Merge PR #1348 into 16.0

Signed-off-by quentinDupont
This commit is contained in:
OCA-git-bot
2024-12-11 10:24:44 +00:00
5 changed files with 27 additions and 5 deletions

View File

@@ -74,6 +74,7 @@ Contributors
* Agung Rachmatullah <agung.rachmatullah@ymail.com>
* Laurent Bélorgey <lb@lalieutenante.com>
* Pimolnat Suntian <pimolnats@ecosoft.co.th>
* Mathieu Delva <mathieu.delva@akretion.com>
Maintainers
~~~~~~~~~~~

View File

@@ -12,6 +12,9 @@
"website": "https://github.com/OCA/manufacture",
"category": "Manufacturing",
"depends": ["mrp"],
"data": ["views/mrp_bom_view.xml"],
"data": [
"views/mrp_bom_view.xml",
"views/mrp_production_templates.xml",
],
"installable": True,
}

View File

@@ -5,3 +5,4 @@
* Agung Rachmatullah <agung.rachmatullah@ymail.com>
* Laurent Bélorgey <lb@lalieutenante.com>
* Pimolnat Suntian <pimolnats@ecosoft.co.th>
* Mathieu Delva <mathieu.delva@akretion.com>

View File

@@ -8,10 +8,11 @@
/*
:Author: David Goodger (goodger@python.org)
: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.
@@ -274,7 +275,7 @@ pre.literal-block, pre.doctest-block, pre.math, pre.code {
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 }
@@ -300,7 +301,7 @@ span.option {
span.pre {
white-space: pre }
span.problematic {
span.problematic, pre.problematic {
color: red }
span.section-subtitle {
@@ -420,12 +421,15 @@ If you spotted it first, help us to smash it by providing a detailed and welcome
<li>Agung Rachmatullah &lt;<a class="reference external" href="mailto:agung.rachmatullah&#64;ymail.com">agung.rachmatullah&#64;ymail.com</a>&gt;</li>
<li>Laurent Bélorgey &lt;<a class="reference external" href="mailto:lb&#64;lalieutenante.com">lb&#64;lalieutenante.com</a>&gt;</li>
<li>Pimolnat Suntian &lt;<a class="reference external" href="mailto:pimolnats&#64;ecosoft.co.th">pimolnats&#64;ecosoft.co.th</a>&gt;</li>
<li>Mathieu Delva &lt;<a class="reference external" href="mailto:mathieu.delva&#64;akretion.com">mathieu.delva&#64;akretion.com</a>&gt;</li>
</ul>
</div>
<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>

View File

@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8" ?>
<odoo>
<template id="report_mrporder" inherit_id="mrp.report_mrporder">
<xpath
expr="//t[@t-call='mrp.report_mrp_production_components']"
position="after"
>
<div t-if="o.bom_id">
<span t-field="o.bom_id.notes" />
</div>
</xpath>
</template>
</odoo>