From e81f8106578f97b8e5589b3fbc9668a67a11a01d Mon Sep 17 00:00:00 2001
From: Kurt Gisler <kurt.gisler@mint-system.ch>
Date: Mon, 11 Nov 2024 22:09:31 +0100
Subject: [PATCH] Update of Snippets

---
 ...t_invoice_document.add_percentage_sign.xml |  6 +-
 ...ort_invoice_document.replace_infotable.xml |  2 +
 .../mrp.label_production_view_pdf.trimada.xml | 17 ++---
 ...porder.modify_section_order_definition.xml |  4 +-
 ...sequotation_document.modify_main_table.xml |  3 +-
 ...eport_blanketorder_document.add_footer.xml | 73 ++++++++++---------
 ...rt_blanketorder_document.address_block.xml | 42 +++++++++++
 ...e.report_saleorder_document.add_footer.xml |  5 +-
 ...saleorder_document.add_percentage_sign.xml |  6 +-
 ...k.label_transfer_template_view.trimada.xml |  2 +-
 10 files changed, 110 insertions(+), 50 deletions(-)
 create mode 100644 snippets/sale.report_blanketorder_document.address_block.xml

diff --git a/snippets/account.report_invoice_document.add_percentage_sign.xml b/snippets/account.report_invoice_document.add_percentage_sign.xml
index 91dcb970..75d7cb4a 100644
--- a/snippets/account.report_invoice_document.add_percentage_sign.xml
+++ b/snippets/account.report_invoice_document.add_percentage_sign.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0"?>
 <data inherit_id="account.report_invoice_document" priority="50">
-    <xpath expr="//span[@t-field='line.discount']" position="replace"><span t-field="line.discount"/>%
+
+<xpath expr="//span[@t-field='line.discount']" position="replace">
+    <span t-field="line.discount"/>
+    <span>%</span>
   </xpath>
+
 </data>
diff --git a/snippets/account.report_invoice_document.replace_infotable.xml b/snippets/account.report_invoice_document.replace_infotable.xml
index ea063d6b..a72f0b37 100644
--- a/snippets/account.report_invoice_document.replace_infotable.xml
+++ b/snippets/account.report_invoice_document.replace_infotable.xml
@@ -6,10 +6,12 @@
       width: 100%;
       margin-bottom: 25px;
       font-size: 9pt;
+      border-color: white;
     }
     table#info tr {
       line-height: 1.2;
       text-align: left;
