[tryton-debian-vcs] tryton-modules-account-invoice branch debian-jessie-3.2 updated. debian/3.2.4-1-2-g1ced117

[Mathias Behrle]

The following commit has been merged in the debian-jessie-3.2 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-account-invoice.git;a=commitdiff;h=debian/3.2.4-1-2-g1ced117

commit 1ced1176b58d32edfcaa344ee6082c4ea21079a9
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Wed Dec 23 14:49:07 2015 +0100

    Releasing debian version 3.2.5-1.
    
    Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>

diff --git a/debian/changelog b/debian/changelog
index 39cd139..d93634f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+tryton-modules-account-invoice (3.2.5-1) unstable; urgency=medium
+
+  * Merging upstream version 3.2.5.
+
+ -- Mathias Behrle <mathiasb at m9s.biz>  Wed, 23 Dec 2015 14:49:07 +0100
+
 tryton-modules-account-invoice (3.2.4-1) unstable; urgency=medium
 
   * Merging upstream version 3.2.4.
commit 97bef836e5186190f657e676c56f31cf708b0977
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Wed Dec 23 14:49:06 2015 +0100

    Merging upstream version 3.2.5.

diff --git a/CHANGELOG b/CHANGELOG
index d69133b..5cbe000 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.2.5 - 2015-12-22
+* Bug fixes (see mercurial logs for details)
+
 Version 3.2.4 - 2015-09-19
 * Bug fixes (see mercurial logs for details)
 
diff --git a/PKG-INFO b/PKG-INFO
index 7d46fe4..50d7ebf 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond_account_invoice
-Version: 3.2.4
+Version: 3.2.5
 Summary: Tryton module for invoicing
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/invoice.py b/invoice.py
index cfd0acf..2c8d1a8 100644
--- a/invoice.py
+++ b/invoice.py
@@ -2542,7 +2542,7 @@ class PayInvoiceAsk(ModelView):
         return 'partial'
 
     @fields.depends('lines', 'amount', 'currency', 'currency_writeoff',
-        'invoice')
+        'invoice', 'payment_lines')
     def on_change_lines(self):
         Currency = Pool().get('currency.currency')
 
@@ -2554,6 +2554,8 @@ class PayInvoiceAsk(ModelView):
         res['amount_writeoff'] = Decimal('0.0')
         for line in self.lines:
             res['amount_writeoff'] += line.debit - line.credit
+        for line in self.payment_lines:
+            res['amount_writeoff'] += line.debit - line.credit
         if self.invoice.type in ('in_invoice', 'out_credit_note'):
             res['amount_writeoff'] = - res['amount_writeoff'] - amount
         else:
diff --git a/tryton.cfg b/tryton.cfg
index 2c114bc..72217ee 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=3.2.4
+version=3.2.5
 depends:
     account
     account_product
diff --git a/trytond_account_invoice.egg-info/PKG-INFO b/trytond_account_invoice.egg-info/PKG-INFO
index 8148b0b..a8938cc 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.4
+Version: 3.2.5
 Summary: Tryton module for invoicing
 Home-page: http://www.tryton.org/
 Author: Tryton
-- 
tryton-modules-account-invoice