diff options
| author | wan <wan@odoo.com> | 2020-01-21 11:48:05 +0000 |
|---|---|---|
| committer | wan <wan@odoo.com> | 2020-02-03 10:46:00 +0000 |
| commit | be2ee7707a4b311e1795e463823f2f6628e8d5f8 (patch) | |
| tree | a79e7be1edba6d5eb3c4a1f0a296f4a8600b3e0b | |
| parent | 3b333b267522ca9680e54f10bb4dbd6c29070f58 (diff) | |
[IMP] inter_company_rules: split sale/purchase and account
Task 2080625
There are now 2 modules:
* account_inter_company_rules
* sale_purchase_inter_company_rules
This allows to use the feature without having to install sale and
purchase.
closes odoo/odoo#43039
Related: odoo/enterprise#7636
Signed-off-by: Quentin De Paoli (qdp) <qdp@openerp.com>
| -rw-r--r-- | addons/base_setup/models/res_config_settings.py | 2 | ||||
| -rw-r--r-- | addons/base_setup/views/res_config_settings_views.xml | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/addons/base_setup/models/res_config_settings.py b/addons/base_setup/models/res_config_settings.py index 058c10b06aa..410d5130b0b 100644 --- a/addons/base_setup/models/res_config_settings.py +++ b/addons/base_setup/models/res_config_settings.py @@ -24,7 +24,7 @@ class ResConfigSettings(models.TransientModel): module_auth_oauth = fields.Boolean("Use external authentication providers (OAuth)") module_auth_ldap = fields.Boolean("LDAP Authentication") module_base_gengo = fields.Boolean("Translate Your Website with Gengo") - module_inter_company_rules = fields.Boolean("Manage Inter Company") + module_account_inter_company_rules = fields.Boolean("Manage Inter Company") module_pad = fields.Boolean("Collaborative Pads") module_voip = fields.Boolean("Asterisk (VoIP)") module_web_unsplash = fields.Boolean("Unsplash Image Library") diff --git a/addons/base_setup/views/res_config_settings_views.xml b/addons/base_setup/views/res_config_settings_views.xml index 1392290799f..c120b5ac8e8 100644 --- a/addons/base_setup/views/res_config_settings_views.xml +++ b/addons/base_setup/views/res_config_settings_views.xml @@ -208,15 +208,15 @@ <div class="row mt16 o_settings_container" name="multicompany_setting_container"> <div class="col-12 col-lg-6 o_setting_box" title="Configure company rules to automatically create SO/PO when one of your company sells/buys to another of your company." id="inter_company"> <div class="o_setting_left_pane"> - <field name="module_inter_company_rules" widget="upgrade_boolean"/> + <field name="module_account_inter_company_rules" widget="upgrade_boolean"/> </div> <div class="o_setting_right_pane"> - <label string="Inter-Company Transactions" for="module_inter_company_rules"/> + <label string="Inter-Company Transactions" for="module_account_inter_company_rules"/> <span class="fa fa-lg fa-building-o" title="Values set here are company-specific." aria-label="Values set here are company-specific." groups="base.group_multi_company" role="img"/> <div class="text-muted"> Automatically generate counterpart documents for orders/invoices between companies </div> - <div class="content-group" attrs="{'invisible': [('module_inter_company_rules','=',False)]}" id="inter_companies_rules"> + <div class="content-group" attrs="{'invisible': [('module_account_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> </div> </div> |