[MERGE] lp:~openerp-dev/openobject-addons/trunk-wiz-remove-btn-highlight-tch
authorJigar Amin - OpenERP <jam@tinyerp.com>
Wed, 20 Jun 2012 12:32:42 +0000 (18:02 +0530)
committerJigar Amin - OpenERP <jam@tinyerp.com>
Wed, 20 Jun 2012 12:32:42 +0000 (18:02 +0530)
bzr revid: jam@tinyerp.com-20120620123242-tvm11xx0s3olkdif

49 files changed:
1  2 
addons/account/wizard/account_invoice_state_view.xml
addons/account/wizard/account_journal_select_view.xml
addons/account/wizard/account_move_line_select_view.xml
addons/account/wizard/account_state_open_view.xml
addons/account/wizard/account_unreconcile_view.xml
addons/account/wizard/account_use_model_view.xml
addons/account/wizard/account_validate_move_view.xml
addons/account_analytic_plans/wizard/analytic_plan_create_model_view.xml
addons/account_payment/wizard/account_payment_create_order_view.xml
addons/account_payment/wizard/account_payment_pay_view.xml
addons/account_payment/wizard/account_payment_populate_statement_view.xml
addons/audittrail/wizard/audittrail_view_log_view.xml
addons/crm/wizard/crm_add_note_view.xml
addons/crm/wizard/crm_lead_to_partner_view.xml
addons/crm/wizard/crm_merge_opportunities_view.xml
addons/crm/wizard/crm_phonecall_to_partner_view.xml
addons/event/wizard/event_confirm_view.xml
addons/hr_attendance/wizard/hr_attendance_byweek_view.xml
addons/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml
addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.xml
addons/hr_recruitment/wizard/hr_recruitment_employee_hired.xml
addons/hr_timesheet/wizard/hr_timesheet_sign_in_out_view.xml
addons/hr_timesheet_sheet/wizard/hr_timesheet_current_view.xml
addons/l10n_be/wizard/l10n_be_partner_vat_listing.xml
addons/l10n_be/wizard/l10n_be_vat_intra_view.xml
addons/l10n_fr/wizard/fr_report_bilan_view.xml
addons/l10n_fr/wizard/fr_report_compute_resultant_view.xml
addons/lunch/wizard/lunch_cashbox_clean_view.xml
addons/mrp/wizard/change_production_qty_view.xml
addons/mrp/wizard/mrp_price_view.xml
addons/mrp/wizard/mrp_product_produce_view.xml
addons/mrp/wizard/mrp_workcenter_load_view.xml
addons/mrp_repair/wizard/mrp_repair_cancel_view.xml
addons/point_of_sale/wizard/pos_box_entries.xml
addons/point_of_sale/wizard/pos_discount.xml
addons/point_of_sale/wizard/pos_receipt_view.xml
addons/procurement/wizard/make_procurement_view.xml
addons/procurement/wizard/mrp_procurement_view.xml
addons/procurement/wizard/orderpoint_procurement_view.xml
addons/share/wizard/share_wizard_view.xml
addons/stock/wizard/stock_inventory_merge_view.xml
addons/stock/wizard/stock_location_product_view.xml
addons/stock/wizard/stock_move_view.xml
addons/stock/wizard/stock_partial_move_view.xml
addons/stock/wizard/stock_partial_picking_view.xml
addons/survey/wizard/survey_print_statistics.xml
addons/wiki/wizard/wiki_create_menu_view.xml
addons/wiki/wizard/wiki_make_index_view.xml
addons/wiki/wizard/wiki_wiki_page_open_view.xml

@@@ -8,11 -8,9 +8,11 @@@
              <field name="arch" type="xml">
                    <form string="Confirm Draft Invoices" version="7.0">
                        <header>
-                           <button icon="terp-camera_test" string="Confirm Invoices" name="invoice_confirm" type="object" default_focus="1" class="oe_form_button_active_flow"/>
+                           <button icon="terp-camera_test" string="Confirm Invoices" name="invoice_confirm" type="object" default_focus="1" class="oe_highlight"/>
                        </header>
 -                      <separator string="Confirm Draft Invoices" colspan="4"/>
 +                      <group>
 +                          <separator string="Confirm Draft Invoices" colspan="4"/>
 +                      </group>
                    </form>
              </field>
          </record>
              <field name="arch" type="xml">
                    <form string="Cancel Selected Invoices" version="7.0">
                        <header>
