[tryton-debian-vcs] tryton-modules-purchase branch debian-wheezy-2.6 updated. debian/2.6.5-1-2-g4b09260
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Wed Nov 12 13:53:55 UTC 2014
The following commit has been merged in the debian-wheezy-2.6 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-purchase.git;a=commitdiff;h=debian/2.6.5-1-2-g4b09260
commit 4b092607147c4fe8ebf4b666646a669cb3fcdf72
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Nov 12 13:31:00 2014 +0100
Releasing debian version 2.6.6-1.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/debian/changelog b/debian/changelog
index eec09e1..b1c70c4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+tryton-modules-purchase (2.6.6-1) unstable; urgency=medium
+
+ * Merging upstream version 2.6.6.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Wed, 12 Nov 2014 13:31:00 +0100
+
tryton-modules-purchase (2.6.5-1) unstable; urgency=medium
* Merging upstream version 2.6.5.
commit c26777f6b86319fffa83b0743f513684848b8976
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Nov 12 13:31:00 2014 +0100
Merging upstream version 2.6.6.
diff --git a/CHANGELOG b/CHANGELOG
index 54a899f..17962b3 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.6.6 - 2014-11-06
+* Bug fixes (see mercurial logs for details)
+
Version 2.6.5 - 2014-05-07
* Bug fixes (see mercurial logs for details)
diff --git a/PKG-INFO b/PKG-INFO
index 3821be4..2318993 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond_purchase
-Version: 2.6.5
+Version: 2.6.6
Summary: Tryton module for purchase
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/purchase.py b/purchase.py
index 500627c..2da9c34 100644
--- a/purchase.py
+++ b/purchase.py
@@ -1152,10 +1152,12 @@ class PurchaseLine(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
+ 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
@@ -1205,8 +1207,11 @@ class PurchaseLine(ModelSQL, ModelView):
if move not in skip:
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.purchase.party.supplier_location:
self.raise_user_error('supplier_location_required')
with Transaction().set_user(0, set_context=True):
diff --git a/tryton.cfg b/tryton.cfg
index b9a2ac1..d67e035 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=2.6.5
+version=2.6.6
depends:
account
account_invoice
diff --git a/trytond_purchase.egg-info/PKG-INFO b/trytond_purchase.egg-info/PKG-INFO
index ca9af6a..1887d09 100644
--- a/trytond_purchase.egg-info/PKG-INFO
+++ b/trytond_purchase.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond-purchase
-Version: 2.6.5
+Version: 2.6.6
Summary: Tryton module for purchase
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/trytond_purchase.egg-info/SOURCES.txt b/trytond_purchase.egg-info/SOURCES.txt
index e132d9d..15d6351 100644
--- a/trytond_purchase.egg-info/SOURCES.txt
+++ b/trytond_purchase.egg-info/SOURCES.txt
@@ -15,10 +15,28 @@ stock.xml
tryton.cfg
./__init__.py
./configuration.py
+./configuration.xml
./invoice.py
+./party.xml
+./product.xml
+./purchase.odt
./purchase.py
+./purchase.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
./tests/__init__.py
+./tests/scenario_purchase.rst
./tests/test_purchase.py
doc/index.rst
locale/bg_BG.po
--
tryton-modules-purchase
More information about the tryton-debian-vcs
mailing list