[tryton-debian-vcs] tryton-modules-account-invoice branch upstream-2.6 updated. upstream/2.6.7-1-g2625924

[Mathias Behrle]

The following commit has been merged in the upstream-2.6 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-account-invoice.git;a=commitdiff;h=upstream/2.6.7-1-g2625924

commit 2625924189f20199e61d2bd88f629f3d2d25b86b
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Wed Mar 26 21:54:47 2014 +0100

    Adding upstream version 2.6.8.

diff --git a/CHANGELOG b/CHANGELOG
index a2217ed..29417a5 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.6.8 - 2014-03-22
+* Bug fixes (see mercurial logs for details)
+
 Version 2.6.7 - 2014-01-18
 * Bug fixes (see mercurial logs for details)
 
diff --git a/COPYRIGHT b/COPYRIGHT
index 6e948f6..c552c67 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-2012 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 35f7542..bf6c32b 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond_account_invoice
-Version: 2.6.7
+Version: 2.6.8
 Summary: Tryton module for invoicing
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/account.py b/account.py
index d6d74c9..8e69051 100644
--- a/account.py
+++ b/account.py
@@ -202,7 +202,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 c08f664..af77e89 100644
--- a/invoice.py
+++ b/invoice.py
@@ -831,10 +831,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
@@ -1325,7 +1325,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',
@@ -2213,7 +2213,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 4b926f5..e819f84 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=2.6.7
+version=2.6.8
 depends:
     account
     account_product
diff --git a/trytond_account_invoice.egg-info/PKG-INFO b/trytond_account_invoice.egg-info/PKG-INFO
index ef799a1..26486f7 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.6.7
+Version: 2.6.8
 Summary: Tryton module for invoicing
 Home-page: http://www.tryton.org/
 Author: Tryton
-- 
tryton-modules-account-invoice