[BOT] post-merge updates

OCA · Sep 20, 2024 · ef61308 · ef61308
1 parent ebad5ef
commit ef61308
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -22,6 +22,7 @@ Available addons
 addon | version | maintainers | summary
 --- | --- | --- | ---
 [partner_delivery_zone_weighing](partner_delivery_zone_weighing/) | 15.0.1.0.0 |  | Show delivery zones info in weighings
+[sale_stock_weighing](sale_stock_weighing/) | 15.0.1.0.0 |  | Weight assistant extension sales
 [stock_picking_batch_weighing](stock_picking_batch_weighing/) | 15.0.1.0.0 |  | Launch the weighing assistant from batch pickings
 [stock_secondary_unit_weighing](stock_secondary_unit_weighing/) | 15.0.1.0.0 |  | Show secondary unit info in the weighing assistant
 [stock_weighing](stock_weighing/) | 15.0.1.2.0 |  | Weighing assistant for stock operations

diff --git a/sale_stock_weighing/README.rst b/sale_stock_weighing/README.rst
@@ -7,7 +7,7 @@ Weighing assistant sales info
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:5221bd76defc63eecc4f44efb4e25378aaffd2e8848dcb6a302f1540326a4249
+   !! source digest: sha256:c1ea8a0ef16e5fadaeb14a9d9782339a443c1b7f2a74ded01825d89003612f36
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png

diff --git a/sale_stock_weighing/static/description/icon.png b/sale_stock_weighing/static/description/icon.png
diff --git a/sale_stock_weighing/static/description/index.html b/sale_stock_weighing/static/description/index.html
@@ -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 @@
   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.pre {
   white-space: pre }
 
-span.problematic {
+span.problematic, pre.problematic {
   color: red }
 
 span.section-subtitle {
@@ -366,7 +367,7 @@ <h1 class="title">Weighing assistant sales info</h1>
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:5221bd76defc63eecc4f44efb4e25378aaffd2e8848dcb6a302f1540326a4249
+!! source digest: sha256:c1ea8a0ef16e5fadaeb14a9d9782339a443c1b7f2a74ded01825d89003612f36
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/stock-weighing/tree/15.0/sale_stock_weighing"><img alt="OCA/stock-weighing" src="https://img.shields.io/badge/github-OCA%2Fstock--weighing-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/stock-weighing-15-0/stock-weighing-15-0-sale_stock_weighing"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/stock-weighing&amp;target_branch=15.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
 <p>Show sale order infos in the weighing assistant cards.</p>
@@ -411,7 +412,9 @@ <h2><a class="toc-backref" href="#toc-entry-4">Contributors</a></h2>
 <div class="section" id="maintainers">
 <h2><a class="toc-backref" href="#toc-entry-5">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>

diff --git a/setup/_metapackage/VERSION.txt b/setup/_metapackage/VERSION.txt
@@ -1 +1 @@
-15.0.20240920.3
+15.0.20240920.4
diff --git a/setup/_metapackage/setup.py b/setup/_metapackage/setup.py
@@ -9,6 +9,7 @@
     version=version,
     install_requires=[
         'odoo-addon-partner_delivery_zone_weighing>=15.0dev,<15.1dev',
+        'odoo-addon-sale_stock_weighing>=15.0dev,<15.1dev',
         'odoo-addon-stock_picking_batch_weighing>=15.0dev,<15.1dev',
         'odoo-addon-stock_secondary_unit_weighing>=15.0dev,<15.1dev',
         'odoo-addon-stock_weighing>=15.0dev,<15.1dev',