Skip to content

Commit

Permalink
Merge PR #965 into 16.0
Browse files Browse the repository at this point in the history
Signed-off-by dhongu
  • Loading branch information
OCA-git-bot committed May 13, 2024
2 parents 7d97d23 + a3d417c commit bd11898
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 9 deletions.
2 changes: 1 addition & 1 deletion l10n_ro_stock/__manifest__.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"views/product_template_view.xml",
],
"license": "AGPL-3",
"version": "16.0.0.3.0",
"version": "16.0.0.3.1",
"author": "NextERP Romania,"
"Dorin Hongu,"
"Forest and Biomass Romania,"
Expand Down
11 changes: 7 additions & 4 deletions l10n_ro_stock/static/description/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,11 @@

/*
:Author: David Goodger ([email protected])
:Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z milde $
:Id: $Id: html4css1.css 9511 2024-01-13 09:50:07Z milde $
:Copyright: This stylesheet has been placed in the public domain.
Default cascading style sheet for the HTML output of Docutils.
Despite the name, some widely supported CSS2 features are used.
See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to
customize this style sheet.
Expand Down Expand Up @@ -274,7 +275,7 @@
margin-left: 2em ;
margin-right: 2em }

pre.code .ln { color: grey; } /* line numbers */
pre.code .ln { color: gray; } /* line numbers */
pre.code, code { background-color: #eeeeee }
pre.code .comment, code .comment { color: #5C6576 }
pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
Expand All @@ -300,7 +301,7 @@
span.pre {
white-space: pre }

span.problematic {
span.problematic, pre.problematic {
color: red }

span.section-subtitle {
Expand Down Expand Up @@ -427,7 +428,9 @@ <h2><a class="toc-backref" href="#toc-entry-5">Contributors</a></h2>
<div class="section" id="maintainers">
<h2><a class="toc-backref" href="#toc-entry-6">Maintainers</a></h2>
<p>This module is maintained by the OCA.</p>
<a class="reference external image-reference" href="https://odoo-community.org"><img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" /></a>
<a class="reference external image-reference" href="https://odoo-community.org">
<img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" />
</a>
<p>OCA, or the Odoo Community Association, is a nonprofit organization whose
mission is to support the collaborative development of Odoo features and
promote its widespread use.</p>
Expand Down
7 changes: 3 additions & 4 deletions l10n_ro_stock/views/product_template_view.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<field name="model">product.template</field>
<field name="inherit_id" ref="product.product_template_form_view" />
<field name="arch" type="xml">
<xpath expr="//label[@for='volume']" position="before">
<xpath expr="//group[@name='group_lots_and_weight']" position="inside">
<label
for="l10n_ro_net_weight"
attrs="{'invisible':[('product_variant_count', '>', 1), ('is_product_variant', '=', False)]}"
Expand All @@ -17,10 +17,9 @@
name="l10n_ro_net_weight"
attrs="{'invisible':[('product_variant_count', '>', 1), ('is_product_variant', '=', False)]}"
>
<field name="l10n_ro_net_weight" />
<span><field name="l10n_ro_net_weight_uom_name" /></span>
<field name="l10n_ro_net_weight" class="oe_inline" />
<field name="l10n_ro_net_weight_uom_name" />
</div>

</xpath>
</field>
</record>
Expand Down

0 comments on commit bd11898

Please sign in to comment.