From bb586419ae2942a6c9201a565de498e23dcb9dee Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Sat, 17 Jan 2009 23:16:45 +0100 Subject: [PATCH] modifs bzr revid: fp@tinyerp.com-20090117221645-8wth23u22h7rlo42 --- addons/account/account.py | 1 + addons/hr/hr.py | 2 +- addons/project/__terp__.py | 4 +++- addons/stock/stock.py | 2 +- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/addons/account/account.py b/addons/account/account.py index a841a299a67..e1f9d699815 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -130,6 +130,7 @@ class account_account(osv.osv): _name = "account.account" _description = "Account" _parent_store = True + _parent_order = 'length(code),code' def search(self, cr, uid, args, offset=0, limit=None, order=None, context=None, count=False): diff --git a/addons/hr/hr.py b/addons/hr/hr.py index eac83acf41a..3a159cbe34a 100644 --- a/addons/hr/hr.py +++ b/addons/hr/hr.py @@ -118,7 +118,7 @@ class hr_employee(osv.osv): 'user_id' : fields.many2one('res.users', 'Related User'), 'country_id' : fields.many2one('res.country', 'Nationality'), - 'birthday' : fields.date("Started on"), + 'birthday' : fields.date("Birthday"), 'ssnid': fields.char('SSN No', size=32), 'sinid': fields.char('SIN No', size=32), 'otherid': fields.char('Other ID', size=32), diff --git a/addons/project/__terp__.py b/addons/project/__terp__.py index 4d74b9f5e38..01059dc193e 100644 --- a/addons/project/__terp__.py +++ b/addons/project/__terp__.py @@ -28,7 +28,9 @@ "website" : "http://www.openerp.com", "category" : "Generic Modules/Projects & Services", "depends" : ["product", "account", "hr", "process"], - "description": "Project management module that track multi-level projects, tasks, works done on tasks, eso. It is able to render planning, order tasks, eso.", + "description": """Project management module that track multi-level projects, tasks, +works done on tasks, eso. It is able to render planning, order tasks, eso. + """, "init_xml" : [], "demo_xml" : ["project_demo.xml"], "update_xml": [ diff --git a/addons/stock/stock.py b/addons/stock/stock.py index e5b66648a26..ef02de53573 100644 --- a/addons/stock/stock.py +++ b/addons/stock/stock.py @@ -54,7 +54,7 @@ class stock_location(osv.osv): _description = "Location" _parent_name = "location_id" _parent_store = True - _parent_order = 'name' + _parent_order = 'id' _order = 'parent_left' def _complete_name(self, cr, uid, ids, name, args, context):