From e2fcb456b6d3064aa846b60d23ce92b9d1d9b8d3 Mon Sep 17 00:00:00 2001
From: janikvonrotz <contact@janikvonrotz.ch>
Date: Thu, 30 Jun 2022 10:34:12 +0200
Subject: [PATCH] sync from 14.0

---
 ...ort_invoice_document.replace_infotable.xml |  2 +-
 ...rchasequotation_document.style_trimada.xml | 77 +++++++++++++++++++
 .../sale.report_saleconfirmation.base.xml     |  9 +++
 ...eport_saleorder_document.address_block.xml | 44 +++++++++++
 ...rt_saleorder_document.confirmation_qty.xml | 18 +++++
 ..._saleorder_document.confirmation_title.xml | 12 +++
 ...rder_document.modify_information_block.xml | 17 ----
 7 files changed, 161 insertions(+), 18 deletions(-)
 create mode 100644 snippets/purchase.report_purchasequotation_document.style_trimada.xml
 create mode 100644 snippets/sale.report_saleconfirmation.base.xml
 create mode 100644 snippets/sale.report_saleorder_document.address_block.xml
 create mode 100644 snippets/sale.report_saleorder_document.confirmation_qty.xml
 create mode 100644 snippets/sale.report_saleorder_document.confirmation_title.xml
 delete mode 100644 snippets/sale.report_saleorder_document.modify_information_block.xml

diff --git a/snippets/account.report_invoice_document.replace_infotable.xml b/snippets/account.report_invoice_document.replace_infotable.xml
index 03c95f4a..578d6d75 100644
--- a/snippets/account.report_invoice_document.replace_infotable.xml
+++ b/snippets/account.report_invoice_document.replace_infotable.xml
@@ -62,7 +62,7 @@
         </td>
         <td>Delivery Date</td>
         <td>
-          <span t-field='o.sale_order_id.effective_date'/>
+          <span t-field='o.picking_ids.date_done' t-options='{ "widget": "date" }'/>
         </td>
       </tr>
     </table>
