From 69e23a841b408717e6ec1e5dfd04054fbeb00465 Mon Sep 17 00:00:00 2001
From: Janik von Rotz <login@janikvonrotz.ch>
Date: Wed, 3 May 2023 08:46:15 +0200
Subject: [PATCH] sync

---
 snippets/account.md                           | 34 ++++++++
 snippets/base.md                              | 16 ++++
 ...base.view_model_fields_form.show_state.xml |  8 ++
 snippets/hr_expense.md                        | 15 ++++
 snippets/hr_payroll.md                        | 10 +++
 snippets/hr_timesheet.md                      | 73 ++++++++--------
 ...timesheet.report_timesheet.user_report.xml | 74 ++++++++--------
 snippets/ir_model.md                          | 54 +++++++++++-
 ...r_model.sale_order_line.x_taxed_amount.xml | 19 +++++
 ...model.sale_order_line.x_untaxed_amount.xml |  2 +-
 snippets/purchase.md                          | 84 -------------------
 snippets/sale.md                              | 30 +++++++
 ...le.view_order_line_tree.x_taxed_amount.xml |  8 ++
 ....view_order_line_tree.x_untaxed_amount.xml |  8 ++
 snippets/stock.md                             | 25 +++++-
 ...kage_form.add_estimated_pack_weight_kg.xml |  2 +-
 16 files changed, 303 insertions(+), 159 deletions(-)
 create mode 100644 snippets/base.view_model_fields_form.show_state.xml
 create mode 100644 snippets/ir_model.sale_order_line.x_taxed_amount.xml
 create mode 100644 snippets/sale.view_order_line_tree.x_taxed_amount.xml
 create mode 100644 snippets/sale.view_order_line_tree.x_untaxed_amount.xml

diff --git a/snippets/account.md b/snippets/account.md
index 2e4de4f4..b990eb26 100644
--- a/snippets/account.md
+++ b/snippets/account.md
@@ -187,6 +187,23 @@ ID: `mint_system.account.report_invoice_document.add_percentage_sign`
 ```
 Source: [snippets/account.report_invoice_document.add_percentage_sign.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/account.report_invoice_document.add_percentage_sign.xml)
 
+### Add Sale Order Contact Name  
+ID: `mint_system.account.report_invoice_document.add_sale_order_contact_name`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="account.report_invoice_document" priority="50">
+
+    <xpath expr="/t/t/div/div[1]/div[5]" position="replace">
+        <div class="col-auto col-3 mw-100 mb-2">
+            <strong>Your contact</strong>
+            <p class="m-0" t-field="o.sale_order_id.partner_contact_id.name"/>
+        </div>
+    </xpath>
+
+</data>
+```
+Source: [snippets/account.report_invoice_document.add_sale_order_contact_name.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/account.report_invoice_document.add_sale_order_contact_name.xml)
+
 ### Add Sale Person  
 ID: `mint_system.account.report_invoice_document.add_sale_person`  
 ```xml
@@ -2312,6 +2329,23 @@ ID: `mint_system.account.report_invoice_document.add_percentage_sign`
 ```
 Source: [snippets/account.report_invoice_document.add_percentage_sign.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/account.report_invoice_document.add_percentage_sign.xml)
 
+### Add Sale Order Contact Name  
+ID: `mint_system.account.report_invoice_document.add_sale_order_contact_name`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="account.report_invoice_document" priority="50">
+
+    <xpath expr="/t/t/div/div[1]/div[5]" position="replace">
+        <div class="col-auto col-3 mw-100 mb-2">
+            <strong>Your contact</strong>
+            <p class="m-0" t-field="o.sale_order_id.partner_contact_id.name"/>
+        </div>
+    </xpath>
+
+</data>
+```
+Source: [snippets/account.report_invoice_document.add_sale_order_contact_name.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/account.report_invoice_document.add_sale_order_contact_name.xml)
+
 ### Add Sale Person  
 ID: `mint_system.account.report_invoice_document.add_sale_person`  
 ```xml
