lp:~openerp-dev/openobject-server/6.0-opw-18390-rgo

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:openobject-server/6.0 at revision 3589

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

Olivier Laurent (Open ERP): Pending requested 2011-10-25

nel: Pending requested 2011-10-25

Diff: 41 lines (+8/-11)

1 file modified

bin/osv/orm.py (+8/-11)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #878104: Cannot overwrite stored function field with non-stored field

Undecided

Fix Committed

Link a bug report

Related blueprints

3528. By Ravi Gohil (OpenERP) on 2011-10-25

[FIX] orm : cannot create/modify record having fields.function field being overridden with non-functional field : (Maintenance Case : 18390)

3527. By Olivier Dony (Odoo) on 2011-10-24

[FIX] res.currency data: a few missing currencies: XOF,XAF,UGX,HNL,CLP

3526. By Launchpad Translations on behalf of openerp on 2011-10-21

Launchpad automatic translations update.

3525. By Vo Minh Thu on 2011-10-20

[MERGE] fields.many2many: delete instead of update on operation 5 (opw 818189).

3524. By Vo Minh Thu on 2011-10-19

[MERGE] res_partner.lang field size bumped to 32.
This is needed for instance to accomodate Serbian(Latin).
The size will be used for newly created database as osv.orm does not
handle bumping the size of a selection field on update.

3523. By Launchpad Translations on behalf of openerp on 2011-10-14

Launchpad automatic translations update.

3522. By Raphael Collet (OpenERP) on 2011-10-13

[FIX] revert change 3509, as it introduces a regression

3521. By Raphael Collet (OpenERP) on 2011-10-12

[MERGE] opw 17993

3520. By Raphael Collet (OpenERP) on 2011-10-12

[MERGE] opw 18120

3519. By Launchpad Translations on behalf of openerp on 2011-10-12

Launchpad automatic translations update.