diff --git a/snippets/account.report_invoice_document.add_iban.xml b/snippets/account.report_invoice_document.add_iban.xml
index ce2143f6..d5d47e25 100644
--- a/snippets/account.report_invoice_document.add_iban.xml
+++ b/snippets/account.report_invoice_document.add_iban.xml
@@ -1,6 +1,18 @@
 <?xml version="1.0"?>
 <data inherit_id="account.report_invoice_document" priority="50">
+
+    <!-- Odoo 17.0 -->
+    <xpath expr="//span[@id='payment_terms_note_id']/.." position="after">
+        <div class="row">
+            <div class="col">
+                <span>IBAN: </span>
+                <span t-field="o.partner_bank_id.acc_number"/>
+            </div>
+        </div>
+    </xpath>
+
     <!-- Odoo 14.0 -->
+    <!--
     <xpath expr="/t/t/div/p[2]" position="before">
         <t t-if="not o.partner_bank_id._eligible_for_qr_code('ch_qr', o.partner_id, o.currency_id)">
             <p>
@@ -15,7 +27,7 @@
                 </b>
             </p>
         </t>
-    </xpath>
+    </xpath> -->
     <!-- Odoo 13.0 -->
     <!-- <xpath expr="/t/t/div/p[2]" position="after">
       <div class="row">
@@ -24,8 +36,8 @@
           <span t-field="o.invoice_partner_bank_id.acc_number"/>
       </div>
       </div>
-  </xpath>
-  <xpath expr="/t/t/div/div[3]" position="after">
+    </xpath>
+    <xpath expr="/t/t/div/div[3]" position="after">
       <div class="row">
       <div class="col">
           <span>Bank/BIC: </span>
@@ -34,5 +46,5 @@
           <br/>
       </div>
       </div>
-  </xpath> -->
+    </xpath> -->
 </data>
diff --git a/snippets/l10n_ch.l10n_ch_swissqr_template.replace_title.xml b/snippets/l10n_ch.l10n_ch_swissqr_template.replace_title.xml
index a10c94e6..38d4e3d9 100644
--- a/snippets/l10n_ch.l10n_ch_swissqr_template.replace_title.xml
+++ b/snippets/l10n_ch.l10n_ch_swissqr_template.replace_title.xml
@@ -1,25 +1,27 @@
-<?xml version="1.0"?>
 <data inherit_id="l10n_ch.l10n_ch_swissqr_template" priority="50">
-    <xpath expr="//h1" position="replace">
-        <style>
+
+<xpath expr="//div[@class='swissqr_content_v2']" position="after">
+ 
+     <style>
           .trimada {
                font-size: 9pt;
                font-family: arial;
                color: black;
                margin-left: 25mm;
-               width: 200mm;
+               padding-top: 50mm;
           }
           .name {
                font-size: 13pt;
           }
      </style>
-        <div class="trimada" t-field="o.partner_invoice_id" t-options="{&quot;widget&quot;: &quot;contact&quot;, &quot;fields&quot;: [&quot;address&quot;, &quot;name&quot;], &quot;no_marker&quot;: True}"/>
-        <br/>
-        <br/>
-        <br/>
-        <span class="trimada name">Rechnung <t t-esc="o.name"/></span>
-        <br/>
-        <span class="trimada">Rechnungsdatum: <t t-options="{&quot;widget&quot;: &quot;date&quot;}" t-esc="o.invoice_date"/></span>
-        <br/>
-    </xpath>
+     <div class="trimada" t-field="o.partner_invoice_id" t-options="{&quot;widget&quot;: &quot;contact&quot;, &quot;fields&quot;: [&quot;address&quot;, &quot;name&quot;], &quot;no_marker&quot;: True}"/>
+     <br/>
+     <br/>
+     <br/>
+     <span class="trimada name">Rechnung <t t-esc="o.name"/></span>
+     <br/>
+     <span class="trimada">Rechnungsdatum: <t t-options="{&quot;widget&quot;: &quot;date&quot;}" t-esc="o.invoice_date"/></span>
+     <br/>
+</xpath>
+
 </data>
diff --git a/snippets/purchase.report_purchaseorder_document.append_payment_terms.xml b/snippets/purchase.report_purchaseorder_document.append_payment_terms.xml
index eb165d98..22a89b2b 100644
--- a/snippets/purchase.report_purchaseorder_document.append_payment_terms.xml
+++ b/snippets/purchase.report_purchaseorder_document.append_payment_terms.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0"?>
-<data inherit_id="purchase.report_purchaseorder_document" priority="50">
-    <xpath expr="/t/t/div/div[4]" position="after">
-        <div class="row">
-            <div class="col">
-                <t t-if="o.payment_term_id" name="payment_term">
-                    <strong>Payment Terms: </strong>
-                    <span t-field="o.payment_term_id.name"/>
-                </t>
-            </div>
-        </div>
-    </xpath>
+<data inherit_id="purchase.report_purchaseorder_document">
+
+<xpath expr="//div[@id='total']" position="after">
+    <div class="row" style="margin-top: 1rem; margin-bottom: 1rem">
+      <div class="col">
+        <t t-if="o.payment_term_id" name="payment_term">
+            <strong>Payment Terms: </strong><span t-field="o.payment_term_id.name"/>
+        </t>
+      </div>
+    </div>
+  </xpath>
+  
 </data>
