From e6ef77b047dda7fa74fb984ecad078978e0d6ad6 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Thu, 5 Jul 2012 11:29:21 +0200
Subject: [PATCH] [MERGE] hr review of form views

bzr revid: qdp-launchpad@openerp.com-20120705092921-0edv4n7z0392ia83
---
 addons/hr_contract/hr_contract_view.xml       |  2 +-
 addons/hr_evaluation/hr_evaluation_view.xml   | 72 +++++++++----------
 addons/hr_expense/hr_expense.py               |  2 +-
 addons/hr_expense/hr_expense_view.xml         | 33 ++++-----
 addons/hr_expense/report/expense.rml          |  4 +-
 addons/hr_holidays/hr_holidays_view.xml       | 32 +++++----
 addons/hr_payroll/hr_payroll_view.xml         | 63 +++-------------
 .../hr_payroll_account_view.xml               | 21 +++---
 addons/hr_recruitment/hr_recruitment_view.xml |  3 +-
 addons/hr_timesheet/hr_timesheet_view.xml     |  7 +-
 .../hr_timesheet_sheet_view.xml               |  4 +-
 .../l10n_be_hr_payroll_view.xml               |  6 +-
 12 files changed, 97 insertions(+), 152 deletions(-)

diff --git a/addons/hr_contract/hr_contract_view.xml b/addons/hr_contract/hr_contract_view.xml
index 37354045d8f..66f486dc9cc 100644
--- a/addons/hr_contract/hr_contract_view.xml
+++ b/addons/hr_contract/hr_contract_view.xml
@@ -91,7 +91,7 @@
                                     <field name="wage"/>
                                     <field name="advantages" nolabel="1" placeholder="Advantages..." colspan="2"/>
                                 </group>
-                                <group name="left_column" string="Duration">
+                                <group name="duration_group" string="Duration">
                                     <label for="trial_date_start" string="Trial Period Duration"/>
                                     <div>
                                         <field name="trial_date_start" class="oe_inline"/> - <field name="trial_date_end" class="oe_inline"/>
diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index 9988c39ae66..a5efaf42347 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -164,55 +164,49 @@
                 </header>
                 <sheet>
                     <label for="employee_id" class="oe_edit_only"/>
-                    <h1><field name="employee_id" on_change="onchange_employee_id(employee_id)"/></h1>
+                    <h1><field name="employee_id" on_change="onchange_employee_id(employee_id)" class="oe_inline"/>, <field name="date" class="oe_inline"/></h1>
                     <label for="plan_id" class="oe_edit_only"/>
                     <h2><field name="plan_id"/></h2>
                     <group>
-                        <group>
-                            <field name="date"/>
-                        </group>
-                        <group attrs="{'invisible':['|', ('state','=','draft'), ('state', '=', 'wait')]}">
+                        <group colspan="4" attrs="{'invisible':['|', ('state','=','draft'), ('state', '=', 'wait')]}">
                             <field name="rating" attrs="{'readonly':[('state','&lt;&gt;','progress')]}"/>
                             <field name="date_close" readonly="1"/>
                         </group>
                     </group>
