Divyesh Makwana(OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-review_all_search-account-mdi into
lp:~openerp-dev/openobject-addons/trunk-review_all_search.
Requested reviews:
OpenERP R&D Team (openerp-dev)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-review_all_search-account-mdi/+merge/110279
Hello Sir,
Improved all search view according to the new search widget in the web client,
following this rules:
1. Only one char field per search view, and it is in first position (this field
makes a multiple search on several fields with filter_domain).
2. Date field in the second position.
3 . Group all the filters (move the filters like 'my leads' with the others),
and placed it just after the search on dates.
4. Search on m2o fields are placed in 4th position, then comes the 'Group By'.
5. Placed the filters that do not filter but only show/hide columns in a group,
called 'Display', which is placed after the group 'Group By'.
Thanks,
Divyesh
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-review_all_search-account-mdi/+merge/110279
Your team OpenERP R&D Team is requested to review the proposed merge of
lp:~openerp-dev/openobject-addons/trunk-review_all_search-account-mdi into
lp:~openerp-dev/openobject-addons/trunk-review_all_search.
=== modified file 'account/account_invoice_view.xml'
--- account/account_invoice_view.xml 2012-06-12 06:53:29 +0000
+++ account/account_invoice_view.xml 2012-06-14 10:15:26 +0000
@@ -407,22 +407,20 @@
<field name="arch" type="xml">
<search string="Search Invoice">
<group>
+ <field name="number"
+ string="Reference"
+ filter_domain="['|', ('number','ilike',self),('origin','ilike',self)]"/>
+ <separator orientation="vertical"/>
<filter name="draft" icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Invoices"/>
<filter name="proforma" icon="terp-gtk-media-pause" string="Proforma" domain="[('state','=','proforma2')]" help="Proforma Invoices" groups="account.group_proforma_invoices"/>
<filter name="invoices" icon="terp-dolar" string="Invoices" domain="[('state','not in',['draft','cancel'])]" help="Proforma/Open/Paid Invoices"/>
<separator orientation="vertical"/>
<filter name="unpaid" icon="terp-dolar_ok!" string="Unpaid" domain="[('state','=','open')]" help="Unpaid Invoices"/>
<separator orientation="vertical"/>
- <filter domain="[('user_id','=',uid)]" help="My Invoices" icon="terp-personal" />
+ <filter domain="[('user_id','=',uid)]" help="My Invoices" icon="terp-personal"/>
<separator orientation="vertical"/>
- <field name="number"
- string="Reference"
- filter_domain="['|', ('number','ilike',self),('origin','ilike',self)]"/>
<field name="partner_id"/>
<field name="user_id" widget="selection" string="Salesperson"/>
- </group>
- <newline/>
- <group>
<field name="journal_id" widget="selection"/>
<field name="period_id" string="Period"/>
</group>
=== modified file 'account/account_view.xml'
--- account/account_view.xml 2012-06-12 06:53:29 +0000
+++ account/account_view.xml 2012-06-14 10:15:26 +0000
@@ -65,11 +65,13 @@
<field name="arch" type="xml">
<search string="Search Fiscalyear">
<group>
+ <field name="name"
+ filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]"
+ string="Fiscal Year"/>
+ <separator orientation="vertical"/>
<filter string="Open" domain="[('state','=','draft')]" icon="terp-camera_test"/>
<filter string="Closed" domain="[('state','=','done')]" icon="terp-dialog-close"/>
<separator orientation="vertical"/>
- <field name="code"/>
- <field name="name"/>
<field name="state"/>
</group>
<newline/>
@@ -141,10 +143,11 @@
<field name="arch" type="xml">
<search string="Search Period">
<group>
+ <field name="name"
+ filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]"
+ string="Period"/>
+ <separator orientation="vertical"/>
<filter string="To Close" name="draft" domain="[('state','=','draft')]" icon="terp-dialog-close"/>
- <separator orientation="vertical"/>
- <field name="name"/>
- <field name="code"/>
</group>
</search>
</field>
@@ -217,11 +220,13 @@
<field name="arch" type="xml">
<search string="Accounts">
<group>
+ <field name="name"
+ filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]"
+ string="Account"/>
+ <separator orientation="vertical"/>
<filter icon="terp-sale" string="Receivable Accounts" domain="[('type','=','receivable')]"/>
<filter icon="terp-purchase" string="Payable Accounts" domain="[('type','=','payable')]"/>
<separator orientation="vertical"/>
- <field name="code"/>
- <field name="name"/>
<field name="user_type"/>
</group>
<newline/>
@@ -379,7 +384,9 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Journal View">
- <field name="name"/>
+ <field name="name"
+ filter_domain="[('name','ilike',self)]"
+ string="Journal View"/>
</search>
</field>
</record>
@@ -440,13 +447,15 @@
<field name="arch" type="xml">
<search string="Search Account Journal">
<group>
+ <field name="name"
+ filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]"
+ string="Journal"/>
+ <separator orientation="vertical"/>
<filter domain="['|', ('type', '=', 'sale'), ('type', '=', 'sale_refund')]" string="Sale" icon="terp-camera_test"/>
<filter domain="['|', ('type', '=', 'purchase'), ('type', '=', 'purchase_refund')]" string="Purchase" icon="terp-purchase"/>
- <filter domain="['|', ('type', '=', 'cash'), ('type', '=', 'bank')]" string="Liquidity" icon="terp-dolar"/>
+ <filter domain="['|', ('type', '=', 'cash'), ('type', '=', 'bank')]" string="Liquidity" icon="terp-dolar"/>
<filter domain="['|', ('type', '=', 'general'), ('type', '=', 'situation')]" string="Others" icon="terp-stock"/>
<separator orientation="vertical"/>
- <field name="code"/>
- <field name="name"/>
<field name="user_id"/>
</group>
<newline/>
@@ -521,12 +530,15 @@
<field name="arch" type="xml">
<search string="Search Bank Statements">
<group>
+ <field name="name"
+ filter_domain="[('name','ilike',self)]"
+ string="Bank Statement"/>
+ <field name="date"/>
+ <separator orientation="vertical"/>
<filter string="Draft" name="state_draft" domain="[('state','=','draft')]" icon="terp-document-new"/>
<filter string="Open" name="state_open" domain="[('state','=','open')]" icon="terp-check"/>
<filter string="Confirmed" name="state_confirmed" domain="[('state','=','confirm')]" icon="terp-camera_test"/>
<separator orientation="vertical"/>
- <field name="date"/>
- <field name="name"/>
<field name="journal_id" widget='selection' domain="[('type', '=', 'cash')]" />
</group>
<newline/>
@@ -564,11 +576,14 @@
<field name="arch" type="xml">
<search string="Search Bank Statements">
<group>
+ <field name="name"
+ filter_domain="[('name','ilike',self)]"
+ string="Bank Statement"/>
+ <field name="date"/>
+ <separator orientation="vertical"/>
<filter string="Draft" domain="[('state','=','draft')]" icon="terp-document-new"/>
<filter string="Confirmed" domain="[('state','=','confirm')]" icon="terp-camera_test"/>
<separator orientation="vertical"/>
- <field name="name"/>
- <field name="date"/>
<field name="period_id"/>
<field name="journal_id" widget="selection" domain="[('type', '=', 'bank')]" />
</group>
@@ -693,8 +708,9 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Account Type">
- <field name="name"/>
- <field name="code"/>
+ <field name="name"
+ filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]"
+ string="Account Type"/>
</search>
</field>
</record>
@@ -794,8 +810,9 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Account Tax Code">
- <field name="name"/>
- <field name="code"/>
+ <field name="name"
+ filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]"
+ string="Tax Code"/>
<field name="parent_id"/>
<field name="company_id" widget="selection" groups="base.group_multi_company"/>
</search>
@@ -881,8 +898,9 @@
<field name="arch" type="xml">
<search string="Search Taxes">
<group>
- <field name="name"/>
- <field name="description"/>
+ <field name="name"
+ filter_domain="['|', ('name','ilike',self), ('description','ilike',self)]"
+ string="Tax"/>
<field name="company_id" widget="selection" groups="base.group_multi_company"/>
</group>
</search>
@@ -1147,6 +1165,8 @@
<field name="arch" type="xml">
<search string="Search Journal Items">
<group>
+ <field name="date"/>
+ <separator orientation="vertical"/>
<filter icon="terp-document-new" string="Unbalanced" domain="[('state','=','draft')]" help="Unbalanced Journal Items"/>
<separator orientation="vertical"/>
<filter icon="terp-document-new" string="Unposted" domain="[('move_id.state','=','draft')]" help="Unposted Journal Items"/>
@@ -1161,12 +1181,8 @@
<filter string="Next Partner to Reconcile" help="Next Partner Entries to reconcile" name="next_partner" context="{'next_partner_only': 1}" icon="terp-gtk-jump-to-ltr" domain="[('account_id.reconcile','=',True),('reconcile_id','=',False)]"/>
<separator orientation="vertical"/>
<field name="move_id" string="Number (Move)"/>
- <field name="date"/>
<field name="account_id"/>
<field name="partner_id"/>
- </group>
- <newline/>
- <group>
<field name="journal_id" widget="selection" context="{'journal_id':self}"/>
<field name="period_id" context="{'period_id':self}"/>
</group>
@@ -1392,18 +1408,17 @@
<field name="arch" type="xml">
<search string="Search Move">
<group>
+ <field name="name"
+ filter_domain="['|', ('name','ilike',self), ('ref','ilike',self)]"
+ string="Move"/>
+ <field name="date"/>
+ <separator orientation="vertical"/>
<filter icon="terp-document-new" string="Unposted" domain="[('state','=','draft')]" help="Unposted Journal Entries"/>
<filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Journal Entries"/>
<separator orientation="vertical"/>
<filter icon="terp-gtk-jump-to-ltr" string="To Review" domain="[('to_check','=',True)]" help="Journal Entries to Review"/>
<separator orientation="vertical"/>
- <field name="name"/>
- <field name="ref"/>
<field name="partner_id"/>
- <field name="date"/>
- </group>
- <newline/>
- <group>
<field name="journal_id" widget="selection"/>
<field name="period_id"/>
</group>
@@ -1622,17 +1637,20 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Journal Entry Model">
- <group>
- <filter string="Sale" icon="terp-camera_test" domain="[('journal_id.type', '=', 'sale')]"/>
- <filter string="Purchase" icon="terp-purchase" domain="[('journal_id.type', '=', 'purchase')]"/>
- <separator orientation="vertical"/>
- <field name="name"/>
- <field name="journal_id" widget="selection"/>
- <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+ <group>
+ <field name="name"
+ filter_domain="[('name','ilike',self)]"
+ string="Journal Entry Model"/>
+ <separator orientation="vertical"/>
+ <filter string="Sale" icon="terp-camera_test" domain="[('journal_id.type', '=', 'sale')]"/>
+ <filter string="Purchase" icon="terp-purchase" domain="[('journal_id.type', '=', 'purchase')]"/>
+ <separator orientation="vertical"/>
+ <field name="journal_id" widget="selection"/>
+ <field name="company_id" widget="selection" groups="base.group_multi_company"/>
</group>
<newline/>
<group expand="0" string="Group By...">
- <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
+ <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
</group>
</search>
</field>
@@ -1715,7 +1733,9 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Payment Term">
- <field name="name"/>
+ <field name="name"
+ filter_domain="[('name','ilike',self)]"
+ string="Payment Term"/>
<field name="active"/>
</search>
</field>
@@ -1801,12 +1821,15 @@
<field name="arch" type="xml">
<search string="Entry Subscription">
<group>
+ <field name="name"
+ filter_domain="[('name','ilike',self)]"
+ string="Account Subscription"/>
+ <field name="date_start"/>
+ <separator orientation="vertical"/>
<filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Subscription"/>
<filter icon="terp-camera_test" string="Running" domain="[('state','=','running')]" help="Running Subscription"/>
<separator orientation="vertical"/>
- <field name="name"/>
<field name="model_id"/>
- <field name="date_start"/>
</group>
<newline/>
<group expand="0" string="Group By...">
@@ -2071,14 +2094,16 @@
<field name="arch" type="xml">
<search string="Search Account Templates">
<group>
+ <field name="name"
+ filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]"
+ string="Account Template"/>
+ <separator orientation="vertical"/>
<filter icon="terp-sale" string="Receivale Accounts" domain="[('type','=','receivable')]"/>
- <filter icon="terp-purchase" string="Payable Accounts" domain="[('type','=','payable')]"/>
- <separator orientation="vertical"/>
- <field name="code"/>
- <field name="name"/>
+ <filter icon="terp-purchase" string="Payable Accounts" domain="[('type','=','payable')]"/>
+ <separator orientation="vertical"/>
<field name="parent_id"/>
+ <field name="user_type"/>
<field name="type"/>
- <field name="user_type"/>
</group>
<newline/>
<group expand="0" string="Group By...">
@@ -2139,13 +2164,16 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Search Chart of Account Templates">
- <group>
- <field name="name"/>
+ <group>
+ <field name="name"
+ filter_domain="[('name','ilike',self)]"
+ string="Account Template"/>
+ <separator orientation="vertical"/>
<field name="account_root_id"/>
<field name="bank_account_view_id"/>
- </group>
- <newline/>
- <group expand="0" string="Group By...">
+ </group>
+ <newline/>
+ <group expand="0" string="Group By...">
<filter string="Root Account" icon="terp-folder-orange" domain="[]" context="{'group_by':'account_root_id'}"/>
<filter string="Bank Account" icon="terp-folder-orange" domain="[]" context="{'group_by':'bank_account_view_id'}"/>
<separator orientation="vertical"/>
@@ -2154,7 +2182,7 @@
<separator orientation="vertical"/>
<filter string="Income Account" icon="terp-sale" domain="[]" context="{'group_by':'property_account_income_categ'}"/>
<filter string="Expense Account" icon="terp-purchase" domain="[]" context="{'group_by':'property_account_expense_categ'}"/>
- </group>
+ </group>
</search>
</field>
</record>
@@ -2261,11 +2289,13 @@
<field name="arch" type="xml">
<search string="Search Tax Templates">
<group>
+ <field name="name"
+ filter_domain="['|', ('name','ilike',self), ('description','ilike',self)]"
+ string="Tax Template"/>
+ <separator orientation="vertical"/>
<filter icon="terp-sale" string="Sale" domain="[('type_tax_use','=','sale')]" help="Taxes used in Sales"/>
<filter icon="terp-purchase" string="Purchase" domain="[('type_tax_use','=','purchase')]" help="Taxes used in Purchases"/>
<separator orientation="vertical"/>
- <field name="name"/>
- <field name="description"/>
<field name="chart_template_id"/>
</group>
</search>
@@ -2304,8 +2334,9 @@
<field name="arch" type="xml">
<search string="Search tax template">
<group>
- <field name="name"/>
- <field name="code"/>
+ <field name="name"
+ filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]"
+ string="Tax Template"/>
<field name="parent_id"/>
</group>
<newline/>
@@ -2443,7 +2474,9 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Fiscal Position">
- <field name="name"/>
+ <field name="name"
+ filter_domain="[('name','ilike',self)]"
+ string="Fiscal Position Template"/>
</search>
</field>
</record>
@@ -2733,9 +2766,11 @@
<field name="arch" type="xml">
<search string="Account Report">
<group>
- <field name="name"/>
- <field name="type"/>
+ <field name="name"
+ filter_domain="[('name','ilike',self)]"
+ string="Account Report"/>
<field name="account_report_id"/>
+ <field name="type"/>
</group>
<newline/>
<group expand="0" string="Group By...">
=== modified file 'account/project/project_view.xml'
--- account/project/project_view.xml 2012-06-11 12:42:11 +0000
+++ account/project/project_view.xml 2012-06-14 10:15:26 +0000
@@ -30,13 +30,15 @@
<field name="arch" type="xml">
<search string="Analytic Account">
<group>
+ <field name="name"
+ filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]"
+ string="Analytic Account"/>
+ <separator orientation="vertical"/>
<filter icon="terp-gtk-media-pause" string="Pending" domain="[('state','=','pending')]" help="Pending Accounts"/>
<filter icon="terp-camera_test" string="Current" domain="[('state','=','open')]" help="Current Accounts"/>
<separator orientation="vertical"/>
<filter icon="terp-go-today" string="Overdue Account" domain="[('date','<',time.strftime('%%Y-%%m-%%d'))]" help="Analytic Accounts with a past deadline."/>
<separator orientation="vertical"/>
- <field name="name"/>
- <field name="code"/>
<field name="partner_id"/>
<field name="user_id" widget="selection"/>
</group>
@@ -220,16 +222,18 @@
<field name="arch" type="xml">
<search string="Search Analytic Lines">
<group>
+ <field name="name"
+ filter_domain="[('name','ilike',self)]"
+ string="Analytic Line"/>
+ <field name="date"/>
+ <separator orientation="vertical"/>
<filter name="sales" string="Sales" domain="[('journal_id.type','=','sale')]" icon="terp-camera_test" help="Analytic Journal Items related to a sale journal."/>
<filter name="purchases" string="Purchases" domain="[('journal_id.type','=','purchase')]" icon="terp-purchase" help="Analytic Journal Items related to a purchase journal."/>
<filter name="others" string="Others" domain="[('journal_id.type','in',('cash','general','situation'))]" icon="terp-folder-orange"/>
+ <filter string="My Entries" domain="[('user_id','=',uid)]" icon="terp-personal"/>
<separator orientation="vertical"/>
- <field name="date"/>
- <field name="name"/>
<field name="account_id"/>
- <field name="user_id">
- <filter string="My Entries" domain="[('user_id','=',uid)]" icon="terp-personal"/>
- </field>
+ <field name="user_id"/>
</group>
<newline/>
<group string="Group By..." expand="0">
@@ -325,12 +329,13 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Analytic Journals">
- <group>
- <field name="code"/>
- <field name="name"/>
- <field name="type"/>
- </group>
- <newline/>
+ <group>
+ <field name="name"
+ filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]"
+ string="Analytic Journal"/>
+ <field name="type"/>
+ </group>
+ <newline/>
<group expand="0" string="Group By...">
<filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type'}"/>
</group>
=== modified file 'account/report/account_analytic_entries_report_view.xml'
--- account/report/account_analytic_entries_report_view.xml 2012-06-11 16:22:53 +0000
+++ account/report/account_analytic_entries_report_view.xml 2012-06-14 10:15:26 +0000
@@ -35,12 +35,16 @@
<field name="arch" type="xml">
<search string="Analytic Entries Analysis">
<group>
+ <field name="day"
+ filter_domain="[('day','ilike',self)]"
+ string="Day"/>
+ <field name="date"/>
+ <separator orientation="vertical"/>
<filter string="My Entries" icon="terp-personal" domain="[('user_id','=',uid)]" help="My Entries"/>
+ <separator orientation="vertical"/>
<field name="account_id" groups="analytic.group_analytic_accounting"/>
<field name="product_id" />
<field name="user_id"/>
- <field name="date"/>
- <field name="day"/>
</group>
<newline/>
<group expand="0" string="Group By...">
=== modified file 'account/report/account_entries_report_view.xml'
--- account/report/account_entries_report_view.xml 2012-05-07 18:13:46 +0000
+++ account/report/account_entries_report_view.xml 2012-06-14 10:15:26 +0000
@@ -68,6 +68,10 @@
<field name="arch" type="xml">
<search string="Entries Analysis">
<group>
+ <field name="date"/>
+ <field name="date_created"/>
+ <field name="date_maturity"/>
+ <separator orientation="vertical"/>
<filter icon="terp-go-year" string="This F.Year"
name="thisyear"
context="{'year':'current_year'}"
@@ -95,10 +99,6 @@
<field name="partner_id"/>
<separator orientation="vertical" groups="base.group_multi_company"/>
<field name="company_id" groups="base.group_multi_company"/>
- <newline/>
- <field name="date_created"/>
- <field name="date"/>
- <field name="date_maturity"/>
</group>
<newline/>
<group expand="1" string="Group By...">
=== modified file 'account/report/account_invoice_report_view.xml'
--- account/report/account_invoice_report_view.xml 2012-06-04 06:27:09 +0000
+++ account/report/account_invoice_report_view.xml 2012-06-14 10:15:26 +0000
@@ -56,6 +56,8 @@
<field name="arch" type="xml">
<search string="Invoices Analysis">
<group>
+ <field name="date"/>
+ <separator orientation="vertical"/>
<filter string="Draft"
icon="terp-document-new"
domain="[('state','=','draft')]"
@@ -90,7 +92,6 @@
<field name="partner_id"/>
<field name="user_id" />
<field name="categ_id" filter_domain="[('categ_id', 'child_of', self)]"/>
- <field name="date"/>
</group>
<newline/>
<group expand="1" string="Group By...">
=== modified file 'account/report/account_report_view.xml'
--- account/report/account_report_view.xml 2012-06-11 12:42:11 +0000
+++ account/report/account_report_view.xml 2012-06-14 10:15:26 +0000
@@ -151,7 +151,9 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Sales by Account">
- <field name="name"/>
+ <field name="name"
+ filter_domain="[('name','ilike',self)]"
+ string="Year"/>
<field name="month"/>
</search>
</field>
@@ -214,7 +216,9 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Sales by Account">
- <field name="name"/>
+ <field name="name"
+ filter_domain="[('name','ilike',self)]"
+ string="Year"/>
<field name="month"/>
</search>
</field>
=== modified file 'account/report/account_treasury_report_view.xml'
--- account/report/account_treasury_report_view.xml 2011-05-31 20:51:28 +0000
+++ account/report/account_treasury_report_view.xml 2012-06-14 10:15:26 +0000
@@ -36,12 +36,12 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Treasury Analysis">
- <group colspan="10" col="12">
+ <group>
<field name="fiscalyear_id"/>
<field name="period_id"/>
<field name="company_id" groups="base.group_multi_company"/>
</group>
- <newline/>
+ <newline/>
</search>
</field>
</record>
=== modified file 'account_analytic_analysis/account_analytic_analysis_menu.xml'
--- account_analytic_analysis/account_analytic_analysis_menu.xml 2012-06-11 16:22:53 +0000
+++ account_analytic_analysis/account_analytic_analysis_menu.xml 2012-06-14 10:15:26 +0000
@@ -20,6 +20,9 @@
<field name="arch" type="xml">
<search string="Analytic Account">
<group col="8" colspan="4">
+ <field name="name" filter_domain="['|', ('name','ilike',self),('code','ilike',self)]" string="Contract"/>
+ <field name="date"/>
+ <separator orientation="vertical"/>
<filter icon="terp-camera_test" name="open" string="Open" domain="[('state','in',('open','draft'))]" help="Contracts in progress"/>
<filter icon="terp-gtk-media-pause" name="pending" string="Pending" domain="[('state','=','pending')]" help="Pending contracts to renew with your customer"/>
<separator orientation="vertical"/>
@@ -30,10 +33,8 @@
<filter string="Contracts Having a Partner" help="A contract in OpenERP is an analytic account having a partner set on it." name="has_partner" domain="[('partner_id', '!=', False)]" icon="terp-partner" />
<filter string="Contracts not assigned" help="Contracts that are not assigned to an account manager." domain="[('user_id', '=', False)]" icon="terp-personal-" />
<separator orientation="vertical"/>
- <field name="name" filter_domain="['|', ('name','ilike',self),('code','ilike',self)]" string="Contract"/>
<field name="partner_id"/>
<field name="user_id"/>
- <field name="date"/>
</group>
<newline/>
<group expand="0" string="Group By...">
=== modified file 'account_analytic_default/account_analytic_default_view.xml'
--- account_analytic_default/account_analytic_default_view.xml 2012-06-10 08:35:15 +0000
+++ account_analytic_default/account_analytic_default_view.xml 2012-06-14 10:15:26 +0000
@@ -47,20 +47,20 @@
<field name="arch" type="xml">
<search string="Accounts">
<group>
- <filter icon="terp-go-month" string="Current" name = "current" help="Analytical defaults whose end date is greater than today or None" domain = "['|', ('date_stop', '>', datetime.date.today().strftime('%%Y-%%m-%%d')), ('date_stop', '=', False)]" />
- <separator orientation="vertical"/>
- <field name="analytic_id" groups="analytic.group_analytic_accounting"/>
- <field name="product_id"/>
- <field name="partner_id"/>
- <field name="user_id"/>
- <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+ <field name="date_stop"/>
+ <separator orientation="vertical"/>
+ <field name="analytic_id" groups="analytic.group_analytic_accounting"/>
+ <field name="product_id"/>
+ <field name="partner_id"/>
+ <field name="user_id"/>
+ <field name="company_id" widget="selection" groups="base.group_multi_company"/>
</group>
<newline/>
<group expand="0" string="Group By...">
<filter string="User" icon="terp-personal" context="{'group_by':'user_id'}" help="User"/>
- <filter string="Partner" icon="terp-partner" context="{'group_by':'partner_id'}" help="Partner"/>
- <separator orientation="vertical"/>
- <filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}" help="Product" />
+ <filter string="Partner" icon="terp-partner" context="{'group_by':'partner_id'}" help="Partner"/>
+ <separator orientation="vertical"/>
+ <filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}" help="Product" />
<filter string="Analytic Account" icon="terp-folder-green" context="{'group_by':'analytic_id'}" help="Analytic Account" groups="analytic.group_analytic_accounting"/>
<separator orientation="vertical"/>
<filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company" />
=== modified file 'account_analytic_plans/account_analytic_plans_view.xml'
--- account_analytic_plans/account_analytic_plans_view.xml 2012-06-09 13:50:41 +0000
+++ account_analytic_plans/account_analytic_plans_view.xml 2012-06-14 10:15:26 +0000
@@ -196,7 +196,9 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Analytic Plans">
- <field name="name"/>
+ <field name="name"
+ filter_domain="[('name','ilike',self)]"
+ string="Analytic Plan"/>
</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
