[tryton-debian-vcs] tryton-modules-sale branch upstream-3.0 updated. upstream/3.0.0-1-g45c4283
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Wed Oct 8 16:53:05 UTC 2014
The following commit has been merged in the upstream-3.0 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-sale.git;a=commitdiff;h=upstream/3.0.0-1-g45c4283
commit 45c42836c7cacac632f14deb0744552af3884473
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Oct 8 14:20:07 2014 +0200
Adding upstream version 3.0.1.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/CHANGELOG b/CHANGELOG
index abd2b7b..f76d159 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.0.1 - 2014-09-29
+* Bug fixes (see mercurial logs for details)
+
Version 3.0.0 - 2013-10-21
* Bug fixes (see mercurial logs for details)
* Replace reference copying by relate
diff --git a/COPYRIGHT b/COPYRIGHT
index 5d422e0..77715d8 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-2013 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 95adefa..f8cb006 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond_sale
-Version: 3.0.0
+Version: 3.0.1
Summary: Tryton module for sale
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/sale.py b/sale.py
index a5da83d..0b69d8b 100644
--- a/sale.py
+++ b/sale.py
@@ -1624,8 +1624,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 8d98329..62bd6ec 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=3.0.0
+version=3.0.1
depends:
account
account_invoice
diff --git a/trytond_sale.egg-info/PKG-INFO b/trytond_sale.egg-info/PKG-INFO
index fffdcc9..c983db6 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.0.0
+Version: 3.0.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..7a5461e 100644
--- a/trytond_sale.egg-info/SOURCES.txt
+++ b/trytond_sale.egg-info/SOURCES.txt
@@ -15,12 +15,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
More information about the tryton-debian-vcs
mailing list