[tryton-debian-vcs] tryton-modules-account-invoice branch debian-jessie-2.8 updated. debian/2.8.5-1-3-ga6a52e0
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Wed Mar 26 20:35:15 UTC 2014
The following commit has been merged in the debian-jessie-2.8 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-account-invoice.git;a=commitdiff;h=debian/2.8.5-1-3-ga6a52e0
commit a6a52e088c1e7789a6181ab5943baee10435f147
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Mar 26 21:35:00 2014 +0100
Releasing debian version 2.8.6-1.
diff --git a/debian/changelog b/debian/changelog
index b86862b..d87ee02 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+tryton-modules-account-invoice (2.8.6-1) unstable; urgency=medium
+
+ * Merging upstream version 2.8.6.
+ * Updating copyright.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Wed, 26 Mar 2014 21:31:10 +0100
+
tryton-modules-account-invoice (2.8.5-1) unstable; urgency=medium
* Merging upstream version 2.8.5.
commit 23bc4e5ec3864591f70fad9f7d560a0c909b1a8c
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Mar 26 21:26:44 2014 +0100
Updating copyright.
diff --git a/debian/copyright b/debian/copyright
index 5f40e66..6833b34 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-2013 Cédric Krier
+Copyright: 2008-2014 Cédric Krier
2008-2013 Bertrand Chenal
- 2008-2013 B2CK SPRL
+ 2008-2014 B2CK SPRL
2004-2008 Tiny SPRL
License: GPL-3+
commit c563ea10227b998b6eee4cd275a729d6b3c3987c
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Mar 26 21:25:48 2014 +0100
Merging upstream version 2.8.6.
diff --git a/CHANGELOG b/CHANGELOG
index 1b63390..0945552 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.8.6 - 2014-03-22
+* Bug fixes (see mercurial logs for details)
+
Version 2.8.5 - 2014-01-18
* Bug fixes (see mercurial logs for details)
diff --git a/COPYRIGHT b/COPYRIGHT
index 5d422e0..77715d8 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,6 @@
-Copyright (C) 2008-2013 Cédric Krier.
+Copyright (C) 2008-2014 Cédric Krier.
Copyright (C) 2008-2013 Bertrand Chenal.
-Copyright (C) 2008-2013 B2CK SPRL.
+Copyright (C) 2008-2014 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 5b3d156..58b7f90 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond_account_invoice
-Version: 2.8.5
+Version: 2.8.6
Summary: Tryton module for invoicing
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/account.py b/account.py
index f7eaf1f..92b4d2e 100644
--- a/account.py
+++ b/account.py
@@ -90,7 +90,7 @@ class FiscalYear:
('id', '!=', self.id),
])
if fiscalyears:
- self.raise_user_error('different_invoice_sequences', {
+ self.raise_user_error('different_invoice_sequence', {
'first': self.rec_name,
'second': fiscalyears[0].rec_name,
})
@@ -220,7 +220,7 @@ class Period:
for period in periods:
sequence = getattr(period, sequence_name)
if (sequence and
- sequence.id != vals[sequence]):
+ sequence.id != vals[sequence_name]):
if Invoice.search([
('invoice_date', '>=', period.start_date),
('invoice_date', '<=', period.end_date),
diff --git a/invoice.py b/invoice.py
index ec45939..dca4424 100644
--- a/invoice.py
+++ b/invoice.py
@@ -866,10 +866,10 @@ class Invoice(Workflow, ModelSQL, ModelView):
term_lines = [(Date.today(), total)]
for date, amount in term_lines:
val = self._get_move_line(date, amount)
- remainder_total_currency -= val['amount_second_currency']
+ remainder_total_currency += val['amount_second_currency']
move_lines.append(val)
if not self.currency.is_zero(remainder_total_currency):
- move_lines[-1]['amount_second_currency'] += \
+ move_lines[-1]['amount_second_currency'] -= \
remainder_total_currency
accounting_date = self.accounting_date or self.invoice_date
@@ -1459,7 +1459,7 @@ class InvoiceLine(ModelSQL, ModelView):
on_change=['product', 'unit', 'quantity', 'description',
'_parent_invoice.type', '_parent_invoice.party',
'_parent_invoice.currency', '_parent_invoice.currency_date',
- 'party', 'currency', 'invoice'],
+ 'party', 'currency', 'invoice', 'invoice_type'],
depends=['type'])
product_uom_category = fields.Function(
fields.Many2One('product.uom.category', 'Product Uom Category',
@@ -1869,6 +1869,14 @@ class InvoiceLine(ModelSQL, ModelView):
return super(InvoiceLine, cls).create(vlist)
@classmethod
+ def copy(cls, lines, default=None):
+ if default is None:
+ default = {}
+ default = default.copy()
+ default.setdefault('origin', None)
+ return super(InvoiceLine, cls).copy(lines, default=default)
+
+ @classmethod
def validate(cls, lines):
super(InvoiceLine, cls).validate(lines)
for line in lines:
@@ -2437,7 +2445,7 @@ class PayInvoiceAsk(ModelView):
lines = fields.Many2Many('account.move.line', None, None, 'Lines',
domain=[
('id', 'in', Eval('lines_to_pay')),
- ('reconciliation', '=', False),
+ ('reconciliation', '=', None),
],
states={
'invisible': Eval('type') != 'writeoff',
diff --git a/tryton.cfg b/tryton.cfg
index cd8eccf..891d670 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=2.8.5
+version=2.8.6
depends:
account
account_product
diff --git a/trytond_account_invoice.egg-info/PKG-INFO b/trytond_account_invoice.egg-info/PKG-INFO
index 968ccc4..4bce545 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: 2.8.5
+Version: 2.8.6
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