From 1e5fc17c9d3b23b0465fa9f61fdd341758c97dd5 Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Tue, 26 Jul 2011 19:02:55 +0530
Subject: [PATCH 1/3] [IMP]hr_expense,hr_recruitment:Remove a configure your
 services and improve Config Review Your Expenses

bzr revid: mma@tinyerp.com-20110726133255-jhx0zwcisp2ql3h3
---
 .../hr_expense/hr_expense_installer_view.xml  | 19 ++++++++-
 addons/hr_recruitment/hr_recruitment_view.xml |  2 +-
 addons/hr_timesheet_invoice/__openerp__.py    |  1 -
 .../hr_timesheet_invoice_installer_view.xml   | 42 -------------------
 4 files changed, 18 insertions(+), 46 deletions(-)
 delete mode 100644 addons/hr_timesheet_invoice/hr_timesheet_invoice_installer_view.xml

diff --git a/addons/hr_expense/hr_expense_installer_view.xml b/addons/hr_expense/hr_expense_installer_view.xml
index aa0ecbd1ae1..ec466f37dd2 100644
--- a/addons/hr_expense/hr_expense_installer_view.xml
+++ b/addons/hr_expense/hr_expense_installer_view.xml
@@ -1,14 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
   <data>
- <record model="ir.actions.act_window" id="product_normal_form_view_installer">
+        <record id="product_expense_installer_tree_view" model="ir.ui.view">
+            <field name="name">product.product.tree</field>
+            <field name="model">product.product</field>
+            <field name="type">tree</field>
+            <field eval="7" name="priority"/>
+            <field name="arch" type="xml">
+                <tree string="Products">
+                    <field name="name"/>
+                    <field name="standard_price"/>
+                    <field name="list_price"/>
+                    <field name="uom_id" string="UoM"/>
+                </tree>
+            </field>
+        </record> 
+ 
+        <record model="ir.actions.act_window" id="product_normal_form_view_installer">
            <field name="name">Review Your Expenses Products</field>
            <field name="type">ir.actions.act_window</field>
            <field name="res_model">product.product</field>
            <field name="view_type">form</field>
            <field name="view_mode">tree,form</field>
            <field name="context" eval="'{\'default_type\':\'service\',\'default_procure_method\':\'make_to_stock\',\'default_supply_method\':\'buy\',\'default_purchase_ok\':True, \'default_sale_ok\':False, \'default_hr_expense_ok\':True,\'default_categ_id\': ' + str(ref('cat_expense')) +'}'"/>
-           <field name="view_id" ref="product.product_normal_form_view"/>
+           <field name="view_id" ref="product_expense_installer_tree_view"/>
        </record>
 
        <record id="product_normal_form_view_todo" model="ir.actions.todo">
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 28c69394e96..0e98ea03030 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -330,7 +330,7 @@
                 <group colspan="4" col="6">
                     <separator string="Stage Definition" colspan="6"/>
                     <field name="name" select="1"/>
-                    <field name="department_id"/>
+                    <field name="department_id" groups="base.group_extended"/>
                     <field name="sequence"/>
                 </group>
                 <separator string="Requirements" colspan="4"/>