diff --git a/snippets/purchase.report_purchaseorder_document.format_title.xml b/snippets/purchase.report_purchaseorder_document.format_title.xml
index cba0e2a4..ab78627b 100644
--- a/snippets/purchase.report_purchaseorder_document.format_title.xml
+++ b/snippets/purchase.report_purchaseorder_document.format_title.xml
@@ -1,14 +1,16 @@
 <?xml version="1.0"?>
-<data inherit_id="purchase.report_purchaseorder_document" priority="50">
+<data inherit_id="purchase.report_purchaseorder_document" priority="50">>
 
-  <xpath expr="//h2[1]" position="attributes">
-    <attribute name="style">color: black; font-size:13pt; font-weight:bold; margin-top:10mm; margin-bottom:3mm</attribute>
+  <xpath expr="//div/h2[1]" position="attributes">
+    <attribute name="style">color: black; margin-top: 2rem</attribute>
   </xpath>
-  <xpath expr="//h2[2]" position="attributes">
-    <attribute name="style">color: black; font-size:13pt; font-weight:bold; margin-top:10mm; margin-bottom:3mm</attribute>
+  
+  <xpath expr="//div/h2[2]" position="attributes">
+    <attribute name="style">color: black; margin-top: 2rem</attribute>
   </xpath>
-  <xpath expr="//h2[3]" position="attributes">
-    <attribute name="style">color: black; font-size:13pt; font-weight:bold; margin-top:10mm; margin-bottom:3mm</attribute>
+  
+  <xpath expr="//div/h2[3]" position="attributes">
+    <attribute name="style">color: black; margin-top: 2rem</attribute>
   </xpath>
 
 </data>
diff --git a/snippets/purchase.report_purchaseorder_document.replace_representative.xml b/snippets/purchase.report_purchaseorder_document.replace_representative.xml
index 555123ad..74f44c9d 100644
--- a/snippets/purchase.report_purchaseorder_document.replace_representative.xml
+++ b/snippets/purchase.report_purchaseorder_document.replace_representative.xml
@@ -1,6 +1,7 @@
-<?xml version="1.0"?>
-<data inherit_id="purchase.report_purchaseorder_document" priority="50">
-    <xpath expr="/t[1]/t[1]/div[1]/div[2]/div[1]/p[1]" position="replace">
-        <span t-field="o.user_id.email"/>
-    </xpath>
-</data>
+<data inherit_id="purchase.report_purchaseorder_document">
+
+  <xpath expr="//div[@id='informations']//p[@t-field='o.user_id']" position="replace">
+    <p t-field="o.user_id.email"/>
+  </xpath>
+
+</data>
\ No newline at end of file
diff --git a/snippets/purchase.report_purchasequotation_document.add_infoblock.xml b/snippets/purchase.report_purchasequotation_document.add_infoblock.xml
new file mode 100644
index 00000000..59f0fb46
--- /dev/null
+++ b/snippets/purchase.report_purchasequotation_document.add_infoblock.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+<data inherit_id="purchase.report_purchasequotation_document" priority="50">
+
+ <xpath expr="//div[@id='informations']" position="replace">
+ 
+    <div id="informations" class="row mt32 mb32">
+        <div t-if="o.user_id" class="col-3 bm-2">
+            <strong>Ansprechperson Einkauf</strong>
+            <p t-field="o.user_id.email" class="m-0"/>
+        </div>
+        <div t-if="o.partner_ref" class="col-3 bm-2">
+            <strong>Ihre Referenz</strong>
+            <p t-field="o.partner_ref" class="m-0"/>
+        </div>
+        <div t-if="o.date_order" class="col-3 bm-2">
+            <strong>Frist für Angebotsabgabe</strong>
+            <p t-field="o.date_order" class="m-0" t-options="{ &quot;widget&quot;: &quot;date&quot; }"/>
+        </div>
+        <div t-if="o.incoterm_id" class="col-3 bm-2">
+            <strong>Incoterm</strong>
+            <p t-field="o.incoterm_id.code" class="m-0"/>
+        </div> 
+    </div>
+  </xpath>
+
+</data>
\ No newline at end of file
diff --git a/snippets/sale.report_saleorder_document.add_partner_contact_id.xml b/snippets/sale.report_saleorder_document.add_partner_contact_id.xml
deleted file mode 100644
index 732496ec..00000000
--- a/snippets/sale.report_saleorder_document.add_partner_contact_id.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0"?>
-<data inherit_id="sale.report_saleorder_document" priority="50">
-    <xpath expr="//div[@id='informations']//p[@t-field='doc.client_order_ref']/.." position="after">
-        <div t-if="doc.partner_contact_id.name and doc.partner_contact_id.parent_id" class="col-auto col-3 mw-100 mb-2">
-            <strong>Contact</strong>
-            <p t-field="doc.partner_contact_id.name"/>
-        </div>
-    </xpath>
-</data>
diff --git a/snippets/sale.report_saleorder_document.add_partner_sale_id.xml b/snippets/sale.report_saleorder_document.add_partner_sale_id.xml
new file mode 100644
index 00000000..f1e47b0d
--- /dev/null
+++ b/snippets/sale.report_saleorder_document.add_partner_sale_id.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<data inherit_id="sale.report_saleorder_document" priority="50">
+    <xpath expr="//div[@id='informations']//span[@t-field='doc.client_order_ref']/.." position="after">
+        <div t-if="doc.partner_sale_id.name and doc.partner_sale_id.parent_id" class="col-auto col-3 mw-100 mb-2">
+            <strong>Contact</strong>
+            <p t-field="doc.partner_sale_id.name"/>
+        </div>
+    </xpath>
+</data>
diff --git a/snippets/sale.report_saleorder_document.append_payment_terms.xml b/snippets/sale.report_saleorder_document.append_payment_terms.xml
index 13ca709c..d4def0df 100644
--- a/snippets/sale.report_saleorder_document.append_payment_terms.xml
+++ b/snippets/sale.report_saleorder_document.append_payment_terms.xml
@@ -1,11 +1,17 @@
-<?xml version="1.0"?>
-<data inherit_id="sale.report_saleorder_document" priority="50">
-    <xpath expr="/t/t/div/div[6]" position="after">
-        <div class="row">
-            <div class="col">
-                <strong>Zahlungsbedingungen: </strong>
-                <span t-field="doc.payment_term_id.name"/>
-            </div>
-        </div>
-    </xpath>
+<data inherit_id="sale.report_saleorder_document">
+
+<xpath expr="//div/span[@t-field='doc.note']/.." position="before">
+    <div class="row" style="margin-top: 1rem; margin-bottom: 1rem">
+      <div class="col">
+         <strong>Zahlungsbedingungen: </strong>
+         <t t-if="doc.x_payment_term_blanket_order">
+           <span t-field="doc.x_payment_term_blanket_order"/>
+         </t>
+         <t t-if="not doc.x_payment_term_blanket_order">
+           <span t-field="doc.payment_term_id.name"/>
+         </t>
+      </div>
+    </div>
+</xpath>
+
 </data>
