diff options
| author | Quentin (OpenERP) <qdp-launchpad@openerp.com> | 2012-07-31 17:03:58 +0200 |
|---|---|---|
| committer | Quentin (OpenERP) <qdp-launchpad@openerp.com> | 2012-07-31 17:03:58 +0200 |
| commit | e1b50e304d3d1a8c030bb5f71bb0eefec3330fee (patch) | |
| tree | ab91d0cf12d01ac01e9a14dd5f6cddfec9ccbcba /addons | |
| parent | a36ca8974a54273d43e59f64708e0afc34817551 (diff) | |
| parent | e1c34a9aad946f3c54fd58c0889bf5b69449ebe4 (diff) | |
[MEGUEZ] merged the clean search view branch
bzr revid: qdp-launchpad@openerp.com-20120731150358-jqd3eoz06imzlx01
Diffstat (limited to 'addons')
118 files changed, 1315 insertions, 2932 deletions
diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml index 393c468c952..f1a8c82b382 100644 --- a/addons/account/account_invoice_view.xml +++ b/addons/account/account_invoice_view.xml @@ -442,32 +442,22 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Search Invoice"> - <group> - <field name="number" - string="Invoice" - 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"/> - <separator orientation="vertical"/> - <field name="partner_id"/> - <field name="user_id" widget="selection" string="Salesperson"/> - <field name="journal_id" widget="selection"/> - <field name="period_id" string="Period"/> - </group> - <newline/> + <field name="number" string="Invoice" filter_domain="['|', ('number','ilike',self),('origin','ilike',self)]"/> + <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"/> + <filter name="unpaid" icon="terp-dolar_ok!" string="Unpaid" domain="[('state','=','open')]" help="Unpaid Invoices"/> + <separator/> + <filter domain="[('user_id','=',uid)]" help="My Invoices" icon="terp-personal"/> + <field name="partner_id"/> + <field name="user_id" string="Salesperson"/> + <field name="journal_id"/> + <field name="period_id" string="Period"/> <group expand="0" string="Group By..."> <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/> <filter string="Responsible" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/> - <separator orientation="vertical"/> <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/> <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/> - <separator orientation="vertical"/> <filter string="Period" icon="terp-go-month" domain="[]" context="{'group_by':'period_id'}"/> <filter string="Invoice Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_invoice'}"/> <filter string="Due Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_due'}"/> diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml index d342dc5d3b9..26e66c66281 100644 --- a/addons/account/account_view.xml +++ b/addons/account/account_view.xml @@ -63,15 +63,10 @@ <field name="type">search</field> <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="state"/> - </group> - <newline/> + <field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Fiscal Year"/> + <filter string="Open" domain="[('state','=','draft')]" icon="terp-camera_test"/> + <filter string="Closed" domain="[('state','=','done')]" icon="terp-dialog-close"/> + <field name="state"/> <group expand="0" string="Group By..."> <filter string="Status" context="{'group_by': 'state'}" icon="terp-stock_effects-object-colorize"/> </group> @@ -146,11 +141,8 @@ <field name="type">search</field> <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"/> - </group> + <field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Period"/> + <filter string="To Close" name="draft" domain="[('state','=','draft')]" icon="terp-dialog-close"/> </search> </field> </record> @@ -217,18 +209,12 @@ <field name="type">search</field> <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="user_type"/> - </group> - <newline/> + <field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Account"/> + <filter icon="terp-sale" string="Receivable Accounts" domain="[('type','=','receivable')]"/> + <filter icon="terp-purchase" string="Payable Accounts" domain="[('type','=','payable')]"/> + <field name="user_type"/> <group expand="0" string="Group By..."> <filter string="Parent Account" icon="terp-folder-orange" domain="" context="{'group_by':'parent_id'}"/> - <separator orientation="vertical"/> <filter string="Account Type" icon="terp-stock_symbol-selection" domain="" context="{'group_by':'user_type'}"/> <filter string="Internal Type" icon="terp-stock_symbol-selection" domain="" context="{'group_by':'type'}"/> </group> @@ -440,21 +426,15 @@ <field name="type">search</field> <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', '=', 'general'), ('type', '=', 'situation')]" string="Others" icon="terp-stock"/> - <separator orientation="vertical"/> <field name="user_id"/> - </group> - <newline/> <group expand="0" string="Group By..."> - <filter string="User" context="{'group_by':'user_id'}" icon="terp-personal"/> - <separator orientation="vertical"/> - <filter string="Type" context="{'group_by':'type'}" icon="terp-stock_symbol-selection"/> + <filter string="User" context="{'group_by':'user_id'}" icon="terp-personal"/> + <filter string="Type" context="{'group_by':'type'}" icon="terp-stock_symbol-selection"/> </group> </search> </field> @@ -542,22 +522,15 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Search Bank Statements"> - <group> - <field name="name" string="Bank Statement"/> - <separator orientation="vertical"/> - <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="journal_id" widget='selection' domain="[('type', '=', 'cash')]" /> - </group> - <newline/> + <field name="name" string="Bank Statement"/> + <field name="date"/> + <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"/> + <field name="journal_id" domain="[('type', '=', 'cash')]" /> <group expand="0" string="Group By..."> <filter string="Journal" context="{'group_by': 'journal_id'}" icon="terp-folder-orange"/> <filter string="Status" context="{'group_by': 'state'}" icon="terp-stock_effects-object-colorize"/> - <separator orientation="vertical"/> <filter string="Period" context="{'group_by': 'period_id'}" icon="terp-go-month"/> </group> </search> @@ -587,22 +560,15 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Search Bank Statements"> - <group> - <field name="name" string="Bank Statement"/> - <separator orientation="vertical"/> - <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="period_id"/> - <field name="journal_id" widget="selection" domain="[('type', '=', 'bank')]" /> - </group> - <newline/> + <field name="name" string="Bank Statement"/> + <field name="date"/> + <filter string="Draft" domain="[('state','=','draft')]" icon="terp-document-new"/> + <filter string="Confirmed" domain="[('state','=','confirm')]" icon="terp-camera_test"/> + <field name="period_id"/> + <field name="journal_id" domain="[('type', '=', 'bank')]" /> <group expand="0" string="Group By..."> <filter string="Journal" context="{'group_by': 'journal_id'}" icon="terp-folder-orange"/> <filter string="Status" context="{'group_by': 'state'}" icon="terp-stock_effects-object-colorize"/> - <separator orientation="vertical"/> <filter string="Period" context="{'group_by': 'period_id'}" icon="terp-go-month"/> </group> </search> @@ -833,7 +799,7 @@ <search string="Account Tax 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"/> + <field name="company_id" groups="base.group_multi_company"/> </search> </field> </record> @@ -916,10 +882,8 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Search Taxes"> - <group> - <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> + <field name="name" filter_domain="['|', ('name','ilike',self), ('description','ilike',self)]" string="Tax"/> + <field name="company_id" groups="base.group_multi_company"/> </search> </field> </record> @@ -1195,38 +1159,26 @@ <field name="type">search</field> <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"/> - <filter name="posted" icon="terp-camera_test" string="Posted" domain="[('move_id.state','=','posted')]" help="Posted Journal Items"/> - <separator orientation="vertical"/> - <filter - icon="terp-dolar_ok!" - string="Unreconciled" - domain="[('reconcile_id','=',False), ('account_id.reconcile','=',True)]" help="Unreconciled Journal Items" - name="unreconciled"/> - <separator orientation="vertical"/> - <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="account_id"/> - <field name="partner_id"/> - <field name="journal_id" widget="selection" context="{'journal_id':self}"/> - <field name="period_id" context="{'period_id':self}"/> - </group> - <newline/> + <field name="date"/> + <filter icon="terp-document-new" string="Unbalanced" domain="[('state','=','draft')]" help="Unbalanced Journal Items"/> + <separator/> + <filter icon="terp-document-new" string="Unposted" domain="[('move_id.state','=','draft')]" help="Unposted Journal Items"/> + <filter name="posted" icon="terp-camera_test" string="Posted" domain="[('move_id.state','=','posted')]" help="Posted Journal Items"/> + <separator/> + <filter icon="terp-dolar_ok!" string="Unreconciled" domain="[('reconcile_id','=',False), ('account_id.reconcile','=',True)]" help="Unreconciled Journal Items" name="unreconciled"/> + <separator/> + <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)]"/> + <field name="move_id" string="Number (Move)"/> + <field name="account_id"/> + <field name="partner_id"/> + <field name="journal_id" context="{'journal_id':self}"/> + <field name="period_id" context="{'period_id':self}"/> <group expand="0" string="Group By..."> <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/> - <separator orientation="vertical"/> <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/> <filter string="Account" icon="terp-folder-green" context="{'group_by':'account_id'}"/> - <separator orientation="vertical"/> <filter string="Period" icon="terp-go-month" domain="[]" context="{'group_by':'period_id'}"/> </group> - <newline/> </search> </field> </record> @@ -1444,27 +1396,19 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Search Move"> - <group> - <field name="name" filter_domain="['|', ('name','ilike',self), ('ref','ilike',self)]" string="Move"/> - <separator orientation="vertical"/> - <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="partner_id"/> - <field name="journal_id" widget="selection"/> - <field name="period_id"/> - </group> - <newline/> + <field name="name" filter_domain="['|', ('name','ilike',self), ('ref','ilike',self)]" string="Move"/> + <field name="date"/> + <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/> + <filter icon="terp-gtk-jump-to-ltr" string="To Review" domain="[('to_check','=',True)]" help="Journal Entries to Review"/> + <field name="partner_id"/> + <field name="journal_id"/> + <field name="period_id"/> <group expand="0" string="Group By..."> <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/> - <separator orientation="vertical"/> <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/> <filter string="States" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/> - <separator orientation="vertical"/> <filter string="Period" icon="terp-go-month" domain="[]" context="{'group_by':'period_id'}"/> <filter string="Date" icon="terp-go-month" domain="[]" context="{'group_by':'date'}"/> </group> @@ -1673,16 +1617,11 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Journal Entry Model"> - <group> - <field name="name" 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/> + <field name="name" string="Journal Entry Model"/> + <filter string="Sale" icon="terp-camera_test" domain="[('journal_id.type', '=', 'sale')]"/> + <filter string="Purchase" icon="terp-purchase" domain="[('journal_id.type', '=', 'purchase')]"/> + <field name="journal_id"/> + <field name="company_id" groups="base.group_multi_company"/> <group expand="0" string="Group By..."> <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/> </group> @@ -1852,17 +1791,11 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Entry Subscription"> - <group> - <field name="name" string="Account Subscription"/> - <separator orientation="vertical"/> - <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="model_id"/> - </group> - <newline/> + <field name="name" string="Account Subscription"/> + <field name="date_start"/> + <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"/> + <field name="model_id"/> <group expand="0" string="Group By..."> <filter string="Model" icon="terp-folder-orange" domain="[]" context="{'group_by':'model_id'}"/> <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/> @@ -2119,17 +2052,12 @@ <field name="type">search</field> <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="parent_id"/> - <field name="user_type"/> - <field name="type"/> - </group> - <newline/> + <field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Account Template"/> + <filter icon="terp-sale" string="Receivale Accounts" domain="[('type','=','receivable')]"/> + <filter icon="terp-purchase" string="Payable Accounts" domain="[('type','=','payable')]"/> + <field name="parent_id"/> + <field name="user_type"/> + <field name="type"/> <group expand="0" string="Group By..."> <filter string="Internal Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type'}"/> <filter string="Account Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'user_type'}"/> @@ -2188,20 +2116,14 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Search Chart of Account Templates"> - <group> - <field name="name" string="Account Template"/> - <separator orientation="vertical"/> - <field name="account_root_id"/> - <field name="bank_account_view_id"/> - </group> - <newline/> + <field name="name" string="Account Template"/> + <field name="account_root_id"/> + <field name="bank_account_view_id"/> <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"/> <filter string="Receivable Account" icon="terp-sale" domain="[]" context="{'group_by':'property_account_receivable'}"/> <filter string="Payable Account" icon="terp-purchase" domain="[]" context="{'group_by':'property_account_payable'}"/> - <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> @@ -2310,14 +2232,10 @@ <field name="type">search</field> <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="chart_template_id"/> - </group> + <field name="name" filter_domain="['|', ('name','ilike',self), ('description','ilike',self)]" string="Tax Template"/> + <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"/> + <field name="chart_template_id"/> </search> </field> </record> @@ -2353,11 +2271,8 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Search tax template"> - <group> - <field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Tax Template"/> - <field name="parent_id"/> - </group> - <newline/> + <field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Tax Template"/> + <field name="parent_id"/> <group expand="0" string="Group By..."> <filter string="Parent Code" icon="terp-folder-orange" domain="[]" context="{'group_by':'parent_id'}"/> </group> @@ -2789,16 +2704,11 @@ action = pool.get('res.config').next(cr, uid, [], context) <field name="type">search</field> <field name="arch" type="xml"> <search string="Account Report"> - <group> - <field name="name" string="Account Report"/> - <separator orientation="vertical"/> - <field name="account_report_id"/> - <field name="type"/> - </group> - <newline/> + <field name="name" string="Account Report"/> + <field name="type"/> + <field name="account_report_id"/> <group expand="0" string="Group By..."> <filter string="Parent Report" icon="terp-folder-orange" domain="" context="{'group_by':'parent_id'}"/> - <separator orientation="vertical"/> <filter string="Report Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type'}"/> </group> </search> diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml index 76aaaf7df6a..de1a087d9c5 100644 --- a/addons/account/project/project_view.xml +++ b/addons/account/project/project_view.xml @@ -30,22 +30,15 @@ <field name="type">search</field> <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"/> - <field name="date"/> - <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"/> - <field name="partner_id"/> - <field name="user_id" widget="selection"/> - </group> - <newline/> + <field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Analytic Account"/> + <field name="date"/> + <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"/> + <field name="partner_id"/> + <field name="user_id"/> <group expand="0" string="Group By..."> <filter string="Manager" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/> <filter string="Associated Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/> - <separator orientation="vertical"/> <filter string="Parent Account" icon="terp-folder-green" domain="[]" context="{'group_by':'parent_id'}"/> <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}" groups="base.group_no_one"/> </group> @@ -183,27 +176,20 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Search Analytic Lines"> - <group> - <field name="name" string="Analytic Line"/> - <separator orientation="vertical"/> - <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="account_id"/> - <field name="user_id"/> - </group> - <newline/> + <field name="name" string="Analytic Line"/> + <field name="date"/> + <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"/> + <separator/> + <filter string="My Entries" domain="[('user_id','=',uid)]" icon="terp-personal"/> + <field name="account_id"/> + <field name="user_id"/> <group string="Group By..." expand="0"> <filter string="Account" context="{'group_by':'account_id'}" icon="terp-folder-green"/> <filter string="Journal" context="{'group_by':'journal_id'}" icon="terp-folder-orange"/> <filter string="User" context="{'group_by':'user_id'}" icon="terp-personal"/> - <separator orientation="vertical"/> <filter string="Fin.Account" context="{'group_by':'general_account_id'}" icon="terp-folder-green"/> - <separator orientation="vertical"/> <filter string="Product" context="{'group_by':'product_id'}" icon="terp-accessories-archiver"/> </group> </search> @@ -304,11 +290,8 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Analytic Journals"> - <group> - <field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Analytic Journal"/> - <field name="type"/> - </group> - <newline/> + <field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Analytic Journal"/> + <field name="type"/> <group expand="0" string="Group By..."> <filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type'}"/> </group> diff --git a/addons/account/report/account_analytic_entries_report_view.xml b/addons/account/report/account_analytic_entries_report_view.xml index 7c9870ca07e..35031180523 100644 --- a/addons/account/report/account_analytic_entries_report_view.xml +++ b/addons/account/report/account_analytic_entries_report_view.xml @@ -34,31 +34,21 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Analytic Entries Analysis"> - <group> - <field name="day" string="Day"/> - <separator orientation="vertical"/> - <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"/> - </group> - <newline/> + <field name="day" string="Day"/> + <field name="date"/> + <filter string="My Entries" icon="terp-personal" domain="[('user_id','=',uid)]" help="My Entries"/> + <field name="account_id" groups="analytic.group_analytic_accounting"/> + <field name="product_id" /> + <field name="user_id"/> <group expand="0" string="Group By..."> <filter string="User" name="User" icon="terp-personal" context="{'group_by':'user_id'}"/> <filter string="Partner" icon="terp-partner" context="{'group_by':'partner_id'}"/> - <separator orientation="vertical"/> <filter string="Account" name="Account" icon="terp-folder-green" context="{'group_by':'account_id'}" groups="analytic.group_analytic_accounting"/> <filter string="General Account" icon="terp-folder-orange" context="{'group_by':'general_account_id'}"/> <filter string="Journal" icon="terp-folder-orange" context="{'group_by':'journal_id'}"/> - <separator orientation="vertical"/> <filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/> <filter string="Product Unit of Measure" icon="terp-mrp" context="{'group_by':'product_uom_id'}"/> - <separator orientation="vertical" groups="base.group_multi_company"/> <filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/> - <separator orientation="vertical"/> <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}"/> <filter string="Month" name="Month" icon="terp-go-month" context="{'group_by':'month'}"/> <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}"/> diff --git a/addons/account/report/account_entries_report_view.xml b/addons/account/report/account_entries_report_view.xml index 54275f6a4b3..8c445052094 100644 --- a/addons/account/report/account_entries_report_view.xml +++ b/addons/account/report/account_entries_report_view.xml @@ -67,54 +67,35 @@ <field name="type">search</field> <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'}" - help="Journal Entries with period in current year"/> - <filter icon="terp-go-month" string="This Period" - name="period" - context="{'period':'current_period'}" - help="Journal Entries with period in current period"/> - <separator orientation="vertical"/> - <filter string="Unposted" icon="terp-document-new" domain="[('move_state','=','draft')]" help = "entries"/> - <filter string="Posted" icon="terp-camera_test" domain="[('move_state','=','posted')]" help = "Posted entries"/> - <separator orientation="vertical"/> - <filter string="Unreconciled" icon="terp-dolar_ok!" domain="[('reconcile_id','=',False), ('account_id.reconcile','=',True)]" help = "Unreconciled entries"/> - <filter string="Reconciled" icon="terp-dolar" domain="[('reconcile_id','!=',False)]" help = "Reconciled entries"/> - <separator orientation="vertical"/> - <field name="account_id"/> - <field name="journal_id" widget="selection"/> - <field name="period_id"/> - </group> - <newline/> - <group expand="0" string="Extended Filters..."> + <field name="date"/> + <field name="date_created"/> + <field name="date_maturity"/> + <filter icon="terp-go-year" string="This F.Year" name="thisyear" context="{'year':'current_year'}" help="Journal Entries with period in current year"/> + <filter icon="terp-go-month" string="This Period" name="period" context="{'period':'current_period'}" help="Journal Entries with period in current period"/> + <separator/> + <filter string="Unposted" icon="terp-document-new" domain="[('move_state','=','draft')]" help = "entries"/> + <filter string="Posted" icon="terp-camera_test" domain="[('move_state','=','posted')]" help = "Posted entries"/> + <separator/> + <filter string="Unreconciled" icon="terp-dolar_ok!" domain="[('reconcile_id','=',False), ('account_id.reconcile','=',True)]" help = "Unreconciled entries"/> + <filter string="Reconciled" icon="terp-dolar" domain="[('reconcile_id','!=',False)]" help = "Reconciled entries"/> + <field name="account_id"/> + <field name="journal_id"/> + <field name="period_id"/> + <group expand="0" string="Extended Filters..."> <field name="fiscalyear_id"/> - <separator orientation="vertical"/> <field name="product_id"/> <field name="partner_id"/> - <separator orientation="vertical" groups="base.group_multi_company"/> <field name="company_id" groups="base.group_multi_company"/> - </group> - <newline/> + </group> <group expand="1" string="Group By..."> <filter string="Partner" icon="terp-partner" context="{'group_by':'partner_id'}"/> - <separator orientation="vertical"/> <filter string="Product" icon="terp-accessories-archiver" context="{'group_by':['product_id','product_uom_id'], 'quantity_visible':1}"/> - <separator orientation="vertical"/> <filter string="Currency" name="group_currency" icon="terp-dolar" context="{'group_by':'currency_id', 'currency_id_visible':1, 'amount_currency_visible':1}"/> <filter string="Journal" name="group_journal" icon="terp-folder-orange" context="{'group_by':'journal_id'}"/> <filter string="Account" name="group_account" icon="terp-folder-green" context="{'group_by':'account_id'}"/> - <separator orientation="vertical"/> <filter string="Acc.Type" icon="terp-stock_symbol-selection" context="{'group_by':'user_type'}" name="usertype"/> <filter string="Int.Type" icon="terp-stock_symbol-selection" context="{'group_by':'type'}"/> - <separator orientation="vertical" groups="base.group_multi_company"/> <filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/> - <separator orientation="vertical"/> <filter string="Date" icon="terp-go-today" context="{'group_by':'date'}"/> <filter string="Period" icon="terp-go-month" name="group_period" context="{'group_by':'period_id'}"/> <filter string="Fiscal Year" icon="terp-go-year" context="{'group_by':'fiscalyear_id'}"/> diff --git a/addons/account/report/account_invoice_report_view.xml b/addons/account/report/account_invoice_report_view.xml index 7d6a4003b53..e3e0b210f20 100644 --- a/addons/account/report/account_invoice_report_view.xml +++ b/addons/account/report/account_invoice_report_view.xml @@ -55,68 +55,32 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Invoices Analysis"> - <group> - <filter icon="terp-go-year" string="Year" - name="year" - domain="[('date','<=', time.strftime('%%Y-%%m-%%d')),('date','>=',time.strftime('%%Y-01-01'))]" - help="year"/> - <separator orientation="vertical"/> - <field name="date"/> - <separator orientation="vertical"/> - <filter string="Draft" - icon="terp-document-new" - domain="[('state','=','draft')]" - help = "Draft Invoices"/> - <filter string="Pro-forma" - icon="terp-gtk-media-pause" - domain="['|', ('state','=','proforma'),('state','=','proforma2')]" - help = "Pro-forma Invoices"/> - <filter string="Invoiced" - name="current" - icon="terp-check" - domain="[('state','not in', ('draft','cancel'))]" - help = "Open and Paid Invoices"/> - <separator orientation="vertical"/> - <filter icon="terp-personal" string="Customer" - name="customer" - domain="['|', ('type','=','out_invoice'),('type','=','out_refund')]" - help="Customer Invoices And Refunds"/> - <filter icon="terp-personal" - string="Supplier" - domain="['|', ('type','=','in_invoice'),('type','=','in_refund')]" - help="Supplier Invoices And Refunds"/> - <separator orientation="vertical"/> - <filter icon="terp-dolar" string="Invoice" - domain="['|', ('type','=','out_invoice'),('type','=','in_invoice')]" - help="Customer And Supplier Invoices"/> - <filter icon="terp-dolar_ok!" - string="Refund" - domain="['|', ('type','=','out_refund'),('type','=','in_refund')]" - help="Customer And Supplier Refunds"/> - <separator orientation="vertical"/> - <field name="partner_id"/> - <field name="user_id" /> - <field name="categ_id" filter_domain="[('categ_id', 'child_of', self)]"/> - </group> - <newline/> + <field name="date"/> + <filter icon="terp-go-year" string="Year" name="year" domain="[('date','<=', time.strftime('%%Y-%%m-%%d')),('date','>=',time.strftime('%%Y-01-01'))]" help="year"/> + <separator/> + <filter string="Draft" icon="terp-document-new" domain="[('state','=','draft')]" help = "Draft Invoices"/> + <filter string="Pro-forma" icon="terp-gtk-media-pause" domain="['|', ('state','=','proforma'),('state','=','proforma2')]" help = "Pro-forma Invoices"/> + <filter string="Invoiced" name="current" icon="terp-check" domain="[('state','not in', ('draft','cancel'))]" help = "Open and Paid Invoices"/> + <separator/> + <filter icon="terp-personal" string="Customer" name="customer" domain="['|', ('type','=','out_invoice'),('type','=','out_refund')]" help="Customer Invoices And Refunds"/> + <filter icon="terp-personal" string="Supplier" domain="['|', ('type','=','in_invoice'),('type','=','in_refund')]" help="Supplier Invoices And Refunds"/> + <filter icon="terp-dolar" string="Invoice" domain="['|', ('type','=','out_invoice'),('type','=','in_invoice')]" help="Customer And Supplier Invoices"/> + <filter icon="terp-dolar_ok!" string="Refund" domain="['|', ('type','=','out_refund'),('type','=','in_refund')]" help="Customer And Supplier Refunds"/> + <field name="partner_id"/> + <field name="user_id" /> + <field name="categ_id" filter_domain="[('categ_id', 'child_of', self)]"/> <group expand="1" string="Group By..."> <filter string="Partner" name="partner" icon="terp-partner" context="{'group_by':'partner_id','residual_visible':True}"/> <filter string="Salesperson" name='user' icon="terp-personal" context="{'group_by':'user_id'}"/> - <separator orientation="vertical"/> <filter string="Due Date" icon="terp-go-today" context="{'group_by':'date_due'}"/> <filter string="Period" icon="terp-go-month" context="{'group_by':'period_id'}" name="period"/> - <separator orientation="vertical"/> <filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id','set_visible':True,'residual_invisible':True}"/> <filter string="Category of Product" name="category_product" icon="terp-stock_symbol-selection" context="{'group_by':'categ_id','residual_invisible':True}"/> - <separator orientation="vertical"/> <filter string="Status" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/> <filter string="Type" icon="terp-stock_symbol-selection" context="{'group_by':'type'}"/> - <separator orientation="vertical"/> <filter string="Journal" icon="terp-folder-orange" context="{'group_by':'journal_id'}"/> <filter string="Account" icon="terp-folder-orange" context="{'group_by':'account_line_id'}"/> - <separator orientation="vertical" groups="base.group_multi_company"/> <filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/> - <separator orientation="vertical"/> <filter string="Day" name="day" icon="terp-go-today" context="{'group_by':'day'}" help="Group by Invoice Date"/> <filter string="Month" name="month" icon="terp-go-month" context="{'group_by':'month'}" help="Group by month of Invoice Date"/> <filter string="Year" name="group_year" icon="terp-go-year" context="{'group_by':'year'}" help="Group by year of Invoice Date"/> diff --git a/addons/account/report/account_treasury_report_view.xml b/addons/account/report/account_treasury_report_view.xml index 9e07c196f3c..f0096b561bb 100644 --- a/addons/account/report/account_treasury_report_view.xml +++ b/addons/account/report/account_treasury_report_view.xml @@ -36,12 +36,9 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Treasury Analysis"> - <group> - <field name="fiscalyear_id"/> - <field name="period_id"/> - <field name="company_id" groups="base.group_multi_company"/> - </group> - <newline/> + <field name="fiscalyear_id"/> + <field name="period_id"/> + <field name="company_id" groups="base.group_multi_company"/> </search> </field> </record> diff --git a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml index 8f86e9eeedc..bca6b2ab260 100644 --- a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml +++ b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml @@ -19,32 +19,24 @@ <field name="type">search</field> <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"/> - <separator orientation="vertical"/> - <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"/> - <filter icon="terp-go-today" string="To Renew" domain="['|', '&', ('date', '!=', False), ('date', '<=', time.strftime('%%Y-%%m-%%d')), ('is_overdue_quantity', '=', True)]" - name="renew" - help="The contracts to be renewed because the deadline is passed or the working hours are higher than the allocated hours" /> - <separator orientation="vertical"/> - <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="partner_id"/> - <field name="user_id"/> - </group> - <newline/> + <field name="name" filter_domain="['|', ('name','ilike',self),('code','ilike',self)]" string="Contract"/> + <field name="date"/> + <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/> + <filter icon="terp-go-today" string="To Renew" domain="['|', '&', ('date', '!=', False), ('date', '<=', time.strftime('%%Y-%%m-%%d')), ('is_overdue_quantity', '=', True)]" name="renew" + help="The contracts to be renewed because the deadline is passed or the working hours are higher than the allocated hours" /> + <separator/> + <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" /> + <separator/> + <filter string="Contracts not assigned" help="Contracts that are not assigned to an account manager." domain="[('user_id', '=', False)]" icon="terp-personal-" /> + <field name="partner_id"/> + <field name="user_id"/> <group expand="0" string="Group By..."> <filter string="Status" icon="terp-personal" domain="[]" context="{'group_by':'state'}"/> <filter string="Responsible" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/> <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/> - <separator orientation="vertical"/> <filter string="Parent" icon="terp-folder-orange" domain="[]" context="{'group_by':'parent_id'}"/> - <separator orientation="vertical"/> <filter string="Start Date" icon="terp-go-month" domain="[]" context="{'group_by' : 'date_start'}" /> <filter string="End Date" icon="terp-go-month" domain="[]" context="{'group_by' : 'date'}" /> </group> diff --git a/addons/account_analytic_default/account_analytic_default_view.xml b/addons/account_analytic_default/account_analytic_default_view.xml index beb4dcbd34e..3e2ba0fe5f3 100644 --- a/addons/account_analytic_default/account_analytic_default_view.xml +++ b/addons/account_analytic_default/account_analytic_default_view.xml @@ -46,23 +46,17 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Accounts"> - <group> - <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/> + <field name="date_stop"/> + <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" groups="base.group_multi_company"/> <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="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" /> </group> </search> diff --git a/addons/account_asset/account_asset_view.xml b/addons/account_asset/account_asset_view.xml index dec5f3714d6..cdc772ad65d 100644 --- a/addons/account_asset/account_asset_view.xml +++ b/addons/account_asset/account_asset_view.xml @@ -65,7 +65,6 @@ <field name="arch" type="xml"> <search string="Search Asset Category"> <field name="name" string="Asset Category"/> - <separator orientation="vertical"/> <field name="journal_id"/> </search> </field> @@ -231,17 +230,12 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Account Asset"> - <group col="10" colspan="12"> - <field name="name" string="Asset"/> - <separator orientation="vertical"/> - <field name="purchase_date"/> - <separator orientation="vertical"/> - <filter icon="terp-check" string="Current" domain="[('state','in', ('draft','open'))]" help="Assets in draft and open states"/> - <filter icon="terp-dialog-close" string="Closed" domain="[('state','=', 'close')]" help="Assets in closed state"/> - <separator orientation="vertical"/> - <field name="category_id"/> - <field name="partner_id"/> - </group> + <field name="name" string="Asset"/> + <field name="purchase_date"/> + <filter icon="terp-check" string="Current" domain="[('state','in', ('draft','open'))]" help="Assets in draft and open states"/> + <filter icon="terp-dialog-close" string="Closed" domain="[('state','=', 'close')]" help="Assets in closed state"/> + <field name="category_id"/> + <field name="partner_id"/> </search> </field> </record> diff --git a/addons/account_asset/report/account_asset_report_view.xml b/addons/account_asset/report/account_asset_report_view.xml index 6cb138b072a..a6652890ec5 100644 --- a/addons/account_asset/report/account_asset_report_view.xml +++ b/addons/account_asset/report/account_asset_report_view.xml @@ -43,34 +43,24 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Assets Analysis"> - <group col="10" colspan="12"> - <field name="purchase_date"/> - <field name="depreciation_date"/> - <separator orientation="vertical"/> - <filter string="Draft" icon="terp-document-new" domain="[('state','=','draft')]" help="Assets in draft state"/> - <filter string="Running" icon="terp-check" domain="[('state','=','open')]" help="Assets in running state"/> - <separator orientation="vertical"/> - <filter string="Posted" name="posted" icon="terp-camera_test" domain="[('move_check','=',True)]" help="Posted depreciation lines" - context="{'unposted_value_visible': 0}"/> - <separator orientation="vertical"/> - <field name="asset_id"/> - <field name="asset_category_id"/> - </group> - <newline/> + <field name="purchase_date"/> + <field name="depreciation_date"/> + <filter string="Draft" icon="terp-document-new" domain="[('state','=','draft')]" help="Assets in draft state"/> + <filter string="Running" icon="terp-check" domain="[('state','=','open')]" help="Assets in running state"/> + <separator/> + <filter string="Posted" name="posted" icon="terp-camera_test" domain="[('move_check','=',True)]" help="Posted depreciation lines" context="{'unposted_value_visible': 0}"/> + <field name="asset_id"/> + <field name="asset_category_id"/> <group expand="0" string="Extended Filters..."> <field name="partner_id"/> - <field name="company_id" groups="base.group_multi_company" widget="selection"/> + <field name="company_id" groups="base.group_multi_company"/> </group> - <newline/> <group expand="1" string="Group By..."> <filter string="Asset" name="asset" context="{'group_by':'asset_id'}"/> <filter string="Asset Category" name="asset_category" icon="terp-stock_symbol-selection" context="{'group_by':'asset_category_id'}"/> - <separator orientation="vertical" groups="base.group_multi_company"/> <filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/> - <separator orientation="vertical" /> <filter string="Purchase Date" icon="terp-go-month" domain="[]" context="{'group_by':'purchase_date'}" help="Date of asset purchase"/> - <separator orientation="vertical" /> <filter string="Depreciation Date" icon="terp-go-today" domain="[]" context="{'group_by':'depreciation_date'}" help="Date of depreciation"/> </group> diff --git a/addons/account_bank_statement_extensions/account_bank_statement_view.xml b/addons/account_bank_statement_extensions/account_bank_statement_view.xml index a3185db2c92..c77fb896840 100644 --- a/addons/account_bank_statement_extensions/account_bank_statement_view.xml +++ b/addons/account_bank_statement_extensions/account_bank_statement_view.xml @@ -123,22 +123,16 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Search Bank Transactions"> - <group> - <field name="name" filter_domain="['|', ('name','ilike',self), ('ref','ilike',self)]" string="Bank Transaction"/> - <separator orientation="vertical"/> - <field name="val_date"/> - <separator orientation="vertical"/> - <filter name="debit" string="Debit" domain="[('amount','>',0)]" icon="terp-folder-green" help="Debit Transactions."/> - <filter name="credit" string="Credit" domain="[('amount','<',0)]" icon="terp-folder-orange" help="Credit Transactions."/> - <separator orientation="vertical"/> - <filter name="draft" string="Draft" domain="[('state','=','draft')]" icon="terp-document-new" help="Draft Statement Lines."/> - <filter name="confirm" string="Confirmed" domain="[('state','=','confirm')]" icon="terp-camera_test" help="Confirmed Statement Lines."/> - <separator orientation="vertical"/> - <field name="journal_id"/> - <field name="statement_id"/> - <field name="globalisation_id" string="Glob. Id"/> - </group> - <newline/> + <field name="name" filter_domain="['|', ('name','ilike',self), ('ref','ilike',self)]" string="Bank Transaction"/> + <field name="val_date"/> + <filter name="debit" string="Debit" domain="[('amount','>',0)]" icon="terp-folder-green" help="Debit Transactions."/> + <filter name="credit" string="Credit" domain="[('amount','<',0)]" icon="terp-folder-orange" help="Credit Transactions."/> + <separator/> + <filter name="draft" string="Draft" domain="[('state','=','draft')]" icon="terp-document-new" help="Draft Statement Lines."/> + <filter name="confirm" string="Confirmed" domain="[('state','=','confirm')]" icon="terp-camera_test" help="Confirmed Statement Lines."/> + <field name="journal_id"/> + <field name="statement_id"/> + <field name="globalisation_id" string="Glob. Id"/> <group string="Extended Filters..." expand="0"> <field name="account_id"/> <field name="partner_id"/> @@ -146,7 +140,6 @@ <field name="globalisation_amount" string="Glob. Amount"/> <field name="note"/> </group> - <newline/> <group string="Group By..." expand="1"> <filter string="Journal" context="{'group_by':'journal_id'}" icon="terp-folder-green"/> <filter string="Statement" context="{'group_by':'statement_id'}" icon="terp-folder-orange"/> diff --git a/addons/account_budget/account_budget_view.xml b/addons/account_budget/account_budget_view.xml index db83df9c07f..c2fba2c6917 100644 --- a/addons/account_budget/account_budget_view.xml +++ b/addons/account_budget/account_budget_view.xml @@ -19,7 +19,7 @@ <field name="arch" type="xml"> <search string="Budgetary Position"> <field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Budgetary Position"/> - <field name="company_id" widget="selection" groups="base.group_multi_company"/> + <field name="company_id" groups="base.group_multi_company"/> </search> </field> </record> @@ -201,17 +201,12 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Budget"> - <group> - <field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Budget"/> - <separator orientation="vertical"/> - <field name="date_from"/> - <field name="date_to"/> - <separator orientation="vertical"/> - <filter string="Draft" icon="terp-document-new" domain="[('state','=','draft')]" help="Draft Budgets"/> - <filter string="To Approve" icon="terp-camera_test" domain="[('state','=','confirm')]" help="To Approve Budgets" /> - <separator orientation="vertical"/> - <field name="state"/> - </group> + <field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Budget"/> + <field name="date_from"/> + <field name="date_to"/> + <filter string="Draft" icon="terp-document-new" domain="[('state','=','draft')]" help="Draft Budgets"/> + <filter string="To Approve" icon="terp-camera_test" domain="[('state','=','confirm')]" help="To Approve Budgets" /> + <field name="state"/> </search> </field> </record> diff --git a/addons/account_coda/account_coda_view.xml b/addons/account_coda/account_coda_view.xml index bb2e833ce25..07f397c663f 100644 --- a/addons/account_coda/account_coda_view.xml +++ b/addons/account_coda/account_coda_view.xml @@ -12,18 +12,13 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="CODA Bank Account Configuration"> - <field name="name" - filter_domain="['|', ('name','ilike',self), ('description1','ilike',self)]" - string="CODA Bank Account"/> - <separator orientation="vertical"/> + <field name="name" filter_domain="['|', ('name','ilike',self), ('description1','ilike',self)]" string="CODA Bank Account"/> <filter string="Normal" domain="[('state','=','normal')]" icon="terp-folder-green"/> <filter string="Info" domain="[('state','=','info')]" icon="terp-folder-yellow"/> - <separator orientation="vertical"/> <field name="bank_id"/> <field name="journal"/> - <field name="currency" widget="selection"/> - <field name="company_id" widget="selection" groups="base.group_multi_company"/> - <newline/> + <field name="currency"/> + <field name="company_id" groups="base.group_multi_company"/> <group expand="0" string="Group By..."> <filter string="Bank Account" icon="terp-folder-yellow" domain="[]" context="{'group_by':'bank_id'}"/> <filter string="Currency" icon="terp-dolar" domain="[]" context="{'group_by':'currency'}"/> @@ -271,20 +266,15 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Search CODA Files"> - <group col="10" colspan="4"> <field name="coda_creation_date"/> <field name="date"/> - <field name="user_id" widget='selection'/> - <field name="company_id" widget="selection" groups="base.group_multi_company"/> - </group> - <newline/> - <group expand="0" string="Group By..."> - <filter string="CODA Creation Date" icon="terp-go-month" domain="[]" context="{'group_by':'coda_creation_date'}"/> - <separator orientation="vertical"/> - <filter string="User" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/> - <separator orientation="vertical"/> - <filter string="Company" icon="terp-go-home" domain="[]" groups="base.group_multi_company" context="{'group_by':'company_id'}"/> - </group> + <field name="user_id"/> + <field name="company_id" groups="base.group_multi_company"/> + <group expand="0" string="Group By..."> + <filter string="CODA Creation Date" icon="terp-go-month" domain="[]" context="{'group_by':'coda_creation_date'}"/> + <filter string="User" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/> + <filter string="Company" icon="terp-go-home" domain="[]" groups="base.group_multi_company" context="{'group_by':'company_id'}"/> + </group> </search> </field> </record> @@ -389,20 +379,13 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Search CODA Bank Statements"> - <group col="8" colspan="4"> - <field name="name" - string="CODA Bank Statement"/> - <separator orientation="vertical"/> - <field name="date"/> - <separator orientation="vertical"/> - <filter string="Normal" domain="[('type','=','normal')]" icon="terp-folder-green"/> - <filter string="Info" domain="[('type','=','info')]" icon="terp-folder-yellow"/> - <separator orientation="vertical"/> - <field name="period_id"/> - <field name="coda_bank_account_id"/> - <field name="journal_id" widget="selection" domain="[('type', '=', 'bank')]"/> - </group> - <newline/> + <field name="name" string="CODA Bank Statement"/> + <field name="date"/> + <filter string="Normal" domain="[('type','=','normal')]" icon="terp-folder-green"/> + <filter string="Info" domain="[('type','=','info')]" icon="terp-folder-yellow"/> + <field name="period_id"/> + <field name="coda_bank_account_id"/> + <field name="journal_id" domain="[('type', '=', 'bank')]"/> <group expand="0" string="Group By..."> <filter string="Journal" context="{'group_by': 'journal_id'}" icon="terp-folder-orange"/> <filter string="Period" context="{'group_by': 'period_id'}" icon="terp-go-month"/> @@ -481,20 +464,12 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Search Bank Transactions"> - <group col='6' colspan='4'> - <field name="name" - filter_domain="['|', ('name','ilike',self), ('ref','ilike',self)]" - string="Bank Transaction"/> - <separator orientation="vertical"/> - <field name="val_date"/> - <separator orientation="vertical"/> - <filter name="debit" string="Debit" domain="[('amount','>',0)]" icon="terp-folder-green" help="Debit Transactions."/> - <filter name="credit" string="Credit" domain="[('amount','<',0)]" icon="terp-folder-orange" help="Credit Transactions."/> - <separator orientation="vertical"/> - <field name="statement_id"/> - <field name="globalisation_id" string="Glob. Id"/> - </group> - <newline/> + <field name="name" filter_domain="['|', ('name','ilike',self), ('ref','ilike',self)]" string="Bank Transaction"/> + <field name="val_date"/> + <filter name="debit" string="Debit" domain="[('amount','>',0)]" icon="terp-folder-green" help="Debit Transactions."/> + <filter name="credit" string="Credit" domain="[('amount','<',0)]" icon="terp-folder-orange" help="Credit Transactions."/> + <field name="statement_id"/> + <field name="globalisation_id" string="Glob. Id"/> <group expand="0" string="Extended Filters..."> <field name="coda_bank_account_id"/> <field name="account_id"/> diff --git a/addons/account_followup/account_followup_view.xml b/addons/account_followup/account_followup_view.xml index 9c11815e05b..3f6591953de 100644 --- a/addons/account_followup/account_followup_view.xml +++ b/addons/account_followup/account_followup_view.xml @@ -71,11 +71,8 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Search Follow-up"> - <group> - <field name="name" string="Follow-up"/> - <separator orientation="vertical"/> - <field name="company_id" widget="selection" groups="base.group_multi_company"/> - </group> + <field name="name" string="Follow-up"/> + <field name="company_id" groups="base.group_multi_company"/> </search> </field> </record> diff --git a/addons/account_followup/report/account_followup_report.xml b/addons/account_followup/report/account_followup_report.xml index 2bdf8eb74bf..854bba0652e 100644 --- a/addons/account_followup/report/account_followup_report.xml +++ b/addons/account_followup/report/account_followup_report.xml @@ -40,31 +40,20 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Follow-ups Sent"> - <group> - <field name="date_move"/> - <field name="date_move_last"/> - <separator orientation="vertical"/> - <filter icon="terp-go-year" string="This Fiscal year" - name="fiscalyear" - domain="[('period_id','in','current_year')]" - help="Follow-up Entries with period in current year"/> - <separator orientation="vertical"/> - <filter icon="terp-camera_test" string="Not Litigation" - domain="[('blocked','=', False)]" - help = "Including journal entries marked as a litigation"/> - <separator orientation="vertical"/> - <field name="partner_id"/> - <field name="balance"/> - </group> - <newline/> + <field name="date_move"/> + <field name="date_move_last"/> + <filter icon="terp-go-year" string="This Fiscal year" name="fiscalyear" domain="[('period_id','in','current_year')]" + help="Follow-up Entries with period in current year"/> + <separator/> + <filter icon="terp-camera_test" string="Not Litigation" domain="[('blocked','=', False)]" + help = "Including journal entries marked as a litigation"/> + <field name="partner_id"/> + <field name="balance"/> <group expand="1" string="Group By..."> <filter string="Partner" icon="terp-partner" context="{'group_by':'partner_id'}" /> - <separator orientation="vertical"/> <filter string="Litigation" icon="terp-camera_test" context="{'group_by':'blocked'}" /> - <separator orientation="vertical"/> <filter string="Follow-up Level" icon="terp-stock_effects-object-colorize" name="followup_level" context="{'group_by':'followup_id'}" /> <filter string="Latest Follow-up Date" icon="terp-go-month" context="{'group_by':'date_followup'}" /> - <separator orientation="vertical" groups="base.group_multi_company"/> <filter string="Company" groups="base.group_multi_company" icon="terp-go-home" context="{'group_by':'company_id'}" /> </group> </search> diff --git a/addons/account_followup/wizard/account_followup_print_view.xml b/addons/account_followup/wizard/account_followup_print_view.xml index c897b283ab0..2949177205f 100644 --- a/addons/account_followup/wizard/account_followup_print_view.xml +++ b/addons/account_followup/wizard/account_followup_print_view.xml @@ -42,9 +42,7 @@ <field name="arch" type="xml"> <search string="Partner to Remind"> <field name="date_followup"/> - <separator orientation="vertical"/> <filter string="Balance > 0" domain="[('balance','>',0)]" icon="terp-dolar" name="balance_positive"/> - <separator orientation="vertical"/> <field name="partner_id"/> <field name="max_followup_id"/> <field name="company_id" groups="base.group_multi_company"/> diff --git a/addons/account_payment/account_payment_view.xml b/addons/account_payment/account_payment_view.xml index 1577d1b86bd..3d0f9c0a78c 100644 --- a/addons/account_payment/account_payment_view.xml +++ b/addons/account_payment/account_payment_view.xml @@ -47,12 +47,9 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Payment Mode"> - <field name="name" - string="Payment Mode"/> - <separator orientation="vertical"/> - <field name="journal" widget='selection'/> - <field name="company_id" widget='selection' groups="base.group_multi_company"/> - <newline/> + <field name="name" string="Payment Mode"/> + <field name="journal"/> + <field name="company_id" groups="base.group_multi_company"/> <group expand="0" string="Group By..."> <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal'}"/> </group> @@ -216,20 +213,13 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Search Payment Orders"> - <group> - <field name="reference" - string="Payment Order"/> - <separator orientation="vertical"/> - <field name="date_done"/> - <separator orientation="vertical"/> - <filter string="Draft" domain="[('state','=','draft')]" icon="terp-document-new"/> - <filter string="Confirmed" domain="[('state','=','open')]" icon="terp-camera_test"/> - <filter string="Done" domain="[('state','=','done')]" icon="terp-dialog-close"/> - <separator orientation="vertical"/> - <field name="mode" widget='selection'/> - <field name="state"/> - </group> - <newline/> + <field name="reference" string="Payment Order"/> + <field name="date_done"/> + <filter string="Draft" domain="[('state','=','draft')]" icon="terp-document-new"/> + <filter string="Confirmed" domain="[('state','=','open')]" icon="terp-camera_test"/> + <filter string="Done" domain="[('state','=','done')]" icon="terp-dialog-close"/> + <field name="mode"/> + <field name="state"/> <group expand="0" string="Group By..."> <filter string="Payment Mode" context="{'group_by': 'mode'}" icon="terp-dolar"/> <filter string="Status" context="{'group_by': 'state'}" icon="terp-stock_effects-object-colorize"/> diff --git a/addons/account_voucher/account_voucher_view.xml b/addons/account_voucher/account_voucher_view.xml index d1912a58d1c..b212c07acb3 100644 --- a/addons/account_voucher/account_voucher_view.xml +++ b/addons/account_voucher/account_voucher_view.xml @@ -126,21 +126,15 @@ <field name="priority">1</field> <field name="arch" type="xml"> <search string="Search Vouchers"> - <group> - <field name="number" string="Voucher"/> - <separator orientation="vertical"/> - <field name="date"/> - <separator orientation="vertical"/> - <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Vouchers"/> - <filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Vouchers"/> - <separator orientation="vertical"/> - <filter icon="terp-gtk-jump-to-ltr" string="To Review" domain="[('state','=','posted'), ('audit','=',False)]" help="To Review"/> - <separator orientation="vertical"/> - <field name="partner_id"/> - <field name="journal_id" widget="selection" context="{'journal_id': self, 'set_visible':False}" /> - <field name="period_id"/> - </group> - <newline/> + <field name="number" string="Voucher"/> + <field name="date"/> + <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Vouchers"/> + <filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Vouchers"/> + <separator/> + <filter icon="terp-gtk-jump-to-ltr" string="To Review" domain="[('state','=','posted'), ('audit','=',False)]" help="To Review"/> + <field name="partner_id"/> + <field name="journal_id" context="{'journal_id': self, 'set_visible':False}" /> + <field name="period_id"/> <group expand="0" string="Group By..."> <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/> <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/> diff --git a/addons/account_voucher/report/account_voucher_sales_receipt_view.xml b/addons/account_voucher/report/account_voucher_sales_receipt_view.xml index 704135ba421..527c959c2ad 100644 --- a/addons/account_voucher/report/account_voucher_sales_receipt_view.xml +++ b/addons/account_voucher/report/account_voucher_sales_receipt_view.xml @@ -48,48 +48,26 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Sales Receipt Analysis"> - <group> - <field name="date"/> - <field name="date_due"/> - <separator orientation="vertical"/> - <filter string="Draft" - icon="terp-document-new" - domain="[('state','=','draft')]" - help = "Draft Vouchers"/> - <filter string="Pro-forma" - icon="terp-gtk-media-pause" - domain="[('state','=','proforma')]" - help = "Pro-forma Vouchers"/> - <filter string="Posted" - name="current" - icon="terp-check" - domain="[('state','not in', ('draft','cancel'))]" - help = "Validated Vouchers"/> - <separator orientation="vertical"/> - <field name="partner_id"/> - </group> - <newline/> + <field name="date"/> + <field name="date_due"/> + <filter string="Draft" icon="terp-document-new" domain="[('state','=','draft')]" help = "Draft Vouchers"/> + <filter string="Pro-forma" icon="terp-gtk-media-pause" domain="[('state','=','proforma')]" help = "Pro-forma Vouchers"/> + <filter string="Posted" name="current" icon="terp-check" domain="[('state','not in', ('draft','cancel'))]" help = "Validated Vouchers"/> + <field name="partner_id"/> <group expand="0" string="Extended Filters..."> - <field name="journal_id" widget="selection"/> + <field name="journal_id"/> <field name="account_id"/> <field name="pay_now"/> - <separator orientation="vertical" groups="base.group_multi_company"/> - <field name="company_id" groups="base.group_multi_company" widget="selection"/> + <field name="company_id" groups="base.group_multi_company"/> </group> - <newline/> <group expand="1" string="Group By..."> <filter string="Partner" name="partner" icon="terp-partner" context="{'group_by':'partner_id'}"/> <filter string="Salesperson" name='user' icon="terp-personal" context="{'group_by':'user_id'}"/> - <separator orientation="vertical"/> <filter string="Status" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/> <filter string="Type" icon="terp-stock_symbol-selection" context="{'group_by':'type'}"/> - <separator orientation="vertical"/> <filter string="Journal" icon="terp-folder-orange" context="{'group_by':'journal_id'}"/> - <separator orientation="vertical"/> <filter string="Due Date" icon="terp-go-today" context="{'group_by':'date_due'}"/> - <separator orientation="vertical" groups="base.group_multi_company"/> <filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/> - <separator orientation="vertical"/> <filter string="Day" name="day" icon="terp-go-today" context="{'group_by':'day'}" help="Group by Invoice Date"/> <filter string="Month" name="month" icon="terp-go-month" context="{'group_by':'month'}" help="Group by month of Invoice Date"/> <filter string="Year" name="year" icon="terp-go-year" context="{'group_by':'year'}" help="Group by year of Invoice Date"/> diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml index 6cb43ed8e3a..2c19cb621c4 100644 --- a/addons/account_voucher/voucher_payment_receipt_view.xml +++ b/addons/account_voucher/voucher_payment_receipt_view.xml @@ -8,21 +8,13 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Search Vouchers"> - <group> - <field name="number" string="Voucher"/> - <separator orientation="vertical"/> - <field name="date"/> - <separator orientation="vertical"/> - <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Vouchers"/> - <filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Vouchers"/> - <separator orientation="vertical"/> - <filter icon="terp-gtk-jump-to-ltr" string="To Review" domain="[('state','=','posted')]" help="To Review"/> - <separator orientation="vertical"/> - <field name="partner_id" string="Customer"/> - <field name="journal_id" widget="selection" context="{'journal_id': self, 'set_visible':False}" domain="[('type','in',('bank','cash'))]"/> - <field name="period_id"/> - </group> - <newline/> + <field name="number" string="Voucher"/> + <field name="date"/> + <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Vouchers"/> + <filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Vouchers"/> + <field name="partner_id" string="Customer"/> + <field name="journal_id" context="{'journal_id': self, 'set_visible':False}" domain="[('type','in',('bank','cash'))]"/> + <field name="period_id"/> <group expand="0" string="Group By..."> <filter string="Customer" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/> <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/> @@ -40,21 +32,13 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Search Vouchers"> - <group> - <field name="number" string="Voucher"/> - <separator orientation="vertical"/> - <field name="date"/> - <separator orientation="vertical"/> - <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Vouchers"/> - <filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Vouchers"/> - <separator orientation="vertical"/> - <filter icon="terp-gtk-jump-to-ltr" string="To Review" domain="[('state','=','posted')]" help="To Review"/> - <separator orientation="vertical"/> - <field name="partner_id" string="Supplier"/> - <field name="journal_id" widget="selection" context="{'journal_id': self, 'set_visible':False}" domain="[('type','in',('bank','cash'))]"/> - <field name="period_id"/> - </group> - <newline/> + <field name="number" string="Voucher"/> + <field name="date"/> + <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Vouchers"/> + <filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Vouchers"/> + <field name="partner_id" string="Supplier"/> + <field name="journal_id" context="{'journal_id': self, 'set_visible':False}" domain="[('type','in',('bank','cash'))]"/> + <field name="period_id"/> <group expand="0" string="Group By..."> <filter string="Supplier" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/> <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/> diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml index 833b7604bac..8390f20b4f0 100644 --- a/addons/account_voucher/voucher_sales_purchase_view.xml +++ b/addons/account_voucher/voucher_sales_purchase_view.xml @@ -7,21 +7,13 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Search Vouchers"> - <group> - <field name="number" string="Voucher"/> - <separator orientation="vertical"/> - <field name="date"/> - <separator orientation="vertical"/> - <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Vouchers"/> - <filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Vouchers"/> - <separator orientation="vertical"/> - <filter icon="terp-gtk-jump-to-ltr" string="To Review" domain="[('state','=','posted')]" help="To Review"/> - <separator orientation="vertical"/> - <field name="partner_id" string="Supplier"/> - <field name="journal_id" widget="selection" context="{'journal_id': self, 'set_visible':False}" domain="[('type','in',('purchase','purchase_refund'))]"/> - <field name="period_id"/> - </group> - <newline/> + <field name="number" string="Voucher"/> + <field name="date"/> + <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Vouchers"/> + <filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Vouchers"/> + <field name="partner_id" string="Supplier"/> + <field name="journal_id" context="{'journal_id': self, 'set_visible':False}" domain="[('type','in',('purchase','purchase_refund'))]"/> + <field name="period_id"/> <group expand="0" string="Group By..."> <filter string="Supplier" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/> <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/> @@ -38,21 +30,13 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Search Vouchers"> - <group> - <field name="number" string="Voucher"/> - <separator orientation="vertical"/> - <field name="date"/> - <separator orientation="vertical"/> - <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Vouchers"/> - <filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Vouchers"/> - <separator orientation="vertical"/> - <filter icon="terp-gtk-jump-to-ltr" string="To Review" domain="[('state','=','posted')]" help="To Review"/> - <separator orientation="vertical"/> - <field name="partner_id" string="Customer"/> - <field name="journal_id" widget="selection" context="{'journal_id': self, 'set_visible':False}" domain="[('type','in',('sale','sale_refund'))]"/> - <field name="period_id"/> - </group> - <newline/> + <field name="number" string="Voucher"/> + <field name="date"/> + <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Vouchers"/> + <filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Vouchers"/> + <field name="partner_id" string="Customer"/> + <field name="journal_id" context="{'journal_id': self, 'set_visible':False}" domain="[('type','in',('sale','sale_refund'))]"/> + <field name="period_id"/> <group expand="0" string="Group By..."> <filter string="Customer" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/> <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/> diff --git a/addons/audittrail/audittrail_view.xml b/addons/audittrail/audittrail_view.xml index 55c55398f4e..65eca09a9a1 100644 --- a/addons/audittrail/audittrail_view.xml +++ b/addons/audittrail/audittrail_view.xml @@ -63,15 +63,10 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Search Audittrail Rule"> - <group> - <field name="name" string="Audittrail Rule"/> - <separator orientation="vertical"/> - <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Rule"/> - <filter icon="terp-camera_test" string="Subscribed" domain="[('state','=','subscribed')]" help="Subscribed Rule"/> - <separator orientation="vertical"/> - <field name="object_id"/> - </group> - <newline/> + <field name="name" string="Audittrail Rule"/> + <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Rule"/> + <filter icon="terp-camera_test" string="Subscribed" domain="[('state','=','subscribed')]" help="Subscribed Rule"/> + <field name="object_id" string="Model"/> <group expand="0" string="Group By..."> <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/> </group> @@ -171,16 +166,11 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Search Audittrail Log"> - <group> - <field name="name" string="Audittrail Log"/> - <separator orientation="vertical"/> - <field name="object_id"/> - <field name="user_id" widget="selection"/> - </group> - <newline/> + <field name="name" string="Audittrail Log"/> + <field name="object_id" string="Model"/> + <field name="user_id"/> <group expand="0" string="Group By..."> <filter string="User" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/> - <separator orientation="vertical"/> <filter string="Object" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'object_id'}"/> <filter string="Date" icon="terp-go-month" domain="[]" context="{'group_by':'timestamp'}"/> </group> diff --git a/addons/base_calendar/base_calendar_view.xml b/addons/base_calendar/base_calendar_view.xml index 642f8f7b9e9..164331b2372 100644 --- a/addons/base_calendar/base_calendar_view.xml +++ b/addons/base_calendar/base_calendar_view.xml @@ -84,40 +84,20 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Search Invitations"> - <field name="email" string="Email"/> - <separator orientation="vertical"/> - <field name="event_date"/> - <separator orientation="vertical"/> - <filter icon="terp-gtk-jump-to-ltr" name="toreview" string="To Review" - domain="[('state','=', 'needs-action')]" - help="Invitations To Review" /> - <filter icon="terp-check" string="Accepted" - domain="[('state','=', 'accepted')]" - help="Accepted Invitations" /> - <filter icon="terp-dialog-close" string="Declined" - domain="[('state','=', 'declined')]" - help="Declined Invitations" /> - <filter icon="gtk-sort-descending" string="Delegated" - domain="[('state','=', 'delegated')]" - help="Delegated Invitations" /> - <separator orientation="vertical"/> - <field name="user_id" string="Responsible"/> - <separator orientation="vertical"/> - <field name="cutype" string="Invitation type"/> - <newline/> + <field name="email" string="Email"/> + <field name="event_date"/> + <filter icon="terp-gtk-jump-to-ltr" name="toreview" string="To Review" domain="[('state','=', 'needs-action')]" help="Invitations To Review" /> + <filter icon="terp-check" string="Accepted" domain="[('state','=', 'accepted')]" help="Accepted Invitations" /> + <filter icon="terp-dialog-close" string="Declined" domain="[('state','=', 'declined')]" help="Declined Invitations" /> + <filter icon="gtk-sort-descending" string="Delegated" domain="[('state','=', 'delegated')]" help="Delegated Invitations" /> + <field name="user_id" string="Responsible"/> + <field name="cutype" string="Invitation type"/> <group expand="0" string="Group By..."> - <filter string="Responsible" icon="terp-personal" domain="[]" - context="{'group_by':'user_id'}" /> - <filter string="Contact" icon="terp-personal" domain="[]" - context="{'group_by':'partner_id'}" /> - <separator orientation="vertical" /> - <filter string="Type" icon="terp-stock_symbol-selection" help="Invitation Type" - domain="[]" context="{'group_by':'cutype'}" /> - <filter string="Role" icon="terp-gtk-select-all" - domain="[]" context="{'group_by':'role'}" /> - <filter string="Required Reply" icon="terp-mail-replied" - domain="[]" context="{'group_by':'rsvp'}" /> - <separator orientation="vertical" /> + <filter string="Responsible" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}" /> + <filter string="Contact" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}" /> + <filter string="Type" icon="terp-stock_symbol-selection" help="Invitation Type" domain="[]" context="{'group_by':'cutype'}" /> + <filter string="Role" icon="terp-gtk-select-all" domain="[]" context="{'group_by':'role'}" /> + <filter string="Required Reply" icon="terp-mail-replied" domain="[]" context="{'group_by':'rsvp'}" /> <filter string="Status" icon="terp-stock_effects-object-colorize" help="Invitation Type" domain="[]" context="{'group_by':'state'}" /> </group> @@ -414,37 +394,20 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Search Events"> - <group> - <field name="name" filter_domain="['|',('name','ilike',self),('location','ilike',self)]" string="Event"/> - <separator orientation="vertical"/> - <filter icon="terp-go-today" string="My Events" - domain="[('user_id','=',uid)]" - help="My Events" /> - <separator orientation="vertical"/> - <filter icon="terp-check" string="Confirmed" - domain="[('state','=','confirmed')]" - help="Confirmed Events" /> - <separator orientation="vertical"/> - <field name="user_id"/> - <separator orientation="vertical"/> - <field name="show_as"/> - <field name="class" string="Privacy"/> - </group> - <newline/> - <group expand="0" string="Group By..."> - <filter string="Responsible" icon="terp-personal" domain="[]" - context="{'group_by':'user_id'}" /> - <separator orientation="vertical" /> - <filter string="Availability" icon="terp-camera_test" - domain="[]" context="{'group_by':'show_as'}" /> - <filter string="Privacy" icon="terp-locked" - domain="[]" context="{'group_by':'class'}" /> - <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" - context="{'group_by':'state'}" /> - <separator orientation="vertical" /> - <filter string="Date" icon="terp-go-month" - domain="[]" context="{'group_by':'date'}" /> - </group> + <field name="name" filter_domain="['|',('name','ilike',self),('location','ilike',self)]" string="Event"/> + <field name="show_as"/> + <field name="class" string="Privacy"/> + <filter icon="terp-go-today" string="My Events" domain="[('user_id','=',uid)]" help="My Events" /> + <separator/> + <filter icon="terp-check" string="Confirmed" domain="[('state','=','confirmed')]" help="Confirmed Events" /> + <field name="user_id"/> + <group expand="0" string="Group By..."> + <filter string="Responsible" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}" /> + <filter string="Availability" icon="terp-camera_test" domain="[]" context="{'group_by':'show_as'}" /> + <filter string="Privacy" icon="terp-locked" domain="[]" context="{'group_by':'class'}" /> + <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}" /> + <filter string="Date" icon="terp-go-month" domain="[]" context="{'group_by':'date'}" /> + </group> </search> </field> </record> diff --git a/addons/base_calendar/crm_meeting_view.xml b/addons/base_calendar/crm_meeting_view.xml index 77244addd9f..c99c77e4799 100644 --- a/addons/base_calendar/crm_meeting_view.xml +++ b/addons/base_calendar/crm_meeting_view.xml @@ -302,18 +302,12 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Search Meetings"> - <group> - <field name="name" string="Meeting" - filter_domain="[('name','ilike',self)]"/> - <filter string="Inbox" help="Unread messages" icon="terp-mail-message-new" - name="needaction_pending" domain="[('needaction_pending','=',True)]"/> - <separator orientation="vertical"/> - <filter string="My Meetings" help="My Meetings" icon="terp-personal" - domain="[('user_id','=',uid)]"/> - <separator orientation="vertical"/> - <field name="user_id"/> - <field name="partner_ids"/> - </group> + <field name="name" string="Meeting" filter_domain="[('name','ilike',self)]"/> + <filter string="Inbox" help="Unread messages" icon="terp-mail-message-new" name="needaction_pending" domain="[('needaction_pending','=',True)]"/> + <separator/> + <filter string="My Meetings" help="My Meetings" icon="terp-personal" domain="[('user_id','=',uid)]"/> + <field name="user_id"/> + <field name="partner_ids"/> </search> </field> </record> diff --git a/addons/caldav/caldav_view.xml b/addons/caldav/caldav_view.xml index 02025ab5261..b72c43e4298 100644 --- a/addons/caldav/caldav_view.xml +++ b/addons/caldav/caldav_view.xml @@ -159,15 +159,15 @@ <field name="arch" type="xml"> <search string="Calendars"> <field name="name" string="Calendar"/> - <separator orientation="vertical"/> <filter string="WebCal" icon="terp-calendar" domain="[('has_webcal', '=', True)]" help="Webcal Calendar"/> + <separator/> <filter string="Event" icon="terp-calendar" domain="[('type', '=', 'vevent')]"/> <filter string="Todo" icon="terp-calendar" domain="[('type', '=', 'vtodo')]"/> + <separator/> <filter string="My Calendar(s)" icon="terp-personal" domain="[('user_id', '=', uid)]" help="My Calendar(s)"/> - <separator orientation="vertical"/> - <field name="user_id" widget="selection"/> - <field name="collection_id"/> <field name="type"/> + <field name="user_id"/> + <field name="collection_id"/> </search> </field> </record> diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml index 2c139470fdf..a62f2e0c0b8 100644 --- a/addons/crm/crm_lead_view.xml +++ b/addons/crm/crm_lead_view.xml @@ -51,7 +51,6 @@ <field name="arch" type="xml"> <search string="Stage Search"> <field name="name" string="Stage Name"/> - <separator orientation="vertical"/> <field name="state"/> <field name="type"/> </search> @@ -351,44 +350,30 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Search Leads"> - <filter icon="terp-mail-message-new" - string="Inbox" help="Unread messages" - name="needaction_pending" - domain="[('needaction_pending','=',True)]"/> <field name="name" string="Lead / Customer" filter_domain="['|','|',('partner_name','ilike',self),('email_from','ilike',self),('name','ilike',self)]"/> <!-- subjects is not set as store=True so, it is placed outside filter_domain--> - <field name="subjects"/> - <separator orientation="vertical"/> + <field name="subjects"/> <field name="create_date"/> - <separator orientation="vertical"/> - <filter icon="terp-check" - string="New" - name="new" help="New Leads" - domain="[('state','=','draft')]"/> - <filter icon="terp-camera_test" - string="Open" - name="open" - domain="[('state','=','open')]"/> - <filter string="Unassigned Leads" - icon="terp-personal-" - domain="[('user_id','=', False)]" - help="Unassigned Leads" /> - <filter string="Leads Assigned to Me or My Team(s)" - icon="terp-personal+" - context="{'invisible_section': False}" + <filter icon="terp-mail-message-new" string="Inbox" help="Unread messages" name="needaction_pending" domain="[('needaction_pending','=',True)]"/> + <separator/> + <filter icon="terp-check" string="New" name="new" help="New Leads" domain="[('state','=','draft')]"/> + <filter icon="terp-camera_test" string="Open" name="open" domain="[('state','=','open')]"/> + <separator/> + <filter string="Unassigned Leads" icon="terp-personal-" domain="[('user_id','=', False)]" help="Unassigned Leads" /> + <separator/> + <filter string="Leads Assigned to Me or My Team(s)" icon="terp-personal+" context="{'invisible_section': False}" domain="['|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]" help="Leads that are assigned to one of the sale teams I manage, or to me"/> - <separator orientation="vertical"/> <field name="user_id"/> - <field name="section_id" widget="selection" - context="{'invisible_section': False}"/> + <field name="section_id" context="{'invisible_section': False}"/> <field name="country_id" context="{'invisible_country': False}"/> - <separator orientation="vertical"/> - <newline/> <group expand="0" string="Group By..."> <filter string="Salesperson" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/> <filter string="Team" icon="terp-personal+" domain="[]" context="{'group_by':'section_id'}"/> <filter string="Referrer" icon="terp-personal" domain="[]" context="{'group_by':'referred'}"/> + <filter string="Category" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'categ_id'}"/> + <filter string="Campaign" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'type_id'}" /> + <filter string="Channel" icon="terp-call-start" domain="[]" context="{'group_by':'channel_id'}" /> <separator orientation="vertical"/> <filter string="Campaign" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'type_id'}" /> @@ -397,18 +382,11 @@ <separator orientation="vertical"/> <filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}"/> <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/> - <separator orientation="vertical" groups="base.group_no_one"/> - <filter string="Creation" help="Create date" icon="terp-go-month" - domain="[]" context="{'group_by':'create_date'}" groups="base.group_no_one"/> + <filter string="Creation" help="Create date" icon="terp-go-month" domain="[]" context="{'group_by':'create_date'}" groups="base.group_no_one"/> </group> - <separator orientation="vertical"/> <group string="Display"> <filter string="Show Countries" icon="terp-personal+" context="{'invisible_country': False}" help="Show Countries"/> - <filter string="Show Sales Team" - icon="terp-personal+" - context="{'invisible_section': False}" - domain="[]" - help="Show Sales Team"/> + <filter string="Show Sales Team" icon="terp-personal+" context="{'invisible_section': False}" domain="[]" help="Show Sales Team"/> </group> </search> </field> @@ -604,56 +582,36 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Search Opportunities"> - <filter icon="terp-mail-message-new" - string="Inbox" help="Unread messages" - name="needaction_pending" - domain="[('needaction_pending','=',True)]"/> <field name="name" string="Opportunity / Customer" filter_domain="['|','|','|',('partner_id','ilike',self),('partner_name','ilike',self),('email_from','ilike',self),('name', 'ilike', self)]"/> - <separator orientation="vertical"/> - <filter icon="terp-check" - string="New" help="New Opportunities" - name="new" - domain="[('state','=','draft')]"/> - <filter icon="terp-camera_test" - string="Open" help="Open Opportunities" - name="open" - domain="[('state','=','open')]"/> - <filter string="Unassigned Opportunities" - icon="terp-personal-" - domain="[('user_id','=', False)]" - help="Unassigned Opportunities" /> - <filter string="Opportunities Assigned to Me or My Team(s)" icon="terp-personal+" - domain="['|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]" - context="{'invisible_section': False}" + <filter icon="terp-mail-message-new" string="Inbox" help="Unread messages" name="needaction_pending" domain="[('needaction_pending','=',True)]"/> + <separator/> + <filter icon="terp-check" string="New" help="New Opportunities" name="new" domain="[('state','=','draft')]"/> + <filter icon="terp-camera_test" string="Open" help="Open Opportunities" name="open" domain="[('state','=','open')]"/> + <separator/> + <filter string="Unassigned Opportunities" icon="terp-personal-" domain="[('user_id','=', False)]" help="Unassigned Opportunities" /> + <separator/> + <filter string="Opportunities Assigned to Me or My Team(s)" icon="terp-personal+" + domain="['|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]" context="{'invisible_section': False}" help="Opportunities that are assigned to either me or one of the sale teams I manage" /> - <separator orientation="vertical"/> <field name="user_id"/> <field name="country_id"/> <field name="partner_id"/> - <field name="section_id" - context="{'invisible_section': False, 'default_section_id': self}"/> - <newline/> + <field name="section_id" context="{'invisible_section': False, 'default_section_id': self}"/> <group expand="0" string="Group By..." colspan="16"> <filter string="Salesperson" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}" /> <filter string="Team" help="Sales Team" icon="terp-personal+" domain="[]" context="{'group_by':'section_id'}"/> <filter string="Customer" help="Partner" icon="terp-personal+" domain="[]" context="{'group_by':'partner_id'}"/> - <separator orientation="vertical" /> <filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}" /> <filter string="Priority" icon="terp-rating-rated" domain="[]" context="{'group_by':'priority'}" /> <filter string="Campaign" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'type_id'}"/> <filter string="Channel" icon="terp-call-start" domain="[]" context="{'group_by':'channel_id'}" /> <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/> - <separator orientation="vertical" /> <filter string="Creation" icon="terp-go-month" domain="[]" context="{'group_by':'create_date'}" groups="base.group_no_one"/> <filter string="Exp.Closing" icon="terp-go-month" help="Expected Closing" domain="[]" context="{'group_by':'date_deadline'}" /> </group> <group string="Display"> - <filter string="Show Sales Team" - icon="terp-personal+" - context="{'invisible_section': False}" - domain="[]" - help="Show Sales Team"/> + <filter string="Show Sales Team" icon="terp-personal+" context="{'invisible_section': False}" domain="[]" help="Show Sales Team"/> </group> </search> </field> diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml index ac0fe3b4b98..2953e963647 100644 --- a/addons/crm/crm_phonecall_view.xml +++ b/addons/crm/crm_phonecall_view.xml @@ -214,40 +214,24 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Search Phonecalls"> - <filter icon="terp-mail-message-new" - string="Inbox" help="Unread messages" - name="needaction_pending" - domain="[('needaction_pending','=',True)]"/> - <separator orientation="vertical"/> <field name="name" string="Phonecalls"/> - <separator orientation="vertical"/> <field name="date"/> - <separator orientation="vertical"/> + <filter icon="terp-mail-message-new" string="Inbox" help="Unread messages" name="needaction_pending" domain="[('needaction_pending','=',True)]"/> + <separator/> <filter icon="terp-gtk-go-back-rtl" string="To Do" name="current" domain="[('state','=','open')]"/> - <filter string="Unassigned Phonecalls" - icon="terp-personal-" - domain="[('user_id','=',False)]" - help="Unassigned Phonecalls"/> - <filter string="Phone Calls Assigned to Me or My Team(s)" - icon="terp-personal+" - domain="['|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]" + <separator/> + <filter string="Unassigned Phonecalls" icon="terp-personal-" domain="[('user_id','=',False)]" help="Unassigned Phonecalls"/> + <separator/> + <filter string="Phone Calls Assigned to Me or My Team(s)" icon="terp-personal+" domain="['|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]" help="Phone Calls that are assigned to me or to my team(s)" /> - <separator orientation="vertical"/> <field name="partner_id"/> <field name="user_id"/> - <field name="section_id" - widget="selection" string="Sales Team"/> - <newline/> + <field name="section_id" string="Sales Team"/> <group expand="0" string="Group By..."> - <filter string="Partner" icon="terp-partner" domain="[]" - context="{'group_by':'partner_id'}" /> - <filter string="Responsible" icon="terp-personal" - domain="[]" context="{'group_by':'user_id'}" /> - <separator orientation="vertical" /> - <filter string="Creation" icon="terp-go-month" help="Creation Date" - domain="[]" context="{'group_by':'create_date'}" /> - <filter string="Date" icon="terp-go-month" domain="[]" - context="{'group_by':'date'}" help="Date of Call" /> + <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}" /> + <filter string="Responsible" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}" /> + <filter string="Creation" icon="terp-go-month" help="Creation Date" domain="[]" context="{'group_by':'create_date'}" /> + <filter string="Date" icon="terp-go-month" domain="[]" context="{'group_by':'date'}" help="Date of Call" /> </group> </search> </field> diff --git a/addons/crm/crm_report_view.xml b/addons/crm/crm_report_view.xml index c3ccde5360b..eaed4564424 100644 --- a/addons/crm/crm_report_view.xml +++ b/addons/crm/crm_report_view.xml @@ -69,15 +69,12 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Cases by Team and Type"> - <group> - <field name="name"/> - <separator orientation="vertical"/> - <field name="month"/> - <field name="section_id" widget="selection" /> - <field name="category2_id"/> - <field name="nbr"/> - <field name="state"/> - </group> + <field name="name"/> + <field name="month"/> + <field name="nbr"/> + <field name="state"/> + <field name="section_id"/> + <field name="category2_id"/> </search> </field> </record> @@ -157,14 +154,11 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Cases by Team and Stage"> - <group> - <field name="name"/> - <separator orientation="vertical"/> - <field name="month"/> - <field name="section_id" widget="selection"/> - <field name="nbr"/> - <field name="state"/> - </group> + <field name="name"/> + <field name="month"/> + <field name="nbr"/> + <field name="state"/> + <field name="section_id"/> </search> </field> </record> @@ -229,14 +223,11 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Cases by Section, Category and Stage"> - <group> - <field name="name"/> - <separator orientation="vertical"/> - <field name="month"/> - <field name="section_id" widget="selection"/> - <field name="nbr"/> - <field name="state"/> - </group> + <field name="name"/> + <field name="month"/> + <field name="nbr"/> + <field name="state"/> + <field name="section_id"/> </search> </field> </record> @@ -318,14 +309,11 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Search Cases by User"> - <group> - <field name="name"/> - <separator orientation="vertical"/> - <field name="month"/> - <field name="section_id" widget="selection"/> - <field name="nbr"/> - <field name="state"/> - </group> + <field name="name"/> + <field name="month"/> + <field name="nbr"/> + <field name="state"/> + <field name="section_id"/> </search> </field> </record> diff --git a/addons/crm/report/crm_lead_report_view.xml b/addons/crm/report/crm_lead_report_view.xml index f45b9d621da..9d0050be69c 100644 --- a/addons/crm/report/crm_lead_report_view.xml +++ b/addons/crm/report/crm_lead_report_view.xml @@ -70,47 +70,26 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Leads Analysis"> - <group> - <filter icon="terp-personal" - name="lead" - string="Lead" - domain="[('type','=', 'lead')]" - help="Show only lead"/> - <filter icon="terp-personal+" - string="Opportunity" - name="opportunity" - domain="[('type','=','opportunity')]" - help="Show only opportunity"/> - <separator orientation="vertical" /> - <filter icon="terp-check" - string="New" - domain="[('state','=','draft')]" - help="Leads/Opportunities which are in New state"/> - <filter icon="terp-camera_test" - string="Open" - domain="[('state','=','open')]" - help="Leads/Opportunities which are in open state"/> - <filter icon="gtk-media-pause" - string="Pending" - domain="[('state','=','pending')]" - help="Leads/Opportunities which are in pending state"/> - <filter icon="terp-dialog-close" - string="Closed" - domain="[('state','=','done')]" - help="Leads/Opportunities which are in done state"/> - <filter string="My Sales Team(s)" icon="terp-personal+" - context="{'invisible_section': False}" - domain="[('section_id.user_id','=',uid)]" - help="Leads/Opportunities that are assigned to one of the sale teams I manage"/> - <filter icon="terp-personal" string="My Case(s)" help="Leads/Opportunities that are assigned to me" domain="[('user_id','=',uid)]"/> - <separator orientation="vertical" /> - <field name="section_id" - context="{'invisible_section': False}"/> - <field name="user_id" string="Salesperson"/> - </group> - <newline/> + <filter icon="terp-personal" name="lead" string="Lead" domain="[('type','=', 'lead')]" help="Show only lead"/> + <filter icon="terp-personal+" string="Opportunity" name="opportunity" domain="[('type','=','opportunity')]" help="Show only opportunity"/> + <separator/> + <filter icon="terp-check" string="New" domain="[('state','=','draft')]" help="Leads/Opportunities which are in New state"/> + <filter icon="terp-camera_test" string="Open" domain="[('state','=','open')]" help="Leads/Opportunities which are in open state"/> + <filter icon="gtk-media-pause" string="Pending" domain="[('state','=','pending')]" help="Leads/Opportunities which are in pending state"/> + <filter icon="terp-dialog-close" string="Closed" domain="[('state','=','done')]" help="Leads/Opportunities which are in done state"/> + <separator/> + <filter string="My Sales Team(s)" icon="terp-personal+" context="{'invisible_section': False}" domain="[('section_id.user_id','=',uid)]" + help="Leads/Opportunities that are assigned to one of the sale teams I manage"/> + <separator/> + <filter icon="terp-personal" string="My Case(s)" help="Leads/Opportunities that are assigned to me" domain="[('user_id','=',uid)]"/> + <field name="section_id" context="{'invisible_section': False}"/> + <field name="user_id" string="Salesperson"/> <group expand="0" string="Extended Filters..."> <field name="partner_id"/> + <field name="stage_id" domain="[('section_ids', '=', 'section_id')]" /> + <field name="type_id"/> + <field name="channel_id"/> + <field name="company_id" groups="base.group_multi_company"/> <separator orientation="vertical"/> <field name="stage_id" widget="selection" domain="[('section_ids', '=', 'section_id')]" /> <field name="type_id" widget="selection"/> @@ -122,22 +101,21 @@ <field name="opening_date"/> <field name="date_closed"/> </group> - <newline/> <group expand="1" string="Group By..."> - <filter string="Salesperson" name="user" icon="terp-personal" - domain="[]" context="{'group_by':'user_id'}" /> - <filter string="Sales Team" icon="terp-personal+" - domain="[]" - context="{'group_by':'section_id'}" /> + <filter string="Salesperson" name="user" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}" /> + <filter string="Sales Team" icon="terp-personal+" domain="[]" context="{'group_by':'section_id'}" /> <filter string="Partner" icon="terp-partner" context="{'group_by':'partner_id'}" /> <filter string="Country" icon="terp-go-home" context="{'group_by':'country_id'}" /> - <filter string="Company" icon="terp-go-home" - domain="[]" - context="{'group_by':'company_id'}" - groups="base.group_multi_company"/> - <separator orientation="vertical" /> + <filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/> <filter string="Stage" name="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}"/> <filter string="Priority" icon="terp-rating-rated" domain="[]" context="{'group_by':'priority'}" /> + <filter string="Campaign" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'type_id'}" /> + <filter string="Channel" icon="terp-call-start" domain="[]" context="{'group_by':'channel_id'}" /> + <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}" /> + <filter string="Year" icon="terp-go-year" domain="[]" context="{'group_by':'creation_year'}"/> + <filter string="Month" icon="terp-go-month" domain="[]" context="{'group_by':'creation_month'}"/> + <filter string="Day" icon="terp-go-today" domain="[]" context="{'group_by':'creation_day'}"/> + <filter string="Exp. Closing" icon="terp-go-month" domain="[]" context="{'group_by':'deadline_month'}"/> <filter string="Campaign" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'type_id'}" /> <filter string="Channel" icon="terp-call-start" diff --git a/addons/crm/report/crm_phonecall_report_view.xml b/addons/crm/report/crm_phonecall_report_view.xml index 3f28fb8730e..2eeff7a0981 100644 --- a/addons/crm/report/crm_phonecall_report_view.xml +++ b/addons/crm/report/crm_phonecall_report_view.xml @@ -51,65 +51,37 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Search"> - <group> - <filter icon="terp-gtk-go-back-rtl" - string="Todo" - domain="[('state','in',('draft','open'))]" - help="Phone calls which are in draft and open state"/> - <filter icon="terp-camera_test" - string="Held" - domain="[('state','=','done')]" - help="Phone calls which are in closed state"/> - <filter icon="gtk-media-pause" - string="Not Held" - domain="[('state','=','pending')]" - help="Phone calls which are in pending state"/> - <filter string="My Sales Team(s)" - icon="terp-personal+" - context="{'invisible_section': False}" - domain="[('section_id.user_id','=',uid)]" - help="Phone calls that are assigned to one of the sale teams I manage"/> - <filter icon="terp-personal" string="My Phone Calls" help="Phone Calls that are assigned to me" domain="[('user_id','=',uid)]" /> - <separator orientation="vertical"/> - <field name="section_id" string="Sales Team" - context="{'invisible_section': False}"/> - <field name="user_id" string="Salesperson"/> - </group> - <newline/> + <filter icon="terp-gtk-go-back-rtl" string="Todo" domain="[('state','in',('draft','open'))]" + help="Phone calls which are in draft and open state"/> + <filter icon="terp-camera_test" string="Held" domain="[('state','=','done')]" + help="Phone calls which are in closed state"/> + <filter icon="gtk-media-pause" string="Not Held" domain="[('state','=','pending')]" + help="Phone calls which are in pending state"/> + <separator/> + <filter string="My Sales Team(s)" icon="terp-personal+" context="{'invisible_section': False}" domain="[('section_id.user_id','=',uid)]" + help="Phone calls that are assigned to one of the sale teams I manage"/> + <separator/> + <filter icon="terp-personal" string="My Phone Calls" help="Phone Calls that are assigned to me" domain="[('user_id','=',uid)]" /> + <field name="section_id" string="Sales Team" context="{'invisible_section': False}"/> + <field name="user_id" string="Salesperson"/> <group expand="0" string="Extended Filters..."> <field name="partner_id"/> - <separator orientation="vertical"/> <field name="company_id" groups="base.group_multi_company"/> - <newline/> <field name="creation_date"/> <field name="opening_date"/> <field name="date_closed"/> </group> - <newline/> <group expand="1" string="Group By..."> - <filter string="Salesperson" name="Salesperson" icon="terp-personal" - domain="[]" context="{'group_by':'user_id'}" /> - <filter string="Sales Team" icon="terp-personal+" - domain="[]" - context="{'group_by':'section_id'}" /> + <filter string="Salesperson" name="Salesperson" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}" /> + <filter string="Sales Team" icon="terp-personal+" domain="[]" context="{'group_by':'section_id'}" /> <filter string="Partner" icon="terp-partner" context="{'group_by':'partner_id'}" /> - <separator orientation="vertical" /> <filter string="Priority" icon="terp-rating-rated" domain="[]" context="{'group_by':'priority'}" /> - <filter string="Category" icon="terp-stock_symbol-selection" - domain="[]" context="{'group_by':'categ_id'}" /> - <filter string="Status" icon="terp-stock_effects-object-colorize" - domain="[]" context="{'group_by':'state'}" /> - <separator orientation="vertical" /> - <filter string="Company" icon="terp-go-home" - domain="[]" - context="{'group_by':'company_id'}" groups="base.group_multi_company"/> - <separator orientation="vertical" /> - <filter string="Day" icon="terp-go-today" - domain="[]" context="{'group_by':'day'}" help="Date of call"/> - <filter string="Month" icon="terp-go-month" - domain="[]" context="{'group_by':'month'}" help="Month of call"/> - <filter string="Year" icon="terp-go-year" - domain="[]" context="{'group_by':'name'}" help="Year of call"/> + <filter string="Category" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'categ_id'}" /> + <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}" /> + <filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/> + <filter string="Day" icon="terp-go-today" domain="[]" context="{'group_by':'day'}" help="Date of call"/> + <filter string="Month" icon="terp-go-month" domain="[]" context="{'group_by':'month'}" help="Month of call"/> + <filter string="Year" icon="terp-go-year" domain="[]" context="{'group_by':'name'}" help="Year of call"/> </group> </search> </field> diff --git a/addons/crm/res_partner_view.xml b/addons/crm/res_partner_view.xml index 8ddf435138a..43bac76833f 100644 --- a/addons/crm/res_partner_view.xml +++ b/addons/crm/res_partner_view.xml @@ -37,6 +37,7 @@ <field eval="18" name="priority"/> <field name="arch" type="xml"> <field name="category_id" position="after"> + <field name="section_id" completion="1"/> <field name="section_id" completion="1" widget="selection" context="{'invisible_section': False}"/> </field> <xpath expr="//field[@name='user_id']" position="after"> diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml index 80e373160be..6c508049e5e 100644 --- a/addons/crm_claim/crm_claim_view.xml +++ b/addons/crm_claim/crm_claim_view.xml @@ -199,50 +199,22 @@ <field name="arch" type="xml"> <search string="Search Claims"> <field name="name" string="Claims"/> - <separator orientation="vertical"/> - <filter icon="terp-check" string="New" name="current" - domain="[('state','=','draft')]" - help="New Claims"/> - <filter icon="terp-camera_test" - string="In Progress" - domain="[('state','=','open')]" - help="In Progress Claims"/> - <filter icon="terp-gtk-media-pause" - string="Pending" - domain="[('state','=','pending')]"/> - <filter string="Unassigned Claims" - icon="terp-personal-" - domain="[('user_id','=', False)]" - help="Unassigned Claims" /> - <separator orientation="vertical"/> + <filter icon="terp-check" string="New" name="current" domain="[('state','=','draft')]" help="New Claims"/> + <filter icon="terp-camera_test" string="In Progress" domain="[('state','=','open')]" help="In Progress Claims"/> + <filter icon="terp-gtk-media-pause" string="Pending" domain="[('state','=','pending')]"/> + <separator/> + <filter string="Unassigned Claims" icon="terp-personal-" domain="[('user_id','=', False)]" help="Unassigned Claims" /> <field name="partner_id"/> - <field name="user_id" widget="selection"/> - <newline/> + <field name="user_id"/> <group expand="0" string="Group By..."> - <filter string="Partner" icon="terp-partner" - domain="[]" help="Partner" - context="{'group_by':'partner_id'}"/> - <filter string="Responsible" icon="terp-personal" - domain="[]" help="Responsible User" - context="{'group_by':'user_id'}"/> - <separator orientation="vertical"/> - <filter string="Stage" icon="terp-stage" - domain="[]" context="{'group_by':'stage_id'}"/> - <filter string="Type" icon="terp-stock_symbol-selection" - domain="[]" context="{'group_by':'categ_id'}"/> - <filter string="Status" - icon="terp-stock_effects-object-colorize" - domain="[]" context="{'group_by':'state'}" groups="base.group_no_one"/> - <separator orientation="vertical"/> - <filter string="Claim Date" icon="terp-go-month" - domain="[]" help="Claim Date" - context="{'group_by':'date'}"/> - <filter string="Deadline" icon="terp-go-month" - domain="[]" - context="{'group_by':'date_deadline'}"/> - <filter string="Closure" icon="terp-go-month" - domain="[]" help="Date Closed" - context="{'group_by':'date_closed'}" groups="base.group_no_one"/> + <filter string="Partner" icon="terp-partner" domain="[]" help="Partner" context="{'group_by':'partner_id'}"/> + <filter string="Responsible" icon="terp-personal" domain="[]" help="Responsible User" context="{'group_by':'user_id'}"/> + <filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}"/> + <filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'categ_id'}"/> + <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}" groups="base.group_no_one"/> + <filter string="Claim Date" icon="terp-go-month" domain="[]" help="Claim Date" context="{'group_by':'date'}"/> + <filter string="Deadline" icon="terp-go-month" domain="[]" context="{'group_by':'date_deadline'}"/> + <filter string="Closure" icon="terp-go-month" domain="[]" help="Date Closed" context="{'group_by':'date_closed'}" groups="base.group_no_one"/> </group> </search> </field> diff --git a/addons/crm_claim/report/crm_claim_report_view.xml b/addons/crm_claim/report/crm_claim_report_view.xml index e92102f889d..adfb97a28f0 100644 --- a/addons/crm_claim/report/crm_claim_report_view.xml +++ b/addons/crm_claim/report/crm_claim_report_view.xml @@ -53,93 +53,43 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Search"> - <group> - <filter icon="terp-document-new" - string="New" - domain="[('state','=','draft')]"/> - <filter icon="terp-camera_test" - string="Open" - domain="[('state','=','open')]"/> - <filter icon="terp-gtk-media-pause" - string="Pending" - domain="[('state','=','pending')]"/> - <filter string="My Sales Team(s)" - icon="terp-personal+" - context="{'invisible_section': False}" - domain="[('section_id.user_id','=',uid)]" - help="My Sales Team(s)" /> - <filter string="My Company" - icon="terp-go-home" - context="{'invisible_section': False}" - domain="[('section_id.user_id.company_id','=',uid)]" - help="My company"/> - <filter icon="terp-personal" string="My Case(s)" help="My Case(s)" domain="[('user_id','=',uid)]" /> - <separator orientation="vertical"/> - <field name="company_id" groups="base.group_multi_company"/> - <field name="user_id" string="Salesperson"/> - <field name="section_id" string="Sales Team" - context="{'invisible_section': False}"/> - </group> - <newline/> + <filter icon="terp-document-new" string="New" domain="[('state','=','draft')]"/> + <filter icon="terp-camera_test" string="Open" domain="[('state','=','open')]"/> + <filter icon="terp-gtk-media-pause" string="Pending" domain="[('state','=','pending')]"/> + <separator/> + <filter string="My Sales Team(s)" icon="terp-personal+" context="{'invisible_section': False}" domain="[('section_id.user_id','=',uid)]" help="My Sales Team(s)" /> + <separator/> + <filter string="My Company" icon="terp-go-home" context="{'invisible_section': False}" domain="[('section_id.user_id.company_id','=',uid)]" help="My company"/> + <separator/> + <filter icon="terp-personal" string="My Case(s)" help="My Case(s)" domain="[('user_id','=',uid)]" /> + <field name="company_id" groups="base.group_multi_company"/> + <field name="user_id" string="Salesperson"/> + <field name="section_id" string="Sales Team" context="{'invisible_section': False}"/> <group expand="0" string="Extended Filters..."> - <filter icon="terp-dialog-close" - string="Done" - domain="[('state','=','done')]"/> - <filter icon="gtk-cancel" - string="Cancel" - domain="[('state','=','cancel')]"/> - <separator orientation="vertical"/> <field name="partner_id"/> - <separator orientation="vertical"/> - <field name="stage_id" widget="selection" domain="[('section_ids', '=', 'section_id')]"/> - <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'crm.claim')]"/> - <separator orientation="vertical"/> - <field name="priority" /> - <field name="type_action" /> - <newline/> + <field name="stage_id" domain="[('section_ids', '=', 'section_id')]"/> + <field name="categ_id" domain="[('object_id.model', '=', 'crm.claim')]"/> + <field name="priority"/> + <field name="type_action"/> <field name="create_date" /> <field name="date_closed" /> <field name="date_deadline" /> + <filter icon="terp-dialog-close" string="Done" domain="[('state','=','done')]"/> + <filter icon="gtk-cancel" string="Cancel" domain="[('state','=','cancel')]"/> </group> - <newline/> <group expand="1" string="Group By..."> - <filter string="Salesperson" name="Salesperson" icon="terp-personal" - domain="[]" context="{'group_by':'user_id'}" /> - <filter string="Sales Team" icon="terp-personal+" - domain="[]" - context="{'group_by':'section_id'}" /> - <filter string="Partner" name="partner" icon="terp-partner" - domain="[]" context="{'group_by':'partner_id'}" /> - <separator orientation="vertical" /> - <filter string="Stage" icon="terp-stage" domain="[]" - context="{'group_by':'stage_id'}" /> - <filter string="Priority" icon="terp-rating-rated" domain="[]" - context="{'group_by':'priority'}" /> - <filter string="Category" icon="terp-stock_symbol-selection" - domain="[]" context="{'group_by':'categ_id'}" /> - - <separator orientation="vertical"/> - <filter string="Type" icon="terp-stock_symbol-selection" domain="[]" - context="{'group_by':'type_action'}" help="Action Type"/> - <filter string="Status" icon="terp-stock_effects-object-colorize" - domain="[]" context="{'group_by':'state'}" /> - <separator orientation="vertical" /> - <filter string="Company" icon="terp-go-home" - domain="[]" - context="{'group_by':'company_id'}" groups="base.group_multi_company"/> - - <separator orientation="vertical" /> - <filter string="Day" icon="terp-go-today" - domain="[]" context="{'group_by':'day'}" - help="Date of claim"/> - - <filter string="Month" icon="terp-go-month" - domain="[]" context="{'group_by':'month'}" - help="Month of claim"/> - - <filter string="Year" icon="terp-go-year" - domain="[]" context="{'group_by':'name'}" - help="Year of claim"/> + <filter string="Salesperson" name="Salesperson" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}" /> + <filter string="Sales Team" icon="terp-personal+" domain="[]" context="{'group_by':'section_id'}" /> + <filter string="Partner" name="partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}" /> + <filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}" /> + <filter string="Priority" icon="terp-rating-rated" domain="[]" context="{'group_by':'priority'}" /> + <filter string="Category" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'categ_id'}" /> + <filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type_action'}" help="Action Type"/> + <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}" /> + <filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/> + <filter string="Day" icon="terp-go-today" domain="[]" context="{'group_by':'day'}" help="Date of claim"/> + <filter string="Month" icon="terp-go-month" domain="[]" context="{'group_by':'month'}" help="Month of claim"/> + <filter string="Year" icon="terp-go-year" domain="[]" context="{'group_by':'name'}" help="Year of claim"/> </group> </search> </field> diff --git a/addons/crm_fundraising/crm_fundraising_view.xml b/addons/crm_fundraising/crm_fundraising_view.xml index 9e67a4001a7..7ee3f35d2a6 100644 --- a/addons/crm_fundraising/crm_fundraising_view.xml +++ b/addons/crm_fundraising/crm_fundraising_view.xml @@ -172,50 +172,24 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Search Funds"> - <group> - <field name="name" string="Fund Description"/> - <separator orientation="vertical" /> - <filter icon="terp-check" string="New" - domain="[('state','=','draft')]" name="current" - help="New Funds" /> - <filter icon="terp-camera_test" string="Open" - domain="[('state','=','open')]" - help="Open Funds" /> - <filter icon="terp-gtk-media-pause" - string="Pending" - domain="[('state','=','pending')]" - help="Pending Funds" /> - <separator orientation="vertical" /> - <filter string="Unassigned" - icon="terp-personal-" - domain="[('user_id','=', False)]" - help="Unassigned" /> - <filter string="Assigned to Me or to My Sales Team(s)" - icon="terp-personal+" - domain="['|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]" - help="Fund Raisings that are assigned to me or to one of the sale teams I manage" /> - <separator orientation="vertical" /> - <field name="state"/> - <field name="user_id" - widget="selection"/> - <field name="section_id" widget="selection" string="Sales Team"/> - </group> - <newline/> + <field name="name" string="Fund Description"/> + <field name="state"/> + <filter icon="terp-check" string="New" domain="[('state','=','draft')]" name="current" help="New Funds" /> + <filter icon="terp-camera_test" string="Open" domain="[('state','=','open')]" help="Open Funds" /> + <filter icon="terp-gtk-media-pause" string="Pending" domain="[('state','=','pending')]" help="Pending Funds" /> + <separator/> + <filter string="Unassigned" icon="terp-personal-" domain="[('user_id','=', False)]" help="Unassigned" /> + <separator/> + <filter string="Assigned to Me or to My Sales Team(s)" icon="terp-personal+" domain="['|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]" + help="Fund Raisings that are assigned to me or to one of the sale teams I manage" /> + <field name="user_id"/> + <field name="section_id" string="Sales Team"/> <group expand="0" string="Group By..."> - <filter string="Partner" icon="terp-partner" - domain="[]" - context="{'group_by':'partner_id'}" /> - <filter string="Responsible" icon="terp-personal" - domain="[]" - context="{'group_by':'user_id'}" /> - <filter string="Category" help="Fund Category" - icon="terp-stock_symbol-selection" domain="[]" - context="{'group_by':'categ_id'}" /> - <filter string="Payment Mode" help="Payment Mode" - icon="terp-dolar" domain="[]" - context="{'group_by':'type_id'}" /> - <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" - context="{'group_by':'state'}" /> + <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}" /> + <filter string="Responsible" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}" /> + <filter string="Category" help="Fund Category" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'categ_id'}" /> + <filter string="Payment Mode" help="Payment Mode" icon="terp-dolar" domain="[]" context="{'group_by':'type_id'}" /> + <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}" /> </group> </search> </field> diff --git a/addons/crm_fundraising/report/crm_fundraising_report_view.xml b/addons/crm_fundraising/report/crm_fundraising_report_view.xml index 5a3ed924567..028635b083c 100644 --- a/addons/crm_fundraising/report/crm_fundraising_report_view.xml +++ b/addons/crm_fundraising/report/crm_fundraising_report_view.xml @@ -77,74 +77,34 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Search"> - <group> - <filter icon="terp-document-new" - string="New" - domain="[('state','=','draft')]"/> - <filter icon="terp-camera_test" - string="Open" - domain="[('state','=','open')]"/> - <filter icon="terp-gtk-media-pause" - string="Pending" - domain="[('state','=','pending')]"/> - <filter string="My Sales Team(s)" - icon="terp-personal+" - context="{'invisible_section': False}" - domain="[('section_id.user_id','=',uid)]" - help="My Sales Team(s)" /> - <filter string="My Company" - icon="terp-go-home" - context="{'invisible_section': False}" - domain="[('section_id.user_id.company_id','=',uid)]" - help="My company"/> - <filter icon="terp-personal" string="My Case(s)" help="My Case(s)" domain="[('user_id','=',uid)]" /> - <separator orientation="vertical"/> - <field name="section_id" string="Sales Team" - context="{'invisible_section': False}"/> - <field name="company_id" groups="base.group_multi_company"/> - <field name="user_id" string="Salesperson"/> - </group> - <newline/> + <filter icon="terp-document-new" string="New" domain="[('state','=','draft')]"/> + <filter icon="terp-camera_test" string="Open" domain="[('state','=','open')]"/> + <filter icon="terp-gtk-media-pause" string="Pending" domain="[('state','=','pending')]"/> + <separator/> + <filter string="My Sales Team(s)" icon="terp-personal+" context="{'invisible_section': False}" domain="[('section_id.user_id','=',uid)]" help="My Sales Team(s)" /> + <separator/> + <filter string="My Company" icon="terp-go-home" context="{'invisible_section': False}" domain="[('section_id.user_id.company_id','=',uid)]" help="My company"/> + <separator/> + <filter icon="terp-personal" string="My Case(s)" help="My Case(s)" domain="[('user_id','=',uid)]" /> + <field name="section_id" string="Sales Team" context="{'invisible_section': False}"/> + <field name="company_id" groups="base.group_multi_company"/> + <field name="user_id" string="Salesperson"/> <group expand="0" string="Extended Filters..."> - <filter icon="terp-dialog-close" - string="Done" - domain="[('state','=','done')]"/> - <filter icon="gtk-cancel" - string="Cancel" - domain="[('state','=','cancel')]"/> - <separator orientation="vertical"/> - <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'crm.fundraising')]"/> + <field name="categ_id" domain="[('object_id.model', '=', 'crm.fundraising')]"/> <field name="create_date"/> + <filter icon="terp-dialog-close" string="Done" domain="[('state','=','done')]"/> + <filter icon="gtk-cancel" string="Cancel" domain="[('state','=','cancel')]"/> </group> - <newline/> <group expand="1" string="Group By..."> - <filter string="Salesperson" name="Salesperson" icon="terp-personal" - domain="[]" context="{'group_by':'user_id'}" /> - <filter string="Sales Team" icon="terp-personal+" - domain="[]" - context="{'group_by':'section_id'}" /> - <separator orientation="vertical" /> - <filter string="Status" icon="terp-stock_effects-object-colorize" - domain="[]" context="{'group_by':'state'}" /> - <filter string="Category" icon="terp-stock_symbol-selection" - domain="[]" context="{'group_by':'categ_id'}" /> - <filter string="Payment Mode" help="Payment Mode" - icon="terp-dolar" domain="[]" - context="{'group_by':'type_id'}" /> - <separator orientation="vertical" /> - <filter string="Company" icon="terp-go-home" - domain="[]" - groups="base.group_multi_company" - context="{'group_by':'company_id'}" /> - <separator orientation="vertical" groups="base.group_multi_company"/> - <filter string="Day" icon="terp-go-today" - domain="[]" context="{'group_by':'day'}" - help="Date of fundraising"/> - <filter string="Month" icon="terp-go-month" - domain="[]" context="{'group_by':'month'}" - help="Month of fundraising"/> - <filter string="Year" icon="terp-go-year" - domain="[]" context="{'group_by':'name'}" /> + <filter string="Salesperson" name="Salesperson" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}" /> + <filter string="Sales Team" icon="terp-personal+" domain="[]" context="{'group_by':'section_id'}" /> + <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}" /> + <filter string="Category" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'categ_id'}" /> + <filter string="Payment Mode" help="Payment Mode" icon="terp-dolar" domain="[]" context="{'group_by':'type_id'}" /> + <filter string="Company" icon="terp-go-home" domain="[]" groups="base.group_multi_company" context="{'group_by':'company_id'}" /> + <filter string="Day" icon="terp-go-today" domain="[]" context="{'group_by':'day'}" help="Date of fundraising"/> + <filter string="Month" icon="terp-go-month" domain="[]" context="{'group_by':'month'}" help="Month of fundraising"/> + <filter string="Year" icon="terp-go-year" domain="[]" context="{'group_by':'name'}" /> </group> </search> </field> diff --git a/addons/crm_helpdesk/crm_helpdesk_view.xml b/addons/crm_helpdesk/crm_helpdesk_view.xml index 4c2d81f94e3..0fb0cbf825f 100644 --- a/addons/crm_helpdesk/crm_helpdesk_view.xml +++ b/addons/crm_helpdesk/crm_helpdesk_view.xml @@ -152,54 +152,24 @@ <field name="arch" type="xml"> <search string="Search Helpdesk"> <field name="name" string="Query"/> - <separator orientation="vertical"/> <field name="date"/> - <separator orientation="vertical"/> - <filter icon="terp-check" string="New" - name="current" - domain="[('state','=','draft')]" - help="New Helpdesk Request" /> - <filter icon="terp-camera_test" - string="Open" - domain="[('state','=','open')]" - help="Open Helpdesk Request" - /> - <filter icon="terp-gtk-media-pause" - string="Pending" - domain="[('state','=','pending')]" - help="All pending Helpdesk Request" - /> - <filter string="Assigned to Me or My Sales Team(s)" - icon="terp-personal+" - domain="['|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]" + <filter icon="terp-check" string="New" name="current" domain="[('state','=','draft')]" help="New Helpdesk Request" /> + <filter icon="terp-camera_test" string="Open" domain="[('state','=','open')]" help="Open Helpdesk Request" /> + <filter icon="terp-gtk-media-pause" string="Pending" domain="[('state','=','pending')]" help="All pending Helpdesk Request" /> + <separator/> + <filter string="Assigned to Me or My Sales Team(s)" icon="terp-personal+" domain="['|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]" help="Helpdesk requests that are assigned to me or to one of the sale teams I manage" /> - <separator orientation="vertical"/> <field name="partner_id" /> - <field name="user_id" widget="selection"/> - <field name="section_id" widget="selection" string="Sales Team"/> - <newline/> + <field name="user_id"/> + <field name="section_id" string="Sales Team"/> <group expand="0" string="Group By..."> - <filter string="Partner" icon="terp-partner" - domain="[]" help="Partner" - context="{'group_by':'partner_id'}" /> - <filter string="Responsible" icon="terp-personal" - domain="[]" help="Responsible User" - context="{'group_by':'user_id'}" /> - <filter string="Sales Team" icon="terp-personal+" - domain="[]" help="Sales Team" - context="{'group_by':'section_id'}" /> - <separator orientation="vertical"/> - <filter string="Priority" icon="terp-rating-rated" - domain="[]" context="{'group_by':'priority'}" /> - <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" - context="{'group_by':'state'}" /> - <separator orientation="vertical"/> - <filter string="Date" icon="terp-go-month" - domain="[]" help="Request Date" - context="{'group_by':'date'}" /> - <filter string="Deadline" icon="terp-go-month" - domain="[]" - context="{'group_by':'date_deadline'}" /> + <filter string="Partner" icon="terp-partner" domain="[]" help="Partner" context="{'group_by':'partner_id'}" /> + <filter string="Responsible" icon="terp-personal" domain="[]" help="Responsible User" context="{'group_by':'user_id'}" /> + <filter string="Sales Team" icon="terp-personal+" domain="[]" help="Sales Team" context="{'group_by':'section_id'}" /> + <filter string="Priority" icon="terp-rating-rated" domain="[]" context="{'group_by':'priority'}" /> + <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}" /> + <filter string="Date" icon="terp-go-month" domain="[]" help="Request Date" context="{'group_by':'date'}" /> + <filter string="Deadline" icon="terp-go-month" domain="[]" context="{'group_by':'date_deadline'}" /> </group> </search> </field> diff --git a/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml b/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml index 6060c6c1f90..9aab23eab70 100644 --- a/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml +++ b/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml @@ -53,65 +53,34 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Search"> - <group> - <filter string="New" icon="terp-check" - domain="[('state','=','draft')]" /> - <filter string="Open" icon="terp-camera_test" - domain="[('state','=','open')]" /> - <filter string="Closed" icon="terp-dialog-close" - domain="[('state','=','cancel')]" /> - <filter icon="terp-personal" string="My Case(s)" help="My Case(s)" domain="[('user_id','=',uid)]" /> - <filter string="My Sales Team(s)" - icon="terp-personal+" - context="{'invisible_section': False}" - domain="[('section_id.user_id','=',uid)]" - help="My Sales Team(s)" /> - <filter string="My Company" - icon="terp-go-home" - context="{'invisible_section': False}" - domain="[('section_id.user_id.company_id','=',uid)]" - help="My company"/> - <separator orientation="vertical"/> - <field name="user_id" string="Salesperson"/> - <field name="section_id" string="Sales Team" - context="{'invisible_section': False}"/> - <field name="company_id" groups="base.group_multi_company"/> - </group> - <newline/> + <filter string="New" icon="terp-check" domain="[('state','=','draft')]" /> + <filter string="Open" icon="terp-camera_test" domain="[('state','=','open')]" /> + <filter string="Closed" icon="terp-dialog-close" domain="[('state','=','cancel')]" /> + <separator/> + <filter icon="terp-personal" string="My Case(s)" help="My Case(s)" domain="[('user_id','=',uid)]" /> + <separator/> + <filter string="My Sales Team(s)" icon="terp-personal+" context="{'invisible_section': False}" domain="[('section_id.user_id','=',uid)]" help="My Sales Team(s)" /> + <separator/> + <filter string="My Company" icon="terp-go-home" context="{'invisible_section': False}" domain="[('section_id.user_id.company_id','=',uid)]" help="My company"/> + <field name="user_id" string="Salesperson"/> + <field name="section_id" string="Sales Team" context="{'invisible_section': False}"/> + <field name="company_id" groups="base.group_multi_company"/> <group expand="0" string="Extended Filters..." groups="base.group_no_one"> <field name="priority" string="Priority"/> <field name="categ_id"/> - <newline/> <field name="create_date"/> <field name="date_closed" string="Close Date"/> </group> - <newline/> <group expand="1" string="Group By..."> - <filter string="Salesperson" icon="terp-personal" - domain="[]" context="{'group_by':'user_id'}"/> - <filter string="Sales Team" icon="terp-personal+" - domain="[]" - context="{'group_by':'section_id'}" /> - <filter string="Partner" icon="terp-partner" - domain="[]" - context="{'group_by':'partner_id'}" /> - <separator orientation="vertical" /> + <filter string="Salesperson" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/> + <filter string="Sales Team" icon="terp-personal+" domain="[]" context="{'group_by':'section_id'}" /> + <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}" /> <filter string="Channel" icon="terp-call-start" domain="[]" context="{'group_by':'channel_id'}" /> - <separator orientation="vertical" /> - <filter string="Status" icon="terp-stock_effects-object-colorize" - domain="[]" context="{'group_by':'state'}" /> - <separator orientation="vertical" /> - <filter string="Company" icon="terp-go-home" - domain="[]" - groups="base.group_multi_company" - context="{'group_by':'company_id'}" /> - <separator orientation="vertical" groups="base.group_multi_company"/> - <filter string="Day" icon="terp-go-today" - domain="[]" context="{'group_by':'day'}" help="Date of helpdesk requests"/> - <filter string="Month" icon="terp-go-month" - domain="[]" context="{'group_by':'month'}" help="Month of helpdesk requests"/> - <filter string="Year" icon="terp-go-year" - domain="[]" context="{'group_by':'name'}" help="Year of helpdesk requests" /> + <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}" /> + <filter string="Company" icon="terp-go-home" domain="[]" groups="base.group_multi_company" context="{'group_by':'company_id'}" /> + <filter string="Day" icon="terp-go-today" domain="[]" context="{'group_by':'day'}" help="Date of helpdesk requests"/> + <filter string="Month" icon="terp-go-month" domain="[]" context="{'group_by':'month'}" help="Month of helpdesk requests"/> + <filter string="Year" icon="terp-go-year" domain="[]" context="{'group_by':'name'}" help="Year of helpdesk requests" /> </group> </search> </field> diff --git a/addons/crm_partner_assign/crm_lead_view.xml b/addons/crm_partner_assign/crm_lead_view.xml index c45002c085c..258b16cea93 100644 --- a/addons/crm_partner_assign/crm_lead_view.xml +++ b/addons/crm_partner_assign/crm_lead_view.xml @@ -62,7 +62,6 @@ </filter> <field name="user_id" position="after"> - <separator orientation="vertical"/> <field name="partner_assigned_id"/> </field> </field> diff --git a/addons/crm_partner_assign/report/crm_lead_report_view.xml b/addons/crm_partner_assign/report/crm_lead_report_view.xml index a9a0cf75d25..f88d7e91f00 100644 --- a/addons/crm_partner_assign/report/crm_lead_report_view.xml +++ b/addons/crm_partner_assign/report/crm_lead_report_view.xml @@ -9,72 +9,42 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Leads Analysis"> - <group> - <filter icon="terp-check" - string="Current" - domain="[('state','in',('draft','open'))]"/> - <filter icon="terp-dialog-close" - string="Closed" - domain="[('state','=','done')]"/> - <separator orientation="vertical" /> - <field name="section_id" - widget="selection" - context="{'invisible_section': False}"/> - <field name="grade_id"/> - <field name="user_id"/> - <field name="partner_assigned_id"/> - </group> - <newline/> - <group expand="0" string="Extended Filters..."> + <filter icon="terp-check" string="Current" domain="[('state','in',('draft','open'))]"/> + <filter icon="terp-dialog-close" string="Closed" domain="[('state','=','done')]"/> + <field name="section_id" context="{'invisible_section': False}"/> + <field name="grade_id"/> + <field name="user_id"/> + <field name="partner_assigned_id"/> + <group expand="0" string="Extended Filters..."> <field name="partner_id"/> - <separator orientation="vertical"/> + <separator/> <field name="stage_id" widget="selection" domain="[('section_ids', '=', 'section_id')]"/> - <separator orientation="vertical"/> + <separator /> <field name="company_id" widget="selection" groups="base.group_multi_company"/> - <newline/> <field name="creation_date"/> <field name="opening_date"/> <field name="date_closed"/> - </group> - <newline/> - <group expand="1" string="Group By..."> - <filter string="Salesperson" name="user" icon="terp-personal" + </group> + <group expand="1" string="Group By..."> + <filter string="Salesperson" name="user" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}" /> - <filter string="Partner" icon="terp-partner" context="{'group_by':'partner_assigned_id'}" /> - <filter string="Country" icon="terp-go-home" context="{'group_by':'country_id'}" /> - <separator orientation="vertical" /> + <filter string="Partner" icon="terp-partner" context="{'group_by':'partner_assigned_id'}" /> + <filter string="Country" icon="terp-go-home" context="{'group_by':'country_id'}" /> <filter string="Section" icon="terp-personal+" - domain="[]" - context="{'group_by':'section_id'}" /> + domain="[]" + context="{'group_by':'section_id'}" /> <filter string="Grade" name="group_grade" icon="terp-stock_symbol-selection" - domain="[]" context="{'group_by':'grade_id'}" /> - - <separator orientation="vertical" /> + domain="[]" context="{'group_by':'grade_id'}" /> <filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}"/> - <separator orientation="vertical"/> <filter string="Priority" icon="terp-rating-rated" domain="[]" context="{'group_by':'priority'}" /> - <separator orientation="vertical" /> - <filter string="Status" icon="terp-stock_effects-object-colorize" - domain="[]" context="{'group_by':'state'}" /> - <separator orientation="vertical" /> - <filter string="Company" icon="terp-go-home" - domain="[]" - context="{'group_by':'company_id'}" /> - <separator orientation="vertical" /> - <filter string="Assign Date" icon="terp-go-today" - domain="[]" - name="group_partner_date" - context="{'group_by':'date_assign'}"/> - <separator orientation="vertical"/> - <filter string="Day" icon="terp-go-today" - domain="[]" context="{'group_by':'day'}"/> - <filter string="Month" icon="terp-go-month" - domain="[]" context="{'group_by':'month'}" /> - <filter string="Year" icon="terp-go-year" - domain="[]" context="{'group_by':'year'}" /> - </group> - - </search> + <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}" /> + <filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}" /> + <filter string="Assign Date" icon="terp-go-today" domain="[]" name="group_partner_date" context="{'group_by':'date_assign'}"/> + <filter string="Day" icon="terp-go-today" domain="[]" context="{'group_by':'day'}"/> + <filter string="Month" icon="terp-go-month" domain="[]" context="{'group_by':'month'}" /> + <filter string="Year" icon="terp-go-year" domain="[]" context="{'group_by':'year'}" /> + </group> + </search> </field> </record> diff --git a/addons/crm_partner_assign/report/crm_partner_report_view.xml b/addons/crm_partner_assign/report/crm_partner_report_view.xml index d652848f0fe..af811f8f869 100644 --- a/addons/crm_partner_assign/report/crm_partner_report_view.xml +++ b/addons/crm_partner_assign/report/crm_partner_report_view.xml @@ -9,36 +9,30 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Partner assigned Analysis"> - <group col="20" colspan="8"> - <field name="section_id"/> - <field name="user_id"/> - <field name="grade_id"/> - <field name="activation"/> - </group> - <newline/> - <group expand="1" string="Group By..."> - <filter string="Salesperson" name="user" icon="terp-personal" + <field name="section_id"/> + <field name="user_id"/> + <field name="grade_id"/> + <field name="activation"/> + <group expand="1" string="Group By..."> + <filter string="Salesperson" name="user" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}" /> - <filter string="Country" icon="terp-go-home" name="group_country" context="{'group_by':'country_id'}" /> - <separator orientation="vertical" /> + <filter string="Country" icon="terp-go-home" name="group_country" context="{'group_by':'country_id'}" /> <filter string="Section" icon="terp-personal+" - domain="[]" - context="{'group_by':'section_id'}" /> + domain="[]" context="{'group_by':'section_id'}" /> <filter string="Activation" name="group_activation" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'activation'}" /> <filter string="Grade" name="group_grade" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'grade_id'}" /> <filter string="Partner" name="" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'partner_id'}" /> - <separator orientation="vertical" /> <filter string="Date Invoice" name="group_period_id" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'period_id'}" /> <filter string="Date Partnership" name="group_date_partnership" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'date_partnership'}" /> <filter string="Date Review" name="group_date_review" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'date_review'}" /> - </group> - </search> + </group> + </search> </field> </record> diff --git a/addons/document/document_view.xml b/addons/document/document_view.xml index 1b1864cabe0..3f5768b8c4a 100644 --- a/addons/document/document_view.xml +++ b/addons/document/document_view.xml @@ -41,7 +41,6 @@ <field name="arch" type="xml"> <search string="Search Document Storage"> <field name="name" string="Document Storage"/> - <newline/> <group expand="0" string="Group By..."> <filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type'}"/> </group> @@ -172,20 +171,15 @@ <field name="arch" type="xml"> <search string="Search Document Directory"> <field name="name" string="Document Directory"/> - <separator orientation="vertical"/> <filter string="Static" domain="[('type','=','directory')]"/> <filter string="Resources" icon="terp-personal" domain="[('type','=','ressource')]"/> - <separator orientation="vertical"/> <field name="company_id" groups="base.group_multi_company"/> <field name="storage_id" /> <field name="user_id" /> - <newline/> <group expand="0" string="Group By..."> <filter string="Owner" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/> - <separator orientation="vertical"/> <filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type'}"/> <filter string="Storage" domain="[]" icon="terp-accessories-archiver" context="{'group_by':'storage_id'}"/> - <separator orientation="vertical" groups="base.group_multi_company"/> <filter string="Company" domain="[]" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/> </group> </search> @@ -269,11 +263,7 @@ <field name="inherit_id" ref="base.view_attachment_search"/> <field name="arch" type="xml"> <xpath expr="//filter[@name='my_documents_filter']" position="replace"> - <filter name="my_documents_filter" - string="My Document(s)" - icon="terp-personal" - domain="[('user_id','=',uid)]" - help="Filter on my documents"/> + <filter name="my_documents_filter" string="My Document(s)" icon="terp-personal" domain="[('user_id','=',uid)]" help="Filter on my documents"/> </xpath> <xpath expr="//field[@name='create_uid']" position="replace"> <field name="user_id"/> diff --git a/addons/document/report/document_report_view.xml b/addons/document/report/document_report_view.xml index 98016d2fee2..6b3708d1a2f 100644 --- a/addons/document/report/document_report_view.xml +++ b/addons/document/report/document_report_view.xml @@ -41,13 +41,8 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="All users files"> - <group> - <field name="name" - filter_domain="['|', '|',('name','ilike',self), ('user','ilike',self), ('directory','ilike',self)]" - string="Users File"/> - <separator orientation="vertical"/> - <field name="month"/> - </group> + <field name="name" filter_domain="['|', '|',('name','ilike',self), ('user','ilike',self), ('directory','ilike',self)]" string="Users File"/> + <field name="month"/> </search> </field> </record> diff --git a/addons/document_webdav/webdav_view.xml b/addons/document_webdav/webdav_view.xml index 44af9f2af3a..35c37530f4d 100644 --- a/addons/document_webdav/webdav_view.xml +++ b/addons/document_webdav/webdav_view.xml @@ -38,10 +38,7 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Search Document properties"> - <field name="name" - filter_domain="['|', ('name','ilike',self), ('namespace','ilike',self)]" - string="Document property"/> - <newline/> + <field name="name" filter_domain="['|', ('name','ilike',self), ('namespace','ilike',self)]" string="Document property"/> <group expand="0" string="Group By..." groups="base.group_no_one"> <filter string="Dir" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'dir_id'}"/> <filter string="Namespace" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'namespace'}"/> @@ -140,10 +137,7 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Search Document properties"> - <field name="name" - filter_domain="['|', ('name','ilike',self), ('namespace','ilike',self)]" - string="Document Property"/> - <newline/> + <field name="name" filter_domain="['|', ('name','ilike',self), ('namespace','ilike',self)]" string="Document Property"/> <group expand="0" string="Group By..." groups="base.group_no_one"> <filter string="Document" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'file_id'}"/> <filter string="Namespace" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'namespace'}"/> diff --git a/addons/email_template/email_template_view.xml b/addons/email_template/email_template_view.xml index c05502cd3a0..daa4d028651 100644 --- a/addons/email_template/email_template_view.xml +++ b/addons/email_template/email_template_view.xml @@ -122,16 +122,11 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Templates"> - <group> - <field name="name" filter_domain="['|', '|', '|',('name','ilike',self), ('report_name','ilike',self), ('subject','ilike',self), ('email_to','ilike',self)]" string="Templates"/> - <separator orientation="vertical"/> - <field name="model_id"/> - <field name="lang"/> - </group> - <newline/> + <field name="name" filter_domain="['|', '|', '|',('name','ilike',self), ('report_name','ilike',self), ('subject','ilike',self), ('email_to','ilike',self)]" string="Templates"/> + <field name="lang"/> + <field name="model_id"/> <group expand="0" string="Group by..."> <filter string="SMTP Server" domain="[]" context="{'group_by':'mail_server_id'}" icon="terp-folder-orange"/> - <separator orientation="vertical"/> <filter string="Model" domain="[]" context="{'group_by':'model_id'}" icon="terp-accessories-archiver"/> </group> </search> diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml index a5181e7dded..95997e6278c 100644 --- a/addons/event/event_view.xml +++ b/addons/event/event_view.xml @@ -332,37 +332,22 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Events"> - <filter icon="terp-mail-message-new" - string="Inbox" help="Unread messages" - name="needaction_pending" - domain="[('needaction_pending','=',True)]"/> - <separator orientation="vertical"/> - <group> - <field name="name" string="Events"/> - <separator orientation="vertical"/> - <filter icon="terp-check" string="Unconfirmed" name="draft" domain="[('state','=','draft')]" help="Events in New state"/> - <filter icon="terp-camera_test" string="Confirmed" domain="[('state','=','confirm')]" help="Confirmed events"/> - <filter icon="terp-personal" - string="My Events" - help="My Events" - domain="[('user_id','=',uid)]"/> - <filter icon="terp-go-today" string="Upcoming" - name="upcoming" - domain="[('date_begin','>=', time.strftime('%%Y-%%m-%%d 00:00:00'))]" - help="Upcoming events from today" /> - <separator orientation="vertical"/> - <field name="type" widget="selection"/> - <field name="user_id" widget="selection"/> - </group> - <newline/> + <field name="name" string="Events"/> + <filter icon="terp-mail-message-new" string="Inbox" help="Unread messages" name="needaction_pending" domain="[('needaction_pending','=',True)]"/> + <separator/> + <filter icon="terp-check" string="Unconfirmed" name="draft" domain="[('state','=','draft')]" help="Events in New state"/> + <filter icon="terp-camera_test" string="Confirmed" domain="[('state','=','confirm')]" help="Confirmed events"/> + <separator/> + <filter icon="terp-personal" string="My Events" help="My Events" domain="[('user_id','=',uid)]"/> + <separator/> + <filter icon="terp-go-today" string="Upcoming" name="upcoming" domain="[('date_begin','>=', time.strftime('%%Y-%%m-%%d 00:00:00'))]" help="Upcoming events from today" /> + <field name="type"/> + <field name="user_id"/> <group expand="0" string="Group By..."> <filter string="Responsible" icon="terp-personal" context="{'group_by': 'user_id'}"/> - <separator orientation="vertical"/> <filter string="Event Type" icon="terp-crm" context="{'group_by':'type'}"/> <filter string="Status" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/> - <separator orientation="vertical"/> - <filter string="Starting Date" icon="terp-go-month" - domain="[]" context="{'group_by':'date_begin'}"/> + <filter string="Starting Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_begin'}"/> </group> </search> </field> @@ -533,34 +518,21 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Event Registration"> - <group> - <filter icon="terp-mail-message-new" - string="Inbox" help="Unread messages" - name="needaction_pending" - domain="[('needaction_pending','=',True)]"/> - <separator orientation="vertical"/> - <field name="name" string="Participant" - filter_domain="['|','|','|',('name','ilike',self),('partner_id','ilike',self),('email','ilike',self),('origin','ilike',self)]"/> - <separator orientation="vertical"/> - <filter icon="terp-check" string="New" name="draft" domain="[('state','=','draft')]" help="Registrations in unconfirmed state"/> - <filter icon="terp-camera_test" string="Confirmed" domain="[('state','=','open')]" help="Confirmed registrations"/> - <filter icon="terp-personal" - string="My Registrations" - help="My Registrations" - domain="[('user_id','=',uid)]"/> - <separator orientation="vertical"/> - <field name="event_id" widget="selection"/> - <field name="user_id"/> - </group> - <newline/> + <field name="name" string="Participant" filter_domain="['|','|','|',('name','ilike',self),('partner_id','ilike',self),('email','ilike',self),('origin','ilike',self)]"/> + <filter icon="terp-mail-message-new" string="Inbox" help="Unread messages" name="needaction_pending" domain="[('needaction_pending','=',True)]"/> + <separator/> + <filter icon="terp-check" string="New" name="draft" domain="[('state','=','draft')]" help="Registrations in unconfirmed state"/> + <filter icon="terp-camera_test" string="Confirmed" domain="[('state','=','open')]" help="Confirmed registrations"/> + <separator/> + <filter icon="terp-personal" string="My Registrations" help="My Registrations" domain="[('user_id','=',uid)]"/> + <field name="event_id"/> + <field name="user_id"/> <group expand="0" string="Group By..."> <filter string="Responsible" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/> <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/> - <separator orientation="vertical"/> <filter string="Event" icon="terp-crm" domain="[]" context="{'group_by':'event_id'}"/> <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/> </group> - </search> </field> </record> diff --git a/addons/event/report/report_event_registration_view.xml b/addons/event/report/report_event_registration_view.xml index 7ae6c0fae2e..f05fdcc09e1 100644 --- a/addons/event/report/report_event_registration_view.xml +++ b/addons/event/report/report_event_registration_view.xml @@ -52,24 +52,12 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Event on Registration"> - <group> - <filter icon="terp-document-new" - string="New" - domain="[('event_state','=','draft')]" - help="Events which are in New state"/> - <filter icon="terp-check" - string="Confirm" - domain="[('event_state','=','confirm')]" - help="Events which are in confirm state"/> - <filter icon="terp-personal" - string="My Events" - help="My Events" - domain="[('user_id','=',uid)]"/> - <separator orientation="vertical"/> - <field name="event_id" string="Event"/> - <field name="user_id" widget="selection"/> - </group> - <newline/> + <filter icon="terp-document-new" string="New" domain="[('event_state','=','draft')]" help="Events which are in New state"/> + <filter icon="terp-check" string="Confirm" domain="[('event_state','=','confirm')]" help="Events which are in confirm state"/> + <separator/> + <filter icon="terp-personal" string="My Events" help="My Events" domain="[('user_id','=',uid)]"/> + <field name="event_id" string="Event"/> + <field name="user_id"/> <group expand="0" string="Extended Filters..."> <field name="event_type" widget="selection"/> <field name="event_date"/> @@ -80,27 +68,18 @@ <filter string="Register" icon="terp-personal" context="{'group_by':'user_id_registration'}" help="Registration contact" groups="base.extended"/> <filter string="Speaker" name="speaker" icon="terp-personal+" context="{'group_by': 'speaker_id'}" groups="base.extended"/> <filter string="Event Responsible" name="user_id" icon="terp-personal" context="{'group_by': 'user_id'}"/> - <separator orientation="vertical"/> <filter string="Event" name="event" icon="terp-crm" context="{'group_by':'event_id', 'max_reg_event_visible':0}"/> <filter string="Event Type" icon="terp-crm" context="{'group_by':'event_type'}"/> - <separator orientation="vertical"/> <filter string="Event State" icon="terp-stock_effects-object-colorize" context="{'group_by':'event_state'}"/> <filter string="Registration State" icon="terp-stock_effects-object-colorize" context="{'group_by':'registration_state'}"/> - <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="Day" icon="terp-go-month" - domain="[]" context="{'group_by':'event_date'}" help="Event Beginning Date"/> - <filter string="Month" icon="terp-go-month" - domain="[]" context="{'group_by':'month'}" help="Event Beginning Date"/> - <filter string="Year" icon="terp-go-year" - domain="[]" context="{'group_by':'year'}" help="Event Beginning Date"/> + <filter string="Day" icon="terp-go-month" domain="[]" context="{'group_by':'event_date'}" help="Event Beginning Date"/> + <filter string="Month" icon="terp-go-month" domain="[]" context="{'group_by':'month'}" help="Event Beginning Date"/> + <filter string="Year" icon="terp-go-year" domain="[]" context="{'group_by':'year'}" help="Event Beginning Date"/> </group> <group expand="0" string="Display"> - <filter icon="terp-camera_test" - string="Show Confirmed Registrations" - help="Registrations in confirmed or done state" - context="{'no_of_draft_invisible':1}"/> + <filter icon="terp-camera_test" string="Show Confirmed Registrations" + help="Registrations in confirmed or done state" context="{'no_of_draft_invisible':1}"/> </group> </search> </field> diff --git a/addons/fetchmail/fetchmail_view.xml b/addons/fetchmail/fetchmail_view.xml index 9567f7746f3..3325ae38c0b 100644 --- a/addons/fetchmail/fetchmail_view.xml +++ b/addons/fetchmail/fetchmail_view.xml @@ -80,10 +80,9 @@ <field name="arch" type="xml"> <search string="Search Incoming Mail Servers"> <field name="name" string="Incoming Mail Server"/> - <separator orientation="vertical"/> <filter string="IMAP" icon="terp-folder-green" domain="[('type','=','imap')]" help="Server type IMAP."/> <filter string="POP" icon="terp-folder-orange" domain="[('type','=','pop')]" help="Server type POP."/> - <separator orientation="vertical"/> + <separator/> <filter string="SSL" icon="terp-camera_test" domain="[('is_ssl','=',True)]" help="If SSL required."/> </search> </field> diff --git a/addons/hr/hr_department_view.xml b/addons/hr/hr_department_view.xml index 6d9141238b1..ed0156e6cce 100644 --- a/addons/hr/hr_department_view.xml +++ b/addons/hr/hr_department_view.xml @@ -40,7 +40,6 @@ <field name="arch" type="xml"> <search string="Departments"> <field name="name" string="Department"/> - <separator orientation="vertical"/> <field name="manager_id" /> </search> </field> diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml index 1c145694a44..ca07c8ce173 100644 --- a/addons/hr/hr_view.xml +++ b/addons/hr/hr_view.xml @@ -109,16 +109,13 @@ <field name="arch" type="xml"> <search string="Employees"> <field name="name" string="Employees"/> - <separator orientation="vertical"/> - <field name="department_id" widget="selection"/> - <field name="job_id" widget="selection"/> + <field name="department_id" /> + <field name="job_id"/> <field name="parent_id"/> <field name="category_ids"/> - <newline/> <group expand="0" string="Group By..."> <filter string="Manager" icon="terp-personal" domain="[]" context="{'group_by':'parent_id'}"/> <filter string="Coach" icon="terp-personal" domain="[]" context="{'group_by':'coach_id'}"/> - <separator orientation="vertical"/> <filter string="Department" icon="terp-personal+" domain="[]" context="{'group_by':'department_id'}"/> <filter string="Job" icon="terp-gtk-select-all" domain="[]" context="{'group_by':'job_id'}"/> <filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/> @@ -410,16 +407,9 @@ <field name="arch" type="xml"> <search string="Jobs"> <field name="name" string="Job"/> - <separator orientation="vertical"/> - <filter icon="terp-camera_test" - domain="[('state','=','open')]" - string="In Position" - help="In Position"/> - <filter icon="terp-personal+" domain="[('state','=','recruit')]" string="In Recruitment" - help="In Recruitment"/> - <separator orientation="vertical"/> - <field name="department_id" widget="selection"/> - <newline/> + <filter icon="terp-camera_test" domain="[('state','=','open')]" string="In Position" help="In Position"/> + <filter icon="terp-personal+" domain="[('state','=','recruit')]" string="In Recruitment" help="In Recruitment"/> + <field name="department_id"/> <group expand="0" string="Group By..."> <filter string="Department" icon="terp-personal+" domain="[]" context="{'group_by':'department_id'}"/> <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/> diff --git a/addons/hr_attendance/hr_attendance_view.xml b/addons/hr_attendance/hr_attendance_view.xml index 448e6401cbd..8a671e8438f 100644 --- a/addons/hr_attendance/hr_attendance_view.xml +++ b/addons/hr_attendance/hr_attendance_view.xml @@ -55,16 +55,13 @@ <field name="arch" type="xml"> <search string="Hr Attendance Search"> <field name="name" string="Attendance"/> - <separator orientation="vertical"/> + <field name="action"/> <filter icon="terp-go-today" string="Today" name="today" domain="[('name','>=',current_date),('name','<=',current_date)]" /> + <separator/> <filter icon="terp-stock_align_left_24" string="My Attendance" domain="[('employee_id.user_id.id', '=', uid)]" /> - <separator orientation="vertical"/> <field name="employee_id"/> - <field name="action"/> - <newline/> <group expand="0" string="Group By..."> <filter name="employee" string="Employee" icon="terp-personal" domain="[]" context="{'group_by':'employee_id'}"/> - <separator orientation="vertical"/> <filter string="Day" icon="terp-go-today" domain="[]" context="{'group_by':'day'}"/> </group> </search> diff --git a/addons/hr_contract/hr_contract_view.xml b/addons/hr_contract/hr_contract_view.xml index 8065d3b16bf..2009e500bf9 100644 --- a/addons/hr_contract/hr_contract_view.xml +++ b/addons/hr_contract/hr_contract_view.xml @@ -40,22 +40,15 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Search Contract"> - <group> - <field name="name" string="Contracts"/> - <separator orientation="vertical"/> - <field name="date_start"/> - <field name="date_end"/> - <separator orientation="vertical"/> - <field name="employee_id"/> - <field name="working_hours"/> - </group> - <newline/> + <field name="name" string="Contracts"/> + <field name="date_start"/> + <field name="date_end"/> + <field name="working_hours"/> + <field name="employee_id"/> <group expand="0" string="Group By..."> <filter string="Employee" icon="terp-personal" domain="[]" context="{'group_by':'employee_id'}"/> - <separator orientation="vertical"/> <filter string="Working Schedule" icon="terp-go-week" domain="[]" context="{'group_by':'working_hours'}"/> <filter string="Job" icon="terp-gtk-select-all" domain="[]" context="{'group_by':'job_id'}"/> - <separator orientation="vertical"/> <filter string="Contract Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type_id'}"/> </group> </search> @@ -174,9 +167,7 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Search Contract Type"> - <group> - <field name="name" string="Contract Type"/> - </group> + <field name="name" string="Contract Type"/> </search> </field> </record> diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml index b940313691f..c67b5b51d1f 100644 --- a/addons/hr_evaluation/hr_evaluation_view.xml +++ b/addons/hr_evaluation/hr_evaluation_view.xml @@ -8,12 +8,8 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Appraisal Plan"> - <group> - <field name="name" string="Appraisal Plans"/> - <separator orientation="vertical"/> - <field name="company_id" widget="selection" groups="base.group_multi_company"/> - </group> - <newline/> + <field name="name" string="Appraisal Plans"/> + <field name="company_id" groups="base.group_multi_company"/> <group expand="0" string="Group By..." groups="base.group_multi_company"> <filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}"/> </group> @@ -234,22 +230,15 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Search Appraisal"> - <group> - <field name="date"/> - <separator orientation="vertical"/> - <filter icon="terp-check" string="Pending" domain="[('state','=','wait')]" help="Appraisal that are in Plan In Progress state"/> - <filter icon="terp-camera_test" string="In progress" domain="[('state','=','progress')]" help="Appraisal that are in waiting appreciation state"/> - <separator orientation="vertical"/> - <field name="employee_id" /> - <field name="plan_id" widget="selection" /> - </group> - <newline/> + <field name="date"/> + <filter icon="terp-check" string="Pending" domain="[('state','=','wait')]" help="Appraisal that are in Plan In Progress state"/> + <filter icon="terp-camera_test" string="In progress" domain="[('state','=','progress')]" help="Appraisal that are in waiting appreciation state"/> + <field name="employee_id" /> + <field name="plan_id"/> <group expand='0' string='Group by...'> <filter string='Employee' icon="terp-personal" domain="[]" context="{'group_by' : 'employee_id'}" /> - <separator orientation="vertical"/> <filter string='Plan' icon="terp-stock_align_left_24" domain="[]" context="{'group_by' : 'plan_id'}" /> <filter string='Status' icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by' : 'state'}" /> - <separator orientation="vertical"/> <filter string='Date' icon="terp-go-month" domain="[]" context="{'group_by' : 'date'}" /> </group> </search> @@ -329,20 +318,13 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Search Appraisal"> - <group> - <field name="date_deadline"/> - <separator orientation="vertical"/> - <filter icon="terp-gtk-go-back-rtl" string="To Do" name="todo" domain="[('state','=','waiting_answer')]"/> - <separator orientation="vertical"/> - <field name="user_to_review_id"/> - <field name="user_id" string="Interviewer"/> - </group> - <newline/> + <field name="date_deadline"/> + <filter icon="terp-gtk-go-back-rtl" string="To Do" name="todo" domain="[('state','=','waiting_answer')]"/> + <field name="user_to_review_id"/> + <field name="user_id" string="Interviewer"/> <group expand="0" string="Group By..."> <filter string="Interviewer" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/> - <separator orientation="vertical"/> <filter string="Survey" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'survey_id'}"/> - <separator orientation="vertical"/> <filter string="Status" name="group_state" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/> </group> </search> diff --git a/addons/hr_evaluation/report/hr_evaluation_report_view.xml b/addons/hr_evaluation/report/hr_evaluation_report_view.xml index d855e02eea7..f92ff1efedb 100644 --- a/addons/hr_evaluation/report/hr_evaluation_report_view.xml +++ b/addons/hr_evaluation/report/hr_evaluation_report_view.xml @@ -45,34 +45,22 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Appraisal Analysis"> - <group> - <filter string="In Progress" icon="terp-camera_test" domain="[('state', '=' ,'wait')]" - help = "In progress Evaluations"/> - <filter string="Final Validation" icon="terp-camera_test" domain="[('state','=','progress')]" - help = "Final Validation Evaluations"/> - <filter icon="terp-dialog-close" string="Done" domain="[('state','=','done')]"/> - <separator orientation="vertical"/> - <field name="employee_id"/> - <field name="plan_id" widget="selection"/> - </group> - <newline/> + <filter string="In Progress" icon="terp-camera_test" domain="[('state', '=' ,'wait')]" help = "In progress Evaluations"/> + <filter string="Final Validation" icon="terp-camera_test" domain="[('state','=','progress')]" help = "Final Validation Evaluations"/> + <filter icon="terp-dialog-close" string="Done" domain="[('state','=','done')]"/> + <field name="employee_id"/> + <field name="plan_id"/> <group expand="0" string="Extended Filters..."> <field name="rating"/> - <newline/> <field name="deadline"/> - <separator orientation="vertical"/> <field name="state"/> <field name="create_date"/> </group> - <newline/> <group expand="1" string="Group By..."> <filter string="Employee" name="employee" icon="terp-personal" context="{'group_by':'employee_id'}"/> - <separator orientation="vertical"/> <filter string="Plan" icon="terp-stock_align_left_24" context="{'group_by':'plan_id'}"/> <filter string="Appreciation" icon="terp-face-plain" context="{'group_by':'rating'}"/> - <separator orientation="vertical"/> <filter string="Status" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/> - <separator orientation="vertical"/> <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}" help="Creation Date"/> <filter string="Month" icon="terp-go-month" context="{'group_by':'create_date'}" help="Creation Date"/> <filter string="Year" icon="terp-go-month" context="{'group_by':'year'}" help="Creation Date"/> diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml index 36ebd202dc8..24514241916 100644 --- a/addons/hr_expense/hr_expense_view.xml +++ b/addons/hr_expense/hr_expense_view.xml @@ -136,27 +136,19 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Expense"> - <group> - <field name="name" string="Expenses"/> - <separator orientation="vertical"/> - <field name="date"/> - <separator orientation="vertical"/> - <filter icon="terp-document-new" domain="[('state','=','draft')]" string="New" help="New Expense"/> - <filter icon="terp-camera_test" domain="[('state','=','confirm')]" string="To Approve" help="Confirmed Expense"/> - <filter icon="terp-dolar" domain="[('state','=','accepted')]" string="To Pay" help="Expenses to Invoice"/> - <separator orientation="vertical"/> - <field name="employee_id"/> - <field name="department_id" widget="selection" string="Department" context="{'invisible_department': False}"/> - <field name="user_id" string="User"/> - </group> - <newline /> - <group expand="0" string="Group By..."> - <filter string="Employee" icon="terp-personal" domain="[]" context="{'group_by':'employee_id'}"/> - <separator orientation="vertical"/> - <filter string="Department" icon="terp-personal+" domain="[]" context="{'group_by':'department_id'}"/> - <separator orientation="vertical"/> - <filter string="Month" icon="terp-go-month" domain="[]" context="{'group_by':'date'}"/> - </group> + <field name="name" string="Expenses"/> + <field name="date"/> + <filter icon="terp-document-new" domain="[('state','=','draft')]" string="New" help="New Expense"/> + <filter icon="terp-camera_test" domain="[('state','=','confirm')]" string="To Approve" help="Confirmed Expense"/> + <filter icon="terp-dolar" domain="[('state','=','accepted')]" string="To Pay" help="Expenses to Invoice"/> + <field name="employee_id"/> + <field name="department_id" string="Department" context="{'invisible_department': False}"/> + <field name="user_id" string="User"/> + <group expand="0" string="Group By..."> + <filter string="Employee" icon="terp-personal" domain="[]" context="{'group_by':'employee_id'}"/> + <filter string="Department" icon="terp-personal+" domain="[]" context="{'group_by':'department_id'}"/> + <filter string="Month" icon="terp-go-month" domain="[]" context="{'group_by':'date'}"/> + </group> </search> </field> </record> diff --git a/addons/hr_expense/report/hr_expense_report_view.xml b/addons/hr_expense/report/hr_expense_report_view.xml index 7877edf4b3a..73ec45bde02 100644 --- a/addons/hr_expense/report/hr_expense_report_view.xml +++ b/addons/hr_expense/report/hr_expense_report_view.xml @@ -51,46 +51,31 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Expenses Analysis"> - <group> - <filter string="Waiting" icon="terp-gtk-media-pause" domain="[('state', '=' ,'confirm')]" - help = "Confirm Expenses"/> - <filter string="Approved" icon="terp-check" domain="[('state','=','accepted')]" - help = "Approved Expenses"/> - <filter string="Invoiced" icon="terp-dolar" domain="[('state','in', ('invoiced', 'paid'))]" - help = "Invoiced Expenses"/> - <separator orientation="vertical"/> - <field name="employee_id"/> - <field name="department_id"/> - </group> - <newline/> - <group expand="0" string="Extended Filters..."> - <field name="product_id"/> - <separator orientation="vertical"/> - <field name="user_id"/> - <separator orientation="vertical"/> - <field name="company_id" groups="base.group_multi_company" widget="selection"/> - <newline/> - <field name="date" string="Creation Date"/> - <field name="date_confirm"/> - <field name="date_valid"/> - </group> - <newline/> - <group expand="1" string="Group By..."> - <filter string="Employee" name="employee" icon="terp-personal" context="{'group_by':'employee_id'}"/> - <filter string="Validation User" name="User" icon="terp-personal" context="{'group_by':'user_id'}"/> - <filter string="Department" icon="terp-personal+" context="{'group_by':'department_id'}"/> - <separator orientation="vertical"/> - <filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/> - <separator orientation="vertical" groups="analytic.group_analytic_accounting"/> - <filter string="Analytic account" icon="terp-folder-green" context="{'group_by':'analytic_account'}" groups="analytic.group_analytic_accounting"/> - <separator orientation="vertical" groups="analytic.group_analytic_accounting"/> - <filter string="Status" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/> - <filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/> - <separator orientation="vertical"/> - <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}" help="Creation Date"/> - <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}" help="Creation Date"/> - <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}" help="Creation Date"/> - </group> + <filter string="Waiting" icon="terp-gtk-media-pause" domain="[('state', '=' ,'confirm')]" help = "Confirm Expenses"/> + <filter string="Approved" icon="terp-check" domain="[('state','=','accepted')]" help = "Approved Expenses"/> + <filter string="Invoiced" icon="terp-dolar" domain="[('state','in', ('invoiced', 'paid'))]" help = "Invoiced Expenses"/> + <field name="employee_id"/> + <field name="department_id"/> + <group expand="0" string="Extended Filters..."> + <field name="product_id"/> + <field name="user_id"/> + <field name="company_id" groups="base.group_multi_company"/> + <field name="date" string="Creation Date"/> + <field name="date_confirm"/> + <field name="date_valid"/> + </group> + <group expand="1" string="Group By..."> + <filter string="Employee" name="employee" icon="terp-personal" context="{'group_by':'employee_id'}"/> + <filter string="Validation User" name="User" icon="terp-personal" context="{'group_by':'user_id'}"/> + <filter string="Department" icon="terp-personal+" context="{'group_by':'department_id'}"/> + <filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/> + <filter string="Analytic account" icon="terp-folder-green" context="{'group_by':'analytic_account'}" groups="analytic.group_analytic_accounting"/> + <filter string="Status" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/> + <filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/> + <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}" help="Creation Date"/> + <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}" help="Creation Date"/> + <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}" help="Creation Date"/> + </group> </search> </field> </record> diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml index 26683e3de8a..29ca1e7b87d 100644 --- a/addons/hr_holidays/hr_holidays_view.xml +++ b/addons/hr_holidays/hr_holidays_view.xml @@ -44,36 +44,28 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Search Leave"> - <group> - <field name="date_from"/> - <separator orientation="vertical"/> - <filter icon="terp-mail-message-new" - string="Inbox" help="Unread messages" - name="needaction_pending" - domain="[('needaction_pending','=',True)]"/> - <separator orientation="vertical"/> - <filter string="My Leaves" icon="terp-personal" name="my_leaves" domain="[('employee_id.user_id','=', uid)]" help="My Leaves"/> - <filter string="My Department Leaves" icon="terp-personal+" help="My Department Leaves" domain="[('department_id.manager_id','=',uid)]"/> - <filter icon="terp-check" domain="[('state','=','draft')]" string="To Confirm"/> - <filter icon="terp-camera_test" domain="[('state','=','confirm')]" string="To Approve" name="approve"/> - <filter icon="terp-camera_test" domain="[('state','=','validate')]" string="Validated" name="validated"/> - <filter icon="terp-go-year" name="year" string="Year" domain="[('holiday_status_id.active','=',True)]" help="Filters only on allocations and requests that belong to an holiday type that is 'active' (active field is True)"/> - <separator orientation="vertical"/> - <field name="employee_id"/> - <field name="department_id" widget="selection"/> - <field name="holiday_status_id" widget="selection"/> - </group> - <newline/> + <field name="date_from"/> + <filter icon="terp-mail-message-new" string="Inbox" help="Unread messages" name="needaction_pending" domain="[('needaction_pending','=',True)]"/> + <separator/> + <filter icon="terp-check" domain="[('state','=','draft')]" string="To Confirm"/> + <filter icon="terp-camera_test" domain="[('state','=','confirm')]" string="To Approve" name="approve"/> + <filter icon="terp-camera_test" domain="[('state','=','validate')]" string="Validated" name="validated"/> + <separator/> + <filter icon="terp-go-year" name="year" string="Year" domain="[('holiday_status_id.active','=',True)]" help="Filters only on allocations and requests that belong to an holiday type that is 'active' (active field is True)"/> + <separator/> + <filter string="My Leaves" icon="terp-personal" name="my_leaves" domain="[('employee_id.user_id','=', uid)]" help="My Leaves"/> + <separator/> + <filter string="My Department Leaves" icon="terp-personal+" help="My Department Leaves" domain="[('department_id.manager_id','=',uid)]"/> + <field name="employee_id"/> + <field name="department_id"/> + <field name="holiday_status_id"/> <group expand="0" string="Group By..."> <filter name="group_date_from" string="Start Date" icon="terp-personal" domain="[]" context="{'group_by':'date_from'}"/> - <separator orientation="vertical"/> <filter name="group_employee" string="Employee" icon="terp-personal" domain="[]" context="{'group_by':'employee_id'}"/> <filter name="group_category" string="Category" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'category_id'}"/> <filter string="Manager" icon="terp-personal" domain="[]" context="{'group_by':'manager_id'}"/> <filter string="Department" icon="terp-personal+" domain="[]" context="{'group_by':'department_id','set_visible':True}"/> - <separator orientation="vertical"/> <filter name="group_type" string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'holiday_status_id'}"/> - <separator orientation="vertical"/> <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/> </group> </search> @@ -408,8 +400,7 @@ <field name="arch" type="xml"> <search string="Search Leave Type"> <field name="name" string="Leave Types"/> - <separator orientation="vertical"/> - <field name="categ_id" widget="selection"/> + <field name="categ_id"/> </search> </field> </record> @@ -475,8 +466,7 @@ <field name="arch" type="xml"> <search string="Leave Type"> <field name="name" string="Leave Types"/> - <separator orientation="vertical"/> - <field name="categ_id" widget="selection"/> + <field name="categ_id"/> </search> </field> </record> diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml index e05910a27da..b08ce6983c6 100644 --- a/addons/hr_payroll/hr_payroll_view.xml +++ b/addons/hr_payroll/hr_payroll_view.xml @@ -61,10 +61,7 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Payroll Structures"> - <group col="8" colspan="4"> - <field name="name" string="Payroll Structures" filter_domain="['|',('name','ilike',self),('code','ilike',self)]"/> - </group> - <newline/> + <field name="name" string="Payroll Structures" filter_domain="['|',('name','ilike',self),('code','ilike',self)]"/> </search> </field> </record> @@ -179,19 +176,13 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Search Payslip Lines"> - <group col="8" colspan="4"> - <field name="name" string="Payslip Lines" filter_domain="['|',('name','ilike',self),('code','ilike',self)]"/> - <separator orientation="vertical"/> - <field name="slip_id"/> - <field name="amount_select"/> - </group> - <newline/> + <field name="name" string="Payslip Lines" filter_domain="['|',('name','ilike',self),('code','ilike',self)]"/> + <field name="amount_select"/> + <field name="slip_id"/> <group col="8" colspan="4" expand="0" string="Group By..."> <filter string="Salary Rule Category" icon="terp-camera_test" name="category_id" context="{'group_by':'category_id'}"/> <filter string="Contribution Register" name="register_id" icon="terp-folder-yellow" context="{'group_by':'register_id'}"/> - <separator orientation="vertical"/> <filter string="Amount Type" name="amount_select" icon="terp-stock_symbol-selection" context="{'group_by':'amount_select'}"/> - <separator orientation="vertical"/> <filter string="Employees" name="employee_id" icon="terp-personal" context="{'group_by':'employee_id'}"/> </group> </search> @@ -367,25 +358,16 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Search Payslips"> - <group> - <field name="name" string="Payslips" filter_domain="['|',('name','ilike',self),('number','ilike',self)]"/> - <separator orientation="vertical"/> - <field name="date_from"/> - <separator orientation="vertical"/> - <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Slip"/> - <filter icon="terp-camera_test" string="Done" domain="[('state','=','done')]" help="Done Slip"/> - <separator orientation="vertical"/> - <field name="employee_id"/> - <field name="payslip_run_id"/> - </group> - <newline/> + <field name="name" string="Payslips" filter_domain="['|',('name','ilike',self),('number','ilike',self)]"/> + <field name="date_from"/> + <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Slip"/> + <filter icon="terp-camera_test" string="Done" domain="[('state','=','done')]" help="Done Slip"/> + <field name="employee_id"/> + <field name="payslip_run_id"/> <group expand="0" string="Group By..."> <filter string="Employees" icon="terp-personal" name="employee_id" context="{'group_by':'employee_id'}"/> - <separator orientation="vertical"/> <filter string="PaySlip Batch" name="payslip_run_id" icon="terp-folder-orange" context="{'group_by':'payslip_run_id'}"/> - <separator orientation="vertical" groups="base.group_multi_company"/> <filter string="Companies" name="company_id" groups="base.group_multi_company" icon="terp-go-home" context="{'group_by':'company_id'}"/> - <separator orientation="vertical"/> <filter string="States" name="state" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/> </group> </search> @@ -526,8 +508,7 @@ <field name="arch" type="xml"> <search string="Contribution Registers"> <field name="name" string="Contribution Registers"/> - <separator orientation="vertical"/> - <field name="company_id" groups="base.group_multi_company" widget="selection"/> + <field name="company_id" groups="base.group_multi_company"/> </search> </field> </record> @@ -655,13 +636,9 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Search Salary Rule"> - <group col="8"> - <field name="name" string="Salary Rules" filter_domain="['|',('name','ilike',self),('code','ilike',self)]"/> - <separator orientation="vertical"/> - <field name="category_id"/> - <field name="condition_range_min"/> - </group> - <newline/> + <field name="name" string="Salary Rules" filter_domain="['|',('name','ilike',self),('code','ilike',self)]"/> + <field name="category_id"/> + <field name="condition_range_min"/> <group col="8" colspan="4" expand="0" string="Group By..."> <filter string="Category" icon="terp-folder-yellow" name="head" context="{'group_by':'category_id'}"/> </group> @@ -698,10 +675,8 @@ <field name="arch" type="xml"> <search string="Search Payslip Batches"> <field name="name" string="Payslip Batches"/> - <separator orientation="vertical"/> <field name="date_start"/> <field name="date_end"/> - <separator orientation="vertical"/> <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Payslip Batches"/> <filter name="done_filter" icon="terp-camera_test" string="Done" domain="[('state','=','close')]" help="Done Payslip Batches"/> </search> diff --git a/addons/hr_payroll_account/hr_payroll_account_view.xml b/addons/hr_payroll_account/hr_payroll_account_view.xml index 9e3aab3ecb6..d481ae3cdde 100644 --- a/addons/hr_payroll_account/hr_payroll_account_view.xml +++ b/addons/hr_payroll_account/hr_payroll_account_view.xml @@ -62,8 +62,7 @@ <field name="inherit_id" ref="hr_payroll.hr_payslip_run_filter"/> <field name="arch" type="xml"> <filter name='done_filter' position="after"> - <separator orientation="vertical"/> - <field name="journal_id" widget="selection"/> + <field name="journal_id"/> </filter> </field> </record> diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml index fd68dc5136c..ff20f18c1bd 100644 --- a/addons/hr_recruitment/hr_recruitment_view.xml +++ b/addons/hr_recruitment/hr_recruitment_view.xml @@ -209,45 +209,29 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Search Jobs"> - <filter icon="terp-mail-message-new" - string="Inbox" help="Unread messages" - name="needaction_pending" - domain="[('needaction_pending','=',True)]"/> - <separator orientation="vertical"/> - <filter icon="terp-document-new" string="New" name="filter_new"/> - <field name="partner_name" filter_domain="['|','|',('name','ilike',self),('partner_name','ilike',self),('email_from','ilike',self)]" string="Subject / Applicant"/> - <separator orientation="vertical"/> - <filter icon="terp-document-new" string="New" - domain="[('state','=','draft')]" - help="All Initial Jobs"/> - <filter icon="terp-camera_test" string="In Progress" - domain="[('state','=','open')]" - help="Open Jobs"/> - <filter icon="terp-gtk-media-pause" string="Pending" - domain="[('state','=','pending')]" - help="Pending Jobs"/> - <filter string="Unassigned Recruitments" domain="[('user_id','=',False)]" help="Unassigned Recruitments" icon="terp-personal-"/> - <filter icon="terp-gtk-jump-to-ltr" string="Next Actions" - context="{'invisible_next_action':False, 'invisible_next_date':False}" - domain="[('date_action','<>',False)]" - help="Filter and view on next actions and date"/> - <separator orientation="vertical"/> - <field name="job_id" widget="selection"/> - <field name="user_id"/> - <newline/> + <field name="partner_name" filter_domain="['|','|',('name','ilike',self),('partner_name','ilike',self),('email_from','ilike',self)]" string="Subject / Applicant"/> + <filter icon="terp-mail-message-new" string="Inbox" help="Unread messages" name="needaction_pending" domain="[('needaction_pending','=',True)]"/> + <separator/> + <filter icon="terp-document-new" string="New" domain="[('state','=','draft')]" help="All Initial Jobs"/> + <filter icon="terp-camera_test" string="In Progress" domain="[('state','=','open')]" help="Open Jobs"/> + <filter icon="terp-gtk-media-pause" string="Pending" domain="[('state','=','pending')]" help="Pending Jobs"/> + <separator/> + <filter string="Unassigned Recruitments" domain="[('user_id','=',False)]" help="Unassigned Recruitments" icon="terp-personal-"/> + <separator/> + <filter icon="terp-gtk-jump-to-ltr" string="Next Actions" context="{'invisible_next_action':False, 'invisible_next_date':False}" + domain="[('date_action','<>',False)]" help="Filter and view on next actions and date"/> + <field name="job_id"/> + <field name="user_id"/> <group expand="0" string="Group By..."> <filter string="Responsible" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/> <filter string="Department" icon="terp-personal+" domain="[]" context="{'group_by':'department_id'}"/> - <separator orientation="vertical"/> <filter string="Job" icon="terp-gtk-select-all" domain="[]" context="{'group_by':'job_id'}"/> <filter string="Degree" icon="terp-gtk-select-all" domain="[]" context="{'group_by':'type_id'}"/> <filter string="Availability" icon="terp-camera_test" domain="[]" context="{'group_by':'availability'}"/> - <separator orientation="vertical"/> <filter string="Appreciation" icon="terp-face-plain" domain="[]" context="{'group_by':'priority'}"/> <filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}"/> <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/> <filter string="Source" icon="terp-face-plain" domain="[]" context="{'group_by':'source_id'}"/> - <separator orientation="vertical" groups="base.group_no_one"/> <filter string="Creation Date" icon="terp-go-month" domain="[]" context="{'group_by':'create_date'}" groups="base.group_no_one"/> </group> </search> diff --git a/addons/hr_recruitment/report/hr_recruitment_report_view.xml b/addons/hr_recruitment/report/hr_recruitment_report_view.xml index 9d81d39f240..afb87aba4ff 100644 --- a/addons/hr_recruitment/report/hr_recruitment_report_view.xml +++ b/addons/hr_recruitment/report/hr_recruitment_report_view.xml @@ -49,55 +49,32 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Recruitment Analysis"> - <group> - <filter string="New" - icon="terp-document-new" - domain="[('state','=','draft')]" - help = "Draft recruitment"/> - <filter string="In progress" - icon="terp-camera_test" - domain="[('state', '=' ,'open')]" - help = "In progress recruitment"/> - <filter string="Pending" - icon="terp-gtk-media-pause" - domain="[('state','=','pending')]" - help = "Pending recruitment"/> - <filter string="Hired" - icon="terp-camera_test" - domain="[('state','=','done')]" - help = "Hired employees"/> - <filter icon="terp-personal" - string="My Recruitment" - help="My Recruitment" - domain="[('user_id','=',uid)]"/> - <separator orientation="vertical"/> - <field name="job_id"/> - <field name="department_id" widget="selection"/> - <field name="user_id" string="Responsible"/> - </group> - <newline/> + <filter string="New" icon="terp-document-new" domain="[('state','=','draft')]" help = "Draft recruitment"/> + <filter string="In progress" icon="terp-camera_test" domain="[('state', '=' ,'open')]" help = "In progress recruitment"/> + <filter string="Pending" icon="terp-gtk-media-pause" domain="[('state','=','pending')]" help = "Pending recruitment"/> + <filter string="Hired" icon="terp-camera_test" domain="[('state','=','done')]" help = "Hired employees"/> + <separator/> + <filter icon="terp-personal" string="My Recruitment" help="My Recruitment" domain="[('user_id','=',uid)]"/> + <field name="job_id"/> + <field name="department_id"/> + <field name="user_id" string="Responsible"/> <group expand="0" string="Extended Filters..."> <!--field name="job_id"/--> <field name="priority"/> - <field name="stage_id" widget="selection"/> - <field name="company_id" widget="selection" groups="base.group_multi_company"/> + <field name="stage_id"/> + <field name="company_id" groups="base.group_multi_company"/> <field name="date" string="Creation Date"/> <field name="date_closed"/> </group> - <newline/> <group expand="1" string="Group By ..."> <filter string="Responsible" name='User' icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/> <filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/> <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}" /> - <separator orientation="vertical"/> - <filter string="Jobs" name="job" icon="terp-gtk-select-all" domain="[]" context="{'group_by':'job_id'}"/> + <filter string="Jobs" name="job" icon="terp-gtk-select-all" domain="[]" context="{'group_by':'job_id'}"/> <filter string="Department" name="department" icon="terp-personal+" domain="[]" context="{'group_by':'department_id'}"/> - <separator orientation="vertical"/> <filter string="Degree" name="degree" icon="terp-gtk-select-all" domain="[]" context="{'group_by':'type_id'}"/> - <separator orientation="vertical"/> <filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}" /> <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/> - <separator orientation="vertical"/> <filter string="Day" name = "day" icon="terp-go-today" domain="[]" context="{'group_by':'day'}" help="Creation Date"/> <filter string="Month" icon="terp-go-month" domain="[]" context="{'group_by':'month'}" help="Creation Date"/> <filter string="Year" icon="terp-go-year" domain="[]" context="{'group_by':'year'}" help="Creation Date"/> diff --git a/addons/hr_timesheet/hr_timesheet_view.xml b/addons/hr_timesheet/hr_timesheet_view.xml index 7875aff12a0..77dbc643a08 100644 --- a/addons/hr_timesheet/hr_timesheet_view.xml +++ b/addons/hr_timesheet/hr_timesheet_view.xml @@ -68,24 +68,17 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Timesheet"> - <group> - <field name="date"/> - <separator orientation="vertical"/> - <field name="user_id"/> - <field name="account_id"/> - </group> - <newline/> + <field name="date"/> + <field name="user_id"/> + <field name="account_id"/> <group expand="0" string="Group By..."> <filter string="Users" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/> - <separator orientation="vertical"/> <filter string="Analytic account" icon="terp-folder-green" domain="[]" context="{'group_by':'account_id'}"/> <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/> - <separator orientation="vertical"/> <filter string="Date" icon="terp-go-month" domain="[]" context="{'group_by':'date'}"/> </group> </search> </field> - </record> <record id="account_analytic_account_timesheet_form" model="ir.ui.view"> diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml index 81dc1e3c9cf..90305c772cb 100644 --- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml +++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml @@ -89,11 +89,11 @@ <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"> + <xpath expr="//filter[@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> + </xpath> </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> diff --git a/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml b/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml index 59b4ceb67a3..5048f2c9193 100644 --- a/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml +++ b/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml @@ -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/> + <filter icon="terp-personal" string="Non Assigned timesheets to users" help="Non Assigned timesheets to users" domain="[('user_id','=',False)]"/> + <field name="user_id"/> + <field name="account_id" groups="analytic.group_analytic_accounting"/> + <field name="product_id"/> <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="month"/> + <field name="user_id"/> </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="month"/> + <field name="account_id" groups="analytic.group_analytic_accounting"/> + <field name="user_id"/> </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="month"/> + <field name="account_id" groups="analytic.group_analytic_accounting"/> + <field name="user_id"/> </search> </field> </record> diff --git a/addons/hr_timesheet_invoice/report/report_analytic_view.xml b/addons/hr_timesheet_invoice/report/report_analytic_view.xml index c7d0c6b7c25..6dbbb85aea9 100644 --- a/addons/hr_timesheet_invoice/report/report_analytic_view.xml +++ b/addons/hr_timesheet_invoice/report/report_analytic_view.xml @@ -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="month"/> + <field name="product_id"/> + <field name="account_id" groups="analytic.group_analytic_accounting"/> </search> </field> </record> diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml index dbc9e1d6dac..86ef3255286 100644 --- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml +++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml @@ -23,11 +23,9 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Search Account"> - <group> - <field name="sheet_id" /> - <field name="name" groups="analytic.group_analytic_accounting"/> - <field name="invoice_rate"/> - </group> + <field name="name" groups="analytic.group_analytic_accounting"/> + <field name="invoice_rate"/> + <field name="sheet_id" /> </search> </field> </record> @@ -158,16 +156,11 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Search Timesheet"> - <group> - <field name="date_from"/> - <separator orientation="vertical"/> - <filter icon="terp-document-new" string="In Draft" domain="[('state','in',('draft', 'new'))]" help="Unvalidated Timesheets"/> - <filter icon="terp-camera_test" string="To Approve" domain="[('state','=','confirm')]" help="Confirmed Timesheets"/> - <separator orientation="vertical"/> - <field name="employee_id"/> - <field name="department_id" widget="selection"/> - </group> - <newline/> + <field name="date_from"/> + <filter icon="terp-document-new" string="In Draft" domain="[('state','in',('draft', 'new'))]" help="Unvalidated Timesheets"/> + <filter icon="terp-camera_test" string="To Approve" domain="[('state','=','confirm')]" help="Confirmed Timesheets"/> + <field name="employee_id"/> + <field name="department_id"/> <group expand="0" string="Group By..."> <filter string="Employees" icon="terp-personal" domain="[]" context="{'group_by':'employee_id'}"/> <filter string="Department" icon="terp-personal+" domain="[]" context="{'group_by':'department_id'}"/> diff --git a/addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml b/addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml index fd5d6b0b6d1..7492d94cba2 100644 --- a/addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml +++ b/addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml @@ -40,29 +40,21 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Timesheet"> - <group> - <field name="account_id" groups="analytic.group_analytic_accounting"/> - <field name="user_id"/> - </group> - <newline/> + <field name="account_id" groups="analytic.group_analytic_accounting"/> + <field name="user_id"/> <group expand="0" string="Extended Filters..."> <field name="general_account_id"/> <field name="product_id"/> <field name="journal_id"/> - <separator orientation="vertical"/> - <field name="company_id" widget="selection" groups="base.group_multi_company"/> - <newline/> + <field name="company_id" groups="base.group_multi_company"/> <field name="date" /> </group> - <newline/> <group expand="1" string="Group By..."> <filter string="User" name="group_user_id" icon="terp-personal" context="{'group_by':'user_id'}"/> <filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/> - <separator orientation="vertical" groups="analytic.group_analytic_accounting"/> <filter string="Analytic Account" icon="terp-folder-green" context="{'group_by':'account_id'}" groups="analytic.group_analytic_accounting"/> <filter string="General Account" icon="terp-folder-orange" context="{'group_by':'general_account_id'}"/> <filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/> - <separator orientation="vertical"/> <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}" help="Group by day of date"/> <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}" help="Group by month of date"/> <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}" help="Group by year of date"/> diff --git a/addons/hr_timesheet_sheet/report/timesheet_report_view.xml b/addons/hr_timesheet_sheet/report/timesheet_report_view.xml index 613f92d3cf6..9956ed2655e 100644 --- a/addons/hr_timesheet_sheet/report/timesheet_report_view.xml +++ b/addons/hr_timesheet_sheet/report/timesheet_report_view.xml @@ -48,51 +48,30 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Timesheet"> - <group> - <filter icon="terp-document-new" - string="Draft" - domain="[('state','=','draft')]"/> - <filter icon="terp-camera_test" - string="Confirmed" - domain="[('state','=','confirm')]"/> - <filter icon="terp-dialog-close" - string="Done" - domain="[('state','=','done')]"/> - <separator orientation="vertical"/> - <field name="account_id"/> - <field name="user_id" /> - </group> - <newline/> + <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]"/> + <filter icon="terp-camera_test" string="Confirmed" domain="[('state','=','confirm')]"/> + <filter icon="terp-dialog-close" string="Done" domain="[('state','=','done')]"/> + <field name="account_id"/> + <field name="user_id" /> <group expand="0" string="Extended Filters..."> <field name="general_account_id"/> - <field name="to_invoice" widget="selection"/> - <separator orientation="vertical"/> + <field name="to_invoice"/> <field name="product_id"/> - <separator orientation="vertical"/> - <field name="department_id" widget="selection"/> - <separator orientation="vertical"/> - <field name="company_id" widget="selection" groups="base.group_multi_company"/> - <newline/> + <field name="department_id"/> + <field name="company_id" groups="base.group_multi_company"/> <field name="date_current"/> <field name="date_to"/> <field name="date_from"/> </group> - <newline/> <group expand="1" string="Group By..."> <filter string="User" name="User_id" icon="terp-personal" context="{'group_by':'user_id'}"/> <filter string="Department" icon="terp-personal+" context="{'group_by':'department_id'}"/> - <separator orientation="vertical"/> <filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/> - <separator orientation="vertical"/> <filter string="Type of Invoicing" icon="terp-stock_symbol-selection" context="{'group_by':'to_invoice'}"/> - <separator orientation="vertical"/> <filter string="Analytic Account" icon="terp-folder-green" context="{'group_by':'account_id'}"/> <filter string="General Account" icon="terp-folder-orange" context="{'group_by':'general_account_id'}"/> - <separator orientation="vertical"/> <filter string="Status" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/> - <separator orientation="vertical"/> <filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/> - <separator orientation="vertical"/> <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}" help="Group by day of date"/> <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}" help="Group by month of date"/> <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}" help="Group by year of date"/> diff --git a/addons/idea/idea_view.xml b/addons/idea/idea_view.xml index ec7f0e6d328..4508301ca8c 100644 --- a/addons/idea/idea_view.xml +++ b/addons/idea/idea_view.xml @@ -110,22 +110,14 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Ideas"> - <group> - <field name="name" string="Idea"/> - <separator orientation="vertical"/> - <filter icon="terp-document-new" string="New" domain="[('state','=', 'draft')]" help="New Ideas"/> - <filter icon="terp-camera_test" string="In Progress" domain="[('state','=', 'open')]" help="Open Ideas"/> - <filter icon="terp-check" string="Accepted" - domain="[('state','=','close')]" help="Accepted Ideas" /> - <separator orientation="vertical"/> - <field name="category_ids"/> - </group> - <newline/> + <field name="name" string="Idea"/> + <filter icon="terp-document-new" string="New" domain="[('state','=', 'draft')]" help="New Ideas"/> + <filter icon="terp-camera_test" string="In Progress" domain="[('state','=', 'open')]" help="Open Ideas"/> + <filter icon="terp-check" string="Accepted" domain="[('state','=','close')]" help="Accepted Ideas" /> + <field name="category_ids"/> <group expand="0" string="Group By..."> <filter icon="terp-personal" string="Creator" help="By Creators" context="{'group_by':'create_uid'}"/> - <separator orientation="vertical"/> <filter icon="terp-stock_symbol-selection" string="Category" help="By Idea Category" context="{'group_by':'category_ids'}"/> - <separator orientation="vertical"/> <filter icon="terp-stock_effects-object-colorize" string="Status" help="By States" context="{'group_by':'state'}"/> </group> </search> diff --git a/addons/lunch/lunch_view.xml b/addons/lunch/lunch_view.xml index 5e870c085c9..d953dfbd1a9 100644 --- a/addons/lunch/lunch_view.xml +++ b/addons/lunch/lunch_view.xml @@ -76,12 +76,9 @@ <field name="arch" type="xml"> <search string="Search Lunch Order"> <field name="date"/> - <separator orientation="vertical"/> <filter icon="terp-check" string="To Confirm" domain="[('state','=','draft')]"/> <filter icon="terp-camera_test" string="Confirmed" domain="[('state','=',('confirmed'))]"/> - <separator orientation="vertical"/> <field name="user_id"/> - <newline/> <group expand="0" string="Group By..."> <filter string="Category" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'category'}"/> </group> @@ -192,12 +189,9 @@ <search string="Search CashMove"> <field name="create_date"/> <field name="user_cashmove"/> - <newline/> <group expand="0" string="Group By..."> <filter string="User" icon="terp-personal" domain="[]" context="{'group_by':'user_cashmove'}"/> - <separator orientation="vertical"/> <filter string="Box" icon="terp-dolar" domain="[]" context="{'group_by':'box'}"/> - <separator orientation="vertical"/> <filter string="Date" icon="terp-go-today" domain="[]" context="{'group_by':'create_date'}"/> </group> </search> @@ -301,8 +295,8 @@ <field name="arch" type="xml"> <search string="Products"> <field name="name" string="Product"/> - <field name="category_id"/> <field name="price"/> + <field name="category_id"/> </search> </field> </record> @@ -375,14 +369,10 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Box Amount by User"> - <group> - <field name="date"/> - <separator orientation="vertical"/> - <field name="user_id"/> - <field name="box"/> - <field name="amount"/> - </group> - <newline/> + <field name="date"/> + <field name="box"/> + <field name="amount"/> + <field name="user_id"/> <group expand="0" string="Group By..."> <filter string="Box" icon="terp-dolar" context="{'group_by':'box'}"/> </group> diff --git a/addons/lunch/report/report_lunch_order_view.xml b/addons/lunch/report/report_lunch_order_view.xml index 01de4be1354..717573687df 100644 --- a/addons/lunch/report/report_lunch_order_view.xml +++ b/addons/lunch/report/report_lunch_order_view.xml @@ -25,19 +25,14 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Lunch Order Analysis"> - <group> - <field name="date"/> - </group> - <newline/> + <field name="date"/> <group expand="0" string="Group By..."> <filter string="User" name="User" icon="terp-personal" context="{'group_by':'user_id'}"/> <filter string="Box" icon="terp-dolar" context="{'group_by':'box_name'}"/> - <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':'year'}"/> </group> - <newline/> </search> </field> </record> diff --git a/addons/mail/mail_group_view.xml b/addons/mail/mail_group_view.xml index c755209f952..bd01e50baa5 100644 --- a/addons/mail/mail_group_view.xml +++ b/addons/mail/mail_group_view.xml @@ -104,7 +104,6 @@ <field name="arch" type="xml"> <search string="Search Groups"> <field name="name" string="Group"/> - <separator orientation="vertical"/> <field name="responsible_id"/> </search> </field> diff --git a/addons/mail/mail_message_view.xml b/addons/mail/mail_message_view.xml index 986bb4bef38..b967035bec3 100644 --- a/addons/mail/mail_message_view.xml +++ b/addons/mail/mail_message_view.xml @@ -64,9 +64,7 @@ <field name="arch" type="xml"> <search string="Messages Search"> <field name="model" string="Message"/> - <separator orientation="vertical"/> <field name="date"/> - <separator orientation="vertical"/> <field name="user_id"/> </search> </field> @@ -80,7 +78,6 @@ <field name="priority">25</field> <field name="arch" type="xml"> <search string="Messages Search"> - <field name="user_id"/> <field name="subject" string="Content" filter_domain="['|', ('subject', 'ilike', self), ('body', 'ilike', self)]" /> <field name="type"/> <filter icon="terp-personal+" string="My Feeds" @@ -105,6 +102,7 @@ domain="[ ('date', '<=', datetime.date.today().strftime('%%Y-%%m-%%d 23:59:59')), ('date', '>=', (datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d 00:00:00')) ]"/> + <field name="user_id"/> </search> </field> </record> @@ -208,31 +206,26 @@ <field name="arch" type="xml"> <search string="Email Search"> <field name="email_from" filter_domain="['|' '|',('email_from','ilike',self), ('email_to','ilike',self), ('subject','ilike',self)]" string="Email"/> - <separator orientation="vertical"/> <field name="date"/> - <separator orientation="vertical"/> <filter icon="terp-camera_test" name="received" string="Received" domain="[('state','=','received')]"/> <filter icon="terp-call-start" name="outgoing" string="Outgoing" domain="[('state','=','outgoing')]"/> <filter icon="terp-check" name="sent" string="Sent" domain="[('state','=','sent')]"/> <filter icon="terp-gtk-stop" name="exception" string="Failed" domain="[('state','=','exception')]"/> + <separator/> <filter icon="terp-camera_test" name="type_email" string="Email" domain="[('type','=','email')]"/> <filter icon="terp-camera_test" name="type_comment" string="Comment" domain="[('type','=','comment')]"/> <filter icon="terp-camera_test" name="type_notification" string="Notification" domain="[('type','=','notification')]"/> - <newline/> <group expand="0" string="Extended Filters..."> <field name="user_id" string="User"/> <field name="partner_id" string="Partner Name"/> <field name="model"/> <field name="res_id"/> </group> - <newline/> <group expand="0" string="Group By..."> <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/> <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/> <filter string="User" name="User" icon="terp-personal" context="{'group_by':'user_id'}"/> - <separator orientation="vertical"/> <filter string="Thread" icon="terp-mail-" domain="[]" context="{'group_by':'message_id'}"/> - <separator orientation="vertical"/> <filter string="Month" help="Creation Month" icon="terp-go-month" domain="[]" context="{'group_by':'date'}"/> </group> </search> diff --git a/addons/marketing_campaign/marketing_campaign_view.xml b/addons/marketing_campaign/marketing_campaign_view.xml index 66a62c5b12d..d0823b93ab1 100644 --- a/addons/marketing_campaign/marketing_campaign_view.xml +++ b/addons/marketing_campaign/marketing_campaign_view.xml @@ -109,19 +109,15 @@ <field name="arch" type="xml"> <search string="Campaigns"> <field name="name" string="Campaign"/> - <separator orientation="vertical"/> <filter icon="terp-document-new" string="Draft" name="draft" domain="[('state','=','draft')]"/> <filter icon="terp-check" string="Running" domain="[('state','=','running')]"/> + <separator/> <filter icon="terp-gtk-jump-to-rtl" string="Test Mode" name="test" domain="[('mode','=','test')]"/> <filter icon="terp-gtk-jump-to-rtl" string="Manual Mode" domain="[('mode','=','manual')]"/> - <separator orientation="vertical"/> <field name="object_id" string="Resource"/> - <newline/> <group expand="0" string="Group By..."> <filter string="Resource" name="Object" icon="terp-accessories-archiver" context="{'group_by':'object_id'}"/> - <separator orientation="vertical"/> <filter string="Mode" name="Mode" icon="terp-gtk-jump-to-rtl" context="{'group_by':'mode'}"/> - <separator orientation="vertical"/> <filter string="Status" name="Status" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/> </group> </search> @@ -204,23 +200,18 @@ <field name="arch" type="xml"> <search string="Segments"> <field name="name" string="Segment"/> - <separator orientation="vertical"/> <field name="date_run"/> - <separator orientation="vertical"/> <filter icon="terp-check" string="Running" name="running" domain="[('state','=','running')]"/> <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]"/> + <separator/> <filter icon="terp-gtk-jump-to-ltr" string="Newly Created" help="Sync mode: only records created after last sync" domain="[('sync_mode','=','create_date')]"/> <filter icon="terp-stock_effects-object-colorize" string="Newly Modified" help="Sync mode: only records updated after last sync" domain="[('sync_mode','=','write_date')]"/> <filter icon="terp-emblem-documents" string="All" help="Sync mode: all records" domain="[('sync_mode','=','all')]"/> - <separator orientation="vertical"/> <field name="campaign_id"/> <field name="object_id"/> - <newline/> <group expand="0" string="Group By..."> <filter string="Campaign" name="Campaign" icon="terp-gtk-jump-to-rtl" context="{'group_by':'campaign_id'}"/> - <separator orientation="vertical"/> <filter string="Status" name="Status" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/> - <separator orientation="vertical"/> <filter string="Launch Date" name="Launch Date" icon="terp-go-month" context="{'group_by':'date_run'}"/> </group> </search> @@ -395,31 +386,22 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Marketing Campaign Activities"> - <group> - <field name="res_name" string="Marketing Campaign Activity"/> - <separator orientation="vertical"/> - <field name="date"/> - <separator orientation="vertical"/> - <filter icon="terp-gtk-go-back-rtl" string="To Do" name="todo" domain="[('state','=','todo')]"/> - <filter icon="terp-emblem-important" string="Exception" domain="[('state','=','exception')]"/> - <separator orientation="vertical"/> - <field name="campaign_id"/> - <field name="segment_id"/> - <field name="object_id"/> - <field name="partner_id"/> - <field name="res_id"/> - </group> - <newline/> + <field name="res_name" string="Marketing Campaign Activity"/> + <field name="date"/> + <filter icon="terp-gtk-go-back-rtl" string="To Do" name="todo" domain="[('state','=','todo')]"/> + <filter icon="terp-emblem-important" string="Exception" domain="[('state','=','exception')]"/> + <field name="campaign_id"/> + <field name="segment_id"/> + <field name="object_id"/> + <field name="partner_id"/> + <field name="res_id"/> <group expand="0" string="Group By..."> <filter string="Campaign" name="campaign" icon="terp-gtk-jump-to-rtl" context="{'group_by':'campaign_id'}"/> <filter string="Segment" name="segment" icon="terp-stock_symbol-selection" context="{'group_by':'segment_id'}"/> <filter string="Activity" name="activity" icon="terp-stock_align_left_24" context="{'group_by':'activity_id'}"/> - <separator orientation="vertical"/> <filter string="Resource" name="resource" icon="terp-accessories-archiver" context="{'group_by':'object_id'}"/> <filter string="Resource ID" name="res_id" icon="terp-accessories-archiver" context="{'group_by':'res_id'}"/> - <separator orientation="vertical"/> <filter string="Status" name="Status" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/> - <separator orientation="vertical"/> <filter string="Execution Date" name="Date" icon="terp-go-month" context="{'group_by':'date'}"/> </group> </search> diff --git a/addons/marketing_campaign/report/campaign_analysis_view.xml b/addons/marketing_campaign/report/campaign_analysis_view.xml index 7b3d848cc8b..30913f1b532 100644 --- a/addons/marketing_campaign/report/campaign_analysis_view.xml +++ b/addons/marketing_campaign/report/campaign_analysis_view.xml @@ -31,35 +31,22 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Campaign Analysis"> - <group> - <field name="date"/> - <separator orientation="vertical"/> - <filter icon="terp-gtk-go-back-rtl" - string="To Do" - domain="[('state','=','todo')]"/> - <filter icon="terp-dialog-close" - string="Done" - domain="[('state','=','done')]"/> - <filter icon="terp-emblem-important" - string="Exceptions" - domain="[('state','=','exception')]"/> - <separator orientation="vertical"/> - <field name="campaign_id"/> - <field name="activity_id"/> - <field name="segment_id"/> - <field name="partner_id"/> - <field name="country_id"/> - </group> - <newline/> + <field name="date"/> + <filter icon="terp-gtk-go-back-rtl" string="To Do" domain="[('state','=','todo')]"/> + <filter icon="terp-dialog-close" string="Done" domain="[('state','=','done')]"/> + <filter icon="terp-emblem-important" string="Exceptions" domain="[('state','=','exception')]"/> + <field name="campaign_id"/> + <field name="activity_id"/> + <field name="segment_id"/> + <field name="partner_id"/> + <field name="country_id"/> <group expand="0" string="Group By..."> <filter string="Campaign" name="Campaign" icon="terp-gtk-jump-to-rtl" context="{'group_by':'campaign_id'}" /> <filter string="Segment" name="Segment" icon="terp-stock_symbol-selection" context="{'group_by':'segment_id'}"/> <filter string="Activity" name="activity" icon="terp-stock_align_left_24" context="{'group_by':'activity_id'}"/> <filter string="Resource" icon="terp-accessories-archiver" context="{'group_by':'res_id'}"/> <filter string="Status" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/> - <separator orientation="vertical"/> <filter string="Partner" icon="terp-partner" context="{'group_by':'partner_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':'year'}"/> diff --git a/addons/membership/membership_view.xml b/addons/membership/membership_view.xml index 26fc7883ef1..a06bcfcce5e 100644 --- a/addons/membership/membership_view.xml +++ b/addons/membership/membership_view.xml @@ -13,14 +13,10 @@ <field name="arch" type="xml"> <search string="Membership Products"> <field name="name" filter_domain="['|',('name','ilike',self),('code','ilike',self)]" string="Membership Product"/> - <separator orientation="vertical"/> <filter string="Inactive" icon="terp-gdu-smart-failing" domain="[('active','=',0)]"/> - <separator orientation="vertical"/> - <field name="categ_id" widget="selection" operator="child_of"/> - <newline/> + <field name="categ_id" operator="child_of"/> <group expand='0' string='Group by...'> <filter string='Category' icon="terp-stock_symbol-selection" domain="[]" context="{'group_by' : 'categ_id'}"/> - <separator orientation="vertical"/> <filter string='Date From' icon="terp-go-month" domain="[]" context="{'group_by' : 'membership_date_from'}"/> </group> </search> @@ -171,17 +167,16 @@ <search string="Membership Partners"> <field name="membership_start" invisible="1"/> <field name="membership_stop" string="End Membership Date"/> - <separator orientation="vertical"/> <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"/> + <separator/> <filter icon="terp-personal" name="all_non_members" domain="[('membership_state', 'in', ['none','canceled','old','waiting'])]" string="All non Members" help="None/Canceled/Old/Waiting"/> <filter icon="terp-personal" name="all_members" domain="[('membership_state', 'in', ['invoiced','paid','free'])]" string="All Members" help="Invoiced/Paid/Free"/> <group expand="0" string="Group By..." colspan="10" col="8"> <filter string="Salesperson" icon="terp-personal" domain="[]" context="{'group_by' : 'user_id'}"/> <filter string="Associate Member" name = "associate" icon="terp-partner" domain="[]" context="{'group_by':'associate_member'}"/> - <separator orientation="vertical"/> <filter string=" Membership State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'membership_state'}"/> - <separator orientation="vertical"/> <filter string="Start Date" help="Starting Date Of Membership" icon="terp-go-month" domain="[]" context="{'group_by':'membership_start'}"/> <filter string="End Date" help="Ending Date Of Membership" icon="terp-go-month" domain="[]" context="{'group_by':'membership_stop'}"/> </group> diff --git a/addons/membership/report/report_membership_view.xml b/addons/membership/report/report_membership_view.xml index 51e1f2499b7..71e1c6f7876 100644 --- a/addons/membership/report/report_membership_view.xml +++ b/addons/membership/report/report_membership_view.xml @@ -35,31 +35,23 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Membership"> - <group> - <field name="date_from"/> - <separator orientation="vertical"/> - <filter string="Forecast" icon="terp-gtk-jump-to-ltr" context="{'waiting_invoiced_totpending_visible':0}" help="This will display waiting, invoiced and total pending columns"/> - <filter string="Revenue Done" name="Revenue" icon="terp-dolar" context="{'paid_old_totearned_visible':0}" help="This will display paid, old and total earned columns"/> - <separator orientation="vertical"/> - <field name="partner_id"/> - <field name="membership_id"/> - <field name="user_id"/> - </group> - <newline/> + <field name="date_from"/> + <filter string="Forecast" icon="terp-gtk-jump-to-ltr" context="{'waiting_invoiced_totpending_visible':0}" help="This will display waiting, invoiced and total pending columns"/> + <filter string="Revenue Done" name="Revenue" icon="terp-dolar" context="{'paid_old_totearned_visible':0}" help="This will display paid, old and total earned columns"/> + <field name="partner_id"/> + <field name="membership_id"/> + <field name="user_id"/> <group expand="1" string="Group By..."> <filter string="Salesperson" icon="terp-personal" name="salesman" domain="[]" context="{'group_by':'user_id'}"/> <filter string="Associated Partner" icon="terp-partner" name="associate_member_id" domain="[]" context="{'group_by':'associate_member_id'}"/> - <separator orientation="vertical"/> <filter string="Membership Product" icon="terp-accessories-archiver" name="product" domain="[]" context="{'group_by':'membership_id'}"/> <filter string="Current Membership State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'membership_state'}"/> - <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="Year" name="year" icon="terp-go-year" domain="[]" context="{'group_by':'year'}"/> <filter string="Month" name="month" icon="terp-go-month" diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml index 0449f590127..a197453c9a4 100644 --- a/addons/mrp/mrp_view.xml +++ b/addons/mrp/mrp_view.xml @@ -87,14 +87,10 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Search"> - <group> - <field name="name" string="Name"/> - <separator orientation="vertical"/> - <field name="group_id" widget="selection"/> - <field name="composition"/> - </group> - <newline/> - <group expand="0" string="Group By..."> + <field name="name" string="Name"/> + <field name="composition"/> + <field name="group_id" /> + <group expand="0" string="Group By..."> <filter string="Property Group" icon="terp-personal" domain="[]" context="{'group_by':'group_id'}"/> </group> </search> @@ -206,20 +202,14 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Search for mrp workcenter"> - <group> - <field name="name" string="Mrp Workcenter" filter_domain="['|',('name','ilike',self),('code','ilike',self)]"/> - <separator orientation="vertical"/> - <filter string="Inactive" icon="terp-gdu-smart-failing" domain="[('active','=',False)]"/> - <separator orientation="vertical"/> - <field name="resource_type"/> - </group> - <newline/> - <group expand="0" string="Group By..."> + <field name="name" string="Mrp Workcenter" filter_domain="['|',('name','ilike',self),('code','ilike',self)]"/> + <field name="resource_type"/> + <filter string="Inactive" icon="terp-gdu-smart-failing" domain="[('active','=',False)]"/> + <group expand="0" string="Group By..."> <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"/> - </group> - </search> + </group> + </search> </field> </record> @@ -311,9 +301,7 @@ <field name="arch" type="xml"> <search string="Routing"> <field name="name" string="Routing" filter_domain="['|',('name','ilike',self),('code','ilike',self)]"/> - <separator orientation="vertical"/> <filter string="Inactive" icon="terp-gdu-smart-failing" domain="[('active','=',False)]"/> - <separator orientation="vertical"/> <field name="location_id"/> <field name="company_id" groups="base.group_multi_company"/> <group expand="0" string="Group By..."> @@ -419,20 +407,14 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Search Bill Of Material"> - <group> - <field name="name" string="Bill Of Material" filter_domain="['|',('name','ilike',self),('code','ilike',self)]"/> - <separator orientation="vertical"/> - <field name="product_id"/> - <field name="company_id" groups="base.group_multi_company"/> - </group> - <newline/> + <field name="name" string="Bill Of Material" filter_domain="['|',('name','ilike',self),('code','ilike',self)]"/> + <field name="product_id"/> + <field name="company_id" groups="base.group_multi_company"/> <group expand="0" string="Group By..."> <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/> <filter string='Default Unit of Measure' icon="terp-mrp" domain="[]" context="{'group_by' : 'product_uom'}"/> - <separator orientation="vertical"/> <filter string="Routing" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'routing_id'}"/> <filter string='Type' icon="terp-stock_symbol-selection" domain="[]" context="{'group_by' : 'type'}"/> - <separator orientation="vertical"/> <filter string="Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_start'}" help="Starting Date"/> </group> </search> @@ -837,32 +819,22 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Search Production"> - <group> - <field name="name" string="Production" filter_domain="['|',('name','ilike',self),('origin','ilike',self)]"/> - <separator orientation="vertical"/> - <filter icon="terp-gtk-media-pause" string="Pending" name="pending" - domain="[('state','=','confirmed')]" - help="Manufacturing Orders which are waiting for raw materials."/> - <filter icon="terp-camera_test" string="Ready" name="ready" - domain="[('state','=','ready')]" - help="Manufacturing Orders which are ready to start production."/> - <filter icon="terp-check" string="In Production" name="inprogress" - domain="[('state','=','in_production')]" - help="Manufacturing Orders which are currently in production."/> - <filter icon="terp-gnome-cpu-frequency-applet+" string="Late" - domain="['&', ('date_planned','<', current_date), ('state', 'in', ('draft', 'confirmed', 'ready'))]" - help="Production started late"/> - <separator orientation="vertical"/> - <field name="product_id"/> - <field name="routing_id" groups="mrp.group_mrp_routings"/> - </group> - <newline/> + <field name="name" string="Production" filter_domain="['|',('name','ilike',self),('origin','ilike',self)]"/> + <filter icon="terp-gtk-media-pause" string="Pending" name="pending" domain="[('state','=','confirmed')]" + help="Manufacturing Orders which are waiting for raw materials."/> + <filter icon="terp-camera_test" string="Ready" name="ready" domain="[('state','=','ready')]" + help="Manufacturing Orders which are ready to start production."/> + <filter icon="terp-check" string="In Production" name="inprogress" domain="[('state','=','in_production')]" + help="Manufacturing Orders which are currently in production."/> + <separator/> + <filter icon="terp-gnome-cpu-frequency-applet+" string="Late" domain="['&', ('date_planned','<', current_date), ('state', 'in', ('draft', 'confirmed', 'ready'))]" + help="Production started late"/> + <field name="product_id"/> + <field name="routing_id" groups="mrp.group_mrp_routings"/> <group expand="0" string="Group By..."> <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/> - <separator orientation="vertical"/> <filter string="Routing" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'routing_id'}"/> <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/> - <separator orientation="vertical"/> <filter string="Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_planned'}" help="Scheduled Date"/> </group> </search> diff --git a/addons/mrp/report/mrp_report_view.xml b/addons/mrp/report/mrp_report_view.xml index eef6c89f702..99571903dde 100644 --- a/addons/mrp/report/mrp_report_view.xml +++ b/addons/mrp/report/mrp_report_view.xml @@ -37,8 +37,7 @@ <field name="arch" type="xml"> <search string="Work Center load"> <field name="name" string="Week"/> - <separator orientation="vertical"/> - <field name="workcenter_id" widget="selection"/> + <field name="workcenter_id"/> </search> </field> </record> diff --git a/addons/mrp_operations/mrp_operations_view.xml b/addons/mrp_operations/mrp_operations_view.xml index 2dccc92a51e..4e77100bb95 100644 --- a/addons/mrp_operations/mrp_operations_view.xml +++ b/addons/mrp_operations/mrp_operations_view.xml @@ -118,41 +118,30 @@ </record> <record id="view_mrp_production_workcenter_form_view_filter" model="ir.ui.view"> - <field name="name">mrp.production.workcenter.line.select</field> - <field name="model">mrp.production.workcenter.line</field> - <field name="type">search</field> - <field name="arch" type="xml"> - <search string="Search Work Orders"> - <group> - <field name="name" string="Work Orders"/> - <separator orientation="vertical"/> - <field name="date_planned"/> - <separator orientation="vertical"/> - <filter icon="terp-document-new" string="Draft" - domain="[('state','=','draft')]"/> - <filter icon="terp-check" string="In Progress" name="Current" - domain="[('state','=','startworking')]"/> - <filter icon="terp-gtk-media-pause" string="Pending" - domain="[('state','=','pause')]"/> - <filter icon="terp-gnome-cpu-frequency-applet+" string="Late" - domain="['&', ('date_planned','<', current_date), ('state', 'in', ('draft', 'confirmed', 'ready'))]" - help="Production started late"/> - <separator orientation="vertical"/> - <field name="workcenter_id" widget="selection"/> - <field name="production_id"/> - <field name="state"/> - </group> - <newline/> - <group expand="0" string="Group By..."> - <filter string="Work Center" icon="terp-go-home" domain="[]" context="{'group_by':'workcenter_id'}"/> - <filter string="Production" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'production_id'}"/> - <separator orientation="vertical"/> - <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/> - <separator orientation="vertical"/> - <filter string="Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_planned'}"/> - </group> - </search> - </field> + <field name="name">mrp.production.workcenter.line.select</field> + <field name="model">mrp.production.workcenter.line</field> + <field name="type">search</field> + <field name="arch" type="xml"> + <search string="Search Work Orders"> + <field name="name" string="Work Orders"/> + <field name="date_planned"/> + <field name="state"/> + <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]"/> + <filter icon="terp-check" string="In Progress" name="Current" domain="[('state','=','startworking')]"/> + <filter icon="terp-gtk-media-pause" string="Pending" domain="[('state','=','pause')]"/> + <separator/> + <filter icon="terp-gnome-cpu-frequency-applet+" string="Late" domain="['&', ('date_planned','<', current_date), ('state', 'in', ('draft', 'confirmed', 'ready'))]" + help="Production started late"/> + <field name="workcenter_id"/> + <field name="production_id"/> + <group expand="0" string="Group By..."> + <filter string="Work Center" icon="terp-go-home" domain="[]" context="{'group_by':'workcenter_id'}"/> + <filter string="Production" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'production_id'}"/> + <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/> + <filter string="Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_planned'}"/> + </group> + </search> + </field> </record> <record id="workcenter_line_calendar" model="ir.ui.view"> diff --git a/addons/mrp_operations/report/mrp_workorder_analysis_view.xml b/addons/mrp_operations/report/mrp_workorder_analysis_view.xml index c84de780ee0..0c9ee4c6726 100644 --- a/addons/mrp_operations/report/mrp_workorder_analysis_view.xml +++ b/addons/mrp_operations/report/mrp_workorder_analysis_view.xml @@ -46,32 +46,22 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Search"> - <group> - <field name="date"/> - <separator orientation="vertical"/> - <filter string="Current" icon="terp-check" domain="[('state','not in',('draft','cancel','done'))]"/> - <filter icon="terp-check" string="Started" domain="[('state','=','startworking')]"/> - <filter icon="terp-camera_test" string="Done" domain="[('state','=','done')]"/> - <separator orientation="vertical"/> - <field name="product_id" /> - <field name="workcenter_id"/> - </group> - <newline/> - <group expand="1" string="Group By..."> + <field name="date"/> + <filter string="Current" icon="terp-check" domain="[('state','not in',('draft','cancel','done'))]"/> + <filter icon="terp-check" string="Started" domain="[('state','=','startworking')]"/> + <filter icon="terp-camera_test" string="Done" domain="[('state','=','done')]"/> + <field name="product_id" /> + <field name="workcenter_id"/> + <group expand="1" string="Group By..."> <filter string="Product" name="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}" /> <filter string="Work Center" name="Workcenter" icon="terp-go-home" context="{'group_by':'workcenter_id'}" /> - <separator orientation="vertical"/> <filter string="Production" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'production_id'}"/> - <separator orientation="vertical"/> <filter string="Status" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/> - <separator orientation="vertical"/> <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}" help="Planned Day"/> - <separator orientation="vertical"/> <filter string="Month" name="terp-go-month" icon="terp-go-month" context="{'group_by':'month'}" help="Planned Month"/> - <separator orientation="vertical"/> <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}" help="Planned Year"/> - </group> - </search> + </group> + </search> </field> </record> <record id="action_report_mrp_workorder" model="ir.actions.act_window"> diff --git a/addons/mrp_repair/mrp_repair_view.xml b/addons/mrp_repair/mrp_repair_view.xml index 34d3ec0482b..24c8a0db2b2 100644 --- a/addons/mrp_repair/mrp_repair_view.xml +++ b/addons/mrp_repair/mrp_repair_view.xml @@ -189,30 +189,23 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Search Reair Orders"> - <group> - <field name="name" string="Reair Orders"/> - <separator orientation="vertical"/> - <filter icon="terp-document-new" string="Quotations" domain="[('state','=','draft')]"/> - <filter icon="terp-check" string="Confirmed" domain="[('state','=','confirmed')]" name="current" /> - <filter icon="terp-emblem-important" string="Ready To Repair" domain="[('state','=','ready')]"/> - <filter icon="terp-dolar" string="Invoiced" domain="[('invoiced','=',True)]"/> - <separator orientation="vertical"/> - <field name="product_id"/> - <field name="partner_id"/> - <field name="state"/> - </group> - <newline/> + <field name="name" string="Reair Orders"/> + <field name="state"/> + <filter icon="terp-document-new" string="Quotations" domain="[('state','=','draft')]"/> + <filter icon="terp-check" string="Confirmed" domain="[('state','=','confirmed')]" name="current" /> + <filter icon="terp-emblem-important" string="Ready To Repair" domain="[('state','=','ready')]"/> + <separator/> + <filter icon="terp-dolar" string="Invoiced" domain="[('invoiced','=',True)]"/> + <field name="product_id"/> + <field name="partner_id"/> <group expand="0" string="Group By..."> <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/> - <separator orientation="vertical"/> <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/> <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/> - <separator orientation="vertical"/> <filter string="Date" icon="terp-go-month" domain="[]" context="{'group_by':'guarantee_limit'}" help="Guarantee limit"/> - <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"/> </group> - </search> + </search> </field> </record> diff --git a/addons/multi_company/res_company_view.xml b/addons/multi_company/res_company_view.xml index 169f42d640e..5ea323175e6 100644 --- a/addons/multi_company/res_company_view.xml +++ b/addons/multi_company/res_company_view.xml @@ -51,9 +51,8 @@ <field name="arch" type="xml"> <search string="Multi Company"> <field name="name" string="Multi Company"/> - <separator orientation="vertical"/> - <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> diff --git a/addons/point_of_sale/account_statement_view.xml b/addons/point_of_sale/account_statement_view.xml index 3b3542bb777..8568c8d60d9 100644 --- a/addons/point_of_sale/account_statement_view.xml +++ b/addons/point_of_sale/account_statement_view.xml @@ -27,21 +27,13 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Search Cash Statements"> - <group> - <field name="name" string="Cash Statement"/> - <separator orientation="vertical"/> - <field name="date"/> - <separator orientation="vertical"/> - <filter string="Open" domain="[('state','=','open')]" icon="terp-document-new" name="open"/> - <separator orientation="vertical"/> - <field name="journal_id"/> - </group> - <newline/> + <field name="name" string="Cash Statement"/> + <field name="date"/> + <filter string="Open" domain="[('state','=','open')]" icon="terp-document-new" name="open"/> + <field name="journal_id"/> <group expand="0" string="Group By..."> <filter string="Journal" context="{'group_by': 'journal_id'}" icon="terp-folder-orange"/> - <separator orientation="vertical"/> <filter string="Period" context="{'group_by': 'period_id'}" icon="terp-go-month"/> - <separator orientation="vertical"/> <filter string="Status" context="{'group_by': 'state'}" icon="terp-stock_effects-object-colorize"/> </group> </search> @@ -54,22 +46,14 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Search Cash Statements"> - <group> - <field name="name" string="Cash Statement"/> - <separator orientation="vertical"/> - <field name="date"/> - <separator orientation="vertical"/> - <filter string="Open" domain="[('state','=','open')]" icon="terp-document-new" name="open"/> - <filter string="Closed" domain="[('state','=','confirm')]" icon="terp-camera_test"/> - <separator orientation="vertical"/> - <field name="journal_id"/> - </group> - <newline/> + <field name="name" string="Cash Statement"/> + <field name="date"/> + <filter string="Open" domain="[('state','=','open')]" icon="terp-document-new" name="open"/> + <filter string="Closed" domain="[('state','=','confirm')]" icon="terp-camera_test"/> + <field name="journal_id"/> <group expand="0" string="Group By..."> <filter string="Journal" context="{'group_by': 'journal_id'}" icon="terp-folder-orange"/> - <separator orientation="vertical"/> <filter string="Period" context="{'group_by': 'period_id'}" icon="terp-go-month"/> - <separator orientation="vertical"/> <filter string="Status" context="{'group_by': 'state'}" icon="terp-stock_effects-object-colorize"/> </group> </search> diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml index 6b1b9132344..fc0de4c9198 100644 --- a/addons/point_of_sale/point_of_sale_view.xml +++ b/addons/point_of_sale/point_of_sale_view.xml @@ -139,24 +139,19 @@ <field name="arch" type="xml"> <search string="Search Sales Order"> <field name="name" string="Sales Order"/> - <separator orientation="vertical"/> <field name="date_order"/> - <separator orientation="vertical"/> <filter icon="terp-document-new" string="New" domain="[('state','=','draft')]"/> <filter icon="gtk-apply" string="Done" domain="[('state','in',('paid','invoiced','done'))]"/> <filter icon="terp-check" string="Invoiced" domain="[('state','=','invoiced')]"/> <filter icon="gtk-convert" string="Posted" domain="[('state','=','done')]"/> - <separator orientation="vertical"/> <field name="user_id"/> <group expand="0" string="Group By..."> <filter string="Customer" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/> <filter string="Salesperson" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/> - <separator string="" orientation="vertical"/> <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/> - <separator string="" orientation="vertical"/> <filter string="Order Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_order'}"/> </group> - </search> + </search> </field> </record> @@ -835,12 +830,10 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Point of Sale Config"> + <field name="name" /> <filter string="Active" domain="[('state', '=', 'active')]" /> <filter string="Inactive" domain="[('state', '=', 'inactive')]" /> - <separator orientation="vertical"/> - <field name="name" /> <field name="shop_id" /> - </search> </field> </record> @@ -985,15 +978,12 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Point of Sale Session"> + <field name="name" /> <filter string="Open" domain="[('state', '=', 'opened')]" /> - <separator orientation="vertical"/> + <separator/> <filter string="Today" domain="[('start_at', '>=', time.strftime('%%Y-%%m-%%d 00:00:00'))]" /> - <separator orientation="vertical"/> <field name="config_id" /> - <field name="name" /> <field name="user_id" /> - - <newline /> <group expand="0" string="Group By..."> <filter string="User" icon="terp-personal" domain="[]" context="{'group_by' : 'user_id'}" /> <filter string="Point of Sales" domain="[]" context="{'group_by': 'user_id'}" /> @@ -1032,27 +1022,22 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Search Sales Order"> + <field name="name"/> + <field name="date_order"/> <filter icon="terp-document-new" string="New" domain="[('state','=','draft')]"/> <filter icon="gtk-apply" string="Done" domain="[('state','in',('paid','invoiced','done'))]"/> - <separator orientation="vertical"/> <filter icon="terp-check" string="Invoiced" domain="[('state','=','invoiced')]"/> <filter icon="gtk-convert" string="Posted" domain="[('state','=','done')]"/> - <separator orientation="vertical"/> - <field name="name"/> <field name="user_id"/> - <field name="date_order"/> <field name="session_id"/> - <newline/> <group expand="0" string="Group By..." groups="base.group_extended"> <filter string="Customer" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/> <filter string="Salesman" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/> <filter string="Session" icon="terp-personal" domain="[]" context="{'group_by':'session_id'}"/> - <separator string="" orientation="vertical"/> <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/> - <separator string="" orientation="vertical"/> <filter string="Order Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_order'}"/> </group> - </search> + </search> </field> </record> diff --git a/addons/point_of_sale/report/pos_order_report_view.xml b/addons/point_of_sale/report/pos_order_report_view.xml index 00e0eb91f2f..e103fe4e6c0 100644 --- a/addons/point_of_sale/report/pos_order_report_view.xml +++ b/addons/point_of_sale/report/pos_order_report_view.xml @@ -34,41 +34,24 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Point of Sale Analysis"> - <group> - <filter icon="terp-go-year" string="Year" name="year" - domain="[('year','=',time.strftime('%%Y'))]" - help="POS ordered created during current year"/> - <filter icon="terp-go-today" - string="Today" - name="today" - domain="[('date','=', time.strftime('%%Y-%%m-%%d'))]" - help="POS ordered created by today"/> - <separator orientation="vertical"/> - <filter icon="terp-dolar" - string="Invoiced" - domain="[('state','=',('invoiced'))]"/> - <filter icon="terp-dolar" - string="Not Invoiced" - domain="[('state','=',('paid'))]"/> - <separator orientation="vertical"/> - <field name="partner_id"/> - <field name="date"/> - <field name="user_id" widget="selection" /> - <filter icon="terp-personal" - string="My Sales" - help="My Sales" - domain="[('user_id','=',uid)]"/> - <separator orientation="vertical"/> - <field name="partner_id"/> - <field name="user_id" widget="selection"/> - </group> - <newline/> + <field name="date"/> + <filter icon="terp-dolar" string="Invoiced" domain="[('state','=',('invoiced'))]"/> + <filter icon="terp-dolar" string="Not Invoiced" domain="[('state','=',('paid'))]"/> + <separator/> + <filter icon="terp-go-year" string="Year" name="year" domain="[('year','=',time.strftime('%%Y'))]" help="POS ordered created during current year"/> + <separator/> + <filter icon="terp-go-today" string="Today" name="today" domain="[('date','=', time.strftime('%%Y-%%m-%%d'))]" + help="POS ordered created by today"/> + <separator/> + <filter icon="terp-personal" string="My Sales" help="My Sales" domain="[('user_id','=',uid)]"/> + <field name="partner_id"/> + <field name="user_id"/> + <field name="partner_id"/> + <field name="user_id"/> <group expand="1" string="Group By..."> <filter string="Salesperson" icon="terp-personal" name="User" context="{'group_by':'user_id'}"/> <filter string="Customer" icon="terp-personal" context="{'group_by':'partner_id'}"/> - <separator orientation="vertical"/> <filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/> - <separator orientation="vertical"/> <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}" help="Day of order date"/> <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}" help="Month of order date"/> <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}" help="Year of order date"/> diff --git a/addons/process/process_view.xml b/addons/process/process_view.xml index c5c152f9930..66dcb87289a 100644 --- a/addons/process/process_view.xml +++ b/addons/process/process_view.xml @@ -113,12 +113,8 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Search Process"> - <group> - <field name="name" string="Process"/> - <separator orientation="vertical"/> - <field name="model_id"/> - </group> - <newline/> + <field name="name" string="Process"/> + <field name="model_id"/> <group expand="0" string="Group By..."> <filter string="Object" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'model_id'}"/> </group> @@ -217,13 +213,9 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Search ProcessNode"> - <group> - <field name="name" string="Process Node"/> - <separator orientation="vertical"/> - <field name="model_id"/> - <field name="kind" /> - </group> - <newline/> + <field name="name" string="Process Node"/> + <field name="kind" /> + <field name="model_id"/> <group expand="0" string="Group By..."> <filter string="Object" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'model_id'}"/> <filter string="Kind Of Node" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'kind'}"/> @@ -310,12 +302,9 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Search Process Transition"> - <group> - <field name="name" string="Process Transition"/> - <separator orientation="vertical"/> - <field name="source_node_id"/> - <field name="target_node_id"/> - </group> + <field name="name" string="Process Transition"/> + <field name="source_node_id"/> + <field name="target_node_id"/> <!-- <newline/> <group expand="0" string="Group By..." colspan="4" col="4"> diff --git a/addons/procurement/procurement_view.xml b/addons/procurement/procurement_view.xml index fe2b1d0ca69..93e7a39088a 100644 --- a/addons/procurement/procurement_view.xml +++ b/addons/procurement/procurement_view.xml @@ -117,22 +117,16 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Search Procurement"> - <group> - <field name="origin" string="Procurement"/> - <separator orientation="vertical"/> - <field name="date_planned"/> - <separator orientation="vertical"/> - <filter icon="terp-emblem-important" string="Exceptions" name="exceptions" domain="[('state','=','exception')]" help="Procurement Exceptions"/> - <filter icon="terp-emblem-important" string="To Fix" name="perm_exceptions" domain="[('state','=','exception'),('message', '!=', '')]" help="Permanent Procurement Exceptions"/> - <filter icon="terp-emblem-important" string="Temporary" name="temp_exceptions" domain="[('state','=','exception'),('message', '=', '')]" help="Temporary Procurement Exceptions"/> - <filter icon="terp-gnome-cpu-frequency-applet+" string="Late" - domain="['&', ('date_planned','<', current_date), ('state', 'in', ('draft', 'confirmed'))]" - help="Procurement started late" /> - <separator orientation="vertical"/> - <field name="product_id" /> - <field name="state" /> - </group> - <newline/> + <field name="origin" string="Procurement"/> + <field name="date_planned"/> + <filter icon="terp-emblem-important" string="Exceptions" name="exceptions" domain="[('state','=','exception')]" help="Procurement Exceptions"/> + <separator/> + <filter icon="terp-emblem-important" string="To Fix" name="perm_exceptions" domain="[('state','=','exception'),('message', '!=', '')]" help="Permanent Procurement Exceptions"/> + <filter icon="terp-emblem-important" string="Temporary" name="temp_exceptions" domain="[('state','=','exception'),('message', '=', '')]" help="Temporary Procurement Exceptions"/> + <separator/> + <filter icon="terp-gnome-cpu-frequency-applet+" string="Late" domain="['&', ('date_planned','<', current_date), ('state', 'in', ('draft', 'confirmed'))]" help="Procurement started late" /> + <field name="product_id" /> + <field name="state" /> <group expand="0" string="Group By"> <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/> <filter string="Reason" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'name'}"/> @@ -198,15 +192,11 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Reordering Rules Search"> - <group> - <field name="name" string="Reordering Rules"/> - <separator orientation="vertical"/> - <field name="warehouse_id" widget="selection"/> - <field name="location_id" groups="stock.group_locations"/> - <field name="company_id" widget="selection" groups="base.group_multi_company"/> - <field name="product_id"/> - </group> - <newline/> + <field name="name" string="Reordering Rules"/> + <field name="warehouse_id"/> + <field name="location_id" groups="stock.group_locations"/> + <field name="company_id" groups="base.group_multi_company"/> + <field name="product_id"/> <group expand="0" string="Group By..."> <filter string="Warehouse" icon="terp-go-home" domain="[]" context="{'group_by':'warehouse_id'}"/> <filter string="Location" icon="terp-go-home" domain="[]" context="{'group_by':'location_id'}"/> diff --git a/addons/product/pricelist_view.xml b/addons/product/pricelist_view.xml index 0492881d9bd..529add848bf 100644 --- a/addons/product/pricelist_view.xml +++ b/addons/product/pricelist_view.xml @@ -113,10 +113,9 @@ <field name="arch" type="xml"> <search string="Products Price Search"> <field name="name" string="Products Price"/> - <separator orientation="vertical"/> - <field name="currency_id"/> <field name="type"/> <field name="active" /> + <field name="currency_id"/> </search> </field> </record> diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml index a2ec5a9d343..e182cb01bed 100644 --- a/addons/product/product_view.xml +++ b/addons/product/product_view.xml @@ -10,29 +10,25 @@ <field name="arch" type="xml"> <search string="Product"> <field name="name" string="Product" filter_domain="['|',('name','ilike',self),('default_code','ilike',self)]"/> - <separator orientation="vertical"/> <filter string="Services" icon="terp-accessories-archiver" domain="[('type','=','service')]"/> <filter string="Products" icon="terp-accessories-archiver" domain="['|',('type','=','product'),('type','=','consu')]" help="Both stockable and consumable products"/> + <separator/> + <filter string="To Sell" name="filter_to_sell" icon="terp-accessories-archiver-minus" domain="[('sale_ok','=',1)]"/> + <separator/> + <filter name="filter_to_purchase" string="To Purchase" icon="terp-accessories-archiver+" domain="[('purchase_ok', '=', 1)]"/> <filter string="Can be Sold" name="filter_to_sell" icon="terp-accessories-archiver-minus" domain="[('sale_ok','=',1)]"/> <filter name="filter_to_purchase" string="Can be Purchased" icon="terp-accessories-archiver+" domain="[('purchase_ok', '=', 1)]"/> - <separator orientation="vertical"/> - <field name="categ_id" widget="selection" operator="child_of"/> + <field name="categ_id" operator="child_of"/> <group expand="0" string="Context..."> - <field name="pricelist_id" widget="selection" context="{'pricelist': self}" groups="product.group_sale_pricelist"/> - <separator orientation="vertical" groups="base.group_multi_company"/> - <field name="company_id" widget="selection" groups="base.group_multi_company"/> + <field name="pricelist_id" context="{'pricelist': self}" groups="product.group_sale_pricelist"/> + <field name="company_id" groups="base.group_multi_company"/> </group> - <newline/> <group expand='0' string='Group by...'> <filter string='Category' icon="terp-stock_symbol-selection" domain="[]" context="{'group_by' : 'categ_id'}"/> - <separator orientation="vertical"/> <filter string='Default Unit of Measure' icon="terp-mrp" domain="[]" context="{'group_by' : 'uom_id'}"/> - <separator orientation="vertical"/> <filter string='Type' icon="terp-stock_symbol-selection" domain="[]" context="{'group_by' : '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"/> </group> - </search> </field> </record> @@ -301,7 +297,6 @@ <field name="arch" type="xml"> <search string="Product Categories"> <field name="name" string="Product Categories"/> - <separator orientation="vertical"/> <field name="parent_id"/> </search> </field> diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml index 8d35bf69db7..ae86f9712a3 100644 --- a/addons/project/project_view.xml +++ b/addons/project/project_view.xml @@ -155,28 +155,21 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Search Project"> - <group> - <field name="complete_name" string="Project Name"/> - <separator orientation="vertical"/> - <filter icon="terp-mail-message-new" - string="Inbox" help="Unread messages" - name="needaction_pending" - domain="[('needaction_pending','=',True)]"/> - <separator orientation="vertical"/> - <filter icon="terp-check" string="Open" name="Current" domain="[('state', '=','open')]" help="Open Projects"/> - <filter icon="gtk-media-pause" string="Pending" name="Pending" domain="[('state', '=','pending')]" help="Pending Projects"/> - <filter icon="gtk-media-pause" string="Template" name="Template" domain="[('state', '=','template')]" help="Templates of Projects"/> - <filter icon="terp-personal+" string="Member" domain="['|',('user_id', '=', uid),('members', '=', uid)]" help="Projects in which I am a member."/> - <filter string="Project(s) Manager" domain="[('user_id','=',uid)]" help="Projects in which I am a manager" icon="terp-personal"/> - <separator orientation="vertical"/> - <field name="user_id" string="Project Manager"/> - <field name="partner_id" string="Partner"/> - </group> - <newline/> + <field name="complete_name" string="Project Name"/> + <filter icon="terp-mail-message-new" string="Inbox" help="Unread messages" name="needaction_pending" domain="[('needaction_pending','=',True)]"/> + <separator/> + <filter icon="terp-check" string="Open" name="Current" domain="[('state', '=','open')]" help="Open Projects"/> + <filter icon="gtk-media-pause" string="Pending" name="Pending" domain="[('state', '=','pending')]" help="Pending Projects"/> + <filter icon="gtk-media-pause" string="Template" name="Template" domain="[('state', '=','template')]" help="Templates of Projects"/> + <separator/> + <filter icon="terp-personal+" string="Member" domain="['|',('user_id', '=', uid),('members', '=', uid)]" help="Projects in which I am a member."/> + <separator/> + <filter string="Project(s) Manager" domain="[('user_id','=',uid)]" help="Projects in which I am a manager" icon="terp-personal"/> + <field name="user_id" string="Project Manager"/> + <field name="partner_id" string="Partner"/> <group expand="0" string="Group By..."> <filter string="Manager" name="Manager" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/> <filter string="Partner" name="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/> - <separator orientation="vertical"/> <filter string="Parent" name="Parent" help="Parent" icon="terp-folder-blue" domain = "[]" context="{'group_by':'parent_id'}"/> </group> </search> @@ -644,37 +637,28 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Tasks"> - <group> - <field name="name" string="Tasks"/> - <separator orientation="vertical"/> - <filter icon="terp-mail-message-new" - string="Inbox" help="Unread messages" - name="needaction_pending" - domain="[('needaction_pending','=',True)]"/> - <separator orientation="vertical"/> - <filter name="draft" string="New" domain="[('state','=','draft')]" help="New Tasks" icon="terp-check"/> - <filter name="open" string="In Progress" domain="[('state','=','open')]" help="In Progress Tasks" icon="terp-camera_test"/> - <filter string="Pending" domain="[('state','=','pending')]" context="{'show_delegated':False}" help="Pending Tasks" icon="terp-gtk-media-pause"/> - <filter name="project" string="Project" domain="[('project_id.user_id','=',uid)]" help="My Projects" icon="terp-check"/> - <filter string="My Tasks" domain="[('user_id','=',uid)]" help="My Tasks" icon="terp-personal"/> - <filter string="Unassigned Tasks" domain="[('user_id','=',False)]" help="Unassigned Tasks" icon="terp-personal-"/> - <filter string="Deadlines" context="{'deadline_visible': False}" domain="[('date_deadline','<>',False)]" - help="Show only tasks having a deadline" icon="terp-gnome-cpu-frequency-applet+"/> - <separator orientation="vertical"/> - <field name="project_id"/> - <field name="user_id"/> - </group> - <newline/> + <field name="name" string="Tasks"/> + <filter icon="terp-mail-message-new" string="Inbox" help="Unread messages" name="needaction_pending" domain="[('needaction_pending','=',True)]"/> + <separator/> + <filter name="draft" string="New" domain="[('state','=','draft')]" help="New Tasks" icon="terp-check"/> + <filter name="open" string="In Progress" domain="[('state','=','open')]" help="In Progress Tasks" icon="terp-camera_test"/> + <filter string="Pending" domain="[('state','=','pending')]" context="{'show_delegated':False}" help="Pending Tasks" icon="terp-gtk-media-pause"/> + <separator/> + <filter name="My project" string="Project" domain="[('project_id.user_id','=',uid)]" help="My Projects" icon="terp-check"/> + <separator/> + <filter string="My Tasks" domain="[('user_id','=',uid)]" help="My Tasks" icon="terp-personal"/> + <filter string="Unassigned Tasks" domain="[('user_id','=',False)]" help="Unassigned Tasks" icon="terp-personal-"/> + <separator/> + <filter string="Deadlines" context="{'deadline_visible': False}" domain="[('date_deadline','<>',False)]" + help="Show only tasks having a deadline" icon="terp-gnome-cpu-frequency-applet+"/> + <field name="project_id"/> + <field name="user_id"/> <group expand="0" string="Group By..."> <filter string="Users" name="group_user_id" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/> - <separator orientation="vertical"/> <filter string="Project" name="group_project_id" icon="terp-folder-violet" domain="[]" context="{'group_by':'project_id'}"/> - <separator orientation="vertical"/> <filter string="Stage" name="group_stage_id" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}"/> <filter string="Status" name="group_state" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/> - <separator orientation="vertical"/> <filter string="Deadline" icon="terp-gnome-cpu-frequency-applet+" domain="[]" context="{'group_by':'date_deadline'}"/> - <separator orientation="vertical" groups="base.group_no_one"/> <filter string="Start Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_start'}" groups="base.group_no_one"/> <filter string="End Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_end'}" groups="base.group_no_one"/> </group> @@ -756,11 +740,8 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Tasks Stages"> - <group> - <field name="name" string="Tasks Stages"/> - <separator orientation="vertical"/> - <filter icon="terp-check" string="Common" name="common" domain="[('case_default', '=', 1)]" help="Stages common to all projects"/> - </group> + <field name="name" string="Tasks Stages"/> + <filter icon="terp-check" string="Common" name="common" domain="[('case_default', '=', 1)]" help="Stages common to all projects"/> </search> </field> </record> diff --git a/addons/project/report/project_cumulative.xml b/addons/project/report/project_cumulative.xml index 3f7f3b26d96..ae87b3f2fe2 100644 --- a/addons/project/report/project_cumulative.xml +++ b/addons/project/report/project_cumulative.xml @@ -53,21 +53,20 @@ <field name="model">project.task.history.cumulative</field> <field name="type">search</field> <field name="arch" type="xml"> - <search string="Task's Analysis"> - <group> - <field name="date"/> - <separator orientation="vertical"/> - <filter name="open" string="In Progress" domain="[('state','in',('open','draft'))]" help="In Progress Tasks" icon="terp-camera_test"/> - <filter string="Pending" domain="[('state','=','pending')]" context="{'show_delegated':False}" help="Pending Tasks" icon="terp-gtk-media-pause"/> - <filter name="kanban_blocked" string="Blocked" domain="[('kanban_state','=','blocked')]" icon="terp-gtk-media-pause"/> - <filter name="kanban_ready" string="Ready" domain="[('kanban_state','=','done')]" icon="terp-camera_test"/> - <filter string="My Tasks" domain="[('user_id','=',uid)]" help="My Tasks" icon="terp-personal" /> - <filter string="Unassigned Tasks" domain="[('user_id','=',False)]" help="Unassigned Tasks" icon="terp-personal-" /> - <filter string="My Projects" domain="[('project_id.user_id','=',uid)]" help="My Projects" icon="terp-personal"/> - <separator orientation="vertical"/> - <field name="project_id"/> - <field name="user_id"/> - </group> + <search string="Task's Analysis"> + <field name="date"/> + <filter name="open" string="In Progress" domain="[('state','in',('open','draft'))]" help="In Progress Tasks" icon="terp-camera_test"/> + <filter string="Pending" domain="[('state','=','pending')]" context="{'show_delegated':False}" help="Pending Tasks" icon="terp-gtk-media-pause"/> + <separator/> + <filter name="kanban_blocked" string="Blocked" domain="[('kanban_state','=','blocked')]" icon="terp-gtk-media-pause"/> + <filter name="kanban_ready" string="Ready" domain="[('kanban_state','=','done')]" icon="terp-camera_test"/> + <separator/> + <filter string="My Tasks" domain="[('user_id','=',uid)]" help="My Tasks" icon="terp-personal" /> + <filter string="Unassigned Tasks" domain="[('user_id','=',False)]" help="Unassigned Tasks" icon="terp-personal-" /> + <separator/> + <filter string="My Projects" domain="[('project_id.user_id','=',uid)]" help="My Projects" icon="terp-personal"/> + <field name="project_id"/> + <field name="user_id"/> </search> </field> </record> diff --git a/addons/project/report/project_report_view.xml b/addons/project/report/project_report_view.xml index 40235ad03b7..ab880536ced 100644 --- a/addons/project/report/project_report_view.xml +++ b/addons/project/report/project_report_view.xml @@ -58,60 +58,32 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Tasks Analysis"> - <group> - <field name="date_start"/> - <field name="date_end"/> - <field name="date_deadline"/> - <separator orientation="vertical"/> - <filter string="New" - icon="terp-document-new" - domain="[('state','=','draft')]" - help = "New tasks"/> - <filter string="In progress" - icon="terp-check" - domain="[('state', '=' ,'open')]" - help = "In progress tasks"/> - <filter string="Pending" - icon="terp-gtk-media-pause" - domain="[('state','=','pending')]" - help = "Pending tasks"/> - <filter string="Done" - icon="terp-dialog-close" - name="done" - domain="[('state','=','done')]"/> - <filter icon="terp-folder-violet" - string="My Projects" - help="My Projects" domain="[('project_id.user_id','=',uid)]"/> - <filter icon="terp-personal" - string="My Task" - help = "My tasks" - domain="[('user_id','=',uid)]" /> - <filter icon="terp-personal-" - string="Non Assigned Tasks to users" - help="Non Assigned Tasks to users" - domain="[('user_id','=',False)]"/> - <separator orientation="vertical"/> - <field name="project_id"/> - <field name="user_id" widget="selection"/> - <field name="partner_id" /> - </group> - <newline/> + <field name="date_start"/> + <field name="date_end"/> + <field name="date_deadline"/> + <filter string="New" icon="terp-document-new" domain="[('state','=','draft')]" help = "New tasks"/> + <filter string="In progress" icon="terp-check" domain="[('state', '=' ,'open')]" help = "In progress tasks"/> + <filter string="Pending" icon="terp-gtk-media-pause" domain="[('state','=','pending')]" help = "Pending tasks"/> + <filter string="Done" icon="terp-dialog-close" name="done" domain="[('state','=','done')]"/> + <separator/> + <filter icon="terp-folder-violet" string="My Projects" help="My Projects" domain="[('project_id.user_id','=',uid)]"/> + <separator/> + <filter icon="terp-personal" string="My Task" help = "My tasks" domain="[('user_id','=',uid)]" /> + <filter icon="terp-personal-" string="Non Assigned Tasks to users" help="Non Assigned Tasks to users" domain="[('user_id','=',False)]"/> + <field name="project_id"/> + <field name="user_id"/> + <field name="partner_id" /> <group expand="0" string="Extended Filters..."> <field name="priority"/> - <separator orientation="vertical"/> - <field name="company_id" groups="base.group_multi_company" widget="selection"/> + <field name="company_id" groups="base.group_multi_company"/> </group> - <newline/> <group expand="1" string="Group By..."> <filter string="Project" name="project" icon="terp-folder-violet" context="{'group_by':'project_id'}"/> <filter string="Task" icon="terp-stock_align_left_24" context="{'group_by':'name'}" /> - <separator orientation="vertical"/> <filter string="Partner" icon="terp-partner" context="{'group_by':'partner_id'}" /> <filter string="Assigned to" name="User" icon="terp-personal" context="{'group_by':'user_id'}" /> - <separator orientation="vertical"/> <filter string="Status" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/> <filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/> - <separator orientation="vertical"/> <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}" help="Creation Date"/> <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}" help="Creation Date"/> <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}" help="Creation Date"/> diff --git a/addons/project/res_partner_view.xml b/addons/project/res_partner_view.xml index 09170c43434..e16c18d1582 100644 --- a/addons/project/res_partner_view.xml +++ b/addons/project/res_partner_view.xml @@ -28,7 +28,5 @@ </xpath> </field> </record> - </data> </openerp> - diff --git a/addons/project_gtd/project_gtd_view.xml b/addons/project_gtd/project_gtd_view.xml index 5b48f6b4648..cce02ab329d 100644 --- a/addons/project_gtd/project_gtd_view.xml +++ b/addons/project_gtd/project_gtd_view.xml @@ -112,9 +112,9 @@ <field name="arch" type="xml"> <search string="My Tasks"> <field name="name" string="My Tasks"/> - <separator orientation="vertical"/> <filter name="open" string="In Progress" domain="[('state','in',('draft','open'))]" help="In Progress and draft tasks" icon="terp-camera_test"/> <filter string="Pending" domain="[('state','=','pending')]" context="{'show_delegated':False}" help="Pending Tasks" icon="terp-gtk-media-pause"/> + <separator/> <filter string="Inbox" domain="[('timebox_id','=', False)]" help="Tasks having no timebox assigned yet"/> <group expand="0" string="Display"> <filter string="Show Context" name="context_show" context="{'context_show': True}" domain="[]" icon="terp-camera_test" help="Show the context field"/> diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml index 4cd5bb9ba6a..c7e73010b8b 100644 --- a/addons/project_issue/project_issue_view.xml +++ b/addons/project_issue/project_issue_view.xml @@ -48,7 +48,6 @@ <field name="arch" type="xml"> <search string="Issue Version"> <field name="name" string="Issue Version"/> - <separator orientation="vertical"/> <field name="active"/> </search> </field> @@ -204,46 +203,26 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Issue Tracker Search"> - <group> - <field name="name" string="Issue" filter_domain="['|', '|',('partner_id','ilike',self),('email_from','ilike',self),('name','ilike',self)]"/> - <separator orientation="vertical"/> - <filter icon="terp-mail-message-new" - string="Inbox" help="Unread messages" - name="needaction_pending" - domain="[('needaction_pending','=',True)]"/> - <separator orientation="vertical"/> - <filter string="New" icon="terp-document-new" domain="[('state','=','draft')]" help="New Issues"/> - <filter string="To Do" domain="[('state','=','open')]" help="To Do Issues" icon="terp-check"/> - <filter string="Unassigned Issues" domain="[('user_id','=',False)]" help="Unassigned Issues" icon="terp-personal-"/> - <separator orientation="vertical"/> - <field name="user_id"/> - <field name="project_id"/> - <separator orientation="vertical"/> - <field name="id"/> - </group> - <newline/> + <field name="name" string="Issue" filter_domain="['|', '|',('partner_id','ilike',self),('email_from','ilike',self),('name','ilike',self)]"/> + <field name="id"/> + <filter icon="terp-mail-message-new" string="Inbox" help="Unread messages" name="needaction_pending" domain="[('needaction_pending','=',True)]"/> + <separator/> + <filter string="New" icon="terp-document-new" domain="[('state','=','draft')]" help="New Issues"/> + <filter string="To Do" domain="[('state','=','open')]" help="To Do Issues" icon="terp-check"/> + <separator/> + <filter string="Unassigned Issues" domain="[('user_id','=',False)]" help="Unassigned Issues" icon="terp-personal-" /> + <field name="user_id"/> + <field name="project_id"/> <group expand="0" string="Group By..." > - <filter string="Responsible" icon="terp-personal" - domain="[]" context="{'group_by':'user_id'}"/> - <filter string="Partner" icon="terp-partner" domain="[]" - context="{'group_by':'partner_id'}"/> - <separator orientation="vertical"/> - <filter string="Project" icon="terp-folder-violet" domain="[]" - context="{'group_by':'project_id'}"/> - <filter string="Version" icon="terp-gtk-jump-to-rtl" - domain="[]" context="{'group_by':'version_id'}"/> - <separator orientation="vertical"/> - <filter string="Category" icon="terp-stock_symbol-selection" domain="[]" - context="{'group_by':'categ_ids'}"/> - <filter string="Priority" icon="terp-rating-rated" domain="[]" - context="{'group_by':'priority'}"/> - <filter string="Stage" icon="terp-stage" domain="[]" - context="{'group_by':'stage_id'}"/> - <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" - context="{'group_by':'state'}"/> - <separator orientation="vertical"/> - <filter string="Month" icon="terp-go-month" - domain="[]" context="{'group_by':'create_date'}" help="Creation Month"/> + <filter string="Responsible" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/> + <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/> + <filter string="Project" icon="terp-folder-violet" domain="[]" context="{'group_by':'project_id'}"/> + <filter string="Version" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'version_id'}"/> + <filter string="Category" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'categ_id'}"/> + <filter string="Priority" icon="terp-rating-rated" domain="[]" context="{'group_by':'priority'}"/> + <filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}"/> + <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/> + <filter string="Month" icon="terp-go-month" domain="[]" context="{'group_by':'create_date'}" help="Creation Month"/> </group> </search> </field> @@ -363,18 +342,13 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Feature Tracker Search"> - <group> - <field name="name" string="Feature description"/> - <separator orientation="vertical"/> - <field name="date"/> - <separator orientation="vertical"/> - <filter icon="terp-check" domain="[('state','in',('open','draft'))]" help="Current Features" name="current_feature"/> - <filter icon="terp-camera_test" domain="[('state','=','open')]" help="Open Features"/> - <separator orientation="vertical"/> - <field name="user_id"/> - <field name="project_id" string="Project"/> - <field name="state" groups="base.group_no_one"/> - </group> + <field name="name" string="Feature description"/> + <field name="date"/> + <field name="state" groups="base.group_no_one"/> + <filter icon="terp-check" domain="[('state','in',('open','draft'))]" help="Current Features" name="current_feature"/> + <filter icon="terp-camera_test" domain="[('state','=','open')]" help="Open Features"/> + <field name="user_id"/> + <field name="project_id" string="Project"/> </search> </field> </record> diff --git a/addons/project_issue/report/project_issue_report_view.xml b/addons/project_issue/report/project_issue_report_view.xml index d01acd6f558..c1ae69517c2 100644 --- a/addons/project_issue/report/project_issue_report_view.xml +++ b/addons/project_issue/report/project_issue_report_view.xml @@ -51,61 +51,30 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Search"> - <group> - <field name="creation_date"/> - <separator orientation="vertical" /> - <filter icon="terp-camera_test" - string="New" - domain="[('state','=','draft')]"/> - <filter icon="terp-check" - string="To Do" - domain="[('state','=','open')]"/> - <filter icon="terp-gtk-media-pause" - string="Pending" - domain="[('state','=','pending')]"/> - <filter icon="terp-dialog-close" - string="Done" - domain="[('state','=','done')]"/> - <separator orientation="vertical" /> - <field name="project_id"/> - <field name="user_id" widget="selection"/> - <field name="partner_id"/> - <field name="version_id" widget="selection" /> - </group> - <newline/> - <group expand="1" string="Group By..."> - <filter string="Assigned to" name="Responsible" icon="terp-personal" - domain="[]" context="{'group_by':'user_id'}" /> + <field name="creation_date"/> + <filter icon="terp-camera_test" string="New" domain="[('state','=','draft')]"/> + <filter icon="terp-check" string="To Do" domain="[('state','=','open')]"/> + <filter icon="terp-gtk-media-pause" string="Pending" domain="[('state','=','pending')]"/> + <filter icon="terp-dialog-close" string="Done" domain="[('state','=','done')]"/> + <field name="project_id"/> + <field name="user_id"/> + <field name="partner_id"/> + <field name="version_id"/> + <group expand="1" string="Group By..."> + <filter string="Assigned to" name="Responsible" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}" /> <filter string="Partner" icon="terp-partner" context="{'group_by':'partner_id'}" /> - <separator orientation="vertical" /> - <filter string="Sale Team" icon="terp-personal+" - domain="[]" - context="{'group_by':'section_id'}" /> - <separator orientation="vertical" /> + <filter string="Sale Team" icon="terp-personal+" domain="[]" context="{'group_by':'section_id'}" /> <filter string="Project" name="project" icon="terp-folder-violet" context="{'group_by':'project_id'}" /> <filter string="Task" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'task_id'}"/> - <separator orientation="vertical" /> - <filter string="Category" icon="terp-stock_symbol-selection" - domain="[]" context="{'group_by':'categ_id'}" /> + <filter string="Category" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'categ_id'}" /> <filter string="Version" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'version_id'}"/> - <separator orientation="vertical" /> <filter string="Priority" icon="terp-rating-rated" domain="[]" context="{'group_by':'priority'}" /> <filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}"/> - <filter string="Status" icon="terp-stock_effects-object-colorize" - domain="[]" context="{'group_by':'state'}" /> - <separator orientation="vertical"/> - <filter string="Company" icon="terp-go-home" - domain="[]" - context="{'group_by':'company_id'}" groups="base.group_multi_company"/> - <separator orientation="vertical" /> - <filter string="Day" icon="terp-go-today" - domain="[]" context="{'group_by':'day'}" help="Creation Date"/> - - <filter string="Month" icon="terp-go-month" - domain="[]" context="{'group_by':'month'}" help="Creation Date"/> - - <filter string="Year" icon="terp-go-year" - domain="[]" context="{'group_by':'name'}" help="Creation Date"/> + <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}" /> + <filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/> + <filter string="Day" icon="terp-go-today" domain="[]" context="{'group_by':'day'}" help="Creation Date"/> + <filter string="Month" icon="terp-go-month" domain="[]" context="{'group_by':'month'}" help="Creation Date"/> + <filter string="Year" icon="terp-go-year" domain="[]" context="{'group_by':'name'}" help="Creation Date"/> </group> </search> </field> diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml index 099b09b9418..3b814cbab6e 100644 --- a/addons/project_long_term/project_long_term_view.xml +++ b/addons/project_long_term/project_long_term_view.xml @@ -66,17 +66,13 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Planning of Users"> - <group> - <field name="user_id"/> - <field name="phase_id"/> - <field name="project_id"/> - </group> - <newline/> + <field name="user_id"/> + <field name="phase_id"/> + <field name="project_id"/> <group expand="0" string="Group By..."> - <filter name="user" string="User" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/> - <separator orientation="vertical"/> - <filter string="Project" icon="terp-folder-violet" domain="[]" context="{'group_by':'project_id'}"/> - <filter string="Phase" icon="terp-project" domain="[]" context="{'group_by':'phase_id'}"/> + <filter name="user" string="User" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/> + <filter string="Project" icon="terp-folder-violet" domain="[]" context="{'group_by':'project_id'}"/> + <filter string="Phase" icon="terp-project" domain="[]" context="{'group_by':'phase_id'}"/> </group> </search> </field> @@ -267,25 +263,18 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Project Phases"> - <group> - <field name="name" string="Project Phases"/> - <separator orientation="vertical"/> - <field name="date_start"/> - <field name="date_end"/> - <separator orientation="vertical"/> - <filter string="New" domain="[('state','=','draft')]" name="current" help="New Phases" icon="terp-check"/> - <filter string="In Progress" name="Progress" domain="[('state','=','open')]" help="In Progress Phases" icon="terp-camera_test"/> - <filter string="Pending" domain="[('state','=','pending')]" help="Pending Phases" icon="terp-gtk-media-pause"/> - <filter string="My Projects" domain="[('project_id.user_id','=',uid)]" help="My Projects" icon="terp-folder-violet"/> - <separator orientation="vertical"/> - <field name="project_id"/> - </group> - <newline/> + <field name="name" string="Project Phases"/> + <field name="date_start"/> + <field name="date_end"/> + <filter string="New" domain="[('state','=','draft')]" name="current" help="New Phases" icon="terp-check"/> + <filter string="In Progress" name="Progress" domain="[('state','=','open')]" help="In Progress Phases" icon="terp-camera_test"/> + <filter string="Pending" domain="[('state','=','pending')]" help="Pending Phases" icon="terp-gtk-media-pause"/> + <separator/> + <filter string="My Projects" domain="[('project_id.user_id','=',uid)]" help="My Projects" icon="terp-folder-violet"/> + <field name="project_id"/> <group expand="0" string="Group By..."> <filter string="Project" icon="terp-folder-violet" domain="[]" context="{'group_by':'project_id'}" name="project"/> - <separator orientation="vertical"/> <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/> - <separator orientation="vertical"/> <filter string="Month" icon="terp-go-month" domain="[]" context="{'group_by':'date_start'}" help="Start Month"/> </group> </search> diff --git a/addons/project_timesheet/project_timesheet_view.xml b/addons/project_timesheet/project_timesheet_view.xml index 7208885748c..3e627eaf01d 100644 --- a/addons/project_timesheet/project_timesheet_view.xml +++ b/addons/project_timesheet/project_timesheet_view.xml @@ -47,8 +47,9 @@ <field name="type">search</field> <field name="inherit_id" ref="project.view_project_project_filter"/> <field name="arch" type="xml"> - <xpath expr='//filter[@string="Member"]' position='after'> - <filter icon="terp-camera_test" string="Billable" domain="[('to_invoice','!=', False)]" help="Billable Project"/> + <xpath expr='//filter[@string="Project(s) Manager"]' position='after'> + <separator/> + <filter icon="terp-camera_test" string="Billable" domain="[('to_invoice','!=', False)]" help="Billable Project"/> </xpath> </field> </record> diff --git a/addons/project_timesheet/report/task_report_view.xml b/addons/project_timesheet/report/task_report_view.xml index 7e79b3793b7..32f8719e9a3 100644 --- a/addons/project_timesheet/report/task_report_view.xml +++ b/addons/project_timesheet/report/task_report_view.xml @@ -30,15 +30,10 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Tasks by User"> - <group> - <field name="name" string="Date"/> - <separator orientation="vertical"/> - <field name="user_id"/> - </group> - <newline/> + <field name="name" string="Date"/> + <field name="user_id"/> <group expand="1" string="Group By..."> <filter string="User" name="group_user_id" icon="terp-personal" context="{'group_by':'user_id'}"/> - <separator orientation="vertical"/> <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}" help="Group by month of date"/> <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}" help="Group by year of date"/> </group> diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml index 7f8742d3bd8..313df25a563 100644 --- a/addons/purchase/purchase_view.xml +++ b/addons/purchase/purchase_view.xml @@ -269,25 +269,19 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Search Purchase Order"> - <group> - <field name="name" string="Reference"/> - <separator orientation="vertical"/> - <filter icon="terp-document-new" name="draft" string="Quotations" domain="[('state','=','draft')]" help="Purchase order which are in draft state"/> - <filter icon="terp-check" name="approved" string="Approved" domain="[('state','in',('approved','done'))]" help="Approved purchase order"/> - <filter icon="terp-gtk-go-back-rtl" name="not_invoiced" string="Not Invoiced" domain="[('invoice_ids','=', False)]" help="Purchase orders that include lines not invoiced."/> - <filter icon="terp-emblem-important" name="exception" string="Exception" domain="[('state','in',('except_invoice','except_picking'))]" help="Purchase order which are in the exception state"/> - <separator orientation="vertical"/> - <field name="partner_id"/> - <field name="product_id"/> - <field name="create_uid"/> - </group> - <newline/> + <field name="name" string="Reference"/> + <filter icon="terp-document-new" name="draft" string="Quotations" domain="[('state','=','draft')]" help="Purchase order which are in draft state"/> + <filter icon="terp-check" name="approved" string="Approved" domain="[('state','in',('approved','done'))]" help="Approved purchase order"/> + <filter icon="terp-emblem-important" name="exception" string="Exception" domain="[('state','in',('except_invoice','except_picking'))]" help="Purchase order which are in the exception state"/> + <separator/> + <filter icon="terp-gtk-go-back-rtl" name="not_invoiced" string="Not Invoiced" domain="[('invoice_ids','=', False)]" help="Purchase orders that include lines not invoiced."/> + <field name="partner_id"/> + <field name="product_id"/> + <field name="create_uid"/> <group expand="0" string="Group By..."> <filter string="Supplier" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/> - <separator orientation="vertical"/> <filter string="Source" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'origin'}"/> <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/> - <separator orientation="vertical"/> <filter string="Order Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_order'}"/> <filter string="Expected Date" icon="terp-go-month" domain="[]" context="{'group_by':'minimum_planned_date'}"/> </group> @@ -301,30 +295,21 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Search Purchase Order"> - <group> - <field name="name" string="Reference"/> - <separator orientation="vertical"/> - <filter icon="terp-mail-message-new" - string="Inbox" help="Unread messages" - name="needaction_pending" - domain="[('needaction_pending','=',True)]"/> - <separator orientation="vertical"/> - <filter icon="terp-document-new" name="draft" string="Quotations" domain="[('state','=','draft')]" help="Purchase orders which are in draft state"/> - <filter icon="terp-check" name="approved" string="Purchase Orders" domain="[('state','not in',('draft','cancel'))]" help="Approved purchase orders"/> - <filter icon="terp-gtk-go-back-rtl" name="not_invoiced" string="Not Invoiced" domain="[('invoice_ids','=', False)]" help="Purchase orders that include lines not invoiced."/> - <filter icon="terp-emblem-important" name="exception" string="Exception" domain="[('state','in',('except_invoice','except_picking'))]" help="Purchase orders which are in exception state"/> - <separator orientation="vertical"/> - <field name="partner_id"/> - <field name="product_id"/> - <field name="create_uid"/> - </group> - <newline/> + <field name="name" string="Reference"/> + <filter icon="terp-mail-message-new" string="Inbox" help="Unread messages" name="needaction_pending" domain="[('needaction_pending','=',True)]"/> + <separator/> + <filter icon="terp-document-new" name="draft" string="Quotations" domain="[('state','=','draft')]" help="Purchase orders which are in draft state"/> + <filter icon="terp-check" name="approved" string="Purchase Orders" domain="[('state','not in',('draft','cancel'))]" help="Approved purchase orders"/> + <filter icon="terp-emblem-important" name="exception" string="Exception" domain="[('state','in',('except_invoice','except_picking'))]" help="Purchase orders which are in exception state"/> + <separator/> + <filter icon="terp-gtk-go-back-rtl" name="not_invoiced" string="Not Invoiced" domain="[('invoice_ids','=', False)]" help="Purchase orders that include lines not invoiced."/> + <field name="partner_id"/> + <field name="product_id"/> + <field name="create_uid"/> <group expand="0" string="Group By..."> <filter string="Supplier" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/> - <separator orientation="vertical"/> <filter string="Source" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'origin'}"/> <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/> - <separator orientation="vertical"/> <filter string="Order Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_order'}"/> <filter string="Expected Date" icon="terp-go-month" domain="[]" context="{'group_by':'minimum_planned_date'}"/> </group> @@ -493,21 +478,16 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Search Purchase Order"> - <group> - <field name="order_id"/> - <field name="product_id"/> - <field name="partner_id" string="Supplier"/> - </group> - <newline/> + <field name="order_id"/> + <field name="product_id"/> + <field name="partner_id" string="Supplier"/> <group expand="0" string="Group By..."> <filter string="Supplier" icon="terp-partner" domain="[]" context="{'group_by' : 'partner_id'}" /> - <separator orientation="vertical"/> <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by' : 'product_id'}" /> <filter icon="terp-gtk-jump-to-rtl" string="Order Reference" domain="[]" context="{'group_by' :'order_id'}"/> - <separator orientation="vertical"/> <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by' : 'state'}" /> </group> - </search> + </search> </field> </record> @@ -573,6 +553,5 @@ </xpath> </field> </record> - </data> </openerp> diff --git a/addons/purchase/report/purchase_report_view.xml b/addons/purchase/report/purchase_report_view.xml index 4cf91053666..aa915c620f5 100644 --- a/addons/purchase/report/purchase_report_view.xml +++ b/addons/purchase/report/purchase_report_view.xml @@ -53,29 +53,16 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Purchase Orders"> - <group> - <filter icon="terp-document-new" - string="Quotations" - name="quotes" - domain="[('state','=','draft')]"/> - <filter icon="terp-gtk-jump-to-rtl" - string="Orders" - name="orders" - domain="[('state','<>','draft'),('state','<>','cancel')]"/> - <separator orientation="vertical"/> - <field name="partner_id"/> - <field name="product_id"/> - </group> - <newline/> + <filter icon="terp-document-new" string="Quotations" name="quotes" domain="[('state','=','draft')]"/> + <filter icon="terp-gtk-jump-to-rtl" string="Orders" name="orders" domain="[('state','<>','draft'),('state','<>','cancel')]"/> + <field name="partner_id"/> + <field name="product_id"/> <group expand="0" string="Extended Filters..."> <field name="user_id"/> <field name="validator"/> - <separator orientation="vertical"/> <field name="location_id"/> - <field name="warehouse_id" widget="selection"/> - <separator orientation="vertical"/> + <field name="warehouse_id"/> <field name="company_id" groups="base.group_multi_company"/> - <newline/> <field name="date"/> <field name="date_approve"/> <field name="expected_date"/> @@ -85,7 +72,6 @@ <filter string="Supplier" name="group_partner_id" icon="terp-personal" context="{'group_by':'partner_id'}"/> <filter string="Responsible" name="Responsible" icon="terp-personal" context="{'group_by':'user_id'}"/> <filter string="Validated by" icon="terp-personal" context="{'group_by':'validator'}"/> - <separator orientation="vertical"/> <filter string="Product" name="group_product_id" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/> <filter string="Category" name="group_category_id" icon="terp-stock_symbol-selection" context="{'group_by':'category_id'}"/> <filter string="Reference Unit of Measure" name="group_product_uom" icon="terp-mrp" context="{'group_by':'product_uom'}"/> @@ -93,11 +79,8 @@ <filter string="Reference UOM" name="group_product_uom" icon="terp-mrp" context="{'group_by':'product_uom'}"/> <filter string="Warehouse" icon="terp-go-home" context="{'group_by':'warehouse_id'}"/> <filter string="Destination" icon="terp-gtk-jump-to-ltr" context="{'group_by':'location_id'}"/> - <separator orientation="vertical"/> <filter string="Status" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/> - <separator orientation="vertical"/> <filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/> - <separator orientation="vertical"/> <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}" help="Order of Day"/> <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}" help="Order of Month"/> <filter string="Year" icon="terp-go-year" context="{'group_by':'name'}" help="Order of Year"/> diff --git a/addons/purchase/stock_view.xml b/addons/purchase/stock_view.xml index 27318adc0f5..2191e642ab2 100644 --- a/addons/purchase/stock_view.xml +++ b/addons/purchase/stock_view.xml @@ -46,35 +46,21 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Picking to Invoice"> - <group col="8" colspan="4"> - <field name="name" string="Picking to Invoice" filter_domain="['|',('name','ilike',self),('origin','ilike',self)]"/> - <separator orientation="vertical"/> - <filter icon="terp-check" name="available" string="Available" - domain="[('state','=','assigned')]" help="Incoming Shipments Available"/> - <filter icon="terp-dialog-close" name="done" string="Received" - domain="[('state','=','done')]" help="Incoming Shipments already Received"/> - <filter icon="terp-accessories-archiver-minus" string="Back Orders" - domain="[('backorder_id', '!=', False)]" help="Is a Back Order"/> - <filter string="To Invoice" name="to_invoice" icon="terp-dolar" - domain="[('invoice_state', '=', '2binvoiced')]"/> - <separator orientation="vertical"/> - <field name="stock_journal_id" widget="selection"/> - <field name="company_id" widget="selection" groups="base.group_multi_company"/> - <field name="purchase_id" /> - </group> - <newline/> + <field name="name" string="Picking to Invoice" filter_domain="['|',('name','ilike',self),('origin','ilike',self)]"/> + <filter icon="terp-check" name="available" string="Available" domain="[('state','=','assigned')]" help="Incoming Shipments Available"/> + <filter icon="terp-dialog-close" name="done" string="Received" domain="[('state','=','done')]" help="Incoming Shipments already Received"/> + <separator/> + <filter icon="terp-accessories-archiver-minus" string="Back Orders" domain="[('backorder_id', '!=', False)]" help="Is a Back Order"/> + <separator/> + <filter string="To Invoice" name="to_invoice" icon="terp-dolar" domain="[('invoice_state', '=', '2binvoiced')]"/> + <field name="stock_journal_id"/> + <field name="company_id" groups="base.group_multi_company"/> + <field name="purchase_id" /> <group expand="0" string="Group By..." colspan="4" col="8"> - <separator orientation="vertical"/> - <filter icon="terp-stock_effects-object-colorize" name="Status" string="Status" - domain="[]" context="{'group_by':'state'}"/> - <separator orientation="vertical"/> - <filter string="Order Date" icon="terp-go-month" - domain="[]" context="{'group_by':'date'}"/> - <filter string="Scheduled Date" icon="terp-go-month" - domain="[]" context="{'group_by':'min_date'}"/> - <separator orientation="vertical"/> - <filter string="Journal" icon="terp-folder-orange" - domain="[]" context="{'group_by':'stock_journal_id'}"/> + <filter icon="terp-stock_effects-object-colorize" name="Status" string="Status" domain="[]" context="{'group_by':'state'}"/> + <filter string="Order Date" icon="terp-go-month" domain="[]" context="{'group_by':'date'}"/> + <filter string="Scheduled Date" icon="terp-go-month" domain="[]" context="{'group_by':'min_date'}"/> + <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'stock_journal_id'}"/> </group> </search> </field> diff --git a/addons/purchase_requisition/purchase_requisition_view.xml b/addons/purchase_requisition/purchase_requisition_view.xml index c1fc14c29bf..e0b8db4862f 100644 --- a/addons/purchase_requisition/purchase_requisition_view.xml +++ b/addons/purchase_requisition/purchase_requisition_view.xml @@ -134,28 +134,21 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Search Purchase Requisition"> - <group> <field name="name" string="Purchase Requisition"/> - <separator orientation="vertical"/> + <field name="exclusive" /> <filter icon="terp-document-new" name="draft" string="New" domain="[('state','=','draft')]" help="New Purchase Requisition"/> <filter icon="terp-camera_test" string="Sent to Suppliers" domain="[('state','=','in_progress')]" help="Purchase Requisition in negociation"/> <filter icon="terp-dialog-close" string="Purchase Done" domain="[('state','=','done')]" help="Current Purchase Requisition"/> - <separator orientation="vertical"/> + <separator/> <filter icon="terp-personal-" string="Unassigned" domain="[('user_id','=', False)]" help="Unassigned Requisition"/> - <separator orientation="vertical"/> <field name="user_id" /> - <field name="exclusive" /> - </group> - <newline/> - <group expand="0" string="Group By..."> - <filter string="Responsible" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/> - <separator orientation="vertical"/> - <filter string="Source" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'origin'}"/> - <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/> - <separator orientation="vertical"/> - <filter string="Start Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_start'}"/> - <filter string="End Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_end'}"/> - </group> + <group expand="0" string="Group By..."> + <filter string="Responsible" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/> + <filter string="Source" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'origin'}"/> + <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/> + <filter string="Start Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_start'}"/> + <filter string="End Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_end'}"/> + </group> </search> </field> </record> diff --git a/addons/report_intrastat/report_intrastat_view.xml b/addons/report_intrastat/report_intrastat_view.xml index c481296196c..73cf99bec34 100644 --- a/addons/report_intrastat/report_intrastat_view.xml +++ b/addons/report_intrastat/report_intrastat_view.xml @@ -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="month"/> + <field name="type"/> + <field name="intrastat_id"/> </search> </field> </record> diff --git a/addons/resource/resource_view.xml b/addons/resource/resource_view.xml index 8a0823a8c15..5b388469f3c 100644 --- a/addons/resource/resource_view.xml +++ b/addons/resource/resource_view.xml @@ -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="resource_type"/> + <filter string="Inactive" icon="terp-gdu-smart-failing" domain="[('active','=',False)]"/> + <field name="user_id" string="User"/> + <field name="company_id" groups="base.group_multi_company"/> <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> diff --git a/addons/sale/report/sale_report_view.xml b/addons/sale/report/sale_report_view.xml index 8eb4fc85ce6..1ac6d425530 100644 --- a/addons/sale/report/sale_report_view.xml +++ b/addons/sale/report/sale_report_view.xml @@ -50,53 +50,35 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Sales Analysis"> - <group> - <field name="date"/> - <field name="date_confirm"/> - <separator orientation="vertical"/> - <filter icon="terp-document-new" - string="Quotations" - domain="[('state','=','draft')]"/> - <filter icon="terp-check" - string="Sales" - domain="[('state','not in',('draft','done','cancel'))]"/> - <filter icon="terp-accessories-archiver" - string="Picked" - domain="[('shipped','=',True)]"/> - <filter icon="terp-personal" - string="My Sales" - help="My Sales" - domain="[('user_id','=',uid)]"/> - <separator orientation="vertical"/> - <field name="partner_id"/> - <field name="product_id"/> - <field name="user_id"/> - </group> - <newline/> + <field name="date"/> + <field name="date_confirm"/> + <filter icon="terp-document-new" string="Quotations" domain="[('state','=','draft')]"/> + <filter icon="terp-check" string="Sales" domain="[('state','not in',('draft','done','cancel'))]"/> + <separator/> + <filter icon="terp-accessories-archiver" string="Picked" domain="[('shipped','=',True)]"/> + <separator/> + <filter icon="terp-personal" string="My Sales" help="My Sales" domain="[('user_id','=',uid)]"/> + <field name="partner_id"/> + <field name="product_id"/> + <field name="user_id"/> <group expand="0" string="Extended Filters..."> - <field name="shop_id" widget="selection"/> - <field name="categ_id" widget="selection"/> - <field name="company_id" groups="base.group_multi_company" widget="selection"/> + <field name="shop_id"/> + <field name="categ_id"/> + <field name="company_id" groups="base.group_multi_company"/> </group> - <newline/> <group expand="1" string="Group By..."> <filter string="Salesperson" icon="terp-personal" name="User" context="{'group_by':'user_id'}"/> <filter string="Partner" icon="terp-partner" name="Customer" context="{'group_by':'partner_id'}"/> - <separator orientation="vertical"/> <filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id','set_visible':True}"/> <filter string="Reference Unit of Measure" icon="terp-mrp" context="{'group_by':'product_uom'}"/> <filter string="Category of Product" icon="terp-stock_symbol-selection" name="Category" context="{'group_by':'categ_id'}"/> - <separator orientation="vertical" groups="analytic.group_analytic_accounting"/> <filter string="Analytic Account" icon="terp-folder-green" context="{'group_by':'analytic_account_id'}" groups="analytic.group_analytic_accounting"/> - <separator orientation="vertical" groups="analytic.group_analytic_accounting"/> <filter string="Status" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/> - <separator orientation="vertical"/> <filter string="Shop" icon="terp-go-home" context="{'group_by':'shop_id'}"/> <filter string="Company" icon="terp-go-home" groups="base.group_multi_company" context="{'group_by':'company_id'}"/> - <separator orientation="vertical"/> - <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}" help="Ordered date of the sales order"/> - <filter string="Month" name="order_month" icon="terp-go-month" context="{'group_by':'month'}" help="Ordered month of the sales order"/> - <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}" help="Ordered Year of the sales order"/> + <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}" help="Ordered date of the sales order"/> + <filter string="Month" name="order_month" icon="terp-go-month" context="{'group_by':'month'}" help="Ordered month of the sales order"/> + <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}" help="Ordered Year of the sales order"/> </group> </search> </field> diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml index a73f7744e53..48e823250dc 100644 --- a/addons/sale/sale_view.xml +++ b/addons/sale/sale_view.xml @@ -359,26 +359,19 @@ <field name="arch" type="xml"> <search string="Search Sales Order"> <field name="name" string="Sales Order" filter_domain="['|',('name','ilike',self),('client_order_ref','ilike',self)]"/> - <separator orientation="vertical"/> - <filter icon="terp-mail-message-new" - string="Inbox" help="Unread messages" - name="needaction_pending" - domain="[('needaction_pending','=',True)]"/> - <separator orientation="vertical"/> + <filter icon="terp-mail-message-new" string="Inbox" help="Unread messages" name="needaction_pending" domain="[('needaction_pending','=',True)]"/> + <separator/> <filter icon="terp-document-new" string="Quotations" name="draft" domain="[('state','in',('draft','sent'))]" help="Sales Order that haven't yet been confirmed"/> <filter icon="terp-check" string="Sales" name="sales" domain="[('state','in',('manual','progress'))]"/> <filter icon="terp-dolar_ok!" string="To Invoice" domain="[('state','=','manual')]" help="Sales Order ready to be invoiced"/> + <separator/> <filter string="My Sale Orders" domain="[('user_id','=',uid)]" help="My Sale Orders" icon="terp-personal" name="my_sale_orders_filter"/> - <separator orientation="vertical"/> <field name="partner_id"/> <field name="user_id"/> - <newline/> <group expand="0" string="Group By..."> <filter string="Customer" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/> <filter string="Salesperson" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/> - <separator orientation="vertical"/> <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/> - <separator orientation="vertical"/> <filter string="Order Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_order'}"/> </group> </search> @@ -531,13 +524,12 @@ <field name="arch" type="xml"> <search string="Search Sales Order"> <filter icon="terp-dolar_ok!" string="To Invoice" domain="[('invoiced','<>', 1),('state','=','done')]" help="Sale Order Lines ready to be invoiced"/> + <separator/> <filter string="My Sales Order Lines" icon="terp-personnal" domain="[('salesman_id','=',uid)]" help="Sales Order Lines related to a Sales Order of mine"/> - <separator orientation="vertical"/> <field name="order_id"/> <field name="order_partner_id"/> <field name="product_id"/> <field name="salesman_id"/> - <newline/> <group expand="0" string="Group By..."> <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/> <filter string="Order" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'order_id'}"/> @@ -557,18 +549,17 @@ <filter icon="terp-gtk-go-back-rtl" string="To Do" domain="[('state','=','confirmed')]" name="sale order" help="Confirmed sale order lines, not yet delivered"/> <filter icon="terp-dialog-close" string="Done" domain="[('state','=','done')]" name="sale_order_done" help="Sale order lines done"/> <filter icon="terp-accessories-archiver" string="Shipped" domain="[('state','=','done')]" name="unshipped" help="Sale Order Lines that are in 'done' state"/> + <separator/> <filter icon="terp-dolar_ok!" string="Uninvoiced" name="uninvoiced" domain="[('invoiced','<>', 1),('state','<>','draft'),('state','<>','cancel')]" help="Sale Order Lines that are confirmed, done or in exception state and haven't yet been invoiced"/> + <separator/> <filter string="My Sales Order Lines" icon="terp-personal" domain="[('salesman_id','=',uid)]" help="My Sales Order Lines"/> - <separator orientation="vertical"/> <field name="order_id"/> <field name="order_partner_id"/> <field name="product_id"/> <field name="salesman_id"/> - <newline/> <group expand="0" string="Group By..."> <filter string="Order" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'order_id'}" help="Order reference"/> <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/> - <separator orientation="vertical"/> <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/> </group> </search> diff --git a/addons/sale_crm/sale_crm_view.xml b/addons/sale_crm/sale_crm_view.xml index d6b7f28d049..6efaea2ac53 100644 --- a/addons/sale_crm/sale_crm_view.xml +++ b/addons/sale_crm/sale_crm_view.xml @@ -36,13 +36,14 @@ <field name="inherit_id" ref="sale.view_sales_order_filter"/> <field name="arch" type="xml"> <xpath expr="//filter[@name='my_sale_orders_filter']" position="after"> + <separator/> <filter string="My Sales Team(s)" icon="terp-personal+" domain="[('section_id.user_id','=',uid)]" help="My Sales Team(s)"/> </xpath> <xpath expr="//field[@name='user_id']" position="after"> - <field name="section_id" widget="selection" string="Sales Team"/> + <field name="section_id" string="Sales Team"/> </xpath> </field> </record> diff --git a/addons/share/res_users_view.xml b/addons/share/res_users_view.xml index defbc522340..3af69bb025b 100644 --- a/addons/share/res_users_view.xml +++ b/addons/share/res_users_view.xml @@ -7,8 +7,7 @@ <field name="type">search</field> <field name="inherit_id" ref="base.view_users_search"/> <field name="arch" type="xml"> - <xpath expr="//field[@name='name']" position="after"> - <separator orientation="vertical"/> + <xpath expr="//field[@name='company_ids']" position="after"> <filter name="no_share" string="Regular users only (no share user)" icon="terp-partner" domain="[('share','=',False)]"/> </xpath> @@ -32,11 +31,8 @@ <field name="arch" type="xml"> <search string="Groups"> <field name="name" string="Group"/> - <separator orientation="vertical"/> - <filter name="no_share" string="Regular groups only (no share groups)" icon="terp-partner" - domain="[('share','=',False)]"/> - <separator orientation="vertical"/> <field name="share"/> + <filter name="no_share" string="Regular groups only (no share groups)" icon="terp-partner" domain="[('share','=',False)]"/> </search> </field> </record> diff --git a/addons/stock/product_view.xml b/addons/stock/product_view.xml index d5a3545a1b3..70fb06709f6 100644 --- a/addons/stock/product_view.xml +++ b/addons/stock/product_view.xml @@ -9,8 +9,8 @@ <field name="inherit_id" ref="product.product_search_form_view"/> <field name="arch" type="xml"> <field name="pricelist_id" position="before"> - <field name="location_id" widget="selection" context="{'location': self}"/> - <field name="warehouse_id" widget="selection" context="{'warehouse': self}"/> + <field name="location_id" context="{'location': self}"/> + <field name="warehouse_id" context="{'warehouse': self}"/> </field> </field> </record> diff --git a/addons/stock/report/report_stock_move_view.xml b/addons/stock/report/report_stock_move_view.xml index 89cbd9c1340..56d17976aad 100644 --- a/addons/stock/report/report_stock_move_view.xml +++ b/addons/stock/report/report_stock_move_view.xml @@ -56,52 +56,33 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Moves Analysis"> - <group> - <filter string="Done" - name="done" - icon="terp-dialog-close" - domain="[('state','=','done')]" - help = "Completed Stock-Moves"/> - <filter string="Todo" - icon="terp-gtk-go-back-rtl" - domain="[('state','in',('assigned','waiting','confirmed'))]" - help = "Future Stock-Moves"/> - <filter icon="terp-go-home" name="in" string="Incoming" domain="[('type','=','in')]"/> - <filter icon="terp-go-home" name="internal" string="Internal" domain="[('type','=','internal')]"/> - <filter icon="terp-go-home" name="out" string="Outgoing" domain="[('type','=','out')]"/> - <separator orientation="vertical"/> - <field name="product_id" default_focus="1"/> - <field name="partner_id" context="{'contact_display':'partner'}"/> - </group> - <newline/> + <filter string="Done" name="done" icon="terp-dialog-close" domain="[('state','=','done')]" help = "Completed Stock-Moves"/> + <filter string="Todo" icon="terp-gtk-go-back-rtl" domain="[('state','in',('assigned','waiting','confirmed'))]" help = "Future Stock-Moves"/> + <separator/> + <filter icon="terp-go-home" name="in" string="Incoming" domain="[('type','=','in')]"/> + <filter icon="terp-go-home" name="internal" string="Internal" domain="[('type','=','internal')]"/> + <filter icon="terp-go-home" name="out" string="Outgoing" domain="[('type','=','out')]"/> + <field name="product_id" default_focus="1"/> + <field name="partner_id" context="{'contact_display':'partner'}"/> <group expand="0" string="Extended Filters..."> <field name="location_id" /> <field name="location_dest_id" /> <field name="categ_id"/> <field name="stock_journal"/> - <separator orientation="vertical"/> - <field name="company_id" groups="base.group_multi_company" widget = "selection"/> - <newline/> + <field name="company_id" groups="base.group_multi_company"/> <field name="date"/> </group> - <newline/> <group expand="1" string="Group By..."> <filter name="group_partner" string="Partner" icon="terp-partner" context="{'group_by':'partner_id'}"/> - <separator orientation="vertical"/> <filter name="group_categ_id" string="Product Category" icon="terp-stock_symbol-selection" context="{'group_by':'categ_id'}"/> <filter name="group_product" string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/> - <separator orientation="vertical"/> <filter name="group_picking" string="Shipment" icon="terp-accessories-archiver" context="{'group_by':'picking_id'}"/> - <separator orientation="vertical"/> <filter string="Source Location" name="src_location" icon="terp-gtk-jump-to-rtl" context="{'group_by':'location_id'}"/> <filter string="Dest. Location" name="dest_location" icon="terp-gtk-jump-to-ltr" context="{'group_by':'location_dest_id'}"/> - <separator orientation="vertical"/> <filter string="Type" name="group_type" icon="terp-stock_symbol-selection" context="{'group_by':'type'}" help="Shipping type specify, goods coming in or going out"/> <filter string="Status" name="group_state" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/> <filter string="Stock journal" name="group_stock_journal" icon="terp-folder-orange" context="{'group_by':'stock_journal'}"/> - <separator orientation="vertical"/> <filter string="Company" name="group_state" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/> - <separator orientation="vertical"/> <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}" help="Day Planned"/> <filter string="Month" icon="terp-go-month" context="{'group_by':'date'}" help="Month Planned"/> <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}" help="Year Planned"/> @@ -163,23 +144,15 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Inventory Analysis"> - <group> - <filter string="Real" - name="real" - icon="terp-check" - domain="[('state','=','done')]" - help="Analysis of current inventory (only moves that have already been processed)"/> - <filter string="Future" - icon="terp-stock" - domain="[('state','in',('assigned','done','waiting','confirmed'))]" - help = "Analysis including future moves (similar to virtual stock)"/> - <filter icon="terp-go-home" name="location_type_internal" string="Internal" domain="[('location_type','=','internal')]"/> - <separator orientation="vertical"/> - <field name="product_id" default_focus="1"/> - <field name="location_id" filter_domain="[('location_id', 'child_of', self)]"/> - <field name="company_id" groups="base.group_multi_company"/> - </group> - <newline/> + <filter string="Real" name="real" icon="terp-check" domain="[('state','=','done')]" + help="Analysis of current inventory (only moves that have already been processed)"/> + <filter string="Future" icon="terp-stock" domain="[('state','in',('assigned','done','waiting','confirmed'))]" + help = "Analysis including future moves (similar to virtual stock)"/> + <separator/> + <filter icon="terp-go-home" name="location_type_internal" string="Internal" domain="[('location_type','=','internal')]"/> + <field name="product_id" default_focus="1"/> + <field name="location_id" filter_domain="[('location_id', 'child_of', self)]"/> + <field name="company_id" groups="base.group_multi_company"/> <group expand="0" string="Extended Filters..."> <field name="partner_id" context="{'contact_display':'partner'}"/> <field name="product_categ_id" /> @@ -189,17 +162,13 @@ <field name="date"/> <filter icon="terp-go-home" name="location_type_scrap" string="Scrap" domain="[('location_type','=','scrap')]"/> </group> - <newline/> <group expand="1" string="Group By..." > <filter string="Partner" name="group_partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/> - <separator orientation="vertical"/> <filter name="group_product_categ_id" string="Product Category" icon="terp-stock_symbol-selection" context="{'group_by':'product_categ_id'}"/> <filter name="group_product" string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/> - <filter name="group_lot" string="Lot" icon="terp-accessories-archiver" context="{'group_by':'prodlot_id'}"/> - <separator orientation="vertical"/> + <filter name="group_lot" string="Lot" icon="terp-accessories-archiver" context="{'group_by':'prodlot_id'}"/> <filter name="group_company" string="Company" groups="base.group_multi_company" icon="terp-go-home" context="{'group_by':'company_id'}"/> <filter name="group_location" string="Location" icon="terp-go-home" context="{'group_by':'location_id'}"/> - <separator orientation="vertical"/> <filter string="Date" icon="terp-go-month" context="{'group_by':'date'}"/> <filter string="Status" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/> </group> diff --git a/addons/stock/report/report_stock_view.xml b/addons/stock/report/report_stock_view.xml index 69a7829f565..15dafbfdbc1 100644 --- a/addons/stock/report/report_stock_view.xml +++ b/addons/stock/report/report_stock_view.xml @@ -35,14 +35,10 @@ <field name="arch" type="xml"> <search string="Dates of Inventories"> <field name="date"/> - <separator orientation="vertical"/> - <filter icon="terp-accessories-archiver" name="stockable" string="Stockable" - domain="[('product_id.type','=', 'product')]"/> - <filter icon="terp-accessories-archiver" string="Consumable" - domain="[('product_id.type','=', 'consu')]"/> - <filter icon="terp-accessories-archiver-minus" string="Non Inv" - domain="[('date','=', False)]"/> - <separator orientation="vertical"/> + <filter icon="terp-accessories-archiver" name="stockable" string="Stockable" domain="[('product_id.type','=', 'product')]"/> + <filter icon="terp-accessories-archiver" string="Consumable" domain="[('product_id.type','=', 'consu')]"/> + <separator/> + <filter icon="terp-accessories-archiver-minus" string="Non Inv" domain="[('date','=', False)]"/> <field name="product_id"/> </search> </field> diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml index 098b6ea14c8..3c08c1eaff0 100644 --- a/addons/stock/stock_view.xml +++ b/addons/stock/stock_view.xml @@ -79,14 +79,9 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Search Inventory"> - <group> - <field name="name" string="Inventory Reference"/> - <separator orientation="vertical"/> - <field name="date"/> - <separator orientation="vertical"/> - <field name="company_id" groups="base.group_multi_company" widget="selection"/> - </group> - <newline/> + <field name="name" string="Inventory Reference"/> + <field name="date"/> + <field name="company_id" groups="base.group_multi_company"/> <group expand="0" string="Group By..."> <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/> <filter string="Date" icon="terp-go-month" domain="[]" context="{'group_by':'date'}"/> @@ -290,13 +285,9 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Pack Search"> - <group> - <field name="name" string="Pack" filter_domain="['|',('name','ilike',self),('serial','ilike',self)]"/> - <separator orientation="vertical"/> - <field name="date"/> - <separator orientation="vertical"/> - <field name="active"/> - </group> + <field name="name" string="Pack" filter_domain="['|',('name','ilike',self),('serial','ilike',self)]"/> + <field name="date"/> + <field name="active"/> </search> </field> </record> @@ -405,16 +396,10 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Product Lots Filter"> - <group> - <field name="name" string="Product Lots" filter_domain="['|','|',('name','ilike',self),('prefix','ilike',self),('ref','ilike',self)]"/> - <separator orientation="vertical"/> - <field name="date"/> - <separator orientation="vertical"/> - <filter icon="terp-check" name="available" string="Available" domain="[('stock_available', '>', 0)]" help="Available Product Lots"/> - <separator orientation="vertical"/> - <field name="product_id"/> - </group> - <newline/> + <field name="name" string="Product Lots" filter_domain="['|','|',('name','ilike',self),('prefix','ilike',self),('ref','ilike',self)]"/> + <field name="date"/> + <filter icon="terp-check" name="available" string="Available" domain="[('stock_available', '>', 0)]" help="Available Product Lots"/> + <field name="product_id"/> <group expand="0" string="Group By..."> <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/> </group> @@ -569,14 +554,9 @@ <field name="arch" type="xml"> <search string="Stock Locations"> <field name="name" string="Stock Locations"/> - <separator orientation="vertical"/> - <filter icon="terp-go-home" name="in_location" - string="Internal" domain="[('usage', '=', 'internal')]" help="Internal Locations"/> - <filter icon="terp-personal" name="customer" - string="Customer" domain="[('usage', '=', 'customer')]" help="Customer Locations"/> - <filter icon="terp-personal" name="supplier" - string="Supplier" domain="[('usage', '=', 'supplier')]" help="Supplier Locations"/> - <separator orientation="vertical"/> + <filter icon="terp-go-home" name="in_location" string="Internal" domain="[('usage', '=', 'internal')]" help="Internal Locations"/> + <filter icon="terp-personal" name="customer" string="Customer" domain="[('usage', '=', 'customer')]" help="Customer Locations"/> + <filter icon="terp-personal" name="supplier" string="Supplier" domain="[('usage', '=', 'supplier')]" help="Supplier Locations"/> <field name="location_id" string="Parent Location"/> </search> </field> @@ -891,26 +871,18 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Internal Picking List"> - <group> - <field name="name" string="Internal Picking List" filter_domain="['|',('name','ilike', self),('origin','ilike',self)]"/> - <separator orientation="vertical"/> - <filter icon="terp-check" string="Ready" domain="[('state','=','assigned')]" help="Assigned Internal Moves"/> - <filter icon="terp-camera_test" name="confirmed" string="Waiting" domain="[('state','=','confirmed')]" help="Confirmed Internal Moves"/> - <filter icon="terp-dialog-close" name="done" string="Done" domain="[('state','=','done')]" help="Pickings already processed"/> - <separator orientation="vertical"/> - <field name="partner_id"/> - <field name="product_id"/> - <field name="stock_journal_id" widget="selection"/> - </group> - <newline/> + <field name="name" string="Internal Picking List" filter_domain="['|',('name','ilike', self),('origin','ilike',self)]"/> + <filter icon="terp-check" string="Ready" domain="[('state','=','assigned')]" help="Assigned Internal Moves"/> + <filter icon="terp-camera_test" name="confirmed" string="Waiting" domain="[('state','=','confirmed')]" help="Confirmed Internal Moves"/> + <filter icon="terp-dialog-close" name="done" string="Done" domain="[('state','=','done')]" help="Pickings already processed"/> + <field name="partner_id"/> + <field name="product_id"/> + <field name="stock_journal_id"/> <group expand="0" string="Group By..."> <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/> - <separator orientation="vertical"/> <filter string="Order Date" icon="terp-go-month" domain="[]" context="{'group_by':'date'}"/> <filter string="Expected Date" icon="terp-go-month" domain="[]" context="{'group_by':'min_date'}"/> - <separator orientation="vertical"/> <filter string="Origin" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'origin'}"/> - <separator orientation="vertical"/> <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'stock_journal_id'}"/> </group> </search> @@ -1000,26 +972,20 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Picking list"> - <group> - <field name="name" string="Picking List" filter_domain="['|',('name','ilike', self),('origin','ilike',self)]"/> - <separator orientation="vertical"/> - <filter icon="terp-check" name="available" string="Ready" domain="[('state','=','assigned')]" help="Assigned Delivery Orders"/> - <filter icon="terp-camera_test" name="confirmed" string="Waiting" domain="[('state','=','confirmed')]" help="Confirmed Delivery Orders"/> - <filter icon="terp-dialog-close" name="done" string="Done" domain="[('state','=','done')]" help="Delivery orders already processed"/> - <filter icon="terp-accessories-archiver-minus" string="Back Orders" domain="[('backorder_id', '!=', False)]" help="Is a Back Order"/> - <filter icon="terp-dolar" name="to_invoice" string="To Invoice" domain="[('invoice_state','=','2binvoiced')]" help="Delivery orders to invoice"/> - <separator orientation="vertical"/> - <field name="stock_journal_id" widget="selection"/> - <field name="company_id" widget="selection" groups="base.group_multi_company"/> - </group> - <newline/> + <field name="name" string="Picking List" filter_domain="['|',('name','ilike', self),('origin','ilike',self)]"/> + <filter icon="terp-check" name="available" string="Ready" domain="[('state','=','assigned')]" help="Assigned Delivery Orders"/> + <filter icon="terp-camera_test" name="confirmed" string="Waiting" domain="[('state','=','confirmed')]" help="Confirmed Delivery Orders"/> + <filter icon="terp-dialog-close" name="done" string="Done" domain="[('state','=','done')]" help="Delivery orders already processed"/> + <separator/> + <filter icon="terp-accessories-archiver-minus" string="Back Orders" domain="[('backorder_id', '!=', False)]" help="Is a Back Order"/> + <separator/> + <filter icon="terp-dolar" name="to_invoice" string="To Invoice" domain="[('invoice_state','=','2binvoiced')]" help="Delivery orders to invoice"/> + <field name="stock_journal_id"/> + <field name="company_id" groups="base.group_multi_company"/> <group expand="0" string="Group By..."> - <separator orientation="vertical"/> <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/> - <separator orientation="vertical"/> <filter string="Order Date" icon="terp-go-month" domain="[]" context="{'group_by':'date'}"/> <filter string="Expected Date" icon="terp-go-month" domain="[]" context="{'group_by':'min_date'}"/> - <separator orientation="vertical"/> <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'stock_journal_id'}"/> </group> </search> @@ -1108,25 +1074,19 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Incoming Shipments"> - <group> - <field name="name" string="Incoming Shipments" filter_domain="['|',('name','ilike',self),('origin','ilike',self)]"/> - <separator orientation="vertical"/> - <filter icon="terp-check" name="available" string="Ready to Process" domain="[('state','=','assigned')]" help="Incoming Shipments Available"/> - <filter icon="terp-dialog-close" name="done" string="Done" domain="[('state','=','done')]" help="Incoming Shipments already processed"/> - <filter icon="terp-accessories-archiver-minus" string="Back Orders" domain="[('backorder_id', '!=', False)]" help="Is a Back Order"/> - <filter string="To Invoice" name="to_invoice" icon="terp-dolar" domain="[('invoice_state', '=', '2binvoiced')]"/> - <separator orientation="vertical"/> - <field name="stock_journal_id" widget="selection"/> - <field name="product_id"/> - </group> - <newline/> + <field name="name" string="Incoming Shipments" filter_domain="['|',('name','ilike',self),('origin','ilike',self)]"/> + <filter icon="terp-check" name="available" string="Ready to Process" domain="[('state','=','assigned')]" help="Incoming Shipments Available"/> + <filter icon="terp-dialog-close" name="done" string="Done" domain="[('state','=','done')]" help="Incoming Shipments already processed"/> + <separator/> + <filter icon="terp-accessories-archiver-minus" string="Back Orders" domain="[('backorder_id', '!=', False)]" help="Is a Back Order"/> + <separator/> + <filter string="To Invoice" name="to_invoice" icon="terp-dolar" domain="[('invoice_state', '=', '2binvoiced')]"/> + <field name="stock_journal_id"/> + <field name="product_id"/> <group expand="0" string="Group By..."> - <separator orientation="vertical"/> <filter icon="terp-stock_effects-object-colorize" name="state" string="Status" domain="[]" context="{'group_by':'state'}"/> - <separator orientation="vertical"/> <filter string="Order Date" icon="terp-go-month" domain="[]" context="{'group_by':'date'}"/> <filter string="Expected Date" icon="terp-go-month" domain="[]" context="{'group_by':'min_date'}"/> - <separator orientation="vertical"/> <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'stock_journal_id'}"/> </group> </search> @@ -1295,33 +1255,25 @@ <field eval="3" name="priority"/> <field name="arch" type="xml"> <search string="Stock Moves"> - <group> - <field name="origin" string="Stock Moves"/> - <separator orientation="vertical" groups="base.group_no_one"/> - <field name="date" groups="base.group_no_one"/> - <separator orientation="vertical"/> - <filter icon="terp-camera_test" string="Ready" name="ready" domain="[('state','=','assigned')]" help="Stock moves that are Available (Ready to process)"/> - <filter icon="terp-stock" string="Future" name="future" domain="[('state','in',('assigned','confirmed','waiting'))]" help="Stock moves that are Confirmed, Available or Waiting"/> - <filter icon="terp-dialog-close" string="Done" name="done" domain="[('state','=','done')]" help="Stock moves that have been processed"/> - <filter icon="terp-go-today" string="Today" domain="[('date','<=',time.strftime('%%Y-%%m-%%d 23:59:59')),('date','>=',time.strftime('%%Y-%%m-%%d 00:00:00'))]" help="Orders processed Today or planned for Today"/> - <separator orientation="vertical"/> - <field name="product_id"/> - <field name="location_id" string="Location" filter_domain="['|',('location_id','ilike',self),('location_dest_id','ilike',self)]"/> - <field name="partner_id" string="Partner" filter_domain="[('picking_id.partner_id','ilike',self)]"/> - <field name="prodlot_id"/> - </group> - <newline/> + <field name="origin" string="Stock Moves"/> + <field name="date" groups="base.group_no_one"/> + <filter icon="terp-camera_test" string="Ready" name="ready" domain="[('state','=','assigned')]" help="Stock moves that are Available (Ready to process)"/> + <filter icon="terp-stock" string="Future" name="future" domain="[('state','in',('assigned','confirmed','waiting'))]" help="Stock moves that are Confirmed, Available or Waiting"/> + <filter icon="terp-dialog-close" string="Done" name="done" domain="[('state','=','done')]" help="Stock moves that have been processed"/> + <separator/> + <filter icon="terp-go-today" string="Today" domain="[('date','<=',time.strftime('%%Y-%%m-%%d 23:59:59')),('date','>=',time.strftime('%%Y-%%m-%%d 00:00:00'))]" help="Orders processed Today or planned for Today"/> + <field name="product_id"/> + <field name="location_id" string="Location" filter_domain="['|',('location_id','ilike',self),('location_dest_id','ilike',self)]"/> + <field name="partner_id" string="Partner" filter_domain="[('picking_id.partner_id','ilike',self)]"/> + <field name="prodlot_id"/> <group expand="0" string="Group By..."> <filter string="Product" name="by_product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/> <filter string="Picking" name="groupby_picking_id" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'picking_id'}"/> <filter string="Lot" name="groupby_prodlot_id" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'prodlot_id'}"/> <filter string="Pack" name="groupby_tracking_id" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'tracking_id'}"/> - <separator orientation="vertical"/> <filter string="Source" name="groupby_location_id" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'location_id'}"/> <filter string="Destination" name="groupby_dest_location_id" icon="terp-gtk-jump-to-ltr" domain="[]" context="{'group_by':'location_dest_id'}"/> - <separator orientation="vertical"/> <filter icon="terp-stock_effects-object-colorize" string="Status" domain="[]" context="{'group_by':'state'}"/> - <separator orientation="vertical"/> <filter string="Creation" name="groupby_create_date" icon="terp-go-month" domain="[]" context="{'group_by':'create_date'}" groups="base.group_no_one"/> <filter string="Expected" name="groupby_date" icon="terp-go-month" domain="[]" context="{'group_by':'date'}"/> </group> @@ -1406,24 +1358,18 @@ <field eval="6" name="priority"/> <field name="arch" type="xml"> <search string="Stock Moves"> - <group> - <field name="origin" string="Stock Moves"/> - <separator orientation="vertical"/> - <filter icon="terp-gtk-go-back-rtl" name="receive" string="Waiting " domain="[('state','in',('confirmed','assigned'))]" help="Stock to be receive"/> - <filter icon="terp-check" name="available" string="Available" domain="[('state','in',('assigned',))]" help="Stock available to be delivered"/> - <filter icon="terp-dialog-close" name="done" string="Done" domain="[('state', '=', 'done')]"/> - <filter icon="terp-go-today" string="Today" domain="[('date','<=',time.strftime('%%Y-%%m-%%d 23:59:59')),('date','>=',time.strftime('%%Y-%%m-%%d 00:00:00'))]" help="Orders planned for today"/> - <separator orientation="vertical"/> - <field name="product_id"/> - <field name="prodlot_id"/> - </group> - <newline/> + <field name="origin" string="Stock Moves"/> + <filter icon="terp-gtk-go-back-rtl" name="receive" string="Waiting " domain="[('state','in',('confirmed','assigned'))]" help="Stock to be receive"/> + <filter icon="terp-check" name="available" string="Available" domain="[('state','in',('assigned',))]" help="Stock available to be delivered"/> + <filter icon="terp-dialog-close" name="done" string="Done" domain="[('state', '=', 'done')]"/> + <separator/> + <filter icon="terp-go-today" string="Today" domain="[('date','<=',time.strftime('%%Y-%%m-%%d 23:59:59')),('date','>=',time.strftime('%%Y-%%m-%%d 00:00:00'))]" help="Orders planned for today"/> + <field name="product_id"/> + <field name="prodlot_id"/> <group expand="0" string="Group By..."> <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/> - <separator orientation="vertical"/> <filter string="Order" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'origin'}"/> <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/> - <separator orientation="vertical" groups="base.group_no_one"/> <filter string="Order Date" icon="terp-go-month" domain="[]" context="{'group_by':'date'}" groups="base.group_no_one"/> </group> </search> @@ -1437,24 +1383,18 @@ <field eval="6" name="priority"/> <field name="arch" type="xml"> <search string="Stock Moves"> - <group> - <field name="origin" string="Stock Moves"/> - <separator orientation="vertical"/> - <filter icon="terp-gtk-go-back-rtl" name="receive" string="Waiting" domain="[('state','in',('confirmed','assigned'))]" help="Stock to be delivered (Available or not)"/> - <filter icon="terp-check" name="available" string="Available" domain="[('state','in',('assigned',))]" help="Stock available to be delivered"/> - <filter icon="terp-dialog-close" name="received" string="Done" domain="[('state','=','done')]"/> - <filter icon="terp-go-today" string="Today" domain="[('date','<=',time.strftime('%%Y-%%m-%%d 23:59:59')),('date','>=',time.strftime('%%Y-%%m-%%d 00:00:00'))]" help="Orders planned for today"/> - <separator orientation="vertical"/> - <field name="product_id"/> - <field name="prodlot_id"/> - </group> - <newline/> + <field name="origin" string="Stock Moves"/> + <filter icon="terp-gtk-go-back-rtl" name="receive" string="Waiting" domain="[('state','in',('confirmed','assigned'))]" help="Stock to be delivered (Available or not)"/> + <filter icon="terp-check" name="available" string="Available" domain="[('state','in',('assigned',))]" help="Stock available to be delivered"/> + <filter icon="terp-dialog-close" name="received" string="Done" domain="[('state','=','done')]"/> + <separator/> + <filter icon="terp-go-today" string="Today" domain="[('date','<=',time.strftime('%%Y-%%m-%%d 23:59:59')),('date','>=',time.strftime('%%Y-%%m-%%d 00:00:00'))]" help="Orders planned for today"/> + <field name="product_id"/> + <field name="prodlot_id"/> <group expand="0" string="Group By..."> - <separator orientation="vertical"/> <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/> <filter string="Order" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'origin'}"/> <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/> - <separator orientation="vertical" groups="base.group_no_one"/> <filter string="Order Date" icon="terp-go-month" domain="[]" context="{'group_by':'date'}" groups="base.group_no_one"/> </group> </search> @@ -1625,7 +1565,6 @@ <field name="arch" type="xml"> <search string="Stock Journal"> <field name="name" string="Stock Journal"/> - <separator orientation="vertical"/> <field name="user_id"/> </search> </field> diff --git a/addons/stock_planning/stock_planning_view.xml b/addons/stock_planning/stock_planning_view.xml index a2fdc9788e1..8c1cb0d2c80 100644 --- a/addons/stock_planning/stock_planning_view.xml +++ b/addons/stock_planning/stock_planning_view.xml @@ -51,10 +51,8 @@ <field name="arch" type="xml"> <search string="Stock Periods"> <field name="name" string="Stock Periods"/> - <separator orientation="vertical"/> <field name="date_start"/> <field name="date_stop"/> - <separator orientation="vertical"/> <filter string="Current" domain="[('state','in',['draft','open'])]" icon="terp-check" help="Current Periods"/> <filter string="Closed" domain="[('state','=','close')]" icon="gtk-stop" help="Closed Periods"/> </search> @@ -199,18 +197,15 @@ <field name="arch" type="xml"> <search string="Search Sales Forecast"> <filter icon="terp-camera_test" string="Validated" domain="[('state','=','validated')]" /> - <separator orientation="vertical"/> <field name="company_id"/> <field name="warehouse_id" /> <field name="period_id" /> <field name="product_id"/> <field name="create_uid"/> - <newline/> <group expand="0" string="Group By..."> <filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}"/> <filter string="Warehouse " icon="terp-go-home" domain="[]" context="{'group_by':'warehouse_id'}"/> <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/> - <separator orientation="vertical"/> <filter string='Default Unit of Measure' icon="terp-mrp" domain="[]" context="{'group_by' : 'product_uom'}" /> </group> </search> @@ -308,17 +303,14 @@ <field name="arch" type="xml"> <search string="Search Stock Planning"> <filter icon="terp-purchase" string="No Requisition" domain="[('history','=',False)]" /> - <separator orientation="vertical"/> - <field name="company_id" widget="selection"/> - <field name="warehouse_id" widget="selection"/> - <field name="period_id" widget="selection"/> + <field name="company_id"/> + <field name="warehouse_id"/> + <field name="period_id"/> <field name="product_id"/> - <newline/> <group expand="0" string="Group By..."> <filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}"/> <filter string="Warehouse " icon="terp-go-home" domain="[]" context="{'group_by':'warehouse_id'}"/> <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/> - <separator orientation="vertical"/> </group> </search> </field> diff --git a/addons/subscription/subscription_view.xml b/addons/subscription/subscription_view.xml index 3de9e9b9651..8b9be319ea6 100644 --- a/addons/subscription/subscription_view.xml +++ b/addons/subscription/subscription_view.xml @@ -69,23 +69,16 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Search Subscription"> - <group> - <field name="name" string="Subscription"/> - <separator orientation="vertical"/> - <field name="date_init"/> - <separator orientation="vertical"/> - <filter icon="terp-check" + <field name="name" string="Subscription"/> + <field name="date_init"/> + <filter icon="terp-check" string="Running" domain="[('state','=','running')]"/> - <separator orientation="vertical"/> - <field name="user_id"/> - <field name="partner_id"/> - </group> - <newline/> + <field name="user_id"/> + <field name="partner_id"/> <group expand="0" string="Group By..."> <filter string="User" icon="terp-personal" name="User" domain="[]" context="{'group_by':'user_id'}"/> <filter string="Partner" icon="terp-partner" name="Partner" domain="[]" context="{'group_by':'partner_id'}"/> - <separator orientation="vertical"/> <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/> </group> </search> @@ -163,11 +156,8 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Subscription Document"> - <group> - <field name="name" string="Subscription Document"/> - <separator orientation="vertical"/> - <field name="model"/> - </group> + <field name="name" string="Subscription Document"/> + <field name="model"/> </search> </field> </record> diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml index fb4b232f512..22838058bec 100644 --- a/addons/survey/survey_view.xml +++ b/addons/survey/survey_view.xml @@ -277,20 +277,15 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Search Survey"> - <group> - <field name="title" string="Survey"/> - <separator orientation="vertical"/> - <filter icon="terp-document-new" string="New" domain="[('state','=', 'draft')]" help="All New Survey"/> - <filter icon="terp-camera_test" string="Open" domain="[('state','=','open')]" help="All Open Survey"/> - <filter string="My Survey(s)" icon="terp-personal" domain="[('responsible_id','=',uid)]" help="My Survey(s)"/> - <separator orientation="vertical"/> - <field name="type" widget="selection"/> - <field name="responsible_id"/> - </group> - <newline/> + <field name="title" string="Survey"/> + <field name="type"/> + <filter icon="terp-document-new" string="New" domain="[('state','=', 'draft')]" help="All New Survey"/> + <filter icon="terp-camera_test" string="Open" domain="[('state','=','open')]" help="All Open Survey"/> + <separator/> + <filter string="My Survey(s)" icon="terp-personal" domain="[('responsible_id','=',uid)]" help="My Survey(s)"/> + <field name="responsible_id"/> <group expand="0" string="Group By..."> <filter string="Responsible" icon="terp-personal" domain="[]" context="{'group_by':'responsible_id'}"/> - <separator orientation="vertical"/> <filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type'}"/> <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/> </group> @@ -553,9 +548,7 @@ <field name="arch" type="xml"> <search string="Search Survey Page"> <field name="title" string="Page"/> - <separator orientation="vertical"/> <field name="survey_id"/> - <newline/> <group expand="0" string="Group By..."> <filter string="Survey" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'survey_id'}"/> </group> @@ -759,11 +752,9 @@ <field name="arch" type="xml"> <search string="Search Question"> <field name="question" string="Question"/> - <separator orientation="vertical"/> - <field name="page_id"/> - <field name="survey" widget="selection"/> + <field name="survey"/> <field name="type"/> - <newline/> + <field name="page_id"/> <group expand="0" string="Group By..."> <filter string="Page" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'page_id'}"/> </group> @@ -1180,22 +1171,17 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Search Survey"> - <group> - <field name="email" string="Survey"/> - <separator orientation="vertical"/> - <filter icon="terp-gtk-media-pause" string="Waiting Answer" domain="[('state','=','waiting_answer')]"/> - <filter icon="terp-emblem-important" string="Late" domain="[('date_deadline','<',current_date)]"/> - <filter string="My Survey(s)" icon="terp-personal" domain="[('user_id','=',uid)]"/> - <separator orientation="vertical"/> - <field name="survey_id" widget="selection"/> - <field name="user_id"/> - </group> - <newline/> + <field name="email" string="Survey"/> + <filter icon="terp-gtk-media-pause" string="Waiting Answer" domain="[('state','=','waiting_answer')]"/> + <separator/> + <filter icon="terp-emblem-important" string="Late" domain="[('date_deadline','<',current_date)]"/> + <separator/> + <filter string="My Survey(s)" icon="terp-personal" domain="[('user_id','=',uid)]"/> + <field name="survey_id" widget="selection"/> + <field name="user_id"/> <group expand="0" string="Group By..."> <filter string="User" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/> - <separator orientation="vertical"/> <filter string="Survey" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'survey_id'}"/> - <separator orientation="vertical"/> <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/> </group> </search> diff --git a/addons/wiki/wiki_view.xml b/addons/wiki/wiki_view.xml index b0f0ab0198e..d0d4c35a80d 100644 --- a/addons/wiki/wiki_view.xml +++ b/addons/wiki/wiki_view.xml @@ -176,14 +176,10 @@ <field name="name" filter_domain="['|', '|', ('name','ilike',self), ('section','ilike',self), ('tags','ilike',self)]" string="Wiki"/> - <separator orientation="vertical"/> <field name="write_date" groups="base.group_no_one"/> - <separator orientation="vertical"/> <filter icon="terp-gtk-jump-to-ltr" string="Need Review" domain="[('review','=',True)]"/> - <separator orientation="vertical"/> <field name="group_id"/> <field name="write_uid"/> - <newline/> <group expand="0" string="Group By..."> <filter icon="terp-folder-blue" string="Wiki Group" domain="[]" context="{'group_by':'group_id'}"/> <filter icon="terp-personal" string="Author" domain="[]" context="{'group_by':'create_uid'}"/> |
