[tryton-debian-vcs] tryton-modules-sale branch debian-stretch-3.6 updated. debian/3.6.0-1-6-gceb8066

[Mathias Behrle]

The following commit has been merged in the debian-stretch-3.6 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-sale.git;a=commitdiff;h=debian/3.6.0-1-6-gceb8066

commit ceb806694220a52c9286c5ec34f0eea19317a838
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Wed Dec 23 14:36:29 2015 +0100

    Releasing debian version 3.6.1-1.
    
    Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>

diff --git a/debian/changelog b/debian/changelog
index 888a24a..c1391f5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+tryton-modules-sale (3.6.1-1) unstable; urgency=medium
+
+  * Updating year of debian copyright.
+  * Adapting section naming in gbp.conf to current git-buildpackage.
+  * Improving description why we can not run the module test suites.
+  * Setting the branch in the watch file to the fixed version 3.6.
+  * Merging upstream version 3.6.1.
+
+ -- Mathias Behrle <mathiasb at m9s.biz>  Wed, 23 Dec 2015 14:36:29 +0100
+
 tryton-modules-sale (3.6.0-1) unstable; urgency=medium
 
   * Wrapping and sorting control files (wrap-and-sort -bts).
commit f59a177902a13d753d7ac5390babb790770d0d05
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Wed Dec 23 14:36:28 2015 +0100

    Merging upstream version 3.6.1.

diff --git a/CHANGELOG b/CHANGELOG
index 932573a..c01fe1c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.6.1 - 2015-12-22
+* Bug fixes (see mercurial logs for details)
+
 Version 3.6.0 - 2015-04-20
 * Bug fixes (see mercurial logs for details)
 * Add support for PyPy
diff --git a/PKG-INFO b/PKG-INFO
index 727f1da..78bd50e 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond_sale
-Version: 3.6.0
+Version: 3.6.1
 Summary: Tryton module for sale
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/sale.py b/sale.py
index f4dce4e..19cb6a8 100644
--- a/sale.py
+++ b/sale.py
@@ -764,7 +764,8 @@ class Sale(Workflow, ModelSQL, ModelView, TaxableMixin):
         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()
 
         Invoice.update_taxes([invoice])
diff --git a/tryton.cfg b/tryton.cfg
index 0e9e427..b812ad0 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=3.6.0
+version=3.6.1
 depends:
     account
     account_invoice
diff --git a/trytond_sale.egg-info/PKG-INFO b/trytond_sale.egg-info/PKG-INFO
index 1d74e02..a5d80a0 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.6.0
+Version: 3.6.1
 Summary: Tryton module for sale
 Home-page: http://www.tryton.org/
 Author: Tryton
-- 
tryton-modules-sale