-                           <button icon="gtk-cancel" string="Cancel Invoices" name="invoice_cancel" type="object" default_focus="1" class="oe_form_button_active_flow"/>
+                           <button icon="gtk-cancel" string="Cancel Invoices" name="invoice_cancel" type="object" default_focus="1" class="oe_highlight"/>
                        </header>
 -                      <separator string="Cancel Selected Invoices" colspan="4"/>
 +                      <group>
 +                          <separator string="Cancel Selected Invoices" colspan="4"/>
 +                      </group>    
                    </form>
              </field>
          </record>
@@@ -9,11 -9,9 +9,11 @@@
              <field name="arch" type="xml">
                    <form string="Journal Select" version="7.0">
                        <header>
-                           <button icon="terp-gtk-go-back-rtl" string="Open Entries" name="action_open_window" type="object" class="oe_form_button_active_flow"/>
+                           <button icon="terp-gtk-go-back-rtl" string="Open Entries" name="action_open_window" type="object" class="oe_highlight"/>
                        </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>
@@@ -9,11 -9,9 +9,11 @@@
              <field name="arch" type="xml">
                  <form string="Account Select" version="7.0">
                      <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"/>
+                         <button icon="terp-gtk-go-back-rtl" string="Open Entries" name="open_window" type="object" default_focus="1" class="oe_highlight"/>
                      </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>
@@@ -9,12 -9,10 +9,12 @@@
              <field name="arch" type="xml">
                  <form string="Open Invoice" version="7.0">
                      <header>
-                         <button name="change_inv_state" string="Yes" type="object" icon="terp-camera_test" class="oe_form_button_active_flow"/>
+                         <button name="change_inv_state" string="Yes" type="object" icon="terp-camera_test" class="oe_highlight"/>
                      </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>
@@@ -9,12 -9,10 +9,12 @@@
              <field name="arch" type="xml">
              <form string="Unreconciliation" version="7.0">
                  <header>
-                     <button icon="gtk-ok" string="Unreconcile" name="trans_unrec" type="object" default_focus="1" class="oe_form_button_active_flow"/>
+                     <button icon="gtk-ok" string="Unreconcile" name="trans_unrec" type="object" default_focus="1" class="oe_highlight"/>
                  </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>
              <field name="arch" type="xml">
              <form string="Unreconciliation" version="7.0">
                  <header>
-                     <button icon="gtk-ok" string="Unreconcile" name="trans_unrec_reconcile" type="object" default_focus="1" class="oe_form_button_active_flow"/>
+                     <button icon="gtk-ok" string="Unreconcile" name="trans_unrec_reconcile" type="object" default_focus="1" class="oe_highlight"/>
                  </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>
              <field name="arch" type="xml">
                  <form string="Use Model" version="7.0">
                      <header>
-                         <button icon="gtk-execute" string="Ok" name="create_entries" type="object" default_focus='1' class="oe_form_button_active_flow"/>
+                         <button icon="gtk-execute" string="Ok" name="create_entries" type="object" default_focus='1' class="oe_highlight"/>
                      </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>
              <field name="arch" type="xml">
                    <form string="Post Journal Entries" version="7.0">
                        <header>
-                           <button icon="terp-camera_test" string="Approve" name="validate_move_lines" type="object" default_focus="1" class="oe_form_button_active_flow"/>
+                           <button icon="terp-camera_test" string="Approve" name="validate_move_lines" type="object" default_focus="1" class="oe_highlight"/>
                        </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>
@@@ -8,11 -8,9 +8,11 @@@
              <field name="arch" type="xml">
              <form string="Distribution Model Saved" version="7.0">
                  <header>
-                     <button string="Ok" icon='gtk-execute' type="object" name="activate" default_focus="1" class="oe_form_button_active_flow"/>
+                     <button string="Ok" icon='gtk-execute' type="object" name="activate" default_focus="1" class="oe_highlight"/>
                  </header>
 -                <label string="Save This Distribution as a Model"/>
 +                <group>
 +                    <label string="Save This Distribution as a Model"/>
 +                </group>
              </form>
              </field>
          </record>
              <field name="arch" type="xml">
                  <form string="Search Payment lines" version="7.0">
                      <header>
-                         <button name="create_payment" string="_Add to payment order" colspan="1" type="object" icon="gtk-execute" class="oe_form_button_active_flow"/>
+                         <button name="create_payment" string="_Add to payment order" colspan="1" type="object" icon="gtk-execute" class="oe_highlight"/>
                      </header>
 -                    <separator string="Entries"/>
 -                    <field name="entries"/>
 +                    <group>
 +                        <separator string="Entries"/>
 +                        <field name="entries"/>
 +                    </group>
                  </form>
              </field>
          </record>