diff --git a/snippets/base.md b/snippets/base.md
index 3bbe7354..33b15e34 100644
--- a/snippets/base.md
+++ b/snippets/base.md
@@ -209,6 +209,22 @@ ID: `mint_system.base.view_company_form.show_analytic_plan_id`
 ```
 Source: [snippets/base.view_company_form.show_analytic_plan_id.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/base.view_company_form.show_analytic_plan_id.xml)
 
+## View Model Fields Form  
+### Show State  
+ID: `mint_system.base.view_model_fields_form.show_state`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="base.view_model_fields_form" priority="50">
+
+  <field name="ttype" position="after">
+    <field name="state"/>
+  </field>
+
+</data>
+
+```
+Source: [snippets/base.view_model_fields_form.show_state.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/base.view_model_fields_form.show_state.xml)
+
 ## View Partner Form  
 ### Add Commercial Partner Id  
 ID: `mint_system.base.view_partner_form.add_commercial_partner_id`  
diff --git a/snippets/base.view_model_fields_form.show_state.xml b/snippets/base.view_model_fields_form.show_state.xml
new file mode 100644
index 00000000..05876625
--- /dev/null
+++ b/snippets/base.view_model_fields_form.show_state.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<data inherit_id="base.view_model_fields_form" priority="50">
+
+  <field name="ttype" position="after">
+    <field name="state"/>
+  </field>
+
+</data>
diff --git a/snippets/hr_expense.md b/snippets/hr_expense.md
index 7d01ff99..d35c145c 100644
--- a/snippets/hr_expense.md
+++ b/snippets/hr_expense.md
@@ -1,5 +1,20 @@
 # Hr Expense
 ## Hr Expense View Form  
+### Set Group Tax Ids  
+ID: `mint_system.hr_expense.hr_expense_view_form.set_group_tax_ids`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="hr_expense.hr_expense_view_form" priority="50">
+
+  <xpath expr="//field[@name='tax_ids']" position="attributes">
+    <attribute name="groups"></attribute>
+  </xpath>
+
+</data>
+
+```
+Source: [snippets/hr_expense.hr_expense_view_form.set_group_tax_ids.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/hr_expense.hr_expense_view_form.set_group_tax_ids.xml)
+
 ### X Partner Id  
 ID: `mint_system.hr_expense.hr_expense_view_form.x_partner_id`  
 ```xml
diff --git a/snippets/hr_payroll.md b/snippets/hr_payroll.md
index 9ecd6260..d8b248a7 100644
--- a/snippets/hr_payroll.md
+++ b/snippets/hr_payroll.md
@@ -69,6 +69,8 @@ ID: `mint_system.hr_payroll.report_payslip.gio_custom_payroll`
                     <address t-field="o.employee_id.address_home_id"
                         t-options='{"widget": "contact", "fields": ["address", "name", "phone"], "no_marker": True, "phone_icons": True}' />
                 </t>
+                
+                <t t-set="input_lines" t-value="o.input_line_ids.filtered('name')" />
 
                 <div class="page">
                     <style>
@@ -145,7 +147,12 @@ ID: `mint_system.hr_payroll.report_payslip.gio_custom_payroll`
                             </tr>
                         </thead>
 
+
+                        <!--<span t-esc="input_lines[0].input_type_id.code" />-->
+                        
                         <t t-foreach="o.line_ids" t-as="line">
+                            <t t-set="inputs" t-value="input_lines.filtered(lambda i: i.input_type_id.code == line.code)" />
+                            
                             <t t-if="line.salary_rule_id.appears_on_payslip and line.amount != 0.00">
                                 <tr>
                                     <!-- Lohnart -->
@@ -158,6 +165,9 @@ ID: `mint_system.hr_payroll.report_payslip.gio_custom_payroll`
                                             t-if="not line.code in ['5000'] and not line.code in ['NET']">
                                             <span t-field="line.name" />
                                         </t>
+                                        <t t-if="inputs">
+                                            <br/><i t-esc="inputs.name" />
+                                        </t>
                                     </td>
                                     <!-- Ansatz -->
                                     <td>
