[tryton-debian-vcs] tryton-modules-account-invoice branch upstream-3.0 updated. upstream/3.0.7-1-gccdaaff
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 upstream-3.0 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-account-invoice.git;a=commitdiff;h=upstream/3.0.7-1-gccdaaff
commit ccdaaffacf3e5ec7a3d05cd2651ab88a71cf8084
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sat Apr 9 19:59:03 2016 +0200
Adding upstream version 3.0.8.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/CHANGELOG b/CHANGELOG
index e852335..3a0c913 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.0.8 - 2016-04-06
+* Bug fixes (see mercurial logs for details)
+
Version 3.0.7 - 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 b5eb9ec..471e09a 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond_account_invoice
-Version: 3.0.7
+Version: 3.0.8
Summary: Tryton module for invoicing
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/invoice.py b/invoice.py
index 8241f95..77a860f 100644
--- a/invoice.py
+++ b/invoice.py
@@ -2642,10 +2642,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
@@ -2655,8 +2658,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 55e1d37..c840ff8 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=3.0.7
+version=3.0.8
depends:
account
account_product
diff --git a/trytond_account_invoice.egg-info/PKG-INFO b/trytond_account_invoice.egg-info/PKG-INFO
index 52d1528..01205ca 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.0.7
+Version: 3.0.8
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 d92cff8..deb67e0 100644
--- a/trytond_account_invoice.egg-info/requires.txt
+++ b/trytond_account_invoice.egg-info/requires.txt
@@ -6,4 +6,4 @@ trytond_company >= 3.0, < 3.1
trytond_currency >= 3.0, < 3.1
trytond_party >= 3.0, < 3.1
trytond_product >= 3.0, < 3.1
-trytond >= 3.0, < 3.1
\ No newline at end of file
+trytond >= 3.0, < 3.1
--
tryton-modules-account-invoice
More information about the tryton-debian-vcs
mailing list