Skip to content

Commit 555677f

Browse files
committed
[IMP] replace all 'Group By...' by 'Group By'
in all searchview, the 'Group By...' looks weird, next to the Custom Reports and Filters. This change was requested by the upper management
1 parent a24020e commit 555677f

File tree

106 files changed

+162
-162
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

106 files changed

+162
-162
lines changed

addons/account/account_invoice_view.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -462,7 +462,7 @@
462462
<field name="period_id" string="Period"/>
463463
<separator/>
464464
<filter domain="[('user_id','=',uid)]" help="My Invoices"/>
465-
<group expand="0" string="Group By...">
465+
<group expand="0" string="Group By">
466466
<filter name="group_by_partner_id" string="Partner" domain="[]" context="{'group_by':'partner_id'}"/>
467467
<filter name="commercial_partner_id" string="Commercial Partner" domain="[]" context="{'group_by':'commercial_partner_id'}"/>
468468
<filter string="Responsible" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>

addons/account/account_view.xml

+14-14
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
<filter string="Open" domain="[('state','=','draft')]" icon="terp-camera_test"/>
6262
<filter string="Closed" domain="[('state','=','done')]" icon="terp-dialog-close"/>
6363
<field name="state"/>
64-
<group expand="0" string="Group By...">
64+
<group expand="0" string="Group By">
6565
<filter string="Status" context="{'group_by': 'state'}" icon="terp-stock_effects-object-colorize"/>
6666
</group>
6767
</search>
@@ -232,7 +232,7 @@
232232
<filter icon="terp-sale" string="Receivable Accounts" domain="[('type','=','receivable')]"/>
233233
<filter icon="terp-purchase" string="Payable Accounts" domain="[('type','=','payable')]"/>
234234
<field name="user_type"/>
235-
<group expand="0" string="Group By...">
235+
<group expand="0" string="Group By">
236236
<filter string="Parent Account" icon="terp-folder-orange" domain="" context="{'group_by':'parent_id'}"/>
237237
<filter string="Account Type" icon="terp-stock_symbol-selection" domain="" context="{'group_by':'user_type'}"/>
238238
<filter string="Internal Type" icon="terp-stock_symbol-selection" domain="" context="{'group_by':'type'}"/>
@@ -381,7 +381,7 @@
381381
<filter domain="['|', ('type', '=', 'cash'), ('type', '=', 'bank')]" string="Liquidity" icon="terp-dolar"/>
382382
<filter domain="['|', ('type', '=', 'general'), ('type', '=', 'situation')]" string="Others" icon="terp-stock"/>
383383
<field name="user_id"/>
384-
<group expand="0" string="Group By...">
384+
<group expand="0" string="Group By">
385385
<filter string="User" context="{'group_by':'user_id'}" icon="terp-personal"/>
386386
<filter string="Type" context="{'group_by':'type'}" icon="terp-stock_symbol-selection"/>
387387
<filter string="Company" context="{'group_by':'company_id'}" icon="terp-go-home" groups="base.group_multi_company"/>
@@ -500,7 +500,7 @@
500500
<filter string="Open" name="state_open" domain="[('state','=','open')]" icon="terp-check"/>
501501
<filter string="Confirmed" name="state_confirmed" domain="[('state','=','confirm')]" icon="terp-camera_test"/>
502502
<field name="journal_id" domain="[('type', '=', 'cash')]" />
503-
<group expand="0" string="Group By...">
503+
<group expand="0" string="Group By">
504504
<filter string="Journal" context="{'group_by': 'journal_id'}" icon="terp-folder-orange"/>
505505
<filter string="Status" context="{'group_by': 'state'}" icon="terp-stock_effects-object-colorize"/>
506506
<filter string="Period" context="{'group_by': 'period_id'}" icon="terp-go-month"/>
@@ -536,7 +536,7 @@
536536
<filter string="Confirmed" domain="[('state','=','confirm')]" icon="terp-camera_test"/>
537537
<field name="period_id"/>
538538
<field name="journal_id" domain="[('type', '=', 'bank')]" />
539-
<group expand="0" string="Group By...">
539+
<group expand="0" string="Group By">
540540
<filter string="Journal" context="{'group_by': 'journal_id'}" icon="terp-folder-orange"/>
541541
<filter string="Status" context="{'group_by': 'state'}" icon="terp-stock_effects-object-colorize"/>
542542
<filter string="Period" context="{'group_by': 'period_id'}" icon="terp-go-month"/>
@@ -895,7 +895,7 @@
895895
<field name="company_id" groups="base.group_multi_company"/>
896896
<filter string="Sale" domain="[('type_tax_use','=','sale')]" />
897897
<filter string="Purchase" domain="[('type_tax_use','=','purchase')]" />
898-
<group string="Group By...">
898+
<group string="Group By">
899899
<filter string="Company" domain="[]" context="{'group_by':'company_id'}"/>
900900
<filter string="Tax Application" domain="[]" context="{'group_by':'type_tax_use'}"/>
901901
</group>
@@ -1175,7 +1175,7 @@
11751175
<field name="partner_id"/>
11761176
<field name="journal_id" context="{'journal_id':self}" widget="selection"/> <!-- it's important to keep widget='selection' in this filter viewbecause without that the value passed in the context is not the ID but the textual value (name) of the selected journal -->
11771177
<field name="period_id" context="{'period_id':self}" widget="selection"/> <!-- it's important to keep the widget='selection' in this field, for the same reason as explained above -->
1178-
<group expand="0" string="Group By...">
1178+
<group expand="0" string="Group By">
11791179
<filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
11801180
<filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
11811181
<filter string="Account" icon="terp-folder-green" context="{'group_by':'account_id'}"/>
@@ -1408,7 +1408,7 @@
14081408
<field name="partner_id"/>
14091409
<field name="journal_id"/>
14101410
<field name="period_id"/>
1411-
<group expand="0" string="Group By...">
1411+
<group expand="0" string="Group By">
14121412
<filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
14131413
<filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
14141414
<filter string="States" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
@@ -1565,7 +1565,7 @@
15651565
<filter string="Purchase" icon="terp-purchase" domain="[('journal_id.type', '=', 'purchase')]"/>
15661566
<field name="journal_id"/>
15671567
<field name="company_id" groups="base.group_multi_company"/>
1568-
<group expand="0" string="Group By...">
1568+
<group expand="0" string="Group By">
15691569
<filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
15701570
</group>
15711571
</search>
@@ -1699,7 +1699,7 @@
16991699
<filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Subscription"/>
17001700
<filter icon="terp-camera_test" string="Running" domain="[('state','=','running')]" help="Running Subscription"/>
17011701
<field name="model_id"/>
1702-
<group expand="0" string="Group By...">
1702+
<group expand="0" string="Group By">
17031703
<filter string="Model" icon="terp-folder-orange" domain="[]" context="{'group_by':'model_id'}"/>
17041704
<filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
17051705
</group>
@@ -1856,7 +1856,7 @@
18561856
<field name="parent_id"/>
18571857
<field name="user_type"/>
18581858
<field name="type"/>
1859-
<group expand="0" string="Group By...">
1859+
<group expand="0" string="Group By">
18601860
<filter string="Internal Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type'}"/>
18611861
<filter string="Account Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'user_type'}"/>
18621862
</group>
@@ -1935,7 +1935,7 @@
19351935
<field name="name" string="Account Template"/>
19361936
<field name="account_root_id"/>
19371937
<field name="bank_account_view_id"/>
1938-
<group expand="0" string="Group By...">
1938+
<group expand="0" string="Group By">
19391939
<filter string="Root Account" icon="terp-folder-orange" domain="[]" context="{'group_by':'account_root_id'}"/>
19401940
<filter string="Bank Account" icon="terp-folder-orange" domain="[]" context="{'group_by':'bank_account_view_id'}"/>
19411941
<filter string="Receivable Account" icon="terp-sale" domain="[]" context="{'group_by':'property_account_receivable'}"/>
@@ -2078,7 +2078,7 @@
20782078
<search string="Search tax template">
20792079
<field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Tax Template"/>
20802080
<field name="parent_id"/>
2081-
<group expand="0" string="Group By...">
2081+
<group expand="0" string="Group By">
20822082
<filter string="Parent Code" icon="terp-folder-orange" domain="[]" context="{'group_by':'parent_id'}"/>
20832083
</group>
20842084
</search>
@@ -2485,7 +2485,7 @@
24852485
<field name="name" string="Account Report"/>
24862486
<field name="type"/>
24872487
<field name="account_report_id"/>
2488-
<group expand="0" string="Group By...">
2488+
<group expand="0" string="Group By">
24892489
<filter string="Parent Report" icon="terp-folder-orange" domain="" context="{'group_by':'parent_id'}"/>
24902490
<filter string="Report Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type'}"/>
24912491
</group>

