Merge lp:~openerp-dev/openobject-addons/6.0-opw-57608-ira into lp:openobject-addons/6.0

[Ila Rana(Open ERP)]

Hello Naresh,

The proper company_id of analytic_line object is not restored in postgres. So the issue of "Timesheet: company_id not updated in analytic.account.line" is resolved now through this branch.

Thanks,
Ila Rana

[Naresh(OpenERP) (nch-openerp)]

review: Approve

[Naresh(OpenERP) (nch-openerp)]

just a note use vals.update(company_id=company[0]) its good practice to do this

[Xavier ALT (dex-phx)]

Hello Ila,

Two things that needd to be fixed:

- You're reading the "company_id" in an account.analytic.account, but the "company_id" field is not required on that object, so make sure there is one, otherwise the final "company[0]" will crash.

- You should move that code into "hr_timesheet" module, because here we're inheriting from "hr.analytic.timesheet" object, and your code don't depend on new fields introduce by "hr_timesheet_sheet" module.

Regards,
Xavier

review: Needs Fixing

Unmerged revisions

5059. By Ila Rana(Open ERP) on 2012-02-16

[FIX]Timesheet: company_id not updated in analytic.account.line in postgres(57608)

=== modified file 'hr_timesheet_sheet/hr_timesheet_sheet.py'
--- hr_timesheet_sheet/hr_timesheet_sheet.py	2011-11-23 09:52:46 +0000
+++ hr_timesheet_sheet/hr_timesheet_sheet.py	2012-02-16 07:21:18 +0000
@@ -478,6 +478,8 @@
             ts = self.pool.get('hr_timesheet_sheet.sheet').browse(cr, uid, vals['sheet_id'])
             if not ts.state in ('draft', 'new'):
                 raise osv.except_osv(_('Error !'), _('You can not modify an entry in a confirmed timesheet !'))
+        company = self.pool.get('account.analytic.account').read(cr, uid, [vals['account_id']], ['company_id'])[0]['company_id']
+        vals.update({'company_id': company[0]})
         return super(hr_timesheet_line,self).create(cr, uid, vals, *args, **kwargs)
 
     def unlink(self, cr, uid, ids, *args, **kwargs):