From a94a27fbb3b848d876626f5ed6cfad5177addc52 Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Fri, 29 Apr 2011 17:38:28 +0530
Subject: [PATCH 1/5] [FIX]stock:locations cannot be sorted and put parent
location field in search view
lp bug: https://launchpad.net/bugs/765559 fixed
bzr revid: ron@tinyerp.com-20110429120828-j33844o6a9qd7ien
---
addons/stock/stock.py | 2 +-
addons/stock/stock_view.xml | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index d6cef8bc458..633a74923ec 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -164,7 +164,7 @@ class stock_location(osv.osv):
\n* Production: Virtual counterpart location for production operations: this location consumes the raw material and produces finished products
""", select = True),
# temporarily removed, as it's unused: 'allocation_method': fields.selection([('fifo', 'FIFO'), ('lifo', 'LIFO'), ('nearest', 'Nearest')], 'Allocation Method', required=True),
- 'complete_name': fields.function(_complete_name, method=True, type='char', size=100, string="Location Name"),
+ 'complete_name': fields.function(_complete_name, method=True, type='char', size=100, string="Location Name", store=True),
'stock_real': fields.function(_product_value, method=True, type='float', string='Real Stock', multi="stock"),
'stock_virtual': fields.function(_product_value, method=True, type='float', string='Virtual Stock', multi="stock"),
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index a22ece14fc5..3eb93cd6618 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -559,6 +559,7 @@
string="Supplier" domain="[('usage', '=', 'supplier')]" help="Supplier Locations" />
+
From d337219345fe7dd261d666095d6169ff1368ed04 Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Mon, 2 May 2011 15:44:38 +0530
Subject: [PATCH 2/5] [IMP]stock:order by location complete name
bzr revid: ron@tinyerp.com-20110502101438-g7kw8njfe1yaje4a
---
addons/stock/stock.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 633a74923ec..d8042a3d5b1 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -71,7 +71,7 @@ class stock_location(osv.osv):
_parent_name = "location_id"
_parent_store = True
_parent_order = 'posz,name'
- _order = 'parent_left'
+ _order = 'complete_name'
def name_get(self, cr, uid, ids, context=None):
res = []
From af26a3ad713877b69af7db686ad98c652734b9fa Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Mon, 6 Jun 2011 11:39:42 +0530
Subject: [PATCH 3/5] [IMP]stock:Location sorting have also order by
parent_left
bzr revid: ron@tinyerp.com-20110606060942-g9g5139qcbh7p9tw
---
addons/stock/stock.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index d8042a3d5b1..7d8cb61393c 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -71,7 +71,7 @@ class stock_location(osv.osv):
_parent_name = "location_id"
_parent_store = True
_parent_order = 'posz,name'
- _order = 'complete_name'
+ _order = 'complete_name, parent_left'
def name_get(self, cr, uid, ids, context=None):
res = []
From 85b4ebb0fac0ea462abd53c586229aa5a914eeee Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Mon, 6 Jun 2011 14:38:25 +0530
Subject: [PATCH 4/5] [IMP]stock:Improved in search by parent_location in
custom search view
bzr revid: ron@tinyerp.com-20110606090825-u04osi1cak7agyu4
---
addons/stock/stock_view.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 3eb93cd6618..49260893f62 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -559,7 +559,7 @@
string="Supplier" domain="[('usage', '=', 'supplier')]" help="Supplier Locations" />
-
+
From f89d86dc58325bcd3f26f57c7248fc536d51f6d4 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)"
Date: Thu, 15 Sep 2011 16:44:53 +0200
Subject: [PATCH 5/5] [REV] reverted the order of stock_location to parent_left
only
bzr revid: qdp-launchpad@openerp.com-20110915144453-hakyl9rkhh8u5rxq
---
addons/stock/stock.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 7d8cb61393c..633a74923ec 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -71,7 +71,7 @@ class stock_location(osv.osv):
_parent_name = "location_id"
_parent_store = True
_parent_order = 'posz,name'
- _order = 'complete_name, parent_left'
+ _order = 'parent_left'
def name_get(self, cr, uid, ids, context=None):
res = []