[tryton-debian-vcs] tryton-modules-account-invoice branch upstream updated. upstream/4.6.0-1-gac4a584

[Mathias Behrle]

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-invoice.git;a=commitdiff;h=upstream/4.6.0-1-gac4a584

commit ac4a584003400df170c53b4f6ad0dc6a657a807f
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Sat Jan 6 11:28:29 2018 +0100

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

diff --git a/CHANGELOG b/CHANGELOG
index 06db1dd..2c214fc 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 4.6.1 - 2018-01-04
+* Bug fixes (see mercurial logs for details)
+
 Version 4.6.0 - 2017-10-30
 * Bug fixes (see mercurial logs for details)
 * Use tax sequence as default value for invoice taxes sequence
diff --git a/PKG-INFO b/PKG-INFO
index 695064f..73709f5 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond_account_invoice
-Version: 4.6.0
+Version: 4.6.1
 Summary: Tryton module for invoicing
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/invoice.py b/invoice.py
index 4b4f539..ef32d2f 100644
--- a/invoice.py
+++ b/invoice.py
@@ -2552,8 +2552,11 @@ class PayInvoice(Wizard):
         with Transaction().set_context(date=self.start.date):
             amount = Currency.compute(self.start.currency,
                 self.start.amount, invoice.company.currency)
+            amount_invoice = Currency.compute(
+                self.start.currency, self.start.amount, invoice.currency)
         _, remainder = self.get_reconcile_lines_for_amount(invoice, amount)
-        if remainder == Decimal('0.0') and amount <= invoice.amount_to_pay:
+        if (remainder == Decimal('0.0')
+                and amount_invoice <= invoice.amount_to_pay):
             return 'pay'
         return 'ask'
 
@@ -2576,6 +2579,8 @@ class PayInvoice(Wizard):
         with Transaction().set_context(date=self.start.date):
             amount = Currency.compute(self.start.currency,
                 self.start.amount, invoice.company.currency)
+            amount_invoice = Currency.compute(
+                self.start.currency, self.start.amount, invoice.currency)
 
         if invoice.company.currency.is_zero(amount):
             lines = invoice.lines_to_pay
@@ -2594,7 +2599,7 @@ class PayInvoice(Wizard):
         default['currency_digits_writeoff'] = invoice.company.currency.digits
         default['invoice'] = invoice.id
 
-        if (amount > invoice.amount_to_pay
+        if (amount_invoice > invoice.amount_to_pay
                 or invoice.company.currency.is_zero(amount)):
             default['type'] = 'writeoff'
         return default
diff --git a/tryton.cfg b/tryton.cfg
index 639d322..4762b22 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=4.6.0
+version=4.6.1
 depends:
     account
     account_product
diff --git a/trytond_account_invoice.egg-info/PKG-INFO b/trytond_account_invoice.egg-info/PKG-INFO
index 808c14f..7edf174 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: 4.6.0
+Version: 4.6.1
 Summary: Tryton module for invoicing
 Home-page: http://www.tryton.org/
 Author: Tryton
-- 
tryton-modules-account-invoice