[tryton-debian-vcs] tryton-modules-stock branch debian-wheezy-2.6 updated. debian/2.6.4-1-3-g72e325d
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Wed Dec 11 18:48:47 UTC 2013
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-stock.git;a=commitdiff;h=debian/2.6.4-1-3-g72e325d
commit 72e325d73e2d0f467000108682ee0d74317c427a
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Dec 11 19:47:14 2013 +0100
Releasing debian version 2.6.5-1.
diff --git a/debian/changelog b/debian/changelog
index fc1cb0b..448e813 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+tryton-modules-stock (2.6.5-1) unstable; urgency=low
+
+ * Removing inadvertently commited .pc directory.
+ * Merging upstream version 2.6.5.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Wed, 11 Dec 2013 19:30:09 +0100
+
tryton-modules-stock (2.6.4-1) unstable; urgency=low
* Merging upstream version 2.6.4.
commit 9fec09ad83cc8d2fdfab4f18a252b5269b2b9e83
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Dec 11 19:22:46 2013 +0100
Merging upstream version 2.6.5.
diff --git a/CHANGELOG b/CHANGELOG
index 2a0a47b..2a1ef87 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.6.5 - 2013-12-04
+* Bug fixes (see mercurial logs for details)
+
Version 2.6.4 - 2013-07-22
* Bug fixes (see mercurial logs for details)
diff --git a/PKG-INFO b/PKG-INFO
index c6ffbe8..1a92d08 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond_stock
-Version: 2.6.4
+Version: 2.6.5
Summary: Tryton module for stock and inventory
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/move.py b/move.py
index 4d85f78..d238a44 100644
--- a/move.py
+++ b/move.py
@@ -308,7 +308,7 @@ class Move(ModelSQL, ModelView):
@classmethod
def search_rec_name(cls, name, clause):
- return [('product',) + clause[1:]]
+ return [('product',) + tuple(clause[1:])]
@classmethod
def _update_product_cost_price(cls, product_id, quantity, uom, unit_price,
diff --git a/shipment.py b/shipment.py
index 52e63e1..f2c5b1a 100644
--- a/shipment.py
+++ b/shipment.py
@@ -2171,8 +2171,8 @@ class PickingList(CompanyReport):
from_location_ids.add(move.from_location.id)
to_location_ids.add(move.to_location.id)
- from_locations = Location.search(list(from_location_ids))
- to_locations = Location.search(list(to_location_ids))
+ from_locations = Location.browse(list(from_location_ids))
+ to_locations = Location.browse(list(to_location_ids))
return {
'from_location_ids': [l.id for l in from_locations],
@@ -2218,8 +2218,8 @@ class SupplierRestockingList(CompanyReport):
from_location_ids.add(move.from_location.id)
to_location_ids.add(move.to_location.id)
- from_locations = Location.search(list(from_location_ids))
- to_locations = Location.search(list(to_location_ids))
+ from_locations = Location.browse(list(from_location_ids))
+ to_locations = Location.browse(list(to_location_ids))
return {
'from_location_ids': [l.id for l in from_locations],
@@ -2265,8 +2265,8 @@ class CustomerReturnRestockingList(CompanyReport):
from_location_ids.add(move.from_location.id)
to_location_ids.add(move.to_location.id)
- from_locations = Location.search(list(from_location_ids))
- to_locations = Location.search(list(to_location_ids))
+ from_locations = Location.browse(list(from_location_ids))
+ to_locations = Location.browse(list(to_location_ids))
return {
'from_location_ids': [l.id for l in from_locations],
@@ -2312,8 +2312,8 @@ class InteralShipmentReport(CompanyReport):
from_location_ids.add(move.from_location.id)
to_location_ids.add(move.to_location.id)
- from_locations = Location.search(list(from_location_ids))
- to_locations = Location.search(list(to_location_ids))
+ from_locations = Location.browse(list(from_location_ids))
+ to_locations = Location.browse(list(to_location_ids))
return {
'from_location_ids': [l.id for l in from_locations],
diff --git a/tryton.cfg b/tryton.cfg
index fb925e2..bc150ab 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=2.6.4
+version=2.6.5
depends:
company
currency
diff --git a/trytond_stock.egg-info/PKG-INFO b/trytond_stock.egg-info/PKG-INFO
index 8011b5b..b65be59 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: 2.6.4
+Version: 2.6.5
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