[tryton-debian-vcs] tryton-modules-account branch upstream-3.8 updated. upstream/3.8.1-1-g73ab983
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Tue Jul 12 13:02:30 UTC 2016
The following commit has been merged in the upstream-3.8 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-account.git;a=commitdiff;h=upstream/3.8.1-1-g73ab983
commit 73ab983f8e58d956ab38846f6038cb49aa602d05
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Mon Jul 11 20:00:12 2016 +0200
Adding upstream version 3.8.2.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/CHANGELOG b/CHANGELOG
index aa630da..9a1e856 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.8.2 - 2016-07-05
+* Bug fixes (see mercurial logs for details)
+
Version 3.8.1 - 2015-12-22
* Bug fixes (see mercurial logs for details)
diff --git a/COPYRIGHT b/COPYRIGHT
index 3a28212..48f96af 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,6 @@
-Copyright (C) 2008-2015 Cédric Krier.
+Copyright (C) 2008-2016 Cédric Krier.
Copyright (C) 2008-2013 Bertrand Chenal.
-Copyright (C) 2008-2015 B2CK SPRL.
+Copyright (C) 2008-2016 B2CK SPRL.
Copyright (C) 2004-2008 Tiny SPRL.
This program is free software: you can redistribute it and/or modify
diff --git a/PKG-INFO b/PKG-INFO
index 564d10a..26400a0 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond_account
-Version: 3.8.1
+Version: 3.8.2
Summary: Tryton module for accounting
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/account.py b/account.py
index e3d8efb..0c3b6d9 100644
--- a/account.py
+++ b/account.py
@@ -803,6 +803,8 @@ class Account(ModelSQL, ModelView):
def copy(cls, accounts, default=None):
if default is None:
default = {}
+ else:
+ default = default.copy()
default.setdefault('template')
default.setdefault('deferrals', [])
new_accounts = super(Account, cls).copy(accounts, default=default)
diff --git a/move.py b/move.py
index 15d2503..f87b980 100644
--- a/move.py
+++ b/move.py
@@ -1806,17 +1806,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.query_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 848a2ea..bf3944a 100644
--- a/tax.py
+++ b/tax.py
@@ -228,6 +228,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]),
@@ -746,6 +755,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
@@ -1179,6 +1197,15 @@ class TaxRule(ModelSQL, ModelView):
def default_company():
return Transaction().context.get('company')
+ @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
@@ -1393,6 +1420,15 @@ class TaxRuleLine(ModelSQL, ModelView, MatchMixin):
table, _ = tables[None]
return [Case((table.sequence == Null, 0), else_=1), 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 21e2a60..7120b88 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=3.8.1
+version=3.8.2
depends:
company
currency
diff --git a/trytond_account.egg-info/PKG-INFO b/trytond_account.egg-info/PKG-INFO
index 9afd275..d9a6f6c 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.8.1
+Version: 3.8.2
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 c15fc82..5debd10 100644
--- a/trytond_account.egg-info/requires.txt
+++ b/trytond_account.egg-info/requires.txt
@@ -4,4 +4,4 @@ simpleeval
trytond_company >= 3.8, < 3.9
trytond_currency >= 3.8, < 3.9
trytond_party >= 3.8, < 3.9
-trytond >= 3.8, < 3.9
\ No newline at end of file
+trytond >= 3.8, < 3.9
--
tryton-modules-account
More information about the tryton-debian-vcs
mailing list