[tryton-debian-vcs] tryton-modules-account-invoice branch upstream-3.0 updated. upstream/3.0.8-1-g69217cb
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.0 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-account-invoice.git;a=commitdiff;h=upstream/3.0.8-1-g69217cb
commit 69217cb69327476c0c90a213e5ca5956e0acc7d5
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Mon Jul 11 19:23:07 2016 +0200
Adding upstream version 3.0.9.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/CHANGELOG b/CHANGELOG
index 3a0c913..decc464 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.0.9 - 2016-07-05
+* Bug fixes (see mercurial logs for details)
+
Version 3.0.8 - 2016-04-06
* Bug fixes (see mercurial logs for details)
diff --git a/PKG-INFO b/PKG-INFO
index 471e09a..6eb145f 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond_account_invoice
-Version: 3.0.8
+Version: 3.0.9
Summary: Tryton module for invoicing
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/invoice.py b/invoice.py
index 77a860f..19463e9 100644
--- a/invoice.py
+++ b/invoice.py
@@ -2104,7 +2104,8 @@ class InvoiceTax(ModelSQL, ModelView):
digits=(16, Eval('_parent_invoice', {}).get('currency_digits', 2)))
amount = fields.Numeric('Amount', required=True,
digits=(16, Eval('_parent_invoice', {}).get('currency_digits', 2)),
- on_change_with=['tax', 'base', 'amount', 'manual'],
+ on_change_with=['tax', 'base', 'amount', 'manual',
+ '_parent_invoice.currency'],
depends=['tax', 'base', 'manual'])
manual = fields.Boolean('Manual')
base_code = fields.Many2One('account.tax.code', 'Base Code',
@@ -2225,7 +2226,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 c840ff8..2f82d17 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=3.0.8
+version=3.0.9
depends:
account
account_product
diff --git a/trytond_account_invoice.egg-info/PKG-INFO b/trytond_account_invoice.egg-info/PKG-INFO
index 01205ca..7776a51 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.0.8
+Version: 3.0.9
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