merge

[odoo/odoo.git] / addons / hr_expense / hr_expense_installer_view.xml

diff --git a/addons/hr_expense/hr_expense_installer_view.xml b/addons/hr_expense/hr_expense_installer_view.xml
index 5db69bc..a5c3782 100644 (file)
--- a/addons/hr_expense/hr_expense_installer_view.xml
+++ b/addons/hr_expense/hr_expense_installer_view.xml
@@ -1,21 +1,35 @@
-<?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 editable="bottom" 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="domain">[('hr_expense_ok','=',True)]</field>
+           <field name="view_id" ref="product_expense_installer_tree_view"/>
        </record>
 
        <record id="product_normal_form_view_todo" model="ir.actions.todo">
            <field name="action_id" ref="product_normal_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>