diff options
| author | Antony Lesuisse <al@openerp.com> | 2011-08-17 22:46:53 +0200 |
|---|---|---|
| committer | Antony Lesuisse <al@openerp.com> | 2011-08-17 22:46:53 +0200 |
| commit | a42f93529cf0640c6c080a1e6344eec22b9f3bc8 (patch) | |
| tree | 97f83c901c34a6637f5c1b3f4d84707b7ba1a4e7 /addons/project_long_term | |
| parent | be74f8da55457a59eb065e5604552bb63781d6bc (diff) | |
| parent | 415ff15c6473a3c097b09ea3aa4f0fc62a8d960d (diff) | |
[MERGE] l10n that just merged trunk
bzr revid: al@openerp.com-20110817204653-1qw6ijdu5lbcsu4g
Diffstat (limited to 'addons/project_long_term')
| -rw-r--r-- | addons/project_long_term/project_long_term_view.xml | 2 | ||||
| -rw-r--r-- | addons/project_long_term/test/test_schedule_tasks_case1.yml | 12 |
2 files changed, 1 insertions, 13 deletions
diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml index b720da13654..819fdbd7542 100644 --- a/addons/project_long_term/project_long_term_view.xml +++ b/addons/project_long_term/project_long_term_view.xml @@ -267,7 +267,7 @@ <field name="arch" type="xml"> <search string="Project Phases"> <group colspan="4" col="20"> - <filter string="Current" domain="[('state','in',('open','draft'))]" name="current" help="Draft and In Progress Phases" icon="terp-check"/> + <filter string="Current" domain="[('state','in',('open','draft','pending'))]" name="current" help="Draft, In Progress and Pending Phases" icon="terp-check"/> <filter string="In Progress" name="Progress" domain="[('state','=','open')]" help="In Progress Phases" icon="terp-camera_test"/> <filter string="Pending" domain="[('state','=','pending')]" help="Pending Phases" icon="terp-gtk-media-pause"/> <separator orientation="vertical"/> diff --git a/addons/project_long_term/test/test_schedule_tasks_case1.yml b/addons/project_long_term/test/test_schedule_tasks_case1.yml index febb2aa3576..d40b61d6b3a 100644 --- a/addons/project_long_term/test/test_schedule_tasks_case1.yml +++ b/addons/project_long_term/test/test_schedule_tasks_case1.yml @@ -1,20 +1,9 @@ - In order to test scheduling of tasks, I create four tasks with different sequences and schedule them. - - I create address for first user. -- - !record {model: res.partner.address, id: res_partner_address_user0}: - name: User 1 -- - I create address for second user. -- - !record {model: res.partner.address, id: res_partner_address_user1}: - name: User 2 -- I create first user. - !record {model: res.users, id: res_users_user0}: - address_id: res_partner_address_user0 company_id: base.main_company context_lang: en_US groups_id: @@ -27,7 +16,6 @@ I create second user. - !record {model: res.users, id: res_users_user1}: - address_id: res_partner_address_user1 company_id: base.main_company context_lang: en_US groups_id: |