[tryton-debian-vcs] tryton-modules-account branch upstream updated. upstream/4.4.0-1-gf628b38

Mathias Behrle tryton-debian-vcs at alioth.debian.org
Thu Aug 17 12:21:32 UTC 2017


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

commit f628b383463f3ccfe7b597767d6ea6120e37b4f6
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Thu Aug 17 13:13:01 2017 +0200

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

diff --git a/CHANGELOG b/CHANGELOG
index ad8b910..4cdf3ba 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 4.4.1 - 2017-08-08
+* Bug fixes (see mercurial logs for details)
+
 Version 4.4.0 - 2017-05-01
 * Bug fixes (see mercurial logs for details)
 * Add definitive lock of period and fiscal year
diff --git a/PKG-INFO b/PKG-INFO
index 87d7c84..a6a7bf5 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond_account
-Version: 4.4.0
+Version: 4.4.1
 Summary: Tryton module for accounting
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/journal.py b/journal.py
index 82cc639..61689d0 100644
--- a/journal.py
+++ b/journal.py
@@ -135,8 +135,8 @@ class Journal(ModelSQL, ModelView, CompanyMultiValueMixin):
     def default_active():
         return True
 
-    @staticmethod
-    def default_sequence():
+    @classmethod
+    def default_sequence(cls, **pattern):
         return None
 
     @staticmethod
diff --git a/move.py b/move.py
index e23825d..42f45de 100644
--- a/move.py
+++ b/move.py
@@ -915,7 +915,7 @@ class Line(ModelSQL, ModelView):
                             else:
                                 line_amount -= tax_line['amount']
                             tax_amount += tax_line['amount'] * \
-                                tax_line['tax'][key + '_tax_sign']
+                                getattr(tax_line['tax'], key + '_tax_sign')
                     line_amount = line.account.company.currency.round(
                         line_amount)
                     tax_amount = line.account.company.currency.round(
@@ -1066,7 +1066,7 @@ class Line(ModelSQL, ModelView):
                     tax_line = TaxLine(**TaxLine.default_get(
                             TaxLine._fields.keys()))
 
-                    tax_line.amount = base_amounts[code_id, tax_id],
+                    tax_line.amount = base_amounts[code_id, tax_id]
                     tax_line.currency_digits = self.account.currency_digits
                     tax_line.code = code_id
                     tax_line.tax = tax_id
diff --git a/setup.cfg b/setup.cfg
index 861a9f5..8bfd5a1 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,4 @@
 [egg_info]
 tag_build = 
 tag_date = 0
-tag_svn_revision = 0
 
diff --git a/tax.py b/tax.py
index f5c3be6..5a7472a 100644
--- a/tax.py
+++ b/tax.py
@@ -1107,7 +1107,6 @@ class TaxableMixin(object):
 class TaxLine(ModelSQL, ModelView):
     'Tax Line'
     __name__ = 'account.tax.line'
-    _rec_name = 'amount'
     currency_digits = fields.Function(fields.Integer('Currency Digits'),
         'on_change_with_currency_digits')
     amount = fields.Numeric('Amount', digits=(16, Eval('currency_digits', 2)),
@@ -1135,15 +1134,18 @@ class TaxLine(ModelSQL, ModelView):
             return self.move_line.currency_digits
         return 2
 
-    @fields.depends('tax')
-    def on_change_tax(self):
-        self.code = None
-
     @fields.depends('_parent_move_line.account', 'move_line')
     def on_change_with_company(self, name=None):
         if self.move_line:
             return self.move_line.account.company.id
 
+    def get_rec_name(self, name):
+        return self.code.rec_name
+
+    @classmethod
+    def search_rec_name(cls, name, clause):
+        return [('code',) + tuple(clause[1:])]
+
 
 class TaxRuleTemplate(ModelSQL, ModelView):
     'Tax Rule Template'
@@ -1394,7 +1396,6 @@ class TaxRuleLineTemplate(sequence_ordered(), ModelSQL, ModelView):
 class TaxRuleLine(sequence_ordered(), ModelSQL, ModelView, MatchMixin):
     'Tax Rule Line'
     __name__ = 'account.tax.rule.line'
-    _rec_name = 'tax'
     rule = fields.Many2One('account.tax.rule', 'Rule', required=True,
             select=True, ondelete='CASCADE')
     group = fields.Many2One('account.tax.group', 'Tax Group',
diff --git a/tryton.cfg b/tryton.cfg
index 483d692..9f17622 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=4.4.0
+version=4.4.1
 depends:
     company
     currency
diff --git a/trytond_account.egg-info/PKG-INFO b/trytond_account.egg-info/PKG-INFO
index 3dfbef1..d653486 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: 4.4.0
+Version: 4.4.1
 Summary: Tryton module for accounting
 Home-page: http://www.tryton.org/
 Author: Tryton
-- 
tryton-modules-account



More information about the tryton-debian-vcs mailing list