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

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:openobject-server at revision 3147

OpenERP Core Team: Pending requested 2010-11-25

Diff: 93 lines (+22/-4) (has conflicts)

4 files modified

bin/addons/base/res/partner/partner_view.xml (+1/-1)
bin/addons/base/res/partner/wizard/partner_wizard_spam.py (+5/-1)
bin/addons/base/res/res_log_view.xml (+1/-1)
bin/tools/misc.py (+15/-1)

api

Superseded for merging into lp:~openerp-dev/openobject-server/trunk-dev-framework

OpenERP Core Team: Pending requested 2010-11-04

Diff: 84 lines (+16/-4)

4 files modified

bin/addons/base/res/partner/partner_view.xml (+1/-1)
bin/addons/base/res/partner/wizard/partner_wizard_spam.py (+5/-1)
bin/addons/base/res/res_log_view.xml (+1/-1)
bin/tools/misc.py (+9/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #668320: Improve wizard spam

Low

Fix Released

Link a bug report

Related blueprints

2264. By ssi (Open ERP) on 2010-11-04

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

2263. By ssi (Open ERP) on 2010-11-04

[FIX]partner:Improved wizard spam

2262. By ssi (Open ERP) on 2010-11-04

[FIX]Audit: solved problem of audit creates ambigous menu entry

2261. By ssi (Open ERP) on 2010-11-04

[IMP] modified partner search view

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]