odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[IMP,FIX]: hr_expense: Improvements in Menus and fixed problem of id in csv data file 

bzr revid: rpa@tinyerp.com-20091125092632-h1ybauokn8dz198f
This commit is contained in:
rpa (Open ERP) 2009-11-25 14:56:32 +05:30
parent 0aa6a883c5
commit c216cb323c
2 changed files with 23 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
addons/hr_expense/hr.expense.expense.csv
View File

@ -1,3 +1,3 @@
name,ref,employee_id,line_ids/date_value,line_ids/name,line_ids/analytic_account,line_ids/unit_quantity,line_ids/ref,line_ids/unit_amount
September Expenses,09/06,Fabien Pinckaers,2006-09-05,Travel by Car - Customer Seagate 2 - Double,Thymbra,130.0,,0.22
,,,2006-09-05,Basic PC - Server for Seagate,Seagate P2,1.0,S1234435,300.0
"id","name","ref","employee_id","line_ids/date_value","line_ids/name","line_ids/analytic_account","line_ids/unit_quantity","line_ids/ref","line_ids/unit_amount"
1,"September Expenses",09/06/09,"Fabien Pinckaers",05/09/06,"Travel by Car - Customer Seagate 2 - Double","Thymbra",130,,0.22
,,,,05/09/06,"Basic PC - Server for Seagate","Seagate P2",1,"S1234435",300

1 id name ref employee_id line_ids/date_value line_ids/name line_ids/analytic_account line_ids/unit_quantity line_ids/ref line_ids/unit_amount
2 1 September Expenses 09/06 09/06/09 Fabien Pinckaers 2006-09-05 05/09/06 Travel by Car - Customer Seagate 2 - Double Thymbra 130.0 130 0.22
3 2006-09-05 05/09/06 Basic PC - Server for Seagate Seagate P2 1.0 1 S1234435 300.0 300

103
addons/hr_expense/hr_expense_view.xml
View File

@ -1,7 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
<!-- Expenses -->
<record id="view_expenses_line_tree" model="ir.ui.view">
<field name="name">hr.expense.line.tree</field>
<field name="type">tree</field>
@ -34,6 +36,8 @@
</tree>
</field>
</record>
<record id="view_expenses_form" model="ir.ui.view">
<field name="name">hr.expense.form</field>
<field name="type">form</field>
@ -93,6 +97,7 @@
</field>
</record>
<record id="view_hr_expense_filter" model="ir.ui.view">
<field name="name">hr.expense.expense.filter</field>
<field name="model">hr.expense.expense</field>
@ -120,59 +125,18 @@
<field name="view_type">form</field>
<field name="search_view_id" ref="view_hr_expense_filter"/>
</record>
<menuitem
id="next_id_49"
name="Expenses"
parent="hr.menu_hr_root"/>
<menuitem
action="expense_all"
id="menu_expense_all"
parent="next_id_49"
groups="hr.group_hr_manager"/>
<record id="expense_all_draft" model="ir.actions.act_window">
<field name="name">Draft expenses</field>
<field name="res_model">hr.expense.expense</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="domain">[('state','=','draft')]</field>
<field name="filter" eval="True"/>
<field name="search_view_id" ref="view_hr_expense_filter"/>
</record>
<menuitem action="expense_all_draft" id="menu_expense_all_draft" parent="hr_expense.menu_expense_all" groups="base.group_extended"/>
<record id="expense_all_confirm" model="ir.actions.act_window">
<field name="name">Expenses waiting validation</field>
<field name="res_model">hr.expense.expense</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="domain">[('state','=','confirm')]</field>
<field name="filter" eval="True"/>
<field name="search_view_id" ref="view_hr_expense_filter"/>
</record>
<menuitem action="expense_all_confirm" id="menu_expense_all_confirm" parent="hr_expense.menu_expense_all" groups="base.group_extended"/>
<record id="expense_all_valid" model="ir.actions.act_window">
<field name="name">Expenses waiting invoice</field>
<field name="res_model">hr.expense.expense</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="domain">[('state','=','accepted')]</field>
<field name="filter" eval="True"/>
<field name="search_view_id" ref="view_hr_expense_filter"/>
</record>
<menuitem action="expense_all_valid" id="menu_expense_all_valid" parent="hr_expense.menu_expense_all" groups="base.group_extended"/>
<record id="expense_all_invoiced" model="ir.actions.act_window">
<field name="name">Expenses waiting payment</field>
<field name="res_model">hr.expense.expense</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="domain">[('state','=','invoiced')]</field>
<field name="filter" eval="True"/>
<field name="search_view_id" ref="view_hr_expense_filter"/>
</record>
<menuitem action="expense_all_invoiced" id="menu_expense_all_invoiced" parent="hr_expense.menu_expense_all" groups="base.group_extended"/>
<menuitem id="next_id_49" name="Expenses"
parent="hr.menu_hr_root"/>
<menuitem action="expense_all" id="menu_expense_all"
parent="next_id_49" groups="hr.group_hr_manager"/>
<!--
My expenses menu
-->
My expenses menu
-->
<record id="expense_my" model="ir.actions.act_window">
<field name="name">My Expenses</field>
<field name="res_model">hr.expense.expense</field>
@ -182,38 +146,11 @@
<field name="filter" eval="True"/>
<field name="search_view_id" ref="view_hr_expense_filter"/>
</record>
<menuitem action="expense_my" id="menu_expense_my" parent="hr_expense.next_id_49" groups="base.group_extended"/>
<record id="expense_my_new" model="ir.actions.act_window">
<field name="name">New Expenses Sheet</field>
<field name="res_model">hr.expense.expense</field>
<field name="view_type">form</field>
<field name="view_mode">form,tree</field>
<field name="domain">[('user_id','=',uid)]</field>
</record>
<menuitem action="expense_my_new" id="menu_expense_my_new" parent="hr_expense.next_id_49"/>
<record id="expense_my_draft" model="ir.actions.act_window">
<field name="name">My Draft expenses</field>
<field name="res_model">hr.expense.expense</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="domain">[('user_id','=',uid),('state','=','draft')]</field>
<field name="filter" eval="True"/>
<field name="search_view_id" ref="view_hr_expense_filter"/>
</record>
<menuitem action="expense_my_draft" id="menu_expense_my_draft" parent="hr_expense.menu_expense_my" groups="base.group_extended"/>
<record id="expense_my_confirm" model="ir.actions.act_window">
<field name="name">My expenses waiting validation</field>
<field name="res_model">hr.expense.expense</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="domain">[('user_id','=',uid),('state','=','confirm')]</field>
<field name="filter" eval="True"/>
<field name="search_view_id" ref="view_hr_expense_filter"/>
</record>
<menuitem action="expense_my_confirm" id="menu_expense_my_confirm" parent="hr_expense.menu_expense_my" groups="base.group_extended"/>
<menuitem action="expense_my" id="menu_expense_my"
parent="hr_expense.next_id_49" groups="base.group_extended"
/>
<record id="view_product_hr_expense_form" model="ir.ui.view">
<field name="name">product.product.expense.form</field>