[tryton-debian-vcs] tryton-modules-purchase branch debian-jessie-3.0 updated. debian/3.0.1-1-3-g482f9c5

Mathias Behrle tryton-debian-vcs at alioth.debian.org
Wed Nov 12 13:53:45 UTC 2014


The following commit has been merged in the debian-jessie-3.0 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-purchase.git;a=commitdiff;h=debian/3.0.1-1-3-g482f9c5

commit 482f9c5cc33ddc5a87d30ed0bddb65100d55304e
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Wed Nov 12 13:03:57 2014 +0100

    Releasing debian version 3.0.2-1.
    
    Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>

diff --git a/debian/changelog b/debian/changelog
index 58c60dd..80c487a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+tryton-modules-purchase (3.0.2-1) unstable; urgency=medium
+
+  * Adding actual upstream signing key.
+  * Merging upstream version 3.0.2.
+
+ -- Mathias Behrle <mathiasb at m9s.biz>  Wed, 12 Nov 2014 13:03:57 +0100
+
 tryton-modules-purchase (3.0.1-1) unstable; urgency=medium
 
   * Removing  LC_ALL=C.UTF-8 as build environment.
commit fe4e2c5050e58284060a55a2b628137a6b1afbf1
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Wed Nov 12 13:03:56 2014 +0100

    Merging upstream version 3.0.2.

diff --git a/CHANGELOG b/CHANGELOG
index 6939fa8..2761adb 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-05-06
 * Bug fixes (see mercurial logs for details)
 
diff --git a/PKG-INFO b/PKG-INFO
index dcc694d..c895e9e 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond_purchase
-Version: 3.0.1
+Version: 3.0.2
 Summary: Tryton module for purchase
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/purchase.py b/purchase.py
index b300edd..8753c11 100644
--- a/purchase.py
+++ b/purchase.py
@@ -1191,10 +1191,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
@@ -1248,8 +1250,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 be3e59c..5c61a6d 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_purchase.egg-info/PKG-INFO b/trytond_purchase.egg-info/PKG-INFO
index 1cba535..08a82b9 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.0.1
+Version: 3.0.2
 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..82cbcc0 100644
--- a/trytond_purchase.egg-info/SOURCES.txt
+++ b/trytond_purchase.egg-info/SOURCES.txt
@@ -15,12 +15,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