[tryton-debian-vcs] tryton-modules-sale branch upstream-2.8 updated. upstream/2.8.2-1-g4fda6da
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Wed Nov 12 13:54:17 UTC 2014
The following commit has been merged in the upstream-2.8 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-sale.git;a=commitdiff;h=upstream/2.8.2-1-g4fda6da
commit 4fda6da4476d2e7536f5b03ce613d0a21a30e3de
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Nov 12 13:37:20 2014 +0100
Adding upstream version 2.8.3.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/CHANGELOG b/CHANGELOG
index 7a91add..3ce983d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.8.3 - 2014-11-06
+* Bug fixes (see mercurial logs for details)
+
Version 2.8.2 - 2013-10-01
* Bug fixes (see mercurial logs for details)
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 dafd736..9427116 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond_sale
-Version: 2.8.2
+Version: 2.8.3
Summary: Tryton module for sale
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/sale.py b/sale.py
index 2ced8d9..7c586c0 100644
--- a/sale.py
+++ b/sale.py
@@ -1243,10 +1243,12 @@ class SaleLine(ModelSQL, ModelView):
if old_invoice_line.id not in skip_ids:
quantity -= Uom.compute_qty(old_invoice_line.unit,
old_invoice_line.quantity, self.unit)
- invoice_line.quantity = quantity
- if invoice_line.quantity <= 0.0:
+ rounding = self.unit.rounding if self.unit else 0.01
+ invoice_line.quantity = Uom.round(quantity, rounding)
+ if invoice_line.quantity <= 0:
return []
+
invoice_line.unit = self.unit
invoice_line.product = self.product
invoice_line.unit_price = self.unit_price
@@ -1311,8 +1313,11 @@ class SaleLine(ModelSQL, ModelView):
if move.id not in skip_ids:
quantity -= Uom.compute_qty(move.uom, move.quantity,
self.unit)
- if quantity <= 0.0:
+
+ quantity = Uom.round(quantity, self.unit.rounding)
+ if quantity <= 0:
return
+
if not self.sale.party.customer_location:
self.raise_user_error('customer_location_required', {
'sale': self.sale.rec_name,
diff --git a/tryton.cfg b/tryton.cfg
index d35c499..9b6f30c 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=2.8.2
+version=2.8.3
depends:
account
account_invoice
diff --git a/trytond_sale.egg-info/PKG-INFO b/trytond_sale.egg-info/PKG-INFO
index a5ed6e8..d4edaff 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: 2.8.2
+Version: 2.8.3
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 8450b33..dee3d51 100644
--- a/trytond_sale.egg-info/SOURCES.txt
+++ b/trytond_sale.egg-info/SOURCES.txt
@@ -15,10 +15,40 @@ stock.xml
tryton.cfg
./__init__.py
./configuration.py
+./configuration.xml
./invoice.py
+./party.xml
+./product.xml
+./sale.odt
./sale.py
+./sale.xml
+./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
./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/product_list_sale_line.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