diff --git a/snippets/hr_timesheet.md b/snippets/hr_timesheet.md
index f4d831b2..603546e7 100644
--- a/snippets/hr_timesheet.md
+++ b/snippets/hr_timesheet.md
@@ -280,42 +280,47 @@ ID: `mint_system.hr_timesheet.report_timesheet.user_report`
 <?xml version="1.0"?>
 <data inherit_id="hr_timesheet.report_timesheet" priority="50">
 
-    <!-- New title -->
-    <xpath expr="/t/t/t/div/div[2]" position="after">
-        <t t-set="min_date" t-value="min(docs.mapped('date'))"/>
-        <t t-set="max_date" t-value="max(docs.mapped('date'))"/>
-        <h3>Arbeitsrapport
-            <t t-if="len(docs.mapped('project_id')) == 1">
-                für das Projekt "<t t-esc="docs.mapped('project_id')[0].name"/>"
-            </t>
-        </h3>
-        <p>
-        Von <t t-esc="min_date"/> bis <t t-esc="max_date"/>
-        </p>
-        <p>
-        Kunde: <t t-esc="docs.mapped('project_id')[0].partner_id.name"/><br/>
-        Erstellt von: <span t-field="user.name"/>
-        </p>
-        <br/>
-    </xpath>
+  <!-- New title -->
+  <xpath expr="/t/t/t/div/div[2]" position="after">
+    <t t-set="min_date" t-value="min(docs.mapped('date'))" />
+    <t t-set="max_date" t-value="max(docs.mapped('date'))" />
+    <h3>Arbeitsrapport <t t-if="len(docs.mapped('project_id')) == 1"> für das Projekt "<t
+          t-esc="docs.mapped('project_id')[0].name" />" </t>
+    </h3>
+    <p>Zeitraum" <t t-esc="min_date" t-options="{'widget': 'date'}" /> bis <t t-esc="max_date"
+        t-options="{'widget': 'date'}" />
+    </p>
+    <p>Kunde: <t t-esc="docs.mapped('project_id')[0].partner_id.name" /><br /> Erstellt von: <span
+        t-field="user.name" />
+    </p>
+    <br />
+  </xpath>
+
+  <!-- Remove responsible -->
+  <xpath expr="//table[1]/tbody[1]/tr[1]/td[2]" position="replace" />
+  <xpath expr="//table[1]/thead[1]/tr[1]/th[2]" position="replace" />
+  <xpath expr="//table[1]/tbody[1]/tr[2]/td[2]" position="replace" />
+  <xpath expr="/t[1]/t[1]/t[1]/div[1]/div[2]/div[1]" position="replace" />
+
+  <!--Combine
+  Responsible and Date-->
+  <xpath expr="//table[1]/thead[1]/tr[1]/th[1]" position="replace">
+    <th>
+      <span>Datum</span>
+      <br />
+      <span>Author</span>
+    </th>
+  </xpath>
+  <xpath expr="//table[1]/tbody[1]/tr[1]/td[1]" position="replace">
+    <td>
+      <span t-field="l.date" />
+      <br />
+      <span t-field="l.employee_id.name" />
+    </td>
+  </xpath>
+
 
-    <!-- Remove responsible -->
-    <xpath expr="//table[1]/tbody[1]/tr[1]/td[2]" position="replace"/>
-    <xpath expr="//table[1]/thead[1]/tr[1]/th[2]" position="replace"/>
-    <xpath expr="//table[1]/tbody[1]/tr[2]/td[2]" position="replace"/>
-    <xpath expr="/t[1]/t[1]/t[1]/div[1]/div[2]/div[1]" position="replace"/>
-    
-    <!--Combine Responsible and Date-->
-    <xpath expr="//table[1]/thead[1]/tr[1]/th[1]" position="replace">
-      <th><span>Datum</span><br/><span>Author</span></th>
-    </xpath>
-    <xpath expr="//table[1]/tbody[1]/tr[1]/td[1]" position="replace">
-      <td><span t-field="l.date"/><br/><span t-field="l.employee_id.name"/></td>
-    </xpath>
-    
-    
 </data>
