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

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

commit 2ab5f14226914c233cd651a17b6af564cfc2049b
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Mon Jul 11 19:26:56 2016 +0200

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

diff --git a/CHANGELOG b/CHANGELOG
index b0ddb20..c77cf9c 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-04-06
 * Bug fixes (see mercurial logs for details)
 
diff --git a/PKG-INFO b/PKG-INFO
index 0a40f7c..9b45b30 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond_account_invoice
-Version: 3.6.4
+Version: 3.6.5
 Summary: Tryton module for invoicing
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/invoice.py b/invoice.py
index a2d9180..17d8dc4 100644
--- a/invoice.py
+++ b/invoice.py
@@ -2138,7 +2138,8 @@ class InvoiceTax(ModelSQL, ModelView):
             self.tax_sign = tax.credit_note_tax_sign
             self.account = tax.credit_note_account
 
-    @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:
@@ -2147,7 +2148,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 d6291b6..e03cb84 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=3.6.4
+version=3.6.5
 depends:
     account
     account_product
diff --git a/trytond_account_invoice.egg-info/PKG-INFO b/trytond_account_invoice.egg-info/PKG-INFO
index ab88aff..bcb251d 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.6.4
+Version: 3.6.5
 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