[tryton-debian-vcs] tryton-modules-purchase branch upstream-3.2 updated. upstream/3.2.0-1-g88fdd49
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Wed Nov 12 13:53:57 UTC 2014
The following commit has been merged in the upstream-3.2 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-purchase.git;a=commitdiff;h=upstream/3.2.0-1-g88fdd49
commit 88fdd4929562a91fbf9770aa352714a52577970c
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Nov 12 13:04:52 2014 +0100
Adding upstream version 3.2.1.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/CHANGELOG b/CHANGELOG
index 47d1e58..2a4e5ed 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.2.1 - 2014-11-06
+* 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 f525b62..0a8597d 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond_purchase
-Version: 3.2.0
+Version: 3.2.1
Summary: Tryton module for purchase
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/TODO b/TODO
deleted file mode 100644
index c720b5a..0000000
--- a/TODO
+++ /dev/null
@@ -1,3 +0,0 @@
-- Add historization of quotation
-- Allow to customize purchase.product_supplier to handle delivery_time depending of quantity
-- Cancel draft moves and draft invoices when canceling purchase order
diff --git a/purchase.py b/purchase.py
index 4766924..0c9ddd2 100644
--- a/purchase.py
+++ b/purchase.py
@@ -1216,10 +1216,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
@@ -1273,8 +1275,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', {
'purchase': self.purchase.rec_name,
diff --git a/tryton.cfg b/tryton.cfg
index 1b20ea5..28a0972 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_purchase.egg-info/PKG-INFO b/trytond_purchase.egg-info/PKG-INFO
index 41f7726..06ee2ee 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: 3.2.0
+Version: 3.2.1
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 67ef9c3..180e9ed 100644
--- a/trytond_purchase.egg-info/SOURCES.txt
+++ b/trytond_purchase.egg-info/SOURCES.txt
@@ -4,7 +4,6 @@ INSTALL
LICENSE
MANIFEST.in
README
-TODO
configuration.xml
party.xml
product.xml
@@ -15,12 +14,49 @@ stock.xml
tryton.cfg
./__init__.py
./configuration.py
+./configuration.xml
./invoice.py
+./party.xml
./product.py
+./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
+./locale/sl_SI.po
./tests/__init__.py
+./tests/scenario_purchase.rst
./tests/test_purchase.py
+./view/configuration_form.xml
+./view/handle_invoice_exception_ask_form.xml
+./view/handle_shipment_exception_ask_form.xml
+./view/move_form.xml
+./view/move_list_shipment.xml
+./view/product_list_purchase_line.xml
+./view/product_supplier_form.xml
+./view/product_supplier_price_form.xml
+./view/product_supplier_price_tree.xml
+./view/product_supplier_tree.xml
+./view/product_supplier_tree_sequence.xml
+./view/purchase_form.xml
+./view/purchase_line_form.xml
+./view/purchase_line_tree.xml
+./view/purchase_line_tree_sequence.xml
+./view/purchase_tree.xml
+./view/template_form.xml
+./view/template_tree.xml
doc/index.rst
locale/bg_BG.po
locale/ca_ES.po
--
tryton-modules-purchase
More information about the tryton-debian-vcs
mailing list