-
 ```
 Source: [snippets/hr_timesheet.report_timesheet.user_report.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/hr_timesheet.report_timesheet.user_report.xml)
 
diff --git a/snippets/hr_timesheet.report_timesheet.user_report.xml b/snippets/hr_timesheet.report_timesheet.user_report.xml
index 1d5c5d20..4bff55e0 100644
--- a/snippets/hr_timesheet.report_timesheet.user_report.xml
+++ b/snippets/hr_timesheet.report_timesheet.user_report.xml
@@ -1,38 +1,44 @@
 <?xml version="1.0"?>
 <data inherit_id="hr_timesheet.report_timesheet" priority="50">
 
-    <!-- New title -->
-    <xpath expr="/t/t/t/div/div[2]" position="after">
-        <t t-set="min_date" t-value="min(docs.mapped('date'))"/>
-        <t t-set="max_date" t-value="max(docs.mapped('date'))"/>
-        <h3>Arbeitsrapport
-            <t t-if="len(docs.mapped('project_id')) == 1">
-                für das Projekt "<t t-esc="docs.mapped('project_id')[0].name"/>"
-            </t>
-        </h3>
-        <p>
-        Von <t t-esc="min_date"/> bis <t t-esc="max_date"/>
-        </p>
-        <p>
-        Kunde: <t t-esc="docs.mapped('project_id')[0].partner_id.name"/><br/>
-        Erstellt von: <span t-field="user.name"/>
-        </p>
-        <br/>
-    </xpath>
+  <!-- New title -->
+  <xpath expr="/t/t/t/div/div[2]" position="after">
+    <t t-set="min_date" t-value="min(docs.mapped('date'))" />
+    <t t-set="max_date" t-value="max(docs.mapped('date'))" />
+    <h3>Arbeitsrapport <t t-if="len(docs.mapped('project_id')) == 1"> für das Projekt "<t
+          t-esc="docs.mapped('project_id')[0].name" />" </t>
+    </h3>
+    <p>Zeitraum" <t t-esc="min_date" t-options="{'widget': 'date'}" /> bis <t t-esc="max_date"
+        t-options="{'widget': 'date'}" />
+    </p>
+    <p>Kunde: <t t-esc="docs.mapped('project_id')[0].partner_id.name" /><br /> Erstellt von: <span
+        t-field="user.name" />
+    </p>
+    <br />
+  </xpath>
 
-    <!-- Remove responsible -->
-    <xpath expr="//table[1]/tbody[1]/tr[1]/td[2]" position="replace"/>
-    <xpath expr="//table[1]/thead[1]/tr[1]/th[2]" position="replace"/>
-    <xpath expr="//table[1]/tbody[1]/tr[2]/td[2]" position="replace"/>
-    <xpath expr="/t[1]/t[1]/t[1]/div[1]/div[2]/div[1]" position="replace"/>
-    
-    <!--Combine Responsible and Date-->
-    <xpath expr="//table[1]/thead[1]/tr[1]/th[1]" position="replace">
-      <th><span>Datum</span><br/><span>Author</span></th>
-    </xpath>
-    <xpath expr="//table[1]/tbody[1]/tr[1]/td[1]" position="replace">
-      <td><span t-field="l.date"/><br/><span t-field="l.employee_id.name"/></td>
-    </xpath>
-    
-    
-</data>
+  <!-- Remove responsible -->
+  <xpath expr="//table[1]/tbody[1]/tr[1]/td[2]" position="replace" />
+  <xpath expr="//table[1]/thead[1]/tr[1]/th[2]" position="replace" />
+  <xpath expr="//table[1]/tbody[1]/tr[2]/td[2]" position="replace" />
+  <xpath expr="/t[1]/t[1]/t[1]/div[1]/div[2]/div[1]" position="replace" />
+
+  <!--Combine
+  Responsible and Date-->
+  <xpath expr="//table[1]/thead[1]/tr[1]/th[1]" position="replace">
+    <th>
+      <span>Datum</span>
+      <br />
+      <span>Author</span>
+    </th>
+  </xpath>
+  <xpath expr="//table[1]/tbody[1]/tr[1]/td[1]" position="replace">
+    <td>
+      <span t-field="l.date" />
+      <br />
+      <span t-field="l.employee_id.name" />
+    </td>
+  </xpath>
+
+
+</data>
\ No newline at end of file
diff --git a/snippets/ir_model.md b/snippets/ir_model.md
index 1302bf90..0afe361a 100644
--- a/snippets/ir_model.md
+++ b/snippets/ir_model.md
@@ -1876,7 +1876,7 @@ ID: `mint_system.ir_model.sale_order_line.x_taxed_amount_invoiced`
     <field name="ttype">float</field>
     <field name="depends">untaxed_amount_invoiced,price_tax</field>
     <field name="compute">for rec in self:
-      rec['x_taxed_amount_invoiced'] = rec.price_unit * (1 - (rec.discount or 0.0) / 100.0) * rec.qty_delivered + rec.price_tax</field>
+  rec['x_taxed_amount_invoiced'] = rec.price_unit * (1 - (rec.discount or 0.0) / 100.0) * (rec.qty_delivered or rec.product_uom_qty) + rec.price_tax</field>
   </record>
 
 </odoo>
@@ -1884,6 +1884,58 @@ ID: `mint_system.ir_model.sale_order_line.x_taxed_amount_invoiced`
 ```
 Source: [snippets/ir_model.sale_order_line.x_taxed_amount_invoiced.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/ir_model.sale_order_line.x_taxed_amount_invoiced.xml)
 
