[tryton-debian-vcs] tryton-modules-account-invoice branch debian-wheezy-2.2 updated. debian/2.2.5-1-3-gd55da9f

[Mathias Behrle]

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

commit d55da9fd83f13ead8c6a63a9a398c60fe48d2271
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Thu Mar 27 15:10:43 2014 +0100

    Releasing debian version 2.2.6-1.

diff --git a/debian/changelog b/debian/changelog
index b527f11..8239a1f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+tryton-modules-account-invoice (2.2.6-1) unstable; urgency=medium
+
+  * Merging upstream version 2.2.6.
+  * Updating copyright.
+
+ -- Mathias Behrle <mathiasb at m9s.biz>  Thu, 27 Mar 2014 15:05:14 +0100
+
 tryton-modules-account-invoice (2.2.5-1) unstable; urgency=medium
 
   * Merging upstream version 2.2.5.
commit 5eee01f14ed88a1bc7100f283432c4975f24c791
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Thu Mar 27 15:02:44 2014 +0100

    Updating copyright.

diff --git a/debian/copyright b/debian/copyright
index a7678ac..ae85b81 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-2011 Bertrand Chenal
-           2008-2013 B2CK SPRL
+           2008-2014 B2CK SPRL
            2004-2008 Tiny SPRL
 License: GPL-3+
 
commit 885bffee201d1035e087e53b3d85987da5678f68
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Thu Mar 27 15:01:17 2014 +0100

    Merging 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