Merge PR #3066 into 14.0

Signed-off-by dreispt
OCA · Apr 28, 2024 · b0edacd · b0edacd
2 parents 65e9efb + a48a2a8
commit b0edacd
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 9 deletions.
diff --git a/sale_order_tag/README.rst b/sale_order_tag/README.rst
@@ -7,7 +7,7 @@ Sale Order Tags
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:a43cb2b1779bba6b0d8e03122968779920bab458c248388141d3f3ee202d4c7b
+   !! source digest: sha256:fbea7b494d106f1d20851eea3219610f6065b265ed5a906b768b031911c9ace2
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
@@ -65,6 +65,7 @@ Contributors
 ~~~~~~~~~~~~
 
 * Patrick Wilson <patrickraymondwilson@gmail.com>
+* Alexei Rivera <arivera@archeti.com>
 
 Maintainers
 ~~~~~~~~~~~

diff --git a/sale_order_tag/__manifest__.py b/sale_order_tag/__manifest__.py
@@ -7,7 +7,7 @@
     "author": "Patrick Wilson, Odoo Community Association (OCA)",
     "website": "https://github.com/OCA/sale-workflow",
     "category": "Sale",
-    "version": "14.0.1.0.1",
+    "version": "14.0.1.0.2",
     "license": "AGPL-3",
     "depends": ["crm", "sale_management"],
     "data": [

diff --git a/sale_order_tag/readme/CONTRIBUTORS.rst b/sale_order_tag/readme/CONTRIBUTORS.rst
@@ -1 +1,2 @@
 * Patrick Wilson <patrickraymondwilson@gmail.com>
+* Alexei Rivera <arivera@archeti.com>
diff --git a/sale_order_tag/static/description/index.html b/sale_order_tag/static/description/index.html
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
@@ -9,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.
@@ -275,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 }
@@ -301,7 +301,7 @@
 span.pre {
   white-space: pre }
 
-span.problematic {
+span.problematic, pre.problematic {
   color: red }
 
 span.section-subtitle {
@@ -367,7 +367,7 @@ <h1 class="title">Sale Order Tags</h1>
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:a43cb2b1779bba6b0d8e03122968779920bab458c248388141d3f3ee202d4c7b
+!! source digest: sha256:fbea7b494d106f1d20851eea3219610f6065b265ed5a906b768b031911c9ace2
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <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/sale-workflow/tree/14.0/sale_order_tag"><img alt="OCA/sale-workflow" src="https://img.shields.io/badge/github-OCA%2Fsale--workflow-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/sale-workflow-14-0/sale-workflow-14-0-sale_order_tag"><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/sale-workflow&amp;target_branch=14.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
 <p>This module adds tags to Sales Orders that are not related to Opportunity.</p>
@@ -412,12 +412,15 @@ <h2><a class="toc-backref" href="#toc-entry-4">Authors</a></h2>
 <h2><a class="toc-backref" href="#toc-entry-5">Contributors</a></h2>
 <ul class="simple">
 <li>Patrick Wilson &lt;<a class="reference external" href="mailto:patrickraymondwilson&#64;gmail.com">patrickraymondwilson&#64;gmail.com</a>&gt;</li>
+<li>Alexei Rivera &lt;<a class="reference external" href="mailto:arivera&#64;archeti.com">arivera&#64;archeti.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>

diff --git a/sale_order_tag/views/sale_order.xml b/sale_order_tag/views/sale_order.xml
@@ -9,7 +9,17 @@
         <field name="field_parent">child_ids</field>
         <field name="arch" type="xml">
             <field name="partner_id" position="before">
-                <field name="so_tag_ids" widget="many2many_tags" />
+                <field name="so_tag_ids" widget="many2many_tags" optional="hide" />
+            </field>
+        </field>
+    </record>
+    <record id="view_order_tree" model="ir.ui.view">
+        <field name="name">sale.order.tree</field>
+        <field name="model">sale.order</field>
+        <field name="inherit_id" ref="sale.view_order_tree" />
+        <field name="arch" type="xml">
+            <field name="partner_id" position="before">
+                <field name="so_tag_ids" widget="many2many_tags" optional="hide" />
             </field>
         </field>
     </record>