[tryton-debian-vcs] tryton-modules-account-invoice branch upstream-3.2 updated. upstream/3.2.6-1-gc9fdc19

Mathias Behrle tryton-debian-vcs at alioth.debian.org
Tue Jul 12 13:02:56 UTC 2016


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

commit c9fdc1905995541df24dd01987927113cd8d9acc
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Mon Jul 11 19:24:35 2016 +0200

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

diff --git a/CHANGELOG b/CHANGELOG
index 1a49bb8..ea28851 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.2.7 - 2016-07-05
+* Bug fixes (see mercurial logs for details)
+
 Version 3.2.6 - 2016-04-06
 * Bug fixes (see mercurial logs for details)
 
diff --git a/PKG-INFO b/PKG-INFO
index 837dfcb..3a37c72 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond_account_invoice
-Version: 3.2.6
+Version: 3.2.7
 Summary: Tryton module for invoicing
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/invoice.py b/invoice.py
index 142b947..c559ad3 100644
--- a/invoice.py
+++ b/invoice.py
@@ -2223,7 +2223,8 @@ class InvoiceTax(ModelSQL, ModelView):
                 changes['account'] = tax.credit_note_account.id
         return changes
 
-    @fields.depends('tax', 'base', 'amount', 'manual')
+    @fields.depends('tax', 'base', 'amount', 'manual',
+        '_parent_invoice.currency')
     def on_change_with_amount(self):
         Tax = Pool().get('account.tax')
         if self.tax and self.manual:
@@ -2232,7 +2233,10 @@ class InvoiceTax(ModelSQL, ModelView):
             for values in Tax.compute([tax], base, 1):
                 if (values['tax'] == tax
                         and values['base'] == base):
-                    return values['amount']
+                    amount = values['amount']
+                    if self.invoice.currency:
+                        amount = self.invoice.currency.round(amount)
+                    return amount
         return self.amount
 
     @classmethod
diff --git a/tryton.cfg b/tryton.cfg
index 660b85f..bd764f4 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=3.2.6
+version=3.2.7
 depends:
     account
     account_product
diff --git a/trytond_account_invoice.egg-info/PKG-INFO b/trytond_account_invoice.egg-info/PKG-INFO
index f5dfd25..1922400 100644
--- a/trytond_account_invoice.egg-info/PKG-INFO
+++ b/trytond_account_invoice.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond-account-invoice
-Version: 3.2.6
+Version: 3.2.7
 Summary: Tryton module for invoicing
 Home-page: http://www.tryton.org/
 Author: Tryton
-- 
tryton-modules-account-invoice



More information about the tryton-debian-vcs mailing list