diff --git a/snippets/purchase.report_purchasequotation_document.style_trimada.xml b/snippets/purchase.report_purchasequotation_document.style_trimada.xml
new file mode 100644
index 00000000..825e07b0
--- /dev/null
+++ b/snippets/purchase.report_purchasequotation_document.style_trimada.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0"?>
+<data inherit_id="purchase.report_purchasequotation_document" priority="60">
+
+	<xpath expr="//div[hasclass('page')]" position="before">
+		<style>
+			table.trimada {
+				font-size: 9pt;
+				font-family: arial;
+				color: black;
+			}
+			table.trimada tr.first td {
+				padding-bottom: 0;
+			}
+			table.trimada tr.second td {
+				padding-top: 0;
+			}
+			table.trimada tr.second {
+				border-bottom: 1px solid rgb(220,220,220);
+			}
+			table.trimada thead tr {
+				border-top:solid 1px;
+				border-bottom: solid 1px;
+			}
+			table.trimada thead th#position {
+				width: 5mm;
+			}
+			table.trimada thead th#default_code {
+			  width: 27mm;
+			  text-align: right;
+			}
+			table.trimada thead th#open_quantity {
+			  width: 30mm;
+			  text-align: right;
+			}
+			table.trimada thead th#quantity {
+			  width: 25mm;
+			  text-align: right !important;
+			}
+			table.trimada tbody td#position {
+			  text-align: right;
+			}
+			table.trimada tbody td#default_code {
+			  text-align: right;
+			}
+			table.trimada tbody td#open_quantity {
+			  text-align: right !important;
+			}
+			table.trimada tbody td#quantity {
+			  text-align: right;
+			}			
+			table.trimada tbody span#qty {
+			  font-weight: bold;
+			}
+			table.trimada tbody span#open_qty {
+			  font-weight: bold;
+			}
+			.subtitel {
+				font-size: 11pt;
+				font-family: arial;
+				margin-top: 10mm;
+			}
+			.note {
+				font-size: 9pt;
+				font-family: arial;
+			}
+		</style>
+	</xpath>
+
+	<xpath expr="//table[2]" position="attributes">
+		<attribute name="class" separator=" " add="trimada table-borderless"/>
+	</xpath>
+
+  	<xpath expr="//div[@name='information_block']" position="attributes">
+		<attribute name="class" separator=" " add="trimada table-borderless"/>
+	</xpath>
+
+</data>
\ No newline at end of file
diff --git a/snippets/sale.report_saleconfirmation.base.xml b/snippets/sale.report_saleconfirmation.base.xml
new file mode 100644
index 00000000..3f2a6515
--- /dev/null
+++ b/snippets/sale.report_saleconfirmation.base.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<t t-name="sale.report_saleconfirmation.base">
+    <t t-call="web.html_container">
+        <t t-foreach="docs" t-as="doc">
+            <t t-set="is_confirmation" t-value="True"/>
+            <t t-call="sale.report_saleorder_document" t-lang="doc.partner_id.lang"/>
+        </t>
+    </t>
+</t>
\ No newline at end of file
diff --git a/snippets/sale.report_saleorder_document.address_block.xml b/snippets/sale.report_saleorder_document.address_block.xml
new file mode 100644
index 00000000..a73e68c2
--- /dev/null
+++ b/snippets/sale.report_saleorder_document.address_block.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0"?>
+<data inherit_id="sale.report_saleorder_document" priority="50">
+
+  <style>
+      .address {
+        font-size: 10pt;
+        font-family: arial;
+        line-height: 1.2;
+        text-align: left;
+      }
+      .title {
+        font-size: 8pt;
+        font-weight: bold;
+      }
+      .margin {
+        padding-bottom: 33mm;
+      }
+  </style>
+
+  <xpath expr="//t[@t-set='address']/div" position="replace">
+    <div class="address margin">
+      <t t-if="doc.partner_contact_id.parent_name">
+        <div t-field="doc.partner_contact_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;: False}" name="partner_contact_id"/>
+      </t>
+      <t t-if="not doc.partner_contact_id.parent_name">
+        <div t-field="doc.partner_contact_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;: False}" name="partner_contact_id"/>
+      </t>
+    </div>
+  </xpath>
+
+  <xpath expr="//t[@t-set='information_block']/../t" position="replace">
+    <t class="address" t-set="information_block">
+      <t t-if="doc.partner_shipping_id == doc.partner_invoice_id">
+        <div class="title">Invoicing and Shipping Address:</div>
+        <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;: False}"/>
+      </t>
+      <t t-if="doc.partner_shipping_id != doc.partner_invoice_id">
+        <div class="title">Shipping Address:</div>
+        <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;: False}"/>
+      </t>
+    </t>
+  </xpath>
+
+</data>
\ No newline at end of file
diff --git a/snippets/sale.report_saleorder_document.confirmation_qty.xml b/snippets/sale.report_saleorder_document.confirmation_qty.xml
new file mode 100644
index 00000000..947245be
--- /dev/null
+++ b/snippets/sale.report_saleorder_document.confirmation_qty.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<data inherit_id="sale.report_saleorder_document" priority="50">
+
+    <?xml version="1.0"?>
+    <data inherit_id="sale.report_saleorder_document" priority="60">
+    
+        <span id="qty" position="replace">
+            <t t-if="confirmation">
+                <span t-field="line.product_uom_qty"/>
+            </t>
+            <t t-else="">
+                <span t-field="line.product_uom_qty"/>
+            </t>
+        </span>
+    
+    </data>
+
+</data>
\ No newline at end of file
diff --git a/snippets/sale.report_saleorder_document.confirmation_title.xml b/snippets/sale.report_saleorder_document.confirmation_title.xml
new file mode 100644
index 00000000..c21d3e6a
--- /dev/null
+++ b/snippets/sale.report_saleorder_document.confirmation_title.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<data inherit_id="sale.report_saleorder_document" priority="50">
+
+    <xpath expr="//h2/t[1]" position="replace">
+        <t t-if="not (env.context.get('proforma', False) or is_pro_forma)">
+            <span t-if="confirmation">Confirmation # </span>
+            <span t-if="doc.state not in ['draft','sent'] and not is_confirmation">Order # </span>
+            <span t-if="doc.state in ['draft','sent'] and not is_confirmation">Quotation # </span>
+        </t>
+    </xpath>
+
+</data>
\ No newline at end of file
diff --git a/snippets/sale.report_saleorder_document.modify_information_block.xml b/snippets/sale.report_saleorder_document.modify_information_block.xml
deleted file mode 100644
index b8632322..00000000
--- a/snippets/sale.report_saleorder_document.modify_information_block.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0"?>
-<data inherit_id="sale.report_saleorder_document" priority="50">
-
-  <xpath expr="//t/t/t[3]" position="replace">
-    <t t-set="information_block">
-      <t t-if="doc.partner_shipping_id == doc.partner_invoice_id">
-        <div style="font-size:10pt; line-height: 1.2; font-weight:bold">Invoicing and Shipping Address:</div>
-        <div style="font-size:10pt; line-height: 1.2" 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;: False}"/>
-      </t>
-      <t t-if="doc.partner_shipping_id != doc.partner_invoice_id">
-        <div style="font-size:10pt; line-height: 1.2; font-weight:bold">Shipping Address:</div>
-        <div style="font-size:10pt; line-height: 1.2" 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;: False}"/>
-      </t>
-    </t>
-  </xpath>
-
-</data>
\ No newline at end of file