addons/account/project/project_view.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
<field name="user_id"/>
3838
<filter string="Open" domain="[('state','=','open')]" help="Current Accounts"/>
3939
<filter string="Pending" domain="[('state','=','pending')]" help="Pending Accounts"/>
40-
<group expand="0" string="Group By...">
40+
<group expand="0" string="Group By">
4141
<filter string="Associated Partner" domain="[]" context="{'group_by':'partner_id'}"/>
4242
<filter string="Type" domain="[]" context="{'group_by':'type'}"/>
4343
<filter string="Template" domain="[]" context="{'group_by':'template_id'}"/>
@@ -198,7 +198,7 @@
198198
<filter string="My Entries" domain="[('user_id','=',uid)]"/>
199199
<field name="account_id"/>
200200
<field name="user_id"/>
201-
<group string="Group By..." expand="0">
201+
<group string="Group By" expand="0">
202202
<filter string="Analytic Account" context="{'group_by':'account_id'}"/>
203203
<filter string="Fin. Account" context="{'group_by':'general_account_id'}"/>
204204
<filter string="Journal" context="{'group_by':'journal_id'}" name="group_journal"/>
@@ -306,7 +306,7 @@
306306
<search string="Analytic Journals">
307307
<field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Analytic Journal"/>
308308
<field name="type"/>
309-
<group expand="0" string="Group By...">
309+
<group expand="0" string="Group By">
310310
<filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type'}"/>
311311
</group>
312312
</search>

