From e46afe1303c224b1d4c91da35565ba0adc19119d Mon Sep 17 00:00:00 2001
From: Janik von Rotz <login@janikvonrotz.ch>
Date: Fri, 28 May 2021 12:32:42 +0200
Subject: [PATCH] snippets

---
 enterprise                                         |  2 +-
 odoo                                               |  2 +-
 ...invoice_document.product_hs_code_and_origin.xml | 14 ++++++++++++++
 ...ount.report_invoice_document.product_weight.xml |  2 +-
 ...ccount.report_invoice_document.remove_taxes.xml |  4 ++--
 ...ase.report_purchaseorder_document.add_email.xml |  8 ++++++++
 ....report_purchaseorder_document.remove_taxes.xml |  7 +++++++
 ..._purchaseorder_document.show_seller_product.xml | 14 ++++++++++++++
 8 files changed, 48 insertions(+), 5 deletions(-)
 create mode 100644 snippets/account.report_invoice_document.product_hs_code_and_origin.xml
 create mode 100644 snippets/purchase.report_purchaseorder_document.add_email.xml
 create mode 100644 snippets/purchase.report_purchaseorder_document.remove_taxes.xml
 create mode 100644 snippets/purchase.report_purchaseorder_document.show_seller_product.xml

diff --git a/enterprise b/enterprise
index 50f09dde..1d5dc159 160000
--- a/enterprise
+++ b/enterprise
@@ -1 +1 @@
-Subproject commit 50f09dde0022266ad6bbb50ee31e4ea2cf57f2f9
+Subproject commit 1d5dc159d28434a86d09927c01d573e1ddeefdaf
diff --git a/odoo b/odoo
index fcc60e21..a54d54c9 160000
--- a/odoo
+++ b/odoo
@@ -1 +1 @@
-Subproject commit fcc60e219fd024394f8642509a20755f964546b6
+Subproject commit a54d54c9c479aaee3bafe6e241d89d557a1e0b56
diff --git a/snippets/account.report_invoice_document.product_hs_code_and_origin.xml b/snippets/account.report_invoice_document.product_hs_code_and_origin.xml
new file mode 100644
index 00000000..afd48081
--- /dev/null
+++ b/snippets/account.report_invoice_document.product_hs_code_and_origin.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<!-- Show custom field country of origin and hs code -->
+<data inherit_id="account.report_invoice_document">
+
+  <xpath expr="//table/tbody/t[3]/tr/t[1]/td[1]/span" position="after">
+    <br/>
+    Origin: <span t-field="line.product_id.x_country_of_origin"/>
+    <t t-if="line.product_id.hs_code">
+      <br/>
+      HS Code: <span t-field="line.product_id.hs_code"/>
+    </t>
+  </xpath>
+
+</data>
diff --git a/snippets/account.report_invoice_document.product_weight.xml b/snippets/account.report_invoice_document.product_weight.xml
index 79eb5c52..a1d45a17 100644
--- a/snippets/account.report_invoice_document.product_weight.xml
+++ b/snippets/account.report_invoice_document.product_weight.xml
@@ -3,7 +3,7 @@
 
   <xpath expr="//table/tbody/t[3]/tr/t[1]/td[1]/span" position="after">
     <br/>
-		<span t-field="line.product_id.weight"/> kg
+		Weight: <span t-field="line.product_id.weight"/> kg
   </xpath>
 
 </data>
diff --git a/snippets/account.report_invoice_document.remove_taxes.xml b/snippets/account.report_invoice_document.remove_taxes.xml
index bb8d7cd6..bf279bf4 100644
--- a/snippets/account.report_invoice_document.remove_taxes.xml
+++ b/snippets/account.report_invoice_document.remove_taxes.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <data inherit_id="account.report_invoice_document">
 
-  <xpath expr="//table[1]/thead[1]/tr[1]/th[6]" position="replace"/>
-  <xpath expr="//table[1]/tbody[1]/t[3]/tr[1]/t[1]/td[6]" position="replace"/>
+  <xpath expr="//table[1]/thead[1]/tr[1]/th[5]" position="replace"/>
+  <xpath expr="//table[1]/tbody[1]/t[3]/tr[1]/t[1]/td[5]" position="replace"/>
 
 </data>
diff --git a/snippets/purchase.report_purchaseorder_document.add_email.xml b/snippets/purchase.report_purchaseorder_document.add_email.xml
new file mode 100644
index 00000000..6d87416a
--- /dev/null
+++ b/snippets/purchase.report_purchaseorder_document.add_email.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<data inherit_id="purchase.report_purchaseorder_document">
+
+  <xpath expr="/t[1]/t[1]/div[1]/div[2]/div[1]/p[1]" position="after">
+    <span t-field="o.user_id.email"/>
+  </xpath>
+  
+</data>
diff --git a/snippets/purchase.report_purchaseorder_document.remove_taxes.xml b/snippets/purchase.report_purchaseorder_document.remove_taxes.xml
new file mode 100644
index 00000000..0f7f7cb3
--- /dev/null
+++ b/snippets/purchase.report_purchaseorder_document.remove_taxes.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<data inherit_id="purchase.report_purchaseorder_document">
+
+  <xpath expr="//table[1]/thead[1]/tr[1]/th[2]" position="replace"/>
+  <xpath expr="//table[1]/tbody[1]/t[2]/tr[1]/t[1]/td[2]" position="replace"/>
+
+</data>
diff --git a/snippets/purchase.report_purchaseorder_document.show_seller_product.xml b/snippets/purchase.report_purchaseorder_document.show_seller_product.xml
new file mode 100644
index 00000000..87f69322
--- /dev/null
+++ b/snippets/purchase.report_purchaseorder_document.show_seller_product.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<data inherit_id="purchase.report_purchaseorder_document">
+
+  <!-- <t t-foreach="line.product_id.seller_ids" t-as="seller">
+      <span t-field="seller.name"/>
+  </t> -->
+
+  <xpath expr="//tbody/t[2]/tr/t[1]/td[1]/span" position="after">
+    <t t-set="seller" t-value="line.product_id.seller_ids.browse(o.partner_id.id)"/>
+    Product Code: <span t-field="seller.product_code"/>
+    Product Name: <span t-field="seller.product_name"/>
+  </xpath>
+
+</data>