[tryton-debian-vcs] tryton-modules-account-invoice branch debian-jessie-3.4 updated. debian/3.4.1-1-4-g1e056fe

[Mathias Behrle]

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

commit 1e056fe592f1bcc7458ce3c894e5bf390b1a9a37
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Wed Dec 23 14:50:11 2015 +0100

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

diff --git a/debian/changelog b/debian/changelog
index b216161..6bbe17f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+tryton-modules-account-invoice (3.4.2-1) unstable; urgency=medium
+
+  * Wrapping and sorting control files (wrap-and-sort -bts).
+  * Setting the branch in the watch file to the fixed version 3.4.
+  * Merging upstream version 3.4.2.
+
+ -- Mathias Behrle <mathiasb at m9s.biz>  Wed, 23 Dec 2015 14:50:11 +0100
+
 tryton-modules-account-invoice (3.4.1-1) unstable; urgency=medium
 
   * Adding actual upstream signing key.
commit dec460dabf16abd1e62d63245c4bf16bdf409b54
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Wed Dec 23 14:50:10 2015 +0100

    Merging upstream version 3.4.2.

diff --git a/CHANGELOG b/CHANGELOG
index e03adc8..db6f600 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.4.2 - 2015-12-22
+* Bug fixes (see mercurial logs for details)
+
 Version 3.4.1 - 2015-03-02
 * Bug fixes (see mercurial logs for details)
 
diff --git a/PKG-INFO b/PKG-INFO
index 1a2d564..adfa59f 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond_account_invoice
-Version: 3.4.1
+Version: 3.4.2
 Summary: Tryton module for invoicing
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/invoice.py b/invoice.py
index fb515a7..c6172b8 100644
--- a/invoice.py
+++ b/invoice.py
@@ -2573,7 +2573,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')
 
@@ -2585,6 +2585,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 84e53cb..9a70870 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=3.4.1
+version=3.4.2
 depends:
     account
     account_product
diff --git a/trytond_account_invoice.egg-info/PKG-INFO b/trytond_account_invoice.egg-info/PKG-INFO
index a684e0d..38cec85 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.4.1
+Version: 3.4.2
 Summary: Tryton module for invoicing
 Home-page: http://www.tryton.org/
 Author: Tryton
-- 
tryton-modules-account-invoice