Twinkle Christian(OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-wiz-remove-btn-fix-tch into
lp:~openerp-dev/openobject-addons/trunk-wiz-remove-btn.
Requested reviews:
Jigar Amin (OpenERP) (jam-openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-wiz-remove-btn-fix-tch/+merge/111159
Improve wizard usability in all wizards.
Kindly Review this.
Thank you,
TCH.
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-wiz-remove-btn-fix-tch/+merge/111159
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-wiz-remove-btn.
=== modified file 'account/wizard/account_invoice_state_view.xml'
--- account/wizard/account_invoice_state_view.xml 2012-06-15 12:03:22 +0000
+++ account/wizard/account_invoice_state_view.xml 2012-06-20 07:39:21 +0000
@@ -10,7 +10,9 @@
<header>
<button icon="terp-camera_test" string="Confirm Invoices" name="invoice_confirm" type="object" default_focus="1" class="oe_form_button_active_flow"/>
</header>
- <separator string="Confirm Draft Invoices" colspan="4"/>
+ <group>
+ <separator string="Confirm Draft Invoices" colspan="4"/>
+ </group>
</form>
</field>
</record>
@@ -30,7 +32,9 @@
<header>
<button icon="gtk-cancel" string="Cancel Invoices" name="invoice_cancel" type="object" default_focus="1" class="oe_form_button_active_flow"/>
</header>
- <separator string="Cancel Selected Invoices" colspan="4"/>
+ <group>
+ <separator string="Cancel Selected Invoices" colspan="4"/>
+ </group>
</form>
</field>
</record>
=== modified file 'account/wizard/account_journal_select_view.xml'
--- account/wizard/account_journal_select_view.xml 2012-06-15 12:03:22 +0000
+++ account/wizard/account_journal_select_view.xml 2012-06-20 07:39:21 +0000
@@ -11,7 +11,9 @@
<header>
<button icon="terp-gtk-go-back-rtl" string="Open Entries" name="action_open_window" type="object" class="oe_form_button_active_flow"/>
</header>
- <label string="Are you sure you want to open Journal Entries?"/>
+ <group>
+ <label string="Are you sure you want to open Journal Entries?"/>
+ </group>
</form>
</field>
</record>
=== modified file 'account/wizard/account_move_line_select_view.xml'
--- account/wizard/account_move_line_select_view.xml 2012-06-15 12:03:22 +0000
+++ account/wizard/account_move_line_select_view.xml 2012-06-20 07:39:21 +0000
@@ -11,7 +11,9 @@
<header>
<button icon="terp-gtk-go-back-rtl" string="Open Entries" name="open_window" type="object" default_focus="1" class="oe_form_button_active_flow"/>
</header>
- <label string="Are you sure you want to open Account move line entries!"/>
+ <group>
+ <label string="Are you sure you want to open Account move line entries!"/>
+ </group>
</form>
</field>
</record>
=== modified file 'account/wizard/account_state_open_view.xml'
--- account/wizard/account_state_open_view.xml 2012-06-15 12:03:22 +0000
+++ account/wizard/account_state_open_view.xml 2012-06-20 07:39:21 +0000
@@ -11,8 +11,10 @@
<header>
<button name="change_inv_state" string="Yes" type="object" icon="terp-camera_test" class="oe_form_button_active_flow"/>
</header>
- <label string="Are you sure you want to open this invoice ?"/>
- <label string="(Invoice should be unreconciled if you want to open it)"/>
+ <group>
+ <label string="Are you sure you want to open this invoice ?"/>
+ <label string="(Invoice should be unreconciled if you want to open it)"/>
+ </group>
</form>
</field>
</record>
=== modified file 'account/wizard/account_unreconcile_view.xml'
--- account/wizard/account_unreconcile_view.xml 2012-06-15 12:03:22 +0000
+++ account/wizard/account_unreconcile_view.xml 2012-06-20 07:39:21 +0000
@@ -11,8 +11,10 @@
<header>
<button icon="gtk-ok" string="Unreconcile" name="trans_unrec" type="object" default_focus="1" class="oe_form_button_active_flow"/>
</header>
- <separator string="Unreconciliate Transactions"/>
- <label string="If you unreconciliate transactions, you must also verify all the actions that are linked to those transactions because they will not be disabled"/>
+ <group>
+ <separator string="Unreconciliate Transactions"/>
+ <label string="If you unreconciliate transactions, you must also verify all the actions that are linked to those transactions because they will not be disabled"/>
+ </group>
</form>
</field>
</record>
@@ -44,8 +46,10 @@
<header>
<button icon="gtk-ok" string="Unreconcile" name="trans_unrec_reconcile" type="object" default_focus="1" class="oe_form_button_active_flow"/>
</header>
- <separator string="Unreconciliation Transactions"/>
- <label string="If you unreconciliate transactions, you must also verify all the actions that are linked to those transactions because they will not be disable"/>
+ <group>
+ <separator string="Unreconciliation Transactions"/>
+ <label string="If you unreconciliate transactions, you must also verify all the actions that are linked to those transactions because they will not be disable"/>
+ </group>
</form>
</field>
</record>
=== modified file 'account/wizard/account_use_model_view.xml'
--- account/wizard/account_use_model_view.xml 2012-06-15 12:03:22 +0000
+++ account/wizard/account_use_model_view.xml 2012-06-20 07:39:21 +0000
@@ -41,7 +41,9 @@
<header>
<button icon="gtk-execute" string="Ok" name="create_entries" type="object" default_focus='1' class="oe_form_button_active_flow"/>
</header>
- <label string = "Are you sure you want to create entries?"/>
+ <group>
+ <label string = "Are you sure you want to create entries?"/>
+ </group>
</form>
</field>
</record>
=== modified file 'account/wizard/account_validate_move_view.xml'
--- account/wizard/account_validate_move_view.xml 2012-06-15 12:03:22 +0000
+++ account/wizard/account_validate_move_view.xml 2012-06-20 07:39:21 +0000
@@ -49,8 +49,10 @@
<header>
<button icon="terp-camera_test" string="Approve" name="validate_move_lines" type="object" default_focus="1" class="oe_form_button_active_flow"/>
</header>
- <separator string="Post Journal Entries"/>
- <label string="All selected journal entries will be validated and posted. It means you won't be able to modify their accounting fields anymore." colspan="2"/>
+ <group>
+ <separator string="Post Journal Entries"/>
+ <label string="All selected journal entries will be validated and posted. It means you won't be able to modify their accounting fields anymore." colspan="2"/>
+ </group>
</form>
</field>
</record>
=== modified file 'account_analytic_plans/wizard/analytic_plan_create_model_view.xml'
--- account_analytic_plans/wizard/analytic_plan_create_model_view.xml 2012-06-15 12:11:41 +0000
+++ account_analytic_plans/wizard/analytic_plan_create_model_view.xml 2012-06-20 07:39:21 +0000
@@ -10,7 +10,9 @@
<header>
<button string="Ok" icon='gtk-execute' type="object" name="activate" default_focus="1" class="oe_form_button_active_flow"/>
</header>
- <label string="Save This Distribution as a Model"/>
+ <group>
+ <label string="Save This Distribution as a Model"/>
+ </group>
</form>
</field>
</record>
=== modified file 'account_payment/wizard/account_payment_create_order_view.xml'
--- account_payment/wizard/account_payment_create_order_view.xml 2012-06-15 12:21:15 +0000
+++ account_payment/wizard/account_payment_create_order_view.xml 2012-06-20 07:39:21 +0000
@@ -27,8 +27,10 @@
<header>
<button name="create_payment" string="_Add to payment order" colspan="1" type="object" icon="gtk-execute" class="oe_form_button_active_flow"/>
</header>
- <separator string="Entries"/>
- <field name="entries"/>
+ <group>
+ <separator string="Entries"/>
+ <field name="entries"/>
+ </group>
</form>
</field>
</record>
=== modified file 'account_payment/wizard/account_payment_pay_view.xml'
--- account_payment/wizard/account_payment_pay_view.xml 2012-06-15 12:21:15 +0000
+++ account_payment/wizard/account_payment_pay_view.xml 2012-06-20 07:39:21 +0000
@@ -11,7 +11,9 @@
<header>
<button name="launch_wizard" string="Yes" type="object" icon="gtk-ok" default_focus="1" class="oe_form_button_active_flow"/>
</header>
- <separator string="Are you sure you want to make payment?"/>
+ <group>
+ <separator string="Are you sure you want to make payment?"/>
+ </group>
</form>
</field>
</record>
=== modified file 'account_payment/wizard/account_payment_populate_statement_view.xml'
--- account_payment/wizard/account_payment_populate_statement_view.xml 2012-06-15 12:21:15 +0000
+++ account_payment/wizard/account_payment_populate_statement_view.xml 2012-06-20 07:39:21 +0000
@@ -11,7 +11,9 @@
<header>
<button name="populate_statement" string="ADD" type="object" icon="gtk-ok" class="oe_form_button_active_flow"/>
</header>
- <field name="lines"/>
+ <group>
+ <field name="lines"/>
+ </group>
</form>
</field>
</record>
=== modified file 'audittrail/wizard/audittrail_view_log_view.xml'
--- audittrail/wizard/audittrail_view_log_view.xml 2012-06-18 12:45:11 +0000
+++ audittrail/wizard/audittrail_view_log_view.xml 2012-06-20 07:39:21 +0000
@@ -11,7 +11,7 @@
<field name="arch" type="xml">
<form string="Audit Logs" version="7.0">
<header>
- <button icon="gtk-open" string="Open Logs" name="log_open_window" type="object" class="oe_form_button_active_flow" />
+ <button icon="gtk-open" string="Open Logs" name="log_open_window" type="object" class="oe_form_button_active_flow"/>
</header>
<group col="4">
<field name="from"/>
=== modified file 'crm/wizard/crm_add_note_view.xml'
--- crm/wizard/crm_add_note_view.xml 2012-06-18 12:45:11 +0000
+++ crm/wizard/crm_add_note_view.xml 2012-06-20 07:39:21 +0000
@@ -13,8 +13,10 @@
<header>
<button name="action_add" type="object" string="_Add" icon="gtk-ok" class="oe_form_button_active_flow"/>
</header>
- <separator string="Add Note"/>
- <field name="body"/>
+ <group>
+ <separator string="Add Note"/>
+ <field name="body"/>
+ </group>
</form>
</field>
</record>
=== modified file 'crm/wizard/crm_lead_to_partner_view.xml'
--- crm/wizard/crm_lead_to_partner_view.xml 2012-06-18 12:45:11 +0000
+++ crm/wizard/crm_lead_to_partner_view.xml 2012-06-20 07:39:21 +0000
@@ -12,8 +12,8 @@
<header>
<button name="make_partner" string="Continue" type="object" icon="gtk-ok" class="oe_form_button_active_flow"/>
</header>
- <separator string="Create a Partner"/>
<group col="4">
+ <separator string="Create a Partner"/>
<field name="action"/>
<field name="partner_id" attrs="{'required': [('action', '=', 'exist')], 'invisible':[('action','!=','exist')]}"/>
</group>
=== modified file 'crm/wizard/crm_merge_opportunities_view.xml'
--- crm/wizard/crm_merge_opportunities_view.xml 2012-06-18 12:45:11 +0000
+++ crm/wizard/crm_merge_opportunities_view.xml 2012-06-20 07:39:21 +0000
@@ -13,7 +13,9 @@
<header>
<button name="action_merge" type="object" string="_Merge" icon="gtk-ok" class="oe_form_button_active_flow"/>
</header>
- <separator string="Select Opportunities"/>
+ <group>
+ <separator string="Select Opportunities"/>
+ </group>
<field name="opportunity_ids">
<tree>
<field name="name" />
=== modified file 'crm/wizard/crm_phonecall_to_partner_view.xml'
--- crm/wizard/crm_phonecall_to_partner_view.xml 2012-06-18 12:45:11 +0000
+++ crm/wizard/crm_phonecall_to_partner_view.xml 2012-06-20 07:39:21 +0000
@@ -12,8 +12,10 @@
<header>
<button name="open_create_partner" string="Create Partner" type="object" icon="gtk-ok" groups="base.group_partner_manager"/>
</header>
- <label string="Are you sure you want to create a partner based on this Phonecall ?"/>
- <label string="You may have to verify that this partner does not exist already."/>
+ <group>
+ <label string="Are you sure you want to create a partner based on this Phonecall ?"/>
+ <label string="You may have to verify that this partner does not exist already."/>
+ </group>
</form>
</field>
</record>
=== modified file 'event/wizard/event_confirm_view.xml'
--- event/wizard/event_confirm_view.xml 2012-06-18 12:45:11 +0000
+++ event/wizard/event_confirm_view.xml 2012-06-20 07:39:21 +0000
@@ -11,7 +11,9 @@
<header>
<button icon="gtk-ok" name="confirm" string="Confirm Anyway" type="object" class="oe_form_button_active_flow"/>
</header>
- <label string="Warning: This Event has not reached its Minimum Registration Limit. Are you sure you want to confirm it?"/>
+ <group>
+ <label string="Warning: This Event has not reached its Minimum Registration Limit. Are you sure you want to confirm it?"/>
+ </group>
</form>
</field>
</record>
=== modified file 'hr_attendance/wizard/hr_attendance_byweek_view.xml'
--- hr_attendance/wizard/hr_attendance_byweek_view.xml 2012-06-15 13:27:07 +0000
+++ hr_attendance/wizard/hr_attendance_byweek_view.xml 2012-06-20 07:39:21 +0000
@@ -10,8 +10,10 @@
<header>
<button name="print_report" string="Print" type="object" icon="gtk-print" class="oe_form_button_active_flow"/>
</header>
- <field name="init_date"/>
- <field name="end_date"/>
+ <group>
+ <field name="init_date"/>
+ <field name="end_date"/>
+ </group>
</form>
</field>
</record>
=== modified file 'hr_attendance/wizard/hr_attendance_sign_in_out_view.xml'
--- hr_attendance/wizard/hr_attendance_sign_in_out_view.xml 2012-06-18 05:24:28 +0000
+++ hr_attendance/wizard/hr_attendance_sign_in_out_view.xml 2012-06-20 07:39:21 +0000
@@ -11,9 +11,11 @@
<button icon="terp-gtk-jump-to-ltr" string="Sign in" name="si_check" type="object" class="oe_form_button_active_flow"/>
<button icon="terp-gtk-jump-to-rtl" string="Sign out" name="so_check" type="object" class="oe_form_button_active_flow"/>
</header>
- <separator colspan="4" string="Sign in / Sign out"/>
- <label colspan="4" nolabel="1" string="If you need your staff to sign in when they arrive at work and sign out again at the end of the day, OpenERP allows you to manage this with this tool. If each employee has been linked to a system user, then they can encode their time with this action button."/>
- <newline/>
+ <group>
+ <separator colspan="4" string="Sign in / Sign out"/>
+ <label colspan="4" nolabel="1" string="If you need your staff to sign in when they arrive at work and sign out again at the end of the day, OpenERP allows you to manage this with this tool. If each employee has been linked to a system user, then they can encode their time with this action button."/>
+ <newline/>
+ </group>
<group colspan="4" >
<field name="name" />
<field name="state" />
=== modified file 'hr_payroll/wizard/hr_payroll_payslips_by_employees.xml'
--- hr_payroll/wizard/hr_payroll_payslips_by_employees.xml 2012-06-18 05:29:55 +0000
+++ hr_payroll/wizard/hr_payroll_payslips_by_employees.xml 2012-06-20 07:39:21 +0000
@@ -11,7 +11,9 @@
<header>
<button icon="gtk-execute" string="Generate" name="compute_sheet" type="object" class="oe_form_button_active_flow"/>
</header>
- <label colspan="4" nolabel="1" string="This wizard will generate payslips for all selected employee(s) based on the dates and credit note specified on Payslips Run." />
+ <group>
+ <label colspan="4" nolabel="1" string="This wizard will generate payslips for all selected employee(s) based on the dates and credit note specified on Payslips Run." />
+ </group>
<group colspan="4" >
<separator string="Employees" colspan="4"/>
<newline/>
=== modified file 'hr_recruitment/wizard/hr_recruitment_employee_hired.xml'
--- hr_recruitment/wizard/hr_recruitment_employee_hired.xml 2012-06-19 12:21:23 +0000
+++ hr_recruitment/wizard/hr_recruitment_employee_hired.xml 2012-06-20 07:39:21 +0000
@@ -12,7 +12,9 @@
<button name="case_close_with_emp" string="Yes" colspan="1" type="object" icon="terp-camera_test" class="oe_form_button_active_flow"/>
<button name="case_close" string="No" icon='gtk-no' type="object"/>
</header>
- <label string="Would you like to create an employee ?" colspan="4" />
+ <group>
+ <label string="Would you like to create an employee ?" colspan="4" />
+ </group>
</form>
</field>
</record>
=== modified file 'hr_timesheet/wizard/hr_timesheet_sign_in_out_view.xml'
--- hr_timesheet/wizard/hr_timesheet_sign_in_out_view.xml 2012-06-18 06:11:18 +0000
+++ hr_timesheet/wizard/hr_timesheet_sign_in_out_view.xml 2012-06-20 07:39:21 +0000
@@ -10,8 +10,10 @@
<header>
<button icon="gtk-ok" string="Sign in / Sign out" name="check_state" type="object" class="oe_form_button_active_flow"/>
</header>
- <separator colspan="4" string="Sign In/Out by Project"/>
- <label colspan="4" nolabel="1" string="Employees can encode their time spent on the different projects they are assigned on. A project is an analytic account and the time spent on a project generates costs on the analytic account. This feature allows to record at the same time the attendance and the timesheet."/>
+ <group>
+ <separator colspan="4" string="Sign In/Out by Project"/>
+ <label colspan="4" nolabel="1" string="Employees can encode their time spent on the different projects they are assigned on. A project is an analytic account and the time spent on a project generates costs on the analytic account. This feature allows to record at the same time the attendance and the timesheet."/>
+ </group>
</form>
</field>
</record>
=== modified file 'hr_timesheet_sheet/wizard/hr_timesheet_current_view.xml'
--- hr_timesheet_sheet/wizard/hr_timesheet_current_view.xml 2012-06-18 05:59:14 +0000
+++ hr_timesheet_sheet/wizard/hr_timesheet_current_view.xml 2012-06-20 07:39:21 +0000
@@ -10,7 +10,9 @@
<header>
<button icon="terp-camera_test" name="open_timesheet" string="Open" type="object" class="oe_form_button_active_flow"/>
</header>
- <separator string="It will open your current timesheet"/>
+ <group>
+ <separator string="It will open your current timesheet"/>
+ </group>
</form>
</field>
</record>
=== modified file 'l10n_be/wizard/l10n_be_partner_vat_listing.xml'
--- l10n_be/wizard/l10n_be_partner_vat_listing.xml 2012-06-15 12:45:39 +0000
+++ l10n_be/wizard/l10n_be_partner_vat_listing.xml 2012-06-20 07:39:21 +0000
@@ -10,7 +10,9 @@
<header>
<button name="get_partner" string="View Customers" type="object" icon="terp-partner" class="oe_form_button_active_flow"/>
</header>
- <label string="This wizard will create an XML file for VAT details and total invoiced amounts per partner." colspan="4"/>
+ <group>
+ <label string="This wizard will create an XML file for VAT details and total invoiced amounts per partner." colspan="4"/>
+ </group>
<newline/>
<field name="year"/>
<newline/>
=== modified file 'l10n_be/wizard/l10n_be_vat_intra_view.xml'
--- l10n_be/wizard/l10n_be_vat_intra_view.xml 2012-06-15 12:45:39 +0000
+++ l10n_be/wizard/l10n_be_vat_intra_view.xml 2012-06-20 07:39:21 +0000
@@ -12,7 +12,9 @@
<button name="create_xml" string="Create _XML" type="object" icon="gtk-execute" class="oe_form_button_active_flow"/>
<button name="preview" string="_Preview" type="object" icon="gtk-print" class="oe_form_button_active_flow"/>
</header>
- <separator string="Intracom VAT Declaration"/>
+ <group>
+ <separator string="Intracom VAT Declaration"/>
+ </group>
<notebook colspan="4">
<page string="General Information">
<group>
=== modified file 'l10n_fr/wizard/fr_report_bilan_view.xml'
--- l10n_fr/wizard/fr_report_bilan_view.xml 2012-06-15 12:48:30 +0000
+++ l10n_fr/wizard/fr_report_bilan_view.xml 2012-06-20 07:39:21 +0000
@@ -11,7 +11,9 @@
<header>
<button name="print_bilan_report" string="Print" type="object" icon="gtk-ok" class="oe_form_button_active_flow"/>
</header>
- <field name="fiscalyear_id"/>
+ <group>
+ <field name="fiscalyear_id"/>
+ </group>
</form>
</field>
</record>
=== modified file 'l10n_fr/wizard/fr_report_compute_resultant_view.xml'
--- l10n_fr/wizard/fr_report_compute_resultant_view.xml 2012-06-15 12:48:30 +0000
+++ l10n_fr/wizard/fr_report_compute_resultant_view.xml 2012-06-20 07:39:21 +0000
@@ -11,7 +11,9 @@
<header>
<button name="print_cdr_report" string="Print" type="object" icon="gtk-ok" class="oe_form_button_active_flow"/>
</header>
- <field name="fiscalyear_id"/>
+ <group>
+ <field name="fiscalyear_id"/>
+ </group>
</form>
</field>
</record>
=== modified file 'lunch/wizard/lunch_cashbox_clean_view.xml'
--- lunch/wizard/lunch_cashbox_clean_view.xml 2012-06-15 10:48:30 +0000
+++ lunch/wizard/lunch_cashbox_clean_view.xml 2012-06-20 07:39:21 +0000
@@ -13,7 +13,9 @@
<header>
<button icon="gtk-ok" name="set_to_zero" string="Set to Zero" type="object" class="oe_form_button_active_flow"/>
</header>
- <label string="Are you sure you want to reset this cashbox ?"/>
+ <group>
+ <label string="Are you sure you want to reset this cashbox ?"/>
+ </group>
</form>
</field>
</record>
=== modified file 'mrp/wizard/change_production_qty_view.xml'
--- mrp/wizard/change_production_qty_view.xml 2012-06-19 07:23:26 +0000
+++ mrp/wizard/change_production_qty_view.xml 2012-06-20 07:39:21 +0000
@@ -14,9 +14,11 @@
<button name="change_prod_qty" string="Approve"
colspan="1" type="object" icon="gtk-ok" class="oe_form_button_active_flow"/>
</header>
- <separator string="Change Quantity" colspan="4"/>
- <newline/>
- <field name="product_qty"/>
+ <group>
+ <separator string="Change Quantity" colspan="4"/>
+ <newline/>
+ <field name="product_qty"/>
+ </group>
</form>
</field>
</record>
=== modified file 'mrp/wizard/mrp_price_view.xml'
--- mrp/wizard/mrp_price_view.xml 2012-06-19 07:23:26 +0000
+++ mrp/wizard/mrp_price_view.xml 2012-06-20 07:39:21 +0000
@@ -14,8 +14,10 @@
<button name="print_report" string="Print"
colspan="1" type="object" icon="gtk-print" class="oe_form_button_active_flow" />
</header>
- <separator colspan="4" string="Print Cost Structure of Product." />
- <field name="number"/>
+ <group>
+ <separator colspan="4" string="Print Cost Structure of Product." />
+ <field name="number"/>
+ </group>
</form>
</field>
</record>
=== modified file 'mrp/wizard/mrp_product_produce_view.xml'
--- mrp/wizard/mrp_product_produce_view.xml 2012-06-19 07:23:26 +0000
+++ mrp/wizard/mrp_product_produce_view.xml 2012-06-20 07:39:21 +0000
@@ -15,9 +15,11 @@
<button name="do_produce" string="Confirm"
colspan="1" type="object" icon="gtk-ok" class="oe_form_button_active_flow"/>
</header>
- <separator string="Produce" colspan="4"/>
- <field name="mode" colspan="4"/>
- <field name="product_qty" colspan="2"/>
+ <group>
+ <separator string="Produce" colspan="4"/>
+ <field name="mode"/>
+ <field name="product_qty" colspan="2"/>
+ </group>
</form>
</field>
</record>
=== modified file 'mrp/wizard/mrp_workcenter_load_view.xml'
--- mrp/wizard/mrp_workcenter_load_view.xml 2012-06-18 09:07:09 +0000
+++ mrp/wizard/mrp_workcenter_load_view.xml 2012-06-20 07:39:21 +0000
@@ -14,11 +14,13 @@
<button name="print_report" string="Print"
colspan="1" type="object" icon="gtk-print" class="oe_form_button_active_flow"/>
</header>
- <sheet layout="auto">
- <field name="time_unit"/>
- <newline/>
- <field name="measure_unit"/>
- </sheet>
+ <group>
+ <sheet layout="auto">
+ <field name="time_unit"/>
+ <newline/>
+ <field name="measure_unit"/>
+ </sheet>
+ </group>
</form>
</field>
</record>
=== modified file 'mrp_repair/wizard/mrp_repair_cancel_view.xml'
--- mrp_repair/wizard/mrp_repair_cancel_view.xml 2012-06-19 07:23:26 +0000
+++ mrp_repair/wizard/mrp_repair_cancel_view.xml 2012-06-20 07:39:21 +0000
@@ -13,7 +13,10 @@
<header>
<button name="cancel_repair" string="Yes" type="object" icon="gtk-ok" class="oe_form_button_active_flow" />
</header>
- <label string="This operation will cancel the Repair process, but will not cancel it's Invoice. Do you want to continue?"/>
+ <newline/>
+ <group>
+ <label string="This operation will cancel the Repair process, but will not cancel it's Invoice. Do you want to continue?"/>
+ </group>
</form>
</field>
</record>
=== modified file 'point_of_sale/wizard/pos_box_entries.xml'
--- point_of_sale/wizard/pos_box_entries.xml 2012-06-18 09:58:28 +0000
+++ point_of_sale/wizard/pos_box_entries.xml 2012-06-20 07:39:21 +0000
@@ -12,7 +12,9 @@
<header>
<button name="get_in" string="Put Money" type="object" icon="gtk-apply" class="oe_form_button_active_flow" />
</header>
- <separator string="Fill in this form if you put money in the cash register:"/>
+ <group>
+ <separator string="Fill in this form if you put money in the cash register:"/>
+ </group>
<group col="4">
<field name="name"/>
<field name="product_id"/>
=== modified file 'point_of_sale/wizard/pos_discount.xml'
--- point_of_sale/wizard/pos_discount.xml 2012-06-18 09:58:28 +0000
+++ point_of_sale/wizard/pos_discount.xml 2012-06-20 07:39:21 +0000
@@ -12,7 +12,9 @@
<header>
<button name="apply_discount" string="Apply Discount" type="object" icon="gtk-ok" class="oe_form_button_active_flow"/>
</header>
- <field name="discount"/>
+ <group>
+ <field name="discount"/>
+ </group>
</form>
</field>
</record>
=== modified file 'point_of_sale/wizard/pos_receipt_view.xml'
--- point_of_sale/wizard/pos_receipt_view.xml 2012-06-18 09:58:28 +0000
+++ point_of_sale/wizard/pos_receipt_view.xml 2012-06-20 07:39:21 +0000
@@ -13,7 +13,9 @@
<header>
<button name="print_report" string="Print Receipt" type="object" icon="gtk-print" class="oe_form_button_active_flow"/>
</header>
- <label string="Print the Receipt of the Sale"/>
+ <group>
+ <label string="Print the Receipt of the Sale"/>
+ </group>
</form>
</field>
</record>
=== modified file 'procurement/wizard/make_procurement_view.xml'
--- procurement/wizard/make_procurement_view.xml 2012-06-15 13:01:17 +0000
+++ procurement/wizard/make_procurement_view.xml 2012-06-20 07:39:21 +0000
@@ -13,7 +13,8 @@
<header>
<button name="make_procurement" string="Ask New Products" type="object" icon="gtk-ok" class="oe_form_button_active_flow"/>
</header>
- <group col="4" string="This wizard will plan the procurement for this product. This procurement may generate task, production orders or purchase orders.">
+ <group col="4" string="This wizard will plan the procurement for this product. This procurement may generate task, production orders or purchase orders."/>
+ <group>
<field name="product_id" on_change="onchange_product_id(product_id)"/>
<field name="qty"/>
<field name="uom_id"/>
=== modified file 'procurement/wizard/mrp_procurement_view.xml'
--- procurement/wizard/mrp_procurement_view.xml 2012-06-15 13:01:17 +0000
+++ procurement/wizard/mrp_procurement_view.xml 2012-06-20 07:39:21 +0000
@@ -14,7 +14,9 @@
<button name="procure_calculation" string="Compute Procurements"
type="object" icon="gtk-ok" class="oe_form_button_active_flow"/>
</header>
- <label string="This wizard will schedule procurements."/>
+ <group>
+ <label string="This wizard will schedule procurements."/>
+ </group>
</form>
</field>
</record>
=== modified file 'procurement/wizard/orderpoint_procurement_view.xml'
--- procurement/wizard/orderpoint_procurement_view.xml 2012-06-15 13:01:17 +0000
+++ procurement/wizard/orderpoint_procurement_view.xml 2012-06-20 07:39:21 +0000
@@ -13,7 +13,9 @@
<header>
<button name="procure_calculation" string="Compute Stock" type="object" icon="gtk-ok" class="oe_form_button_active_flow"/>
</header>
- <label string="Wizard checks all the stock minimum rules and generate procurement order."/>
+ <group>
+ <label string="Wizard checks all the stock minimum rules and generate procurement order."/>
+ </group>
<group col="2">
<field name="automatic"/>
</group>
=== modified file 'share/wizard/share_wizard_view.xml'
--- share/wizard/share_wizard_view.xml 2012-06-15 10:41:12 +0000
+++ share/wizard/share_wizard_view.xml 2012-06-20 07:39:21 +0000
@@ -32,8 +32,10 @@
<header>
<button name="go_step_2" string="Share" type="object" icon="gtk-go-forward" class="oe_form_button_active_flow"/>
</header>
- <field name="user_type" invisible="1"/>
- <field name="invite" invisible="1"/>
+ <group>
+ <field name="user_type" invisible="1"/>
+ <field name="invite" invisible="1"/>
+ </group>
<group>
<group name="emails_group" attrs="{'invisible':['|', ('user_type', '!=', 'emails'), ('invite', '=', True)]}" string="Share with these People (one e-mail per line)">
<field colspan="2" nolabel="1" name="new_users" attrs="{'required':[('user_type','=','emails'), ('invite', '!=', True)]}"/>
=== modified file 'stock/wizard/stock_inventory_merge_view.xml'
--- stock/wizard/stock_inventory_merge_view.xml 2012-06-15 13:01:17 +0000
+++ stock/wizard/stock_inventory_merge_view.xml 2012-06-20 07:39:21 +0000
@@ -11,8 +11,10 @@
<header>
<button name="do_merge" string="Yes" type="object" icon="gtk-apply" class="oe_form_button_active_flow"/>
</header>
- <separator string="Merge Inventories" />
- <label string="Do you want to merge theses inventories?"/>
+ <group>
+ <separator string="Merge Inventories" />
+ </group>
+ <label string="Do you want to merge theses inventories?"/>
</form>
</field>
</record>
=== modified file 'stock/wizard/stock_location_product_view.xml'
--- stock/wizard/stock_location_product_view.xml 2012-06-15 13:01:17 +0000
+++ stock/wizard/stock_location_product_view.xml 2012-06-20 07:39:21 +0000
@@ -10,7 +10,9 @@
<header>
<button name="action_open_window" string="Open Product" type="object" icon="gtk-ok" class="oe_form_button_active_flow"/>
</header>
- <separator string="Stock Location Analysis"/>
+ <group>
+ <separator string="Stock Location Analysis"/>
+ </group>
<group>
<field name="from_date"/>
<field name="to_date"/>
=== modified file 'stock/wizard/stock_move_view.xml'
--- stock/wizard/stock_move_view.xml 2012-06-15 13:01:17 +0000
+++ stock/wizard/stock_move_view.xml 2012-06-20 07:39:21 +0000
@@ -12,16 +12,18 @@
<header>
<button name="do_move_consume" string="Ok" type="object" icon="gtk-ok" class="oe_form_button_active_flow"/>
</header>
- <separator string="Consume Products"/>
- <div>
- <field name="product_id" readonly="1"/>
- <label for="product_qty"/>
+ <group>
+ <separator string="Consume Products"/>
<div>
- <field name="product_qty"/>
- <field name="product_uom" nolabel="1" readonly="1"/>
+ <field name="product_id" readonly="1"/>
+ <label for="product_qty"/>
+ <div>
+ <field name="product_qty"/>
+ <field name="product_uom" nolabel="1" readonly="1"/>
+ </div>
+ <field name="location_id"/>
</div>
- <field name="location_id"/>
- </div>
+ </group>
</form>
</field>
</record>
=== modified file 'stock/wizard/stock_partial_move_view.xml'
--- stock/wizard/stock_partial_move_view.xml 2012-06-15 13:01:17 +0000
+++ stock/wizard/stock_partial_move_view.xml 2012-06-20 07:39:21 +0000
@@ -24,8 +24,10 @@
<header>
<button name="do_partial" string="_Validate" type="object" icon="gtk-go-forward" class="oe_form_button_active_flow"/>
</header>
- <separator string="Products"/>
- <field name="move_ids"/>
+ <group>
+ <separator string="Products"/>
+ <field name="move_ids"/>
+ </group>
</form>
</field>
</record>
=== modified file 'stock/wizard/stock_partial_picking_view.xml'
--- stock/wizard/stock_partial_picking_view.xml 2012-06-19 07:25:40 +0000
+++ stock/wizard/stock_partial_picking_view.xml 2012-06-20 07:39:21 +0000
@@ -19,8 +19,10 @@
<header>
<button name="do_partial" string="_Transfer" type="object" icon="gtk-go-forward" class="oe_form_button_active_flow"/>
</header>
+ <group>
<field name="hide_tracking" invisible="1"/>
- <separator string="Transfer Products" name="product_separator"/>
+ <separator string="Transfer Products" name="product_separator"/>
+ </group>
<field name="move_ids" context="{'hide_tracking': hide_tracking}">
<tree editable="bottom" string="Product Moves">
<field name="product_id" />
=== modified file 'survey/wizard/survey_print_statistics.xml'
--- survey/wizard/survey_print_statistics.xml 2012-06-15 10:14:40 +0000
+++ survey/wizard/survey_print_statistics.xml 2012-06-20 07:39:21 +0000
@@ -13,7 +13,9 @@
<header>
<button icon="gtk-print" name="action_next" string="Print" type="object" class="oe_form_button_active_flow"/>
</header>
- <field name="survey_ids"/>
+ <group>
+ <field name="survey_ids"/>
+ </group>
</form>
</field>
</record>
=== modified file 'wiki/wizard/wiki_create_menu_view.xml'
--- wiki/wizard/wiki_create_menu_view.xml 2012-06-15 10:31:43 +0000
+++ wiki/wizard/wiki_create_menu_view.xml 2012-06-20 07:39:21 +0000
@@ -13,9 +13,11 @@
<header>
<button name="wiki_menu_create" string="Create Menu" type="object" class="oe_form_button_active_flow"/>
</header>
- <separator string="Menu Information" colspan="4" />
- <field name="menu_name" />
- <field name="menu_parent_id" />
+ <group>
+ <separator string="Menu Information" colspan="4" />
+ <field name="menu_name" />
+ <field name="menu_parent_id" />
+ </group>
</form>
</field>
</record>
=== modified file 'wiki/wizard/wiki_make_index_view.xml'
--- wiki/wizard/wiki_make_index_view.xml 2012-06-15 10:31:43 +0000
+++ wiki/wizard/wiki_make_index_view.xml 2012-06-20 07:39:21 +0000
@@ -13,8 +13,10 @@
<header>
<button name="wiki_do_index" string="Create Index" type="object" icon="gtk-ok" class="oe_form_button_active_flow"/>
</header>
- <separator string="Menu Information" colspan="4"/>
- <label string="Want to create a Index on Selected Pages ? "/>
+ <group>
+ <separator string="Menu Information" colspan="4"/>
+ <label string="Want to create a Index on Selected Pages ? "/>
+ </group>
</form>
</field>
</record>
=== modified file 'wiki/wizard/wiki_wiki_page_open_view.xml'
--- wiki/wizard/wiki_wiki_page_open_view.xml 2012-06-15 10:31:43 +0000
+++ wiki/wizard/wiki_wiki_page_open_view.xml 2012-06-20 07:39:21 +0000
@@ -13,8 +13,10 @@
<header>
<button name="open_wiki_page" string="Open Wiki Page" type="object" icon="gtk-ok" class="oe_form_button_active_flow"/>
</header>
- <separator string="" colspan="6" />
- <label string="Want to open a wiki page? "/>
+ <group>
+ <separator string="" colspan="6" />
+ <label string="Want to open a wiki page? "/>
+ </group>
</form>
</field>
</record>
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
