summaryrefslogtreecommitdiff
path: root/addons/base_setup
diff options
context:
space:
mode:
authorppr-odoo <ppr@odoo.com>2017-09-21 15:39:16 +0200
committerYannick Tivisse <yti@odoo.com>2017-09-21 15:41:06 +0200
commitd7b073d427a8f6bc1f2f248aa1127eac4a1c4e2c (patch)
tree8338b76701ee058cb48e3f7186fd6541f7acf73b /addons/base_setup
parent09d3b269a3a29217018efc5bafb0ecc6362e59de (diff)
[FIX] base_setup,stock: Rename 'Multi-Companies' into 'Multi-Company'
As well as 'Inter-Companies' into 'Inter-Company'
Diffstat (limited to 'addons/base_setup')
-rw-r--r--addons/base_setup/i18n/base_setup.pot6
-rw-r--r--addons/base_setup/views/res_config_settings_views.xml8
2 files changed, 7 insertions, 7 deletions
diff --git a/addons/base_setup/i18n/base_setup.pot b/addons/base_setup/i18n/base_setup.pot
index f951b54dcbf..8c92f849122 100644
--- a/addons/base_setup/i18n/base_setup.pot
+++ b/addons/base_setup/i18n/base_setup.pot
@@ -58,7 +58,7 @@ msgstr ""
#. module: base_setup
#: model:ir.ui.view,arch_db:base_setup.res_config_settings_view_form
-msgid "Automate inter-companies transactions"
+msgid "Automate inter-company transactions"
msgstr ""
#. module: base_setup
@@ -198,7 +198,7 @@ msgstr ""
#. module: base_setup
#: model:ir.ui.view,arch_db:base_setup.res_config_settings_view_form
-msgid "Inter-Companies Transactions"
+msgid "Inter-Company Transactions"
msgstr ""
#. module: base_setup
@@ -224,7 +224,7 @@ msgstr ""
#. module: base_setup
#: model:ir.ui.view,arch_db:base_setup.res_config_settings_view_form
-msgid "Multi-Companies"
+msgid "Multi-company"
msgstr ""
#. module: base_setup
diff --git a/addons/base_setup/views/res_config_settings_views.xml b/addons/base_setup/views/res_config_settings_views.xml
index 7cf8fa57dde..ac31d1553d6 100644
--- a/addons/base_setup/views/res_config_settings_views.xml
+++ b/addons/base_setup/views/res_config_settings_views.xml
@@ -80,14 +80,14 @@
</div>
</div>
<field name="company_id" invisible="1"/>
- <h2>Multi-Companies</h2>
+ <h2>Multi-company</h2>
<div class="row mt16 o_settings_container" name="multi_company">
<div class="col-xs-12 col-md-6 o_setting_box">
<div class="o_setting_left_pane">
<field name="group_multi_company"/>
</div>
<div class="o_setting_right_pane">
- <label string="Multi-Companies" for="group_multi_company"/>
+ <label string="Multi-company" for="group_multi_company"/>
<div class="text-muted">
Manage multiple legal entities with separate accounting
</div>
@@ -107,9 +107,9 @@
<field name="module_inter_company_rules" widget="upgrade_boolean"/>
</div>
<div class="o_setting_right_pane">
- <label string="Inter-Companies Transactions" for="module_inter_company_rules"/>
+ <label string="Inter-Company Transactions" for="module_inter_company_rules"/>
<div class="text-muted">
- Automate inter-companies transactions
+ Automate inter-company transactions
</div>
<div class="content-group" attrs="{'invisible': [('module_inter_company_rules','=',False)]}" id="inter_companies_rules">
<div class="mt16 text-warning"><strong>Save</strong> this page and come back here to set up the feature.</div>