From 150d846785686d02e2ca5a7083eb36d112f7ab4f Mon Sep 17 00:00:00 2001
From: Janik von Rotz <login@janikvonrotz.ch>
Date: Wed, 28 Jun 2023 15:22:42 +0200
Subject: [PATCH] sync

---
 oca/hr-attendance                             |  2 +-
 oca/hr-holidays                               |  2 +-
 oca/l10n-switzerland                          |  2 +-
 ....report_invoice_document.move_incoterm.xml | 12 ++++
 ..._saleorder_document.add_delivery_dates.xml | 14 ++++
 ...rt_saleorder_document.add_intrastat_id.xml | 14 ++++
 ...e.report_saleorder_document.add_weight.xml | 14 ++++
 ....replace_address_and_information_block.xml | 72 +++++++++++++++++++
 ...rnal_layout_boxed.hide_company_details.xml |  6 ++
 ...ternal_layout_boxed.increase_logo_size.xml |  8 +++
 10 files changed, 143 insertions(+), 3 deletions(-)
 create mode 100644 snippets/account.report_invoice_document.move_incoterm.xml
 create mode 100644 snippets/sale.report_saleorder_document.add_delivery_dates.xml
 create mode 100644 snippets/sale.report_saleorder_document.add_intrastat_id.xml
 create mode 100644 snippets/sale.report_saleorder_document.add_weight.xml
 create mode 100644 snippets/sale.report_saleorder_document.replace_address_and_information_block.xml
 create mode 100644 snippets/web.external_layout_boxed.hide_company_details.xml
 create mode 100644 snippets/web.external_layout_boxed.increase_logo_size.xml