-                    <notebook>
-                        <page string="Appraisal" attrs="{'invisible':[('state','=','draft')]}">
-                            <field name="survey_request_ids">
-                                <form string="Interview Appraisal" version="7.0">
-                                    <div class="oe_right oe_button_box">
-                                        <button name="%(survey.action_view_survey_question_message)d" string="Answer Survey" type="action" states="waiting_answer,done,cancel" icon="gtk-execute" context="{'survey_id': survey_id, 'response_id': [response], 'response_no':0, 'active' : response,'request' : True, 'object' : 'hr.evaluation.interview', 'cur_id' : active_id}" attrs="{'readonly':[('survey_id','=',False)]}"/>
-                                        <button name="%(survey.survey_browse_response)d" string="Print Interview" type="action" states="done" icon="gtk-print" context="{'survey_id': survey_id, 'response_id' : [response], 'response_no':0,}" attrs="{'readonly':[('response','=',False)]}" />
-                                    </div>
+                    <group string="Appraisal Forms" attrs="{'invisible':[('state','=','draft')]}">
+                        <field nolabel="1" name="survey_request_ids">
+                            <form string="Interview Appraisal" version="7.0">
+                                <div class="oe_right oe_button_box">
+                                    <button name="%(survey.action_view_survey_question_message)d" string="Answer Survey" type="action" states="waiting_answer,done,cancel" icon="gtk-execute" context="{'survey_id': survey_id, 'response_id': [response], 'response_no':0, 'active' : response,'request' : True, 'object' : 'hr.evaluation.interview', 'cur_id' : active_id}" attrs="{'readonly':[('survey_id','=',False)]}"/>
+                                    <button name="%(survey.survey_browse_response)d" string="Print Interview" type="action" states="done" icon="gtk-print" context="{'survey_id': survey_id, 'response_id' : [response], 'response_no':0,}" attrs="{'readonly':[('response','=',False)]}" />
+                                </div>
+                                <group>
                                     <group>
-                                        <group>
-                                            <field name="survey_id"/>
-                                            <field name="user_to_review_id"/>
-                                            <field name="user_id" string="Interviewer"/>
-                                        </group>
-                                        <group>
-                                            
-                                            <field name="date_deadline"/>
-                                            <field name="response" readonly="1"/>
-                                        </group>
+                                        <field name="survey_id"/>
+                                        <field name="user_to_review_id"/>
+                                        <field name="user_id" string="Interviewer"/>
                                     </group>
-                                    <group col="4" string="Status" invisible="1">
-                                         <field name="state"/>
-                                         <div>
-                                             <button string="Done" name="survey_req_done" states="waiting_answer" type="object" icon="gtk-jump-to" />
-                                         </div>
+                                    <group>              
+                                        <field name="date_deadline"/>
+                                        <field name="response" readonly="1"/>
                                     </group>
-                                </form>
-                            </field>
-                        </page>
-                        <page string="Internal Notes" attrs="{'invisible':[('state','=','draft')]}">
-                            <field name="note_action"
-                                groups="base.group_hr_manager"/>
-                        </page>
-                        <page string="Public Notes" attrs="{'invisible':[('state','=','draft')]}">
-                            <field name="note_summary"/>
-                        </page>
-                    </notebook>
+                                </group>
+                                <group col="4" string="Status" invisible="1">
+                                     <field name="state"/>
+                                     <div>
+                                         <button string="Done" name="survey_req_done" states="waiting_answer" type="object" icon="gtk-jump-to" />
+                                     </div>
+                                </group>
+                            </form>
+                        </field>
+                    </group>
+                    <group string="Internal Notes" attrs="{'invisible':[('state','=','draft')]}">
+                        <field nolabel="1" name="note_action"
+                            groups="base.group_hr_manager" placeholder="Appraisal Summary..."/>
+                    </group>
+                    <group string="Public Notes" attrs="{'invisible':[('state','=','draft')]}">
+                        <field nolabel="1" name="note_summary" placeholder="Action Plan..."/>
+                    </group>
               </sheet>
               </form>
             </field>
diff --git a/addons/hr_expense/hr_expense.py b/addons/hr_expense/hr_expense.py
index 9d7ec10cc28..b1192701dfb 100644
--- a/addons/hr_expense/hr_expense.py
+++ b/addons/hr_expense/hr_expense.py
@@ -56,12 +56,12 @@ class hr_expense_expense(osv.osv):
             return self.pool.get('res.currency').search(cr, uid, [('rate','=',1.0)], context=context)[0]
 
     _name = "hr.expense.expense"
