Turkesh Patel (openERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-clean-search-hr_expanse-tpa into
lp:~openerp-dev/openobject-addons/trunk-clean-search.
Requested reviews:
Jigar Amin (OpenERP) (jam-openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-clean-search-hr_expanse-tpa/+merge/115945
[IMP] Improved search views of hr_expanse module.
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-clean-search-hr_expanse-tpa/+merge/115945
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-clean-search.
=== modified file 'hr_expense/hr_expense_view.xml'
--- hr_expense/hr_expense_view.xml 2012-07-13 09:53:41 +0000
+++ hr_expense/hr_expense_view.xml 2012-07-20 10:45:42 +0000
@@ -136,27 +136,19 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Expense">
- <group>
- <field name="name" string="Expenses"/>
- <separator orientation="vertical"/>
- <field name="date"/>
- <separator orientation="vertical"/>
- <filter icon="terp-document-new" domain="[('state','=','draft')]" string="New" help="New Expense"/>
- <filter icon="terp-camera_test" domain="[('state','=','confirm')]" string="To Approve" help="Confirmed Expense"/>
- <filter icon="terp-dolar" domain="[('state','=','accepted')]" string="To Pay" help="Expenses to Invoice"/>
- <separator orientation="vertical"/>
- <field name="employee_id"/>
- <field name="department_id" widget="selection" string="Department" context="{'invisible_department': False}"/>
- <field name="user_id" string="User"/>
- </group>
- <newline />
- <group expand="0" string="Group By...">
- <filter string="Employee" icon="terp-personal" domain="[]" context="{'group_by':'employee_id'}"/>
- <separator orientation="vertical"/>
- <filter string="Department" icon="terp-personal+" domain="[]" context="{'group_by':'department_id'}"/>
- <separator orientation="vertical"/>
- <filter string="Month" icon="terp-go-month" domain="[]" context="{'group_by':'date'}"/>
- </group>
+ <field name="name" string="Expenses"/>
+ <field name="date"/>
+ <field name="employee_id"/>
+ <field name="department_id" string="Department" context="{'invisible_department': False}"/>
+ <field name="user_id" string="User"/>
+ <filter icon="terp-document-new" domain="[('state','=','draft')]" string="New" help="New Expense"/>
+ <filter icon="terp-camera_test" domain="[('state','=','confirm')]" string="To Approve" help="Confirmed Expense"/>
+ <filter icon="terp-dolar" domain="[('state','=','accepted')]" string="To Pay" help="Expenses to Invoice"/>
+ <group expand="0" string="Group By...">
+ <filter string="Employee" icon="terp-personal" domain="[]" context="{'group_by':'employee_id'}"/>
+ <filter string="Department" icon="terp-personal+" domain="[]" context="{'group_by':'department_id'}"/>
+ <filter string="Month" icon="terp-go-month" domain="[]" context="{'group_by':'date'}"/>
+ </group>
</search>
</field>
</record>
=== modified file 'hr_expense/report/hr_expense_report_view.xml'
--- hr_expense/report/hr_expense_report_view.xml 2012-07-03 15:58:43 +0000
+++ hr_expense/report/hr_expense_report_view.xml 2012-07-20 10:45:42 +0000
@@ -51,46 +51,31 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Expenses Analysis">
- <group>
- <filter string="Waiting" icon="terp-gtk-media-pause" domain="[('state', '=' ,'confirm')]"
- help = "Confirm Expenses"/>
- <filter string="Approved" icon="terp-check" domain="[('state','=','accepted')]"
- help = "Approved Expenses"/>
- <filter string="Invoiced" icon="terp-dolar" domain="[('state','in', ('invoiced', 'paid'))]"
- help = "Invoiced Expenses"/>
- <separator orientation="vertical"/>
- <field name="employee_id"/>
- <field name="department_id"/>
- </group>
- <newline/>
- <group expand="0" string="Extended Filters...">
- <field name="product_id"/>
- <separator orientation="vertical"/>
- <field name="user_id"/>
- <separator orientation="vertical"/>
- <field name="company_id" groups="base.group_multi_company" widget="selection"/>
- <newline/>
- <field name="date" string="Creation Date"/>
- <field name="date_confirm"/>
- <field name="date_valid"/>
- </group>
- <newline/>
- <group expand="1" string="Group By...">
- <filter string="Employee" name="employee" icon="terp-personal" context="{'group_by':'employee_id'}"/>
- <filter string="Validation User" name="User" icon="terp-personal" context="{'group_by':'user_id'}"/>
- <filter string="Department" icon="terp-personal+" context="{'group_by':'department_id'}"/>
- <separator orientation="vertical"/>
- <filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
- <separator orientation="vertical" groups="analytic.group_analytic_accounting"/>
- <filter string="Analytic account" icon="terp-folder-green" context="{'group_by':'analytic_account'}" groups="analytic.group_analytic_accounting"/>
- <separator orientation="vertical" groups="analytic.group_analytic_accounting"/>
- <filter string="Status" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
- <filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
- <separator orientation="vertical"/>
- <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}" help="Creation Date"/>
- <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}" help="Creation Date"/>
- <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}" help="Creation Date"/>
- </group>
+ <field name="employee_id"/>
+ <field name="department_id"/>
+ <filter string="Waiting" icon="terp-gtk-media-pause" domain="[('state', '=' ,'confirm')]" help = "Confirm Expenses"/>
+ <filter string="Approved" icon="terp-check" domain="[('state','=','accepted')]" help = "Approved Expenses"/>
+ <filter string="Invoiced" icon="terp-dolar" domain="[('state','in', ('invoiced', 'paid'))]" help = "Invoiced Expenses"/>
+ <group expand="0" string="Extended Filters...">
+ <field name="product_id"/>
+ <field name="user_id"/>
+ <field name="company_id" groups="base.group_multi_company"/>
+ <field name="date" string="Creation Date"/>
+ <field name="date_confirm"/>
+ <field name="date_valid"/>
+ </group>
+ <group expand="1" string="Group By...">
+ <filter string="Employee" name="employee" icon="terp-personal" context="{'group_by':'employee_id'}"/>
+ <filter string="Validation User" name="User" icon="terp-personal" context="{'group_by':'user_id'}"/>
+ <filter string="Department" icon="terp-personal+" context="{'group_by':'department_id'}"/>
+ <filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
+ <filter string="Analytic account" icon="terp-folder-green" context="{'group_by':'analytic_account'}" groups="analytic.group_analytic_accounting"/>
+ <filter string="Status" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
+ <filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
+ <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}" help="Creation Date"/>
+ <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}" help="Creation Date"/>
+ <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}" help="Creation Date"/>
+ </group>
</search>
</field>
</record>
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