diff --git a/oca/hr-attendance b/oca/hr-attendance
index 8198451f..c3557e5a 160000
--- a/oca/hr-attendance
+++ b/oca/hr-attendance
@@ -1 +1 @@
-Subproject commit 8198451f93738fb1e978112558df28d1df7249a1
+Subproject commit c3557e5af1cb732ab9b3a630b60b3254612270af
diff --git a/oca/hr-holidays b/oca/hr-holidays
index 3f21899f..a831e7cc 160000
--- a/oca/hr-holidays
+++ b/oca/hr-holidays
@@ -1 +1 @@
-Subproject commit 3f21899f4b603ac3c20dfcde7ebcf3fdb08f75e8
+Subproject commit a831e7cc950d890ed38a977acb6afe23b8f1e08a
diff --git a/oca/l10n-switzerland b/oca/l10n-switzerland
index fb0ecd0c..bb7affa6 160000
--- a/oca/l10n-switzerland
+++ b/oca/l10n-switzerland
@@ -1 +1 @@
-Subproject commit fb0ecd0c1902df6158553d69fcd2a9980e0d706b
+Subproject commit bb7affa612a459bcdf094bd13a5116896bea8f19
diff --git a/snippets/account.report_invoice_document.move_incoterm.xml b/snippets/account.report_invoice_document.move_incoterm.xml
new file mode 100644
index 00000000..4f5b23f2
--- /dev/null
+++ b/snippets/account.report_invoice_document.move_incoterm.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<data inherit_id="account.report_invoice_document" priority="60">
+
+  <xpath expr="//p[@name='incoterm']" position="replace"/>
+  <xpath expr="//p[2]" position="after">
+    <p t-if="o.invoice_incoterm_id" name="incoterm">
+      <strong>Incoterm: </strong>
+      <span t-field="o.invoice_incoterm_id.code"/>
+ -      <span t-field="o.invoice_incoterm_id.name"/>
+    </p>
+  </xpath>
+</data>
\ No newline at end of file
diff --git a/snippets/sale.report_saleorder_document.add_delivery_dates.xml b/snippets/sale.report_saleorder_document.add_delivery_dates.xml
new file mode 100644
index 00000000..1d1288a0
--- /dev/null
+++ b/snippets/sale.report_saleorder_document.add_delivery_dates.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<data inherit_id="sale.report_saleorder_document" priority="50">
+  
+  <xpath expr="//th[@name='th_priceunit']" position="before">
+    <th name="th_delivery_dates" class="text-right">Delivery Date</th>
+  </xpath>
+
+  <xpath expr="//td[@name='td_priceunit']" position="before">
+    <td name="td_delivery_dates" class="text-right">
+       <span t-field="line.delivery_dates" t-options="{&quot;widget&quot;: &quot;date&quot;}"/>
+    </td>
+  </xpath>
+  
+</data>
\ No newline at end of file
diff --git a/snippets/sale.report_saleorder_document.add_intrastat_id.xml b/snippets/sale.report_saleorder_document.add_intrastat_id.xml
new file mode 100644
index 00000000..0745cdeb
--- /dev/null
+++ b/snippets/sale.report_saleorder_document.add_intrastat_id.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<data inherit_id="sale.report_saleorder_document" priority="50">
+  
+  <xpath expr="//th[@name='th_quantity']" position="after">
+    <th name="th_hs_code" class="text-right">HS Code</th>
+  </xpath>
+  
+  <xpath expr="//td[@name='td_quantity']" position="after">
+    <td name="td_hs_code" class="text-right">
+       <span t-field="line.product_id.intrastat_id.code"/>
+    </td>
+  </xpath>
+  
+</data>
\ No newline at end of file
diff --git a/snippets/sale.report_saleorder_document.add_weight.xml b/snippets/sale.report_saleorder_document.add_weight.xml
new file mode 100644
index 00000000..1d1288a0
--- /dev/null
+++ b/snippets/sale.report_saleorder_document.add_weight.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<data inherit_id="sale.report_saleorder_document" priority="50">
+  
+  <xpath expr="//th[@name='th_priceunit']" position="before">
+    <th name="th_delivery_dates" class="text-right">Delivery Date</th>
+  </xpath>
+
+  <xpath expr="//td[@name='td_priceunit']" position="before">
+    <td name="td_delivery_dates" class="text-right">
+       <span t-field="line.delivery_dates" t-options="{&quot;widget&quot;: &quot;date&quot;}"/>
+    </td>
+  </xpath>
+  
+</data>
\ No newline at end of file
diff --git a/snippets/sale.report_saleorder_document.replace_address_and_information_block.xml b/snippets/sale.report_saleorder_document.replace_address_and_information_block.xml
new file mode 100644
index 00000000..440db9ff
--- /dev/null
+++ b/snippets/sale.report_saleorder_document.replace_address_and_information_block.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0"?>
+<data inherit_id="sale.report_saleorder_document" priority="50">
+
+  <xpath expr="//t[@t-set='address']" position="replace"/>
+
+  <xpath expr="//t[@t-set='information_block']/.." position="replace">
+
+    <div class="row text-900 o_bold">
+      <div class="col-7">Customer</div>
+      <div class="col-5">Invoice Address</div>
+    </div>
+
+    <div class="row">
+      <div class="col-7">
+        <span t-field="doc.partner_id.commercial_company_name"/>
+      </div>
+      <div class="col-5">
+        <span t-field="doc.partner_invoice_id.commercial_company_name"/>
+      </div>
+    </div>
+
+    <div class="row">
+      <div class="col-7">
+        <span t-field="doc.partner_id" t-options-widget="&quot;contact&quot;" t-options-fields="['address']" t-options-no_marker="True"/>
+      </div>
+      <div class="col-5">
+        <span t-field="doc.partner_invoice_id" t-options-widget="&quot;contact&quot;" t-options-fields="['address']" t-options-no_marker="True"/>
+      </div>
+    </div>
+
+    <div class="row">
+      <div class="col-5 text-900 o_bold offset-7" style="margin-top:25px">Delivery Address</div>
+    </div>
+
+    <div class="row">
+      <div class="col-5 offset-7">
+        <span t-field="doc.partner_shipping_id.commercial_company_name"/>
+      </div>
+    </div>
+    
+    <div class="row">
+      <div class="col-5 offset-7">
+        <span t-field="doc.partner_shipping_id" t-options-widget="&quot;contact&quot;" t-options-fields="['address']" t-options-no_marker="True"/>
+      </div>
+    </div>
+
+    <div class="row o_bold text-900" style="margin-top:25px">
+      <div class="col-7">Your Contact</div>
+      <div class="col-5">Our Contact</div>
+    </div>
+
+    <div class="row">
+      <div class="col-7">
+        <span t-field="doc.partner_id.name"/>
+      </div>
+      <div class="col-5">
+        <span t-field="doc.user_id.name"/>
+      </div>
+    </div>
+
+    <div class="row">
+      <div class="col-7" style="margin-bottom:25px">
+        <span t-field="doc.partner_id" t-options-widget="&quot;contact&quot;" t-options-fields="['phone', 'email']" t-options-no_marker="True"/>
+      </div>
+      <div class="col-5">
+        <span t-field="doc.user_id" t-options-widget="&quot;contact&quot;" t-options-fields="['phone', 'email']" t-options-no_marker="True"/>
+      </div>
+    </div>
+
+  </xpath>
+
+</data>
\ No newline at end of file
diff --git a/snippets/web.external_layout_boxed.hide_company_details.xml b/snippets/web.external_layout_boxed.hide_company_details.xml
new file mode 100644
index 00000000..0dd9adbb
--- /dev/null
+++ b/snippets/web.external_layout_boxed.hide_company_details.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<data inherit_id="web.external_layout_boxed" priority="50">
+
+  <xpath expr="//div[@name='company_address']/.." position="replace"/>
+  
+</data>
\ No newline at end of file
diff --git a/snippets/web.external_layout_boxed.increase_logo_size.xml b/snippets/web.external_layout_boxed.increase_logo_size.xml
new file mode 100644
index 00000000..de68c078
--- /dev/null
+++ b/snippets/web.external_layout_boxed.increase_logo_size.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<data inherit_id="web.external_layout_boxed" priority="50">
+
+  <xpath expr="//img[@t-if='company.logo']" position="attributes">
+        <attribute name="style">width: 720px; margin-top: 10px</attribute>
+  </xpath>
+
+</data>
\ No newline at end of file