lp:~openerp-dev/openobject-server/trunk-bug-1161881-ishwar

Branch merges

Propose for merging

No branches dependent on this one.

Ready for review for merging into lp:openobject-server

OpenERP Core Team: Pending requested 2013-04-09

Diff: 25 lines (+8/-7)

1 file modified

openerp/osv/orm.py (+8/-7)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1161881: models many2many field error

Medium

Fix Committed

Link a bug report

Related blueprints

4853. By Ishwar Malvi(OpenERP) on 2013-04-09

[FIX]Custom model : adding many2many field generates error

4852. By Thibault Delavallée (OpenERP) on 2013-04-05

[MERGE] Alias Visibility and Salesteams View. Improve the display of alias in form views and in empty list help messages. Improve the use, visibility and display of salesteams.

ir_action:
- removed size on char fields
- help is now somewhat dynamic; it calls get_empty_list_help on the related model that could be overridden to display a custom message instead of the generic one defined on the action
BaseModel:
- added get_empty_list_help method, that basically returns the help that is given into parameter. Its purpose is to be overridden by models that should customize the empty list help message

4851. By Thibault Delavallée (OpenERP) on 2013-04-05

[FIX] service/model.py: fixed missing import of psycopg error OperationalError added when merging 7.0 into trunk.

4850. By Vo Minh Thu on 2013-04-04

[MERGE] forward merge 7.0 until revision 4919.

4849. By Vo Minh Thu on 2013-04-02

[FIX] loading: typo.

4848. By Vo Minh Thu on 2013-04-02

[FIX] service.db: forgot to remove the indicing when pooler.get_pool() was replaced.

4847. By Launchpad Translations on behalf of openerp on 2013-03-31

Launchpad automatic translations update.

4846. By Vo Minh Thu on 2013-03-28

[IMP] doc: added missing images.

4845. By Vo Minh Thu on 2013-03-28

[IMP] doc: actually use the images in the .rst.

4844. By Vo Minh Thu on 2013-03-28

[ADD] doc: added Form View Guidelines (authored by apr and rco).