Merge branch '16.0' into 16.0

OCA · Oct 7, 2024 · d50552b · d50552b
2 parents ae253b2 + c199434
commit d50552b
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 15 deletions.
diff --git a/README.md b/README.md
@@ -25,9 +25,9 @@ addon | version    | maintainers
 [base_report_to_printer](base_report_to_printer/) | 16.0.1.1.7 |                                                                                                                                                                                                                    | Report to printer
 [base_report_to_printer_mail](base_report_to_printer_mail/) | 16.0.1.0.0 |                                                                                                                                                                                                                    | Report to printer - Mail extension
 [pingen](pingen/) | 16.0.1.0.1 | [![ajaniszewska-dev](https://github.com/ajaniszewska-dev.png?size=30px)](https://github.com/ajaniszewska-dev) [![grindtildeath](https://github.com/grindtildeath.png?size=30px)](https://github.com/grindtildeath) | pingen.com integration
-[pingen_env](pingen_env/) | 16.0.1.0.0 | [![ajaniszewska-dev](https://github.com/ajaniszewska-dev.png?size=30px)](https://github.com/ajaniszewska-dev)                                                                                                      | pingen.com server environment
-[printer_zpl2](printer_zpl2/) | 16.0.1.0.0 |                                                                                                                                                                                                                    | Add a ZPL II label printing feature
-[printing_simple_configuration](printing_simple_configuration/) | 16.0.1.0.1 |                                                                                                                                                                                                                    | Allow to set printing configuration in company or in warehouse
+[pingen_env](pingen_env/) | 16.0.1.0.0 | [![ajaniszewska-dev](https://github.com/ajaniszewska-dev.png?size=30px)](https://github.com/ajaniszewska-dev) | pingen.com server environment
+[printer_zpl2](printer_zpl2/) | 16.0.1.1.0 |  | Add a ZPL II label printing feature
+[printing_simple_configuration](printing_simple_configuration/) | 16.0.1.0.1 |  | Allow to set printing configuration in company or in warehouse
 [zpl_printer](zpl_printer/) | 16.0.0.0.1 | [![mohs8421](https://github.com/mohs8421.png?size=30px)](https://github.com/mohs8421)                                                                                                                             | Directly connect label printers to Odoo
 [zpl_printer_mrp](zpl_printer_mrp/) | 16.0.0.0.1 | [![mohs8421](https://github.com/mohs8421.png?size=30px)](https://github.com/mohs8421)                                                                                                                              | Connects zpl_printer module with mrp module
 [zpl_printer_stock](zpl_printer_stock/) | 16.0.0.0.1 | [![mohs8421](https://github.com/mohs8421.png?size=30px)](https://github.com/mohs8421)                                                                                                                              | Connects zpl_printer module with mrp module, add option to specify printer on product

diff --git a/pingen/i18n/it.po b/pingen/i18n/it.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 16.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2024-07-08 14:58+0000\n"
+"PO-Revision-Date: 2024-09-17 10:06+0000\n"
 "Last-Translator: mymage <[email protected]>\n"
 "Language-Team: none\n"
 "Language: it\n"
@@ -249,7 +249,7 @@ msgstr "Contenuto file (base64)"
 #. module: pingen
 #: model:ir.model.fields,field_description:pingen.field_pingen_document__raw
 msgid "File Content (raw)"
-msgstr "Contenuto file (grezzo)"
+msgstr "Contenuto file (raw)"
 
 #. module: pingen
 #: model:ir.model.fields,field_description:pingen.field_pingen_document__file_size

diff --git a/printer_zpl2/README.rst b/printer_zpl2/README.rst
@@ -7,7 +7,7 @@ Printer ZPL II
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:c4defaa600d7e33cad7033338f5db25c205cd873afc0a5fd1aaa7658c7c4e3d7
+   !! source digest: sha256:0205041d24095e143639c6bde7b129dfb5c1afd149df42cceeb9f0908db36673
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png

diff --git a/printer_zpl2/__manifest__.py b/printer_zpl2/__manifest__.py
@@ -3,7 +3,7 @@
 
 {
     "name": "Printer ZPL II",
-    "version": "16.0.1.0.0",
+    "version": "16.0.1.1.0",
     "category": "Printer",
     "summary": "Add a ZPL II label printing feature",
     "author": "SUBTENO-IT, FLorent de Labarre, "

diff --git a/printer_zpl2/static/description/index.html b/printer_zpl2/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 ([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.
@@ -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">Printer ZPL II</h1>
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:c4defaa600d7e33cad7033338f5db25c205cd873afc0a5fd1aaa7658c7c4e3d7
+!! source digest: sha256:0205041d24095e143639c6bde7b129dfb5c1afd149df42cceeb9f0908db36673
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <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/report-print-send/tree/16.0/printer_zpl2"><img alt="OCA/report-print-send" src="https://img.shields.io/badge/github-OCA%2Freport--print--send-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/report-print-send-16-0/report-print-send-16-0-printer_zpl2"><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/report-print-send&amp;target_branch=16.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
 <p>This module extends the <strong>Report to printer</strong> (<tt class="docutils literal">base_report_to_printer</tt>)
@@ -428,7 +428,9 @@ <h1><a class="toc-backref" href="#toc-entry-3">Usage</a></h1>
     self.env['product.product'].browse(product_id))
 </pre>
 <p>You can also use the generic label printing wizard, if added on some models.</p>
-<a class="reference external image-reference" href="https://runbot.odoo-community.org/runbot/144/12.0"><img alt="Try me on Runbot" src="https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas" /></a>
+<a class="reference external image-reference" href="https://runbot.odoo-community.org/runbot/144/12.0">
+<img alt="Try me on Runbot" src="https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas" />
+</a>
 </div>
 <div class="section" id="changelog">
 <h1><a class="toc-backref" href="#toc-entry-4">Changelog</a></h1>
@@ -476,7 +478,9 @@ <h2><a class="toc-backref" href="#toc-entry-9">Contributors</a></h2>
 <div class="section" id="maintainers">
 <h2><a class="toc-backref" href="#toc-entry-10">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/printer_zpl2/views/printing_label_zpl2.xml b/printer_zpl2/views/printing_label_zpl2.xml
@@ -149,6 +149,7 @@
                                             widget="ace"
                                             options="{'mode': 'python'}"
                                             nolabel="1"
+                                            colspan="2"
                                         />
                                     </group>
                                     <notebook colspan="4">
@@ -302,6 +303,7 @@
                                     widget="ace"
                                     options="{'mode': 'python'}"
                                     attrs="{'invisible':[('test_print_mode', '=', False), ('test_labelary_mode', '=', False)]}"
+                                    colspan="2"
                                 />
                             </group>
                         </page>

diff --git a/printer_zpl2/wizard/wizard_import_zpl2.xml b/printer_zpl2/wizard/wizard_import_zpl2.xml
@@ -12,7 +12,7 @@
                     </group>
                 </group>
                 <group string="ZPL2">
-                    <field name="data" widget="ace" nolabel="1" />
+                    <field name="data" widget="ace" nolabel="1" colspan="2" />
                 </group>
                 <footer>
                     <button string="Cancel" class="btn-default" special="cancel" />