diff options
| author | Raphael Collet <rco@openerp.com> | 2012-07-06 16:56:08 +0200 |
|---|---|---|
| committer | Raphael Collet <rco@openerp.com> | 2012-07-06 16:56:08 +0200 |
| commit | e70648a12321447d21c19cd31bede1d41da1fa5f (patch) | |
| tree | f733b2ff380f6e399e303c280a42e07254c6b65c | |
| parent | 102ab0691fbbafd182315e4236ff8c1e64064ea3 (diff) | |
| parent | 9bf667b700fd186ace741d49332fa68fef9a65e3 (diff) | |
[MERGE] trunk-improve_config_wizards-rco (use full page for config wizards)
bzr revid: rco@openerp.com-20120706145608-rxdarbopirltc9gm
| -rw-r--r-- | addons/account/res_config_view.xml | 3 | ||||
| -rw-r--r-- | addons/base_setup/res_config_view.xml | 56 | ||||
| -rw-r--r-- | addons/hr/res_config_view.xml | 48 | ||||
| -rw-r--r-- | addons/knowledge/res_config_view.xml | 22 | ||||
| -rw-r--r-- | addons/mrp/res_config_view.xml | 36 | ||||
| -rw-r--r-- | addons/project/res_config_view.xml | 38 | ||||
| -rw-r--r-- | addons/purchase/res_config_view.xml | 32 | ||||
| -rw-r--r-- | addons/stock/res_config_view.xml | 54 |
8 files changed, 136 insertions, 153 deletions
diff --git a/addons/account/res_config_view.xml b/addons/account/res_config_view.xml index c6bd026882a..d7eda0a2692 100644 --- a/addons/account/res_config_view.xml +++ b/addons/account/res_config_view.xml @@ -21,7 +21,7 @@ or <button string="Cancel" type="object" name="cancel" class="oe_link"/> </header> - <sheet> + <field name="has_default_company" invisible="1" /> <field name="has_chart_of_accounts" invisible="1"/> <field name="complete_tax_set" invisible="1"/> @@ -134,7 +134,6 @@ <group name="analytic_accounting" invisible="1" string="Analytic Accounting"/> </group> - </sheet> </form> </field> </record> diff --git a/addons/base_setup/res_config_view.xml b/addons/base_setup/res_config_view.xml index 85a20bddf52..8607e671085 100644 --- a/addons/base_setup/res_config_view.xml +++ b/addons/base_setup/res_config_view.xml @@ -12,29 +12,27 @@ or <button string="Cancel" type="object" name="cancel" class="oe_link"/> </header> - <sheet> - <group string="Company Settings"> - <group> - <field name="module_multi_company"/> - </group> - <group> - <div> - You will also find several configuration options on your company data: - address for the header and footer, overdue payments texts, etc. - </div> - <button type="object" name="open_company" string="Configure Your Company Data" icon="gtk-execute"/> - </group> + <group string="Company Settings"> + <group> + <field name="module_multi_company"/> </group> - <group string="External Accesses"> - <field name="module_share"/> - <field name="module_portal"/> + <group> + <div> + You will also find several configuration options on your company data: + address for the header and footer, overdue payments texts, etc. + </div> + <button type="object" name="open_company" string="Configure Your Company Data" icon="gtk-execute"/> </group> - <group string="Others"> - <label for="id" string="Outgoing Mail Servers"/> - <button type="action" name="%(base.action_ir_mail_server_list)d" - string="Configure" icon="gtk-execute"/> - </group> - </sheet> + </group> + <group string="External Accesses"> + <field name="module_share"/> + <field name="module_portal"/> + </group> + <group string="Others"> + <label for="id" string="Outgoing Mail Servers"/> + <button type="action" name="%(base.action_ir_mail_server_list)d" + string="Configure" icon="gtk-execute"/> + </group> </form> </field> </record> @@ -60,15 +58,13 @@ or <button string="Cancel" type="object" name="cancel" class="oe_link"/> </header> - <sheet> - <field name="module_crm" invisible="1"/> - <group name="config_sale"/> - <group name="config_fetchmail" string="Emails" attrs="{'invisible': [('module_crm','=',False)]}"> - <field name="module_plugin_thunderbird"/> - <field name="module_plugin_outlook"/> - </group> - <group name="config_crm"/> - </sheet> + <field name="module_crm" invisible="1"/> + <group name="config_sale"/> + <group name="config_fetchmail" string="Emails" attrs="{'invisible': [('module_crm','=',False)]}"> + <field name="module_plugin_thunderbird"/> + <field name="module_plugin_outlook"/> + </group> + <group name="config_crm"/> </form> </field> </record> diff --git a/addons/hr/res_config_view.xml b/addons/hr/res_config_view.xml index b41ccd0e935..3285f4c32a6 100644 --- a/addons/hr/res_config_view.xml +++ b/addons/hr/res_config_view.xml @@ -20,34 +20,32 @@ or <button string="Cancel" type="object" name="cancel" class="oe_link"/> </header> - <sheet> - <group string="Additional Features"> - <group> - <field name="module_hr_expense"/> - <field name="module_hr_evaluation"/> - <field name="module_hr_holidays"/> - </group> - <group> - <field name="module_hr_recruitment"/> - <field name="module_hr_contract"/> - <label for="module_hr_payroll"/> - <div> - <field name="module_hr_payroll"/> - <button name="%(open_payroll_modules)d" type="action" - string="Install Country-Specific Payroll" icon="gtk-go-forward" - attrs="{'invisible': [('module_hr_payroll','=',False)]}"/> - </div> - </group> + <group string="Additional Features"> + <group> + <field name="module_hr_expense"/> + <field name="module_hr_evaluation"/> + <field name="module_hr_holidays"/> </group> <group> - <group string="Timesheets"> - <field name="module_hr_attendance" on_change="onchange_hr_attendance(module_hr_attendance)"/> - <field name="module_hr_timesheet" on_change="onchange_hr_timesheet(module_hr_timesheet)"/> - <field name="module_hr_timesheet_sheet"/> - </group> - <group name="config_recruitment"/> + <field name="module_hr_recruitment"/> + <field name="module_hr_contract"/> + <label for="module_hr_payroll"/> + <div> + <field name="module_hr_payroll"/> + <button name="%(open_payroll_modules)d" type="action" + string="Install Country-Specific Payroll" icon="gtk-go-forward" + attrs="{'invisible': [('module_hr_payroll','=',False)]}"/> + </div> + </group> + </group> + <group> + <group string="Timesheets"> + <field name="module_hr_attendance" on_change="onchange_hr_attendance(module_hr_attendance)"/> + <field name="module_hr_timesheet" on_change="onchange_hr_timesheet(module_hr_timesheet)"/> + <field name="module_hr_timesheet_sheet"/> </group> - </sheet> + <group name="config_recruitment"/> + </group> </form> </field> </record> diff --git a/addons/knowledge/res_config_view.xml b/addons/knowledge/res_config_view.xml index ad3488deb98..0cec5899c41 100644 --- a/addons/knowledge/res_config_view.xml +++ b/addons/knowledge/res_config_view.xml @@ -13,19 +13,17 @@ <button string="Cancel" type="object" name="cancel" class="oe_link"/> </header> - <sheet> - <group> - <group string="Wiki"> - <field name="module_wiki_faq"/> - <field name="module_wiki_quality_manual"/> - </group> - <group string="Documents"> - <field name="module_document"/> - <field name="module_document_ftp"/> - <field name="module_document_webdav"/> - </group> + <group> + <group string="Wiki"> + <field name="module_wiki_faq"/> + <field name="module_wiki_quality_manual"/> </group> - </sheet> + <group string="Documents"> + <field name="module_document"/> + <field name="module_document_ftp"/> + <field name="module_document_webdav"/> + </group> + </group> </form> </field> </record> diff --git a/addons/mrp/res_config_view.xml b/addons/mrp/res_config_view.xml index 48938972f60..db337c9b178 100644 --- a/addons/mrp/res_config_view.xml +++ b/addons/mrp/res_config_view.xml @@ -12,25 +12,23 @@ or <button string="Cancel" type="object" name="cancel" class="oe_link"/> </header> - <sheet> - <group string="Manufacturing Order"> - <field name="module_mrp_operations"/> - <field name="module_stock_planning"/> - <field name="module_mrp_subproduct"/> - <field name="module_mrp_repair"/> - </group> - <group string="Logistics"> - <field name="module_mrp_jit"/> - <field name="module_stock_no_autopicking"/> - </group> - <group string="Bill Of Material"> - <field name="group_mrp_routings"/> - <field name="group_mrp_properties"/> - </group> - <group string="Products"> - <field name="module_product_manufacturer"/> - </group> - </sheet> + <group string="Manufacturing Order"> + <field name="module_mrp_operations"/> + <field name="module_stock_planning"/> + <field name="module_mrp_subproduct"/> + <field name="module_mrp_repair"/> + </group> + <group string="Logistics"> + <field name="module_mrp_jit"/> + <field name="module_stock_no_autopicking"/> + </group> + <group string="Bill Of Material"> + <field name="group_mrp_routings"/> + <field name="group_mrp_properties"/> + </group> + <group string="Products"> + <field name="module_product_manufacturer"/> + </group> </form> </field> </record> diff --git a/addons/project/res_config_view.xml b/addons/project/res_config_view.xml index ff1511d49f2..b6497e56d62 100644 --- a/addons/project/res_config_view.xml +++ b/addons/project/res_config_view.xml @@ -12,28 +12,26 @@ or <button string="Cancel" type="object" name="cancel" class="oe_link"/> </header> - <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 string="Project"> + <group> + <field name="module_project_mrp"/> + <field name="module_project_timesheet"/> + <field name="module_pad"/> </group> - <group string="Planning"> - <field name="module_project_long_term"/> + <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 string="Helpdesk and Support" name="support"> - <field name="module_project_issue"/> - <field name="module_project_issue_sheet"/> - </group> - </sheet> + </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> </form> </field> </record> diff --git a/addons/purchase/res_config_view.xml b/addons/purchase/res_config_view.xml index 06b06c7bae4..1e8588bf618 100644 --- a/addons/purchase/res_config_view.xml +++ b/addons/purchase/res_config_view.xml @@ -12,25 +12,23 @@ or <button string="Cancel" type="object" name="cancel" class="oe_link"/> </header> - <sheet> - <group string="Invoicing"> - <field name="default_invoice_method"/> - <field name="decimal_precision"/> + <group string="Invoicing"> + <field name="default_invoice_method"/> + <field name="decimal_precision"/> + </group> + <group string="Purchase Order"> + <group> + <field name="group_purchase_pricelist"/> + <field name="group_uom"/> + <field name="group_purchase_delivery_address"/> </group> - <group string="Purchase Order"> - <group> - <field name="group_purchase_pricelist"/> - <field name="group_uom"/> - <field name="group_purchase_delivery_address"/> - </group> - <group> - <field name="module_purchase_double_validation"/> - <field name="module_purchase_requisition"/> - <field name="module_warning"/> - <field name="module_purchase_analytic_plans"/> - </group> + <group> + <field name="module_purchase_double_validation"/> + <field name="module_purchase_requisition"/> + <field name="module_warning"/> + <field name="module_purchase_analytic_plans"/> </group> - </sheet> + </group> </form> </field> </record> diff --git a/addons/stock/res_config_view.xml b/addons/stock/res_config_view.xml index 64c151af33c..f6638f22002 100644 --- a/addons/stock/res_config_view.xml +++ b/addons/stock/res_config_view.xml @@ -13,38 +13,36 @@ or <button string="Cancel" type="object" name="cancel" class="oe_link"/> </header> - <sheet> - <group string="Traceability"> - <field name="group_stock_production_lot"/> - <field name="group_stock_tracking_lot"/> - <field name="module_product_expiry" - attrs="{'invisible': [('group_stock_production_lot','=',False)]}"/> + <group string="Traceability"> + <field name="group_stock_production_lot"/> + <field name="group_stock_tracking_lot"/> + <field name="module_product_expiry" + attrs="{'invisible': [('group_stock_production_lot','=',False)]}"/> + </group> + <group string="Logistics"> + <group> + <field name="group_stock_multiple_locations"/> + <field name="module_stock_invoice_directly"/> </group> - <group string="Logistics"> - <group> - <field name="group_stock_multiple_locations"/> - <field name="module_stock_invoice_directly"/> - </group> - <group> - <field name="module_stock_location"/> - <field name="decimal_precision"/> - </group> + <group> + <field name="module_stock_location"/> + <field name="decimal_precision"/> </group> - <group string="Products"> - <group> - <field name="group_stock_packaging"/> - <field name="group_uom"/> - <field name="group_uos"/> - </group> - <group> - <field name="group_stock_inventory_valuation"/> - <field name="group_product_variant"/> - </group> + </group> + <group string="Products"> + <group> + <field name="group_stock_packaging"/> + <field name="group_uom"/> + <field name="group_uos"/> </group> - <group string="Partners"> - <field name="module_claim_from_delivery"/> + <group> + <field name="group_stock_inventory_valuation"/> + <field name="group_product_variant"/> </group> - </sheet> + </group> + <group string="Partners"> + <field name="module_claim_from_delivery"/> + </group> </form> </field> </record> |
