[tryton-debian-vcs] tryton-modules-account branch debian-jessie-3.4 updated. debian/3.4.5-1-2-g2ae0cdd
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Tue Jul 12 13:02:26 UTC 2016
The following commit has been merged in the debian-jessie-3.4 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-account.git;a=commitdiff;h=debian/3.4.5-1-2-g2ae0cdd
commit 2ae0cdd2f091ae42252dfb63f791e279568366fc
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Mon Jul 11 19:57:37 2016 +0200
Releasing debian version 3.4.6-1.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/debian/changelog b/debian/changelog
index e61a8d5..e1864ca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+tryton-modules-account (3.4.6-1) unstable; urgency=medium
+
+ * Merging upstream version 3.4.6.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Mon, 11 Jul 2016 19:57:37 +0200
+
tryton-modules-account (3.4.5-1) unstable; urgency=medium
* Updating signing-key.asc with the actual upstream maintainer keys.
commit 2a26c9d8ce29580bbf6eecaefb1efcd567fb1c4f
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Mon Jul 11 19:57:36 2016 +0200
Merging upstream version 3.4.6.
diff --git a/CHANGELOG b/CHANGELOG
index 922c85f..ab70e11 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.4.6 - 2016-07-05
+* Bug fixes (see mercurial logs for details)
+
Version 3.4.5 - 2016-03-14
* Bug fixes (see mercurial logs for details)
diff --git a/PKG-INFO b/PKG-INFO
index 38fa628..c3e7d2b 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond_account
-Version: 3.4.5
+Version: 3.4.6
Summary: Tryton module for accounting
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/account.py b/account.py
index b335d28..f821b02 100644
--- a/account.py
+++ b/account.py
@@ -826,6 +826,8 @@ class Account(ModelSQL, ModelView):
def copy(cls, accounts, default=None):
if default is None:
default = {}
+ else:
+ default = default.copy()
default['left'] = 0
default['right'] = 0
default.setdefault('template')
diff --git a/move.py b/move.py
index 3200d78..d1eafc8 100644
--- a/move.py
+++ b/move.py
@@ -1767,17 +1767,20 @@ class Reconcile(Wizard):
def get_accounts(self):
'Return a list of account id to reconcile'
pool = Pool()
+ Rule = pool.get('ir.rule')
Line = pool.get('account.move.line')
line = Line.__table__()
Account = pool.get('account.account')
account = Account.__table__()
cursor = Transaction().cursor
+ account_rule = Rule.domain_get(Account.__name__)
balance = line.debit - line.credit
cursor.execute(*line.join(account,
condition=line.account == account.id).select(
account.id,
- where=(line.reconciliation == Null) & account.reconcile,
+ where=((line.reconciliation == Null) & account.reconcile
+ & account.id.in_(account_rule)),
group_by=account.id,
having=(
Sum(Case((balance > 0, 1), else_=0)) > 0)
diff --git a/tax.py b/tax.py
index 0ad69a7..1ec0956 100644
--- a/tax.py
+++ b/tax.py
@@ -237,6 +237,15 @@ class TaxCode(ModelSQL, ModelView):
]
@classmethod
+ def copy(cls, codes, default=None):
+ if default is None:
+ default = {}
+ else:
+ default = default.copy()
+ default.setdefault('template')
+ return super(TaxCode, cls).copy(codes, default=default)
+
+ @classmethod
def delete(cls, codes):
codes = cls.search([
('parent', 'child_of', [c.id for c in codes]),
@@ -738,6 +747,15 @@ class Tax(ModelSQL, ModelView):
return self.company.currency.digits
return 2
+ @classmethod
+ def copy(cls, taxes, default=None):
+ if default is None:
+ default = {}
+ else:
+ default = default.copy()
+ default.setdefault('template')
+ return super(Tax, cls).copy(taxes, default=default)
+
def _process_tax(self, price_unit):
if self.type == 'percentage':
amount = price_unit * self.rate
@@ -1022,6 +1040,15 @@ class TaxRule(ModelSQL, ModelView):
def default_kind():
return 'both'
+ @classmethod
+ def copy(cls, rules, default=None):
+ if default is None:
+ default = {}
+ else:
+ default = default.copy()
+ default.setdefault('template')
+ return super(TaxRule, cls).copy(rules, default=default)
+
def apply(self, tax, pattern):
'''
Apply rule on tax
@@ -1258,6 +1285,15 @@ class TaxRuleLine(ModelSQL, ModelView, MatchMixin):
table, _ = tables[None]
return [table.sequence == None, table.sequence]
+ @classmethod
+ def copy(cls, lines, default=None):
+ if default is None:
+ default = {}
+ else:
+ default = default.copy()
+ default.setdefault('template')
+ return super(TaxRuleLine, cls).copy(lines, default=default)
+
def match(self, pattern):
if 'group' in pattern and not self.group:
if pattern['group']:
diff --git a/tryton.cfg b/tryton.cfg
index d3cb7f7..6b09c14 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=3.4.5
+version=3.4.6
depends:
company
currency
diff --git a/trytond_account.egg-info/PKG-INFO b/trytond_account.egg-info/PKG-INFO
index 000a164..ef0e10e 100644
--- a/trytond_account.egg-info/PKG-INFO
+++ b/trytond_account.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond-account
-Version: 3.4.5
+Version: 3.4.6
Summary: Tryton module for accounting
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/trytond_account.egg-info/requires.txt b/trytond_account.egg-info/requires.txt
index c1e3b87..4a098d0 100644
--- a/trytond_account.egg-info/requires.txt
+++ b/trytond_account.egg-info/requires.txt
@@ -3,4 +3,4 @@ python-sql
trytond_company >= 3.4, < 3.5
trytond_currency >= 3.4, < 3.5
trytond_party >= 3.4, < 3.5
-trytond >= 3.4, < 3.5
\ No newline at end of file
+trytond >= 3.4, < 3.5
--
tryton-modules-account
More information about the tryton-debian-vcs
mailing list