diff options
| author | Xavier Morel <xmo@openerp.com> | 2011-03-15 15:08:59 +0100 |
|---|---|---|
| committer | Xavier Morel <xmo@openerp.com> | 2011-03-15 15:08:59 +0100 |
| commit | 4e6a9ea55c84ce288d810f63b3a4a4cd801e37d8 (patch) | |
| tree | c9b5a20fc0f2676d9fc58826725f6dd31ac87c19 | |
| parent | 8141573deefd5046468beb628a91f1b46cff01ae (diff) | |
[REM] all @col and @colspan attributes on groups in search views: search views are not laid out by columns, therefore these attributes do not belong
bzr revid: xmo@openerp.com-20110315140859-uh9w3exdit84qz47
88 files changed, 238 insertions, 238 deletions
diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml index f608d673bbc..857963c6c52 100644 --- a/addons/account/account_invoice_view.xml +++ b/addons/account/account_invoice_view.xml @@ -356,7 +356,7 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Search Invoice"> - <group col="10" colspan="4"> + <group> <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"/> <filter name="invoices" icon="terp-dolar" string="Invoices" domain="[('state','not in',['draft','cancel'])]" help="Proforma/Open/Paid Invoices"/> @@ -372,7 +372,7 @@ <field name="amount_total"/> </group> <newline/> - <group col="10" colspan="4"> + <group> <field name="journal_id" widget="selection"/> <field name="period_id" string="Period"/> </group> diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml index 745b298d5dc..cb7ed89f5c0 100644 --- a/addons/account/account_view.xml +++ b/addons/account/account_view.xml @@ -202,7 +202,7 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Accounts"> - <group col="10" colspan="4"> + <group> <filter icon="terp-sale" string="Receivable Accounts" domain="[('type','=','receivable')]"/> <filter icon="terp-purchase" string="Payable Accounts" domain="[('type','=','payable')]"/> <separator orientation="vertical"/> @@ -482,7 +482,7 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Search Bank Statements"> - <group col="8" colspan="4"> + <group> <filter string="Draft" domain="[('state','=','draft')]" icon="terp-document-new"/> <filter string="Confirmed" domain="[('state','=','confirm')]" icon="terp-camera_test"/> <separator orientation="vertical"/> @@ -526,7 +526,7 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Search Bank Statements"> - <group col="8" colspan="4"> + <group> <filter string="Draft" domain="[('state','=','draft')]" icon="terp-document-new"/> <filter string="Confirmed" domain="[('state','=','confirm')]" icon="terp-camera_test"/> <separator orientation="vertical"/> @@ -906,7 +906,7 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Search Taxes"> - <group col="10" colspan="4"> + <group> <field name="name"/> <field name="description"/> </group> @@ -1174,7 +1174,7 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Search Journal Items"> - <group col='10' colspan='4'> + <group> <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"/> @@ -1194,7 +1194,7 @@ </field> </group> <newline/> - <group col="10" colspan="4"> + <group> <field name="journal_id" widget="selection" context="{'journal_id':self, 'visible_id':self, 'normal_view':False}"/> <field name="period_id" context="{'period_id':self, 'search_default_period_id':self}"/> </group> @@ -1206,7 +1206,7 @@ <field name="balance" string="Debit/Credit"/> </group> <newline/> - <group expand="0" string="Group By..." colspan="12" col="10"> + <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'}"/> @@ -1438,7 +1438,7 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Search Move"> - <group col='8' colspan='4'> + <group> <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"/> @@ -1450,12 +1450,12 @@ <field name="date"/> </group> <newline/> - <group col='8' colspan='4'> + <group> <field name="journal_id" widget="selection"/> <field name="period_id"/> </group> <newline/> - <group expand="0" string="Group By..." colspan="12" col="10"> + <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'}"/> @@ -1837,7 +1837,7 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Entry Subscription"> - <group col="8" colspan="4"> + <group> <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"/> @@ -2283,7 +2283,7 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Search Tax Templates"> - <group col="10" colspan="4"> + <group> <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"/> diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml index 62a7c6d5718..51a3ece226a 100644 --- a/addons/account/project/project_view.xml +++ b/addons/account/project/project_view.xml @@ -27,7 +27,7 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Analytic Account"> - <group col="8" colspan="4"> + <group> <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"/> @@ -201,7 +201,7 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Search Analytic Lines"> - <group col='6' colspan='4'> + <group> <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"/> @@ -433,7 +433,7 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Analytic Entries Stats"> - <group col="8" colspan="4"> + <group> <filter icon="terp-go-year" string="This Year" domain="[('name','=',time.strftime('%%Y'))]" help="Sale journal in this year"/> <filter icon="terp-go-month" string="This Month" domain="[('month','=',time.strftime('%%m'))]" help="Sale journal in this month"/> <separator orientation="vertical"/> diff --git a/addons/account/report/account_analytic_entries_report_view.xml b/addons/account/report/account_analytic_entries_report_view.xml index 22d743e5b9c..e30996c11c7 100644 --- a/addons/account/report/account_analytic_entries_report_view.xml +++ b/addons/account/report/account_analytic_entries_report_view.xml @@ -34,7 +34,7 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Analytic Entries Analysis"> - <group col="10" colspan="12"> + <group> <filter icon="terp-go-year" string=" 365 Days " domain="[('day','<=', time.strftime('%%Y-%%m-%%d')),('day','>',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]" help="Analytic Entries of last 365 days"/> diff --git a/addons/account/report/account_entries_report_view.xml b/addons/account/report/account_entries_report_view.xml index baa9e15182b..7c41ea6b9ee 100644 --- a/addons/account/report/account_entries_report_view.xml +++ b/addons/account/report/account_entries_report_view.xml @@ -67,7 +67,7 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Entries Analysis"> - <group colspan="10" col="12"> + <group> <filter icon="terp-go-year" string="This F.Year" name="thisyear" context="{'year':'current_year'}" diff --git a/addons/account/report/account_invoice_report_view.xml b/addons/account/report/account_invoice_report_view.xml index b393e8ab1aa..4af2c6f65b2 100644 --- a/addons/account/report/account_invoice_report_view.xml +++ b/addons/account/report/account_invoice_report_view.xml @@ -58,7 +58,7 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Invoices Analysis"> - <group col="10" colspan="12"> + <group> <filter string="Draft" icon="terp-document-new" domain="[('state','=','draft')]" diff --git a/addons/account_analytic_default/account_analytic_default_view.xml b/addons/account_analytic_default/account_analytic_default_view.xml index f078ba09c22..753765019f6 100644 --- a/addons/account_analytic_default/account_analytic_default_view.xml +++ b/addons/account_analytic_default/account_analytic_default_view.xml @@ -44,7 +44,7 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Accounts"> - <group col="10" colspan="4"> + <group> <filter icon="terp-go-month" string="Current" name = "current" help="Analytical defaults whose end date is greater than today or None" domain = "['|', ('date_stop', '>', datetime.date.today().strftime('%%Y-%%m-%%d')), ('date_stop', '=', False)]" /> <separator orientation="vertical"/> <field name="analytic_id" groups="analytic.group_analytic_accounting"/> diff --git a/addons/account_budget/account_budget_view.xml b/addons/account_budget/account_budget_view.xml index 6065786c6ca..139ce03aff7 100644 --- a/addons/account_budget/account_budget_view.xml +++ b/addons/account_budget/account_budget_view.xml @@ -170,7 +170,7 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Budget"> - <group col="20" colspan="4"> + <group> <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"/> diff --git a/addons/account_coda/account_coda_view.xml b/addons/account_coda/account_coda_view.xml index a16e68d5ee0..c369cf7b921 100644 --- a/addons/account_coda/account_coda_view.xml +++ b/addons/account_coda/account_coda_view.xml @@ -45,7 +45,7 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Search Coda"> - <group col="10" colspan="4"> + <group> <field name="journal_id" widget='selection'/> <field name="date"/> <field name="user_id" widget='selection'/> diff --git a/addons/account_followup/account_followup_view.xml b/addons/account_followup/account_followup_view.xml index 326264ffdcd..5bc47d54cfd 100644 --- a/addons/account_followup/account_followup_view.xml +++ b/addons/account_followup/account_followup_view.xml @@ -71,7 +71,7 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Search Followup"> - <group col="10" colspan="4"> + <group> <field name="name"/> <field name="company_id" widget="selection" groups="base.group_multi_company"/> </group> diff --git a/addons/account_followup/report/account_followup_report.xml b/addons/account_followup/report/account_followup_report.xml index 55691cd9397..3f5d95a4fa6 100644 --- a/addons/account_followup/report/account_followup_report.xml +++ b/addons/account_followup/report/account_followup_report.xml @@ -41,7 +41,7 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Follow-ups Sent"> - <group col="10" colspan="12"> + <group> <filter icon="terp-go-year" string="This Fiscal year" name="fiscalyear" domain="[('period_id','in','current_year')]" diff --git a/addons/account_payment/account_payment_view.xml b/addons/account_payment/account_payment_view.xml index 56ff30e5ded..ad8030ae1a0 100644 --- a/addons/account_payment/account_payment_view.xml +++ b/addons/account_payment/account_payment_view.xml @@ -199,7 +199,7 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Search Payment Orders"> - <group col="8" colspan="4"> + <group> <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"/> diff --git a/addons/account_voucher/account_voucher_view.xml b/addons/account_voucher/account_voucher_view.xml index 392ed7fa798..b419d2f0669 100644 --- a/addons/account_voucher/account_voucher_view.xml +++ b/addons/account_voucher/account_voucher_view.xml @@ -118,7 +118,7 @@ <field name="priority">1</field> <field name="arch" type="xml"> <search string="Search Vouchers"> - <group col='8' colspan='4'> + <group> <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"/> @@ -129,19 +129,19 @@ <field name="partner_id"/> </group> <newline/> - <group col='8' colspan='4'> + <group> <field name="journal_id" widget="selection" context="{'journal_id': self, 'set_visible':False}" /> <field name="period_id" groups="base.group_extended"/> </group> <newline/> - <group expand="0" string="Extended Filters..." col='8' colspan='4'> + <group expand="0" string="Extended Filters..."> <field name="reference"/> <field name="name"/> <field name="narration"/> <field name="amount"/> </group> <newline/> - <group expand="0" string="Group By..." colspan="4" col="10"> + <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'}"/> <filter string="Period" icon="terp-go-month" domain="[]" context="{'group_by':'period_id','visible':True}"/> 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 ad32978ddd8..c997b2ea256 100644 --- a/addons/account_voucher/report/account_voucher_sales_receipt_view.xml +++ b/addons/account_voucher/report/account_voucher_sales_receipt_view.xml @@ -48,7 +48,7 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Sales Receipt Analysis"> - <group col="10" colspan="12"> + <group> <filter string="Draft" icon="terp-document-new" domain="[('state','=','draft')]" diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml index b62cba19d65..f72ea9c37cd 100644 --- a/addons/account_voucher/voucher_payment_receipt_view.xml +++ b/addons/account_voucher/voucher_payment_receipt_view.xml @@ -8,7 +8,7 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Search Vouchers"> - <group col='8' colspan='4'> + <group> <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"/> @@ -19,19 +19,19 @@ <field name="partner_id" string="Customer"/> </group> <newline/> - <group col='8' colspan='4'> + <group> <field name="journal_id" widget="selection" context="{'journal_id': self, 'set_visible':False}" domain="[('type','in',('bank','cash'))]"/> <field name="period_id" groups="base.group_extended"/> </group> <newline/> - <group expand="0" string="Extended Filters..." col='8' colspan='4'> + <group expand="0" string="Extended Filters..."> <field name="reference"/> <field name="name"/> <field name="narration"/> <field name="amount"/> </group> <newline/> - <group expand="0" string="Group By..." colspan="4" col="10"> + <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'}"/> <filter string="Period" icon="terp-go-month" domain="[]" context="{'group_by':'period_id','visible':True}"/> @@ -48,7 +48,7 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Search Vouchers"> - <group col='8' colspan='4'> + <group> <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"/> @@ -59,19 +59,19 @@ <field name="partner_id" string="Supplier"/> </group> <newline/> - <group col='8' colspan='4'> + <group> <field name="journal_id" widget="selection" context="{'journal_id': self, 'set_visible':False}" domain="[('type','in',('bank','cash'))]"/> <field name="period_id" groups="base.group_extended"/> </group> <newline/> - <group expand="0" string="Extended Filters..." col='8' colspan='4'> + <group expand="0" string="Extended Filters..."> <field name="reference"/> <field name="name"/> <field name="narration"/> <field name="amount"/> </group> <newline/> - <group expand="0" string="Group By..." colspan="4" col="10"> + <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'}"/> <filter string="Period" icon="terp-go-month" domain="[]" context="{'group_by':'period_id','visible':True}"/> diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml index 0921f0a5f8a..54428771149 100644 --- a/addons/account_voucher/voucher_sales_purchase_view.xml +++ b/addons/account_voucher/voucher_sales_purchase_view.xml @@ -7,7 +7,7 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Search Vouchers"> - <group col='8' colspan='4'> + <group> <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"/> @@ -18,19 +18,19 @@ <field name="partner_id" string="Supplier"/> </group> <newline/> - <group col='8' colspan='4'> + <group> <field name="journal_id" widget="selection" context="{'journal_id': self, 'set_visible':False}" domain="[('type','in',('purchase','purchase_refund'))]"/> <field name="period_id" groups="base.group_extended"/> </group> <newline/> - <group expand="0" string="Extended Filters..." col='8' colspan='4'> + <group expand="0" string="Extended Filters..."> <field name="reference"/> <field name="name"/> <field name="narration"/> <field name="amount"/> </group> <newline/> - <group expand="0" string="Group By..." colspan="4" col="10"> + <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'}"/> <filter string="Period" icon="terp-go-month" domain="[]" context="{'group_by':'period_id','visible':True}"/> @@ -46,7 +46,7 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Search Vouchers"> - <group col='8' colspan='4'> + <group> <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"/> @@ -57,19 +57,19 @@ <field name="partner_id" string="Customer"/> </group> <newline/> - <group col='8' colspan='4'> + <group> <field name="journal_id" widget="selection" context="{'journal_id': self, 'set_visible':False}" domain="[('type','in',('sale','sale_refund'))]"/> <field name="period_id" groups="base.group_extended"/> </group> <newline/> - <group expand="0" string="Extended Filters..." col='8' colspan='4'> + <group expand="0" string="Extended Filters..."> <field name="reference"/> <field name="name"/> <field name="narration"/> <field name="amount"/> </group> <newline/> - <group expand="0" string="Group By..." colspan="4" col="10"> + <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'}"/> <filter string="Period" icon="terp-go-month" domain="[]" context="{'group_by':'period_id','visible':True}"/> diff --git a/addons/auction/auction_view.xml b/addons/auction/auction_view.xml index 6e457f06db3..5b9a7458b7e 100644 --- a/addons/auction/auction_view.xml +++ b/addons/auction/auction_view.xml @@ -216,7 +216,7 @@ <field name="auction1" string="First Auction Date"/> <field name="auction2" string="Last Auction Date"/> <newline/> - <group expand="0" string="Group By..." colspan="16"> + <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="Auction Date" @@ -446,7 +446,7 @@ <field name="bord_vnd_id"/> <field name="state"/> <newline/> - <group expand="0" string="Group By..." colspan="16"> + <group expand="0" string="Group By..."> <filter string="Buyer" icon="terp-personal" help="Buyer" domain="[]" @@ -610,7 +610,7 @@ <field name="method"/> <field name="date_dep"/> <newline/> - <group expand="0" string="Group By..." colspan="16"> + <group expand="0" string="Group By..."> <filter string="Seller" icon="terp-personal" help="Seller" domain="[]" @@ -743,7 +743,7 @@ <field name="partner_id"/> <field name="contact_tel"/> <newline/> - <group expand="0" string="Group By..." colspan="16"> + <group expand="0" string="Group By..."> <filter string="Buyer" icon="terp-personal" help="Buyer" domain="[]" diff --git a/addons/auction/report/report_auction_view.xml b/addons/auction/report/report_auction_view.xml index b7e17970884..328e1c48aab 100644 --- a/addons/auction/report/report_auction_view.xml +++ b/addons/auction/report/report_auction_view.xml @@ -69,7 +69,7 @@ <field name="lot_type"/> </group> <newline/> - <group expand="1" string="Group By..." colspan="10" col="12"> + <group expand="1" string="Group By..."> <filter string="User" icon="terp-personal" name="User" context="{'group_by':'user_id'}"/> <filter string="Buyer" icon="terp-personal" name="buyer" context="{'group_by':'buyer'}"/> <filter string="Seller" icon="terp-personal" name="seller" context="{'group_by':'seller'}"/> diff --git a/addons/audittrail/audittrail_view.xml b/addons/audittrail/audittrail_view.xml index 6f6b461d1a6..ec52b295e6e 100644 --- a/addons/audittrail/audittrail_view.xml +++ b/addons/audittrail/audittrail_view.xml @@ -56,7 +56,7 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Search Audittrail Rule"> - <group col="8" colspan="4"> + <group> <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"/> @@ -64,7 +64,7 @@ <field name="object_id"/> </group> <newline/> - <group expand="0" string="Group By..." colspan="4" col="10" groups="base.group_extended"> + <group expand="0" string="Group By..." groups="base.group_extended"> <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/> </group> </search> @@ -158,13 +158,13 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Search Audittrail Log"> - <group col="8" colspan="4"> + <group> <field name="name"/> <field name="object_id"/> <field name="user_id" widget="selection"/> </group> <newline/> - <group expand="0" string="Group By..." colspan="4" col="10" groups="base.group_extended"> + <group expand="0" string="Group By..." groups="base.group_extended"> <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'}"/> diff --git a/addons/base_calendar/base_calendar_view.xml b/addons/base_calendar/base_calendar_view.xml index 31f9dbbe5b8..575a48e8ea5 100644 --- a/addons/base_calendar/base_calendar_view.xml +++ b/addons/base_calendar/base_calendar_view.xml @@ -448,7 +448,7 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Search Events"> - <group col="12" colspan="4"> + <group> <filter icon="terp-go-today" string="My Events" domain="[('user_id','=',uid)]" help="My Events" /> diff --git a/addons/base_synchro/base_synchro_view.xml b/addons/base_synchro/base_synchro_view.xml index f161d6c31ea..07f71539bb7 100644 --- a/addons/base_synchro/base_synchro_view.xml +++ b/addons/base_synchro/base_synchro_view.xml @@ -36,12 +36,12 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Transfered Ids Details"> - <group colspan="4" col="10"> + <group> <field name="name"/> <field name="obj_id"/> </group> <newline/> - <group expand="0" string="Group By" colspan="4"> + <group expand="0" string="Group By"> <filter string="Object" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'obj_id'}"/> <separator orientation="vertical"/> <filter string="Date" icon="terp-go-month" domain="[]" context="{'group_by':'name'}"/> @@ -118,12 +118,12 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Synchronized objects"> - <group colspan="4" col="10"> + <group> <field name="model_id"/> <field name="synchronize_date"/> </group> <newline/> - <group expand="0" string="Group By" colspan="4"> + <group expand="0" string="Group By"> <filter string="Object to synchronize" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'model_id'}"/> <separator orientation="vertical"/> <filter string="Latest synchronization" icon="terp-go-month" domain="[]" context="{'group_by':'synchronize_date'}"/> diff --git a/addons/board/board_administration_view.xml b/addons/board/board_administration_view.xml index 0e9f08690f6..3eec988fc2d 100644 --- a/addons/board/board_administration_view.xml +++ b/addons/board/board_administration_view.xml @@ -37,7 +37,7 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Log Analysis"> - <group col="20" colspan="8"> + <group> <filter icon="terp-go-year" string=" Year " domain="[('create_date','<=', time.strftime('%%Y-%%m-%%d')),('create_date','>=',time.strftime('%%Y-01-01'))]" help="Log created in current year"/> diff --git a/addons/board/board_view.xml b/addons/board/board_view.xml index d48ddd6a025..5edf9eaa4f5 100644 --- a/addons/board/board_view.xml +++ b/addons/board/board_view.xml @@ -8,13 +8,13 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Notes"> - <group col="10" colspan="4"> + <group> <field name="name" string="Subject"/> <field name="type" string="Note Type"/> <field name="date" string="Date"/> </group> <newline/> - <group expand="0" colspan="4" string="Group By..."> + <group expand="0" string="Group By..."> <filter string="Author" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/> </group> </search> diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml index 8f37787db6e..df9cf6fa68b 100644 --- a/addons/crm/crm_meeting_view.xml +++ b/addons/crm/crm_meeting_view.xml @@ -294,7 +294,7 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Search Meetings"> - <group col="12" colspan="4"> + <group> <filter icon="terp-check" name="current" string="Current" domain="[('state','in',('draft', 'open'))]" groups="base.group_extended" diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml index 9b87c64483e..924244cd135 100644 --- a/addons/crm/crm_opportunity_view.xml +++ b/addons/crm/crm_opportunity_view.xml @@ -326,7 +326,7 @@ <field name="date_closed"/> </group> <newline/> - <group expand="0" string="Group By..." colspan="16"> + <group expand="0" string="Group By..."> <filter string="Salesman" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}" /> <filter string="Team" help="Sales Team" icon="terp-personal+" domain="[]" context="{'group_by':'section_id'}"/> diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml index 6667a3202f5..08b9bd77502 100644 --- a/addons/crm/crm_phonecall_view.xml +++ b/addons/crm/crm_phonecall_view.xml @@ -280,7 +280,7 @@ help="My Sales Team(s)" /> </field> <newline/> - <group expand="0" string="Group By..." colspan="4"> + <group expand="0" string="Group By..."> <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}" /> <filter string="Responsible" icon="terp-personal" diff --git a/addons/crm/crm_report_view.xml b/addons/crm/crm_report_view.xml index b74512e282a..e4701c94443 100644 --- a/addons/crm/crm_report_view.xml +++ b/addons/crm/crm_report_view.xml @@ -69,7 +69,7 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Cases by Team and Type"> - <group col="10" colspan="4"> + <group> <filter string="This Year" icon="terp-go-year" domain="[('name','=',time.localtime()[0])]" help="Cases by Team and Type for this year" /> @@ -161,7 +161,7 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Cases by Team and Stage"> - <group col="8" colspan="4"> + <group> <filter string="This Year" icon="terp-go-year" domain="[('name','=',time.localtime()[0])]" help="Cases by Team and Stage for this year" /> @@ -236,7 +236,7 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Cases by Section, Category and Stage"> - <group col='8' colspan='4'> + <group> <filter string="This Year" icon="terp-go-year" domain="[('name','=',time.localtime()[0])]" help="Cases by Section, Category and Stage for this year" /> @@ -329,7 +329,7 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Search Cases by User"> - <group col='12' colspan='4'> + <group> <filter string="This Year" icon="terp-go-year" domain="[('name','=',time.localtime()[0])]" help="Cases by User for this year" /> diff --git a/addons/crm/report/crm_lead_report_view.xml b/addons/crm/report/crm_lead_report_view.xml index eb88f17bd83..795b52eaee2 100644 --- a/addons/crm/report/crm_lead_report_view.xml +++ b/addons/crm/report/crm_lead_report_view.xml @@ -70,7 +70,7 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Leads Analysis"> - <group col="20" colspan="8"> + <group> <filter icon="terp-personal" string="Lead" domain="[('type','=', 'lead')]" diff --git a/addons/crm/report/crm_phonecall_report_view.xml b/addons/crm/report/crm_phonecall_report_view.xml index 5cf29de5422..7d5a7ce1395 100644 --- a/addons/crm/report/crm_phonecall_report_view.xml +++ b/addons/crm/report/crm_phonecall_report_view.xml @@ -51,7 +51,7 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Search"> - <group col="16" colspan="8"> + <group> <filter string=" Year " icon="terp-go-year" domain="[('create_date','<=', time.strftime('%%Y-%%m-%%d')),('create_date','>=',time.strftime('%%Y-01-01'))]" help="Phone calls made in current year"/> diff --git a/addons/crm_claim/report/crm_claim_report_view.xml b/addons/crm_claim/report/crm_claim_report_view.xml index 70b78a40c51..1d81f81708e 100644 --- a/addons/crm_claim/report/crm_claim_report_view.xml +++ b/addons/crm_claim/report/crm_claim_report_view.xml @@ -54,7 +54,7 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Search"> - <group col="16" colspan="8"> + <group> <filter string=" Year " icon="terp-go-year" domain="[('create_date','<=', time.strftime('%%Y-%%m-%%d')),('create_date','>=',time.strftime('%%Y-01-01'))]" help="Claims created in current year"/> diff --git a/addons/crm_fundraising/report/crm_fundraising_report_view.xml b/addons/crm_fundraising/report/crm_fundraising_report_view.xml index 7ad99c966f9..b01e605ac37 100644 --- a/addons/crm_fundraising/report/crm_fundraising_report_view.xml +++ b/addons/crm_fundraising/report/crm_fundraising_report_view.xml @@ -75,7 +75,7 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Search"> - <group col="16" colspan="8"> + <group> <filter string=" Year " icon="terp-go-year" domain="[('create_date','<=', time.strftime('%%Y-%%m-%%d')),('create_date','>=',time.strftime('%%Y-01-01'))]" help="Funds raised in current year"/> diff --git a/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml b/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml index 6559c166f12..919e9b0576e 100644 --- a/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml +++ b/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml @@ -53,7 +53,7 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Search"> - <group col="16" colspan="9"> + <group> <filter string=" Year " icon="terp-go-year" domain="[('create_date','<=', time.strftime('%%Y-%%m-%%d')),('create_date','>=',time.strftime('%%Y-01-01'))]" help="Helpdesk requests occurred in current year"/> 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 fa705903715..80d0fe40f8f 100644 --- a/addons/crm_partner_assign/report/crm_lead_report_view.xml +++ b/addons/crm_partner_assign/report/crm_lead_report_view.xml @@ -9,7 +9,7 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Leads Analysis"> - <group col="20" colspan="8"> + <group> <filter string="Last 30 Days" icon="terp-go-month" name="this_month" domain="[('create_date','>',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"/> <filter icon="terp-go-week" string="7 Days" diff --git a/addons/document/report/document_report_view.xml b/addons/document/report/document_report_view.xml index d4479e7578b..e7fa4efb5be 100644 --- a/addons/document/report/document_report_view.xml +++ b/addons/document/report/document_report_view.xml @@ -41,7 +41,7 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="All users files"> - <group col="12" colspan="4"> + <group> <separator orientation="vertical"/> <filter icon="terp-go-year" string="This Year" domain="[('name','=',time.localtime()[0])]" help="All Months Files"/> <filter icon="terp-go-month" string="This Month" domain="[('month','=',time.localtime()[1])]" help="This Months Files"/> diff --git a/addons/email_template/email_template_view.xml b/addons/email_template/email_template_view.xml index 088e2a39625..bb91fbabe8a 100644 --- a/addons/email_template/email_template_view.xml +++ b/addons/email_template/email_template_view.xml @@ -172,7 +172,7 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Templates"> - <group col="13" colspan="4"> + <group> <field name="name"/> <field name="object_name"/> <field name="def_to"/> @@ -182,7 +182,7 @@ <field name="file_name"/> </group> <newline/> - <group expand="0" string="Group by..." colspan="4" col="10"> + <group expand="0" string="Group by..."> <filter string="Account" domain="[]" context="{'group_by':'from_account'}" icon="terp-folder-orange"/> <separator orientation="vertical"/> <filter string="Resource" domain="[]" context="{'group_by':'object_name'}" icon="terp-accessories-archiver"/> diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml index a496d8cffe9..639fc05a635 100644 --- a/addons/event/event_view.xml +++ b/addons/event/event_view.xml @@ -227,7 +227,7 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Events"> - <group col="10" colspan="4"> + <group> <filter icon="terp-check" string="Current" name="draft" domain="[('state','in',('draft', 'confirm'))]" help="Events in draft or confirmed state"/> <filter icon="terp-camera_test" string="Confirmed" domain="[('state','=','confirm')]" help="Confirmed events"/> <separator orientation="vertical"/> @@ -248,7 +248,7 @@ </field> </group> <newline/> - <group expand="0" string="Group By..." colspan="4" col="12"> + <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'}"/> @@ -476,7 +476,7 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Event Registration"> - <group col="12" colspan="4"> + <group> <filter icon="terp-check" string="Current" name="draft" domain="[('state','in',('draft', 'open'))]" help="Registrations in unconfirmed or confirmed state"/> <filter icon="terp-camera_test" string="Confirmed" domain="[('state','=','open')]" help="Confirmed registrations"/> <separator orientation="vertical"/> diff --git a/addons/event/report/report_event_registration_view.xml b/addons/event/report/report_event_registration_view.xml index eb19712b8c8..90d09d30781 100644 --- a/addons/event/report/report_event_registration_view.xml +++ b/addons/event/report/report_event_registration_view.xml @@ -52,7 +52,7 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Event on Registration"> - <group col="8" colspan="4"> + <group> <filter icon="terp-go-year" string="Last 365 Days" name="365day" domain="[('date','<=', time.strftime('%%Y-%%m-%%d')),('date','>',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]" help="Events with beginning date in last 365 days"/> @@ -93,7 +93,7 @@ </group> <newline/> - <group expand="1" string="Group By..." colspan="4" col="12"> + <group expand="1" string="Group By..."> <filter string="Responsible" name="user_id" icon="terp-personal" context="{'group_by': 'user_id'}"/> <filter string="Speaker" name="speaker" icon="terp-personal+" context="{'group_by': 'speaker_id'}"/> <filter string="Sale Team" icon="terp-personal" context="{'group_by': 'section_id'}"/> diff --git a/addons/hr_contract/hr_contract_view.xml b/addons/hr_contract/hr_contract_view.xml index 67607af8146..cfafc00ad74 100644 --- a/addons/hr_contract/hr_contract_view.xml +++ b/addons/hr_contract/hr_contract_view.xml @@ -36,12 +36,12 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Search Wage Type"> - <group col='15' colspan='4'> + <group> <field name="name"/> <field name="type"/> </group> <newline/> - <group expand="0" string="Group By..." colspan="4" col="20"> + <group expand="0" string="Group By..."> <filter string="Period" icon="terp-go-month" domain="[]" context="{'group_by':'period_id'}"/> </group> </search> @@ -78,7 +78,7 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Search Wage Period"> - <group col='15' colspan='4'> + <group> <field name="name"/> </group> </search> @@ -131,7 +131,7 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Search Contract"> - <group col='15' colspan='4'> + <group> <filter string="Current" icon="terp-check" name="current" domain="['|',('date_end','>=', time.strftime('%%Y-%%m-%%d')),('date_end','=',False)]" help="Contracts in progress"/> <filter string="Overpassed" icon="terp-emblem-important" domain="[('date_end','<', time.strftime('%%Y-%%m-%%d'))]" help="Contracts whose end date already passed"/> <separator orientation="vertical"/> @@ -142,7 +142,7 @@ <field name="date_end"/> </group> <newline/> - <group expand="0" string="Group By..." colspan="4" col="20"> + <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'}"/> @@ -251,7 +251,7 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Search Contract Type"> - <group col='15' colspan='4'> + <group> <field name="name"/> </group> </search> diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml index 27b3ba53d10..fd742d92da7 100644 --- a/addons/hr_evaluation/hr_evaluation_view.xml +++ b/addons/hr_evaluation/hr_evaluation_view.xml @@ -8,7 +8,7 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Search Evaluation Plan"> - <group col='15' colspan='4'> + <group> <field name="name"/> <field name="company_id" widget="selection" groups="base.group_multi_company"/> </group> @@ -251,7 +251,7 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Search Evaluation"> - <group col='10' colspan='4'> + <group> <filter icon="terp-check" string="Current" domain="[('state','=','wait'))]" help="Evaluations that are in waiting state"/> <filter icon="terp-camera_test" string="In progress" domain="[('state','=','progress')]" help="Evaluations that are in progress state"/> <separator orientation="vertical"/> @@ -340,7 +340,7 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Search Evaluation"> - <group col='10' colspan='4'> + <group> <filter icon="terp-gtk-go-back-rtl" string="To Do" name="todo" domain="[('state','=','waiting_answer')]"/> <separator orientation="vertical"/> <filter icon="terp-gnome-cpu-frequency-applet+" string="Late" domain="[('date_deadline','<',current_date)]"/> diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml index 7740470ccc7..d46dbad54e3 100644 --- a/addons/hr_holidays/hr_holidays_view.xml +++ b/addons/hr_holidays/hr_holidays_view.xml @@ -8,7 +8,7 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Search Leave"> - <group col='8' colspan='4'> + <group> <filter icon="terp-camera_test" domain="[('state','=','validate')]" string="Validated"/> <separator orientation="vertical"/> <filter icon="terp-check" domain="[('state','=','draft')]" string="To Confirm"/> diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml index 4e8613bef30..ab8cf83c9b0 100644 --- a/addons/hr_payroll/hr_payroll_view.xml +++ b/addons/hr_payroll/hr_payroll_view.xml @@ -58,14 +58,14 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Search Passport"> - <group col="8" colspan="4"> + <group> <field name="name"/> <field name="employee_id"/> <field name="country_id"/> <field name="address_id"/> </group> <newline/> - <group col="8" colspan="4" expand="0" string="Group By..."> + <group expand="0" string="Group By..."> <filter string="Employees" icon="terp-partner" name="employee_id" context="{'group_by':'employee_id'}"/> <filter string="Country" name="country_id" icon="terp-go-home" context="{'group_by':'country_id'}"/> <filter string="Expire" name="date_expire" icon="terp-go-month" context="{'group_by':'date_expire'}"/> @@ -487,7 +487,7 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Search Payslips"> - <group col="8" colspan="4"> + <group> <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Slip"/> <filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Slip"/> <separator orientation="vertical"/> @@ -499,7 +499,7 @@ <field name="date"/> </group> <newline/> - <group col="8" colspan="4" expand="0" string="Group By..."> + <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="Register" icon="terp-folder-yellow" name="register_id" context="{'group_by':'register_id'}"/> @@ -616,7 +616,7 @@ <field name="code"/> <field name="type"/> <newline/> - <group expand="0" string="Group By..." colspan="4" col="4" groups="base.group_extended"> + <group expand="0" string="Group By..." groups="base.group_extended"> <filter string="Based" icon="terp-go-month" domain="[]" context="{'group_by':'base'}"/> <filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type'}"/> </group> @@ -703,7 +703,7 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Search Company Contribution"> - <group col="8" colspan="4"> + <group> <filter icon="terp-document-new" string="Fixed Amount" domain="[('amount_type','=','fix')]" help="Draft Slip"/> <filter icon="terp-camera_test" string="Function Calculation" domain="[('amount_type','=','func')]" help="Posted Slip"/> <separator orientation="vertical"/> @@ -713,7 +713,7 @@ <field name="register_id"/> </group> <newline/> - <group col="8" colspan="4" expand="0" string="Group By..."> + <group expand="0" string="Group By..."> <filter string="Type" icon="terp-stock_symbol-selection" name="amount_type" context="{'group_by':'amount_type'}"/> <filter string="Category" name="category_id" icon="terp-stock_symbol-selection" context="{'group_by':'category_id'}"/> </group> diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml index 8e58bcb1604..cd94b69fe31 100644 --- a/addons/hr_recruitment/hr_recruitment_view.xml +++ b/addons/hr_recruitment/hr_recruitment_view.xml @@ -252,7 +252,7 @@ help="My Department"/> </field> <newline/> - <group expand="0" string="Group By..." colspan="11" col="20"> + <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"/> diff --git a/addons/hr_timesheet/hr_timesheet_view.xml b/addons/hr_timesheet/hr_timesheet_view.xml index 9a13e2e9c94..321f0d0036a 100644 --- a/addons/hr_timesheet/hr_timesheet_view.xml +++ b/addons/hr_timesheet/hr_timesheet_view.xml @@ -62,7 +62,7 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Timesheet"> - <group col='8' colspan='4'> + <group> <filter name="today" icon="terp-go-today" domain="[('date', '=', time.strftime('%%Y-%%m-%%d'))]" string="Today"/> <separator orientation="vertical"/> <field name="user_id"/> 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 92fff2b7196..d7ae5304ade 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,7 +46,7 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Timesheet by user"> - <group col="10" colspan="4"> + <group> <filter icon="terp-go-year" string="This Year" domain="[('date','<=', time.strftime('%%Y-%%m-%%d')),('date','>',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]" help="Timesheet lines in this year"/> @@ -69,7 +69,7 @@ <field name="product_id"/> </group> <newline/> - <group expand="0" string="Extended Filters..." colspan="10" col="12"> + <group expand="0" string="Extended Filters..."> <field name="date"/> <separator orientation="vertical"/> <field name="invoice_id" widget="selection"/> @@ -161,7 +161,7 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Timesheet by user"> - <group col="10" colspan="4"> + <group> <separator orientation="vertical"/> <filter icon="terp-go-year" string="This Year" domain="[('name','=',time.strftime('%%Y'))]" help="Timesheet by user in this year"/> <filter icon="terp-go-month" string="This Month" domain="[('month','=',time.strftime('%%m'))]" help="Timesheet by user in this month"/> @@ -298,7 +298,7 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Daily timesheet by account"> - <group col="10" colspan="4"> + <group> <separator orientation="vertical"/> <filter icon="terp-go-year" string="This Year" domain="[('name','=',time.strftime('%%Y'))]" help="Daily Timesheets for this year"/> <filter icon="terp-go-month" string="This Month" domain="[('month','=',time.strftime('%%m'))]" help="Daily Timesheets of this month"/> diff --git a/addons/hr_timesheet_invoice/report/report_analytic_view.xml b/addons/hr_timesheet_invoice/report/report_analytic_view.xml index 1895b5072ba..c196beae880 100644 --- a/addons/hr_timesheet_invoice/report/report_analytic_view.xml +++ b/addons/hr_timesheet_invoice/report/report_analytic_view.xml @@ -113,7 +113,7 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Analytic Lines to Invoice"> - <group col="12" colspan="4"> + <group> <filter string="This Year" icon="terp-go-year" domain="[('name','=',time.localtime()[0])]"/> <filter string="This Month" icon="terp-go-month" domain="[('month','=',time.localtime()[1])]"/> <separator orientation="vertical"/> diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml index 11d5685caa0..0b7c69dd3e8 100644 --- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml +++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml @@ -33,7 +33,7 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Search Account"> - <group col="10" colspan="4"> + <group> <field name="sheet_id" /> <field name="name" groups="analytic.group_analytic_accounting"/> <field name="invoice_rate"/> @@ -159,7 +159,7 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Search Timesheet"> - <group col="10" colspan="4"> + <group> <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"/> 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 52147d062ac..96151786676 100644 --- a/addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml +++ b/addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml @@ -40,7 +40,7 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Timesheet"> - <group col="10" colspan="12"> + <group> <filter icon="terp-go-year" string=" Year " name="year" domain="[('date','<=', time.strftime('%%Y-%%m-%%d')),('date','>=',time.strftime('%%Y-01-01'))]" diff --git a/addons/hr_timesheet_sheet/report/timesheet_report_view.xml b/addons/hr_timesheet_sheet/report/timesheet_report_view.xml index 08abc6db63b..4206fef3e52 100644 --- a/addons/hr_timesheet_sheet/report/timesheet_report_view.xml +++ b/addons/hr_timesheet_sheet/report/timesheet_report_view.xml @@ -48,7 +48,7 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Timesheet"> - <group col="10" colspan="12"> + <group> <filter icon="terp-go-year" string=" Year " domain="[('date_current','<=', time.strftime('%%Y-%%m-%%d')),('date_current','>',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]" help="Timesheet in current year"/> diff --git a/addons/idea/idea_view.xml b/addons/idea/idea_view.xml index c2c890c5efa..beac18f81c8 100644 --- a/addons/idea/idea_view.xml +++ b/addons/idea/idea_view.xml @@ -8,12 +8,12 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Ideas Categories"> - <group col="10" colspan="4"> + <group> <field name="name" string="Category"/> <field name="parent_id" widget="selection"/> </group> <newline/> - <group expand="0" string="Group By..." colspan="14"> + <group expand="0" string="Group By..."> <filter string="Parent Category" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'parent_id'}"/> </group> </search> @@ -169,12 +169,12 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Ideas vote"> - <group col="10" colspan="4"> + <group> <field name="idea_id" widget="selection"/> <field name="user_id" string="User"/> </group> <newline/> - <group expand="0" string="Group By..." colspan="14"> + <group expand="0" string="Group By..."> <filter string="User" name="user" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/> <separator orientation="vertical"/> <filter string="Idea" icon="terp-idea" domain="[]" context="{'group_by':'idea_id'}"/> @@ -288,7 +288,7 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Ideas"> - <group col="10" colspan="4"> + <group> <filter icon="terp-check" string="Current" domain="[('state','in', ('draft', 'open'))]" help="Draft and Open Ideas"/> <filter icon="terp-camera_test" string="Accepted" domain="[('state','=','close')]" help="Accepted Ideas" /> @@ -298,7 +298,7 @@ <field name="user_id"/> </group> <newline/> - <group expand="0" string="Group By..." colspan="12" col="10"> + <group expand="0" string="Group By..."> <filter icon="terp-personal" string="Creator" help="By Creators" context="{'group_by':'user_id'}"/> <separator orientation="vertical"/> <filter icon="terp-stock_symbol-selection" string="Category" help="By Idea Category" context="{'group_by':'category_id'}"/> diff --git a/addons/idea/report/report_vote_view.xml b/addons/idea/report/report_vote_view.xml index 3ca67d907a5..eb5cfe3c28b 100644 --- a/addons/idea/report/report_vote_view.xml +++ b/addons/idea/report/report_vote_view.xml @@ -62,7 +62,7 @@ <field name="user_id"/> </group> <newline/> - <group expand="1" string="Group By..." colspan="10" col="12"> + <group expand="1" string="Group By..."> <filter string="Creator" icon="terp-personal" context="{'group_by':'creater_id'}"/> <filter string="User" icon="terp-personal" name="User" context="{'group_by':'user_id'}"/> <separator orientation="vertical"/> diff --git a/addons/lunch/lunch_view.xml b/addons/lunch/lunch_view.xml index 1c0547f7056..c00b92c4e71 100644 --- a/addons/lunch/lunch_view.xml +++ b/addons/lunch/lunch_view.xml @@ -83,7 +83,7 @@ <field name="user_id"/> <field name="date"/> <newline/> - <group expand="0" string="Group By..." colspan="4" col="20"> + <group expand="0" string="Group By..."> <filter string="Category" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'category'}"/> </group> </search> @@ -191,7 +191,7 @@ <field name="user_cashmove"/> <field name="create_date"/> <newline/> - <group expand="0" string="Group By..." colspan="4" col="20"> + <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'}"/> @@ -380,7 +380,7 @@ <field name="amount"/> </group> <newline/> - <group expand="0" string="Group By..." colspan="4" col="4"> + <group expand="0" string="Group By..."> <filter string="Box" icon="terp-dolar" context="{'group_by':'box'}"/> </group> </search> diff --git a/addons/lunch/report/report_lunch_order_view.xml b/addons/lunch/report/report_lunch_order_view.xml index 816438f36d2..5dd25322d47 100644 --- a/addons/lunch/report/report_lunch_order_view.xml +++ b/addons/lunch/report/report_lunch_order_view.xml @@ -39,7 +39,7 @@ help="Tasks during last 7 days"/> </group> <newline/> - <group expand="0" string="Group By..." colspan="10" col="12"> + <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"/> diff --git a/addons/marketing_campaign/marketing_campaign_view.xml b/addons/marketing_campaign/marketing_campaign_view.xml index a171c71b742..52bfe3bb873 100644 --- a/addons/marketing_campaign/marketing_campaign_view.xml +++ b/addons/marketing_campaign/marketing_campaign_view.xml @@ -97,7 +97,7 @@ <field name="name"/> <field name="object_id" string="Resource"/> <newline/> - <group expand="0" string="Group By..." colspan="10" col="12"> + <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'}" /> @@ -204,7 +204,7 @@ <field name="object_id"/> <field name="date_run"/> <newline/> - <group expand="0" string="Group By..." colspan="10" col="12"> + <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="State" name="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}" /> @@ -396,7 +396,7 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Marketing Campaign Activities"> - <group colspan="4" col="10"> + <group> <filter icon="terp-go-today" string="Today" name="today" domain="[('date','<', time.strftime('%%Y-%%m-%%d 23:59:59')), ('date','>=', time.strftime('%%Y-%%m-%%d 00:00:00'))]"/> <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')]"/> @@ -411,7 +411,7 @@ <field name="partner_id"/> </group> <newline/> - <group expand="0" string="Group By..." colspan="10" col="12"> + <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'}" /> diff --git a/addons/marketing_campaign/report/campaign_analysis_view.xml b/addons/marketing_campaign/report/campaign_analysis_view.xml index 745dd4047e5..653cc5c553d 100644 --- a/addons/marketing_campaign/report/campaign_analysis_view.xml +++ b/addons/marketing_campaign/report/campaign_analysis_view.xml @@ -59,7 +59,7 @@ <field name="country_id"/> </group> <newline/> - <group expand="0" string="Group By..." colspan="10" col="12"> + <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'}" /> diff --git a/addons/membership/report/report_membership_view.xml b/addons/membership/report/report_membership_view.xml index b14d3dcb88c..722667ba913 100644 --- a/addons/membership/report/report_membership_view.xml +++ b/addons/membership/report/report_membership_view.xml @@ -35,7 +35,7 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Membership"> - <group col="8" colspan="4"> + <group> <filter string="Last 365 Days" icon="terp-go-year" domain="[('date_from','<=', time.strftime('%%Y-%%m-%%d')), ('date_from','>',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"/> <filter string="Last 30 Days" icon="terp-go-month" name="month" @@ -49,7 +49,7 @@ <field name="user_id"/> </group> <newline/> - <group expand="1" string="Group By..." colspan="4" col="12"> + <group expand="1" string="Group By..."> <filter string="Salesman" icon="terp-personal" name="salesman" domain="[]" context="{'group_by':'user_id'}"/> <filter string="Associated Partner" icon="terp-partner" name="associate_member_id" diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml index 1ac11707870..d525a302741 100644 --- a/addons/mrp/mrp_view.xml +++ b/addons/mrp/mrp_view.xml @@ -79,13 +79,13 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Search"> - <group col='15' colspan='4'> + <group> <field name="name"/> <field name="composition"/> <field name="group_id" widget="selection" /> </group> <newline/> - <group expand="0" string="Group By..." colspan="4" col="20"> + <group expand="0" string="Group By..."> <filter string="Property Group" icon="terp-personal" domain="[]" context="{'group_by':'group_id'}"/> </group> </search> @@ -183,7 +183,7 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Search for mrp workcenter"> - <group col='15' colspan='4'> + <group> <filter string="Inactive" icon="terp-gdu-smart-failing" domain="[('active','=',False)]"/> <separator orientation="vertical"/> <field name="code"/> @@ -191,7 +191,7 @@ <field name="resource_type"/> </group> <newline/> - <group expand="0" string="Group By..." colspan="4" col="20" groups="base.group_extended"> + <group expand="0" string="Group By..." groups="base.group_extended"> <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"/> @@ -289,7 +289,7 @@ <field name="location_id"/> <field name="company_id" groups="base.group_multi_company"/> <newline/> - <group expand="0" string="Group By..." colspan="4" col="8" groups="base.group_extended"> + <group expand="0" string="Group By..." groups="base.group_extended"> <filter string="Production Location" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'location_id'}"/> </group> </search> @@ -420,14 +420,14 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Search Bill Of Material"> - <group col='4' colspan='4'> + <group> <field name="name"/> <field name="code" string="Reference"/> <field name="product_id"/> <field name="company_id" groups="base.group_multi_company"/> </group> <newline/> - <group expand="0" string="Group By..." colspan="4" col="8" groups="base.group_extended"> + <group expand="0" string="Group By..." groups="base.group_extended"> <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/> <filter string='Default UOM' icon="terp-mrp" domain="[]" context="{'group_by' : 'product_uom'}" /> <separator orientation="vertical"/> @@ -796,7 +796,7 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Search Production"> - <group col='9' colspan='4'> + <group> <filter icon="terp-gtk-media-pause" string="Pending" name="pending" domain="[('state','=','confirmed')]" help="Manufacturing Orders which are waiting for raw materials."/> @@ -817,7 +817,7 @@ <field name="origin"/> </group> <newline/> - <group expand="0" string="Group By..." colspan="10" col="8" groups="base.group_extended"> + <group expand="0" string="Group By..." groups="base.group_extended"> <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'}" groups="base.group_extended"/> diff --git a/addons/mrp/report/mrp_production_order_view.xml b/addons/mrp/report/mrp_production_order_view.xml index 27ccab40c94..5fdea3b8f0a 100644 --- a/addons/mrp/report/mrp_production_order_view.xml +++ b/addons/mrp/report/mrp_production_order_view.xml @@ -47,7 +47,7 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Search"> - <group col="16" colspan="6"> + <group> <filter icon="terp-go-year" string="Year" domain="[('year','=',time.strftime('%%Y'))]" help="Production performed during current year"/> diff --git a/addons/mrp_operations/mrp_operations_view.xml b/addons/mrp_operations/mrp_operations_view.xml index 575ecb6429e..4af2994d0d1 100644 --- a/addons/mrp_operations/mrp_operations_view.xml +++ b/addons/mrp_operations/mrp_operations_view.xml @@ -131,7 +131,7 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Search Work Orders"> - <group col='9' colspan='4'> + <group> <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]"/> <filter icon="terp-check" string="In Progress" name="Current" @@ -150,7 +150,7 @@ <field name="date_planned" widget="date"/> </group> <newline/> - <group expand="0" string="Group By..." colspan="10" col="8" groups="base.group_extended"> + <group expand="0" string="Group By..." groups="base.group_extended"> <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"/> diff --git a/addons/mrp_operations/report/mrp_workorder_analysis_view.xml b/addons/mrp_operations/report/mrp_workorder_analysis_view.xml index a9b62644765..03ec22ce0a5 100644 --- a/addons/mrp_operations/report/mrp_workorder_analysis_view.xml +++ b/addons/mrp_operations/report/mrp_workorder_analysis_view.xml @@ -46,7 +46,7 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Search"> - <group col="16" colspan="6"> + <group> <filter icon="terp-go-year" string="Year" domain="[('year','=',time.strftime('%%Y'))]" help="Work orders made during current year"/> diff --git a/addons/mrp_repair/mrp_repair_view.xml b/addons/mrp_repair/mrp_repair_view.xml index c8554070a7c..6093305556c 100644 --- a/addons/mrp_repair/mrp_repair_view.xml +++ b/addons/mrp_repair/mrp_repair_view.xml @@ -179,7 +179,7 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Search Reair Orders"> - <group col='4' colspan='4'> + <group> <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')]"/> @@ -192,7 +192,7 @@ <field name="state" /> </group> <newline/> - <group expand="0" string="Group By..." colspan="10" col="8"> + <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'}"/> diff --git a/addons/point_of_sale/account_statement_view.xml b/addons/point_of_sale/account_statement_view.xml index 2b09639588b..895ecaca174 100644 --- a/addons/point_of_sale/account_statement_view.xml +++ b/addons/point_of_sale/account_statement_view.xml @@ -39,7 +39,7 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Search Cash Statements"> - <group col="8" colspan="4"> + <group> <filter string="Open" domain="[('state','=','open')]" icon="terp-document-new" name="open"/> <separator orientation="vertical"/> <field name="date"/> @@ -64,7 +64,7 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Search Cash Statements"> - <group col="8" colspan="4"> + <group> <filter string="Open" domain="[('state','=','open')]" icon="terp-document-new" name="open"/> <filter string="Confirm" domain="[('state','=','confirm')]" icon="terp-camera_test"/> <separator orientation="vertical"/> diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml index acc0a72ff3b..b8fd85b707a 100644 --- a/addons/point_of_sale/point_of_sale_view.xml +++ b/addons/point_of_sale/point_of_sale_view.xml @@ -140,7 +140,7 @@ <field name="user_id"/> <field name="date_order" string="Order date"/> <newline/> - <group expand="0" string="Group By..." colspan="11" col="11" groups="base.group_extended"> + <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'}"/> <separator string="" orientation="vertical"/> 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 9bd4fdd57eb..8b18bf0b57a 100644 --- a/addons/point_of_sale/report/pos_order_report_view.xml +++ b/addons/point_of_sale/report/pos_order_report_view.xml @@ -76,7 +76,7 @@ <field name="date_payment"/> </group> <newline/> - <group expand="1" string="Group By..." colspan="10" col="12"> + <group expand="1" string="Group By..."> <filter string="Salesman" icon="terp-personal" name="User" context="{'group_by':'user_id'}"/> <filter string="Customer" icon="terp-personal" context="{'group_by':'partner_id'}"/> <separator orientation="vertical"/> diff --git a/addons/point_of_sale/report/report_cash_register_view.xml b/addons/point_of_sale/report/report_cash_register_view.xml index 91776914647..8e42a9a5ce0 100644 --- a/addons/point_of_sale/report/report_cash_register_view.xml +++ b/addons/point_of_sale/report/report_cash_register_view.xml @@ -59,7 +59,7 @@ </field> </group> <newline/> - <group expand="1" string="Group By..." colspan="10" col="12"> + <group expand="1" string="Group By..."> <filter string="User" name="User" icon="terp-personal" context="{'group_by':'user_id'}"/> <filter string="Journal" icon="terp-folder-orange" context="{'group_by':'journal_id'}"/> <separator orientation="vertical"/> diff --git a/addons/process/process_view.xml b/addons/process/process_view.xml index d158dd83425..de92b9c6c60 100644 --- a/addons/process/process_view.xml +++ b/addons/process/process_view.xml @@ -108,12 +108,12 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Search Process"> - <group col="10" colspan="4"> + <group> <field name="name"/> <field name="model_id"/> </group> <newline/> - <group expand="0" string="Group By..." colspan="4" col="4"> + <group expand="0" string="Group By..."> <filter string="Object" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'model_id'}"/> </group> </search> @@ -213,13 +213,13 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Search ProcessNode"> - <group col="10" colspan="4"> + <group> <field name="name"/> <field name="model_id"/> <field name="kind" /> </group> <newline/> - <group expand="0" string="Group By..." colspan="4" col="4"> + <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'}"/> </group> @@ -302,7 +302,7 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Search Process Transition"> - <group col="10" colspan="4"> + <group> <field name="name"/> <field name="source_node_id"/> <field name="target_node_id" /> diff --git a/addons/procurement/procurement_view.xml b/addons/procurement/procurement_view.xml index ed353f996f8..6b5af29cdc1 100644 --- a/addons/procurement/procurement_view.xml +++ b/addons/procurement/procurement_view.xml @@ -100,7 +100,7 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Search Procurement"> - <group col='10' colspan='4'> + <group> <filter icon="terp-check" string="Current" domain="[('state','in',('draft','confirmed'))]" name="current" help="Procurement Orders in draft or open state."/> <filter icon="terp-gnome-cpu-frequency-applet+" string="Late" domain="['&', ('date_planned::date','<', current_date), ('state', 'in', ('draft', 'confirmed'))]" @@ -116,7 +116,7 @@ <field name="state" /> </group> <newline/> - <group expand="0" string="Group By" colspan="4" col="8" groups="base.group_extended"> + <group expand="0" string="Group By" groups="base.group_extended"> <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'}"/> <filter string="Scheduled Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_planned'}"/> @@ -181,7 +181,7 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Minimum Stock Rules Search"> - <group col="10" colspan="4"> + <group> <field name="name"/> <field name="warehouse_id" widget="selection"/> <field name="location_id"/> @@ -189,7 +189,7 @@ <field name="product_id"/> </group> <newline/> - <group expand="0" string="Group By..." colspan="4" col="10"> + <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'}"/> </group> diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml index 1449f435c4e..72f802951a5 100644 --- a/addons/project/project_view.xml +++ b/addons/project/project_view.xml @@ -106,7 +106,7 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Search Project"> - <group col='15' colspan='4'> + <group> <filter icon="terp-check" string="Current" name="Current" domain="[('state', 'in',('open','pending'))]" help="Open and Pending Projects"/> <separator orientation="vertical"/> <filter icon="terp-personal+" string="Member" domain="['|',('user_id', '=', uid),('members', '=', uid)]" help="Projects in which I am a member."/> @@ -118,7 +118,7 @@ <field name="partner_id" string="Partner"/> </group> <newline /> - <group expand="0" string="Group By..." colspan="4" col="20" groups="base.group_extended"> + <group expand="0" string="Group By..." groups="base.group_extended"> <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"/> @@ -395,7 +395,7 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Task Edition"> - <group col="20" colspan="4"> + <group> <filter string="Current" domain="[('state','in',('open','draft'))]" name="current" help="Draft and In Progress tasks" icon="terp-check"/> <filter 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"/> @@ -416,7 +416,7 @@ </field> </group> <newline/> - <group expand="0" string="Group By..." colspan="4" col="20"> + <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'}"/> diff --git a/addons/project/report/project_report_view.xml b/addons/project/report/project_report_view.xml index ad891e80bfd..35a0615b1b6 100644 --- a/addons/project/report/project_report_view.xml +++ b/addons/project/report/project_report_view.xml @@ -59,7 +59,7 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Tasks Analysis"> - <group colspan="10" col="12"> + <group> <filter icon="terp-go-year" string=" Year " domain="[('date_start','<=', time.strftime('%%Y-%%m-%%d')),('date_start','>=',time.strftime('%%Y-01-01'))]" help="Current Year"/> @@ -108,7 +108,7 @@ <field name="partner_id" /> </group> <newline/> - <group expand="0" string="Extended Filters..." colspan="10" col="12" groups="base.group_extended"> + <group expand="0" string="Extended Filters..." groups="base.group_extended"> <field name="priority"/> <field name="type_id" widget="selection"/> <separator orientation="vertical"/> @@ -121,7 +121,7 @@ </group> <newline/> - <group expand="1" string="Group By..." colspan="10" col="12"> + <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"/> diff --git a/addons/project_issue/report/project_issue_report_view.xml b/addons/project_issue/report/project_issue_report_view.xml index a9e1772f1ad..bc118345369 100644 --- a/addons/project_issue/report/project_issue_report_view.xml +++ b/addons/project_issue/report/project_issue_report_view.xml @@ -53,7 +53,7 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Search"> - <group col="16" colspan="8"> + <group> <filter string="Year" icon="terp-go-year" help="Current Year" domain="[('create_date','<=', time.strftime('%%Y-%%m-%%d')),('create_date','>=',time.strftime('%%Y-01-01'))]" /> @@ -92,7 +92,7 @@ <field name="user_id" widget="selection"/> </group> <newline/> - <group expand="0" string="Extended Filters..." colspan="10" col="12" groups="base.group_extended"> + <group expand="0" string="Extended Filters..." groups="base.group_extended"> <field name="partner_id"/> <field name="assigned_to" widget="selection"/> <separator orientation="vertical"/> @@ -109,7 +109,7 @@ <field name="date_closed" string="Date Closed"/> </group> <newline/> - <group expand="1" string="Group By..." colspan="4" col="8"> + <group expand="1" string="Group By..."> <filter name="User" string="Responsible" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}" /> <filter string="Assigned to" name="Responsible" icon="terp-personal" diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml index b720da13654..cbbe848bc8f 100644 --- a/addons/project_long_term/project_long_term_view.xml +++ b/addons/project_long_term/project_long_term_view.xml @@ -74,13 +74,13 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Resources Allocation"> - <group colspan="4" col="20"> + <group> <field name="resource_id"/> <field name="phase_id"/> <field name="project_id"/> </group> <newline/> - <group expand="0" string="Group By..." colspan="4" col="20"> + <group expand="0" string="Group By..."> <filter name="resource" string="Resource" icon="terp-personal" domain="[]" context="{'group_by':'resource_id'}"/> <separator orientation="vertical"/> <filter string="Project" icon="terp-folder-violet" domain="[]" context="{'group_by':'project_id'}"/> @@ -266,7 +266,7 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Project Phases"> - <group colspan="4" col="20"> + <group> <filter string="Current" domain="[('state','in',('open','draft'))]" name="current" help="Draft and In Progress 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"/> @@ -280,7 +280,7 @@ <field name="date_end"/> </group> <newline/> - <group expand="0" string="Group By..." colspan="4" col="20" groups="base.group_extended"> + <group expand="0" string="Group By..." groups="base.group_extended"> <filter string="Responsible" icon="terp-personal" domain="[]" context="{'group_by':'responsible_id'}"/> <separator orientation="vertical"/> <filter string="Project" icon="terp-folder-violet" domain="[]" context="{'group_by':'project_id'}" name="project"/> diff --git a/addons/project_messages/project_messages_view.xml b/addons/project_messages/project_messages_view.xml index 46b2a3f4163..5fc6e999f4d 100644 --- a/addons/project_messages/project_messages_view.xml +++ b/addons/project_messages/project_messages_view.xml @@ -78,7 +78,7 @@ <field name="message"/> </group> <newline/> - <group expand="0" string="Group By..." colspan="4" col="20"> + <group expand="0" string="Group By..."> <filter string="Message To" icon="terp-personal" domain="[]" context="{'group_by':'to_id'}"/> <filter string="Message From" icon="terp-personal" domain="[]" context="{'group_by':'from_id'}"/> <separator orientation="vertical"/> diff --git a/addons/project_planning/project_planning_view.xml b/addons/project_planning/project_planning_view.xml index bb69963c780..be4bbce1f5e 100644 --- a/addons/project_planning/project_planning_view.xml +++ b/addons/project_planning/project_planning_view.xml @@ -156,7 +156,7 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Planning by Account"> - <group col="8" colspan="4"> + <group> <filter icon="terp-check" string="Current Plannings" domain="[('date_from','<=',time.strftime('%%Y-%%m-%%d')),('date_to','>=',time.strftime('%%Y-%%m-%%d'))]" help="Current Plannings"/> <separator orientation="vertical"/> <field name="name"/> @@ -274,7 +274,7 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Planning statistics"> - <group col="10" colspan="4"> + <group> <field name="planning_id"/> <field name="user_id"/> <field name="account_id" groups="analytic.group_analytic_accounting"/> diff --git a/addons/project_scrum/project_scrum_view.xml b/addons/project_scrum/project_scrum_view.xml index 950cf0f41cf..cc13bb0813e 100644 --- a/addons/project_scrum/project_scrum_view.xml +++ b/addons/project_scrum/project_scrum_view.xml @@ -129,7 +129,7 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Product Backlogs"> - <group col="10" colspan="4"> + <group> <filter icon="terp-check" string="Current" @@ -163,7 +163,7 @@ </field> </group> <newline/> - <group expand="0" string="Group By..." colspan="4" col="20" groups="base.group_extended"> + <group expand="0" string="Group By..." groups="base.group_extended"> <filter string="Author" 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'}"/> @@ -317,7 +317,7 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Sprints"> - <group col="10" colspan="4"> + <group> <filter name="terp-check" icon="terp-check" string="Current" domain="[('state','in',('draft','open'))]" help="Draft and open Sprints"/> <separator orientation="vertical"/> <filter icon="terp-camera_test" string="Open" domain="[('state','=','open')]" help="Open Sprints"/> @@ -329,7 +329,7 @@ <field name="date_start"/> </group> <newline/> - <group expand="0" string="Group By..." colspan="4" col="20"> + <group expand="0" string="Group By..."> <filter string="Product owner" icon="terp-personal" domain="[]" context="{'group_by':'product_owner_id'}"/> <filter string="Scrum Master" icon="terp-personal" domain="[]" context="{'group_by':'scrum_master_id'}"/> <separator orientation="vertical"/> @@ -425,7 +425,7 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Scrum Sprint"> - <group col="10" colspan="4"> + <group> <filter name="scrum_daily" icon="terp-go-today" string="Daily" domain="[('date','=',time.strftime('%%Y-%%m-%%d'))]" help="Daily Meetings"/> <separator orientation="vertical"/> <field name="sprint_id"> @@ -434,7 +434,7 @@ <field name="date"/> </group> <newline/> - <group expand="0" string="Group By..." colspan="4" col="20"> + <group expand="0" string="Group By..."> <filter string="Sprint" icon="terp-gtk-jump-to-ltr" domain="[]" context="{'group_by':'sprint_id'}"/> <separator orientation="vertical"/> <filter string="Month" icon="terp-go-month" domain="[]" context="{'group_by':'date'}" help="Meeting Date"/> diff --git a/addons/project_timesheet/report/task_report_view.xml b/addons/project_timesheet/report/task_report_view.xml index c73bc9dc039..48cb1b02aed 100644 --- a/addons/project_timesheet/report/task_report_view.xml +++ b/addons/project_timesheet/report/task_report_view.xml @@ -30,7 +30,7 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Tasks by User"> - <group colspan="4" col="3"> + <group> <filter icon="terp-go-year" string=" Year " name="year" domain="[('name','<=', time.strftime('%%Y-%%m-%%d')),('name','>=',time.strftime('%%Y-01-01'))]" @@ -47,7 +47,7 @@ <field name="user_id"/> </group> <newline/> - <group expand="1" string="Group By..." colspan="4" col="3"> + <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"/> diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml index 18545594f22..a4391ddf9ea 100644 --- a/addons/purchase/purchase_view.xml +++ b/addons/purchase/purchase_view.xml @@ -232,7 +232,7 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Search Purchase Order"> - <group col='10' colspan='4'> + <group> <filter icon="terp-document-new" name="draft" string="Quotations" domain="[('state','=','draft')]" help="Purchase order which are in draft state"/> <filter icon="terp-camera_test" name="confirmed" string="To Approve" domain="[('state','in',('wait','confirmed'))]" help="Purchase order to be approved"/> <filter icon="terp-check" name="approved" string="Approved" domain="[('state','in',('approved','done'))]" help="Approved purchase order"/> @@ -247,7 +247,7 @@ <field name="create_uid"/> </group> <newline/> - <group expand="0" string="Group By..." colspan="4" col="10" groups="base.group_extended"> + <group expand="0" string="Group By..." groups="base.group_extended"> <filter string="Supplier" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/> <separator orientation="vertical"/> <filter string="Origin" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'origin'}"/> diff --git a/addons/purchase/report/purchase_report_view.xml b/addons/purchase/report/purchase_report_view.xml index 85c5eb04123..474e0ade046 100644 --- a/addons/purchase/report/purchase_report_view.xml +++ b/addons/purchase/report/purchase_report_view.xml @@ -53,7 +53,7 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Purchase Orders"> - <group colspan="10" col="12"> + <group> <filter icon="terp-go-year" string=" Year " domain="[('date','<=', time.strftime('%%Y-%%m-%%d')),('date','>=',time.strftime('%%Y-01-01'))]" help="Order in current year"/> @@ -79,7 +79,7 @@ <field name="product_id"/> </group> <newline/> - <group expand="0" string="Extended Filters..." colspan="10" col="12" groups="base.group_extended"> + <group expand="0" string="Extended Filters..." groups="base.group_extended"> <field name="user_id"/> <field name="validator"/> <separator orientation="vertical"/> @@ -93,7 +93,7 @@ <field name="expected_date"/> </group> <newline/> - <group expand="1" string="Group By..." colspan="10" col="12"> + <group expand="1" string="Group By..."> <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'}"/> diff --git a/addons/purchase_requisition/purchase_requisition_view.xml b/addons/purchase_requisition/purchase_requisition_view.xml index ffb01cbfddf..ebc5764fef9 100644 --- a/addons/purchase_requisition/purchase_requisition_view.xml +++ b/addons/purchase_requisition/purchase_requisition_view.xml @@ -119,7 +119,7 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Search Purchase Requisition"> - <group col='10' colspan='4'> + <group> <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Purchase Requisition"/> <filter icon="terp-camera_test" string="In Progress" domain="[('state','=','in_progress')]" help="Purchase Requisition in negociation"/> <filter icon="terp-dialog-close" string="Done" domain="[('state','=','done')]" help="Current Purchase Requisition"/> @@ -130,7 +130,7 @@ <field name="exclusive" /> </group> <newline/> - <group expand="0" string="Group By..." colspan="4" col="10" groups="base.group_extended"> + <group expand="0" string="Group By..." groups="base.group_extended"> <filter string="Responsible" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/> <separator orientation="vertical"/> <filter string="Origin" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'origin'}"/> diff --git a/addons/report_intrastat/report_intrastat_view.xml b/addons/report_intrastat/report_intrastat_view.xml index 8e56150bb60..b14b94ef315 100644 --- a/addons/report_intrastat/report_intrastat_view.xml +++ b/addons/report_intrastat/report_intrastat_view.xml @@ -97,7 +97,7 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Intrastat Data"> - <group col="10" colspan="4"> + <group> <filter string="This Year" icon="terp-go-year" domain="[('name','=',time.localtime()[0])]"/> <filter string="This Month" icon="terp-go-month" domain="[('month','=',time.localtime()[1])]"/> <separator orientation="vertical"/> diff --git a/addons/resource/resource_view.xml b/addons/resource/resource_view.xml index 7663a5af5d4..6384f96d77d 100644 --- a/addons/resource/resource_view.xml +++ b/addons/resource/resource_view.xml @@ -10,7 +10,7 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Search Resource"> - <group col='15' colspan='4'> + <group> <filter string="Inactive" icon="terp-gdu-smart-failing" domain="[('active','=',False)]"/> <separator orientation="vertical"/> <field name="name"/> @@ -19,7 +19,7 @@ <field name="company_id" widget="selection" groups="base.group_multi_company"/> </group> <newline/> - <group expand="0" string="Group By..." colspan="4" col="20" groups="base.group_extended"> + <group expand="0" string="Group By..." groups="base.group_extended"> <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'}"/> @@ -38,7 +38,7 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Search Working Time"> - <group col='15' colspan='4'> + <group> <field name="name" string="Name"/> <field name="manager"/> <field name="company_id" widget="selection" groups="base.group_multi_company"/> @@ -53,14 +53,14 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Search Working Period Leaves"> - <group col='15' colspan='4'> + <group> <field name="name" string="Reason"/> <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..." colspan="4" col="20"> + <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"/> diff --git a/addons/sale/report/sale_report_view.xml b/addons/sale/report/sale_report_view.xml index 3d8aadeff0a..031cfe72d52 100644 --- a/addons/sale/report/sale_report_view.xml +++ b/addons/sale/report/sale_report_view.xml @@ -93,7 +93,7 @@ <field name="date_confirm"/> </group> <newline/> - <group expand="1" string="Group By..." colspan="10" col="12"> + <group expand="1" string="Group By..."> <filter string="Salesman" 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"/> diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml index 5be47a6a838..2e0bfe6a5a2 100644 --- a/addons/sale/sale_view.xml +++ b/addons/sale/sale_view.xml @@ -273,7 +273,7 @@ <filter domain="[('user_id','=',uid)]" help="My Sale Orders" icon="terp-personal"/> </field> <newline/> - <group expand="0" string="Group By..." colspan="11" col="11" groups="base.group_extended"> + <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'}"/> <separator orientation="vertical"/> @@ -434,7 +434,7 @@ <filter icon="terp-personnal" domain="[('salesman_id','=',uid)]" help="Sales Order Lines related to a Sales Order of mine"/> </field> <newline/> - <group expand="context.get('report',False)" string="Group By..." colspan="9" col="8"> + <group expand="context.get('report',False)" 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'}"/> <filter string="Salesman" icon="terp-personal" domain="[]" context="{'group_by':'salesman_id'}"/> @@ -478,7 +478,7 @@ <filter icon="terp-personal" domain="[('salesman_id','=',uid)]" help="My Sales Order Lines"/> </field> <newline /> - <group expand="0" string="Group By..." colspan="9" col="8"> + <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"/> diff --git a/addons/sale_margin/report/report_margin_view.xml b/addons/sale_margin/report/report_margin_view.xml index fdc624b36ae..ff7111bba09 100644 --- a/addons/sale_margin/report/report_margin_view.xml +++ b/addons/sale_margin/report/report_margin_view.xml @@ -31,7 +31,7 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Search Margin"> - <group col="10" colspan="4"> + <group> <filter icon="terp-go-year" string="This Year" domain="[('year','=',time.strftime('%%Y'))]" help="All Months Sales by Margin"/> <filter icon="terp-go-month" string="This Month" domain="[('month','=',time.strftime('%%m'))]" help="This Months Sales by Margin"/> <separator orientation="vertical"/> @@ -53,7 +53,7 @@ <field name="categ_id"/> </group> <newline/> - <group expand="1" string="Group By..." colspan="4" col="10"> + <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'}"/> diff --git a/addons/stock/report/report_stock_move_view.xml b/addons/stock/report/report_stock_move_view.xml index 25abf4d7333..6431b8c4ee7 100644 --- a/addons/stock/report/report_stock_move_view.xml +++ b/addons/stock/report/report_stock_move_view.xml @@ -187,7 +187,7 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Inventory Analysis"> - <group col="16"> + <group> <filter string="Real" name="real" icon="terp-check" diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml index d774d9a2327..e438e10672d 100644 --- a/addons/stock/stock_view.xml +++ b/addons/stock/stock_view.xml @@ -75,13 +75,13 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Search Inventory"> - <group col="10" colspan="4"> + <group> <field name="name"/> <field name="date"/> <field name="company_id" groups="base.group_multi_company" widget="selection"/> </group> <newline/> - <group expand="0" string="Group By..." colspan="4" col="4" groups="base.group_extended"> + <group expand="0" string="Group By..." groups="base.group_extended"> <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/> <filter string="Date" icon="terp-go-month" domain="[]" context="{'group_by':'date'}"/> </group> @@ -275,7 +275,7 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Pack Search"> - <group col="10" colspan="4"> + <group> <field name="name" /> <field name="serial" /> <field name="date" /> @@ -383,7 +383,7 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Product Lots Filter"> - <group col="10" colspan="4"> + <group> <filter icon="terp-check" name="available" string="Available" domain="[('stock_available', '>', 0)]" help="Available Product Lots" /> <separator orientation="vertical"/> <field name="prefix"/> @@ -393,7 +393,7 @@ <field name="date"/> </group> <newline/> - <group expand="0" string="Group By..." colspan="4" col="8"> + <group expand="0" string="Group By..."> <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/> </group> </search> @@ -831,7 +831,7 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Search Stock Picking"> - <group col="10" colspan="4"> + <group> <filter icon="terp-check" name="available" string="Available" domain="[('state','=','assigned')]" help="Available Pickings"/> <filter icon="terp-camera_test" string="Confirmed" domain="[('state','=','confirmed')]" help="Confirmed Pickings"/> <filter icon="terp-dialog-close" name="done" string="Done" domain="[('state','=','done')]" help="Pickings already processed"/> @@ -845,7 +845,7 @@ <field name="stock_journal_id" groups="base.group_extended" widget="selection"/> </group> <newline/> - <group expand="0" string="Group By..." colspan="4" col="8"> + <group expand="0" string="Group By..."> <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/> <separator orientation="vertical" /> <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/> @@ -1024,7 +1024,7 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Picking list"> - <group col="8" colspan="4"> + <group> <filter icon="terp-check" name="available" string="Available" domain="[('state','=','assigned')]" help="Assigned Delivery Orders"/> <filter icon="terp-camera_test" name="confirmed" string="Confirmed" domain="[('state','=','confirmed')]" help="Confirmed Delivery Orders"/> <filter icon="terp-dialog-close" name="done" string="Done" domain="[('state','=','done')]" help="Delivery orders already processed"/> @@ -1040,7 +1040,7 @@ <field name="company_id" widget="selection" groups="base.group_multi_company"/> </group> <newline/> - <group expand="0" string="Group By..." colspan="4" col="8"> + <group expand="0" string="Group By..."> <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/> <separator orientation="vertical" /> <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/> @@ -1243,7 +1243,7 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Incoming Shipments"> - <group col="8" colspan="4"> + <group> <filter icon="terp-check" name="available" string="Available" 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 orientation="vertical" /> @@ -1256,11 +1256,11 @@ <field name="company_id" widget="selection" groups="base.group_multi_company" /> </group> <newline/> - <group expand="0" string="Extended Filters..." colspan="4" col="8"> + <group expand="0" string="Extended Filters..."> <filter string="To invoice" name="to_invoice" icon="terp-dolar" domain="[('invoice_state', '=', '2binvoiced')]" /> </group> <newline/> - <group expand="0" string="Group By..." colspan="4" col="8"> + <group expand="0" string="Group By..."> <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/> <separator orientation="vertical" /> <filter icon="terp-stock_effects-object-colorize" name="state" string="State" domain="[]" context="{'group_by':'state'}"/> @@ -1311,7 +1311,7 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Internal Picking List"> - <group col="8" colspan="4"> + <group> <filter icon="terp-check" string="Available" domain="[('state','=','assigned')]" help="Assigned Internal Moves"/> <filter icon="terp-camera_test" name="confirmed" string="Confirmed" domain="[('state','=','confirmed')]" help="Confirmed Internal Moves" /> <separator orientation="vertical"/> @@ -1321,7 +1321,7 @@ <field name="company_id" widget="selection"/> </group> <newline/> - <group expand="0" string="Group By..." colspan="4" col="8"> + <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'}"/> @@ -1489,7 +1489,7 @@ <field eval="3" name="priority"/> <field name="arch" type="xml"> <search string="Stock Moves"> - <group col="14" colspan="4"> + <group> <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"/> <filter icon="terp-dialog-close" string="Done" name="done" domain="[('state','=','done')]" help="Stock moves that have been processed"/> @@ -1502,7 +1502,7 @@ <field name="date"/> </group> <newline/> - <group expand="0" string="Extended Filters..." colspan="4" col="8" groups="base.group_extended"> + <group expand="0" string="Extended Filters..." groups="base.group_extended"> <field name="origin"/> <field name="picking_id"/> <field name="prodlot_id"/> @@ -1510,7 +1510,7 @@ <field name="state"/> </group> <newline/> - <group expand="0" string="Group By..." colspan="4" col="8" groups="base.group_extended"> + <group expand="0" string="Group By..." groups="base.group_extended"> <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'}"/> @@ -1686,7 +1686,7 @@ <field eval="6" name="priority"/> <field name="arch" type="xml"> <search string="Stock Moves"> - <group col="8" colspan="4"> + <group> <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"/> <filter icon="terp-gtk-go-back-rtl" name="receive" string="To Do" domain="[('state','in',('confirmed','assigned'))]" help="Stock to be received"/> @@ -1702,7 +1702,7 @@ <field name="prodlot_id"/> </group> <newline/> - <group expand="0" string="Group By..." colspan="4" col="8" groups="base.group_extended"> + <group expand="0" string="Group By..." groups="base.group_extended"> <filter string="Supplier" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/> <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/> <separator orientation="vertical"/> @@ -1722,7 +1722,7 @@ <field eval="6" name="priority"/> <field name="arch" type="xml"> <search string="Stock Moves"> - <group col="8" colspan="4"> + <group> <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"/> <filter icon="terp-gtk-go-back-rtl" name="receive" string="To Do" domain="[('state','in',('confirmed','assigned'))]" help="Stock to be delivered (available or not)"/> @@ -1739,7 +1739,7 @@ <field name="prodlot_id"/> </group> <newline/> - <group expand="0" string="Group By..." colspan="4" col="8" groups="base.group_extended"> + <group expand="0" string="Group By..." groups="base.group_extended"> <filter string="Customer" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/> <separator orientation="vertical"/> <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/> diff --git a/addons/stock_planning/stock_planning_view.xml b/addons/stock_planning/stock_planning_view.xml index e292f0d1e1d..c2dfa2fba5a 100644 --- a/addons/stock_planning/stock_planning_view.xml +++ b/addons/stock_planning/stock_planning_view.xml @@ -197,7 +197,7 @@ <field name="product_id"/> <field name="create_uid"/> <newline/> - <group expand="0" string="Group By..." colspan="4" col="8"> + <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'}"/> @@ -301,7 +301,7 @@ <field name="period_id" widget="selection"/> <field name="product_id"/> <newline/> - <group expand="0" string="Group By..." colspan="4" col="8"> + <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'}"/> diff --git a/addons/subscription/subscription_view.xml b/addons/subscription/subscription_view.xml index d0c2fd4463e..550240d522e 100644 --- a/addons/subscription/subscription_view.xml +++ b/addons/subscription/subscription_view.xml @@ -75,7 +75,7 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Search Subscription"> - <group col="10" colspan="4"> + <group> <filter icon="terp-check" string="Running" domain="[('state','=','running')]"/> @@ -89,7 +89,7 @@ <field name="partner_id"/> </group> <newline/> - <group expand="0" string="Group By..." colspan="4" col="4"> + <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"/> @@ -169,7 +169,7 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Subscription Document"> - <group col="10" colspan="4"> + <group> <field name="name"/> <field name="model"/> </group> diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml index a344d3cc7a9..e9809fdb821 100644 --- a/addons/survey/survey_view.xml +++ b/addons/survey/survey_view.xml @@ -260,7 +260,7 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Search Survey"> - <group col='10' colspan='4'> + <group> <filter icon="terp-check" string="Current" domain="[('state','in', ('draft', 'open'))]"/> <separator orientation="vertical"/> <field name="title"/> @@ -270,7 +270,7 @@ </field> </group> <newline/> - <group expand="0" string="Group By..." colspan="4" col="20"> + <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'}"/> @@ -476,7 +476,7 @@ <field name="title"/> <field name="survey_id"/> <newline/> - <group expand="0" string="Group By..." colspan="4" col="20"> + <group expand="0" string="Group By..."> <filter string="Survey" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'survey_id'}"/> </group> </search> @@ -682,7 +682,7 @@ <field name="survey" widget="selection"/> <field name="type"/> <newline/> - <group expand="0" string="Group By..." colspan="4" col="20"> + <group expand="0" string="Group By..."> <filter string="Page" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'page_id'}"/> </group> </search> @@ -1093,7 +1093,7 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Search Survey"> - <group col='10' colspan='4'> + <group> <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)]"/> <separator orientation="vertical"/> @@ -1104,7 +1104,7 @@ </field> </group> <newline/> - <group expand="0" string="Group By..." colspan="4" col="20"> + <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'}"/> diff --git a/addons/wiki/wiki_view.xml b/addons/wiki/wiki_view.xml index abc378df988..98e44ae669d 100644 --- a/addons/wiki/wiki_view.xml +++ b/addons/wiki/wiki_view.xml @@ -170,7 +170,7 @@ <field name="write_uid"/> <field name="write_date"/> <newline/> - <group expand="0" string="Group By..." colspan="8" col="6"> + <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'}"/> <filter icon="terp-personal+" string="Last Contributor" domain="[]" context="{'group_by':'write_uid'}"/> |