diff options
| author | Pierre Masereel <pim@odoo.com> | 2018-01-08 16:25:09 +0100 |
|---|---|---|
| committer | Simon Lejeune <sle@openerp.com> | 2018-01-29 15:20:56 +0100 |
| commit | 52a85e57b9a6353c14abdbcd7e04d34214f151f5 (patch) | |
| tree | 200c6422ae7f62ab388cbeff879a542abf8ed3b1 /addons/base_setup/views | |
| parent | 951cb8bf405f174206ff777d28220c6ffa902937 (diff) | |
[IMP] stock: configurable product's weight UOM
This commit adds the possibility to chose between pounds and kilograms
to express the weight field on the product. This is done so that
companies that worked internally in pounds do not have to convert their
weights back to kilograms for a consistent computation of the rates in
delivery.
We complete the general settings with the selection of the weight's uom.
Validating the setting will create an ir.config.parameter. A static
method defined on product template will return the chosen UOM.
We display "weight_uom_name" on the form view so that the UOM is not
clickable/editable because we fear user would want to edit the UOM
instead of changing it in the res config.
We move the view definition allowing to fill the product's weight from
stock to product to help the generation of the intrastat report without
installing inventory.
Diffstat (limited to 'addons/base_setup/views')
| -rw-r--r-- | addons/base_setup/views/res_config_settings_views.xml | 58 |
1 files changed, 30 insertions, 28 deletions
diff --git a/addons/base_setup/views/res_config_settings_views.xml b/addons/base_setup/views/res_config_settings_views.xml index a58f3e0d808..f10dd6244e2 100644 --- a/addons/base_setup/views/res_config_settings_views.xml +++ b/addons/base_setup/views/res_config_settings_views.xml @@ -79,40 +79,42 @@ </div> </div> </div> - <field name="company_id" invisible="1"/> - <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-company" for="group_multi_company"/> - <div class="text-muted"> - Manage multiple legal entities with separate accounting + <div id="multi_company"> + <field name="company_id" invisible="1"/> + <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="content-group" attrs="{'invisible': [('group_multi_company','=',False)]}"> - <div class="mt16"> - <button name="%(base.action_res_company_form)d" icon="fa-arrow-right" type="action" string="Companies" class="btn-link"/> + <div class="o_setting_right_pane"> + <label string="Multi-company" for="group_multi_company"/> + <div class="text-muted"> + Manage multiple legal entities with separate accounting </div> - <div id="company_share_partner"> - <field name="company_share_partner"/> - <label string="Common Contact Book" class="o_light_label" for="company_share_partner"/> + <div class="content-group" attrs="{'invisible': [('group_multi_company','=',False)]}"> + <div class="mt16"> + <button name="%(base.action_res_company_form)d" icon="fa-arrow-right" type="action" string="Companies" class="btn-link"/> + </div> + <div id="company_share_partner"> + <field name="company_share_partner"/> + <label string="Common Contact Book" class="o_light_label" for="company_share_partner"/> + </div> </div> </div> </div> - </div> - <div class="col-xs-12 col-md-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." attrs="{'invisible': [('group_multi_company', '=', False)]}" id="inter_company"> - <div class="o_setting_left_pane"> - <field name="module_inter_company_rules" widget="upgrade_boolean"/> - </div> - <div class="o_setting_right_pane"> - <label string="Inter-Company Transactions" for="module_inter_company_rules"/> - <div class="text-muted"> - Automate inter-company transactions + <div class="col-xs-12 col-md-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." attrs="{'invisible': [('group_multi_company', '=', False)]}" id="inter_company"> + <div class="o_setting_left_pane"> + <field name="module_inter_company_rules" widget="upgrade_boolean"/> </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> + <div class="o_setting_right_pane"> + <label string="Inter-Company Transactions" for="module_inter_company_rules"/> + <div class="text-muted"> + 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> + </div> </div> </div> </div> |