lp:~openerp-dev/openobject-server/6.0-opw-16988-rha

Branch merges

Propose for merging

No branches dependent on this one.

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

Rifakat Husen (OpenERP) (community): Needs Resubmitting on 2012-03-09

Jean-Christophe VASSORT (community): Needs Fixing on 2012-03-07

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

Diff: 37 lines (+22/-3)

1 file modified

bin/osv/orm.py (+22/-3)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

3603. By Rifakat Husen (OpenERP) on 2012-03-09

[Fix]: chcking if ids is integer

3602. By Xavier ALT on 2012-03-07

[RELEASE] OpenERP 6.0.4

3601. By Xavier ALT on 2012-03-07

[MERGE] publisher warranty stats

3600. By Jean-Christophe VASSORT on 2012-03-07

[REVERT] previous commit cause failure in runbot

3599. By Jean-Christophe VASSORT on 2012-03-07

[MERGE] OPW 16988 function fields with multi does not work on osv_memory

3598. By Jean-Christophe VASSORT on 2012-03-07

[MERGE] OPW 441976 Problem with the read method in base/res_currency

When an Integer 'ids' is supplied as parameter of read() method, a
traceback is caused because a dict will be return by the execution
of next statement(when passed 'ids' as integer) that is
'res=super(osv.osv, self).read(cr, user, ids, fields, context, load)'
whereas a list of dict is expected to execute the code within next
looping statement.

3597. By Launchpad Translations on behalf of openerp on 2012-03-07

Launchpad automatic translations update.

3596. By Xavier ALT on 2012-02-29

[MERGE] OPW 56037: make sure res.log context is not bigger than field size (250 chars)

3595. By Xavier ALT on 2012-02-29

[REVERT] r3591: causing problem to install some modules

3594. By Xavier ALT on 2012-02-28

[REVERT] r3583: revert back res.log context field to fields.char(size=255)