@@@ -9,11 -9,9 +9,11 @@@
               <field name="arch" type="xml">
                  <form string="Make Payment" version="7.0">
                      <header>
-                         <button name="launch_wizard" string="Yes" type="object" icon="gtk-ok" default_focus="1" class="oe_form_button_active_flow"/>
+                         <button name="launch_wizard" string="Yes" type="object" icon="gtk-ok" default_focus="1" class="oe_highlight"/>
                      </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>
@@@ -9,11 -9,9 +9,11 @@@
               <field name="arch" type="xml">
                  <form string="Populate Statement:" version="7.0">
                      <header>
-                         <button name="populate_statement" string="ADD" type="object" icon="gtk-ok" class="oe_form_button_active_flow"/>
+                         <button name="populate_statement" string="ADD" type="object" icon="gtk-ok" class="oe_highlight"/>
                      </header>
 -                    <field name="lines"/>
 +                    <group>
 +                        <field name="lines"/>
 +                    </group>
                  </form>
               </field>
          </record>
@@@ -11,7 -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_highlight" />
++                        <button icon="gtk-open" string="Open Logs" name="log_open_window" type="object" class="oe_highlight"/>
                      </header>
                      <group col="4">
                           <field name="from"/>
              <field name="arch" type="xml">
                  <form string="Add Note" version="7.0">
                      <header>
-                         <button name="action_add" type="object" string="_Add" icon="gtk-ok" class="oe_form_button_active_flow"/>
+                         <button name="action_add" type="object" string="_Add" icon="gtk-ok" class="oe_highlight"/>
                      </header>
 -                    <separator string="Add Note"/>
 -                    <field name="body"/>
 +                    <group>
 +                        <separator string="Add Note"/>
 +                        <field name="body"/>
 +                    </group>
                  </form>
              </field>
          </record>
            <field name="arch" type="xml">
                <form string="Create a Partner" version="7.0">
                    <header>
-                       <button name="make_partner" string="Continue" type="object" icon="gtk-ok" class="oe_form_button_active_flow"/>
+                       <button name="make_partner" string="Continue" type="object" icon="gtk-ok" class="oe_highlight"/>
                    </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>
              <field name="arch" type="xml">
                  <form string="Merge Opportunities" version="7.0">
                      <header>
-                         <button name="action_merge" type="object" string="_Merge" icon="gtk-ok" class="oe_form_button_active_flow"/>
+                         <button name="action_merge" type="object" string="_Merge" icon="gtk-ok" class="oe_highlight"/>
                      </header>
 -                    <separator string="Select Opportunities"/>
 +                    <group>
 +                        <separator string="Select Opportunities"/>
 +                    </group>
                      <field name="opportunity_ids">
                          <tree>
                              <field name="name" />
            <field name="arch" type="xml">
              <form string="Create a Partner" version="7.0">
                  <header>
-                     <button name="open_create_partner" string="Create Partner" type="object" icon="gtk-ok" groups="base.group_partner_manager"/>
+                     <button name="open_create_partner" string="Create Partner" type="object" icon="gtk-ok" groups="base.group_partner_manager" class="oe_highlight"/>
                  </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>
@@@ -9,11 -9,9 +9,11 @@@
              <field name="arch" type="xml">
                <form string="Event Confirmation" version="7.0">
                    <header>
-                       <button icon="gtk-ok" name="confirm" string="Confirm Anyway" type="object" class="oe_form_button_active_flow"/>
+                       <button icon="gtk-ok" name="confirm" string="Confirm Anyway" type="object" class="oe_highlight"/>
                    </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>
@@@ -8,12 -8,10 +8,12 @@@
              <field name="arch" type="xml">
              <form string="Print Attendance Report Weekly" version="7.0">
                  <header>
-                     <button name="print_report" string="Print" type="object"  icon="gtk-print" class="oe_form_button_active_flow"/>
+                     <button name="print_report" string="Print" type="object"  icon="gtk-print" class="oe_highlight"/>
                  </header>
 -                <field name="init_date"/>
 -                <field name="end_date"/>
 +                <group>
 +                    <field name="init_date"/>
 +                    <field name="end_date"/>
 +                </group>    
              </form>
              </field>
          </record>