+### X Taxed Amount  
+ID: `mint_system.ir_model.sale_order_line.x_taxed_amount`  
+```xml
+<?xml version='1.0' encoding='UTF-8' ?>
+<odoo>
+
+  <record id="x_taxed_amount" model="ir.model.fields">
+    <field name="domain">[]</field>
+    <field name="field_description">Total inkl. MWST</field>
+    <field name="model">sale.order.line</field>
+    <field name="model_id" ref="sale.model_sale_order_line"/>
+    <field name="name">x_taxed_amount</field>
+    <field name="store" eval="True" />
+    <field name="readonly" eval="True" />
+    <field name="copied" eval="False" />
+    <field name="ttype">float</field>
+    <field name="depends">price_unit,discount,qty_delivered,product_uom_qty,price_tax</field>
+    <field name="compute">for rec in self:
+  rec['x_taxed_amount'] = rec.price_unit * (1 - (rec.discount or 0.0) / 100.0) * (rec.qty_delivered or rec.product_uom_qty) + rec.price_tax</field>
+  </record>
+
+</odoo>
+
+```
+Source: [snippets/ir_model.sale_order_line.x_taxed_amount.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/ir_model.sale_order_line.x_taxed_amount.xml)
+
+### X Untaxed Amount  
+ID: `mint_system.ir_model.sale_order_line.x_untaxed_amount`  
+```xml
+<?xml version='1.0' encoding='UTF-8' ?>
+<odoo>
+
+  <record id="x_untaxed_amount" model="ir.model.fields">
+    <field name="domain">[]</field>
+    <field name="field_description">Total exkl. MWST</field>
+    <field name="model">sale.order.line</field>
+    <field name="model_id" ref="sale.model_sale_order_line"/>
+    <field name="name">x_untaxed_amount</field>
+    <field name="store" eval="True" />
+    <field name="readonly" eval="True" />
+    <field name="copied" eval="False" />
+    <field name="ttype">float</field>
+    <field name="depends">price_unit,discount,qty_delivered,product_uom_qty</field>
+    <field name="compute">for rec in self:
+  rec['x_untaxed_amount'] = rec.price_unit * (1 - (rec.discount or 0.0) / 100.0) * (rec.qty_delivered or rec.product_uom_qty)</field>
+  </record>
+
+</odoo>
+
+```
+Source: [snippets/ir_model.sale_order_line.x_untaxed_amount.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/ir_model.sale_order_line.x_untaxed_amount.xml)
+
 ### X Weight Delivered  
 ID: `mint_system.ir_model.sale_order_line.x_weight_delivered`  
 ```xml
diff --git a/snippets/ir_model.sale_order_line.x_taxed_amount.xml b/snippets/ir_model.sale_order_line.x_taxed_amount.xml
new file mode 100644
index 00000000..8601246f
--- /dev/null
+++ b/snippets/ir_model.sale_order_line.x_taxed_amount.xml
@@ -0,0 +1,19 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+<odoo>
+
+  <record id="x_taxed_amount" model="ir.model.fields">
+    <field name="domain">[]</field>
+    <field name="field_description">Total inkl. MWST</field>
+    <field name="model">sale.order.line</field>
+    <field name="model_id" ref="sale.model_sale_order_line"/>
+    <field name="name">x_taxed_amount</field>
+    <field name="store" eval="True" />
+    <field name="readonly" eval="True" />
+    <field name="copied" eval="False" />
+    <field name="ttype">float</field>
+    <field name="depends">price_unit,discount,qty_delivered,product_uom_qty,price_tax</field>
+    <field name="compute">for rec in self:
+  rec['x_taxed_amount'] = rec.price_unit * (1 - (rec.discount or 0.0) / 100.0) * (rec.qty_delivered or rec.product_uom_qty) + rec.price_tax</field>
+  </record>
+
+</odoo>
diff --git a/snippets/ir_model.sale_order_line.x_untaxed_amount.xml b/snippets/ir_model.sale_order_line.x_untaxed_amount.xml
index 405752dd..19de9d27 100644
--- a/snippets/ir_model.sale_order_line.x_untaxed_amount.xml
+++ b/snippets/ir_model.sale_order_line.x_untaxed_amount.xml
@@ -8,7 +8,7 @@
     <field name="model_id" ref="sale.model_sale_order_line"/>
     <field name="name">x_untaxed_amount</field>
     <field name="store" eval="True" />
-    <field name="readonly" eval="False" />
+    <field name="readonly" eval="True" />
     <field name="copied" eval="False" />
     <field name="ttype">float</field>
     <field name="depends">price_unit,discount,qty_delivered,product_uom_qty</field>
diff --git a/snippets/purchase.md b/snippets/purchase.md
index 661f0534..8a309356 100644
--- a/snippets/purchase.md
+++ b/snippets/purchase.md
@@ -459,90 +459,6 @@ ID: `mint_system.purchase.report_purchaseorder_document.add_footer`
 ```
 Source: [snippets/purchase.report_purchaseorder_document.add_footer.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/purchase.report_purchaseorder_document.add_footer.xml)
 
