Turkesh Patel (openERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-clean-search-resource-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-resource-tpa/+merge/116211
[IMP] Improved search views of report_intrastat and resource.
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-clean-search-resource-tpa/+merge/116211
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-clean-search.
=== modified file 'report_intrastat/report_intrastat_view.xml'
--- report_intrastat/report_intrastat_view.xml 2012-06-19 05:56:24 +0000
+++ report_intrastat/report_intrastat_view.xml 2012-07-23 07:37:31 +0000
@@ -99,12 +99,10 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Intrastat Data">
- <group>
- <field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Intrastat Data"/>
- <field name="intrastat_id"/>
- <field name="month"/>
- <field name="type"/>
- </group>
+ <field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Intrastat Data"/>
+ <field name="intrastat_id"/>
+ <field name="month"/>
+ <field name="type"/>
</search>
</field>
</record>
=== modified file 'resource/resource_view.xml'
--- resource/resource_view.xml 2012-07-12 15:30:40 +0000
+++ resource/resource_view.xml 2012-07-23 07:37:31 +0000
@@ -10,23 +10,15 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Search Resource">
- <group>
- <field name="name" string="Resource"/>
- <separator orientation="vertical"/>
- <filter string="Inactive" icon="terp-gdu-smart-failing" domain="[('active','=',False)]"/>
- <separator orientation="vertical"/>
- <field name="user_id" string="User"/>
- <field name="company_id" widget="selection" groups="base.group_multi_company"/>
- <field name="resource_type"/>
- </group>
- <newline/>
+ <field name="name" string="Resource"/>
+ <field name="user_id" string="User"/>
+ <field name="company_id" groups="base.group_multi_company"/>
+ <field name="resource_type"/>
+ <filter string="Inactive" icon="terp-gdu-smart-failing" domain="[('active','=',False)]"/>
<group expand="0" string="Group By...">
<filter string="User" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
- <separator orientation="vertical"/>
<filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'resource_type'}"/>
- <separator orientation="vertical" groups="base.group_multi_company"/>
<filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
- <separator orientation="vertical" />
<filter string="Working Period" icon="terp-go-today" domain="[]" context="{'group_by':'calendar_id'}"/>
</group>
</search>
@@ -39,12 +31,9 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Search Working Time">
- <group>
- <field name="name" string="Working Time"/>
- <separator orientation="vertical"/>
- <field name="manager"/>
- <field name="company_id" widget="selection" groups="base.group_multi_company"/>
- </group>
+ <field name="name" string="Working Time"/>
+ <field name="manager"/>
+ <field name="company_id" groups="base.group_multi_company"/>
</search>
</field>
</record>
@@ -55,19 +44,13 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Search Working Period Leaves">
- <group>
- <field name="name" string="Reason"/>
- <separator orientation="vertical"/>
- <field name="resource_id" string="Resource"/>
- <field name="company_id" string="Company" widget="selection" groups="base.group_multi_company"/>
- <field name="calendar_id" string="Working Period" widget="selection"/>
- </group>
- <newline/>
- <group expand="0" string="Group By...">
+ <field name="name" string="Reason"/>
+ <field name="resource_id" string="Resource"/>
+ <field name="company_id" string="Company" groups="base.group_multi_company"/>
+ <field name="calendar_id" string="Working Period"/>
+ <group expand="0" string="Group By...">
<filter string="Resource" icon="terp-personal" domain="[]" context="{'group_by':'resource_id'}"/>
- <separator orientation="vertical"/>
<filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
- <separator orientation="vertical" groups="base.group_multi_company"/>
<filter string="Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_from'}" help="Starting Date of Leave"/>
</group>
</search>
_______________________________________________
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