@@@ -8,14 -8,12 +8,14 @@@
              <field name="arch" type="xml">
                  <form string="Sign in / Sign out" version="7.0">
                      <header>
-                         <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"/>
+                         <button icon="terp-gtk-jump-to-ltr" string="Sign in" name="si_check" type="object" class="oe_highlight"/>
+                         <button icon="terp-gtk-jump-to-rtl" string="Sign out" name="so_check" type="object" class="oe_highlight"/>
                      </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" />
@@@ -9,11 -9,9 +9,11 @@@
              <field name="arch" type="xml">
                  <form string="Payslips by Employees" version="7.0">
                      <header>
-                         <button icon="gtk-execute" string="Generate" name="compute_sheet" type="object" class="oe_form_button_active_flow"/>
+                         <button icon="gtk-execute" string="Generate" name="compute_sheet" type="object" class="oe_highlight"/>
                      </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/>
@@@ -9,12 -9,10 +9,12 @@@
              <field name="arch" type="xml">
              <form string="Create New Employee" version="7.0">
                  <header>
-                     <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_with_emp" string="Yes" colspan="1" type="object" icon="terp-camera_test" class="oe_highlight"/>
                      <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>
@@@ -8,12 -8,10 +8,12 @@@
              <field name="arch" type="xml">
                  <form string="Sign In/Out by Project" version="7.0">
                      <header>
-                         <button icon="gtk-ok" string="Sign in / Sign out" name="check_state" type="object" class="oe_form_button_active_flow"/>
+                         <button icon="gtk-ok" string="Sign in / Sign out" name="check_state" type="object" class="oe_highlight"/>
                      </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>
@@@ -8,11 -8,9 +8,11 @@@
          <field name="arch" type="xml">
              <form string="My Current Timesheet" version="7.0">
                 <header>
-                     <button  icon="terp-camera_test" name="open_timesheet" string="Open" type="object" class="oe_form_button_active_flow"/>
+                     <button  icon="terp-camera_test" name="open_timesheet" string="Open" type="object" class="oe_highlight"/>
                 </header>
 -               <separator string="It will open your current timesheet"/>
 +               <group>
 +                    <separator string="It will open your current timesheet"/>
 +               </group>
             </form>
          </field>
      </record>
@@@ -8,11 -8,9 +8,11 @@@
        <field name="arch" type="xml">
          <form string="Partner VAT Listing" version="7.0">
            <header>
-             <button name="get_partner" string="View Customers" type="object" icon="terp-partner" class="oe_form_button_active_flow"/>
+             <button name="get_partner" string="View Customers" type="object" icon="terp-partner" class="oe_highlight"/>
            </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/>
@@@ -9,12 -9,10 +9,12 @@@
              <field name="arch" type="xml">
                  <form string="Partner VAT intra" version="7.0">
                      <header>
-                         <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"/>
+                         <button name="create_xml" string="Create _XML" type="object" icon="gtk-execute" class="oe_highlight"/>
+                         <button name="preview" string="_Preview" type="object" icon="gtk-print"  class="oe_highlight"/>
                      </header>
 -                    <separator string="Intracom VAT Declaration"/>
 +                    <group>
 +                        <separator string="Intracom VAT Declaration"/>
 +                    </group>   
                      <notebook colspan="4">
                          <page string="General Information">
                              <group>
@@@ -9,11 -9,9 +9,11 @@@
              <field name="arch" type="xml">
                  <form string="Bilan Report" version="7.0">
                     <header>
-                         <button name="print_bilan_report" string="Print" type="object" icon="gtk-ok" class="oe_form_button_active_flow"/>
+                         <button name="print_bilan_report" string="Print" type="object" icon="gtk-ok" class="oe_highlight"/>
                     </header>
 -                   <field name="fiscalyear_id"/>
 +                   <group>
 +                        <field name="fiscalyear_id"/>
 +                   </group>
                   </form>
              </field>
          </record>
@@@ -9,11 -9,9 +9,11 @@@
              <field name="arch" type="xml">
                  <form string='Compte de resultat' version="7.0">
                      <header>
-                         <button name="print_cdr_report" string="Print" type="object" icon="gtk-ok" class="oe_form_button_active_flow"/>
+                         <button name="print_cdr_report" string="Print" type="object" icon="gtk-ok" class="oe_highlight"/>
                      </header>
 -                    <field name="fiscalyear_id"/>
 +                    <group>
 +                        <field name="fiscalyear_id"/>
 +                    </group>
                   </form>
              </field>
          </record>
              <field name="arch" type="xml">
                  <form string="Reset cashbox" version="7.0">
                      <header>
