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

Branch merges

Propose for merging

No branches dependent on this one.

Approved for merging into lp:openobject-addons/6.0

Xavier ALT (community): Needs Fixing on 2012-04-03

Naresh(OpenERP) (community): Approve on 2012-03-26

Diff: 12 lines (+2/-0)

1 file modified

hr_timesheet_sheet/hr_timesheet_sheet.py (+2/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

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

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

5058. By Launchpad Translations on behalf of openerp on 2012-02-16

Launchpad automatic translations update.

5057. By Launchpad Translations on behalf of openerp on 2012-02-15

Launchpad automatic translations update.

5056. By Olivier Laurent (Open ERP) on 2012-02-14

[FIX] fix needed for opw 51206. Is linked to a server fix for csv import

5055. By Launchpad Translations on behalf of openerp on 2012-02-14

Launchpad automatic translations update.

5054. By nel on 2012-02-13

[MERGE]

5053. By nel on 2012-02-13

[MERGE]

5052. By tfr (Openerp) on 2012-02-13

[FIX] mess up relation filled in picking wizard + solve key error 'wizard_pick_id', this error is due to the implementation of the read for one2many field in osv_memory, if a field in osv_memory is never written, the key is not present in the dict (representation of osv_memory) then we get the error key Error,
the workarount is defining default value for missing key (fields) in the osv_memory during the read, the correct fix should be done in the orm

5051. By tfr (Openerp) on 2012-02-13

[REVERT] 5050

5050. By tfr (Openerp) on 2012-02-13

[FIX] OPW 17161 : don't use the same relational field for two different osv_memory, avoid to mess up 'foreign key'