+    _inherit = ['mail.thread']
     _description = "Expense"
     _order = "id desc"
     _columns = {
         'name': fields.char('Description', size=128, required=True),
         'id': fields.integer('Sheet ID', readonly=True),
-        'ref': fields.char('Reference', size=32),
         'date': fields.date('Date', select=True),
         'journal_id': fields.many2one('account.journal', 'Force Journal', help = "The journal used when the expense is invoiced"),
         'employee_id': fields.many2one('hr.employee', "Employee", required=True),
diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index ec2ff849ecb..b8868c3319f 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -49,7 +49,6 @@
                     <field name="employee_id"/>
                     <field name="date"/>
                     <field name="department_id"/>
-                    <field name="ref"/>
                     <field name="name"/>
                     <field name="amount"/>
                     <field name="state"/>
@@ -74,14 +73,18 @@
                     <field name="state" widget="statusbar" statusbar_visible="draft,confirm,accepted" statusbar_colors='{"confirm":"blue","cancelled":"red"}'/>
                 </header>
                 <sheet>
-                    <group col="4">
-                        <field name="employee_id" on_change="onchange_employee_id(employee_id)"/>
-                        <field name="name"/>
-                        <field name="ref"/>
-                        <field name="date"/>
-                        <field name="currency_id"/>
-                        <field name="department_id"/>
-                        <field name="company_id" groups="base.group_multi_company"/>
+                    <group>
+                        <group>
+                            <field name="employee_id" on_change="onchange_employee_id(employee_id)"/>
+                            <field name="date"/>
+                            <field name="department_id"/>
+                            <field name="company_id" groups="base.group_multi_company"/>
+                        </group>
+                        <group>
+                            <field name="name"/>
+                            <field name="user_valid"/>
+                            <field name="currency_id"/>
+                        </group>
                     </group>
                     <notebook>
                         <page string="Description">
@@ -106,6 +109,8 @@
                                     </group>
                                 </form>
                             </field>
+                            <separator string="Notes"/>
+                            <field name="note" placeholder="Free Notes"/>
                         </page>
                         <page string="Other Info">
                             <group>
@@ -113,17 +118,13 @@
                                     <field name="journal_id"/>
                                     <field name="invoice_id" context="{'type':'in_invoice', 'journal_type': 'purchase'}"/>
                                 </group>
-                                <group groups="base.group_no_one" string="Validation">
-                                    <field name="date_confirm" readonly="1"/>
-                                    <field name="date_valid" readonly="1"/>
-                                    <field name="user_valid"/>
-                                </group>
                             </group>
-                            <separator string="Notes"/>
-                            <field name="note"/>
                         </page>
                     </notebook>
                 </sheet>
+                <footer>
+                    <field name="message_ids" widget="mail_thread"/>
+                </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/hr_expense/report/expense.rml b/addons/hr_expense/report/expense.rml
index d0d73aa5ca4..bf456cfc4d6 100644
--- a/addons/hr_expense/report/expense.rml
+++ b/addons/hr_expense/report/expense.rml
@@ -160,7 +160,7 @@
           <para style="terp_tblheader_General_Centre">Date</para>
         </td>
         <td>
-          <para style="terp_tblheader_General_Centre">Reference</para>
+          <para style="terp_tblheader_General_Centre">Description</para>
         </td>
         <td>
           <para style="terp_tblheader_General_Centre">Validated By</para>
@@ -176,7 +176,7 @@
           <para style="terp_default_Centre_8">[[ formatLang(o.date,date=True) ]]</para>
         </td>
         <td>
-          <para style="terp_default_Centre_8">[[ o.ref ]]</para>
+          <para style="terp_default_Centre_8">[[ o.name ]]</para>
         </td>
         <td>
           <para style="terp_default_Centre_8">[[ o.user_valid.name ]]</para>
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 01d066b62f4..1237cdb14f4 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -420,20 +420,24 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Leave Type" version="7.0">
-                    <sheet>
-                        <group>
-                            <group>
-                                <field name="name"/>
-                                <field name="categ_id"/>
-                                <field name="color_name"/>
-                                <field name="active"/>
-                            </group>
-                            <group>
-                                <field name="double_validation"/>
-                                <field name="limit"/>
-                            </group>
-                        </group>
-                    </sheet>
+                    <group col="4">
+                        <field name="name"/>
+                        <field name="categ_id"/>
+                    </group>
+                    <notebook>
+                      <page string="Details">
+                          <group>
+                              <group name="selection" string="Validation">
+                                  <field name="double_validation"/>
+                                  <field name="limit"/>
+                              </group>
+                              <group name="second" string="Misc">
+                                  <field name="color_name"/>
+                                  <field name="active"/>
+                              </group>
+                          </group>
+                      </page>
+                    </notebook>
                 </form>
             </field>
         </record>
diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index a6674e01bac..bae89ed215b 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -7,36 +7,6 @@
         <menuitem id="menu_hr_root_payroll" parent="hr.menu_hr_root" name="Payroll" sequence="30"/>
         <menuitem id="menu_hr_payroll_reporting" parent="hr.menu_hr_reporting" name="Payroll" groups="base.group_hr_manager"/>
 
-        <!-- Employee View -->
-        <record id="hr_contract.hr_hr_employee_view_form2" model="ir.ui.view">
-            <field name="name">hr.hr.employee.view.form2</field>
-            <field name="model">hr.employee</field>
-            <field name="inherit_id" ref="hr.view_employee_form"/>
-            <field name="arch" type="xml">
-            <data>
-                <xpath expr="//page[@string='Personal Information']" position="after">
-                    <page string="Miscellaneous" groups="base.group_hr_user">
-                        <group colspan="2" col="2">
-                            <separator string="Personal Info" colspan="2"/>
-                            <field name="bank_account_id" context="{'display_partner':True, 'partner_id':partner_id}"/>
-                            <field name="place_of_birth"/>
-                            <field name="children"/>
-                            <!-- <field name="basic" invisible="0"/> -->
-                        </group>
-                        <group colspan="2" col="2">
-                            <separator string="Job Info" colspan="2"/>
-                            <field name="manager" />
-                            <field name="vehicle" />
-                            <field name="vehicle_distance" />
-                            <field name="medic_exam"  string="Medical Examination"/>
-                        </group>
-                    </page>
-                </xpath>
-            </data>
-            </field>
-        </record>
-        <!-- End Employee View -->
-
         <!-- Contract View -->
         <record id="hr_contract_form_inherit" model="ir.ui.view">
             <field name="name">hr.contract.view.form.inherit</field>
@@ -291,6 +261,7 @@
                     </group>
                     <notebook>
                         <page string="Worked Days &amp; Inputs">
+                            <separator string="Worked Days"/>
                             <field name="worked_days_line_ids">
                                 <tree string="Worked Days" editable="bottom">
                                     <field name="name"/>
@@ -312,6 +283,7 @@
                                     </group>
                                 </form>
                             </field>
+                            <separator string="Other Inputs"/>
                             <field name="input_line_ids" colspan="4" nolabel="1">
                                 <tree string="Input Data" editable="bottom">
                                     <field name="name"/>
@@ -371,12 +343,13 @@
                        </page>
                        <page string="Other Information">
                             <group>
-                                <group>
+                                <group string="Miscellaneous">
                                     <field name="company_id" groups="base.group_multi_company"/>
                                     <field name="payslip_run_id" domain="[('state','=','draft')]"/>
+                                </group>
+                                <group name="accounting" string="Accounting">
                                     <field name="paid" readonly="1"/>
                                 </group>
-                                <group/>
                             </group>
                             <div colspan="4">
                                 <field name="note" Placeholder="Add an internal note..."/>
@@ -435,8 +408,8 @@
                     groups="base.group_hr_manager"/>
 
         <!-- Employee View -->
-        <record id="hr_contract.hr_hr_employee_view_form2" model="ir.ui.view">
-            <field name="name">hr.hr.employee.view.form2</field>
+        <record id="payroll_hr_employee_view_form" model="ir.ui.view">
+            <field name="name">payroll.hr.employee.view.form</field>
             <field name="model">hr.employee</field>
             <field name="inherit_id" ref="hr.view_employee_form"/>
             <field name="arch" type="xml">
@@ -444,27 +417,6 @@
                     <xpath expr="//div[@name='button_box']" position="inside">
                         <button name="%(act_hr_employee_payslip_list)d" string="Payslips" type="action"/>
                     </xpath>
-                    <xpath expr="//field[@name='parent_id']" position="before">
-                        <field name="manager"/>
-                    </xpath>
-                    <xpath expr="//group[@name='active_group']" position="before">
-                        <group>
-                            <field name="vehicle"/>
-                            <field name="vehicle_distance"/>
-                        </group>
-                    </xpath>
-                    <field name="active" position="before">
-                        <field name="medic_exam" string="Medical Examination"/>
-                    </field>
-                    <field name="birthday" position="before">
-                        <field name="children"/>
-                    </field>
-                    <field name="birthday" position="after">
-                        <field name="place_of_birth"/>
-                    </field>
-                    <field name="bank_account_id" position="replace">
-                        <field name="bank_account_id" context="{'display_partner':True, 'partner_id':partner_id}"/>
-                    </field>
                 </data>
             </field>
         </record>
@@ -797,6 +749,7 @@
                     <group col="4">
                         <field name="credit_note"/>
                     </group>
+                    <separator string="Payslips"/>
                     <field name="slip_ids"/>
                 </sheet>
                 </form>
diff --git a/addons/hr_payroll_account/hr_payroll_account_view.xml b/addons/hr_payroll_account/hr_payroll_account_view.xml
index 03c625e054a..9e3aab3ecb6 100644
--- a/addons/hr_payroll_account/hr_payroll_account_view.xml
+++ b/addons/hr_payroll_account/hr_payroll_account_view.xml
@@ -2,8 +2,6 @@
 <openerp>
     <data>
 
-
-
         <record model="ir.ui.view" id="view_hr_payslip_inherit_form">
             <field name="name">hr.payslip.inherit.form</field>
             <field name="model">hr.payslip</field>
@@ -27,10 +25,12 @@
             <field name="arch" type="xml">
               <xpath expr="/form/notebook/page[@string='Child Rules']" position="after">
                     <page string="Accounting">
-                        <field name="account_debit" />
-                        <field name="account_credit"/>
-                        <field name="analytic_account_id" groups="analytic.group_analytic_accounting"/>
-                        <field name="account_tax_id"/>
+                        <group colspan="4">
+                            <field name="account_debit" />
+                            <field name="account_credit"/>
+                            <field name="analytic_account_id" groups="analytic.group_analytic_accounting"/>
+                            <field name="account_tax_id"/>
+                        </group>
                     </page>
                 </xpath>
             </field>
@@ -44,7 +44,7 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="hr_contract.hr_contract_view_form"/>
             <field name="arch" type="xml">
-                <xpath expr="//group[@name='trail']" position="after">
+                <xpath expr="//group[@name='duration_group']" position="after">
                    <group string="Accounting">
                         <field name="analytic_account_id" groups="analytic.group_analytic_accounting"/>
                         <field name="journal_id"/>
@@ -52,7 +52,7 @@
                 </xpath>
             </field>
         </record>
-        
+
     <!-- Payslip Run View -->
 
         <record id="hr_payslip_run_search_inherit" model="ir.ui.view">
@@ -86,12 +86,11 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="hr_payroll.hr_payslip_run_form"/>
             <field name="arch" type="xml">
-                <field name="date_end" position="after">
-                    <newline/>
+                <field name="credit_note" position="before">
                     <field name="journal_id"/>
                 </field>
             </field>
         </record>
-        
+
     </data>
 </openerp>
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 3cb29348089..c8230787cfe 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -145,8 +145,7 @@
                     <button name="action_print_survey" type="object"
                         string="Print Interview" icon="gtk-print" help="Print interview report"
                         attrs="{'invisible':[('survey','=',False)]}"/>
-                </div>
-                
+                </div>             
                 <div class="oe_title">
                     <label for="name" class="oe_edit_only"/>
                     <h1><field name="name"/></h1>
diff --git a/addons/hr_timesheet/hr_timesheet_view.xml b/addons/hr_timesheet/hr_timesheet_view.xml
index 399c31c148b..7875aff12a0 100644
--- a/addons/hr_timesheet/hr_timesheet_view.xml
+++ b/addons/hr_timesheet/hr_timesheet_view.xml
@@ -42,7 +42,7 @@
                         <group>
                             <group string="Product">
                                 <field name="product_id" on_change="on_change_unit_amount(product_id, unit_amount, False, product_uom_id,journal_id)" required="1" domain="[('type','=','service')]"/>
-                                <label string="Quantity" for="unit_amount" align="1.0"/>
+                                <label string="Quantity" for="unit_amount"/>
                                 <div>
                                     <field name="unit_amount" on_change="on_change_unit_amount(product_id, unit_amount, False, product_uom_id,journal_id)" class="oe_inline"/>
                                     <field name="product_uom_id" on_change="on_change_unit_amount(product_id, unit_amount, False, product_uom_id,journal_id)" class="oe_inline"/>
@@ -123,10 +123,7 @@
             <field name="arch" type="xml">
                 <page string="Personal Information" position="after">
                     <page string="Timesheets" groups="base.group_hr_user">
-                        <div class="oe_right oe_button_box" name="button_timesheet">
-                            <!-- Put here related buttons -->
-                        </div>
-                        <group col="4">
+                        <group>
                             <group col="2">
                                 <field name="product_id" domain="[('type','=','service')]"/>
                                 <field name="journal_id"/>
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index 649b5334c50..6635c38b909 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -348,7 +348,7 @@
                 </tree>
             </field>
         </record>
-        
+
   <!-- Timesheet Button on Employee Form -->
   <act_window
            context="{'search_default_employee_id': [active_id], 'default_employee_id': active_id}"
@@ -359,7 +359,7 @@
             <field name="model">hr.employee</field>
             <field name="inherit_id" ref="hr_timesheet.hr_timesheet_employee_extd_form"/>
             <field name="arch" type="xml">
-                <xpath expr="//div[@name='button_timesheet']" position="inside">
+                <xpath expr="//div[@name='button_box']" position="inside">
                     <button name="%(act_hr_employee_2_hr_timesheet)d" string="Timesheets" type="action"/>
                 </xpath>
             </field>
diff --git a/addons/l10n_be_hr_payroll/l10n_be_hr_payroll_view.xml b/addons/l10n_be_hr_payroll/l10n_be_hr_payroll_view.xml
index d295888d8b5..79c7c08ffca 100644
--- a/addons/l10n_be_hr_payroll/l10n_be_hr_payroll_view.xml
+++ b/addons/l10n_be_hr_payroll/l10n_be_hr_payroll_view.xml
@@ -12,16 +12,14 @@
                  <xpath expr="//field[@name='struct_id']" position="after">
                     <field name="travel_reimbursement_amount"/>
                     <field name="car_company_amount"/>
+                    <field name="car_employee_deduction"/>
                     <field name="misc_onss_deduction"/>
                     <field name="meal_voucher_amount"/>
+                    <field name="meal_voucher_employee_deduction"/>
                     <field name="misc_advantage_amount"/>
-                 </xpath>
-                 <xpath expr="//field[@name='advantages']" position="before">
                     <field name="additional_net_amount"/>
                     <field name="retained_net_amount"/>
                     <field name="insurance_employee_deduction"/>
-                    <field name="meal_voucher_employee_deduction"/>
-                    <field name="car_employee_deduction"/>
                  </xpath>
             </data>
             </field>