-                         <button  icon="gtk-ok" name="set_to_zero" string="Set to Zero" type="object" class="oe_form_button_active_flow"/>
+                         <button  icon="gtk-ok" name="set_to_zero" string="Set to Zero" type="object" class="oe_highlight"/>
                      </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>
                  <form string="Change Product Qty" version="7.0">
                      <header>
                          <button name="change_prod_qty" string="Approve"
-                             colspan="1" type="object" icon="gtk-ok" class="oe_form_button_active_flow"/>
+                             colspan="1" type="object" icon="gtk-ok" class="oe_highlight"/>
                      </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>
                  <form string="Product Cost Structure" version="7.0">
                      <header>
                              <button name="print_report" string="Print"
-                             colspan="1" type="object" icon="gtk-print" class="oe_form_button_active_flow" />
+                             colspan="1" type="object" icon="gtk-print" class="oe_highlight" />
                      </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>
                  <form string="Produce" version="7.0">
                      <header>
                          <button name="do_produce" string="Confirm"
-                             colspan="1" type="object" icon="gtk-ok" class="oe_form_button_active_flow"/>
+                             colspan="1" type="object" icon="gtk-ok" class="oe_highlight"/>
                      </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>
                  <form string="Select time unit" version="7.0">
                      <header>
                          <button name="print_report" string="Print"
-                             colspan="1" type="object" icon="gtk-print" class="oe_form_button_active_flow"/>
+                             colspan="1" type="object" icon="gtk-print" class="oe_highlight"/>
                      </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>
              <field name="arch" type="xml">
                  <form string="Cancel Repair Order" version="7.0">
                      <header>
-                         <button name="cancel_repair" string="Yes" type="object" icon="gtk-ok" class="oe_form_button_active_flow" />
+                         <button name="cancel_repair" string="Yes" type="object" icon="gtk-ok" class="oe_highlight" />
                      </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>         
              <field name="arch" type="xml">
                  <form string="Put Money" version="7.0">
                      <header>
-                         <button name="get_in" string="Put Money" type="object" icon="gtk-apply" class="oe_form_button_active_flow" />
+                         <button name="get_in" string="Put Money" type="object" icon="gtk-apply" class="oe_highlight" />
                      </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"/>
              <field name="arch" type="xml">
                  <form string="Apply Discount" version="7.0">
                      <header>
-                         <button name="apply_discount" string="Apply Discount" type="object" icon="gtk-ok" class="oe_form_button_active_flow"/>
+                         <button name="apply_discount" string="Apply Discount" type="object" icon="gtk-ok" class="oe_highlight"/>
                      </header>
 -                    <field name="discount"/>
 +                    <group>
 +                        <field name="discount"/>
 +                    </group>
                  </form>
              </field>
          </record>
                <field name="arch" type="xml">
                  <form string="Receipt :" version="7.0">
                      <header>
-                       <button name="print_report" string="Print Receipt" type="object" icon="gtk-print" class="oe_form_button_active_flow"/>
+                       <button name="print_report" string="Print Receipt" type="object" icon="gtk-print" class="oe_highlight"/>
                      </header>
 -                    <label string="Print the Receipt of the Sale"/>
 +                    <group>
 +                        <label string="Print the Receipt of the Sale"/>
 +                    </group>    
                  </form>
                </field>
          </record>
              <field name="arch" type="xml">
                  <form string="Procurement Request" version="7.0">
                      <header>
-                         <button name="make_procurement" string="Ask New Products" type="object" icon="gtk-ok" class="oe_form_button_active_flow"/>
+                         <button name="make_procurement" string="Ask New Products" type="object" icon="gtk-ok" class="oe_highlight"/>
                      </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"/>
                  <form string="Parameters" version="7.0">
                      <header>
                          <button name="procure_calculation" string="Compute Procurements"
-                             type="object" icon="gtk-ok" class="oe_form_button_active_flow"/>
+                             type="object" icon="gtk-ok" class="oe_highlight"/>
                      </header>
 -                    <label string="This wizard will schedule procurements."/>
 +                    <group>
 +                        <label string="This wizard will schedule procurements."/>
 +                    </group>
                  </form>
              </field>
          </record>
              <field name="arch" type="xml">
                  <form string="Parameters" version="7.0">
                      <header>