addons/account/report/account_analytic_entries_report_view.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<field name="account_id" groups="analytic.group_analytic_accounting"/>
1212
<field name="product_id" />
1313
<field name="user_id"/>
14-
<group expand="0" string="Group By...">
14+
<group expand="0" string="Group By">
1515
<filter string="User" name="User" icon="terp-personal" context="{'group_by':'user_id'}"/>
1616
<filter string="Partner" icon="terp-partner" context="{'group_by':'partner_id'}"/>
1717
<filter string="Account" name="Account" icon="terp-folder-green" context="{'group_by':'account_id'}" groups="analytic.group_analytic_accounting"/>

addons/account/report/account_entries_report_view.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@
8383
<field name="partner_id"/>
8484
<field name="company_id" groups="base.group_multi_company"/>
8585
</group>
86-
<group expand="1" string="Group By...">
86+
<group expand="1" string="Group By">
8787
<filter string="Partner" icon="terp-partner" context="{'group_by':'partner_id'}"/>
8888
<filter string="Product" icon="terp-accessories-archiver" context="{'group_by':['product_id','product_uom_id'], 'quantity_visible':1}"/>
8989
<filter string="Currency" name="group_currency" icon="terp-dolar" context="{'group_by':'currency_id', 'currency_id_visible':1, 'amount_currency_visible':1}"/>

addons/account/report/account_invoice_report_view.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
<field name="partner_id"/>
3636
<field name="user_id" />
3737
<field name="categ_id" filter_domain="[('categ_id', 'child_of', self)]"/>
38-
<group expand="1" string="Group By...">
38+
<group expand="1" string="Group By">
3939
<filter string="Partner" name="partner_id" context="{'group_by':'partner_id','residual_visible':True}"/>
4040
<filter string="Commercial Partner" name="commercial_partner_id" context="{'group_by':'commercial_partner_id','residual_visible':True}"/>
4141
<filter string="Commercial Partner's Country" name="country_id" context="{'group_by':'country_id'}"/>