-### Add Infotable  
-ID: `mint_system.purchase.report_purchaseorder_document.add_infotable`  
-```xml
-<?xml version="1.0"?>
-<data inherit_id="purchase.report_purchaseorder_document" priority="50">
-
-  <xpath expr="//div[@id='informations']" position="before">
-    <style>
-    table#info {
-      width: 100%;
-      margin-bottom: 25px;
-      font-size: 9pt;
-      font-family: arial;
-    }
-     table#info tr {
-      line-height: 1.2;
-      text-align: left;
-    }
-    .note {
-      font-size: 9pt;
-    }
-    </style>
-    <table id='info'>
-      <tr>
-        <td width="17%">Oder Date</td>
-        <td width="40%">
-          <t t-if="o.date_approve">
-            <span id='date_approve' t-field='o.date_approve' t-options='{ "widget": "date" }'/>
-          </t>
-          <t t-else="">
-            <span t-field='o.date_order' t-options='{ "widget": "date" }'/>
-          </t>
-        </td>
-        <td width="18%">Our Reference</td>
-        <td width="25%">
-          <span t-field='o.user_id'/>
-        </td>
-      </tr>
-      <tr>
-        <td>Customer No.</td>
-        <td>
-          <span t-field='o.partner_id.ref'/>
-        </td>
-        <td>Incoterm</td>
-        <td>
-          <span t-field='o.incoterm_id'/>
-        </td>
-      </tr>
-      <tr>
-        <td></td>
-
-        <td>
-          <span t-field='o.partner_ref'/>
-        </td>
-
-        <t t-if="o.requisition_id">
-          <td>Purchase Contract</td>
-          <td>
-            <span t-field='o.requisition_id'/>
-            <t t-if="o.requisition_id.partner_ref"> /              <span t-field='o.requisition_id.partner_ref'/>
-            </t>
-          </td>
-        </t>
-      </tr>
-      <tr>
-        <td>Reference</td>
-        <td>
-          <span t-field='o.comment'/>
-        </td>
-        <td></td>
-        <td></td>
-      </tr>
-    </table>
-
-    <t t-if="o.note_header != '&lt;p&gt;&lt;br&gt;&lt;/p&gt;'">
-      <span class="note" t-field="o.note_header"/>
-    </t>
-
-  </xpath>
-
-</data>
-```
-Source: [snippets/purchase.report_purchaseorder_document.add_infotable.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/purchase.report_purchaseorder_document.add_infotable.xml)
-
 ### Add Taxes  
 ID: `mint_system.purchase.report_purchaseorder_document.add_taxes`  
 ```xml
diff --git a/snippets/sale.md b/snippets/sale.md
index e011b367..564d7604 100644
--- a/snippets/sale.md
+++ b/snippets/sale.md
@@ -3621,6 +3621,36 @@ ID: `mint_system.sale.view_order_line_tree.x_taxed_amount_invoiced`
 ```
 Source: [snippets/sale.view_order_line_tree.x_taxed_amount_invoiced.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/sale.view_order_line_tree.x_taxed_amount_invoiced.xml)
 
