From 5eb7a02e0721032b2b097291e8e58adfb2d034b4 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sun, 13 Jun 2010 00:33:23 +0200
Subject: [PATCH] [FIX] removed action by mistake

bzr revid: fp@tinyerp.com-20100612223323-2gtw8kn6w0gfpz30
---
 addons/hr_contract/hr_contract.py       |  4 +-
 addons/hr_contract/hr_contract_view.xml | 54 +++----------------------
 addons/sale/sale_view.xml               |  9 +++++
 3 files changed, 17 insertions(+), 50 deletions(-)

diff --git a/addons/hr_contract/hr_contract.py b/addons/hr_contract/hr_contract.py
index ddc29bd26a1..90889b6343e 100644
--- a/addons/hr_contract/hr_contract.py
+++ b/addons/hr_contract/hr_contract.py
@@ -27,11 +27,11 @@ class hr_employee(osv.osv):
     _description = "Employee"
     _inherit = "hr.employee"
     _columns = {
-        'manager': fields.boolean('Manager'),
+        'manager': fields.boolean('Is a Manager'),
         'medic_exam': fields.date('Medical Examination Date'),
         'place_of_birth': fields.char('Place of Birth', size=30),
         'children': fields.integer('Number of Children'),
-        'vehicle': fields.integer('Company Vehicle'),
+        'vehicle': fields.char('Company Vehicle', size=64),
         'vehicle_distance': fields.integer('Home-Work Distance', help="In kilometers"),
         'contract_ids': fields.one2many('hr.contract', 'employee_id', 'Contracts'),
     }
diff --git a/addons/hr_contract/hr_contract_view.xml b/addons/hr_contract/hr_contract_view.xml
index be13b0b05d2..0b92bcc986a 100644
--- a/addons/hr_contract/hr_contract_view.xml
+++ b/addons/hr_contract/hr_contract_view.xml
@@ -69,47 +69,6 @@
             <field name="inherit_id" ref="hr.view_employee_form"/>
             <field name="arch" type="xml">
                 <notebook position="inside">
-                    <page string="Contracts">
-                        <field colspan="4" mode="form,tree" name="contract_ids" nolabel="1">
-                            <tree string="Contracts">
-                                <field name="name"/>
-                                <field name="job_id"/>
-                                <field name="date_start"/>
-                                <field name="date_end"/>
-                                <field name="working_hours"/>
-                                <field name="wage_type_id"/>
-                                <field name="wage"/>
-                            </tree>
-                            <form string="Contract">
-                                <group colspan="3" col="6">
-                                    <field name="name" select="1"/>
-                                    <field name="job_id"/>
-                                    <newline/>
-                                    <field name="wage"/>
-                                    <field name="wage_type_id" widget="selection"/>
-                                    <field name="type_id" widget="selection"/>
-                                </group>
-                                <notebook>
-                                <page string="Main Data">
-                                    <group col="2" colspan="2">
-                                        <separator colspan="2" string="Duration"/>
-                                        <field name="date_start" select="1"/>
-                                        <field name="date_end" select="1"/>
-                                        <field name="working_hours"/>
-                                    </group>
-                                    <group col="2" colspan="2">
-                                        <separator colspan="2" string="Advantages"/>
-                                        <field name="advantages_net"/>
-                                        <field name="advantages_gross"/>
-                                        <field name="advantages" nolabel="1" colspan="2"/>
-                                    </group>
-                                    <separator colspan="4" string="Notes"/>
-                                    <field colspan="4" name="notes" nolabel="1"/>
-                                </page>
-                                </notebook>
-                            </form>
-                        </field>
-                    </page>
                     <page string="Miscelleanous">
                         <group colspan="2" col="2">
                             <separator string="Personal Info" colspan="2"/>
@@ -122,7 +81,6 @@
                             <field name="manager" select="1"/>
                             <field name="vehicle" select="1"/>
                             <field name="vehicle_distance" select="1"/>
-                            <field name="medic_exam" select="1"/>
                         </group>
                         <group colspan="2" col="2">
                             <separator string="Others Info" colspan="2"/>
@@ -140,15 +98,15 @@
             <field name="arch" type="xml">
                 <search string="Search Contract">
                    <group col='15' colspan='4'>
-                           <field name="name"/>
-                          <field name="employee_id"/>
-                           <field name="date_start"/>
-                           <field name="date_end"/>
+                       <field name="name"/>
+                       <field name="employee_id"/>
+                       <field name="date_start"/>
+                       <field name="date_end"/>
                    </group>
                    <newline/>
                    <group expand="0" string="Group By..." colspan="4" col="20">
-                        <filter string="Wage Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'wage_type_id'}"/>
-                    </group>
+                       <filter string="Wage Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'wage_type_id'}"/>
+                   </group>
                </search>
             </field>
         </record>
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 92176545cde..088daf40fe8 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -91,6 +91,15 @@
             </field>
         </record>
 
+        <act_window name="Partial Invoice"
+           res_model="sale.advance.payment.inv"
+           src_model="sale.order"
+           view_mode="form"
+           target="new"
+           key2="client_action_multi"
+           id="action_view_sale_advance_payment_inv"/> 
+
+
         <record id="view_order_form" model="ir.ui.view">
             <field name="name">sale.order.form</field>
             <field name="model">sale.order</field>