+      border-color: white;
     }
     .note {
       font-size: 9pt;
diff --git a/snippets/mrp.label_production_view_pdf.trimada.xml b/snippets/mrp.label_production_view_pdf.trimada.xml
index 04f0b4bc..7aa46734 100644
--- a/snippets/mrp.label_production_view_pdf.trimada.xml
+++ b/snippets/mrp.label_production_view_pdf.trimada.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0"?>
 <t t-name="mrp.label_production_view_pdf.trimada">
     <t t-call="web.basic_layout">
         <t t-foreach="docs" t-as="production">
@@ -20,7 +19,7 @@
               padding-bottom: 3mm;
           }
           .title {
-              font-size: 11mm;
+              font-size: 13mm;
               margin: 3mm 3mm 0 3mm;
               font-weight: bold;
               text-align: center;
@@ -28,7 +27,7 @@
               line-height: 1;
           }
           .description {
-              font-size: 9mm;
+              font-size: 10mm;
               margin: 0 3mm 0 3mm;
               text-align: center;
               height: 23mm;
@@ -49,7 +48,7 @@
               border-bottom: solid 1px;
           }
           .order {
-              font-size: 7mm;
+              font-size: 8mm;
               margin: 3mm 3mm 0 3mm;
               text-align: left;
               border-bottom: solid 1px;
@@ -63,7 +62,7 @@
               font-size: 5mm;
               text-align: center;
               height: 8mm;
-              line-height: 10mm;
+              line-height: 12mm;
           }
           .col-6 {
             padding-right: 0;
@@ -77,7 +76,7 @@
                                 <span t-esc="move.product_id.default_code"/>
                             </div>
                             <div t-if="move.product_id.barcode" class="col-6 box2 text-right">
-                                <img t-att-src="'/report/barcode/?type=%s&amp;value=%s&amp;width=%s&amp;height=%s&amp;quiet=0' % ('Code128', move.product_id.barcode, 250, 85)" alt="Barcode"/>
+                                <span t-field="move.product_id.barcode" t-options-quiet="0" t-options="{'widget': 'barcode', 'img_style': 'float:right; width:250px; height:85px;'}"/>
                             </div>
                         </div>
                         <div class="description">
@@ -99,16 +98,16 @@
                             </div>
                             <div class="col-6 box">
                                 <div t-if="production.name" class="text-right">
-                                    <img t-att-src="'/report/barcode/?type=%s&amp;value=%s&amp;width=%s&amp;height=%s&amp;quiet=0' % ('Code128', production.name, 250, 80)" alt="Barcode"/>
+                                     <span t-field="production.name" t-options-quiet="0" t-options="{'widget': 'barcode', 'img_style': 'float:right; width:250px; height:80px;'}"/>
                                 </div>
                             </div>
                         </div>
                         <div class="comment">
-                            <span>Trimada AG, CH-5610 Wohlen &#x2013; www.trimada.ch</span>
+                            <span>Trimada AG, CH-5610 Wohlen – www.trimada.ch</span>
                         </div>
                     </div>
                 </div>
             </t>
         </t>
     </t>
-</t>
+</t>
\ No newline at end of file
diff --git a/snippets/mrp.report_mrporder.modify_section_order_definition.xml b/snippets/mrp.report_mrporder.modify_section_order_definition.xml
index 4e130b30..921a8edd 100644
--- a/snippets/mrp.report_mrporder.modify_section_order_definition.xml
+++ b/snippets/mrp.report_mrporder.modify_section_order_definition.xml
@@ -74,10 +74,10 @@
           <span t-field="o.product_uom_id.name" groups="uom.group_uom"/>
         </strong>
       </div>
-      <div class="col-4">
+      <div class="col-3">
         Start: <span t-field="o.date_planned_start" t-options="{&quot;widget&quot;: &quot;date&quot;}"/>
       </div>
-      <div class="col-2 text-end">
+      <div class="col-3 text-end">
         <strong>Termin: <span t-field="o.date_planned_finished" t-options="{&quot;widget&quot;: &quot;date&quot;}"/>
         </strong>
       </div>
diff --git a/snippets/purchase.report_purchasequotation_document.modify_main_table.xml b/snippets/purchase.report_purchasequotation_document.modify_main_table.xml
index f4b1ec2f..6681dfa8 100644
--- a/snippets/purchase.report_purchasequotation_document.modify_main_table.xml
+++ b/snippets/purchase.report_purchasequotation_document.modify_main_table.xml
@@ -50,6 +50,7 @@
   <!-- header: description -->
   <xpath expr="//table/thead/tr/th[3]" position="attributes">
     <attribute name="style">width: 400px;</attribute>
+    <attribute name="class" separator=" " add="text-start" remove="text-center"/>
   </xpath>
 
   <!-- header: date_planned -->
@@ -108,4 +109,4 @@
     </table>    
   </xpath>
 
-</data>
+</data>
\ No newline at end of file
diff --git a/snippets/sale.report_blanketorder_document.add_footer.xml b/snippets/sale.report_blanketorder_document.add_footer.xml
index 36b84864..56f5da6a 100644
--- a/snippets/sale.report_blanketorder_document.add_footer.xml
+++ b/snippets/sale.report_blanketorder_document.add_footer.xml
@@ -1,55 +1,60 @@
-<?xml version="1.0"?>
-<data inherit_id="sale.report_blanketorder_document" priority="50">
-    <xpath expr="//p[@t-if='doc.payment_term_id.note']" position="replace">
-        <style>
+<data inherit_id="sale_blanket_order.report_blanketorder_document" priority="50">
+
+<xpath expr="//table[@id='summary']" position="after">
+  <style>
       table#footer {
         width: 100%;
         font-size: 8pt;
+        line-height: 1.5;
       }
       table#footer tr, td {
         vertical-align: top;
       }
     </style>