+### X Taxed Amount  
+ID: `mint_system.sale.view_order_line_tree.x_taxed_amount`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="sale.view_order_line_tree" priority="50">
+
+    <field name="price_total" position="after">
+        <field name="x_taxed_amount"  sum="Total inkl. MWST" optional="show" />
+    </field>
+
+</data>
+
+```
+Source: [snippets/sale.view_order_line_tree.x_taxed_amount.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/sale.view_order_line_tree.x_taxed_amount.xml)
+
+### X Untaxed Amount  
+ID: `mint_system.sale.view_order_line_tree.x_untaxed_amount`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="sale.view_order_line_tree" priority="51">
+
+    <field name="price_total" position="after">
+        <field name="x_untaxed_amount"  sum="Total exkl. MWST" optional="show" />
+    </field>
+
+</data>
+
+```
+Source: [snippets/sale.view_order_line_tree.x_untaxed_amount.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/sale.view_order_line_tree.x_untaxed_amount.xml)
+
 ### X Weight Delivered  
 ID: `mint_system.sale.view_order_line_tree.x_weight_delivered`  
 ```xml
diff --git a/snippets/sale.view_order_line_tree.x_taxed_amount.xml b/snippets/sale.view_order_line_tree.x_taxed_amount.xml
new file mode 100644
index 00000000..06a297bb
--- /dev/null
+++ b/snippets/sale.view_order_line_tree.x_taxed_amount.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<data inherit_id="sale.view_order_line_tree" priority="50">
+
+    <field name="price_total" position="after">
+        <field name="x_taxed_amount"  sum="Total inkl. MWST" optional="show" />
+    </field>
+
+</data>
diff --git a/snippets/sale.view_order_line_tree.x_untaxed_amount.xml b/snippets/sale.view_order_line_tree.x_untaxed_amount.xml
new file mode 100644
index 00000000..cbf44c95
--- /dev/null
+++ b/snippets/sale.view_order_line_tree.x_untaxed_amount.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<data inherit_id="sale.view_order_line_tree" priority="51">
+
+    <field name="price_total" position="after">
+        <field name="x_untaxed_amount"  sum="Total exkl. MWST" optional="show" />
+    </field>
+
+</data>
diff --git a/snippets/stock.md b/snippets/stock.md
index abdcc82c..c107e8c4 100644
--- a/snippets/stock.md
+++ b/snippets/stock.md
@@ -651,7 +651,7 @@ ID: `mint_system.stock.report_certificatecofc_simplified.tissa`
  / 
                 <span t-field="o.origin"/>
                 <t t-if="o.move_line_ids[0].lot_id.x_production_ids[0].move_raw_ids[0].move_line_ids[0].lot_id.x_production_id">
-                     /                  <span t-field="o.move_line_ids.lot_id.x_production_ids.move_raw_ids.move_line_ids.lot_id.x_production_id"/>
+                     /                  <span t-field="o.move_line_ids[0].lot_id.x_production_ids[0].move_raw_ids[0].move_line_ids[0].lot_id.x_production_id"/>
                 </t>
               </td>
             </tr>
@@ -757,7 +757,7 @@ ID: `mint_system.stock.report_certificatecofc_simplified.tissa`
             </tr>
           </table>
 
-          <t t-set="qualitycheck_line" t-value="o.move_line_ids.lot_id.x_production_ids.move_raw_ids.move_line_ids.lot_id.x_production_ids.x_quality_check_ids"/>
+          <t t-set="qualitycheck_line" t-value="o.move_line_ids[0].lot_id.x_production_ids[0].move_raw_ids.move_line_ids[0].lot_id.x_production_ids[0].x_quality_check_ids[0]"/>
           <div id="subtitle">
       Qualitätsprüfung <span t-field="qualitycheck_line.name"/>
           </div>
@@ -992,7 +992,7 @@ ID: `mint_system.stock.report_certificatecofc.tissa`
  / 
                 <span t-field="o.origin"/>
                 <t t-if="o.move_line_ids[0].lot_id.x_production_ids[0].move_raw_ids[0].move_line_ids[0].lot_id.x_production_id">
-                     /                  <span t-field="o.move_line_ids.lot_id.x_production_ids.move_raw_ids.move_line_ids.lot_id.x_production_id"/>
+                     /                  <span t-field="o.move_line_ids[0].lot_id.x_production_ids[0].move_raw_ids[0].move_line_ids[0].lot_id.x_production_id"/>
                 </t>
               </td>
             </tr>
@@ -1113,7 +1113,7 @@ ID: `mint_system.stock.report_certificatecofc.tissa`
             </tr>
           </table>
 
-          <t t-set="qualitycheck_line" t-value="o.move_line_ids.lot_id.x_production_ids.move_raw_ids.move_line_ids.lot_id.x_production_ids.x_quality_check_ids"/>
+          <t t-set="qualitycheck_line" t-value="o.move_line_ids[0].lot_id.x_production_ids[0].move_raw_ids[0].move_line_ids[0].lot_id.x_production_ids[0].x_quality_check_ids[0]"/>
           <div id="subtitle">
       Qualitätsprüfung <span t-field="qualitycheck_line.name"/>
           </div>
@@ -5150,6 +5150,23 @@ ID: `mint_system.stock.view_stock_move_line_operation_tree.edit_reserved_qty`
 ```
 Source: [snippets/stock.view_stock_move_line_operation_tree.edit_reserved_qty.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/stock.view_stock_move_line_operation_tree.edit_reserved_qty.xml)
 
