lp:~openerp-dev/openobject-server/trunk-dev-framework

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:openobject-server at revision 3029

Olivier Dony (Odoo): Needs Fixing on 2010-11-03

Diff: 213 lines (+58/-15)

9 files modified

bin/addons/__init__.py (+2/-2)
bin/addons/base/i18n/base.pot (+50/-0)
bin/addons/base/ir/ir_actions.py (+2/-3)
bin/addons/base/ir/ir_model.py (+1/-1)
bin/addons/base/module/wizard/base_module_upgrade.py (+1/-1)
bin/addons/base/res/partner/partner.py (+0/-1)
bin/addons/base/res/res_user.py (+1/-1)
bin/report/printscreen/ps_list.py (+0/-1)
bin/report/report_sxw.py (+1/-5)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #510834: Print Engine is broken Converting to other type that is not PDF or HTML	Wishlist	Invalid
Bug #660494: Alert messages no translated in 6.0	Low	Fix Released

Link a bug report

Related blueprints

2264. By Naresh(OpenERP) on 2011-02-11

[MERGE FROM TRUNK]

2263. By Olivier Dony (Odoo) on 2011-01-17

[MERGE] merged with latest trunk

2262. By Harry (OpenERP) on 2010-11-19

[MERGE]

2261. By Harry (OpenERP) on 2010-11-04

[FIX] base: remove override create method of res.users object.

2260. By Harry (OpenERP) on 2010-11-04

[FIX] base: correct warning messages

2259. By Harry (OpenERP) on 2010-10-28

[FIX] base: missing import _

2258. By Harry (OpenERP) on 2010-10-28

[FIX] base: remove _(..) in sql_constraints in res.users model

2257. By Rucha (Open ERP) on 2010-10-27

[FIX]: Fixed translation of warning messages

2256. By Harry (OpenERP) on 2010-10-27

[MERGE] merged with openobject-server branch

2255. By Harry (OpenERP) on 2010-10-26

[MERGE]