[tryton-debian-vcs] tryton-modules-stock branch debian-jessie-3.0 updated. debian/3.0.1-2-6-g1c29afc

Mathias Behrle tryton-debian-vcs at alioth.debian.org
Mon May 12 16:10:43 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-stock.git;a=commitdiff;h=debian/3.0.1-2-6-g1c29afc

commit 1c29afc524ace42f7a09b87e6200566fdfb161ed
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Mon May 12 16:23:23 2014 +0200

    Releasing debian version 3.0.2-1.

diff --git a/debian/changelog b/debian/changelog
index b6e324b..595934f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+tryton-modules-stock (3.0.2-1) unstable; urgency=medium
+
+  * Removing  LC_ALL=C.UTF-8 as build environment.
+  * Setting the branch in the watch file to the fixed version 3.0.
+  * Updating signing key while using now plain .asc files instead of .pgp
+    binaries.
+  * Merging upstream version 3.0.2.
+  * Updating copyright file.
+
+ -- Mathias Behrle <mathiasb at m9s.biz>  Mon, 12 May 2014 16:23:23 +0200
+
 tryton-modules-stock (3.0.1-2) unstable; urgency=medium
 
   * Updating year in debian copyright.
commit b5e749d950bc6440e208d5ac83a149c9aa7ccd5c
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Mon May 12 16:23:19 2014 +0200

    Updating copyright file.

diff --git a/debian/copyright b/debian/copyright
index 79dc1e6..b9b85af 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,9 +2,9 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 
 Files: *
 Copyright: 2012 Openlabs Technologies & Consulting (P) LTD
-           2008-2013 Cédric Krier
+           2008-2014 Cédric Krier
            2008-2013 Bertrand Chenal
-           2008-2013 B2CK SPRL
+           2008-2014 B2CK SPRL
            2004-2008 Tiny SPRL
 License: GPL-3+
 
commit 1d7b4cfd4e0841cd369539d595f7ebd3bfe0a254
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Mon May 12 16:23:19 2014 +0200

    Merging upstream version 3.0.2.

diff --git a/CHANGELOG b/CHANGELOG
index e2c3071..0668f78 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.0.2 - 2014-05-07
+* Bug fixes (see mercurial logs for details)
+
 Version 3.0.1 - 2014-01-18
 * Bug fixes (see mercurial logs for details)
 
diff --git a/COPYRIGHT b/COPYRIGHT
index b9e8d97..06390fa 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,7 +1,7 @@
 Copyright (C) 2012 Openlabs Technologies & Consulting (P) LTD.
-Copyright (C) 2008-2013 Cédric Krier.
+Copyright (C) 2008-2014 Cédric Krier.
 Copyright (C) 2008-2013 Bertrand Chenal.
-Copyright (C) 2008-2013 B2CK SPRL.
+Copyright (C) 2008-2014 B2CK SPRL.
 Copyright (C) 2004-2008 Tiny SPRL.
 
 This program is free software: you can redistribute it and/or modify
diff --git a/PKG-INFO b/PKG-INFO
index be9e89d..76410a9 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond_stock
-Version: 3.0.1
+Version: 3.0.2
 Summary: Tryton module for stock and inventory
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/location.py b/location.py
index 2d9afdf..8724139 100644
--- a/location.py
+++ b/location.py
@@ -312,8 +312,9 @@ class Location(ModelSQL, ModelView):
                     default=default)
                 warehouse_locations = Transaction().context.get(
                     'cp_warehouse_locations') or {}
-                cp_warehouse = cls(Transaction().context['cp_warehouse_id'])
                 if location.id in warehouse_locations.values():
+                    cp_warehouse = cls(
+                        Transaction().context['cp_warehouse_id'])
                     for field, loc_id in warehouse_locations.iteritems():
                         if loc_id == location.id:
                             cls.write([cp_warehouse], {
diff --git a/product.py b/product.py
index 4ca8975..b6fe10a 100644
--- a/product.py
+++ b/product.py
@@ -454,6 +454,8 @@ class Product(object, StockMixin):
             res[key] = Uom.round(quantity, uom.rounding)
 
         if wh_to_add:
+            if product_ids is None:
+                product_ids = set((p for s, p in res))
             for wh, storage in wh_to_add.iteritems():
                 for product in product_ids:
                     if (storage, product) in res:
diff --git a/tryton.cfg b/tryton.cfg
index 651d7df..3d61757 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=3.0.1
+version=3.0.2
 depends:
     company
     currency
diff --git a/trytond_stock.egg-info/PKG-INFO b/trytond_stock.egg-info/PKG-INFO
index f2715e7..567d234 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.0.1
+Version: 3.0.2
 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