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

[Mathias Behrle]

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.5-1-g2b9774f

commit 2b9774f122ef3b3627b407eb1642fd2c92066685
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Sat Apr 9 20:00:10 2016 +0200

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

diff --git a/CHANGELOG b/CHANGELOG
index 5cbe000..1a49bb8 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.2.6 - 2016-04-06
+* Bug fixes (see mercurial logs for details)
+
 Version 3.2.5 - 2015-12-22
 * Bug fixes (see mercurial logs for details)
 
diff --git a/COPYRIGHT b/COPYRIGHT
index 3a28212..48f96af 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,6 @@
-Copyright (C) 2008-2015 Cédric Krier.
+Copyright (C) 2008-2016 Cédric Krier.
 Copyright (C) 2008-2013 Bertrand Chenal.
-Copyright (C) 2008-2015 B2CK SPRL.
+Copyright (C) 2008-2016 B2CK SPRL.
 Copyright (C) 2004-2008 Tiny SPRL.
 
 This program is free software: you can redistribute it and/or modify
diff --git a/PKG-INFO b/PKG-INFO
index 50d7ebf..837dfcb 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond_account_invoice
-Version: 3.2.5
+Version: 3.2.6
 Summary: Tryton module for invoicing
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/invoice.py b/invoice.py
index 2c8d1a8..142b947 100644
--- a/invoice.py
+++ b/invoice.py
@@ -2649,10 +2649,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
@@ -2662,8 +2665,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 72217ee..660b85f 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=3.2.5
+version=3.2.6
 depends:
     account
     account_product
diff --git a/trytond_account_invoice.egg-info/PKG-INFO b/trytond_account_invoice.egg-info/PKG-INFO
index a8938cc..f5dfd25 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.5
+Version: 3.2.6
 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 f86ec11..a326b95 100644
--- a/trytond_account_invoice.egg-info/requires.txt
+++ b/trytond_account_invoice.egg-info/requires.txt
@@ -6,4 +6,4 @@ trytond_company >= 3.2, < 3.3
 trytond_currency >= 3.2, < 3.3
 trytond_party >= 3.2, < 3.3
 trytond_product >= 3.2, < 3.3
-trytond >= 3.2, < 3.3
\ No newline at end of file
+trytond >= 3.2, < 3.3
-- 
tryton-modules-account-invoice