diff --git a/snippets/sale.report_saleorder_document.set_ids.xml b/snippets/sale.report_saleorder_document.set_ids.xml
index 1e72ce19..0af22b5f 100644
--- a/snippets/sale.report_saleorder_document.set_ids.xml
+++ b/snippets/sale.report_saleorder_document.set_ids.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0"?>
 <data inherit_id="sale.report_saleorder_document" priority="50">
-    <xpath expr="//div[@id='informations']//p[@t-field='doc.incoterm.code']/.." position="attributes">
+    <xpath expr="//div[@id='informations']//span[@t-field='doc.incoterm.code']/.." position="attributes">
         <attribute name="id">incoterm</attribute>
     </xpath>
-    <xpath expr="//div[@id='informations']//p[@t-field='doc.date_order']" position="attributes">
+    <xpath expr="//div[@id='informations']//span[@t-field='doc.date_order']" position="attributes">
         <attribute name="id">date_order</attribute>
     </xpath>
     <xpath expr="//th[@name='th_description']" position="attributes">
diff --git a/snippets/sale.report_saleorder_document.style_gelso.xml b/snippets/sale.report_saleorder_document.style_gelso.xml
index 6b05ab72..bd14d18b 100644
--- a/snippets/sale.report_saleorder_document.style_gelso.xml
+++ b/snippets/sale.report_saleorder_document.style_gelso.xml
@@ -1,9 +1,16 @@
-<?xml version="1.0"?>
 <data inherit_id="sale.report_saleorder_document" priority="60">
-    <xpath expr="//div[@id='incoterm']" position="attributes">
-        <attribute name="class" separator=" " add="col-auto col-3 mw-100 mb-2"/>
+
+    <xpath expr="//div[hasclass('page')]" position="before">
+        <style>
+        .mt-4 {
+            margin-top: 0rem !important;
+            }
+        </style>
     </xpath>
-    <xpath expr="//p[@id='date_order']" position="attributes">
-        <attribute name="t-options-widget">"date"</attribute>
+
+    <xpath expr="//h2" position="attributes">
+        <attribute name="class"/>
+        <attribute name="style">margin-top: 2rem</attribute>
     </xpath>
-</data>
+    
+</data>
\ No newline at end of file