[tryton-debian-vcs] tryton-modules-stock branch debian-stretch-3.6 updated. debian/3.6.0-1-6-g019c703

Mathias Behrle tryton-debian-vcs at alioth.debian.org
Wed Dec 23 16:54:49 UTC 2015


The following commit has been merged in the debian-stretch-3.6 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-stock.git;a=commitdiff;h=debian/3.6.0-1-6-g019c703

commit 019c703fc27e52e80f2d934c2da38d263236aa1f
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Wed Dec 23 14:42:33 2015 +0100

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

diff --git a/debian/changelog b/debian/changelog
index 18cfb66..1a54eaa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+tryton-modules-stock (3.6.1-1) unstable; urgency=medium
+
+  * Updating year of debian copyright.
+  * Adapting section naming in gbp.conf to current git-buildpackage.
+  * Improving description why we can not run the module test suites.
+  * Setting the branch in the watch file to the fixed version 3.6.
+  * Merging upstream version 3.6.1.
+
+ -- Mathias Behrle <mathiasb at m9s.biz>  Wed, 23 Dec 2015 14:42:33 +0100
+
 tryton-modules-stock (3.6.0-1) unstable; urgency=medium
 
   * Wrapping and sorting control files (wrap-and-sort -bts).
commit 76cf538adf62d8817726aa3b08026a2b021d85a3
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Wed Dec 23 14:42:32 2015 +0100

    Merging upstream version 3.6.1.

diff --git a/CHANGELOG b/CHANGELOG
index cb35add..94372f7 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.6.1 - 2015-12-22
+* Bug fixes (see mercurial logs for details)
+
 Version 3.6.0 - 2015-04-20
 * Bug fixes (see mercurial logs for details)
 * Add support for PyPy
diff --git a/PKG-INFO b/PKG-INFO
index 3c871f4..2b87a96 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond_stock
-Version: 3.6.0
+Version: 3.6.1
 Summary: Tryton module for stock and inventory
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/move.py b/move.py
index d82aa52..24b3f6f 100644
--- a/move.py
+++ b/move.py
@@ -547,7 +547,7 @@ class Move(Workflow, ModelSQL, ModelView):
             product_qty = product.quantity
         else:
             product_qty = product.template.quantity
-        product_qty = Decimal(str(product_qty))
+        product_qty = Decimal(str(max(product_qty, 0)))
         # convert wrt currency
         with Transaction().set_context(date=self.effective_date):
             unit_price = Currency.compute(self.currency, self.unit_price,
@@ -628,7 +628,7 @@ class Move(Workflow, ModelSQL, ModelView):
                 and self.from_location.type == 'storage'
                 and self.product.cost_price_method == 'average'):
             self._update_product_cost_price('out')
-        if not self.cost_price:
+        if self.cost_price is None:
             self.cost_price = self.product.cost_price
 
     @classmethod
diff --git a/shipment.py b/shipment.py
index b0fc56c..cd1dedf 100644
--- a/shipment.py
+++ b/shipment.py
@@ -449,7 +449,8 @@ class ShipmentIn(Workflow, ModelSQL, ModelView):
     @Workflow.transition('draft')
     def draft(cls, shipments):
         Move = Pool().get('stock.move')
-        Move.draft([m for s in shipments for m in s.incoming_moves])
+        Move.draft([m for s in shipments for m in s.incoming_moves
+                if m.state != 'staging'])
         Move.delete([m for s in shipments for m in s.inventory_moves
                 if m.state in ('draft', 'cancel')])
 
@@ -694,7 +695,8 @@ class ShipmentInReturn(Workflow, ModelSQL, ModelView):
     @Workflow.transition('draft')
     def draft(cls, shipments):
         Move = Pool().get('stock.move')
-        Move.draft([m for s in shipments for m in s.moves])
+        Move.draft([m for s in shipments for m in s.moves
+                if m.state != 'staging'])
 
     @classmethod
     @ModelView.button
@@ -1041,7 +1043,8 @@ class ShipmentOut(Workflow, ModelSQL, ModelView):
     def draft(cls, shipments):
         Move = Pool().get('stock.move')
         Move.draft([m for s in shipments
-                for m in s.inventory_moves + s.outgoing_moves])
+                for m in s.inventory_moves + s.outgoing_moves
+                if m.state != 'staging'])
 
     @classmethod
     @ModelView.button
@@ -1626,7 +1629,8 @@ class ShipmentOutReturn(Workflow, ModelSQL, ModelView):
     @Workflow.transition('draft')
     def draft(cls, shipments):
         Move = Pool().get('stock.move')
-        Move.draft([m for s in shipments for m in s.incoming_moves])
+        Move.draft([m for s in shipments for m in s.incoming_moves
+                if m.state != 'staging'])
         Move.delete([m for s in shipments for m in s.inventory_moves
                 if m.state in ('draft', 'cancel')])
 
@@ -1946,7 +1950,8 @@ class ShipmentInternal(Workflow, ModelSQL, ModelView):
     def wait(cls, shipments):
         Move = Pool().get('stock.move')
         # First reset state to draft to allow update from and to location
-        Move.draft([m for s in shipments for m in s.moves])
+        Move.draft([m for s in shipments for m in s.moves
+                if m.state != 'staging'])
         for shipment in shipments:
             Move.write([m for m in shipment.moves
                     if m.state != 'done'], {
diff --git a/tryton.cfg b/tryton.cfg
index 9df5be0..5745e8a 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=3.6.0
+version=3.6.1
 depends:
     company
     currency
diff --git a/trytond_stock.egg-info/PKG-INFO b/trytond_stock.egg-info/PKG-INFO
index 34f1843..100d178 100644
--- a/trytond_stock.egg-info/PKG-INFO
+++ b/trytond_stock.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond-stock
-Version: 3.6.0
+Version: 3.6.1
 Summary: Tryton module for stock and inventory
 Home-page: http://www.tryton.org/
 Author: Tryton
-- 
tryton-modules-stock



More information about the tryton-debian-vcs mailing list