[tryton-debian-vcs] tryton-modules-sale-extra branch upstream updated. upstream/3.6.1-1-g9570e97

[Mathias Behrle]

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

commit 9570e9741b1ccdc477cf752e513bc62a0e80f07d
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Wed Jul 15 12:57:51 2015 +0200

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

diff --git a/CHANGELOG b/CHANGELOG
index 105696a..b7f341c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.6.2 - 2015-07-13
+* Bug fixes (see mercurial logs for details)
+
 Version 3.6.1 - 2015-05-22
 * Bug fixes (see mercurial logs for details)
 
diff --git a/PKG-INFO b/PKG-INFO
index 3f00668..ccfe500 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond_sale_extra
-Version: 3.6.1
+Version: 3.6.2
 Summary: Tryton module for sale extra
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/sale.py b/sale.py
index 54dfd7a..76c989d 100644
--- a/sale.py
+++ b/sale.py
@@ -27,7 +27,9 @@ class Sale:
         'Set extra lines'
         pool = Pool()
         Extra = pool.get('sale.extra')
+        Line = pool.get('sale.line')
 
+        lines_to_delete = []
         extra_lines = Extra.get_lines(self)
         extra2lines = {line.extra: line for line in extra_lines}
         lines = list(self.lines)
@@ -39,9 +41,12 @@ class Sale:
                 continue
             else:
                 lines.remove(line)
+                lines_to_delete.append(line)
         if extra2lines:
             lines.extend(extra2lines.values())
         self.lines = lines
+        if lines_to_delete:
+            Line.delete(lines_to_delete)
 
 
 class SaleLine:
diff --git a/tryton.cfg b/tryton.cfg
index 6c1f7f6..97ec624 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=3.6.1
+version=3.6.2
 depends:
     company
     ir
diff --git a/trytond_sale_extra.egg-info/PKG-INFO b/trytond_sale_extra.egg-info/PKG-INFO
index 28aacdf..ecee249 100644
--- a/trytond_sale_extra.egg-info/PKG-INFO
+++ b/trytond_sale_extra.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond-sale-extra
-Version: 3.6.1
+Version: 3.6.2
 Summary: Tryton module for sale extra
 Home-page: http://www.tryton.org/
 Author: Tryton
-- 
tryton-modules-sale-extra