[tryton-debian-vcs] tryton-modules-account-invoice branch debian-stretch-3.6 updated. debian/3.6.3-1-3-g5315110

Mathias Behrle tryton-debian-vcs at alioth.debian.org
Sat Apr 9 18:52:53 UTC 2016


The following commit has been merged in the debian-stretch-3.6 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-account-invoice.git;a=commitdiff;h=debian/3.6.3-1-3-g5315110

commit 53151102f2658d7273123a97cd73d001c31471f0
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Sat Apr 9 20:02:30 2016 +0200

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

diff --git a/debian/changelog b/debian/changelog
index fa4e367..6c86d70 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+tryton-modules-account-invoice (3.6.4-1) unstable; urgency=medium
+
+  * Updating signing-key.asc with the actual upstream maintainer keys.
+  * Merging upstream version 3.6.4.
+
+ -- Mathias Behrle <mathiasb at m9s.biz>  Sat, 09 Apr 2016 20:02:30 +0200
+
 tryton-modules-account-invoice (3.6.3-1) unstable; urgency=medium
 
   * Merging upstream version 3.6.3.
commit 8d2035b4adb05ff5445ad2de7b01266d7701658d
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Sat Apr 9 20:02:30 2016 +0200

    Merging upstream version 3.6.4.

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



More information about the tryton-debian-vcs mailing list