Merge pull request #1279 from OCA/15.0

Syncing from upstream OCA/product-attribute (15.0)
brain-tec · Mar 1, 2025 · d5e8a02 · d5e8a02
2 parents 03ee009 + e2688f2
commit d5e8a02
Show file tree

Hide file tree

Showing 12 changed files with 67 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -50,7 +50,7 @@ addon | version | maintainers | summary
 [product_order_noname](product_order_noname/) | 15.0.1.0.0 | [![WR-96](https://github.com/WR-96.png?size=30px)](https://github.com/WR-96) [![moylop260](https://github.com/moylop260.png?size=30px)](https://github.com/moylop260) [![luisg123v](https://github.com/luisg123v.png?size=30px)](https://github.com/luisg123v) | Speedup product retrieve
 [product_packaging_type](product_packaging_type/) | 15.0.1.0.0 |  | Product Packaging Type
 [product_pricelist_by_contact](product_pricelist_by_contact/) | 15.0.1.0.0 |  | Product Pricelist Per Contact
-[product_pricelist_direct_print](product_pricelist_direct_print/) | 15.0.1.4.0 |  | Print price list from menu option, product templates, products variants or price lists
+[product_pricelist_direct_print](product_pricelist_direct_print/) | 15.0.1.5.0 |  | Print price list from menu option, product templates, products variants or price lists
 [product_pricelist_direct_print_company_group](product_pricelist_direct_print_company_group/) | 15.0.1.0.0 |  | Print Pricelist items using the company group model
 [product_pricelist_direct_print_website_sale](product_pricelist_direct_print_website_sale/) | 15.0.1.0.0 | [![CarlosRoca13](https://github.com/CarlosRoca13.png?size=30px)](https://github.com/CarlosRoca13) | Extend Product Pricelist Direct Print for filter by public categories
 [product_pricelist_item_list_view](product_pricelist_item_list_view/) | 15.0.1.0.0 | [![LoisRForgeFlow](https://github.com/LoisRForgeFlow.png?size=30px)](https://github.com/LoisRForgeFlow) | View and search the list of pricelist items

diff --git a/product_pricelist_direct_print/README.rst b/product_pricelist_direct_print/README.rst
@@ -7,7 +7,7 @@ Product Pricelist Direct Print
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:86154b3ca174ab6e21cc6df2282e53ad277989d8151616f2f1bf52b2f3c25d4a
+   !! source digest: sha256:778d1abaed6b1d71c124578be37d59927ff0bb2dd8e5240cbd600c9919f23733
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png

diff --git a/product_pricelist_direct_print/__manifest__.py b/product_pricelist_direct_print/__manifest__.py
@@ -5,7 +5,7 @@
     "name": "Product Pricelist Direct Print",
     "summary": "Print price list from menu option, product templates, "
     "products variants or price lists",
-    "version": "15.0.1.4.0",
+    "version": "15.0.1.5.0",
     "category": "Product",
     "website": "https://github.com/OCA/product-attribute",
     "author": "Tecnativa, " "Odoo Community Association (OCA)",

diff --git a/product_pricelist_direct_print/i18n/es.po b/product_pricelist_direct_print/i18n/es.po
@@ -418,6 +418,11 @@ msgstr "Mostrar precio de coste"
 msgid "Show Sale Price"
 msgstr "Mostrar precio ficha"
 
+#. module: product_pricelist_direct_print
+#: model:ir.model.fields,field_description:product_pricelist_direct_print.field_product_pricelist_print__show_uom
+msgid "Show UOM"
+msgstr ""
+
 #. module: product_pricelist_direct_print
 #: model:ir.model.fields,field_description:product_pricelist_direct_print.field_product_pricelist_print__show_variants
 msgid "Show Variants"
@@ -450,6 +455,12 @@ msgstr "Resumen"
 msgid "Summary:"
 msgstr "Resumen:"
 
+#. module: product_pricelist_direct_print
+#: code:addons/product_pricelist_direct_print/report/product_pricelist_xlsx.py:0
+#, python-format
+msgid "UOM"
+msgstr ""
+
 #. module: product_pricelist_direct_print
 #: code:addons/product_pricelist_direct_print/wizards/product_pricelist_print.py:0
 #, python-format

diff --git a/product_pricelist_direct_print/i18n/fr.po b/product_pricelist_direct_print/i18n/fr.po
@@ -391,6 +391,11 @@ msgstr ""
 msgid "Show Sale Price"
 msgstr ""
 
+#. module: product_pricelist_direct_print
+#: model:ir.model.fields,field_description:product_pricelist_direct_print.field_product_pricelist_print__show_uom
+msgid "Show UOM"
+msgstr ""
+
 #. module: product_pricelist_direct_print
 #: model:ir.model.fields,field_description:product_pricelist_direct_print.field_product_pricelist_print__show_variants
 msgid "Show Variants"
@@ -423,6 +428,12 @@ msgstr ""
 msgid "Summary:"
 msgstr ""
 
+#. module: product_pricelist_direct_print
+#: code:addons/product_pricelist_direct_print/report/product_pricelist_xlsx.py:0
+#, python-format
+msgid "UOM"
+msgstr ""
+
 #. module: product_pricelist_direct_print
 #: code:addons/product_pricelist_direct_print/wizards/product_pricelist_print.py:0
 #, python-format

diff --git a/product_pricelist_direct_print/i18n/it.po b/product_pricelist_direct_print/i18n/it.po
@@ -411,6 +411,11 @@ msgstr "Mostra prezzo di costo"
 msgid "Show Sale Price"
 msgstr "Mostra prezzo di vendita"
 
+#. module: product_pricelist_direct_print
+#: model:ir.model.fields,field_description:product_pricelist_direct_print.field_product_pricelist_print__show_uom
+msgid "Show UOM"
+msgstr ""
+
 #. module: product_pricelist_direct_print
 #: model:ir.model.fields,field_description:product_pricelist_direct_print.field_product_pricelist_print__show_variants
 msgid "Show Variants"
@@ -443,6 +448,12 @@ msgstr "Riepilogo"
 msgid "Summary:"
 msgstr "Riepilogo:"
 
+#. module: product_pricelist_direct_print
+#: code:addons/product_pricelist_direct_print/report/product_pricelist_xlsx.py:0
+#, python-format
+msgid "UOM"
+msgstr ""
+
 #. module: product_pricelist_direct_print
 #: code:addons/product_pricelist_direct_print/wizards/product_pricelist_print.py:0
 #, python-format

diff --git a/product_pricelist_direct_print/i18n/product_pricelist_direct_print.pot b/product_pricelist_direct_print/i18n/product_pricelist_direct_print.pot
@@ -384,6 +384,11 @@ msgstr ""
 msgid "Show Sale Price"
 msgstr ""
 
+#. module: product_pricelist_direct_print
+#: model:ir.model.fields,field_description:product_pricelist_direct_print.field_product_pricelist_print__show_uom
+msgid "Show UOM"
+msgstr ""
+
 #. module: product_pricelist_direct_print
 #: model:ir.model.fields,field_description:product_pricelist_direct_print.field_product_pricelist_print__show_variants
 msgid "Show Variants"
@@ -416,6 +421,12 @@ msgstr ""
 msgid "Summary:"
 msgstr ""
 
+#. module: product_pricelist_direct_print
+#: code:addons/product_pricelist_direct_print/report/product_pricelist_xlsx.py:0
+#, python-format
+msgid "UOM"
+msgstr ""
+
 #. module: product_pricelist_direct_print
 #: code:addons/product_pricelist_direct_print/wizards/product_pricelist_print.py:0
 #, python-format

diff --git a/product_pricelist_direct_print/report/product_pricelist_xlsx.py b/product_pricelist_direct_print/report/product_pricelist_xlsx.py
@@ -67,6 +67,9 @@ def _create_product_pricelist_sheet(self, workbook, book, pricelist):
             sheet.write(5, next_col, _("Sale Price"), header_format)
         next_col += 1
         sheet.write(5, next_col, _("List Price"), header_format)
+        if book.show_uom:
+            next_col += 1
+            sheet.write(5, next_col, _("UOM"), header_format)
         return sheet
 
     def _add_extra_header(self, sheet, book, next_col, header_format):
@@ -119,6 +122,9 @@ def _fill_data(self, workbook, sheet, book, pricelist):
                     product.with_context(pricelist=pricelist.id, date=print_date).price,
                     decimal_bold_format,
                 )
+                if book.show_uom:
+                    next_col += 1
+                    sheet.write(row, next_col, product.uom_id.display_name)
                 row += 1
         if book.summary:
             sheet.write(row, 0, _("Summary:"), bold_format)

diff --git a/product_pricelist_direct_print/static/description/index.html b/product_pricelist_direct_print/static/description/index.html
@@ -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.
@@ -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">Product Pricelist Direct Print</h1>
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:86154b3ca174ab6e21cc6df2282e53ad277989d8151616f2f1bf52b2f3c25d4a
+!! source digest: sha256:778d1abaed6b1d71c124578be37d59927ff0bb2dd8e5240cbd600c9919f23733
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <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/product-attribute/tree/15.0/product_pricelist_direct_print"><img alt="OCA/product-attribute" src="https://img.shields.io/badge/github-OCA%2Fproduct--attribute-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/product-attribute-15-0/product-attribute-15-0-product_pricelist_direct_print"><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/product-attribute&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>Print price list from menu option, product templates, products variants or
@@ -474,7 +475,9 @@ <h2><a class="toc-backref" href="#toc-entry-6">Contributors</a></h2>
 <div class="section" id="maintainers">
 <h2><a class="toc-backref" href="#toc-entry-7">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/product_pricelist_direct_print/views/report_product_pricelist.xml b/product_pricelist_direct_print/views/report_product_pricelist.xml
@@ -64,6 +64,7 @@
                                 <th t-if="pricelist" class="text-right">
                                     <strong>List Price</strong>
                                 </th>
+                                <th t-if="o.show_uom" />
                             </tr>
                         </thead>
                         <tbody>
@@ -95,6 +96,9 @@
                                             t-field="product.with_context(pricelist=pricelist.id, date=o.date or None).price"
                                         />
                                     </td>
+                                    <td t-if="o.show_uom">
+                                        <span t-field="product.uom_id" />
+                                    </td>
                                 </tr>
                             </t>
                         </tbody>

diff --git a/product_pricelist_direct_print/wizards/product_pricelist_print.py b/product_pricelist_direct_print/wizards/product_pricelist_print.py
@@ -43,6 +43,7 @@ class ProductPricelistPrint(models.TransientModel):
     )
     show_standard_price = fields.Boolean(string="Show Cost Price")
     show_sale_price = fields.Boolean()
+    show_uom = fields.Boolean(string="Show UOM", groups="uom.group_uom")
     hide_pricelist_name = fields.Boolean()
     order_field = fields.Selection(
         [("name", "Name"), ("default_code", "Internal Reference")], string="Order"

diff --git a/product_pricelist_direct_print/wizards/product_pricelist_print_view.xml b/product_pricelist_direct_print/wizards/product_pricelist_print_view.xml
@@ -22,6 +22,7 @@
                     <group string="Filter Options">
                         <field name="show_sale_price" />
                         <field name="show_standard_price" />
+                        <field name="show_uom" />
                         <field name="hide_pricelist_name" />
                         <field name="order_field" />
                         <field name="date" />