-        <table id="footer">
-            <tr>
-                <td width="40%" t-if="doc.payment_term_id.note">Zahlungsbedingungen 
-          <span t-field="doc.payment_term_id.note"/>
+    <table id="footer">
+      <tr>
+        <td width="40%" t-if="doc.payment_term_id">
+          <span>Zahlungsbedingungen </span>
+          <span t-field="doc.payment_term_id"/>
         </td>
-                <td width="60%">
-          Lieferung gem&#xE4;ss unseren allgemeinen Lieferbedingungen
+        <td width="60%">
+          Delivery according to our general delivery conditions
         </td>
-            </tr>
-            <tr>
-                <td>MWST-Nr: 
+      </tr>
+      <tr>
+        <td>
+           <span>VAT no: </span>
            <span t-field="doc.company_id.vat"/>
         </td>
-                <td>
-                    <table width="100%">
-                        <tr>
-                            <td width="35%">
-               Bankverbindungen:
+        <td>
+          <table width="100%">
+          <tr>
+            <td width="35%">
+               Bank accounts:
             </td>
-                            <td width="65%">
+              <td width="65%">
               UBS AG, 6301 Zug, BLZ 273, SWIFT UBSWCHZH80A
              </td>
-                        </tr>
-                        <tr>
-                            <td>
+          </tr> 
+          <tr> 
+             <td>
             </td>
-                            <td>
+            <td>
             (CHF) IBAN CH63 0027 3273 Q978 6962 0
             </td>
-                        </tr>
-                        <tr>
-                            <td>
+          </tr>
+       
+          <tr>
+            <td>
             </td>
-                            <td>
+            <td>
             (EUR) IBAN CH59 0027 3273 HN10 3698 0
             </td>
