diff options
| author | Robot Odoo <xmo+roboto@odoo.com> | 2018-12-04 05:46:22 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-04 05:46:22 +0100 |
| commit | a2c5b44df8c538b0a43b86502849e72c55c2d2ff (patch) | |
| tree | f352060e6104f90a706330988503f8086b2512d0 | |
| parent | 18efcc2eb4b3171207983c83d79eee54540d150e (diff) | |
| parent | 8f22263235baa16d031390b147b6eb09f66416b9 (diff) | |
[MERGE] barcodes, event, stock: nomenclature settings
We don't want to bloat the company settings with the choice of the barcode nomenclature. We move this settings to event_barcode and stock_barcodes.
task id 1903864
closes odoo/odoo#28346
| -rw-r--r-- | addons/barcodes/__manifest__.py | 1 | ||||
| -rw-r--r-- | addons/barcodes/views/res_company.xml | 13 | ||||
| -rw-r--r-- | addons/event/views/res_config_settings_views.xml | 3 | ||||
| -rw-r--r-- | addons/stock/views/res_config_settings_views.xml | 3 |
4 files changed, 4 insertions, 16 deletions
diff --git a/addons/barcodes/__manifest__.py b/addons/barcodes/__manifest__.py index 83419dcd933..84002122ed4 100644 --- a/addons/barcodes/__manifest__.py +++ b/addons/barcodes/__manifest__.py @@ -9,7 +9,6 @@ 'views/barcodes_view.xml', 'security/ir.model.access.csv', 'views/barcodes_templates.xml', - 'views/res_company.xml', ], 'installable': True, 'auto_install': False, diff --git a/addons/barcodes/views/res_company.xml b/addons/barcodes/views/res_company.xml deleted file mode 100644 index fcf2b6c6eaa..00000000000 --- a/addons/barcodes/views/res_company.xml +++ /dev/null @@ -1,13 +0,0 @@ -<?xml version="1.0"?> -<odoo> - <record model="ir.ui.view" id="view_company_form_inherit"> - <field name="name">barcode.company.form</field> - <field name="model">res.company</field> - <field name="inherit_id" ref="base.view_company_form"/> - <field name="arch" type="xml"> - <xpath expr="//field[@name='currency_id']" position="after"> - <field name="nomenclature_id"/> - </xpath> - </field> - </record> -</odoo> diff --git a/addons/event/views/res_config_settings_views.xml b/addons/event/views/res_config_settings_views.xml index 70cacce989b..c27742a4ffb 100644 --- a/addons/event/views/res_config_settings_views.xml +++ b/addons/event/views/res_config_settings_views.xml @@ -56,7 +56,8 @@ </div> <div class="o_setting_right_pane"> <label for="module_event_barcode"/> - <div class="text-muted"> + <span class="fa fa-lg fa-building-o" title="Values set here are company-specific." groups="base.group_multi_company"/> + <div class="text-muted" name="event_barcode"> Scan badges to confirm attendances </div> </div> diff --git a/addons/stock/views/res_config_settings_views.xml b/addons/stock/views/res_config_settings_views.xml index 49640e17ae7..1fc69dea373 100644 --- a/addons/stock/views/res_config_settings_views.xml +++ b/addons/stock/views/res_config_settings_views.xml @@ -17,7 +17,8 @@ </div> <div class="o_setting_right_pane" id="barcode_settings"> <label for="module_stock_barcode"/> - <div class="text-muted"> + <span class="fa fa-lg fa-building-o" title="Values set here are company-specific." groups="base.group_multi_company"/> + <div class="text-muted" name="stock_barcode"> Process operations faster with barcodes </div> <div class="content-group"> |