[tryton-debian-vcs] tryton-modules-account branch upstream-3.6 updated. upstream/3.6.4-1-gcefb62f

[Mathias Behrle]

The following commit has been merged in the upstream-3.6 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-account.git;a=commitdiff;h=upstream/3.6.4-1-gcefb62f

commit cefb62f2ba0f2a139909c5fa8294a9f094d46b8c
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Mon Jul 11 19:58:55 2016 +0200

    Adding upstream version 3.6.5.
    
    Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>

diff --git a/CHANGELOG b/CHANGELOG
index 7761e00..c61dc4e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.6.5 - 2016-07-05
+* Bug fixes (see mercurial logs for details)
+
 Version 3.6.4 - 2016-03-14
 * Bug fixes (see mercurial logs for details)
 
diff --git a/PKG-INFO b/PKG-INFO
index 0aa1379..49dfcc4 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond_account
-Version: 3.6.4
+Version: 3.6.5
 Summary: Tryton module for accounting
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/account.py b/account.py
index 76cf07b..38987d6 100644
--- a/account.py
+++ b/account.py
@@ -868,6 +868,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 ca74acb..452b728 100644
--- a/move.py
+++ b/move.py
@@ -1813,17 +1813,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 352b3a3..0901b1a 100644
--- a/tax.py
+++ b/tax.py
@@ -245,6 +245,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]),
@@ -814,6 +823,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
@@ -1285,6 +1303,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
@@ -1521,6 +1548,15 @@ class TaxRuleLine(ModelSQL, ModelView, MatchMixin):
         table, _ = tables[None]
         return [table.sequence == Null, 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 8039591..5dc9a81 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=3.6.4
+version=3.6.5
 depends:
     company
     currency
diff --git a/trytond_account.egg-info/PKG-INFO b/trytond_account.egg-info/PKG-INFO
index 7cda57f..01e6029 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.6.4
+Version: 3.6.5
 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 e89f0df..7aa45ce 100644
--- a/trytond_account.egg-info/requires.txt
+++ b/trytond_account.egg-info/requires.txt
@@ -4,4 +4,4 @@ simpleeval
 trytond_company >= 3.6, < 3.7
 trytond_currency >= 3.6, < 3.7
 trytond_party >= 3.6, < 3.7
-trytond >= 3.6, < 3.7
\ No newline at end of file
+trytond >= 3.6, < 3.7
-- 
tryton-modules-account