[tryton-debian-vcs] tryton-modules-sale branch upstream-3.2 updated. upstream/3.2.4-1-gc114875

Mathias Behrle tryton-debian-vcs at alioth.debian.org
Wed Dec 23 16:54:01 UTC 2015


The following commit has been merged in the upstream-3.2 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-sale.git;a=commitdiff;h=upstream/3.2.4-1-gc114875

commit c114875eeac54bce28fbeb36ed7b0150fc5bd31f
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Wed Dec 23 14:34:21 2015 +0100

    Adding upstream version 3.2.5.
    
    Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>

diff --git a/CHANGELOG b/CHANGELOG
index 0c412e2..b9993ef 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.2.5 - 2015-12-22
+* Bug fixes (see mercurial logs for details)
+
 Version 3.2.4 - 2015-09-13
 * Bug fixes (see mercurial logs for details)
 
diff --git a/PKG-INFO b/PKG-INFO
index c1339fe..5563585 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond_sale
-Version: 3.2.4
+Version: 3.2.5
 Summary: Tryton module for sale
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/sale.py b/sale.py
index 374bf1b..cfb832b 100644
--- a/sale.py
+++ b/sale.py
@@ -768,7 +768,8 @@ class Sale(Workflow, ModelSQL, ModelView):
         invoice = self._get_invoice_sale(invoice_type)
         invoice.lines = ((list(invoice.lines)
                 if hasattr(invoice, 'lines') else [])
-            + list(chain.from_iterable(invoice_lines.itervalues())))
+            + list(chain.from_iterable(invoice_lines[l.id] for l in self.lines
+                    if l.id in invoice_lines)))
         invoice.save()
 
         with Transaction().set_user(0, set_context=True):
diff --git a/tryton.cfg b/tryton.cfg
index f03fda5..438bf27 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=3.2.4
+version=3.2.5
 depends:
     account
     account_invoice
diff --git a/trytond_sale.egg-info/PKG-INFO b/trytond_sale.egg-info/PKG-INFO
index 5db3a87..08a8fe5 100644
--- a/trytond_sale.egg-info/PKG-INFO
+++ b/trytond_sale.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond-sale
-Version: 3.2.4
+Version: 3.2.5
 Summary: Tryton module for sale
 Home-page: http://www.tryton.org/
 Author: Tryton
-- 
tryton-modules-sale



More information about the tryton-debian-vcs mailing list