-                         <button name="procure_calculation" string="Compute Stock" type="object" icon="gtk-ok" class="oe_form_button_active_flow"/>
+                         <button name="procure_calculation" string="Compute Stock" type="object" icon="gtk-ok" class="oe_highlight"/>
                      </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>
              <field name="arch" type="xml">
                  <form version="7.0">
                      <header>
-                         <button name="go_step_2" string="Share" type="object" icon="gtk-go-forward" class="oe_form_button_active_flow"/>
+                         <button name="go_step_2" string="Share" type="object" icon="gtk-go-forward" class="oe_highlight"/>
                      </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)]}"/>
@@@ -9,12 -9,10 +9,12 @@@
              <field name="arch" type="xml">
                  <form string="Merge Inventories" version="7.0">
                      <header>
-                         <button name="do_merge" string="Yes" type="object" icon="gtk-apply" class="oe_form_button_active_flow"/>
+                         <button name="do_merge" string="Yes" type="object" icon="gtk-apply" class="oe_highlight"/>
                      </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>
@@@ -8,11 -8,9 +8,11 @@@
              <field name="arch" type="xml">
                 <form string="View Stock of Products" version="7.0">
                      <header>
-                         <button name="action_open_window" string="Open Product" type="object" icon="gtk-ok" class="oe_form_button_active_flow"/>
+                         <button name="action_open_window" string="Open Product" type="object" icon="gtk-ok" class="oe_highlight"/>
                      </header>
 -                    <separator string="Stock Location Analysis"/>
 +                    <group>
 +                        <separator string="Stock Location Analysis"/>
 +                    </group>
                      <group>
                          <field name="from_date"/>
                          <field name="to_date"/>
              <field name="arch" type="xml">
                  <form string="Consume Move" version="7.0">
                      <header>
-                         <button name="do_move_consume" string="Ok" type="object" icon="gtk-ok" class="oe_form_button_active_flow"/>
+                         <button name="do_move_consume" string="Ok" type="object" icon="gtk-ok" class="oe_highlight"/>
                      </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>
              <field name="arch" type="xml">
                  <form version="7.0">
                      <header>
-                         <button name="do_partial" string="_Validate" type="object" icon="gtk-go-forward" class="oe_form_button_active_flow"/>
+                         <button name="do_partial" string="_Validate" type="object" icon="gtk-go-forward" class="oe_highlight"/>
                      </header>
 -                    <separator string="Products"/>
 -                    <field name="move_ids"/>
 +                    <group>
 +                        <separator string="Products"/>
 +                        <field name="move_ids"/>
 +                    </group>
                  </form>
              </field>
          </record>
              <field name="arch" type="xml">
                  <form version="7.0">
                      <header>
-                         <button name="do_partial" string="_Transfer" type="object" icon="gtk-go-forward" class="oe_form_button_active_flow"/>
+                         <button name="do_partial" string="_Transfer" type="object" icon="gtk-go-forward" class="oe_highlight"/>
                      </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" />
              <field name="arch" type="xml">
                  <form string="Survey Print Statistics" version="7.0">
                      <header>
-                         <button icon="gtk-print" name="action_next" string="Print" type="object" class="oe_form_button_active_flow"/>
+                         <button icon="gtk-print" name="action_next" string="Print" type="object" class="oe_highlight"/>
                      </header>
 -                    <field name="survey_ids"/>
 +                    <group>
 +                        <field name="survey_ids"/>
 +                    </group>    
                  </form>
              </field>
          </record>
              <field name="arch" type="xml">
                  <form string="Create Menu" version="7.0">
                      <header>
-                         <button name="wiki_menu_create" string="Create Menu" type="object" class="oe_form_button_active_flow"/>
+                         <button name="wiki_menu_create" string="Create Menu" type="object" class="oe_highlight"/>
                      </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>
              <field name="arch" type="xml">
                  <form string="Create Menu" version="7.0">
                      <header>
-                         <button name="wiki_do_index" string="Create Index" type="object" icon="gtk-ok" class="oe_form_button_active_flow"/>
+                         <button name="wiki_do_index" string="Create Index" type="object" icon="gtk-ok" class="oe_highlight"/>
                      </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>
              <field name="arch" type="xml">
                  <form string="Open Page" version="7.0">
                      <header>
-                         <button name="open_wiki_page" string="Open Wiki Page" type="object" icon="gtk-ok" class="oe_form_button_active_flow"/>
+                         <button name="open_wiki_page" string="Open Wiki Page" type="object" icon="gtk-ok" class="oe_highlight"/>
                      </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>