Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 38 additions & 18 deletions product_logistics_uom/views/res_config_settings.xml
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You should do a cherry-pick. b112ece#diff-ee9090ad2f93bb9e5f5005222971731fe1dae5ca5eb20f9698bb752562a5b048
including only the new field added to the view.
And then an separate commit for formatting the file.

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Eventhough the commit's name is not related to the change as it is a whole module migration?
After that I would need to add a fix commit to make the change work with version 14.0.
And as last commit the one to format the file

Original file line number Diff line number Diff line change
@@ -1,22 +1,42 @@
<?xml version="1.0" encoding="utf-8" ?>
<odoo>
<record id="res_config_settings_view_form" model="ir.ui.view">
<field name="name">res.config.settings.view.form.inherit.product</field>
<field name="model">res.config.settings</field>
<field name="inherit_id" ref="product.res_config_settings_view_form" />
<field name="arch" type="xml">
<field name="product_weight_in_lbs" position="attributes">
<attribute name="invisible">1</attribute>
</field>
<field name="product_weight_in_lbs" position="after">
<field name="product_default_weight_uom_id" />
</field>
<field name="product_volume_volume_in_cubic_feet" position="attributes">
<attribute name="invisible">1</attribute>
</field>
<field name="product_volume_volume_in_cubic_feet" position="after">
<field name="product_default_volume_uom_id" />
</field>
<record id="res_config_settings_view_form" model="ir.ui.view">
<field name="name">res.config.settings.view.form.inherit.product</field>
<field name="model">res.config.settings</field>
<field name="inherit_id" ref="product.res_config_settings_view_form" />
<field name="arch" type="xml">
<field name="product_weight_in_lbs" position="attributes">
<attribute name="invisible">1</attribute>
</field>
</record>
<field name="product_weight_in_lbs" position="after">
<field name="product_default_weight_uom_id" />
</field>
<field name="product_volume_volume_in_cubic_feet" position="attributes">
<attribute name="invisible">1</attribute>
</field>
<field name="product_volume_volume_in_cubic_feet" position="after">
<field name="product_default_volume_uom_id" />
</field>
<xpath expr="//div[@id='manage_volume_uom_setting']" position="after">
<div class="col-12 col-lg-6 o_setting_box" id="length_uom_setting">
<div class="o_setting_left_pane">
</div>
<div class="o_setting_right_pane">
<label
for="product_default_length_uom_id"
string="Length UoM"
/>
<div class="text-muted">
Define your length unit of measure
</div>
<div class="content-group">
<div class="mt16">
<field name="product_default_length_uom_id" />
</div>
</div>
</div>
</div>
</xpath>
</field>
</record>
</odoo>
Loading