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

[Mathias Behrle]

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.3-1-g2a325f4

commit 2a325f40404bd3e1e7f31b1ad22edce8811e2876
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Sat Apr 9 20:02:29 2016 +0200

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

diff --git a/CHANGELOG b/CHANGELOG
index 0036060..b0ddb20 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.6.4 - 2016-04-06
+* Bug fixes (see mercurial logs for details)
+
 Version 3.6.3 - 2016-02-06
 * Bug fixes (see mercurial logs for details)
 
diff --git a/PKG-INFO b/PKG-INFO
index 42dc640..0a40f7c 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond_account_invoice
-Version: 3.6.3
+Version: 3.6.4
 Summary: Tryton module for invoicing
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/invoice.py b/invoice.py
index c981a53..a2d9180 100644
--- a/invoice.py
+++ b/invoice.py
@@ -2520,10 +2520,13 @@ class PayInvoice(Wizard):
             if line_id not in default['lines_to_pay']:
                 default['lines'].remove(line_id)
 
+        default['payment_lines'] = [x.id for x in invoice.payment_lines
+                if not x.reconciliation]
+
         default['amount_writeoff'] = Decimal('0.0')
         for line in Line.browse(default['lines']):
             default['amount_writeoff'] += line.debit - line.credit
-        for line in invoice.payment_lines:
+        for line in Line.browse(default['payment_lines']):
             default['amount_writeoff'] += line.debit - line.credit
         if invoice.type in ('in_invoice', 'out_credit_note'):
             default['amount_writeoff'] = - default['amount_writeoff'] - amount
@@ -2533,8 +2536,6 @@ class PayInvoice(Wizard):
         default['currency_writeoff'] = invoice.company.currency.id
         default['currency_digits_writeoff'] = invoice.company.currency.digits
         default['invoice'] = invoice.id
-        default['payment_lines'] = [x.id for x in invoice.payment_lines
-                if not x.reconciliation]
 
         if (amount > invoice.amount_to_pay
                 or invoice.company.currency.is_zero(amount)):
diff --git a/tryton.cfg b/tryton.cfg
index 05a2f31..d6291b6 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=3.6.3
+version=3.6.4
 depends:
     account
     account_product
diff --git a/trytond_account_invoice.egg-info/PKG-INFO b/trytond_account_invoice.egg-info/PKG-INFO
index 64e4648..ab88aff 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.3
+Version: 3.6.4
 Summary: Tryton module for invoicing
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/trytond_account_invoice.egg-info/requires.txt b/trytond_account_invoice.egg-info/requires.txt
index ca484e7..c0bb49a 100644
--- a/trytond_account_invoice.egg-info/requires.txt
+++ b/trytond_account_invoice.egg-info/requires.txt
@@ -6,4 +6,4 @@ trytond_company >= 3.6, < 3.7
 trytond_currency >= 3.6, < 3.7
 trytond_party >= 3.6, < 3.7
 trytond_product >= 3.6, < 3.7
-trytond >= 3.6, < 3.7
\ No newline at end of file
+trytond >= 3.6, < 3.7
-- 
tryton-modules-account-invoice