lp:~openerp-dev/openobject-server/trunk-for-caribou-jam

Branch merges

Propose for merging

No branches dependent on this one.

On hold for merging into lp:openobject-server

OpenERP Core Team: Pending requested 2012-08-09

Diff: 392 lines (+149/-51)

9 files modified

openerp-server (+2/-0)
openerp/addons/base/ir/workflow/print_instance.py (+63/-37)
openerp/modules/loading.py (+0/-2)
openerp/osv/orm.py (+2/-2)
openerp/tests/test_ir_sequence.py (+3/-0)
openerp/tools/convert.py (+5/-2)
openerp/workflow/instance.py (+10/-1)
openerp/workflow/wkf_service.py (+13/-2)
openerp/workflow/workitem.py (+51/-5)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

4279. By Vo Minh Thu on 2012-11-09

[MERGE]merged trunk.

4278. By Vo Minh Thu on 2012-11-08

[REV] reverted leftover pydb call.

4277. By Olivier Laurent (Open ERP) on 2012-11-07

[FIX] re-raise exception in case of error

4276. By Olivier Laurent (Open ERP) on 2012-11-07

[MERGE] merge with trunk

4275. By Jigar A. on 2012-10-04

[MERGE] Sync with Trunk

4274. By Jigar A. on 2012-10-04

[MERGE] Sync with Trunk

4273. By Jigar A. on 2012-10-03

[MERGE] lp:openobject-server

4272. By Vo Minh Thu on 2012-10-02

[MERGE] merged trunk.

4271. By Vo Minh Thu on 2012-10-02

[FIX] workflow: consider only transitions from already loaded modules.

4270. By Vo Minh Thu on 2012-10-01

[MERGE] merged trunk.