lp:~openerp-dev/openobject-server/trunk-bug-795444-xrg

Branch merges

Propose for merging

No branches dependent on this one.

On hold for merging into lp:openobject-server

OpenERP Core Team: Pending requested 2011-06-10

Diff: 225 lines (+48/-22)

5 files modified

openerp/addons/base/ir/ir_values.py (+3/-1)
openerp/addons/base/res/res_lang.py (+1/-1)
openerp/modules/loading.py (+3/-3)
openerp/tools/convert.py (+39/-15)
openerp/tools/yaml_import.py (+2/-2)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #795444: res.lang, ir.values: don't use ir.values as defaults when creating

Undecided

Fix Committed

Link a bug report

Related blueprints

3455. By OpenERP buildbot on 2011-06-10

addons/init: pass context to tools.convert_*

3454. By OpenERP buildbot on 2011-06-10

tools/convert,yaml_import: have context passed from caller

In the context, we will be able to distinguish if we are being called
in the module loading sequence or not

3453. By OpenERP buildbot on 2011-06-10

res.lang, ir.values: don't use ir.values as defaults when creating
(cherry picked from commit 7e419058ea3391e8b2e2bb45f8054dfb8af88e7b)

3452. By Vo Minh Thu on 2011-06-09

[ADD] openerp/netsvc: use cgitb to format the exception sent to the client, code/idea by chs.

3451. By Vo Minh Thu on 2011-06-08

[MERGE] res/partner/crm: removed unused code.

3450. By Vo Minh Thu on 2011-06-08

[MERGE] ir_translation: lang field selection only displays installed languages.

3449. By Launchpad Translations on behalf of openerp on 2011-06-07

Launchpad automatic translations update.

3448. By Vo Minh Thu on 2011-06-06

[MERGE] use drawCentredString instead of drawString for report header.

3447. By Vo Minh Thu on 2011-06-06

[MERGE] res_widget: remove res.widget.user entries when user deleted.

3446. By Vo Minh Thu on 2011-06-06

[MERGE] "%s" % a + b should be "%s" % (a + b).