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

Proposed by Vo Minh Thu
Status: Work in progress
Proposed branch: lp://qastaging/~openerp-dev/openobject-server/trunk-for-caribou-jam
Merge into: lp://qastaging/openobject-server
Diff against target: 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)
To merge this branch: bzr merge lp://qastaging/~openerp-dev/openobject-server/trunk-for-caribou-jam
Reviewer Review Type Date Requested Status
OpenERP Core Team Pending
Review via email: mp+118926@code.qastaging.launchpad.net
To post a comment you must log in.
4246. By Jigar A.

[MERGE] lp:openobject-server

4247. By Jigar A.

[MERGE] lp:openobject-server

4248. By Jigar A.

[MERGE] lp:openobject-server

4249. By Jigar A.

[MERGE] lp:~openerp-dev/openobject-server/trunk-for-caribou-demo-tpa

4250. By Jigar A.

merge lp:openobject-server

4251. By Jigar A.

merge lp:openobject-server

4252. By Jigar A.

[merge] lp:openobject-server

4253. By Jigar A.

[FIX] Workflow node fix, patch by Vo Minh Thu

4254. By Jigar A.

merge lp:openobject-server

4255. By Jigar A.

merge lp:openobject-server

4256. By Jigar A.

[FIX] remvoed conflicts

4257. By Vo Minh Thu

[IMP] workflow: only use already loaded transitions during an update.

4258. By Jigar A.

Merge lp:openobject-server

4259. By Vo Minh Thu

[MERGE] merged trunk.

4260. By Vo Minh Thu

[IMP] loading: only CSV are in a forced noupdate, other data rely on the noupdate attr. in the XML file.

4261. By Jigar A.

[MERGE] Merged lp:openobject-server

4262. By Jigar A.

[MERGE] Merged lp:opeenobject-server

4263. By Vo Minh Thu

[FIX] workflow: during an update consider only workflows from already loaded modules.

4264. By Vo Minh Thu

[MERGE] merged trunk.

4265. By Jigar A.

[MERGE] lp:openobject-server

4266. By Jigar A.

[MERGE] lp:openobject-server

4267. By Jigar A.

[MERGE] lp:openobject-server

4268. By Vo Minh Thu

[IMP] workflow: consider only transitions and activities from loaded modules (useful during an update).

4269. By Vo Minh Thu

[FIX] workflows: the similarly-named columns in results of a select * with a join in SQL queries are overwritten, so use explicit column names.

4270. By Vo Minh Thu

[MERGE] merged trunk.

4271. By Vo Minh Thu

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

4272. By Vo Minh Thu

[MERGE] merged trunk.

4273. By Jigar A.

[MERGE] lp:openobject-server

4274. By Jigar A.

[MERGE] Sync with Trunk

4275. By Jigar A.

[MERGE] Sync with Trunk

Revision history for this message
Vo Minh Thu (thu) wrote :

This branch makes a few changes to the server to make it possible 1/ to install the demo data, 2/ to run the tests with a single update (i.e. the -u command-line flag) and have the tests pass.

This is intended to somewhat test a migrated database (which would normally not contain the demo data necessary to properly run the tests). The only trick is to set demo=True on the ir_module_module table before proceeding to the update.

So let's go through this.

- Changes in openerp/addons/base/ir/workflow/print_instance.py don't matter, this is just some minimal refactoring and exposes the ability to dump workflows as SVGs on disk.

- The if self.pool._init and False: in orm.py should clearly be reverted. This means that computing the left/right parents can't be deferred to after the tests (i.e. some tests need that information to be available).

- Changes in openerp/tests/test_ir_sequence.py are made to make sure the tests on ir_sequence can be played over again (i.e. one run doesn't affect the next run).

- Changes in openerp/tools/convert.py are made so we know which data are fresh (i.e. we just created them while reading the imported file): if the data is new, let the workflow run. Maybe it is not necessary any more because of the new noupdate semantic (see next bullet point).

- Changes in openerp/modules/loading.py: noupdate is forced only for CSV files. Otherwise, the noupdate attribute is honored (previously, demo data were always in noupdate).

- The openerp/workflow sub-module is changed to ignore activities and transitions that are available in db but defined by modules not already loaded (this is necessary to let workflows run in tests, while being in the middle of the update module graph).

4276. By Olivier Laurent (Open ERP)

[MERGE] merge with trunk

4277. By Olivier Laurent (Open ERP)

[FIX] re-raise exception in case of error

Revision history for this message
Vo Minh Thu (thu) wrote :

There is a leftover of some pydb import/call.

4278. By Vo Minh Thu

[REV] reverted leftover pydb call.

4279. By Vo Minh Thu

[MERGE]merged trunk.

Unmerged revisions

4279. By Vo Minh Thu

[MERGE]merged trunk.

4278. By Vo Minh Thu

[REV] reverted leftover pydb call.

4277. By Olivier Laurent (Open ERP)

[FIX] re-raise exception in case of error

4276. By Olivier Laurent (Open ERP)

[MERGE] merge with trunk

4275. By Jigar A.

[MERGE] Sync with Trunk

4274. By Jigar A.

[MERGE] Sync with Trunk

4273. By Jigar A.

[MERGE] lp:openobject-server

4272. By Vo Minh Thu

[MERGE] merged trunk.

4271. By Vo Minh Thu

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

4270. By Vo Minh Thu

[MERGE] merged trunk.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.