Turkesh Patel (openERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-clean-search-hr_timesheet_invoice-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_timesheet_invoice-tpa/+merge/115957
[IMP] Improved search views of hr_timesheet_invoice module.
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-clean-search-hr_timesheet_invoice-tpa/+merge/115957
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-clean-search.
=== modified file 'hr_timesheet_invoice/hr_timesheet_invoice_view.xml'
--- hr_timesheet_invoice/hr_timesheet_invoice_view.xml 2012-07-16 11:13:43 +0000
+++ hr_timesheet_invoice/hr_timesheet_invoice_view.xml 2012-07-20 11:35:34 +0000
@@ -89,10 +89,10 @@
<field name="type">search</field>
<field name="inherit_id" ref="account.view_account_analytic_line_filter"/>
<field name="arch" type="xml">
- <field name="date" position="before">
+ <field name="others" position="after">
+ <separator/>
<filter name="to_invoice" string="To Invoice" context="{'to_invoice': 1}" domain="[('invoice_id','=',False), ('to_invoice','<>',False)]" icon="terp-dolar"/>
<filter name="invoiced" string="Invoiced" domain="[('invoice_id','!=',False), ('to_invoice','<>',False)]" icon="terp-dolar"/>
- <separator orientation="vertical"/>
</field>
</field>
</record>
@@ -144,9 +144,7 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Type of invoicing">
- <group>
- <field name="name" string="Type of invoicing"/>
- </group>
+ <field name="name" string="Type of invoicing"/>
</search>
</field>
</record>
=== modified file 'hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml'
--- hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml 2012-06-28 12:18:20 +0000
+++ hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml 2012-07-20 11:35:34 +0000
@@ -46,29 +46,19 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Timesheet by user">
- <group>
- <filter icon="terp-personal"
- string="Non Assigned timesheets to users"
- help="Non Assigned timesheets to users"
- domain="[('user_id','=',False)]"/>
- <separator orientation="vertical"/>
- <field name="user_id" widget="selection"/>
- <field name="account_id" groups="analytic.group_analytic_accounting"/>
- <field name="product_id"/>
- </group>
- <newline/>
+ <field name="user_id"/>
+ <field name="account_id" groups="analytic.group_analytic_accounting"/>
+ <field name="product_id"/>
+ <filter icon="terp-personal" string="Non Assigned timesheets to users" help="Non Assigned timesheets to users" domain="[('user_id','=',False)]"/>
<group expand="0" string="Extended Filters...">
<field name="date"/>
- <separator orientation="vertical"/>
- <field name="invoice_id" widget="selection"/>
+ <field name="invoice_id"/>
</group>
<group expand="1" string="Group By...">
<filter string="User" name="User" icon="terp-personal" context="{'group_by':'user_id'}"/>
- <separator orientation="vertical"/>
<filter string="Account" icon="terp-folder-orange" context="{'group_by':'account_id'}"/>
<filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
<filter string="Invoice" icon="terp-dolar" context="{'group_by':'invoice_id'}"/>
- <separator orientation="vertical"/>
<filter string="Day" icon="terp-go-today" context="{'group_by':'day'}"/>
<filter string="Month" icon="terp-go-month" context="{'group_by':'month'}"/>
<filter string="Year" icon="terp-go-year" context="{'group_by':'name'}"/>
@@ -149,12 +139,9 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Timesheet by user">
- <group>
- <field name="name" string="Timesheet by users"/>
- <separator orientation="vertical"/>
- <field name="user_id"/>
- <field name="month"/>
- </group>
+ <field name="name" string="Timesheet by users"/>
+ <field name="user_id"/>
+ <field name="month"/>
</search>
</field>
</record>
@@ -201,7 +188,6 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Timesheet by invoice">
- <separator orientation="vertical"/>
<field name="account_id" groups="analytic.group_analytic_accounting"/>
<field name="manager_id"/>
<field name="user_id"/>
@@ -282,13 +268,10 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Daily timesheet by account">
- <group>
- <field name="name" string="Timesheet by account"/>
- <separator orientation="vertical"/>
- <field name="account_id" groups="analytic.group_analytic_accounting"/>
- <field name="user_id"/>
- <field name="month"/>
- </group>
+ <field name="name" string="Timesheet by account"/>
+ <field name="account_id" groups="analytic.group_analytic_accounting"/>
+ <field name="user_id"/>
+ <field name="month"/>
</search>
</field>
</record>
@@ -351,13 +334,10 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Timesheet by account">
- <group>
- <field name="name" string="Timesheet by account"/>
- <separator orientation="vertical"/>
- <field name="account_id" groups="analytic.group_analytic_accounting"/>
- <field name="user_id"/>
- <field name="month"/>
- </group>
+ <field name="name" string="Timesheet by account"/>
+ <field name="account_id" groups="analytic.group_analytic_accounting"/>
+ <field name="user_id"/>
+ <field name="month"/>
</search>
</field>
</record>
=== modified file 'hr_timesheet_invoice/report/report_analytic_view.xml'
--- hr_timesheet_invoice/report/report_analytic_view.xml 2012-06-28 12:18:20 +0000
+++ hr_timesheet_invoice/report/report_analytic_view.xml 2012-07-20 11:35:34 +0000
@@ -113,13 +113,10 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Analytic Lines to Invoice">
- <group>
- <field name="name" string="Analytic Lines"/>
- <separator orientation="vertical"/>
- <field name="product_id"/>
- <field name="account_id" groups="analytic.group_analytic_accounting"/>
- <field name="month"/>
- </group>
+ <field name="name" string="Analytic Lines"/>
+ <field name="product_id"/>
+ <field name="account_id" groups="analytic.group_analytic_accounting"/>
+ <field name="month"/>
</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