addons/account_analytic_analysis/account_analytic_analysis_view.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@
238238
<filter string="Customer Contracts" help="Contracts assigned to a customer." name="has_partner" domain="[('partner_id', '!=', False)]"/>
239239
<filter string="Contracts not assigned" help="Contracts that are not assigned to an account manager." domain="[('manager_id', '=', False)]"/>
240240
<separator/>
241-
<group expand="0" string="Group By...">
241+
<group expand="0" string="Group By">
242242
<filter string="Status" domain="[]" context="{'group_by':'state'}"/>
243243
<filter string="Account Manager" domain="[]" context="{'group_by':'manager_id'}"/>
244244
<filter string="Partner" domain="[]" context="{'group_by':'partner_id'}"/>

addons/account_analytic_default/account_analytic_default_view.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
<field name="partner_id"/>
5050
<field name="user_id"/>
5151
<field name="company_id" groups="base.group_multi_company"/>
52-
<group expand="0" string="Group By...">
52+
<group expand="0" string="Group By">
5353
<filter string="User" icon="terp-personal" context="{'group_by':'user_id'}" help="User"/>
5454
<filter string="Partner" icon="terp-partner" context="{'group_by':'partner_id'}" help="Partner"/>
5555
<filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}" help="Product" />

addons/account_asset/report/account_asset_report_view.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
<field name="partner_id" filter_domain="[('partner_id','child_of',self)]"/>
3434
<field name="company_id" groups="base.group_multi_company"/>
3535
</group>
36-
<group expand="1" string="Group By...">
36+
<group expand="1" string="Group By">
3737
<filter string="Asset" name="asset" context="{'group_by':'asset_id'}"/>
3838
<filter string="Asset Category" name="asset_category" icon="terp-stock_symbol-selection" context="{'group_by':'asset_category_id'}"/>
3939
<filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>

addons/account_bank_statement_extensions/account_bank_statement_view.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@
135135
<field name="globalisation_amount" string="Glob. Amount"/>
136136
<field name="note"/>
137137
</group>
138-
<group string="Group By..." expand="1">
138+
<group string="Group By" expand="1">
139139
<filter string="Journal" context="{'group_by':'journal_id'}" icon="terp-folder-green"/>
140140
<filter string="Statement" context="{'group_by':'statement_id'}" icon="terp-folder-orange"/>
141141
<filter string="Fin.Account" context="{'group_by':'account_id'}" icon="terp-folder-yellow"/>

addons/account_followup/account_followup_customers.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
<filter string="My Follow-ups" domain="[('payment_responsible_id','=', uid)]" name="my"/>
5252
</group>
5353
</search>
54-
<group string="Group By..." position="inside">
54+
<group string="Group By" position="inside">
5555
<filter string="Follow-up Responsible" context="{'group_by':'payment_responsible_id'}"/>
5656
<filter string="Followup Level" context="{'group_by':'latest_followup_level_id'}"/>
5757
</group>

addons/account_followup/report/account_followup_report.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
help = "Including journal entries marked as a litigation"/>
2727
<field name="partner_id"/>
2828
<field name="balance"/>
29-
<group expand="1" string="Group By...">
29+
<group expand="1" string="Group By">
3030
<filter string="Partner" icon="terp-partner" context="{'group_by':'partner_id'}" />
3131
<filter string="Litigation" icon="terp-camera_test" context="{'group_by':'blocked'}" />
3232
<filter string="Follow-up Level" icon="terp-stock_effects-object-colorize" name="followup_level" context="{'group_by':'followup_id'}" />

addons/account_payment/account_payment_view.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<field name="name" string="Payment Mode"/>
1313
<field name="journal"/>
1414
<field name="company_id" groups="base.group_multi_company"/>
15-
<group expand="0" string="Group By...">
15+
<group expand="0" string="Group By">
1616
<filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal'}"/>
1717
</group>
1818
</search>
@@ -177,7 +177,7 @@
177177
<filter string="Done" domain="[('state','=','done')]" icon="terp-dialog-close"/>
178178
<field name="mode"/>
179179
<field name="state"/>
180-
<group expand="0" string="Group By...">
180+
<group expand="0" string="Group By">
181181
<filter string="Payment Mode" context="{'group_by': 'mode'}" icon="terp-dolar"/>
182182
<filter string="Status" context="{'group_by': 'state'}" icon="terp-stock_effects-object-colorize"/>
183183
</group>

0 commit comments

Comments
 (0)