Turkesh Patel (openERP) has proposed merging
lp:~openerp-dev/openobject-server/trunk-clean-search-tpa into
lp:~openerp-dev/openobject-server/trunk-clean-search.
Requested reviews:
Jigar Amin (OpenERP) (jam-openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-server/trunk-clean-search-tpa/+merge/115679
[IMP] I have improved all search view at server side.
--
https://code.launchpad.net/~openerp-dev/openobject-server/trunk-clean-search-tpa/+merge/115679
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-server/trunk-clean-search.
=== modified file 'openerp/addons/base/ir/ir.xml'
--- openerp/addons/base/ir/ir.xml 2012-07-09 05:28:15 +0000
+++ openerp/addons/base/ir/ir.xml 2012-07-19 09:49:17 +0000
@@ -68,10 +68,7 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Client Actions">
- <field name="name"
- filter_domain="['|', '|', ('name','ilike',self), ('model','ilike',self), ('key2','ilike',self)]"
- string="Client Action"/>
- <newline/>
+ <field name="name" filter_domain="['|', '|', ('name','ilike',self), ('model','ilike',self), ('key2','ilike',self)]" string="Client Action"/>
<group expand="0" string="Group By...">
<filter string="Model" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'model'}"/>
<filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'key2'}"/>
@@ -203,7 +200,6 @@
<search string="Sequences">
<field name="name" string="Sequence"/>
<field name="code"/>
- <separator orientation="vertical"/>
<field name="company_id" groups="base.group_multi_company"/>
</search>
</field>
@@ -392,12 +388,9 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Report Xml">
- <group col="10" colspan="4">
- <field name="name"
- filter_domain="['|', '|', '|', '|', ('name','ilike',self), ('model','ilike',self), ('type','ilike',self), ('report_name','ilike',self), ('report_type','ilike',self)]"
- string="Report"/>
- </group>
- <newline/>
+ <field name="name"
+ filter_domain="['|', '|', '|', '|', ('name','ilike',self), ('model','ilike',self), ('type','ilike',self), ('report_name','ilike',self), ('report_type','ilike',self)]"
+ string="Report"/>
<group expand="0" string="Group By" colspan="4">
<filter string="Report Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'report_type'}"/>
</group>
@@ -499,11 +492,8 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Open a Window">
- <group col="10" colspan="4">
- <field name="name" filter_domain="['|', ('name','ilike',self), ('res_model','ilike',self)]" string="Action"/>
- <field name="view_type"/>
- </group>
- <newline/>
+ <field name="name" filter_domain="['|', ('name','ilike',self), ('res_model','ilike',self)]" string="Action"/>
+ <field name="view_type"/>
<group expand="0" string="Group By" colspan="4">
<filter string="View Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'view_type'}"/>
</group>
@@ -569,9 +559,7 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Wizards">
- <field name="name"
- filter_domain="['|', '|', ('name','ilike',self), ('type','ilike',self), ('wiz_name','ilike',self)]"
- string="Wizard"/>
+ <field name="name" filter_domain="['|', '|', ('name','ilike',self), ('type','ilike',self), ('wiz_name','ilike',self)]" string="Wizard"/>
</search>
</field>
</record>
@@ -661,20 +649,11 @@
<field name="arch" type="xml">
<search string="Views">
<field name="name" filter_domain="['|', ('name','ilike',self), ('model','ilike',self)]" string="View"/>
- <separator orientation="vertical"/>
- <filter icon="terp-stock_zoom"
- string="Search"
- domain="[('type', '=', 'search')]"/>
- <filter icon="gtk-indent"
- string="Tree"
- domain="[('type', '=', 'tree')]"/>
- <filter icon="gtk-new"
- string="Form"
- domain="[('type', '=','form')]"/>
- <separator orientation="vertical"/>
<field name="inherit_id"/>
<field name="type"/>
- <newline/>
+ <filter icon="terp-stock_zoom" string="Search" domain="[('type', '=', 'search')]"/>
+ <filter icon="gtk-indent" string="Tree" domain="[('type', '=', 'tree')]"/>
+ <filter icon="gtk-new" string="Form" domain="[('type', '=','form')]"/>
<group expand="0" string="Group By...">
<filter string="Object" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'model'}"/>
<filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type'}"/>
@@ -802,31 +781,18 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Attachments">
- <group colspan="4" col="10">
- <field name="name" filter_domain="['|', ('name','ilike',self), ('datas_fname','ilike',self)]" string="Attachment"/>
- <field name="create_date"/>
- <separator orientation="vertical"/>
- <filter icon="terp-stage"
- string="URL"
- domain="[('type','=','url')]"/>
- <filter icon="terp-stock_align_left_24"
- string="Binary"
- domain="[('type','=','binary')]"/>
- <filter name="my_documents_filter"
- string="My Document(s)"
- icon="terp-personal"
- domain="[('create_uid','=',uid)]"
- help="Filter on my documents"/>
- <separator orientation="vertical"/>
- <field name="create_uid"/>
- <field name="type"/>
- </group>
- <newline/>
+ <field name="name" filter_domain="['|', ('name','ilike',self), ('datas_fname','ilike',self)]" string="Attachment"/>
+ <field name="create_date"/>
+ <field name="create_uid"/>
+ <field name="type"/>
+ <filter icon="terp-stage" string="URL" domain="[('type','=','url')]"/>
+ <filter icon="terp-stock_align_left_24" string="Binary" domain="[('type','=','binary')]"/>
+ <separator/>
+ <filter name="my_documents_filter" string="My Document(s)" icon="terp-personal" domain="[('create_uid','=',uid)]" help="Filter on my documents"/>
<group expand="0" string="Group By...">
<filter string="Owner" icon="terp-personal" domain="[]" context="{'group_by':'create_uid'}"/>
<filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type'}" groups="base.group_no_one"/>
<filter string="Company" icon="terp-gtk-home" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
- <separator orientation="vertical"/>
<filter string="Month" help="Creation Month" icon="terp-go-month" domain="[]" context="{'group_by':'create_date'}"/>
</group>
</search>
@@ -955,16 +921,10 @@
<field name="arch" type="xml">
<search string="Model Description">
<field name="name" filter_domain="['|', ('name','ilike',self), ('model','ilike',self)]" string="Model"/>
- <separator orientation="vertical"/>
- <filter icon="terp-camera_test"
- string="In Memory"
- domain="[('osv_memory', '=', True)]"/>
- <filter icon="terp-stock_align_left_24"
- string="Custom"
- domain="[('state', '=', 'manual')]"/>
- <filter icon="terp-translate"
- string="Base"
- domain="[('state', '=', 'base')]"/>
+ <filter icon="terp-camera_test" string="In Memory" domain="[('osv_memory', '=', True)]"/>
+ <separator/>
+ <filter icon="terp-stock_align_left_24" string="Custom" domain="[('state', '=', 'manual')]"/>
+ <filter icon="terp-translate" string="Base" domain="[('state', '=', 'base')]"/>
</search>
</field>
</record>
@@ -1035,22 +995,15 @@
<field name="arch" type="xml">
<search string="Fields">
<field name="name" filter_domain="['|', ('name','ilike',self), ('field_description','ilike',self)]" string="Field"/>
- <separator orientation="vertical"/>
- <filter icon="terp-gnome-cpu-frequency-applet+"
- string="Required"
- domain="[('required', '=', True)]"/>
- <filter icon="terp-dialog-close"
- string="Readonly"
- domain="[('readonly', '=', True)]"/>
- <filter icon="terp-translate"
- string="Translate"
- domain="[('translate', '=', True)]"/>
- <newline/>
<field name="model_id"/>
<field name="ttype"/>
<field name="required"/>
<field name="readonly"/>
- <newline/>
+ <filter icon="terp-gnome-cpu-frequency-applet+" string="Required" domain="[('required', '=', True)]"/>
+ <separator/>
+ <filter icon="terp-dialog-close" string="Readonly" domain="[('readonly', '=', True)]"/>
+ <separator/>
+ <filter icon="terp-translate" string="Translate" domain="[('translate', '=', True)]"/>
<group expand="0" string="Group By...">
<filter string="Object" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'model_id'}"/>
</group>
@@ -1104,17 +1057,10 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="External Identifiers">
- <field name="name"
- filter_domain="['|', '|', ('name','ilike',self), ('model','ilike',self), ('module','ilike',self)]"
- string="External Identifier"/>
- <separator orientation="vertical"/>
- <filter icon="terp-camera_test"
- string="Updatable"
- domain="[('noupdate', '=', False)]"/>
- <separator orientation="vertical"/>
+ <field name="name" filter_domain="['|', '|', ('name','ilike',self), ('model','ilike',self), ('module','ilike',self)]" string="External Identifier"/>
<field name="res_id"/>
<field name="noupdate"/>
- <newline/>
+ <filter icon="terp-camera_test" string="Updatable" domain="[('noupdate', '=', False)]"/>
<group expand="0" string="Group By...">
<filter string="Module" icon="terp-folder-blue" domain="[]" context="{'group_by':'module'}"/>
<filter string="Object" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'model'}"/>
@@ -1237,13 +1183,10 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Translations">
- <filter icon="terp-gdu-smart-failing"
- string="Untranslated"
- domain="['|',('value', '=', False),('value','=','')]"/>
- <separator orientation="vertical"/>
<field name="lang"/>
<field name="src"/>
<field name="value"/>
+ <filter icon="terp-gdu-smart-failing" string="Untranslated" domain="['|',('value', '=', False),('value','=','')]"/>
</search>
</field>
</record>
@@ -1469,11 +1412,9 @@
<field name="arch" type="xml">
<search string="Scheduled Actions">
<field name="name" string="Scheduled Action"/>
- <separator orientation="vertical"/>
- <field name="user_id" widget="selection"/>
+ <field name="user_id"/>
<field name="nextcall"/>
<field name="active"/>
- <newline/>
<group expand="0" string="Group By...">
<filter string="User" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
<filter string="Execution" icon="terp-go-month"
@@ -1554,18 +1495,14 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Access Controls">
- <group>
- <field name="name" string="Access Control"/>
- <separator orientation="vertical"/>
- <filter string="Global" icon="terp-stage" domain="[('group_id','=',False)]"/>
- <filter string="Full Access" icon="terp-gtk-select-all" domain="[('perm_read','=',True),('perm_write','=',True),('perm_create','=',True),('perm_unlink','=',True)]"/>
- <filter string="Read Access" icon="terp-stock_align_left_24" domain="[('perm_read','=',True)]"/>
- <filter string="Write Access" icon="terp-tools" domain="[('perm_write','=',True)]"/>
- <separator orientation="vertical"/>
- <field name="model_id"/>
- <field name="group_id"/>
- </group>
- <newline/>
+ <field name="name" string="Access Control"/>
+ <field name="model_id"/>
+ <field name="group_id"/>
+ <filter string="Global" icon="terp-stage" domain="[('group_id','=',False)]"/>
+ <separator/>
+ <filter string="Full Access" icon="terp-gtk-select-all" domain="[('perm_read','=',True),('perm_write','=',True),('perm_create','=',True),('perm_unlink','=',True)]"/>
+ <filter string="Read Access" icon="terp-stock_align_left_24" domain="[('perm_read','=',True)]"/>
+ <filter string="Write Access" icon="terp-tools" domain="[('perm_write','=',True)]"/>
<group expand="0" string="Group By..." colspan="11" col="11" groups="base.group_no_one">
<filter string="Group" icon="terp-personal" domain="[]" context="{'group_by':'group_id'}"/>
<filter string="Object" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'model_id'}"/>
@@ -1651,17 +1588,14 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Record Rules">
- <group>
- <field name="name" string="Record Rule"/>
- <separator orientation="vertical"/>
- <filter string="Global" icon="terp-stage" domain="[('global','=',True)]"/>
- <filter string="Full Access" icon="terp-gtk-select-all" domain="[('perm_read','=',True),('perm_write','=',True),('perm_create','=',True),('perm_unlink','=',True)]"/>
- <filter string="Read Access" icon="terp-stock_align_left_24" domain="[('perm_read','=',True)]"/>
- <filter string="Write Access" icon="terp-tools" domain="[('perm_write','=',True)]"/>
- <separator orientation="vertical"/>
- <field name="model_id"/>
- <field name="groups"/>
- </group>
+ <field name="name" string="Record Rule"/>
+ <field name="model_id"/>
+ <field name="groups"/>
+ <filter string="Global" icon="terp-stage" domain="[('global','=',True)]"/>
+ <separator/>
+ <filter string="Full Access" icon="terp-gtk-select-all" domain="[('perm_read','=',True),('perm_write','=',True),('perm_create','=',True),('perm_unlink','=',True)]"/>
+ <filter string="Read Access" icon="terp-stock_align_left_24" domain="[('perm_read','=',True)]"/>
+ <filter string="Write Access" icon="terp-tools" domain="[('perm_write','=',True)]"/>
</search>
</field>
</record>
@@ -1794,13 +1728,9 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Server Actions">
- <group col="10" colspan="4">
- <field name="name" string="Server Action"/>
- <separator orientation="vertical"/>
- <field name="model_id"/>
- <field name="state"/>
- </group>
- <newline/>
+ <field name="name" string="Server Action"/>
+ <field name="model_id"/>
+ <field name="state"/>
<group expand="0" string="Group By" colspan="4" col="4">
<filter string="Action Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'state'}"/>
</group>
@@ -1878,14 +1808,10 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Search Actions">
- <group>
- <filter string="To Do" name="todo" icon="terp-camera_test" domain=" [('state','=','open')]" help="Wizards to be Launched"/>
- <separator orientation="vertical"/>
- <field name="action_id"/>
- <field name="category_id"/>
- <field name="state"/>
- </group>
- <newline/>
+ <field name="action_id"/>
+ <field name="category_id"/>
+ <field name="state"/>
+ <filter string="To Do" name="todo" icon="terp-camera_test" domain=" [('state','=','open')]" help="Wizards to be Launched"/>
<group expand="0" string="Group By...">
<filter string="Category" context="{'group_by': 'category_id'}" icon="terp-folder-orange"/>
</group>
@@ -2008,9 +1934,7 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Outgoing Mail Servers">
- <field name="name"
- filter_domain="['|', '|', ('name','ilike',self), ('smtp_host','ilike',self), ('smtp_user','ilike',self)]"
- string="Outgoing Mail Server"/>
+ <field name="name" filter_domain="['|', '|', ('name','ilike',self), ('smtp_host','ilike',self), ('smtp_user','ilike',self)]" string="Outgoing Mail Server"/>
<field name="smtp_encryption"/>
</search>
</field>
=== modified file 'openerp/addons/base/ir/ir_filters.xml'
--- openerp/addons/base/ir/ir_filters.xml 2012-06-22 10:11:46 +0000
+++ openerp/addons/base/ir/ir_filters.xml 2012-07-19 09:49:17 +0000
@@ -54,15 +54,12 @@
<field name="arch" type="xml">
<search string="Filters">
<field name="name" string="Filter Name"/>
- <separator orientation="vertical"/>
+ <field name="model_id"/>
+ <field name="user_id"/>
<filter string="Personal" domain="[('user_id','!=',False)]" help="Filters visible only for one user"/>
<filter string="Shared" domain="[('user_id','=',False)]" help="Filters shared with all users"/>
- <filter icon="terp-personal" domain="[('user_id','in',(uid, False))]"
- name="my_filters"
- string="My Filters"/>
- <separator orientation="vertical"/>
- <field name="model_id"/>
- <field name="user_id"/>
+ <separator/>
+ <filter icon="terp-personal" domain="[('user_id','in',(uid, False))]" name="my_filters" string="My Filters"/>
</search>
</field>
</record>
=== modified file 'openerp/addons/base/ir/workflow/workflow_view.xml'
--- openerp/addons/base/ir/workflow/workflow_view.xml 2012-07-06 13:11:42 +0000
+++ openerp/addons/base/ir/workflow/workflow_view.xml 2012-07-19 09:49:17 +0000
@@ -164,16 +164,11 @@
<field name="arch" type="xml">
<search string="Workflow Activity">
<field name="name" string="Workflow Activity"/>
- <separator orientation="vertical"/>
- <filter icon="terp-camera_test" string="Flow Start"
- domain="[('flow_start', '=',True)]" />
- <filter icon="terp-gtk-stop" string="Flow Stop"
- domain="[('flow_stop', '=',True)]" />
- <separator orientation="vertical"/>
<field name="wkf_id"/>
<field name="action_id"/>
<field name="kind"/>
- <newline/>
+ <filter icon="terp-camera_test" string="Flow Start" domain="[('flow_start', '=',True)]" />
+ <filter icon="terp-gtk-stop" string="Flow Stop" domain="[('flow_stop', '=',True)]" />
<group expand="0" string="Group By...">
<filter string="Workflow" icon="terp-stage" domain="[]" context="{'group_by':'wkf_id'}"/>
</group>
@@ -242,7 +237,6 @@
<field name="arch" type="xml">
<search string="Transition">
<field name="signal" filter_domain="['|', ('signal','ilike',self), ('condition','ilike',self)]" string="Workflow Transition"/>
- <separator orientation="vertical"/>
<field name="act_from"/>
<field name="act_to"/>
</search>
@@ -301,12 +295,10 @@
<field name="arch" type="xml">
<search string="Workflow Instances">
<field name="res_type" string="Resource Object"/>
- <separator orientation="vertical"/>
- <filter icon="terp-camera_test" string="Active" domain="[('state','=','active')]" name="active"/>
- <separator orientation="vertical"/>
- <field name="wkf_id" widget="selection"/>
+ <field name="wkf_id"/>
<field name="res_id"/>
<field name="state"/>
+ <filter icon="terp-camera_test" string="Active" domain="[('state','=','active')]" name="active"/>
</search>
</field>
</record>
@@ -366,13 +358,11 @@
<field name="arch" type="xml">
<search string="Workflow Workitems">
<field name="state" string="State"/>
- <separator orientation="vertical"/>
- <filter icon="terp-camera_test" string="Active" name="active" domain="[('state','=','active')]"/>
- <separator orientation="vertical"/>
- <field name="wkf_id" widget="selection"/>
+ <field name="wkf_id"/>
<field name="act_id"/>
<field name="subflow_id"/>
<field name="inst_id"/>
+ <filter icon="terp-camera_test" string="Active" name="active" domain="[('state','=','active')]"/>
</search>
</field>
</record>
=== modified file 'openerp/addons/base/module/module_view.xml'
--- openerp/addons/base/module/module_view.xml 2012-07-16 20:35:12 +0000
+++ openerp/addons/base/module/module_view.xml 2012-07-19 09:49:17 +0000
@@ -41,21 +41,17 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Search modules">
- <group col='10' colspan='4'>
- <field name="name" filter_domain="['|', ('name','ilike',self), ('shortdesc','ilike',self)]" string="Module"/>
- <field name="description" string="Keywords"/>
- <separator orientation="vertical"/>
- <filter name="app" icon="terp-check" string="Apps" domain="[('application', '=', 1)]"/>
- <filter name="extra" icon="terp-check" string="Extra" domain="[('application', '=', 0)]"/>
- <filter icon="terp-check" string="Installed" domain="[('state', 'in', ['installed', 'to upgrade', 'to remove'])]"/>
- <filter icon="terp-dialog-close" string="Not Installed" domain="[('state', 'in', ['uninstalled', 'uninstallable', 'to install'])]"/>
- <separator orientation="vertical"/>
- <field name="category_id"/>
- <newline/>
- <group expand="0" string="Group By...">
- <filter string="Author" icon="terp-personal" domain="[]" context="{'group_by':'author'}"/>
- <filter string="Category" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'category_id'}"/>
- </group>
+ <field name="name" filter_domain="['|', ('name','ilike',self), ('shortdesc','ilike',self)]" string="Module"/>
+ <field name="description" string="Keywords"/>
+ <field name="category_id"/>
+ <filter name="app" icon="terp-check" string="Apps" domain="[('application', '=', 1)]"/>
+ <filter name="extra" icon="terp-check" string="Extra" domain="[('application', '=', 0)]"/>
+ <separator/>
+ <filter icon="terp-check" string="Installed" domain="[('state', 'in', ['installed', 'to upgrade', 'to remove'])]"/>
+ <filter icon="terp-dialog-close" string="Not Installed" domain="[('state', 'in', ['uninstalled', 'uninstallable', 'to install'])]"/>
+ <group expand="0" string="Group By...">
+ <filter string="Author" icon="terp-personal" domain="[]" context="{'group_by':'author'}"/>
+ <filter string="Category" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'category_id'}"/>
</group>
</search>
</field>
=== modified file 'openerp/addons/base/res/ir_property_view.xml'
--- openerp/addons/base/res/ir_property_view.xml 2012-07-02 21:08:02 +0000
+++ openerp/addons/base/res/ir_property_view.xml 2012-07-19 09:49:17 +0000
@@ -9,14 +9,9 @@
<field name="arch" type="xml">
<search string="Parameters">
<field name="name" string="Name"/>
- <separator orientation="vertical"/>
- <filter icon="terp-project"
- string="Generic"
- help="Parameters that are used by all resources."
- domain="[('res_id','=',False)]"/>
- <separator orientation="vertical"/>
<field name="fields_id"/>
<field name="company_id" groups="base.group_multi_company"/>
+ <filter icon="terp-project" string="Generic" help="Parameters that are used by all resources." domain="[('res_id','=',False)]"/>
</search>
</field>
</record>
=== modified file 'openerp/addons/base/res/res_bank_view.xml'
--- openerp/addons/base/res/res_bank_view.xml 2012-07-03 08:55:24 +0000
+++ openerp/addons/base/res/res_bank_view.xml 2012-07-19 09:49:17 +0000
@@ -146,11 +146,9 @@
<field name="arch" type="xml">
<search string="Bank Accounts">
<field name="bank_name" filter_domain="['|', ('bank_name','ilike',self), ('acc_number','ilike',self)]" string="Bank Name"/>
- <separator orientation="vertical"/>
+ <field name="company_id" invisible="context.get('company_hide', True)"/>
+ <field name="partner_id"/>
<filter name="my_bank" icon="terp-check" string="My Banks" domain="[('company_id','<>',False)]" help="Bank accounts belonging to one of your companies"/>
- <separator orientation="vertical"/>
- <field name="company_id" invisible="context.get('company_hide', True)"/>
- <field name="partner_id"/>
</search>
</field>
</record>
=== modified file 'openerp/addons/base/res/res_company_view.xml'
--- openerp/addons/base/res/res_company_view.xml 2012-07-13 16:12:22 +0000
+++ openerp/addons/base/res/res_company_view.xml 2012-07-19 09:49:17 +0000
@@ -178,8 +178,8 @@
<field name="arch" type="xml">
<search string="Multi Company">
<field name="name" string="Name"/>
- <field name="company_id" widget="selection"/>
- <field name="company_dest_id" widget="selection"/>
+ <field name="company_id"/>
+ <field name="company_dest_id"/>
<field name="object_id"/>
</search>
</field>
=== modified file 'openerp/addons/base/res/res_lang_view.xml'
--- openerp/addons/base/res/res_lang_view.xml 2012-06-19 10:13:33 +0000
+++ openerp/addons/base/res/res_lang_view.xml 2012-07-19 09:49:17 +0000
@@ -108,15 +108,9 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Languages">
- <group>
- <field name="name"
- filter_domain="['|', '|', ('name','ilike',self), ('code','ilike',self), ('iso_code','ilike',self)]"
- string="Language"/>
- <separator orientation="vertical"/>
- <filter string="Translatable" icon="terp-tools" domain="[('translatable','=',True)]"/>
- <separator orientation="vertical"/>
- <field name="direction"/>
- </group>
+ <field name="name" filter_domain="['|', '|', ('name','ilike',self), ('code','ilike',self), ('iso_code','ilike',self)]" string="Language"/>
+ <field name="direction"/>
+ <filter string="Translatable" icon="terp-tools" domain="[('translatable','=',True)]"/>
</search>
</field>
</record>
=== modified file 'openerp/addons/base/res/res_partner_view.xml'
--- openerp/addons/base/res/res_partner_view.xml 2012-07-16 21:18:30 +0000
+++ openerp/addons/base/res/res_partner_view.xml 2012-07-19 09:49:17 +0000
@@ -241,27 +241,23 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Search Partner">
- <group col='10' colspan='4'>
- <field name="name"
- filter_domain="['|','|',('name','ilike',self),('parent_id','ilike',self),('ref','=',self)]"
- string="Partner"/>
- <separator orientation="vertical"/>
- <filter help="My Partners" icon="terp-personal+" domain="[('user_id','=',uid)]"/>
- <filter string="Persons" name="type_person" icon="terp-personal" domain="[('is_company','=',0)]"/>
- <filter string="Companies" name="type_company" icon="terp-partner" domain="[('is_company','=',1)]"/>
- <filter string="Customers" name="customer" icon="terp-personal" domain="[('customer','=',1)]" help="Customer Partners"/>
- <filter string="Suppliers" name="supplier" icon="terp-personal" domain="[('supplier','=',1)]" help="Supplier Partners"/>
- <separator orientation="vertical"/>
- <field name="category_id"/>
- <field name="user_id"/>
- <field name="parent_id" filter_domain="[('parent_id','child_of',[self])]"/>
- </group>
- <newline />
- <group expand="0" string="Group By...">
- <filter string="Salesman" icon="terp-personal" domain="[]" context="{'group_by' : 'user_id'}" />
- <filter string="Company" context="{'group_by': 'parent_id'}"/>
- </group>
- </search>
+ <field name="name" filter_domain="['|','|',('name','ilike',self),('parent_id','ilike',self),('ref','=',self)]" string="Partner"/>
+ <field name="category_id"/>
+ <field name="user_id"/>
+ <field name="parent_id" filter_domain="[('parent_id','child_of',[self])]"/>
+ <filter help="My Partners" icon="terp-personal+" domain="[('user_id','=',uid)]"/>
+ <separator/>
+ <filter string="Persons" name="type_person" icon="terp-personal" domain="[('is_company','=',0)]"/>
+ <filter string="Companies" name="type_company" icon="terp-partner" domain="[('is_company','=',1)]"/>
+ <separator/>
+ <filter string="Customers" name="customer" icon="terp-personal" domain="[('customer','=',1)]" help="Customer Partners"/>
+ <separator/>
+ <filter string="Suppliers" name="supplier" icon="terp-personal" domain="[('supplier','=',1)]" help="Supplier Partners"/>
+ <group expand="0" string="Group By...">
+ <filter string="Salesman" icon="terp-personal" domain="[]" context="{'group_by' : 'user_id'}" />
+ <filter string="Company" context="{'group_by': 'parent_id'}"/>
+ </group>
+ </search>
</field>
</record>
=== modified file 'openerp/addons/base/res/res_widget_view.xml'
--- openerp/addons/base/res/res_widget_view.xml 2012-06-29 08:30:14 +0000
+++ openerp/addons/base/res/res_widget_view.xml 2012-07-19 09:49:17 +0000
@@ -8,7 +8,7 @@
<field name="arch" type="xml">
<search string="Search Widget">
<field name="title" string="Widget"/>
- </search>
+ </search>
</field>
</record>
<record id="res_widget_form" model="ir.ui.view">
_______________________________________________
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
