[tryton-debian-vcs] tryton-modules-account-invoice branch upstream-2.2 updated. upstream/2.2.5-1-g1830adb
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Thu Mar 27 14:10:56 UTC 2014
The following commit has been merged in the upstream-2.2 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-account-invoice.git;a=commitdiff;h=upstream/2.2.5-1-g1830adb
commit 1830adb68d53590fca0bb98e6a679b16110d4b84
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Thu Mar 27 15:01:16 2014 +0100
Adding upstream version 2.2.6.
diff --git a/CHANGELOG b/CHANGELOG
index 599c59c..bc5502c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.2.6 - 2014-03-22
+* Bug fixes (see mercurial logs for details)
+
Version 2.2.5 - 2014-01-18
* Bug fixes (see mercurial logs for details)
diff --git a/COPYRIGHT b/COPYRIGHT
index 244bb5d..b25a4e5 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-2011 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 1345097..b6e4a1c 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond_account_invoice
-Version: 2.2.5
+Version: 2.2.6
Summary: Financial and Accounting Module with:
- Payment Term
- Invoice / Credit Note
diff --git a/__tryton__.py b/__tryton__.py
index 877f584..d83d030 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -8,7 +8,7 @@
'name_es_ES': 'Facturación',
'name_fr_FR': 'Facturation',
'name_nl_NL': 'Facturatie',
- 'version': '2.2.5',
+ 'version': '2.2.6',
'author': 'B2CK',
'email': 'info at b2ck.com',
'website': 'http://www.tryton.org/',
diff --git a/invoice.py b/invoice.py
index fa250b8..15f651e 100644
--- a/invoice.py
+++ b/invoice.py
@@ -862,11 +862,11 @@ class Invoice(ModelWorkflow, ModelSQL, ModelView):
remainder_total_currency = total_currency
for date, amount in term_lines:
val = self._get_move_line(invoice, date, amount)
- remainder_total_currency -= val['amount_second_currency']
+ remainder_total_currency += val['amount_second_currency']
move_lines.append(val)
if not currency_obj.is_zero(invoice.currency,
remainder_total_currency):
- move_lines[-1]['amount_second_currency'] += remainder_total_currency
+ move_lines[-1]['amount_second_currency'] -= remainder_total_currency
accounting_date = invoice.accounting_date or invoice.invoice_date
period_id = period_obj.find(invoice.company.id, date=accounting_date)
@@ -1366,7 +1366,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'])
account = fields.Many2One('account.account', 'Account',
domain=[
diff --git a/trytond_account_invoice.egg-info/PKG-INFO b/trytond_account_invoice.egg-info/PKG-INFO
index fd213a0..d8ba198 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.2.5
+Version: 2.2.6
Summary: Financial and Accounting Module with:
- Payment Term
- Invoice / Credit Note
--
tryton-modules-account-invoice
More information about the tryton-debian-vcs
mailing list