Rucha (Open ERP) has proposed merging
lp:~openerp-dev/openobject-server/trunk-configuration-rework-imp1-rpa into
lp:~openerp-dev/openobject-server/trunk-configuration-rework.
Requested reviews:
qdp (OpenERP) (qdp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-server/trunk-configuration-rework-imp1-rpa/+merge/66599
--
https://code.launchpad.net/~openerp-dev/openobject-server/trunk-configuration-rework-imp1-rpa/+merge/66599
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-server/trunk-configuration-rework.
=== modified file 'openerp/addons/base/res/res_company.py'
--- openerp/addons/base/res/res_company.py 2011-06-30 13:18:18 +0000
+++ openerp/addons/base/res/res_company.py 2011-07-01 13:21:05 +0000
@@ -81,13 +81,13 @@
def _get_address_data(self, cr, uid, ids, name, arg, context=None):
result = {}
+ part_obj = self.pool.get('res.partner')
+ address_obj = self.pool.get('res.partner.address')
for company in self.browse(cr, uid, ids, context=context):
result[company.id] = {}
for field in name:
result[company.id][field] = False
if company.partner_id:
- part_obj = self.pool.get('res.partner')
- address_obj = self.pool.get('res.partner.address')
address_data = part_obj.address_get(cr, uid, [company.partner_id.id], adr_pref=['default'])
if address_data['default']:
address = address_obj.read(cr, uid, address_data['default'], [], context=context)
=== modified file 'openerp/addons/base/res/res_config.py'
--- openerp/addons/base/res/res_config.py 2011-06-30 13:18:18 +0000
+++ openerp/addons/base/res/res_config.py 2011-07-01 13:21:05 +0000
@@ -44,10 +44,9 @@
'''Return a description the current progress of configuration:
a tuple of (non_open_todos:int, total_todos: int)
'''
- return (self.pool.get('ir.actions.todo')\
- .search_count(cr, uid, [('state','<>','open')], context),
- self.pool.get('ir.actions.todo')\
- .search_count(cr, uid, [], context))
+ todo_pool = self.pool.get('ir.actions.todo')
+ return (todo_pool.search_count(cr, uid, [('state','<>','open')], context),
+ todo_pool.search_count(cr, uid, [], context))
def _progress(self, cr, uid, context=None):
closed, total = self.get_current_progress(cr, uid, context=context)
@@ -116,8 +115,9 @@
return self.pool.get(current_user_menu.type).read(cr, uid, current_user_menu.id)
def start(self, cr, uid, ids, context=None):
- ids2 = self.pool.get('ir.actions.todo').search(cr, uid, [], context=context)
- for todo in self.pool.get('ir.actions.todo').browse(cr, uid, ids2, context=context):
+ todo_pool = self.pool.get('ir.actions.todo')
+ ids2 = todo_pool.search(cr, uid, [], context=context)
+ for todo in todo_pool.browse(cr, uid, ids2, context=context):
if (todo.type=='normal_recurring'):
todo.write({'state':'open'})
return self.next(cr, uid, ids, context)
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
