diff options
| author | Vijaykumar Baladaniya <vba@tinyerp.com> | 2012-07-09 18:31:13 +0530 |
|---|---|---|
| committer | Vijaykumar Baladaniya <vba@tinyerp.com> | 2012-07-09 18:31:13 +0530 |
| commit | be2e95656aaa113addea2b510fcdcf2f890eaaa4 (patch) | |
| tree | abcb3dd4ef350a1b8ad0eaffdd2b9a1cb91521af /addons/project/res_config_view.xml | |
| parent | b982ea278b33132def3927417b7a854b98b5028a (diff) | |
| parent | 3925f76ce85854e5d4834902a05f57bcfc5ace85 (diff) | |
[MERGE]merged with trunk-survey-layout-tta
bzr revid: vba@tinyerp.com-20120709130113-3lchipgil9oqpglg
Diffstat (limited to 'addons/project/res_config_view.xml')
| -rw-r--r-- | addons/project/res_config_view.xml | 45 |
1 files changed, 25 insertions, 20 deletions
diff --git a/addons/project/res_config_view.xml b/addons/project/res_config_view.xml index 18c7875fcdc..ff1511d49f2 100644 --- a/addons/project/res_config_view.xml +++ b/addons/project/res_config_view.xml @@ -1,6 +1,5 @@ <openerp> <data> - <record id="view_config_settings" model="ir.ui.view"> <field name="name">project settings</field> <field name="model">project.config.settings</field> @@ -9,26 +8,32 @@ <field name="arch" type="xml"> <form string="Configure Project" version="7.0"> <header> - <button string="Apply" type="object" name="execute"/> - <button string="Cancel" special="cancel"/> + <button string="Apply" type="object" name="execute" class="oe_highlight"/> + or + <button string="Cancel" type="object" name="cancel" class="oe_link"/> </header> - <group col="4"> - <separator string="Project" colspan="4"/> - <field name="module_project_mrp"/> - <field name="module_project_timesheet"/> - <field name="module_pad"/> - <field name="group_tasks_work_on_tasks"/> - <field name="group_time_work_estimation_tasks"/> - <field name="group_manage_delegation_task"/> - - <separator string="Planning" colspan="4"/> - <field name="module_project_long_term"/> - - <separator string="Helpdesk and Support" colspan="4"/> - <field name="module_project_issue"/> - <field name="module_project_issue_sheet"/> - <group name="support" colspan="4"/> - </group> + <sheet> + <group string="Project"> + <group> + <field name="module_project_mrp"/> + <field name="module_project_timesheet"/> + <field name="module_pad"/> + </group> + <group> + <field name="group_tasks_work_on_tasks"/> + <field name="group_time_work_estimation_tasks"/> + <field name="group_manage_delegation_task"/> + <field name="time_unit" domain="[('category_id.name','=','Working Time')]"/> + </group> + </group> + <group string="Planning"> + <field name="module_project_long_term"/> + </group> + <group string="Helpdesk and Support" name="support"> + <field name="module_project_issue"/> + <field name="module_project_issue_sheet"/> + </group> + </sheet> </form> </field> </record> |