[tryton-debian-vcs] tryton-modules-sale branch upstream-3.0 updated. upstream/3.0.1-1-g216b2de
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-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.1-1-g216b2de
commit 216b2de84a88ec1d964bfe00e4f0c9e082cef60c
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Nov 12 13:10:43 2014 +0100
Adding upstream version 3.0.2.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/CHANGELOG b/CHANGELOG
index f76d159..42098e8 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.0.2 - 2014-11-06
+* Bug fixes (see mercurial logs for details)
+
Version 3.0.1 - 2014-09-29
* Bug fixes (see mercurial logs for details)
diff --git a/PKG-INFO b/PKG-INFO
index f8cb006..e64ae01 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond_sale
-Version: 3.0.1
+Version: 3.0.2
Summary: Tryton module for sale
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/sale.py b/sale.py
index 0b69d8b..ac272bf 100644
--- a/sale.py
+++ b/sale.py
@@ -1301,10 +1301,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
@@ -1370,8 +1372,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 62bd6ec..1313d5c 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=3.0.1
+version=3.0.2
depends:
account
account_invoice
diff --git a/trytond_sale.egg-info/PKG-INFO b/trytond_sale.egg-info/PKG-INFO
index c983db6..3460439 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.1
+Version: 3.0.2
Summary: Tryton module for sale
Home-page: http://www.tryton.org/
Author: Tryton
--
tryton-modules-sale
More information about the tryton-debian-vcs
mailing list