Turkesh Patel (openERP) has proposed merging
lp:~openerp-dev/openobject-server/trunk-clean-search-imp-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-imp-tpa/+merge/117252
[IMP] improved search views.
--
https://code.launchpad.net/~openerp-dev/openobject-server/trunk-clean-search-imp-tpa/+merge/117252
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-20 05:06:42 +0000
+++ openerp/addons/base/ir/ir.xml 2012-07-30 12:36:20 +0000
@@ -68,7 +68,13 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Client Actions">
+<<<<<<< TREE
<field name="name" filter_domain="['|', '|', ('name','ilike',self), ('model','ilike',self), ('key2','ilike',self)]" string="Client Action"/>
+=======
+ <field name="name"
+ filter_domain="['|', '|', ('name','ilike',self), ('model','ilike',self), ('key2','ilike',self)]"
+ string="Client Action"/>
+>>>>>>> MERGE-SOURCE
<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'}"/>
@@ -649,11 +655,26 @@
<field name="arch" type="xml">
<search string="Views">
<field name="name" filter_domain="['|', ('name','ilike',self), ('model','ilike',self)]" string="View"/>
+<<<<<<< TREE
+=======
+ <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')]"/>
+>>>>>>> MERGE-SOURCE
<field name="inherit_id"/>
<field name="type"/>
+<<<<<<< TREE
<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')]"/>
+=======
+>>>>>>> MERGE-SOURCE
<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'}"/>
@@ -781,6 +802,7 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Attachments">
+<<<<<<< TREE
<field name="name" filter_domain="['|', ('name','ilike',self), ('datas_fname','ilike',self)]" string="Attachment"/>
<field name="create_date"/>
<field name="create_uid"/>
@@ -789,6 +811,24 @@
<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"/>
+=======
+ <field name="name" filter_domain="['|', ('name','ilike',self), ('datas_fname','ilike',self)]" string="Attachment"/>
+ <field name="create_date"/>
+ <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"/>
+ <field name="create_uid"/>
+ <field name="type"/>
+>>>>>>> MERGE-SOURCE
<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"/>
@@ -921,10 +961,23 @@
<field name="arch" type="xml">
<search string="Model Description">
<field name="name" filter_domain="['|', ('name','ilike',self), ('model','ilike',self)]" string="Model"/>
+<<<<<<< TREE
<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')]"/>
+=======
+ <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')]"/>
+>>>>>>> MERGE-SOURCE
</search>
</field>
</record>
@@ -995,15 +1048,32 @@
<field name="arch" type="xml">
<search string="Fields">
<field name="name" filter_domain="['|', ('name','ilike',self), ('field_description','ilike',self)]" string="Field"/>
+<<<<<<< TREE
+=======
+ <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)]"/>
+>>>>>>> MERGE-SOURCE
<field name="model_id"/>
<field name="ttype"/>
<field name="required"/>
<field name="readonly"/>
+<<<<<<< TREE
<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)]"/>
+=======
+>>>>>>> MERGE-SOURCE
<group expand="0" string="Group By...">
<filter string="Object" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'model_id'}"/>
</group>
@@ -1057,10 +1127,22 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="External Identifiers">
+<<<<<<< TREE
<field name="name" filter_domain="['|', '|', ('name','ilike',self), ('model','ilike',self), ('module','ilike',self)]" string="External Identifier"/>
+=======
+ <field name="name"
+ filter_domain="['|', '|', ('name','ilike',self), ('model','ilike',self), ('module','ilike',self)]"
+ string="External Identifier"/>
+ <filter icon="terp-camera_test"
+ string="Updatable"
+ domain="[('noupdate', '=', False)]"/>
+>>>>>>> MERGE-SOURCE
<field name="res_id"/>
<field name="noupdate"/>
+<<<<<<< TREE
<filter icon="terp-camera_test" string="Updatable" domain="[('noupdate', '=', False)]"/>
+=======
+>>>>>>> MERGE-SOURCE
<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'}"/>
@@ -1183,6 +1265,12 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Translations">
+<<<<<<< TREE
+=======
+ <filter icon="terp-gdu-smart-failing"
+ string="Untranslated"
+ domain="['|',('value', '=', False),('value','=','')]"/>
+>>>>>>> MERGE-SOURCE
<field name="lang"/>
<field name="src"/>
<field name="value"/>
@@ -1495,14 +1583,25 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Access Controls">
- <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)]"/>
+<<<<<<< TREE
+ <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)]"/>
+=======
+ <field name="name" string="Access Control"/>
+ <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)]"/>
+ <field name="model_id"/>
+ <field name="group_id"/>
+>>>>>>> MERGE-SOURCE
<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'}"/>
@@ -1588,14 +1687,25 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Record Rules">
- <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)]"/>
+<<<<<<< TREE
+ <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)]"/>
+=======
+ <field name="name" string="Record Rule"/>
+ <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)]"/>
+ <field name="model_id"/>
+ <field name="groups"/>
+>>>>>>> MERGE-SOURCE
</search>
</field>
</record>
@@ -1808,10 +1918,17 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Search Actions">
- <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"/>
+<<<<<<< TREE
+ <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"/>
+=======
+ <filter string="To Do" name="todo" icon="terp-camera_test" domain=" [('state','=','open')]" help="Wizards to be Launched"/>
+ <field name="action_id"/>
+ <field name="category_id"/>
+ <field name="state"/>
+>>>>>>> MERGE-SOURCE
<group expand="0" string="Group By...">
<filter string="Category" context="{'group_by': 'category_id'}" icon="terp-folder-orange"/>
</group>
=== modified file 'openerp/addons/base/ir/ir_filters.xml'
--- openerp/addons/base/ir/ir_filters.xml 2012-07-19 07:24:13 +0000
+++ openerp/addons/base/ir/ir_filters.xml 2012-07-30 12:36:20 +0000
@@ -54,12 +54,24 @@
<field name="arch" type="xml">
<search string="Filters">
<field name="name" string="Filter Name"/>
+<<<<<<< TREE
<field name="model_id"/>
<field name="user_id"/>
+=======
+>>>>>>> MERGE-SOURCE
<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"/>
+<<<<<<< TREE
<separator/>
<filter icon="terp-personal" domain="[('user_id','in',(uid, False))]" name="my_filters" string="My Filters"/>
+=======
+ <separator/>
+ <filter icon="terp-personal" domain="[('user_id','in',(uid, False))]"
+ name="my_filters"
+ string="My Filters"/>
+ <field name="model_id"/>
+ <field name="user_id"/>
+>>>>>>> MERGE-SOURCE
</search>
</field>
</record>
=== modified file 'openerp/addons/base/ir/workflow/workflow_view.xml'
--- openerp/addons/base/ir/workflow/workflow_view.xml 2012-07-19 09:44:51 +0000
+++ openerp/addons/base/ir/workflow/workflow_view.xml 2012-07-30 12:36:20 +0000
@@ -164,11 +164,22 @@
<field name="arch" type="xml">
<search string="Workflow Activity">
<field name="name" string="Workflow Activity"/>
+<<<<<<< TREE
+=======
+ <filter icon="terp-camera_test" string="Flow Start"
+ domain="[('flow_start', '=',True)]" />
+ <separator/>
+ <filter icon="terp-gtk-stop" string="Flow Stop"
+ domain="[('flow_stop', '=',True)]" />
+>>>>>>> MERGE-SOURCE
<field name="wkf_id"/>
<field name="action_id"/>
<field name="kind"/>
+<<<<<<< TREE
<filter icon="terp-camera_test" string="Flow Start" domain="[('flow_start', '=',True)]" />
<filter icon="terp-gtk-stop" string="Flow Stop" domain="[('flow_stop', '=',True)]" />
+=======
+>>>>>>> MERGE-SOURCE
<group expand="0" string="Group By...">
<filter string="Workflow" icon="terp-stage" domain="[]" context="{'group_by':'wkf_id'}"/>
</group>
@@ -295,7 +306,12 @@
<field name="arch" type="xml">
<search string="Workflow Instances">
<field name="res_type" string="Resource Object"/>
- <field name="wkf_id"/>
+<<<<<<< TREE
+ <field name="wkf_id"/>
+=======
+ <filter icon="terp-camera_test" string="Active" domain="[('state','=','active')]" name="active"/>
+ <field name="wkf_id"/>
+>>>>>>> MERGE-SOURCE
<field name="res_id"/>
<field name="state"/>
<filter icon="terp-camera_test" string="Active" domain="[('state','=','active')]" name="active"/>
@@ -358,7 +374,12 @@
<field name="arch" type="xml">
<search string="Workflow Workitems">
<field name="state" string="State"/>
- <field name="wkf_id"/>
+<<<<<<< TREE
+ <field name="wkf_id"/>
+=======
+ <filter icon="terp-camera_test" string="Active" name="active" domain="[('state','=','active')]"/>
+ <field name="wkf_id"/>
+>>>>>>> MERGE-SOURCE
<field name="act_id"/>
<field name="subflow_id"/>
<field name="inst_id"/>
=== modified file 'openerp/addons/base/module/module_view.xml'
--- openerp/addons/base/module/module_view.xml 2012-07-24 03:54:13 +0000
+++ openerp/addons/base/module/module_view.xml 2012-07-30 12:36:20 +0000
@@ -41,6 +41,7 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Search modules">
+<<<<<<< TREE
<field name="name" filter_domain="['|', ('name','ilike',self), ('shortdesc','ilike',self)]" string="Module"/>
<field name="description" string="Keywords"/>
<field name="category_id"/>
@@ -52,6 +53,19 @@
<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'}"/>
+=======
+ <field name="name" filter_domain="['|', ('name','ilike',self), ('shortdesc','ilike',self)]" string="Module"/>
+ <field name="description" string="Keywords" filter_domain="['|', ('description', 'ilike', self), ('summary', 'ilike', self)]"/>
+ <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'])]"/>
+ <field name="category_id"/>
+ <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'}"/>
+>>>>>>> MERGE-SOURCE
</group>
</search>
</field>
=== modified file 'openerp/addons/base/res/ir_property_view.xml'
--- openerp/addons/base/res/ir_property_view.xml 2012-07-19 09:07:25 +0000
+++ openerp/addons/base/res/ir_property_view.xml 2012-07-30 12:36:20 +0000
@@ -9,6 +9,13 @@
<field name="arch" type="xml">
<search string="Parameters">
<field name="name" string="Name"/>
+<<<<<<< TREE
+=======
+ <filter icon="terp-project"
+ string="Generic"
+ help="Parameters that are used by all resources."
+ domain="[('res_id','=',False)]"/>
+>>>>>>> MERGE-SOURCE
<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)]"/>
=== modified file 'openerp/addons/base/res/res_bank_view.xml'
--- openerp/addons/base/res/res_bank_view.xml 2012-07-19 09:07:25 +0000
+++ openerp/addons/base/res/res_bank_view.xml 2012-07-30 12:36:20 +0000
@@ -146,9 +146,17 @@
<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"/>
+<<<<<<< TREE
<field name="company_id" invisible="context.get('company_hide', True)"/>
<field name="partner_id"/>
+=======
+>>>>>>> MERGE-SOURCE
<filter name="my_bank" icon="terp-check" string="My Banks" domain="[('company_id','<>',False)]" help="Bank accounts belonging to one of your companies"/>
+<<<<<<< TREE
+=======
+ <field name="company_id" invisible="context.get('company_hide', True)"/>
+ <field name="partner_id"/>
+>>>>>>> MERGE-SOURCE
</search>
</field>
</record>
=== modified file 'openerp/addons/base/res/res_lang_view.xml'
--- openerp/addons/base/res/res_lang_view.xml 2012-07-19 09:07:25 +0000
+++ openerp/addons/base/res/res_lang_view.xml 2012-07-30 12:36:20 +0000
@@ -108,9 +108,17 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Languages">
+<<<<<<< TREE
<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)]"/>
+=======
+ <field name="name"
+ filter_domain="['|', '|', ('name','ilike',self), ('code','ilike',self), ('iso_code','ilike',self)]"
+ string="Language"/>
+ <filter string="Translatable" icon="terp-tools" domain="[('translatable','=',True)]"/>
+ <field name="direction"/>
+>>>>>>> MERGE-SOURCE
</search>
</field>
</record>
=== modified file 'openerp/addons/base/res/res_partner_view.xml'
--- openerp/addons/base/res/res_partner_view.xml 2012-07-30 12:34:17 +0000
+++ openerp/addons/base/res/res_partner_view.xml 2012-07-30 12:36:20 +0000
@@ -245,6 +245,7 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Search Partner">
+<<<<<<< TREE
<field name="name" filter_domain="['|','|',('name','ilike',self),('parent_id','ilike',self),('ref','=',self)]" string="Partner"/>
<field name="category_id"/>
<field name="user_id"/>
@@ -262,6 +263,27 @@
<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"/>
+ <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"/>
+ <field name="category_id"/>
+ <field name="user_id"/>
+ <field name="parent_id" filter_domain="[('parent_id','child_of',[self])]"/>
+ <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>
+>>>>>>> MERGE-SOURCE
</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