-                        </tr>
-                    </table>
-                </td>
-            </tr>
-        </table>
-    </xpath>
-</data>
+          </tr>
+          </table> 
+        </td>
+      </tr>
+    </table>
+  </xpath>
+
+</data>
\ No newline at end of file
diff --git a/snippets/sale.report_blanketorder_document.address_block.xml b/snippets/sale.report_blanketorder_document.address_block.xml
new file mode 100644
index 00000000..5a676c46
--- /dev/null
+++ b/snippets/sale.report_blanketorder_document.address_block.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0"?>
+<data inherit_id="sale_blanket_order.report_blanketorder_document" priority="50">&gt;
+
+    <xpath expr="/t/t/div/div[2]" position="replace">
+        <t t-set="address">
+            <t t-if="doc.partner_sale_id">
+                <div t-esc="doc.partner_sale_id.parent_id.name"/>
+                <div t-esc="doc.partner_sale_id.parent_id.name2"/>
+                <span t-esc="doc.partner_sale_id.title.name"/>
+                <span t-esc="doc.partner_sale_id.name"/>
+                <div t-esc="doc.partner_sale_id.street"/>
+                <div t-esc="doc.partner_sale_id.street2"/>
+                <span t-esc="doc.partner_sale_id.zip"/>
+                <span t-esc="doc.partner_sale_id.city"/>
+                <t t-if="doc.partner_sale_id.country_id.code != 'CH'">
+                    <div t-esc="doc.partner_sale_id.country_id.name"/>
+                </t>
+            </t>
+            <t t-else="">
+                <div t-field="doc.partner_id" t-options="{&quot;widget&quot;: &quot;contact&quot;, &quot;fields&quot;: [&quot;address&quot;, &quot;name&quot;], &quot;no_marker&quot;: True}"/>
+                <p t-if="doc.partner_id.vat">
+                    <t t-esc="doc.company_id.country_id.vat_label or 'Tax ID'"/>
+:                    <span t-field="doc.partner_id.vat"/>
+                </p>
+            </t>
+        </t>
+        <t t-if="doc.partner_shipping_id == doc.partner_invoice_id                              and doc.partner_invoice_id != doc.partner_id                              or doc.partner_shipping_id != doc.partner_invoice_id">
+            <t t-set="information_block">
+                <!--
+                <strong t-if="doc.partner_shipping_id == doc.partner_invoice_id">Invoicing and Shipping Address:</strong>
+                <strong t-if="doc.partner_shipping_id != doc.partner_invoice_id">Invoicing Address:</strong>
+                <div t-field="doc.partner_invoice_id" t-options="{&quot;widget&quot;: &quot;contact&quot;, &quot;fields&quot;: [&quot;address&quot;, &quot;name&quot;, &quot;phone&quot;], &quot;no_marker&quot;: True, &quot;phone_icons&quot;: True}"/>
+                -->
+                <t t-if="doc.partner_shipping_id != doc.partner_invoice_id">
+                    <strong>Shipping Address:</strong>
+                    <div t-field="doc.partner_shipping_id" t-options="{&quot;widget&quot;: &quot;contact&quot;, &quot;fields&quot;: [&quot;address&quot;, &quot;name&quot;], &quot;no_marker&quot;: True, &quot;phone_icons&quot;: True}"/>
+                </t>
+            </t>
+        </t>
+    </xpath>
+
+</data>
\ No newline at end of file
diff --git a/snippets/sale.report_saleorder_document.add_footer.xml b/snippets/sale.report_saleorder_document.add_footer.xml
index 2f2fb026..736fdcfa 100644
--- a/snippets/sale.report_saleorder_document.add_footer.xml
+++ b/snippets/sale.report_saleorder_document.add_footer.xml
@@ -6,9 +6,12 @@
         width: 100%;
         font-size: 8pt;
         margin-top: 25px;
+        border-color: white;
+        line-height: 1.5;
       }
       table#footer tr, td {
         vertical-align: top;
+        border-color: white;
       }
     </style>
     <table id="footer">
@@ -60,4 +63,4 @@
     </table>
   </xpath>
 
-</data>
+</data>
\ No newline at end of file
diff --git a/snippets/sale.report_saleorder_document.add_percentage_sign.xml b/snippets/sale.report_saleorder_document.add_percentage_sign.xml
index 94e0626b..3f5f9f17 100644
--- a/snippets/sale.report_saleorder_document.add_percentage_sign.xml
+++ b/snippets/sale.report_saleorder_document.add_percentage_sign.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0"?>
 <data inherit_id="sale.report_saleorder_document" priority="50">
-    <xpath expr="//span[@t-field='line.discount']" position="replace"><span t-field="line.discount"/>%
+
+<xpath expr="//span[@t-field='line.discount']" position="replace">
+    <span t-field="line.discount"/>
+    <span>%</span>
   </xpath>
+
 </data>
diff --git a/snippets/stock.label_transfer_template_view.trimada.xml b/snippets/stock.label_transfer_template_view.trimada.xml
index 16e29554..7f8f670e 100644
--- a/snippets/stock.label_transfer_template_view.trimada.xml
+++ b/snippets/stock.label_transfer_template_view.trimada.xml
@@ -23,7 +23,7 @@
                         padding-bottom: 3mm;
                     }
                     .title {
-                        font-size: 11mm;
+                        font-size: 13mm;
                         margin: 3mm 3mm 0 3mm;
                         font-weight: bold;
                         text-align: center;