+## View Stock Quant Package Form  
+### Add Estimated Pack Weight Kg  
+ID: `mint_system.stock.view_stock_quant_package_form.add_estimated_pack_weight_kg`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="stock.view_stock_quant_package_form" priority="50">
+
+  <xpath expr="//span[@class='text-muted'][1]" position="replace">
+    <span class="text-muted">(computed: <field name="estimated_pack_weight_kg" nolabel="1"/>
+    </span>
+  </xpath>
+
+</data>
+
+```
+Source: [snippets/stock.view_stock_quant_package_form.add_estimated_pack_weight_kg.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/stock.view_stock_quant_package_form.add_estimated_pack_weight_kg.xml)
+
 ## View Stock Quant Tree Editable  
 ### Show Reserved Quantity  
 ID: `mint_system.stock.view_stock_quant_tree_editable.show_reserved_quantity`  
diff --git a/snippets/stock.view_stock_quant_package_form.add_estimated_pack_weight_kg.xml b/snippets/stock.view_stock_quant_package_form.add_estimated_pack_weight_kg.xml
index 8d834fc2..1091f54a 100644
--- a/snippets/stock.view_stock_quant_package_form.add_estimated_pack_weight_kg.xml
+++ b/snippets/stock.view_stock_quant_package_form.add_estimated_pack_weight_kg.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<data inherit_id="stock.view_quant_package_form" priority="50">
+<data inherit_id="stock.view_stock_quant_package_form" priority="50">
 
   <xpath expr="//span[@class='text-muted'][1]" position="replace">
     <span class="text-muted">(computed: <field name="estimated_pack_weight_kg" nolabel="1"/>