[tryton-debian-vcs] tryton-modules-account-invoice branch debian-jessie-3.4 updated. debian/3.4.2-1-4-ge20932d
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Sat Apr 9 18:52:52 UTC 2016
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.2-1-4-ge20932d
commit e20932d5592e049f3959cb6579e6f90faceacea8
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sat Apr 9 20:01:30 2016 +0200
Releasing debian version 3.4.3-1.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/debian/changelog b/debian/changelog
index 6bbe17f..d1d31cc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+tryton-modules-account-invoice (3.4.3-1) unstable; urgency=medium
+
+ * Updating signing-key.asc with the actual upstream maintainer keys.
+ * Merging upstream version 3.4.3.
+ * Updating copyright file.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Sat, 09 Apr 2016 20:01:30 +0200
+
tryton-modules-account-invoice (3.4.2-1) unstable; urgency=medium
* Wrapping and sorting control files (wrap-and-sort -bts).
commit 453749ccec8c6730feadb3fdb89503d3efc9defc
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sat Apr 9 20:01:30 2016 +0200
Updating copyright file.
diff --git a/debian/copyright b/debian/copyright
index 5612f85..943c5b3 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,9 +1,9 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Files: *
-Copyright: 2008-2015 Cédric Krier
+Copyright: 2008-2016 Cédric Krier
2008-2013 Bertrand Chenal
- 2008-2015 B2CK SPRL
+ 2008-2016 B2CK SPRL
2004-2008 Tiny SPRL
License: GPL-3+
commit 24e1f443fbd9f723ee7fc969884eb7d75358a6e1
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sat Apr 9 20:01:30 2016 +0200
Merging upstream version 3.4.3.
diff --git a/CHANGELOG b/CHANGELOG
index db6f600..55a9958 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.4.3 - 2016-04-06
+* Bug fixes (see mercurial logs for details)
+
Version 3.4.2 - 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 adfa59f..1392eeb 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond_account_invoice
-Version: 3.4.2
+Version: 3.4.3
Summary: Tryton module for invoicing
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/invoice.py b/invoice.py
index c6172b8..83b3d1c 100644
--- a/invoice.py
+++ b/invoice.py
@@ -2680,10 +2680,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
@@ -2693,8 +2696,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 9a70870..ae67c8e 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=3.4.2
+version=3.4.3
depends:
account
account_product
diff --git a/trytond_account_invoice.egg-info/PKG-INFO b/trytond_account_invoice.egg-info/PKG-INFO
index 38cec85..4f2059d 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.2
+Version: 3.4.3
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 c451a91..62a36c0 100644
--- a/trytond_account_invoice.egg-info/requires.txt
+++ b/trytond_account_invoice.egg-info/requires.txt
@@ -6,4 +6,4 @@ trytond_company >= 3.4, < 3.5
trytond_currency >= 3.4, < 3.5
trytond_party >= 3.4, < 3.5
trytond_product >= 3.4, < 3.5
-trytond >= 3.4, < 3.5
\ No newline at end of file
+trytond >= 3.4, < 3.5
--
tryton-modules-account-invoice
More information about the tryton-debian-vcs
mailing list