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

Mathias Behrle tryton-debian-vcs at alioth.debian.org
Wed Dec 23 16:50:46 UTC 2015


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.1-1-g5401c78

commit 5401c78eb059a41446c5d6e4e8e4c858369421b8
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Wed Dec 23 14:51:14 2015 +0100

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

diff --git a/CHANGELOG b/CHANGELOG
index 52d2372..042a2d3 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.6.2 - 2015-12-22
+* Bug fixes (see mercurial logs for details)
+
 Version 3.6.1 - 2015-05-22
 * Bug fixes (see mercurial logs for details)
 
diff --git a/PKG-INFO b/PKG-INFO
index c3973b3..d96689a 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond_account_invoice
-Version: 3.6.1
+Version: 3.6.2
 Summary: Tryton module for invoicing
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/invoice.py b/invoice.py
index cd846c5..739ef00 100644
--- a/invoice.py
+++ b/invoice.py
@@ -2408,7 +2408,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')
 
@@ -2419,6 +2419,8 @@ class PayInvoiceAsk(ModelView):
         self.amount_writeoff = Decimal('0.0')
         for line in self.lines:
             self.amount_writeoff += line.debit - line.credit
+        for line in self.payment_lines:
+            self.amount_writeoff += line.debit - line.credit
         if self.invoice.type in ('in_invoice', 'out_credit_note'):
             self.amount_writeoff = - self.amount_writeoff - amount
         else:
diff --git a/tryton.cfg b/tryton.cfg
index eb8404a..c6d9da1 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=3.6.1
+version=3.6.2
 depends:
     account
     account_product
diff --git a/trytond_account_invoice.egg-info/PKG-INFO b/trytond_account_invoice.egg-info/PKG-INFO
index 9cedb2d..5e42c1a 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.1
+Version: 3.6.2
 Summary: Tryton module for invoicing
 Home-page: http://www.tryton.org/
 Author: Tryton
-- 
tryton-modules-account-invoice



More information about the tryton-debian-vcs mailing list