diff --git a/addons/hr_timesheet_invoice/__openerp__.py b/addons/hr_timesheet_invoice/__openerp__.py
index 5d5e41ecbb0..95682d00ef0 100644
--- a/addons/hr_timesheet_invoice/__openerp__.py
+++ b/addons/hr_timesheet_invoice/__openerp__.py
@@ -47,7 +47,6 @@ reports, etc.""",
         'wizard/hr_timesheet_invoice_create_view.xml',
         'wizard/hr_timesheet_invoice_create_final_view.xml',
         'board_hr_timesheet_invoice.xml',
-        'hr_timesheet_invoice_installer_view.xml'
     ],
     'demo': [
         'hr_timesheet_invoice_demo.xml',
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_installer_view.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_installer_view.xml
deleted file mode 100644
index 22d12db6ec8..00000000000
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_installer_view.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
- 
-        <!--  Configure Your Services Config Wiz  -->
-
-        <record id="product_timesheet_invoice_tree_view" model="ir.ui.view">
-            <field name="name">product.product.tree</field>
-            <field name="model">product.product</field>
-            <field name="type">tree</field>
-            <field eval="7" name="priority"/>
-            <field name="arch" type="xml">
-                <tree colors="red:virtual_available&lt;0;blue:virtual_available&gt;=0 and state in ('draft', 'end', 'obsolete');black:virtual_available&gt;=0 and state not in ('draft', 'end', 'obsolete')" string="Products">
-                    <field name="name"/>
-                    <field name="standard_price"/>
-                    <field name="lst_price"/>
-                    <field name="uom_id" string="UoM"/>
-                </tree>
-            </field>
-        </record>       
-
-        <record model="ir.actions.act_window" id="product_services_form_view_installer">
-           <field name="name">Configure Your Services</field>
-           <field name="type">ir.actions.act_window</field>
-           <field name="res_model">product.product</field>
-           <field name="view_type">form</field>
-           <field name="view_mode">tree,form</field>
-           <field name="domain">[('type','=','service')]</field>
-           <field name="context" eval="'{\'default_type\':\'service\', \'default_sale_ok\':True, \'default_hr_expense_ok\':False,}'"/>
-           <field name="view_id" ref="product_timesheet_invoice_tree_view"/>
-       </record>
-
-       <record id="product_services_form_view_todo" model="ir.actions.todo">
-           <field name="action_id" ref="product_services_form_view_installer"/>
-           <field name="category_id" ref="hr.category_hr_management_config"/>
-           <field name="sequence">3</field>
-           <field name="type">normal</field>
-           <field name="state">skip</field>
-       </record>
-
-    </data>
-</openerp>
\ No newline at end of file

From a79f1c67bd0f0a6941018b9be209c111cdf95cdb Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Wed, 27 Jul 2011 14:38:02 +0530
Subject: [PATCH 2/3] [IMP]hr_expense:Improvement is done as per suggestion

bzr revid: mma@tinyerp.com-20110727090802-eskarem75xfwyf1k
---
 addons/hr_expense/hr_expense_installer_view.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/hr_expense/hr_expense_installer_view.xml b/addons/hr_expense/hr_expense_installer_view.xml
index ec466f37dd2..f93493e94fe 100644
--- a/addons/hr_expense/hr_expense_installer_view.xml
+++ b/addons/hr_expense/hr_expense_installer_view.xml
@@ -7,7 +7,7 @@
             <field name="type">tree</field>
             <field eval="7" name="priority"/>
             <field name="arch" type="xml">
-                <tree string="Products">
+                <tree editable="bottom" string="Products">
                     <field name="name"/>
                     <field name="standard_price"/>
                     <field name="list_price"/>
@@ -23,6 +23,7 @@
            <field name="view_type">form</field>
            <field name="view_mode">tree,form</field>
            <field name="context" eval="'{\'default_type\':\'service\',\'default_procure_method\':\'make_to_stock\',\'default_supply_method\':\'buy\',\'default_purchase_ok\':True, \'default_sale_ok\':False, \'default_hr_expense_ok\':True,\'default_categ_id\': ' + str(ref('cat_expense')) +'}'"/>
+           <field name="domain">[('hr_expense_ok','=',True)]</field>
            <field name="view_id" ref="product_expense_installer_tree_view"/>
        </record>
 

From fd361f326e1762662130ef86c651bcd48596e269 Mon Sep 17 00:00:00 2001
From: "Rucha (Open ERP)" <rpa@tinyerp.com>
Date: Wed, 27 Jul 2011 15:19:53 +0530
Subject: [PATCH 3/3] [IMP]: hr_expense: Minor Improvement in demo

bzr revid: rpa@tinyerp.com-20110727094953-l0zx1c3o231xqn1r
---
 addons/hr_expense/hr_expense_demo.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/hr_expense/hr_expense_demo.xml b/addons/hr_expense/hr_expense_demo.xml
index 49afbd8523c..ea19a396b3e 100644
--- a/addons/hr_expense/hr_expense_demo.xml
+++ b/addons/hr_expense/hr_expense_demo.xml
@@ -27,13 +27,13 @@
         </record>
 
         <record id="product_product_expense_car" model="product.product">
-            <field name="list_price">0.30</field>
-            <field name="standard_price">0.30</field>
+            <field name="list_price">0.32</field>
+            <field name="standard_price">0.32</field>
             <field name="uom_id" ref="product.product_uom_km"/>
             <field name="uom_po_id" ref="product.product_uom_km"/>
             <field name="type">consu</field>
-            <field name="name">Car Travel</field>
-            <field name="default_code">CAR</field>
+            <field name="name">Travel Expenses</field>
+            <field name="default_code">TRA</field>
             <field name="categ_id" ref="product.cat2"/>
             <field name="hr_expense_ok" eval="True" />
         </record>