[tryton-debian-vcs] tryton-modules-sale branch upstream updated. upstream/3.2.0-1-g8db4888

[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.git;a=commitdiff;h=upstream/3.2.0-1-g8db4888

commit 8db48888b51fad44b865bbf3cb8a170f46132e3a
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Wed Oct 8 14:17:14 2014 +0200

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

diff --git a/CHANGELOG b/CHANGELOG
index d8eab5b..942ecff 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.2.1 - 2014-09-29
+* Bug fixes (see mercurial logs for details)
+
 Version 3.2.0 - 2014-04-21
 * Bug fixes (see mercurial logs for details)
 * Add link between stock moves and invoice lines
diff --git a/PKG-INFO b/PKG-INFO
index 57e44db..adcefe8 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond_sale
-Version: 3.2.0
+Version: 3.2.1
 Summary: Tryton module for sale
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/TODO b/TODO
deleted file mode 100644
index d686abe..0000000
--- a/TODO
+++ /dev/null
@@ -1,2 +0,0 @@
-- Add historization of quotation
-- Cancel draft moves and draft invoice when canceling sale order
diff --git a/sale.py b/sale.py
index 74bf951..c4667a0 100644
--- a/sale.py
+++ b/sale.py
@@ -1673,8 +1673,9 @@ class ReturnSale(Wizard):
         return_sales = Sale.copy(sales)
         for sale in return_sales:
             for line in sale.lines:
-                line.quantity *= -1
-                line.save()
+                if line.type == 'line':
+                    line.quantity *= -1
+                    line.save()
         data = {'res_id': [s.id for s in return_sales]}
         if len(return_sales) == 1:
             action['views'].reverse()
diff --git a/tryton.cfg b/tryton.cfg
index 3af04bc..1c7c099 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=3.2.0
+version=3.2.1
 depends:
     account
     account_invoice
diff --git a/trytond_sale.egg-info/PKG-INFO b/trytond_sale.egg-info/PKG-INFO
index 1e59235..dd0e5ef 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.0
+Version: 3.2.1
 Summary: Tryton module for sale
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/trytond_sale.egg-info/SOURCES.txt b/trytond_sale.egg-info/SOURCES.txt
index 59424ac..8be1416 100644
--- a/trytond_sale.egg-info/SOURCES.txt
+++ b/trytond_sale.egg-info/SOURCES.txt
@@ -4,7 +4,6 @@ INSTALL
 LICENSE
 MANIFEST.in
 README
-TODO
 configuration.xml
 party.xml
 product.xml
@@ -15,12 +14,45 @@ stock.xml
 tryton.cfg
 ./__init__.py
 ./configuration.py
+./configuration.xml
 ./invoice.py
+./party.xml
 ./product.py
+./product.xml
+./sale.odt
 ./sale.py
+./sale.xml
 ./stock.py
+./stock.xml
+./tryton.cfg
+./locale/bg_BG.po
+./locale/ca_ES.po
+./locale/cs_CZ.po
+./locale/de_DE.po
+./locale/es_AR.po
+./locale/es_CO.po
+./locale/es_ES.po
+./locale/fr_FR.po
+./locale/nl_NL.po
+./locale/ru_RU.po
+./locale/sl_SI.po
 ./tests/__init__.py
+./tests/scenario_sale.rst
 ./tests/test_sale.py
+./view/configuration_form.xml
+./view/handle_invoice_exception_ask_form.xml
+./view/handle_shipment_exception_ask_form.xml
+./view/move_list_shipment.xml
+./view/party_form.xml
+./view/product_list_sale_line.xml
+./view/return_sale_start_form.xml
+./view/sale_form.xml
+./view/sale_line_form.xml
+./view/sale_line_tree.xml
+./view/sale_line_tree_sequence.xml
+./view/sale_tree.xml
+./view/template_form.xml
+./view/template_tree.xml
 doc/index.rst
 locale/bg_BG.po
 locale/ca_ES.po
-- 
tryton-modules-sale