[IMP]hr_payroll: resolve conflicts

bzr revid: pat@tinyerp.com-20120716055914-ps31ejm29hlez34y

diff --cc addons/hr_payroll/hr_payroll_view.xml
index f4f60e2,bae89ed..6d28ed5
--- 1/addons/hr_payroll/hr_payroll_view.xml
--- 2/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@@ -7,36 -7,6 +7,7 @@@
          <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"/>
-                             <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>

diff --cc addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
Simple merge

diff --cc addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
Simple merge