[tryton-debian-vcs] tryton-modules-account branch upstream-3.0 updated. upstream/3.0.11-1-gdad86d2

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.0 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-account.git;a=commitdiff;h=upstream/3.0.11-1-gdad86d2

commit dad86d267b7d2dd364e94a7f857469b243bf88a9
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Mon Jul 11 19:54:59 2016 +0200

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

diff --git a/CHANGELOG b/CHANGELOG
index 2f100f8..acafb93 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.0.12 - 2016-07-05
+* Bug fixes (see mercurial logs for details)
+
 Version 3.0.11 - 2016-03-14
 * Bug fixes (see mercurial logs for details)
 
diff --git a/PKG-INFO b/PKG-INFO
index 0f17f4e..56ec250 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond_account
-Version: 3.0.11
+Version: 3.0.12
 Summary: Tryton module for accounting
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/account.py b/account.py
index 078bada..2c232c7 100644
--- a/account.py
+++ b/account.py
@@ -808,6 +808,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/tax.py b/tax.py
index 1f3b17e..9f2b864 100644
--- a/tax.py
+++ b/tax.py
@@ -235,6 +235,15 @@ class TaxCode(ModelSQL, ModelView):
         return [('name',) + tuple(clause[1:])]
 
     @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]),
@@ -730,6 +739,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
@@ -1004,6 +1022,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
@@ -1234,6 +1261,15 @@ class TaxRuleLine(ModelSQL, ModelView):
         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):
         '''
         Match line on pattern
diff --git a/tryton.cfg b/tryton.cfg
index 7b93535..aedcd51 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=3.0.11
+version=3.0.12
 depends:
     company
     currency
diff --git a/trytond_account.egg-info/PKG-INFO b/trytond_account.egg-info/PKG-INFO
index 449aed2..4fc3515 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.0.11
+Version: 3.0.12
 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 166cb5c..c76fc65 100644
--- a/trytond_account.egg-info/requires.txt
+++ b/trytond_account.egg-info/requires.txt
@@ -3,4 +3,4 @@ python-sql
 trytond_company >= 3.0, < 3.1
 trytond_currency >= 3.0, < 3.1
 trytond_party >= 3.0, < 3.1
-trytond >= 3.0, < 3.1
\ No newline at end of file
+trytond >= 3.0, < 3.1
-- 
tryton-modules-account



More information about the tryton-debian-vcs mailing list