diff --git a/.vuepress/sidebar_snippet.js b/.vuepress/sidebar_snippet.js
index e2443ddd..670d0bf3 100644
--- a/.vuepress/sidebar_snippet.js
+++ b/.vuepress/sidebar_snippet.js
@@ -1 +1 @@
-module.exports = ['/snippets/account.md','/snippets/account_budget.md','/snippets/agreement.md','/snippets/agreement_legal.md','/snippets/base.md','/snippets/business_requirement.md','/snippets/calendar.md','/snippets/certificate_planer.md','/snippets/contract.md','/snippets/crm.md','/snippets/crm_iap_lead_enrich.md','/snippets/delivery.md','/snippets/digest.md','/snippets/fleet.md','/snippets/gio_payroll_custom.md','/snippets/helpdesk.md','/snippets/hr.md','/snippets/hr_attendance.md','/snippets/hr_contract.md','/snippets/hr_holidays.md','/snippets/hr_holidays_delegations.md','/snippets/hr_payroll.md','/snippets/hr_recruitment.md','/snippets/hr_timesheet.md','/snippets/ir_model.md','/snippets/ir_ui_view.md','/snippets/l10n_ch.md','/snippets/l10n_ch_qr_isr_invoice_import.md','/snippets/mail.md','/snippets/mail_activity_board.md','/snippets/mrp.md','/snippets/mrp_workorder.md','/snippets/printnode_base.md','/snippets/product.md','/snippets/project.md','/snippets/purchase.md','/snippets/purchase_requisition.md','/snippets/res_groups.md','/snippets/sale.md','/snippets/sale_blanket_order.md','/snippets/sale_management.md','/snippets/sale_margin.md','/snippets/sale_order_contact_person.md','/snippets/sale_order_line_date.md','/snippets/sale_order_picking_note.md','/snippets/sale_partner_incoterm.md','/snippets/sale_product_set.md','/snippets/sale_subscription.md','/snippets/stock.md','/snippets/stock_delivery_note.md','/snippets/timesheet_grid.md','/snippets/web.md','/snippets/website_discount_voucher.md','/snippets/website_sale.md',]
+module.exports = ['/snippets/account.md','/snippets/account_asset.md','/snippets/account_budget.md','/snippets/account_followup.md','/snippets/account_sale_timesheet_report.md','/snippets/agreement.md','/snippets/agreement_legal.md','/snippets/base.md','/snippets/business_requirement.md','/snippets/calendar.md','/snippets/certificate_planer.md','/snippets/contract.md','/snippets/crm.md','/snippets/crm_iap_lead_enrich.md','/snippets/delivery.md','/snippets/digest.md','/snippets/fleet.md','/snippets/gio_payroll_custom.md','/snippets/helpdesk.md','/snippets/hr.md','/snippets/hr_attendance.md','/snippets/hr_contract.md','/snippets/hr_holidays.md','/snippets/hr_holidays_delegations.md','/snippets/hr_payroll.md','/snippets/hr_recruitment.md','/snippets/hr_timesheet.md','/snippets/ir_model.md','/snippets/ir_ui_view.md','/snippets/l10n_ch.md','/snippets/l10n_ch_qr_isr_invoice_import.md','/snippets/mail.md','/snippets/mail_activity_board.md','/snippets/mrp.md','/snippets/mrp_workorder.md','/snippets/printnode_base.md','/snippets/product.md','/snippets/project.md','/snippets/purchase.md','/snippets/purchase_requisition.md','/snippets/purchase_requisition_send.md','/snippets/res_groups.md','/snippets/sale.md','/snippets/sale_blanket_order.md','/snippets/sale_management.md','/snippets/sale_margin.md','/snippets/sale_order_contact_person.md','/snippets/sale_order_line_date.md','/snippets/sale_order_picking_note.md','/snippets/sale_partner_incoterm.md','/snippets/sale_product_set.md','/snippets/sale_subscription.md','/snippets/stock.md','/snippets/stock_account.md','/snippets/stock_delivery_note.md','/snippets/timesheet_grid.md','/snippets/web.md','/snippets/website_discount_voucher.md','/snippets/website_sale.md',]
diff --git a/README.md b/README.md
index 0d5d46a6..4f02dfd2 100644
--- a/README.md
+++ b/README.md
@@ -160,6 +160,65 @@ task stop
 task drop-db
 ```
 
+## Mail
+
+### Setup mail server and client
+
+Start mail server.
+
+```
+task start mail
+```
+
+Create a new account `odoo@example.com` and set `odoo` as password.\
+Create a new account `test@example.com` and set `test` as password.
+
+Install a simple mail client such as [Claws Mail](https://www.claws-mail.org/) and connect with credentials:
+
+host: `localhost`\
+port: `25`\
+username: `odoo@example.com`\
+password: `test`
+
+For incoming mails use these informations:
+
+server type: `IMAP`
+host: `localhost`\
+port: `143`\
+username: `odoo@example.com`\
+password: `test`
+
+Repeat the same for `test@example.com`.
+
+### Setup incoming and outgoing mail for Odoo
+
+Activate mail sever option with `example.com` domain.
+
+For outgoing mails use these informations:
+
+host: `localhost`\
+port: `25`\
+username: `odoo@example.com`\
+password: `odoo`
+
+For incoming mails use these informations:
+
+server type: `IMAP`
+host: `localhost`\
+port: `143`\
+username: `odoo@example.com`\
+password: `odoo`
+
+### Test mail exchange
+
+Follow these steps to test a mail exchange:
+
+* Send mail in Odoo to `test@example.com`
+* In mail client create reply to the mail and save as draft
+* Copy the mail to the inbox of `odoo@example.com`
+* Trigger fetchmail in Odoo
+* Check if reply has been processed
+
 ## Troubleshooting
 
 ### inotify instance limit reached 
@@ -178,4 +237,4 @@ Increase ifnotify watch limit.
 
 ```bash
 sudo sysctl fs.inotify.max_user_watches=52428800
-```
\ No newline at end of file
+```
diff --git a/docker-compose.yml b/docker-compose.yml
index bfa33e76..b1beae8c 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -12,14 +12,14 @@ services:
     ports:
       - "127.0.0.1:8069:8069"
     volumes:
-      - odoo-odoo-data:/var/lib/odoo
+      - odoo-data:/var/lib/odoo
       - ./config:/etc/odoo
       - ./addons:/mnt/addons
       - ./oca:/mnt/oca
       - ./enterprise:/mnt/enterprise
       - ./themes:/mnt/themes
-  pgadmin:
-    container_name: pgadmin
+  admin:
+    container_name: admin
     image: dpage/pgadmin4:6
     depends_on:
       - db
@@ -29,7 +29,7 @@ services:
       PGADMIN_DEFAULT_EMAIL: admin@example.com
       PGADMIN_DEFAULT_PASSWORD: admin
     volumes:
-      - odoo-pgadmin-data:/var/lib/pgadmin
+      - admin-data:/var/lib/pgadmin
       - ./config/servers.json:/pgadmin4/servers.json
   db:
     container_name: db
@@ -41,8 +41,19 @@ services:
       POSTGRES_PASSWORD: odoo
       PGDATA: /var/lib/postgresql/data/pgdata
     volumes:
-      - odoo-db-data:/var/lib/postgresql/data/pgdata
+      - db-data:/var/lib/postgresql/data/pgdata
+  mail:
+    image: docker.io/mailserver/docker-mailserver:latest
+    container_name: mail
+    hostname: mail
+    domainname: localhost
+    ports:
+      - "25:25"
+      - "143:143"
+      - "587:587"
+      - "993:993"
 volumes:
-  odoo-odoo-data:
-  odoo-db-data:
-  odoo-pgadmin-data:
+  odoo-data:
+  db-data:
+  admin-data:
+  mail-data:
diff --git a/snippets.md b/snippets.md
index 85af87b3..bc6571ec 100644
--- a/snippets.md
+++ b/snippets.md
@@ -1,7 +1,10 @@
 # Snippets
 In Odoo everything is described as an XML document.     Snippets are modifications (edits) for these XML documents.     With a snippet you can e.g. hide a field on the contact form.     A snippet name is unique and follows the `$COMPANY.$MODULE.$XML_ID.$DESCRIPTION` schema.
 ## [Account](snippets/account.md)
+## [Account Asset](snippets/account_asset.md)
 ## [Account Budget](snippets/account_budget.md)
+## [Account Followup](snippets/account_followup.md)
+## [Account Sale Timesheet Report](snippets/account_sale_timesheet_report.md)
 ## [Agreement](snippets/agreement.md)
 ## [Agreement Legal](snippets/agreement_legal.md)
 ## [Base](snippets/base.md)
@@ -37,6 +40,7 @@ In Odoo everything is described as an XML document.     Snippets are modificatio
 ## [Project](snippets/project.md)
 ## [Purchase](snippets/purchase.md)
 ## [Purchase Requisition](snippets/purchase_requisition.md)
+## [Purchase Requisition Send](snippets/purchase_requisition_send.md)
 ## [Res Groups](snippets/res_groups.md)
 ## [Sale](snippets/sale.md)
 ## [Sale Blanket Order](snippets/sale_blanket_order.md)
@@ -49,6 +53,7 @@ In Odoo everything is described as an XML document.     Snippets are modificatio
 ## [Sale Product Set](snippets/sale_product_set.md)
 ## [Sale Subscription](snippets/sale_subscription.md)
 ## [Stock](snippets/stock.md)
+## [Stock Account](snippets/stock_account.md)
 ## [Stock Delivery Note](snippets/stock_delivery_note.md)
 ## [Timesheet Grid](snippets/timesheet_grid.md)
 ## [Web](snippets/web.md)
diff --git a/snippets/account.md b/snippets/account.md
index 17548c23..70210347 100644
--- a/snippets/account.md
+++ b/snippets/account.md
@@ -61,28 +61,25 @@ ID: `mint_system.account.report_invoice_document.add_iban`
 <?xml version="1.0"?>
 <data inherit_id="account.report_invoice_document" priority="50">
 
-  <!-- Odoo 14.0 -->
-  <xpath expr="/t/t/div/p[2]" position="after">
-      <div class="row">
-      <div class="col">
-          <span>IBAN: </span>
-          <span t-field="o.partner_bank_id.acc_number"/>
-      </div>
-      </div>
-  </xpath>
-  <xpath expr="/t/t/div/div[3]" position="after">
-      <div class="row">
-      <div class="col">
-          <span>Bank/BIC: </span>
-          <span t-field="o.partner_bank_id.bank_id.display_name"/>
-          <br/>
-          <br/>
-      </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>
+                <span>IBAN: </span>
+                <b>
+                    <span t-field="o.partner_bank_id.acc_number" />
+                </b>
+                <br />
+                <span>Bank/BIC: </span>
+                <b>
+                    <span t-field="o.partner_bank_id.bank_id.display_name" />
+                </b>
+            </p>
+        </t>
+    </xpath>
 
-  <!-- Odoo 13.0 -->
-  <!-- <xpath expr="/t/t/div/p[2]" position="after">
+    <!-- Odoo 13.0 -->
+    <!-- <xpath expr="/t/t/div/p[2]" position="after">
       <div class="row">
       <div class="col">
           <span>IBAN: </span>
@@ -102,7 +99,6 @@ ID: `mint_system.account.report_invoice_document.add_iban`
   </xpath> -->
 
 </data>
-
 ```
 Source: [snippets/account.report_invoice_document.add_iban.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/account.report_invoice_document.add_iban.xml)
 
@@ -120,6 +116,38 @@ 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 Person  
+ID: `mint_system.account.report_invoice_document.add_sale_person`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="account.report_invoice_document" priority="50">
+
+    <!-- Remove reference -->
+    <xpath expr="/t/t/div/div[1]/div[5]" position="replace">
+    </xpath>
+
+    <!-- Add sales person -->
+    <xpath expr="/t/t/div/div[1]/div[1]" position="after">
+        <div class="col-auto mw-100 mb-2" t-if="o.invoice_user_id" name="invoice_user_id">
+            <strong>Salesperson:</strong>
+            <p class="m-0" t-field="o.invoice_user_id.name" />
+        </div>
+    </xpath>
+
+    <!-- Add referencce to new line -->
+    <xpath expr="//div[@id='informations']" position="after">
+        <div id="informations2" class="row mt32 mb32" t-if="o.ref">
+            <div class="col-auto mw-100 mb-2" name="reference">
+                <strong>Reference:</strong>
+                <p class="m-0" t-field="o.ref" />
+            </div>
+        </div>
+    </xpath>
+
+</data>
+```
+Source: [snippets/account.report_invoice_document.add_sale_person.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/account.report_invoice_document.add_sale_person.xml)
+
 ### Add Salesperson  
 ID: `mint_system.account.report_invoice_document.add_salesperson`  
 ```xml
@@ -208,6 +236,36 @@ ID: `mint_system.account.report_invoice_document.bank_account`
 ```
 Source: [snippets/account.report_invoice_document.bank_account.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/account.report_invoice_document.bank_account.xml)
 
+### Custom Address  
+ID: `mint_system.account.report_invoice_document.custom_address`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="account.report_invoice_document" priority="50">
+
+  <xpath expr="//t[@t-set='address']/address" position="replace">
+    <address>
+      <t t-if="o.partner_id.invoice_name">
+        <div><span t-esc="o.partner_id.invoice_name" /></div>
+      </t>
+      <t t-if="o.partner_id.address_addition">
+        <div><span t-esc="o.partner_id.address_addition" /></div>
+      </t>
+      <t t-if="o.partner_id.street">
+        <div><span t-esc="o.partner_id.street" /></div>
+      </t>
+      <t t-if="o.partner_id.city and o.partner_id.city">
+        <div><span t-esc="o.partner_id.zip" /> <span t-esc="o.partner_id.city" /></div>
+      </t>
+      <t t-if="o.partner_id.country_id">
+        <div><span t-esc="o.partner_id.country_id.name" /></div>
+      </t>
+    </address>
+  </xpath>
+
+</data>
+```
+Source: [snippets/account.report_invoice_document.custom_address.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/account.report_invoice_document.custom_address.xml)
+
 ### Custom Taxes  
 ID: `mint_system.account.report_invoice_document.custom_taxes`  
 ```xml
@@ -1872,28 +1930,25 @@ ID: `mint_system.account.report_invoice_document.add_iban`
 <?xml version="1.0"?>
 <data inherit_id="account.report_invoice_document" priority="50">
 
-  <!-- Odoo 14.0 -->
-  <xpath expr="/t/t/div/p[2]" position="after">
-      <div class="row">
-      <div class="col">
-          <span>IBAN: </span>
-          <span t-field="o.partner_bank_id.acc_number"/>
-      </div>
-      </div>
-  </xpath>
-  <xpath expr="/t/t/div/div[3]" position="after">
-      <div class="row">
-      <div class="col">
-          <span>Bank/BIC: </span>
-          <span t-field="o.partner_bank_id.bank_id.display_name"/>
-          <br/>
-          <br/>
-      </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>
+                <span>IBAN: </span>
+                <b>
+                    <span t-field="o.partner_bank_id.acc_number" />
+                </b>
+                <br />
+                <span>Bank/BIC: </span>
+                <b>
+                    <span t-field="o.partner_bank_id.bank_id.display_name" />
+                </b>
+            </p>
+        </t>
+    </xpath>
 
-  <!-- Odoo 13.0 -->
-  <!-- <xpath expr="/t/t/div/p[2]" position="after">
+    <!-- Odoo 13.0 -->
+    <!-- <xpath expr="/t/t/div/p[2]" position="after">
       <div class="row">
       <div class="col">
           <span>IBAN: </span>
@@ -1913,7 +1968,6 @@ ID: `mint_system.account.report_invoice_document.add_iban`
   </xpath> -->
 
 </data>
-
 ```
 Source: [snippets/account.report_invoice_document.add_iban.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/account.report_invoice_document.add_iban.xml)
 
@@ -1931,6 +1985,38 @@ 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 Person  
+ID: `mint_system.account.report_invoice_document.add_sale_person`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="account.report_invoice_document" priority="50">
+
+    <!-- Remove reference -->
+    <xpath expr="/t/t/div/div[1]/div[5]" position="replace">
+    </xpath>
+
+    <!-- Add sales person -->
+    <xpath expr="/t/t/div/div[1]/div[1]" position="after">
+        <div class="col-auto mw-100 mb-2" t-if="o.invoice_user_id" name="invoice_user_id">
+            <strong>Salesperson:</strong>
+            <p class="m-0" t-field="o.invoice_user_id.name" />
+        </div>
+    </xpath>
+
+    <!-- Add referencce to new line -->
+    <xpath expr="//div[@id='informations']" position="after">
+        <div id="informations2" class="row mt32 mb32" t-if="o.ref">
+            <div class="col-auto mw-100 mb-2" name="reference">
+                <strong>Reference:</strong>
+                <p class="m-0" t-field="o.ref" />
+            </div>
+        </div>
+    </xpath>
+
+</data>
+```
+Source: [snippets/account.report_invoice_document.add_sale_person.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/account.report_invoice_document.add_sale_person.xml)
+
 ### Add Salesperson  
 ID: `mint_system.account.report_invoice_document.add_salesperson`  
 ```xml
@@ -2019,6 +2105,36 @@ ID: `mint_system.account.report_invoice_document.bank_account`
 ```
 Source: [snippets/account.report_invoice_document.bank_account.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/account.report_invoice_document.bank_account.xml)
 
+### Custom Address  
+ID: `mint_system.account.report_invoice_document.custom_address`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="account.report_invoice_document" priority="50">
+
+  <xpath expr="//t[@t-set='address']/address" position="replace">
+    <address>
+      <t t-if="o.partner_id.invoice_name">
+        <div><span t-esc="o.partner_id.invoice_name" /></div>
+      </t>
+      <t t-if="o.partner_id.address_addition">
+        <div><span t-esc="o.partner_id.address_addition" /></div>
+      </t>
+      <t t-if="o.partner_id.street">
+        <div><span t-esc="o.partner_id.street" /></div>
+      </t>
+      <t t-if="o.partner_id.city and o.partner_id.city">
+        <div><span t-esc="o.partner_id.zip" /> <span t-esc="o.partner_id.city" /></div>
+      </t>
+      <t t-if="o.partner_id.country_id">
+        <div><span t-esc="o.partner_id.country_id.name" /></div>
+      </t>
+    </address>
+  </xpath>
+
+</data>
+```
+Source: [snippets/account.report_invoice_document.custom_address.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/account.report_invoice_document.custom_address.xml)
+
 ### Custom Taxes  
 ID: `mint_system.account.report_invoice_document.custom_taxes`  
 ```xml
@@ -3840,6 +3956,20 @@ ID: `mint_system.account.view_move_form.domain_partner_bank_ids`
 ```
 Source: [snippets/account.view_move_form.domain_partner_bank_ids.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/account.view_move_form.domain_partner_bank_ids.xml)
 
+### Edit Invoice Date  
+ID: `mint_system.account.view_move_form.edit_invoice_date`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="account.view_move_form" priority="50" >
+
+    <field name="invoice_date" position="attributes">
+        <attribute name="attrs">{}</attribute>
+    </field>
+
+</data>
+```
+Source: [snippets/account.view_move_form.edit_invoice_date.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/account.view_move_form.edit_invoice_date.xml)
+
 ### Hide Payment Reference  
 ID: `mint_system.account.view_move_form.hide_payment_reference`  
 ```xml
@@ -4004,6 +4134,24 @@ ID: `mint_system.account.view_move_form.show_user_id`
 ```
 Source: [snippets/account.view_move_form.show_user_id.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/account.view_move_form.show_user_id.xml)
 
+### X Duplicate Found  
+ID: `mint_system.account.view_move_form.x_duplicate_found`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="account.view_move_form" priority="50" >
+
+    <header position="after">
+        <field name="x_duplicate_found" invisible="1"/>
+        <div groups="account.group_account_invoice" class="alert alert-warning" role="alert" style="margin-bottom:0px;" attrs="{'invisible': [('x_duplicate_found', '=', False)]}">
+            Es existiert eine bestehende Rechnung mit dem gleichen Partner und Total. Stellen sicher, dass diese Rechnung kein Duplikat ist. 
+            <!-- A duplicate invoice with the same partner and total exists. Make sure this invoice is not a duplicate before posting. -->
+        </div>
+    </header>
+
+</data>
+```
+Source: [snippets/account.view_move_form.x_duplicate_found.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/account.view_move_form.x_duplicate_found.xml)
+
 ### X Recurring Inverval  
 ID: `mint_system.account.view_move_form.x_recurring_inverval`  
 ```xml
diff --git a/snippets/account.report_invoice_document.add_iban.xml b/snippets/account.report_invoice_document.add_iban.xml
index bd325c34..31bb194b 100644
--- a/snippets/account.report_invoice_document.add_iban.xml
+++ b/snippets/account.report_invoice_document.add_iban.xml
@@ -1,28 +1,25 @@
 <?xml version="1.0"?>
 <data inherit_id="account.report_invoice_document" priority="50">
 
-  <!-- Odoo 14.0 -->
-  <xpath expr="/t/t/div/p[2]" position="after">
-      <div class="row">
-      <div class="col">
-          <span>IBAN: </span>
-          <span t-field="o.partner_bank_id.acc_number"/>
-      </div>
-      </div>
-  </xpath>
-  <xpath expr="/t/t/div/div[3]" position="after">
-      <div class="row">
-      <div class="col">
-          <span>Bank/BIC: </span>
-          <span t-field="o.partner_bank_id.bank_id.display_name"/>
-          <br/>
-          <br/>
-      </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>
+                <span>IBAN: </span>
+                <b>
+                    <span t-field="o.partner_bank_id.acc_number" />
+                </b>
+                <br />
+                <span>Bank/BIC: </span>
+                <b>
+                    <span t-field="o.partner_bank_id.bank_id.display_name" />
+                </b>
+            </p>
+        </t>
+    </xpath>
 
-  <!-- Odoo 13.0 -->
-  <!-- <xpath expr="/t/t/div/p[2]" position="after">
+    <!-- Odoo 13.0 -->
+    <!-- <xpath expr="/t/t/div/p[2]" position="after">
       <div class="row">
       <div class="col">
           <span>IBAN: </span>
@@ -41,4 +38,4 @@
       </div>
   </xpath> -->
 
-</data>
+</data>
\ No newline at end of file
diff --git a/snippets/account.report_invoice_document.add_sale_person.xml b/snippets/account.report_invoice_document.add_sale_person.xml
new file mode 100644
index 00000000..a4c29dc9
--- /dev/null
+++ b/snippets/account.report_invoice_document.add_sale_person.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+<data inherit_id="account.report_invoice_document" priority="50">
+
+    <!-- Remove reference -->
+    <xpath expr="/t/t/div/div[1]/div[5]" position="replace">
+    </xpath>
+
+    <!-- Add sales person -->
+    <xpath expr="/t/t/div/div[1]/div[1]" position="after">
+        <div class="col-auto mw-100 mb-2" t-if="o.invoice_user_id" name="invoice_user_id">
+            <strong>Salesperson:</strong>
+            <p class="m-0" t-field="o.invoice_user_id.name" />
+        </div>
+    </xpath>
+
+    <!-- Add referencce to new line -->
+    <xpath expr="//div[@id='informations']" position="after">
+        <div id="informations2" class="row mt32 mb32" t-if="o.ref">
+            <div class="col-auto mw-100 mb-2" name="reference">
+                <strong>Reference:</strong>
+                <p class="m-0" t-field="o.ref" />
+            </div>
+        </div>
+    </xpath>
+
+</data>
\ No newline at end of file
diff --git a/snippets/account.report_invoice_document.custom_address.xml b/snippets/account.report_invoice_document.custom_address.xml
new file mode 100644
index 00000000..04fb942a
--- /dev/null
+++ b/snippets/account.report_invoice_document.custom_address.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+<data inherit_id="account.report_invoice_document" priority="50">
+
+  <xpath expr="//t[@t-set='address']/address" position="replace">
+    <address>
+      <t t-if="o.partner_id.invoice_name">
+        <div><span t-esc="o.partner_id.invoice_name" /></div>
+      </t>
+      <t t-if="o.partner_id.address_addition">
+        <div><span t-esc="o.partner_id.address_addition" /></div>
+      </t>
+      <t t-if="o.partner_id.street">
+        <div><span t-esc="o.partner_id.street" /></div>
+      </t>
+      <t t-if="o.partner_id.city and o.partner_id.city">
+        <div><span t-esc="o.partner_id.zip" /> <span t-esc="o.partner_id.city" /></div>
+      </t>
+      <t t-if="o.partner_id.country_id">
+        <div><span t-esc="o.partner_id.country_id.name" /></div>
+      </t>
+    </address>
+  </xpath>
+
+</data>
\ No newline at end of file
diff --git a/snippets/account.view_move_form.edit_invoice_date.xml b/snippets/account.view_move_form.edit_invoice_date.xml
new file mode 100644
index 00000000..ddb2792d
--- /dev/null
+++ b/snippets/account.view_move_form.edit_invoice_date.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<data inherit_id="account.view_move_form" priority="50" >
+
+    <field name="invoice_date" position="attributes">
+        <attribute name="attrs">{}</attribute>
+    </field>
+
+</data>
\ No newline at end of file
diff --git a/snippets/account.view_move_form.x_duplicate_found.xml b/snippets/account.view_move_form.x_duplicate_found.xml
new file mode 100644
index 00000000..c3084d58
--- /dev/null
+++ b/snippets/account.view_move_form.x_duplicate_found.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<data inherit_id="account.view_move_form" priority="50" >
+
+    <header position="after">
+        <field name="x_duplicate_found" invisible="1"/>
+        <div groups="account.group_account_invoice" class="alert alert-warning" role="alert" style="margin-bottom:0px;" attrs="{'invisible': [('x_duplicate_found', '=', False)]}">
+            Es existiert eine bestehende Rechnung mit dem gleichen Partner und Total. Stellen sicher, dass diese Rechnung kein Duplikat ist. 
+            <!-- A duplicate invoice with the same partner and total exists. Make sure this invoice is not a duplicate before posting. -->
+        </div>
+    </header>
+
+</data>
\ No newline at end of file
diff --git a/snippets/account_asset.md b/snippets/account_asset.md
new file mode 100644
index 00000000..cc36a3b1
--- /dev/null
+++ b/snippets/account_asset.md
@@ -0,0 +1,27 @@
+---
+prev: ./snippets.md
+---
+# Account Asset
+## View Account Asset Form  
+### Account Ids Optional  
+ID: `mint_system.account_asset.view_account_asset_form.account_ids_optional`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="account_asset.view_account_asset_form" priority="50">
+
+    <field name="account_asset_id" position="attributes">
+		<attribute name="attrs">{'invisible': ['|', ('display_account_asset_id', '=', False), ('asset_type', '!=', 'purchase')]}</attribute>
+	</field>
+
+	<field name="account_depreciation_expense_id" position="attributes">
+		<attribute name="required">0</attribute>
+	</field>
+
+    <field name="account_depreciation_id" position="attributes">
+		<attribute name="required">0</attribute>
+	</field>
+
+</data>
+```
+Source: [snippets/account_asset.view_account_asset_form.account_ids_optional.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/account_asset.view_account_asset_form.account_ids_optional.xml)
+
diff --git a/snippets/account_asset.view_account_asset_form.account_ids_optional.xml b/snippets/account_asset.view_account_asset_form.account_ids_optional.xml
new file mode 100644
index 00000000..0ed475e4
--- /dev/null
+++ b/snippets/account_asset.view_account_asset_form.account_ids_optional.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<data inherit_id="account_asset.view_account_asset_form" priority="50">
+
+    <field name="account_asset_id" position="attributes">
+		<attribute name="attrs">{'invisible': ['|', ('display_account_asset_id', '=', False), ('asset_type', '!=', 'purchase')]}</attribute>
+	</field>
+
+	<field name="account_depreciation_expense_id" position="attributes">
+		<attribute name="required">0</attribute>
+	</field>
+
+    <field name="account_depreciation_id" position="attributes">
+		<attribute name="required">0</attribute>
+	</field>
+
+</data>
\ No newline at end of file
diff --git a/snippets/account_followup.md b/snippets/account_followup.md
new file mode 100644
index 00000000..f8066f4b
--- /dev/null
+++ b/snippets/account_followup.md
@@ -0,0 +1,31 @@
+---
+prev: ./snippets.md
+---
+# Account Followup
+## Template Followup Report  
+### Padding Before Table  
+ID: `mint_system.account_followup.template_followup_report.padding_before_table`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="account_followup.template_followup_report" priority="50">
+
+  <xpath expr="//table[hasclass('o_account_reports_table')]" position="attributes">
+    <attribute name="style">padding-top: 2rem</attribute>
+  </xpath>
+
+</data>
+```
+Source: [snippets/account_followup.template_followup_report.padding_before_table.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/account_followup.template_followup_report.padding_before_table.xml)
+
+### Remove Summary Placeholder  
+ID: `mint_system.account_followup.template_followup_report.remove_summary_placeholder`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="account_followup.template_followup_report" priority="50">
+
+  <xpath expr="//span[hasclass('o_account_report_summary_placeholder')]" position="replace" />
+
+</data>
+```
+Source: [snippets/account_followup.template_followup_report.remove_summary_placeholder.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/account_followup.template_followup_report.remove_summary_placeholder.xml)
+
diff --git a/snippets/account_followup.template_followup_report.padding_before_table.xml b/snippets/account_followup.template_followup_report.padding_before_table.xml
new file mode 100644
index 00000000..75c44f92
--- /dev/null
+++ b/snippets/account_followup.template_followup_report.padding_before_table.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<data inherit_id="account_followup.template_followup_report" priority="50">
+
+  <xpath expr="//table[hasclass('o_account_reports_table')]" position="attributes">
+    <attribute name="style">padding-top: 2rem</attribute>
+  </xpath>
+
+</data>
\ No newline at end of file
diff --git a/snippets/account_followup.template_followup_report.remove_summary_placeholder.xml b/snippets/account_followup.template_followup_report.remove_summary_placeholder.xml
new file mode 100644
index 00000000..44345d2a
--- /dev/null
+++ b/snippets/account_followup.template_followup_report.remove_summary_placeholder.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<data inherit_id="account_followup.template_followup_report" priority="50">
+
+  <xpath expr="//span[hasclass('o_account_report_summary_placeholder')]" position="replace" />
+
+</data>
\ No newline at end of file
diff --git a/snippets/account_sale_timesheet_report.md b/snippets/account_sale_timesheet_report.md
new file mode 100644
index 00000000..7f7df7f7
--- /dev/null
+++ b/snippets/account_sale_timesheet_report.md
@@ -0,0 +1,45 @@
+---
+prev: ./snippets.md
+---
+# Account Sale Timesheet Report
+## Report Invoice Document  
+### Add Pagebreak  
+ID: `mint_system.account_sale_timesheet_report.report_invoice_document.add_pagebreak`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="account_sale_timesheet_report.report_invoice_document" priority="50">
+
+  <xpath expr="//div[@id='qrcode']" position="after">
+    <t t-if="print_with_timesheets">
+      <p style="page-break-before:always;" />
+    </t>
+  </xpath>
+
+</data>
+```
+Source: [snippets/account_sale_timesheet_report.report_invoice_document.add_pagebreak.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/account_sale_timesheet_report.report_invoice_document.add_pagebreak.xml)
+
+## Timesheet Table  
+### Add Start And End Hour  
+ID: `mint_system.account_sale_timesheet_report.timesheet_table.add_start_and_end_hour`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="account_sale_timesheet_report.timesheet_table" priority="50">
+
+  <xpath expr="//th[@id='date']" position="replace">
+    <th id="date" class="align-middle"><span>Datum und Uhrzeit</span></th>
+  </xpath>
+
+  <xpath expr="//td[@id='line_date']" position="replace">
+    <td id="line_date">
+      <span t-field="line.date"/><br/>
+      <span t-field="line.from_time" t-options="{'widget': 'duration', 'digital': True, 'unit': 'hour', 'round': 'minute'}"/>
+      <span> - </span> 
+      <span t-field="line.until_time" t-options="{'widget': 'duration', 'digital': True, 'unit': 'hour', 'round': 'minute'}"/>
+   </td>
+  </xpath>
+
+</data>
+```
+Source: [snippets/account_sale_timesheet_report.timesheet_table.add_start_and_end_hour.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/account_sale_timesheet_report.timesheet_table.add_start_and_end_hour.xml)
+
diff --git a/snippets/account_sale_timesheet_report.report_invoice_document.add_pagebreak.xml b/snippets/account_sale_timesheet_report.report_invoice_document.add_pagebreak.xml
new file mode 100644
index 00000000..a3c7cf8e
--- /dev/null
+++ b/snippets/account_sale_timesheet_report.report_invoice_document.add_pagebreak.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<data inherit_id="account_sale_timesheet_report.report_invoice_document" priority="50">
+
+  <xpath expr="//div[@id='qrcode']" position="after">
+    <t t-if="print_with_timesheets">
+      <p style="page-break-before:always;" />
+    </t>
+  </xpath>
+
+</data>
\ No newline at end of file
diff --git a/snippets/account_sale_timesheet_report.timesheet_table.add_start_and_end_hour.xml b/snippets/account_sale_timesheet_report.timesheet_table.add_start_and_end_hour.xml
new file mode 100644
index 00000000..e5532221
--- /dev/null
+++ b/snippets/account_sale_timesheet_report.timesheet_table.add_start_and_end_hour.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+<data inherit_id="account_sale_timesheet_report.timesheet_table" priority="50">
+
+  <xpath expr="//th[@id='date']" position="replace">
+    <th id="date" class="align-middle"><span>Datum und Uhrzeit</span></th>
+  </xpath>
+
+  <xpath expr="//td[@id='line_date']" position="replace">
+    <td id="line_date">
+      <span t-field="line.date"/><br/>
+      <span t-field="line.from_time" t-options="{'widget': 'duration', 'digital': True, 'unit': 'hour', 'round': 'minute'}"/>
+      <span> - </span> 
+      <span t-field="line.until_time" t-options="{'widget': 'duration', 'digital': True, 'unit': 'hour', 'round': 'minute'}"/>
+   </td>
+  </xpath>
+
+</data>
\ No newline at end of file
diff --git a/snippets/base.ir_cron_view_tree.show_ir_actions_server_id.xml b/snippets/base.ir_cron_view_tree.show_ir_actions_server_id.xml
new file mode 100644
index 00000000..69fd5a47
--- /dev/null
+++ b/snippets/base.ir_cron_view_tree.show_ir_actions_server_id.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<data inherit_id="base.ir_cron_view_tree" priority="50">
+
+  <field name="model_id" position="after">
+    <field name="ir_actions_server_id" optional="hide"/>
+  </field>
+
+</data>
diff --git a/snippets/base.md b/snippets/base.md
index c8c9e1d5..e17a3b0f 100644
--- a/snippets/base.md
+++ b/snippets/base.md
@@ -30,6 +30,22 @@ ID: `mint_system.base.contact_name.modify_name`
 ```
 Source: [snippets/base.contact_name.modify_name.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/base.contact_name.modify_name.xml)
 
+## Ir Cron View Tree  
+### Show Ir Actions Server Id  
+ID: `mint_system.base.ir_cron_view_tree.show_ir_actions_server_id`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="base.ir_cron_view_tree" priority="50">
+
+  <field name="model_id" position="after">
+    <field name="ir_actions_server_id" optional="hide"/>
+  </field>
+
+</data>
+
+```
+Source: [snippets/base.ir_cron_view_tree.show_ir_actions_server_id.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/base.ir_cron_view_tree.show_ir_actions_server_id.xml)
+
 ## Ir Filters View Form  
 ### Remove Domain Widget  
 ID: `mint_system.base.ir_filters_view_form.remove_domain_widget`  
diff --git a/snippets/hr_holidays.hr_leave_view_form.show_number_of_hours_always.xml b/snippets/hr_holidays.hr_leave_view_form.show_number_of_hours_always.xml
new file mode 100644
index 00000000..b2e5fa1f
--- /dev/null
+++ b/snippets/hr_holidays.hr_leave_view_form.show_number_of_hours_always.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<data inherit_id="hr_holidays.hr_leave_view_form" priority="50">
+
+  <xpath expr="//field[@name='number_of_hours_text']/.." position="attributes">
+    <attribute name="attrs">{}</attribute>
+  </xpath>
+
+</data>
diff --git a/snippets/hr_holidays.hr_leave_view_tree.x_synced.xml b/snippets/hr_holidays.hr_leave_view_tree.x_synced.xml
index 0ee3db9c..7d4ab9d5 100644
--- a/snippets/hr_holidays.hr_leave_view_tree.x_synced.xml
+++ b/snippets/hr_holidays.hr_leave_view_tree.x_synced.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<data inherit_id="hr_holidays.hr_leave_view_tree">
+<data inherit_id="hr_holidays.hr_leave_view_tree" priority="50">
 
   <xpath expr="//field[@name='state']" position="after">
     <field name="x_synced" widget="toggle_button" groups="hr.group_hr_user"/>
diff --git a/snippets/hr_holidays.md b/snippets/hr_holidays.md
index 95c728bb..17b4399c 100644
--- a/snippets/hr_holidays.md
+++ b/snippets/hr_holidays.md
@@ -36,6 +36,22 @@ ID: `mint_system.hr_holidays.hr_leave_view_form_manager_approve.report_note_grou
 ```
 Source: [snippets/hr_holidays.hr_leave_view_form_manager_approve.report_note_group.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/hr_holidays.hr_leave_view_form_manager_approve.report_note_group.xml)
 
+## Hr Leave View Form  
+### Show Number Of Hours Always  
+ID: `mint_system.hr_holidays.hr_leave_view_form.show_number_of_hours_always`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="hr_holidays.hr_leave_view_form" priority="50">
+
+  <xpath expr="//field[@name='number_of_hours_text']/.." position="attributes">
+    <attribute name="attrs">{}</attribute>
+  </xpath>
+
+</data>
+
+```
+Source: [snippets/hr_holidays.hr_leave_view_form.show_number_of_hours_always.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/hr_holidays.hr_leave_view_form.show_number_of_hours_always.xml)
+
 ## Hr Leave View Timeline  
 ### View  
 ID: `mint_system.hr_holidays.hr_leave_view_timeline.view`  
@@ -58,21 +74,6 @@ ID: `mint_system.hr_holidays.hr_leave_view_timeline.view`
 Source: [snippets/hr_holidays.hr_leave_view_timeline.view.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/hr_holidays.hr_leave_view_timeline.view.xml)
 
 ## Hr Leave View Tree  
-### Add Synced Field  
-ID: `mint_system.hr_holidays.hr_leave_view_tree.add_synced_field`  
-```xml
-<?xml version="1.0"?>
-<data inherit_id="hr_holidays.hr_leave_view_tree" priority="50">
-
-  <xpath expr="//field[@name='state']" position="after">
-    <field name="x_synced" widget="toggle_button"/>
-  </xpath>
-
-</data>
-
-```
-Source: [snippets/hr_holidays.hr_leave_view_tree.add_synced_field.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/hr_holidays.hr_leave_view_tree.add_synced_field.xml)
-
 ### Remove Payslip  
 ID: `mint_system.hr_holidays.hr_leave_view_tree.remove_payslip`  
 ```xml
@@ -102,3 +103,33 @@ ID: `mint_system.hr_holidays.hr_leave_view_tree.show_days`
 ```
 Source: [snippets/hr_holidays.hr_leave_view_tree.show_days.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/hr_holidays.hr_leave_view_tree.show_days.xml)
 
+### X Synced  
+ID: `mint_system.hr_holidays.hr_leave_view_tree.x_synced`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="hr_holidays.hr_leave_view_tree" priority="50">
+
+  <xpath expr="//field[@name='state']" position="after">
+    <field name="x_synced" widget="toggle_button" groups="hr.group_hr_user"/>
+  </xpath>
+
+</data>
+```
+Source: [snippets/hr_holidays.hr_leave_view_tree.x_synced.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/hr_holidays.hr_leave_view_tree.x_synced.xml)
+
+## View Holiday Pivot  
+### X Number Of Hours  
+ID: `mint_system.hr_holidays.view_holiday_pivot.x_number_of_hours`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="hr_holidays.view_holiday_pivot" priority="50">
+
+  <field name="number_of_days" position="after">
+    <field name="x_number_of_hours" type="measure"/>
+  </field>
+
+</data>
+
+```
+Source: [snippets/hr_holidays.view_holiday_pivot.x_number_of_hours.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/hr_holidays.view_holiday_pivot.x_number_of_hours.xml)
+
diff --git a/snippets/hr_holidays.view_holiday_pivot.x_number_of_hours.xml b/snippets/hr_holidays.view_holiday_pivot.x_number_of_hours.xml
new file mode 100644
index 00000000..0dc956bb
--- /dev/null
+++ b/snippets/hr_holidays.view_holiday_pivot.x_number_of_hours.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<data inherit_id="hr_holidays.view_holiday_pivot" priority="50">
+
+  <field name="number_of_days" position="after">
+    <field name="x_number_of_hours" type="measure"/>
+  </field>
+
+</data>
diff --git a/snippets/hr_payroll.md b/snippets/hr_payroll.md
index 8f15b5cb..1450f672 100644
--- a/snippets/hr_payroll.md
+++ b/snippets/hr_payroll.md
@@ -57,6 +57,228 @@ ID: `mint_system.hr_payroll.hr_salary_rule_form.switch_account`
 ```
 Source: [snippets/hr_payroll.hr_salary_rule_form.switch_account.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/hr_payroll.hr_salary_rule_form.switch_account.xml)
 
+## Report Payslip  
+### Gio Custom Payroll  
+ID: `mint_system.hr_payroll.report_payslip.gio_custom_payroll`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="hr_payroll.report_payslip" priority="50">
+
+  <template id="gio_payslip_replace" inherit_id="hr_payroll.report_payslip">
+    <xpath expr="//div[@class='page']" position="replace">
+
+      <div class="page" style="font-family:dinot !important;">
+        <div class="row">
+          <div class="col-6">
+            <table name="informations" class="table table-sm information-table mb-0">
+              <tr name="tr_name">
+                <th name="th_name" class="text-left m-0 p-0 qweb-border-none lato-medium">
+                  <h2 class="m-0 p-0 h2_custom_info">Payroll</h2>
+                </th>
+              </tr>
+              <tr name="tr_identification_id">
+                <th name="th_identification_id" class="text-left m-0 p-0 lato-medium"
+                  style="border-top: 1px solid black;">
+                  <span>Identification number</span>
+                </th>
+                <td name="td_identification_id" class="text-right m-0 p-0 lato-medium"
+                  style="border-top: 1px solid black;">
+                  <t t-if="o.employee_id and o.employee_id.identification_id">
+                    <span t-field="o.employee_id.identification_id" />
+                  </t>
+                </td>
+              </tr>
+              <tr name="tr_payslip_run_id">
+                <th name="th_payslip_run_id" class="text-left m-0 p-0 lato-medium"
+                  style="border-top: 1px solid black;">
+                  <span>Payslip run ID</span>
+                </th>
+                <td name="td_payslip_run_id" class="text-right m-0 p-0 lato-medium"
+                  style="border-top: 1px solid black;">
+                  <t t-if="o.payslip_run_id and o.payslip_run_id.name">
+                    <span t-field="o.payslip_run_id.name" />
+                  </t>
+                </td>
+              </tr>
+            </table>
+          </div>
+        </div>
+        <div id="total">
+          <table class="table table-sm o_main_table">
+            <thead class="o_black_border">
+              <tr>
+                <th class="lato-bold text-left">LA</th>
+                <th class="lato-bold text-left">Name</th>
+                <th class="lato-bold text-right">Estimate</th>
+                <th class="lato-bold text-right">Deduction Base</th>
+                <th class="lato-bold text-right">Amount</th>
+              </tr>
+            </thead>
+            <tbody>
+              <t t-set="total_deductions" t-value="0" />
+              <t t-set="amount_payout" t-value="0" />
+              <span t-foreach="o.line_ids.filtered(lambda line: line.appears_on_payslip)"
+                t-as="line">
+                <t t-set="line_style" />
+                <t t-set="line_class" t-value="'lato-medium'" />
+                <t t-if="line.code == '5000'">
+                  <t t-set="line_style" t-value="" />
+                  <t t-set="line_class" t-value="'lato-bold'" />
+                  <!-- empty row -->
+                  <tr>
+                    <td colspan="5">
+                      <p></p>
+                    </td>
+                  </tr>
+                </t>
+                <t t-if="line.code == 'NET'">
+                  <t t-set="line_style" t-value="'color:#875A7B;'" />
+                  <t t-set="line_class" t-value="'o_total o_border_bottom lato-bold'" />
+                  <t t-set="amount_payout" t-value="line.total" />
+                  <tr class="lato-bold" name="tr_deduction">
+                    <td></td>
+                    <td class="text-left">
+                      <span>Deductions</span>
+                    </td>
+                    <td name="td_deductions" colspan="3" class="text-right">
+                      <span t-esc="'{:.2f}'.format(total_deductions)" />
+                      <t t-if="o.currency_id and o.currency_id.name">
+                        <span t-esc="' %s' % (o.currency_id.name)" />
+                      </t>
+                    </td>
+                  </tr>
+                </t>
+                <t t-if="(line.code == 'BASIC') or (line.code == 'GROSS')">
+                  <t t-set="line_style" t-value="'color:#00A09D;'" />
+                  <t t-set="line_class" t-value="'o_subtotal o_border_bottom'" />
+                </t>
+                <tr t-att-class="line_class" t-att-style="line_style">
+                  <td class="text-left">
+                    <span t-field="line.code" />
+                  </td>
+                  <td class="text-left">
+                    <span t-field="line.name" />
+                  </td>
+                  <td class="text-right">
+                    <t t-if="o.contract_id and o.contract_id.gio_name">
+                      <t t-if="'AHV' in line.name">
+                        <span t-esc="'{:.3f}'.format(o.contract_id.gio_name.gio_ahv)" />
+                        <span t-esc="' %'" />
+                        <t t-set="total_deductions" t-value="total_deductions + line.total" />
+                      </t>
+                      <t t-if="'ALV' in line.name and not 'ALV 2' in line.name">
+                        <span t-esc="'{:.3f}'.format(o.contract_id.gio_name.gio_alv)" />
+                        <span t-esc="' %'" />
+                        <t t-set="total_deductions" t-value="total_deductions + line.total" />
+                      </t>
+                      <t t-if="'ALV 2' in line.name">
+                        <span t-esc="'{:.3f}'.format(o.contract_id.gio_name.gio_alv2)" />
+                        <span t-esc="' %'" />
+                        <t t-set="total_deductions" t-value="total_deductions + line.total" />
+                      </t>
+                      <t t-if="'NBU' in line.name">
+                        <span t-esc="'{:.3f}'.format(o.contract_id.gio_name.gio_nbu)" />
+                        <span t-esc="' %'" />
+                        <t t-set="total_deductions" t-value="total_deductions + line.total" />
+                      </t>
+                      <t t-if="'KTG m' in line.name">
+                        <span t-esc="'{:.3f}'.format(o.contract_id.gio_name.gio_ktgm)" />
+                        <span t-esc="' %'" />
+                        <t t-set="total_deductions" t-value="total_deductions + line.total" />
+                      </t>
+                      <t t-if="'KTG f' in line.name">
+                        <span t-esc="'{:.3f}'.format(o.contract_id.gio_name.gio_ktgf)" />
+                        <span t-esc="' %'" />
+                        <t t-set="total_deductions" t-value="total_deductions + line.total" />
+                      </t>
+                      <t t-if="'UVG Zuschlag' in line.name and not 'UVG Zuschlag 2' in line.name">
+                        <span
+                          t-esc="'{:.3f}'.format(o.contract_id.gio_name.gio_uvg_supplementary_insurance)" />
+                        <span t-esc="' %'" />
+                        <t t-set="total_deductions" t-value="total_deductions + line.total" />
+                      </t>
+                      <t t-if="'UVG Zuschlag 2' in line.name">
+                        <span
+                          t-esc="'{:.3f}'.format(o.contract_id.gio_name.gio_uvg_supplementary_insurance2)" />
+                        <span t-esc="' %'" />
+                        <t t-set="total_deductions" t-value="total_deductions + line.total" />
+                      </t>
+                    </t>
+                    <t t-if="'Quellensteuer' in line.name">
+                      <t t-set="total_deductions" t-value="total_deductions + line.total" />
+                    </t>
+                    <span t-if="line.quantity > 1" t-esc="line.quantity" />
+                  </td>
+                  <td class="text-right">
+                    <!-- <t
+                      t-if="line.salary_rule_id.gio_amount_python_compute != 'result=0' and line.salary_rule_id.gio_amount_python_compute != 'result = 0'">
+                      <span t-esc="line.get_amount_in_report(line.salary_rule_id)"
+                        t-options='{"widget": "monetary", "display_currency": o.company_id.currency_id}'
+                      />
+                    </t> -->
+                  </td>
+                  <td class="text-right">
+                    <span t-esc="line.total"
+                      t-options='{"widget": "monetary", "display_currency": o.company_id.currency_id}' />
+                  </td>
+                </tr>
+              </span>
+              <br />
+              <!-- Bank informations -->
+              <!-- empty row -->
+
+              <tr>
+                <td colspan="5">
+                  <span>Paid to</span>
+                </td>
+              </tr>
+              <tr class="pt-3">
+                <td></td>
+                <td class="lato-medium text-left" name="bank_name">
+                  <t t-if="o.employee_id.bank_account_id and o.employee_id.bank_account_id.bank_id">
+                    <span t-field="o.employee_id.bank_account_id.bank_id.name" />
+                  </t>
+                </td>
+                <td colspan="3" class="lato-medium text-right" name="total_payout">
+                  <strong t-esc="amount_payout"
+                    t-options='{"widget": "monetary", "display_currency": o.company_id.currency_id}' />
+                </td>
+              </tr>
+              <tr>
+                <td></td>
+                <td class="lato-medium text-left" name="bank_iban">
+                  <t t-if="o.employee_id.bank_account_id">
+                    <span>IBAN:</span>
+                    <span t-field="o.employee_id.bank_account_id.acc_number" />
+                  </t>
+                </td>
+                <td></td>
+                <td></td>
+                <td></td>
+              </tr>
+              <tr>
+                <td></td>
+                <td class="lato-medium text-left" name="bank_bic">
+                  <t t-if="o.employee_id.bank_account_id and o.employee_id.bank_account_id.bank_id">
+                    <span>BIC:</span>
+                    <span t-field="o.employee_id.bank_account_id.bank_id.bic" />
+                  </t>
+                </td>
+                <td></td>
+                <td></td>
+                <td></td>
+              </tr>
+            </tbody>
+          </table>
+        </div>
+      </div>
+    </xpath>
+  </template>
+
+</data>
+```
+Source: [snippets/hr_payroll.report_payslip.gio_custom_payroll.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/hr_payroll.report_payslip.gio_custom_payroll.xml)
+
 ## View Hr Payslip Form  
 ### Show Gio Amount  
 ID: `mint_system.hr_payroll.view_hr_payslip_form.show_gio_amount`  
diff --git a/snippets/hr_payroll.report_payslip.gio_custom_payroll.xml b/snippets/hr_payroll.report_payslip.gio_custom_payroll.xml
new file mode 100644
index 00000000..7cedbf60
--- /dev/null
+++ b/snippets/hr_payroll.report_payslip.gio_custom_payroll.xml
@@ -0,0 +1,215 @@
+<?xml version="1.0"?>
+<data inherit_id="hr_payroll.report_payslip" priority="50">
+
+  <template id="gio_payslip_replace" inherit_id="hr_payroll.report_payslip">
+    <xpath expr="//div[@class='page']" position="replace">
+
+      <div class="page" style="font-family:dinot !important;">
+        <div class="row">
+          <div class="col-6">
+            <table name="informations" class="table table-sm information-table mb-0">
+              <tr name="tr_name">
+                <th name="th_name" class="text-left m-0 p-0 qweb-border-none lato-medium">
+                  <h2 class="m-0 p-0 h2_custom_info">Payroll</h2>
+                </th>
+              </tr>
+              <tr name="tr_identification_id">
+                <th name="th_identification_id" class="text-left m-0 p-0 lato-medium"
+                  style="border-top: 1px solid black;">
+                  <span>Identification number</span>
+                </th>
+                <td name="td_identification_id" class="text-right m-0 p-0 lato-medium"
+                  style="border-top: 1px solid black;">
+                  <t t-if="o.employee_id and o.employee_id.identification_id">
+                    <span t-field="o.employee_id.identification_id" />
+                  </t>
+                </td>
+              </tr>
+              <tr name="tr_payslip_run_id">
+                <th name="th_payslip_run_id" class="text-left m-0 p-0 lato-medium"
+                  style="border-top: 1px solid black;">
+                  <span>Payslip run ID</span>
+                </th>
+                <td name="td_payslip_run_id" class="text-right m-0 p-0 lato-medium"
+                  style="border-top: 1px solid black;">
+                  <t t-if="o.payslip_run_id and o.payslip_run_id.name">
+                    <span t-field="o.payslip_run_id.name" />
+                  </t>
+                </td>
+              </tr>
+            </table>
+          </div>
+        </div>
+        <div id="total">
+          <table class="table table-sm o_main_table">
+            <thead class="o_black_border">
+              <tr>
+                <th class="lato-bold text-left">LA</th>
+                <th class="lato-bold text-left">Name</th>
+                <th class="lato-bold text-right">Estimate</th>
+                <th class="lato-bold text-right">Deduction Base</th>
+                <th class="lato-bold text-right">Amount</th>
+              </tr>
+            </thead>
+            <tbody>
+              <t t-set="total_deductions" t-value="0" />
+              <t t-set="amount_payout" t-value="0" />
+              <span t-foreach="o.line_ids.filtered(lambda line: line.appears_on_payslip)"
+                t-as="line">
+                <t t-set="line_style" />
+                <t t-set="line_class" t-value="'lato-medium'" />
+                <t t-if="line.code == '5000'">
+                  <t t-set="line_style" t-value="" />
+                  <t t-set="line_class" t-value="'lato-bold'" />
+                  <!-- empty row -->
+                  <tr>
+                    <td colspan="5">
+                      <p></p>
+                    </td>
+                  </tr>
+                </t>
+                <t t-if="line.code == 'NET'">
+                  <t t-set="line_style" t-value="'color:#875A7B;'" />
+                  <t t-set="line_class" t-value="'o_total o_border_bottom lato-bold'" />
+                  <t t-set="amount_payout" t-value="line.total" />
+                  <tr class="lato-bold" name="tr_deduction">
+                    <td></td>
+                    <td class="text-left">
+                      <span>Deductions</span>
+                    </td>
+                    <td name="td_deductions" colspan="3" class="text-right">
+                      <span t-esc="'{:.2f}'.format(total_deductions)" />
+                      <t t-if="o.currency_id and o.currency_id.name">
+                        <span t-esc="' %s' % (o.currency_id.name)" />
+                      </t>
+                    </td>
+                  </tr>
+                </t>
+                <t t-if="(line.code == 'BASIC') or (line.code == 'GROSS')">
+                  <t t-set="line_style" t-value="'color:#00A09D;'" />
+                  <t t-set="line_class" t-value="'o_subtotal o_border_bottom'" />
+                </t>
+                <tr t-att-class="line_class" t-att-style="line_style">
+                  <td class="text-left">
+                    <span t-field="line.code" />
+                  </td>
+                  <td class="text-left">
+                    <span t-field="line.name" />
+                  </td>
+                  <td class="text-right">
+                    <t t-if="o.contract_id and o.contract_id.gio_name">
+                      <t t-if="'AHV' in line.name">
+                        <span t-esc="'{:.3f}'.format(o.contract_id.gio_name.gio_ahv)" />
+                        <span t-esc="' %'" />
+                        <t t-set="total_deductions" t-value="total_deductions + line.total" />
+                      </t>
+                      <t t-if="'ALV' in line.name and not 'ALV 2' in line.name">
+                        <span t-esc="'{:.3f}'.format(o.contract_id.gio_name.gio_alv)" />
+                        <span t-esc="' %'" />
+                        <t t-set="total_deductions" t-value="total_deductions + line.total" />
+                      </t>
+                      <t t-if="'ALV 2' in line.name">
+                        <span t-esc="'{:.3f}'.format(o.contract_id.gio_name.gio_alv2)" />
+                        <span t-esc="' %'" />
+                        <t t-set="total_deductions" t-value="total_deductions + line.total" />
+                      </t>
+                      <t t-if="'NBU' in line.name">
+                        <span t-esc="'{:.3f}'.format(o.contract_id.gio_name.gio_nbu)" />
+                        <span t-esc="' %'" />
+                        <t t-set="total_deductions" t-value="total_deductions + line.total" />
+                      </t>
+                      <t t-if="'KTG m' in line.name">
+                        <span t-esc="'{:.3f}'.format(o.contract_id.gio_name.gio_ktgm)" />
+                        <span t-esc="' %'" />
+                        <t t-set="total_deductions" t-value="total_deductions + line.total" />
+                      </t>
+                      <t t-if="'KTG f' in line.name">
+                        <span t-esc="'{:.3f}'.format(o.contract_id.gio_name.gio_ktgf)" />
+                        <span t-esc="' %'" />
+                        <t t-set="total_deductions" t-value="total_deductions + line.total" />
+                      </t>
+                      <t t-if="'UVG Zuschlag' in line.name and not 'UVG Zuschlag 2' in line.name">
+                        <span
+                          t-esc="'{:.3f}'.format(o.contract_id.gio_name.gio_uvg_supplementary_insurance)" />
+                        <span t-esc="' %'" />
+                        <t t-set="total_deductions" t-value="total_deductions + line.total" />
+                      </t>
+                      <t t-if="'UVG Zuschlag 2' in line.name">
+                        <span
+                          t-esc="'{:.3f}'.format(o.contract_id.gio_name.gio_uvg_supplementary_insurance2)" />
+                        <span t-esc="' %'" />
+                        <t t-set="total_deductions" t-value="total_deductions + line.total" />
+                      </t>
+                    </t>
+                    <t t-if="'Quellensteuer' in line.name">
+                      <t t-set="total_deductions" t-value="total_deductions + line.total" />
+                    </t>
+                    <span t-if="line.quantity > 1" t-esc="line.quantity" />
+                  </td>
+                  <td class="text-right">
+                    <!-- <t
+                      t-if="line.salary_rule_id.gio_amount_python_compute != 'result=0' and line.salary_rule_id.gio_amount_python_compute != 'result = 0'">
+                      <span t-esc="line.get_amount_in_report(line.salary_rule_id)"
+                        t-options='{"widget": "monetary", "display_currency": o.company_id.currency_id}'
+                      />
+                    </t> -->
+                  </td>
+                  <td class="text-right">
+                    <span t-esc="line.total"
+                      t-options='{"widget": "monetary", "display_currency": o.company_id.currency_id}' />
+                  </td>
+                </tr>
+              </span>
+              <br />
+              <!-- Bank informations -->
+              <!-- empty row -->
+
+              <tr>
+                <td colspan="5">
+                  <span>Paid to</span>
+                </td>
+              </tr>
+              <tr class="pt-3">
+                <td></td>
+                <td class="lato-medium text-left" name="bank_name">
+                  <t t-if="o.employee_id.bank_account_id and o.employee_id.bank_account_id.bank_id">
+                    <span t-field="o.employee_id.bank_account_id.bank_id.name" />
+                  </t>
+                </td>
+                <td colspan="3" class="lato-medium text-right" name="total_payout">
+                  <strong t-esc="amount_payout"
+                    t-options='{"widget": "monetary", "display_currency": o.company_id.currency_id}' />
+                </td>
+              </tr>
+              <tr>
+                <td></td>
+                <td class="lato-medium text-left" name="bank_iban">
+                  <t t-if="o.employee_id.bank_account_id">
+                    <span>IBAN:</span>
+                    <span t-field="o.employee_id.bank_account_id.acc_number" />
+                  </t>
+                </td>
+                <td></td>
+                <td></td>
+                <td></td>
+              </tr>
+              <tr>
+                <td></td>
+                <td class="lato-medium text-left" name="bank_bic">
+                  <t t-if="o.employee_id.bank_account_id and o.employee_id.bank_account_id.bank_id">
+                    <span>BIC:</span>
+                    <span t-field="o.employee_id.bank_account_id.bank_id.bic" />
+                  </t>
+                </td>
+                <td></td>
+                <td></td>
+                <td></td>
+              </tr>
+            </tbody>
+          </table>
+        </div>
+      </div>
+    </xpath>
+  </template>
+
+</data>
\ No newline at end of file
diff --git a/snippets/hr_timesheet.hr_timesheet_line_tree.disable_editable.xml b/snippets/hr_timesheet.hr_timesheet_line_tree.disable_editable.xml
new file mode 100644
index 00000000..b8a5d201
--- /dev/null
+++ b/snippets/hr_timesheet.hr_timesheet_line_tree.disable_editable.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<data inherit_id="hr_timesheet.hr_timesheet_line_tree" priority="50">
+
+  <xpath expr="//tree" position="attributes">
+    <attribute name="editable"></attribute>
+  </xpath>
+
+</data>
diff --git a/snippets/hr_timesheet.hr_timesheet_line_tree.taks_id_required.xml b/snippets/hr_timesheet.hr_timesheet_line_tree.taks_id_required.xml
new file mode 100644
index 00000000..3c4bc63c
--- /dev/null
+++ b/snippets/hr_timesheet.hr_timesheet_line_tree.taks_id_required.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<data inherit_id="hr_timesheet.hr_timesheet_line_tree" priority="50">
+
+  <xpath expr="//field[@name='task_id']" position="attributes">
+    <attribute name="required">1</attribute>
+  </xpath>
+
+</data>
diff --git a/snippets/hr_timesheet.md b/snippets/hr_timesheet.md
index 934fdece..b07c2bdc 100644
--- a/snippets/hr_timesheet.md
+++ b/snippets/hr_timesheet.md
@@ -3,6 +3,21 @@ prev: ./snippets.md
 ---
 # Hr Timesheet
 ## Hr Timesheet Line Tree  
+### Disable Editable  
+ID: `mint_system.hr_timesheet.hr_timesheet_line_tree.disable_editable`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="hr_timesheet.hr_timesheet_line_tree" priority="50">
+
+  <xpath expr="//tree" position="attributes">
+    <attribute name="editable"></attribute>
+  </xpath>
+
+</data>
+
+```
+Source: [snippets/hr_timesheet.hr_timesheet_line_tree.disable_editable.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/hr_timesheet.hr_timesheet_line_tree.disable_editable.xml)
+
 ### Invoice Details  
 ID: `mint_system.hr_timesheet.hr_timesheet_line_tree.invoice_details`  
 ```xml
@@ -38,6 +53,21 @@ ID: `mint_system.hr_timesheet.hr_timesheet_line_tree.show_partner_id`
 ```
 Source: [snippets/hr_timesheet.hr_timesheet_line_tree.show_partner_id.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/hr_timesheet.hr_timesheet_line_tree.show_partner_id.xml)
 
+### Taks Id Required  
+ID: `mint_system.hr_timesheet.hr_timesheet_line_tree.taks_id_required`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="hr_timesheet.hr_timesheet_line_tree" priority="50">
+
+  <xpath expr="//field[@name='task_id']" position="attributes">
+    <attribute name="required">1</attribute>
+  </xpath>
+
+</data>
+
+```
+Source: [snippets/hr_timesheet.hr_timesheet_line_tree.taks_id_required.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/hr_timesheet.hr_timesheet_line_tree.taks_id_required.xml)
+
 ## Portal My Timesheets  
 ### Show Billable  
 ID: `mint_system.hr_timesheet.portal_my_timesheets.show_billable`  
diff --git a/snippets/ir_model.account_move.x_duplicate_found.xml b/snippets/ir_model.account_move.x_duplicate_found.xml
new file mode 100644
index 00000000..5b0c2b3e
--- /dev/null
+++ b/snippets/ir_model.account_move.x_duplicate_found.xml
@@ -0,0 +1,30 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+<odoo>
+
+  <record id="x_duplicate_found" model="ir.model.fields">
+    <field name="domain">[]</field>
+    <field name="field_description">Duplikat Gefunden</field>
+    <field name="model">account.move</field>
+    <field name="model_id" ref="account.model_account_move"/>
+    <field name="name">x_duplicate_found</field>
+    <field name="store" eval="False"/>
+    <field name="readonly" eval="True"/>
+    <field name="copied" eval="False"/>
+    <field name="ttype">boolean</field>
+    <field name="depends">partner_id,amount_total,state</field>
+    <field name="compute">for rec in self:
+      if rec.state == 'draft' and rec.move_type == 'in_invoice':
+        invoice_id = self.env['account.move'].search([
+          ('state', '=', 'posted'),
+          ('partner_id', '=', rec.partner_id.id),
+          ('amount_total', '=', rec.amount_total)
+        ], limit=1)
+        if invoice_id:
+          rec['x_duplicate_found'] = True
+        else:
+          rec['x_duplicate_found'] = False
+      else:
+        rec['x_duplicate_found'] = False</field>
+  </record>
+
+</odoo>
diff --git a/snippets/ir_model.hr_leave.x_number_of_hours.xml b/snippets/ir_model.hr_leave.x_number_of_hours.xml
new file mode 100644
index 00000000..63c1317d
--- /dev/null
+++ b/snippets/ir_model.hr_leave.x_number_of_hours.xml
@@ -0,0 +1,19 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+<odoo>
+
+  <record id="x_number_of_hours" model="ir.model.fields">
+    <field name="domain">[]</field>
+    <field name="field_description">Dauer (Stunden)</field>
+    <field name="model">hr.leave</field>
+    <field name="model_id" ref="hr.model_hr_leave"/>
+    <field name="name">x_number_of_hours</field>
+    <field name="store" eval="True"/>
+    <field name="readonly" eval="True"/>
+    <field name="copied" eval="False"/>
+    <field name="ttype">float</field>
+    <field name="depends">number_of_hours_display</field>
+    <field name="compute">for leave in self:
+      leave['x_number_of_hours'] = round(leave.number_of_hours_display, 2)</field>ld>
+  </record>
+
+</odoo>
diff --git a/snippets/ir_model.md b/snippets/ir_model.md
index 2c254b31..98c49bbb 100644
--- a/snippets/ir_model.md
+++ b/snippets/ir_model.md
@@ -142,6 +142,43 @@ ID: `mint_system.ir_model.account_move.x_date_done`
 ```
 Source: [snippets/ir_model.account_move.x_date_done.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/ir_model.account_move.x_date_done.xml)
 
+### X Duplicate Found  
+ID: `mint_system.ir_model.account_move.x_duplicate_found`  
+```xml
+<?xml version='1.0' encoding='UTF-8' ?>
+<odoo>
+
+  <record id="x_duplicate_found" model="ir.model.fields">
+    <field name="domain">[]</field>
+    <field name="field_description">Duplikat Gefunden</field>
+    <field name="model">account.move</field>
+    <field name="model_id" ref="account.model_account_move"/>
+    <field name="name">x_duplicate_found</field>
+    <field name="store" eval="False"/>
+    <field name="readonly" eval="True"/>
+    <field name="copied" eval="False"/>
+    <field name="ttype">boolean</field>
+    <field name="depends">partner_id,amount_total,state</field>
+    <field name="compute">for rec in self:
+      if rec.state == 'draft' and rec.move_type == 'in_invoice':
+        invoice_id = self.env['account.move'].search([
+          ('state', '=', 'posted'),
+          ('partner_id', '=', rec.partner_id.id),
+          ('amount_total', '=', rec.amount_total)
+        ], limit=1)
+        if invoice_id:
+          rec['x_duplicate_found'] = True
+        else:
+          rec['x_duplicate_found'] = False
+      else:
+        rec['x_duplicate_found'] = False</field>
+  </record>
+
+</odoo>
+
+```
+Source: [snippets/ir_model.account_move.x_duplicate_found.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/ir_model.account_move.x_duplicate_found.xml)
+
 ### X Picking List  
 ID: `mint_system.ir_model.account_move.x_picking_list`  
 ```xml
@@ -553,6 +590,33 @@ ID: `mint_system.ir_model.hr_contract.x_struct_id`
 ```
 Source: [snippets/ir_model.hr_contract.x_struct_id.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/ir_model.hr_contract.x_struct_id.xml)
 
+## Hr Leave  
+### X Number Of Hours  
+ID: `mint_system.ir_model.hr_leave.x_number_of_hours`  
+```xml
+<?xml version='1.0' encoding='UTF-8' ?>
+<odoo>
+
+  <record id="x_number_of_hours" model="ir.model.fields">
+    <field name="domain">[]</field>
+    <field name="field_description">Dauer (Stunden)</field>
+    <field name="model">hr.leave</field>
+    <field name="model_id" ref="hr.model_hr_leave"/>
+    <field name="name">x_number_of_hours</field>
+    <field name="store" eval="True"/>
+    <field name="readonly" eval="True"/>
+    <field name="copied" eval="False"/>
+    <field name="ttype">float</field>
+    <field name="depends">number_of_hours_display</field>
+    <field name="compute">for leave in self:
+      leave['x_number_of_hours'] = round(leave.number_of_hours_display, 2)</field>ld>
+  </record>
+
+</odoo>
+
+```
+Source: [snippets/ir_model.hr_leave.x_number_of_hours.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/ir_model.hr_leave.x_number_of_hours.xml)
+
 ## Hr Payslip Line  
 ### X Code Name  
 ID: `mint_system.ir_model.hr_payslip_line.x_code_name`  
@@ -873,6 +937,29 @@ ID: `mint_system.ir_model.product_template.x_hide_on_delivery`
 ```
 Source: [snippets/ir_model.product_template.x_hide_on_delivery.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/ir_model.product_template.x_hide_on_delivery.xml)
 
+### X Hide On Sale Order  
+ID: `mint_system.ir_model.product_template.x_hide_on_sale_order`  
+```xml
+<?xml version='1.0' encoding='UTF-8' ?>
+<odoo>
+
+  <record id="x_hide_on_sale_order" model="ir.model.fields">
+    <field name="domain">[]</field>
+    <field name="field_description">Auf Verkaufsangebot ausblenden</field>
+    <field name="model">product.template</field>
+    <field name="model_id" ref="product.model_product_template"/>
+    <field name="name">x_hide_on_sale_order</field>
+    <field name="store" eval="True"/>
+    <field name="readonly" eval="False"/>
+    <field name="copied" eval="True"/>
+    <field name="ttype">boolean</field>
+  </record>
+
+</odoo>
+
+```
+Source: [snippets/ir_model.product_template.x_hide_on_sale_order.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/ir_model.product_template.x_hide_on_sale_order.xml)
+
 ### X Product Label  
 ID: `mint_system.ir_model.product_template.x_product_label`  
 ```xml
@@ -965,14 +1052,13 @@ ID: `mint_system.ir_model.project_task.x_business_requirement_id`
     <field name="name">x_business_requirement_id</field>
     <field name="state">manual</field>
     <field name="store" eval="True"/>
-    <field name="readonly" eval="False"/>
-    <field name="copied" eval="True"/>
+    <field name="readonly" eval="True"/>
+    <field name="copied" eval="False"/>
     <field name="ttype">many2one</field>
     <field name="relation">business.requirement</field>
-    <field name="depends">project_id,name</field>
-    <field name="compute">for record in self:
-  record['x_business_requirement_id'] = self.env['business.requirement'].search([('x_task_id', '=', record.id)], limit=1)
-    </field>
+    <field name="depends">project_id,name,partner_id</field>
+    <field name="compute">for rec in self:
+      rec['x_business_requirement_id'] = self.env['business.requirement'].search([('x_task_id', '=', rec.id)], limit=1)</field>
   </record>
 
 </odoo>
@@ -980,6 +1066,33 @@ ID: `mint_system.ir_model.project_task.x_business_requirement_id`
 ```
 Source: [snippets/ir_model.project_task.x_business_requirement_id.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/ir_model.project_task.x_business_requirement_id.xml)
 
+### X Lead Id  
+ID: `mint_system.ir_model.project_task.x_lead_id`  
+```xml
+<?xml version='1.0' encoding='UTF-8' ?>
+<odoo>
+
+  <record id="x_lead_id" model="ir.model.fields">
+    <field name="domain">[]</field>
+    <field name="field_description">Lead</field>
+    <field name="model">crm.lead</field>
+    <field name="model_id" ref="crm.model_crm_lead"/>
+    <field name="name">x_lead_id</field>
+    <field name="state">manual</field>
+    <field name="store" eval="True"/>
+    <field name="readonly" eval="True"/>
+    <field name="copied" eval="False"/>
+    <field name="ttype">many2one</field>
+    <field name="relation">crm.lead</field>
+    <field name="depends">project_id,name,partner_id</field>
+    <field name="compute">for rec in self:
+  rec['x_lead_id'] = self.env['crm.lead'].search([('x_task_id', '=', rec.id)], limit=1)</field>
+  </record>
+
+</odoo>
+```
+Source: [snippets/ir_model.project_task.x_lead_id.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/ir_model.project_task.x_lead_id.xml)
+
 ### X Vehicle Id  
 ID: `mint_system.ir_model.project_task.x_vehicle_id`  
 ```xml
@@ -1245,6 +1358,32 @@ ID: `mint_system.ir_model.res_partner.x_stock_move_ids`
 ```
 Source: [snippets/ir_model.res_partner.x_stock_move_ids.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/ir_model.res_partner.x_stock_move_ids.xml)
 
+## Sale Blanket Order Line  
+### X Product Uom Category Id  
+ID: `mint_system.ir_model.sale_blanket_order_line.x_product_uom_category_id`  
+```xml
+<?xml version='1.0' encoding='UTF-8' ?>
+<odoo>
+
+  <record id="x_product_uom_category_id" model="ir.model.fields">
+    <field name="domain">[]</field>
+    <field name="field_description">Kategorie</field>
+    <field name="model">sale.blanket.order.line</field>
+    <field name="model_id" ref="sale.model_sale_blanket_order_line"/>
+    <field name="name">x_product_uom_category_id</field>
+    <field name="store" eval="False"/>
+    <field name="readonly" eval="True"/>
+    <field name="copied" eval="False"/>
+    <field name="ttype">Many2One</field>
+    <field name="relation">uom.category</field>
+    <field name="related">product_id.uom_id.category_id</field>
+  </record>
+
+</odoo>
+
+```
+Source: [snippets/ir_model.sale_blanket_order_line.x_product_uom_category_id.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/ir_model.sale_blanket_order_line.x_product_uom_category_id.xml)
+
 ## Sale Order Line  
 ### X Categ Id  
 ID: `mint_system.ir_model.sale_order_line.x_categ_id`  
@@ -1511,7 +1650,7 @@ ID: `mint_system.ir_model.sale_order_line.x_weight_delivered`
     <field name="readonly" eval="True" />
     <field name="copied" eval="False" />
     <field name="ttype">float</field>
-    <field name="depends">qty_delivered</field>
+    <field name="depends">qty_delivered,product_id.weight</field>
     <field name="compute">for rec in self:
       rec['x_weight_delivered'] = rec.product_id.weight * rec.qty_delivered</field>
   </record>
@@ -1572,6 +1711,58 @@ ID: `mint_system.ir_model.sale_order.x_studio_description`
 ```
 Source: [snippets/ir_model.sale_order.x_studio_description.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/ir_model.sale_order.x_studio_description.xml)
 
+## Stock Location  
+### X Should Be Valued  
+ID: `mint_system.ir_model.stock_location.x_should_be_valued`  
+```xml
+<?xml version='1.0' encoding='UTF-8' ?>
+<odoo>
+
+  <record id="x_should_be_valued" model="ir.model.fields">
+    <field name="domain">[]</field>
+    <field name="field_description">Should be valued</field>
+    <field name="model">stock.location</field>
+    <field name="model_id" ref="stock.model_stock_location"/>
+    <field name="name">x_should_be_valued</field>
+    <field name="store" eval="False"/>
+    <field name="readonly" eval="True"/>
+    <field name="copied" eval="False"/>
+    <field name="ttype">boolean</field> 
+    <field name="depends">usage</field>
+    <field name="compute">for rec in self:
+      rec['x_should_be_valued'] = rec._should_be_valued()
+    </field>
+  </record>
+
+</odoo>
+```
+Source: [snippets/ir_model.stock_location.x_should_be_valued.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/ir_model.stock_location.x_should_be_valued.xml)
+
+## Stock Move Line  
+### X Position  
+ID: `mint_system.ir_model.stock_move_line.x_position`  
+```xml
+<?xml version='1.0' encoding='UTF-8' ?>
+<odoo>
+
+  <record id="x_position" model="ir.model.fields">
+    <field name="domain">[]</field>
+    <field name="field_description">Pos</field>
+    <field name="model">stock.move.line</field>
+    <field name="model_id" ref="stock.model_stock_move_line"/>
+    <field name="name">x_position</field>
+    <field name="store" eval="False"/>
+    <field name="readonly" eval="True"/>
+    <field name="copied" eval="False"/>
+    <field name="ttype">many2one</field>
+    <field name="relation">stock.move</field>
+    <field name="related">move_id</field>
+  </record>
+
+</odoo>
+```
+Source: [snippets/ir_model.stock_move_line.x_position.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/ir_model.stock_move_line.x_position.xml)
+
 ## Stock Move  
 ### X Count Boxes  
 ID: `mint_system.ir_model.stock_move.x_count_boxes`  
@@ -1898,3 +2089,37 @@ ID: `mint_system.ir_model.stock_quant.x_last_delivery_partner_id`
 ```
 Source: [snippets/ir_model.stock_quant.x_last_delivery_partner_id.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/ir_model.stock_quant.x_last_delivery_partner_id.xml)
 
+## Stock Valuation Layer  
+### X Quant Location Id  
+ID: `mint_system.ir_model.stock_valuation_layer.x_quant_location_id`  
+```xml
+<?xml version='1.0' encoding='UTF-8'?>
+<odoo>
+
+  <record id="x_quant_location_id" model="ir.model.fields">
+    <field name="domain">[]</field>
+    <field name="field_description">Lagerort Bestand</field>
+    <field name="model">stock.valuation.layer</field>
+    <field name="model_id" ref="stock.model_stock_valuation_layer" />
+    <field name="name">x_quant_location_id</field>
+    <field name="state">manual</field>
+    <field name="store" eval="True" />
+    <field name="readonly" eval="True" />
+    <field name="copied" eval="False" />
+    <field name="ttype">many2one</field>
+    <field name="relation">stock.location</field>
+    <field name="depends">stock_move_id.location_id,stock_move_id.location_dest_id</field>
+    <field name="compute">for record in self:
+      if (record.stock_move_id.picking_code == "outgoing"):
+        record['x_quant_location_id'] = record.stock_move_id.location_id.id
+      elif (record.stock_move_id.picking_code == "incoming"):
+        record['x_quant_location_id'] = record.stock_move_id.location_dest_id.id
+      else:
+        record['x_quant_location_id'] = record.stock_move_id.location_dest_id.id
+    </field>
+  </record>
+
+</odoo>
+```
+Source: [snippets/ir_model.stock_valuation_layer.x_quant_location_id.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/ir_model.stock_valuation_layer.x_quant_location_id.xml)
+
diff --git a/snippets/ir_model.product_template.x_hide_on_sale_order.xml b/snippets/ir_model.product_template.x_hide_on_sale_order.xml
new file mode 100644
index 00000000..37e8f216
--- /dev/null
+++ b/snippets/ir_model.product_template.x_hide_on_sale_order.xml
@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+<odoo>
+
+  <record id="x_hide_on_sale_order" model="ir.model.fields">
+    <field name="domain">[]</field>
+    <field name="field_description">Auf Verkaufsangebot ausblenden</field>
+    <field name="model">product.template</field>
+    <field name="model_id" ref="product.model_product_template"/>
+    <field name="name">x_hide_on_sale_order</field>
+    <field name="store" eval="True"/>
+    <field name="readonly" eval="False"/>
+    <field name="copied" eval="True"/>
+    <field name="ttype">boolean</field>
+  </record>
+
+</odoo>
diff --git a/snippets/ir_model.project_task.x_business_requirement_id.xml b/snippets/ir_model.project_task.x_business_requirement_id.xml
index 75b69a01..d8327982 100644
--- a/snippets/ir_model.project_task.x_business_requirement_id.xml
+++ b/snippets/ir_model.project_task.x_business_requirement_id.xml
@@ -9,14 +9,13 @@
     <field name="name">x_business_requirement_id</field>
     <field name="state">manual</field>
     <field name="store" eval="True"/>
-    <field name="readonly" eval="False"/>
-    <field name="copied" eval="True"/>
+    <field name="readonly" eval="True"/>
+    <field name="copied" eval="False"/>
     <field name="ttype">many2one</field>
     <field name="relation">business.requirement</field>
-    <field name="depends">project_id,name</field>
-    <field name="compute">for record in self:
-  record['x_business_requirement_id'] = self.env['business.requirement'].search([('x_task_id', '=', record.id)], limit=1)
-    </field>
+    <field name="depends">project_id,name,partner_id</field>
+    <field name="compute">for rec in self:
+      rec['x_business_requirement_id'] = self.env['business.requirement'].search([('x_task_id', '=', rec.id)], limit=1)</field>
   </record>
 
 </odoo>
diff --git a/snippets/ir_model.project_task.x_lead_id.xml b/snippets/ir_model.project_task.x_lead_id.xml
new file mode 100644
index 00000000..42b64b9d
--- /dev/null
+++ b/snippets/ir_model.project_task.x_lead_id.xml
@@ -0,0 +1,21 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+<odoo>
+
+  <record id="x_lead_id" model="ir.model.fields">
+    <field name="domain">[]</field>
+    <field name="field_description">Lead</field>
+    <field name="model">crm.lead</field>
+    <field name="model_id" ref="crm.model_crm_lead"/>
+    <field name="name">x_lead_id</field>
+    <field name="state">manual</field>
+    <field name="store" eval="True"/>
+    <field name="readonly" eval="True"/>
+    <field name="copied" eval="False"/>
+    <field name="ttype">many2one</field>
+    <field name="relation">crm.lead</field>
+    <field name="depends">project_id,name,partner_id</field>
+    <field name="compute">for rec in self:
+  rec['x_lead_id'] = self.env['crm.lead'].search([('x_task_id', '=', rec.id)], limit=1)</field>
+  </record>
+
+</odoo>
\ No newline at end of file
diff --git a/snippets/ir_model.sale_blanket_order_line.x_product_uom_category_id.xml b/snippets/ir_model.sale_blanket_order_line.x_product_uom_category_id.xml
new file mode 100644
index 00000000..7556bb43
--- /dev/null
+++ b/snippets/ir_model.sale_blanket_order_line.x_product_uom_category_id.xml
@@ -0,0 +1,18 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+<odoo>
+
+  <record id="x_product_uom_category_id" model="ir.model.fields">
+    <field name="domain">[]</field>
+    <field name="field_description">Kategorie</field>
+    <field name="model">sale.blanket.order.line</field>
+    <field name="model_id" ref="sale.model_sale_blanket_order_line"/>
+    <field name="name">x_product_uom_category_id</field>
+    <field name="store" eval="False"/>
+    <field name="readonly" eval="True"/>
+    <field name="copied" eval="False"/>
+    <field name="ttype">Many2One</field>
+    <field name="relation">uom.category</field>
+    <field name="related">product_id.uom_id.category_id</field>
+  </record>
+
+</odoo>
diff --git a/snippets/ir_model.sale_order_line.x_weight_delivered.xml b/snippets/ir_model.sale_order_line.x_weight_delivered.xml
index 4b93df58..8662dce2 100644
--- a/snippets/ir_model.sale_order_line.x_weight_delivered.xml
+++ b/snippets/ir_model.sale_order_line.x_weight_delivered.xml
@@ -11,7 +11,7 @@
     <field name="readonly" eval="True" />
     <field name="copied" eval="False" />
     <field name="ttype">float</field>
-    <field name="depends">qty_delivered</field>
+    <field name="depends">qty_delivered,product_id.weight</field>
     <field name="compute">for rec in self:
       rec['x_weight_delivered'] = rec.product_id.weight * rec.qty_delivered</field>
   </record>
diff --git a/snippets/ir_model.stock_location.x_should_be_valued.xml b/snippets/ir_model.stock_location.x_should_be_valued.xml
new file mode 100644
index 00000000..19258aa4
--- /dev/null
+++ b/snippets/ir_model.stock_location.x_should_be_valued.xml
@@ -0,0 +1,20 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+<odoo>
+
+  <record id="x_should_be_valued" model="ir.model.fields">
+    <field name="domain">[]</field>
+    <field name="field_description">Should be valued</field>
+    <field name="model">stock.location</field>
+    <field name="model_id" ref="stock.model_stock_location"/>
+    <field name="name">x_should_be_valued</field>
+    <field name="store" eval="False"/>
+    <field name="readonly" eval="True"/>
+    <field name="copied" eval="False"/>
+    <field name="ttype">boolean</field> 
+    <field name="depends">usage</field>
+    <field name="compute">for rec in self:
+      rec['x_should_be_valued'] = rec._should_be_valued()
+    </field>
+  </record>
+
+</odoo>
\ No newline at end of file
diff --git a/snippets/ir_model.stock_valuation_layer.x_quant_location_id.xml b/snippets/ir_model.stock_valuation_layer.x_quant_location_id.xml
new file mode 100644
index 00000000..1b438635
--- /dev/null
+++ b/snippets/ir_model.stock_valuation_layer.x_quant_location_id.xml
@@ -0,0 +1,27 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<odoo>
+
+  <record id="x_quant_location_id" model="ir.model.fields">
+    <field name="domain">[]</field>
+    <field name="field_description">Lagerort Bestand</field>
+    <field name="model">stock.valuation.layer</field>
+    <field name="model_id" ref="stock.model_stock_valuation_layer" />
+    <field name="name">x_quant_location_id</field>
+    <field name="state">manual</field>
+    <field name="store" eval="True" />
+    <field name="readonly" eval="True" />
+    <field name="copied" eval="False" />
+    <field name="ttype">many2one</field>
+    <field name="relation">stock.location</field>
+    <field name="depends">stock_move_id.location_id,stock_move_id.location_dest_id</field>
+    <field name="compute">for record in self:
+      if (record.stock_move_id.picking_code == "outgoing"):
+        record['x_quant_location_id'] = record.stock_move_id.location_id.id
+      elif (record.stock_move_id.picking_code == "incoming"):
+        record['x_quant_location_id'] = record.stock_move_id.location_dest_id.id
+      else:
+        record['x_quant_location_id'] = record.stock_move_id.location_dest_id.id
+    </field>
+  </record>
+
+</odoo>
\ No newline at end of file
diff --git a/snippets/l10n_ch.l10n_ch_swissqr_template.add_title_padding.xml b/snippets/l10n_ch.l10n_ch_swissqr_template.add_title_padding.xml
new file mode 100644
index 00000000..1b097123
--- /dev/null
+++ b/snippets/l10n_ch.l10n_ch_swissqr_template.add_title_padding.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<data inherit_id="l10n_ch.l10n_ch_swissqr_template" priority="50">
+
+     <xpath expr="//div[@class='swissqr_page_title']" position="before">
+          <style>
+          .swissqr_page_title {
+            padding-top: 200px;
+          }
+          </style>
+     </xpath>
+
+</data>
\ No newline at end of file
diff --git a/snippets/l10n_ch.md b/snippets/l10n_ch.md
index 46fe9cc7..530fc948 100644
--- a/snippets/l10n_ch.md
+++ b/snippets/l10n_ch.md
@@ -18,6 +18,24 @@ ID: `mint_system.l10n_ch.isr_invoice_form.disable_print_buttons`
 Source: [snippets/l10n_ch.isr_invoice_form.disable_print_buttons.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/l10n_ch.isr_invoice_form.disable_print_buttons.xml)
 
 ## L10n Ch Swissqr Template  
+### Add Title Padding  
+ID: `mint_system.l10n_ch.l10n_ch_swissqr_template.add_title_padding`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="l10n_ch.l10n_ch_swissqr_template" priority="50">
+
+     <xpath expr="//div[@class='swissqr_page_title']" position="before">
+          <style>
+          .swissqr_page_title {
+            padding-top: 200px;
+          }
+          </style>
+     </xpath>
+
+</data>
+```
+Source: [snippets/l10n_ch.l10n_ch_swissqr_template.add_title_padding.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/l10n_ch.l10n_ch_swissqr_template.add_title_padding.xml)
+
 ### Modify Header Style  
 ID: `mint_system.l10n_ch.l10n_ch_swissqr_template.modify_header_style`  
 ```xml
diff --git a/snippets/mail.mail_notification_light.debrand.xml b/snippets/mail.mail_notification_light.debrand.xml
new file mode 100644
index 00000000..2db46789
--- /dev/null
+++ b/snippets/mail.mail_notification_light.debrand.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<data inherit_id="mail.mail_notification_light" priority="50">
+
+  <xpath expr="//t[1]/table[1]/tr[2]" position="replace" />
+
+</data>
diff --git a/snippets/mail.mail_notification_light.set_model_name.xml b/snippets/mail.mail_notification_light.set_model_name.xml
new file mode 100644
index 00000000..1e584f44
--- /dev/null
+++ b/snippets/mail.mail_notification_light.set_model_name.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<data inherit_id="mail.mail_notification_light" priority="60">
+
+  <xpath expr="//span[1]" position="replace">
+    <span style="font-size: 10px;"><t t-esc="model_description or 'document'"/></span><br/>
+  </xpath>
+  
+</data>
\ No newline at end of file
diff --git a/snippets/mail.mail_notification_paynow.set_model_name.xml b/snippets/mail.mail_notification_paynow.set_model_name.xml
new file mode 100644
index 00000000..47bd3d44
--- /dev/null
+++ b/snippets/mail.mail_notification_paynow.set_model_name.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<data inherit_id="mail.mail_notification_paynow" priority="60">
+
+  <xpath expr="//td[1]/span[1]" position="replace">
+    <span style="font-size: 10px;"><t t-esc="model_description or 'document'"/></span><br/>
+  </xpath>
+  
+</data>
\ No newline at end of file
diff --git a/snippets/mail.md b/snippets/mail.md
index 9db83862..7adaaeb3 100644
--- a/snippets/mail.md
+++ b/snippets/mail.md
@@ -138,6 +138,19 @@ ID: `mint_system.mail.mail_notification_light.align_left`
 ```
 Source: [snippets/mail.mail_notification_light.align_left.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/mail.mail_notification_light.align_left.xml)
 
+### Debrand  
+ID: `mint_system.mail.mail_notification_light.debrand`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="mail.mail_notification_light" priority="50">
+
+  <xpath expr="//t[1]/table[1]/tr[2]" position="replace" />
+
+</data>
+
+```
+Source: [snippets/mail.mail_notification_light.debrand.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/mail.mail_notification_light.debrand.xml)
+
 ### Reduce To Content  
 ID: `mint_system.mail.mail_notification_light.reduce_to_content`  
 ```xml
@@ -207,6 +220,20 @@ ID: `mint_system.mail.mail_notification_light.replace_footer`
 ```
 Source: [snippets/mail.mail_notification_light.replace_footer.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/mail.mail_notification_light.replace_footer.xml)
 
+### Set Model Name  
+ID: `mint_system.mail.mail_notification_light.set_model_name`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="mail.mail_notification_light" priority="60">
+
+  <xpath expr="//span[1]" position="replace">
+    <span style="font-size: 10px;"><t t-esc="model_description or 'document'"/></span><br/>
+  </xpath>
+  
+</data>
+```
+Source: [snippets/mail.mail_notification_light.set_model_name.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/mail.mail_notification_light.set_model_name.xml)
+
 ### White Background  
 ID: `mint_system.mail.mail_notification_light.white_background`  
 ```xml
@@ -320,6 +347,20 @@ ID: `mint_system.mail.mail_notification_paynow.replace_footer`
 ```
 Source: [snippets/mail.mail_notification_paynow.replace_footer.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/mail.mail_notification_paynow.replace_footer.xml)
 
+### Set Model Name  
+ID: `mint_system.mail.mail_notification_paynow.set_model_name`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="mail.mail_notification_paynow" priority="60">
+
+  <xpath expr="//td[1]/span[1]" position="replace">
+    <span style="font-size: 10px;"><t t-esc="model_description or 'document'"/></span><br/>
+  </xpath>
+  
+</data>
+```
+Source: [snippets/mail.mail_notification_paynow.set_model_name.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/mail.mail_notification_paynow.set_model_name.xml)
+
 ### White Background  
 ID: `mint_system.mail.mail_notification_paynow.white_background`  
 ```xml
@@ -368,3 +409,22 @@ ID: `mint_system.mail.message_activity_assigned.remove_access_link`
 ```
 Source: [snippets/mail.message_activity_assigned.remove_access_link.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/mail.message_activity_assigned.remove_access_link.xml)
 
+### Set Access Link My Activities  
+ID: `mint_system.mail.message_activity_assigned.set_access_link_my_activities`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="mail.message_activity_assigned" priority="50">
+
+  <xpath expr="//p[1]" position="replace">
+    <p style="margin: 16px 0px 16px 0px;">
+      <a href="/web?debug=1#action=365&amp;model=mail.activity&amp;view_type=kanban&amp;cids=1&amp;menu_id=1" style="background-color:#875A7B; padding: 8px 16px 8px 16px; text-decoration: none; color: #fff; border-radius: 5px;">
+        My Activities
+        <!-- Meine Aktivitäten -->
+      </a>
+    </p>
+  </xpath>
+
+</data>
+```
+Source: [snippets/mail.message_activity_assigned.set_access_link_my_activities.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/mail.message_activity_assigned.set_access_link_my_activities.xml)
+
diff --git a/snippets/mail.message_activity_assigned.set_access_link_my_activities.xml b/snippets/mail.message_activity_assigned.set_access_link_my_activities.xml
new file mode 100644
index 00000000..c736e013
--- /dev/null
+++ b/snippets/mail.message_activity_assigned.set_access_link_my_activities.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<data inherit_id="mail.message_activity_assigned" priority="50">
+
+  <xpath expr="//p[1]" position="replace">
+    <p style="margin: 16px 0px 16px 0px;">
+      <a href="/web?debug=1#action=365&amp;model=mail.activity&amp;view_type=kanban&amp;cids=1&amp;menu_id=1" style="background-color:#875A7B; padding: 8px 16px 8px 16px; text-decoration: none; color: #fff; border-radius: 5px;">
+        My Activities
+        <!-- Meine Aktivitäten -->
+      </a>
+    </p>
+  </xpath>
+
+</data>
\ No newline at end of file
diff --git a/snippets/mrp.label_production_view_pdf.trimada.xml b/snippets/mrp.label_production_view_pdf.trimada.xml
index 252d4a31..63bbb8c1 100644
--- a/snippets/mrp.label_production_view_pdf.trimada.xml
+++ b/snippets/mrp.label_production_view_pdf.trimada.xml
@@ -19,7 +19,7 @@
               font-weight: bold;
               text-align: center;
               border-bottom: solid 1px;
-              line-height: 30mm;
+              line-height: 1;
           }
           .description {
               font-size: 9mm;
@@ -64,7 +64,7 @@
         <div class="page">
           <div class="label">
             <div class="row title">
-              <div class="col-6">
+              <div class="col-6 box">
                 <span t-esc="move.product_id.default_code"/>
               </div>
               <div t-if="move.product_id.barcode" class="col-6 box text-right">
diff --git a/snippets/mrp.md b/snippets/mrp.md
index 02018fee..781cfeff 100644
--- a/snippets/mrp.md
+++ b/snippets/mrp.md
@@ -248,7 +248,7 @@ ID: `mint_system.mrp.label_production_view_pdf.trimada`
               font-weight: bold;
               text-align: center;
               border-bottom: solid 1px;
-              line-height: 30mm;
+              line-height: 1;
           }
           .description {
               font-size: 9mm;
@@ -293,7 +293,7 @@ ID: `mint_system.mrp.label_production_view_pdf.trimada`
         <div class="page">
           <div class="label">
             <div class="row title">
-              <div class="col-6">
+              <div class="col-6 box">
                 <span t-esc="move.product_id.default_code"/>
               </div>
               <div t-if="move.product_id.barcode" class="col-6 box text-right">
diff --git a/snippets/product.md b/snippets/product.md
index fb7fca82..78757e70 100644
--- a/snippets/product.md
+++ b/snippets/product.md
@@ -2,6 +2,48 @@
 prev: ./snippets.md
 ---
 # Product
+## Product Normal Form View  
+### Add Feeder Id  
+ID: `mint_system.product.product_normal_form_view.add_feeder_id`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="product.product_normal_form_view" priority="50">
+
+    <xpath expr="//page[@name='general_information']//field[@name='categ_id']" position="after">
+     <field name="feeder_id"/>
+    </xpath>
+</data>
+```
+Source: [snippets/product.product_normal_form_view.add_feeder_id.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/product.product_normal_form_view.add_feeder_id.xml)
+
+### Hide Default Code  
+ID: `mint_system.product.product_normal_form_view.hide_default_code`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="product.product_normal_form_view" priority="50">
+
+    <xpath expr="//page[@name='general_information']//field[@name='default_code']" position="replace"/>
+
+</data>
+```
+Source: [snippets/product.product_normal_form_view.hide_default_code.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/product.product_normal_form_view.hide_default_code.xml)
+
+### Relocate Barcode  
+ID: `mint_system.product.product_normal_form_view.relocate_barcode`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="product.product_normal_form_view" priority="50">
+
+    <xpath expr="//page[@name='general_information']//field[@name='barcode']" position="replace"/>
+
+    <xpath expr="//page[@name='general_information']//field[@name='categ_id']" position="after">
+        <field name="barcode"/>
+    </xpath>
+
+</data>
+```
+Source: [snippets/product.product_normal_form_view.relocate_barcode.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/product.product_normal_form_view.relocate_barcode.xml)
+
 ## Product Normal Only Form View  
 ### Add X Product Label  
 ID: `mint_system.product.product_normal_only_form_view.add_x_product_label`  
@@ -318,6 +360,20 @@ ID: `mint_system.product.product_template_only_form_view.x_hide_on_delivery`
 ```
 Source: [snippets/product.product_template_only_form_view.x_hide_on_delivery.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/product.product_template_only_form_view.x_hide_on_delivery.xml)
 
+### X Hide On Sale Order  
+ID: `mint_system.product.product_template_only_form_view.x_hide_on_sale_order`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="product.product_template_only_form_view" priority="50">
+
+    <field name="description_sale" position="after">
+        <field name="x_hide_on_sale_order" widget="boolean_toggle" />
+    </field>
+
+</data>
+```
+Source: [snippets/product.product_template_only_form_view.x_hide_on_sale_order.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/product.product_template_only_form_view.x_hide_on_sale_order.xml)
+
 ### X Storage Temperature  
 ID: `mint_system.product.product_template_only_form_view.x_storage_temperature`  
 ```xml
@@ -348,6 +404,20 @@ ID: `mint_system.product.product_template_search_view.add_type_description`
 ```
 Source: [snippets/product.product_template_search_view.add_type_description.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/product.product_template_search_view.add_type_description.xml)
 
+### Modify Name  
+ID: `mint_system.product.product_template_search_view.modify_name`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="product.product_template_search_view" priority="50">
+
+  <xpath expr="//field[@name='name']" position="replace">
+    <field name="name" string="Product" filter_domain="['|', '|', '|', '|','|',('default_code', 'ilike', self), ('product_variant_ids.default_code', 'ilike', self),('name', 'ilike', self), ('barcode', 'ilike', self), ('type_description', 'ilike', self), ('type_description2', 'ilike', self)]"/>
+  </xpath>
+
+</data>
+```
+Source: [snippets/product.product_template_search_view.modify_name.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/product.product_template_search_view.modify_name.xml)
+
 ## Product Template Tree View  
 ### Add Default Code And Type Description  
 ID: `mint_system.product.product_template_tree_view.add_default_code_and_type_description`  
@@ -482,6 +552,7 @@ ID: `mint_system.product.report_producttemplatelabel.trimada`
             font-weight: bold;
             text-align: center;
             border-bottom: solid 1px;
+            line-height: 1;
         }
         .frame {
             border-bottom: solid 1px;
@@ -522,7 +593,7 @@ ID: `mint_system.product.report_producttemplatelabel.trimada`
         <div class="page">
           <div class="label">
             <div class="row title">
-              <div class="col-6 box1">
+              <div class="col-6 box2">
                 <span t-esc="product.default_code"/>
               </div>
               <div t-if="product.barcode" class="col-6 box2 text-right">
diff --git a/snippets/product.product_normal_form_view.add_feeder_id.xml b/snippets/product.product_normal_form_view.add_feeder_id.xml
new file mode 100644
index 00000000..a764461c
--- /dev/null
+++ b/snippets/product.product_normal_form_view.add_feeder_id.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<data inherit_id="product.product_normal_form_view" priority="50">
+
+    <xpath expr="//page[@name='general_information']//field[@name='categ_id']" position="after">
+     <field name="feeder_id"/>
+    </xpath>
+</data>
\ No newline at end of file
diff --git a/snippets/product.product_normal_form_view.hide_default_code.xml b/snippets/product.product_normal_form_view.hide_default_code.xml
new file mode 100644
index 00000000..3c4f71a6
--- /dev/null
+++ b/snippets/product.product_normal_form_view.hide_default_code.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<data inherit_id="product.product_normal_form_view" priority="50">
+
+    <xpath expr="//page[@name='general_information']//field[@name='default_code']" position="replace"/>
+
+</data>
\ No newline at end of file
diff --git a/snippets/product.product_normal_form_view.relocate_barcode.xml b/snippets/product.product_normal_form_view.relocate_barcode.xml
new file mode 100644
index 00000000..b9af9e69
--- /dev/null
+++ b/snippets/product.product_normal_form_view.relocate_barcode.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<data inherit_id="product.product_normal_form_view" priority="50">
+
+    <xpath expr="//page[@name='general_information']//field[@name='barcode']" position="replace"/>
+
+    <xpath expr="//page[@name='general_information']//field[@name='categ_id']" position="after">
+        <field name="barcode"/>
+    </xpath>
+
+</data>
\ No newline at end of file
diff --git a/snippets/product.product_template_only_form_view.x_hide_on_sale_order.xml b/snippets/product.product_template_only_form_view.x_hide_on_sale_order.xml
new file mode 100644
index 00000000..cc1fa3be
--- /dev/null
+++ b/snippets/product.product_template_only_form_view.x_hide_on_sale_order.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<data inherit_id="product.product_template_only_form_view" priority="50">
+
+    <field name="description_sale" position="after">
+        <field name="x_hide_on_sale_order" widget="boolean_toggle" />
+    </field>
+
+</data>
\ No newline at end of file
diff --git a/snippets/product.product_template_search_view.modify_name.xml b/snippets/product.product_template_search_view.modify_name.xml
new file mode 100644
index 00000000..de053cf5
--- /dev/null
+++ b/snippets/product.product_template_search_view.modify_name.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<data inherit_id="product.product_template_search_view" priority="50">
+
+  <xpath expr="//field[@name='name']" position="replace">
+    <field name="name" string="Product" filter_domain="['|', '|', '|', '|','|',('default_code', 'ilike', self), ('product_variant_ids.default_code', 'ilike', self),('name', 'ilike', self), ('barcode', 'ilike', self), ('type_description', 'ilike', self), ('type_description2', 'ilike', self)]"/>
+  </xpath>
+
+</data>
\ No newline at end of file
diff --git a/snippets/product.report_producttemplatelabel.trimada.xml b/snippets/product.report_producttemplatelabel.trimada.xml
index 0c44465a..0d09f76f 100644
--- a/snippets/product.report_producttemplatelabel.trimada.xml
+++ b/snippets/product.report_producttemplatelabel.trimada.xml
@@ -21,6 +21,7 @@
             font-weight: bold;
             text-align: center;
             border-bottom: solid 1px;
+            line-height: 1;
         }
         .frame {
             border-bottom: solid 1px;
@@ -61,7 +62,7 @@
         <div class="page">
           <div class="label">
             <div class="row title">
-              <div class="col-6 box1">
+              <div class="col-6 box2">
                 <span t-esc="product.default_code"/>
               </div>
               <div t-if="product.barcode" class="col-6 box2 text-right">
diff --git a/snippets/project.md b/snippets/project.md
index d425e7fd..5b3fa9d1 100644
--- a/snippets/project.md
+++ b/snippets/project.md
@@ -50,6 +50,83 @@ ID: `mint_system.project.view_task_form2.parent_domain`
 ```
 Source: [snippets/project.view_task_form2.parent_domain.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/project.view_task_form2.parent_domain.xml)
 
+### Remove Timer Buttons  
+ID: `mint_system.project.view_task_form2.remove_timer_buttons`  
+```xml
+<?xml version="1.0"?>
+
+<data inherit_id="project.view_task_form2" priority="50">
+
+  <button name="action_timer_start" position="replace"/>
+  <button name="action_timer_stop" position="replace"/>
+  <button name="action_timer_pause" position="replace"/>
+  <button name="action_timer_resume" position="replace"/>
+
+</data>
+
+```
+Source: [snippets/project.view_task_form2.remove_timer_buttons.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/project.view_task_form2.remove_timer_buttons.xml)
+
+### Show Allow Timesheets  
+ID: `mint_system.project.view_task_form2.show_allow_timesheets`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="project.view_task_form2" priority="50">
+
+  <xpath expr="//field[@name='analytic_account_id']" position="after">
+    <field name="allow_timesheets"/>
+  </xpath>
+
+</data>
+
+```
+Source: [snippets/project.view_task_form2.show_allow_timesheets.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/project.view_task_form2.show_allow_timesheets.xml)
+
+### Show Analytic Account Active  
+ID: `mint_system.project.view_task_form2.show_analytic_account_active`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="project.view_task_form2" priority="50">
+
+  <xpath expr="//field[@name='analytic_account_id']" position="after">
+    <field name="analytic_account_active"/>
+  </xpath>
+
+</data>
+
+```
+Source: [snippets/project.view_task_form2.show_analytic_account_active.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/project.view_task_form2.show_analytic_account_active.xml)
+
+### Show Display Timesheet Timer  
+ID: `mint_system.project.view_task_form2.show_display_timesheet_timer`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="project.view_task_form2" priority="50">
+
+  <xpath expr="//field[@name='analytic_account_id']" position="after">
+    <field name="display_timesheet_timer"/>
+  </xpath>
+
+</data>
+
+```
+Source: [snippets/project.view_task_form2.show_display_timesheet_timer.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/project.view_task_form2.show_display_timesheet_timer.xml)
+
+### Show Encode Uom In Days  
+ID: `mint_system.project.view_task_form2.show_encode_uom_in_days`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="project.view_task_form2" priority="50">
+
+  <xpath expr="//field[@name='analytic_account_id']" position="after">
+    <field name="encode_uom_in_days"/>
+  </xpath>
+
+</data>
+
+```
+Source: [snippets/project.view_task_form2.show_encode_uom_in_days.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/project.view_task_form2.show_encode_uom_in_days.xml)
+
 ### Show Gantt Dates  
 ID: `mint_system.project.view_task_form2.show_gantt_dates`  
 ```xml
@@ -133,6 +210,21 @@ ID: `mint_system.project.view_task_form2.x_business_requirement_id`
 ```
 Source: [snippets/project.view_task_form2.x_business_requirement_id.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/project.view_task_form2.x_business_requirement_id.xml)
 
+### X Lead Id  
+ID: `mint_system.project.view_task_form2.x_lead_id`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="project.view_task_form2" priority="50">
+
+	<field name="partner_id" position="before">
+	   <field name="x_lead_id" attrs="{'invisible': [('x_lead_id','=', False)]}" />
+  </field>
+
+</data>
+
+```
+Source: [snippets/project.view_task_form2.x_lead_id.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/project.view_task_form2.x_lead_id.xml)
+
 ### X Vehicle Id  
 ID: `mint_system.project.view_task_form2.x_vehicle_id`  
 ```xml
diff --git a/snippets/project.view_task_form2.remove_timer_buttons.xml b/snippets/project.view_task_form2.remove_timer_buttons.xml
new file mode 100644
index 00000000..22853354
--- /dev/null
+++ b/snippets/project.view_task_form2.remove_timer_buttons.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+
+<data inherit_id="project.view_task_form2" priority="50">
+
+  <button name="action_timer_start" position="replace"/>
+  <button name="action_timer_stop" position="replace"/>
+  <button name="action_timer_pause" position="replace"/>
+  <button name="action_timer_resume" position="replace"/>
+
+</data>
diff --git a/snippets/project.view_task_form2.show_allow_timesheets.xml b/snippets/project.view_task_form2.show_allow_timesheets.xml
new file mode 100644
index 00000000..20bf49de
--- /dev/null
+++ b/snippets/project.view_task_form2.show_allow_timesheets.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<data inherit_id="project.view_task_form2" priority="50">
+
+  <xpath expr="//field[@name='analytic_account_id']" position="after">
+    <field name="allow_timesheets"/>
+  </xpath>
+
+</data>
diff --git a/snippets/project.view_task_form2.show_analytic_account_active.xml b/snippets/project.view_task_form2.show_analytic_account_active.xml
new file mode 100644
index 00000000..aa65c1ec
--- /dev/null
+++ b/snippets/project.view_task_form2.show_analytic_account_active.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<data inherit_id="project.view_task_form2" priority="50">
+
+  <xpath expr="//field[@name='analytic_account_id']" position="after">
+    <field name="analytic_account_active"/>
+  </xpath>
+
+</data>
diff --git a/snippets/project.view_task_form2.show_display_timesheet_timer.xml b/snippets/project.view_task_form2.show_display_timesheet_timer.xml
new file mode 100644
index 00000000..bf17ae67
--- /dev/null
+++ b/snippets/project.view_task_form2.show_display_timesheet_timer.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<data inherit_id="project.view_task_form2" priority="50">
+
+  <xpath expr="//field[@name='analytic_account_id']" position="after">
+    <field name="display_timesheet_timer"/>
+  </xpath>
+
+</data>
diff --git a/snippets/project.view_task_form2.show_encode_uom_in_days.xml b/snippets/project.view_task_form2.show_encode_uom_in_days.xml
new file mode 100644
index 00000000..0abcfdf1
--- /dev/null
+++ b/snippets/project.view_task_form2.show_encode_uom_in_days.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<data inherit_id="project.view_task_form2" priority="50">
+
+  <xpath expr="//field[@name='analytic_account_id']" position="after">
+    <field name="encode_uom_in_days"/>
+  </xpath>
+
+</data>
diff --git a/snippets/project.view_task_form2.x_lead_id.xml b/snippets/project.view_task_form2.x_lead_id.xml
new file mode 100644
index 00000000..4adb61a3
--- /dev/null
+++ b/snippets/project.view_task_form2.x_lead_id.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<data inherit_id="project.view_task_form2" priority="50">
+
+	<field name="partner_id" position="before">
+	   <field name="x_lead_id" attrs="{'invisible': [('x_lead_id','=', False)]}" />
+  </field>
+
+</data>
diff --git a/snippets/purchase.md b/snippets/purchase.md
index b641a206..08a9ff47 100644
--- a/snippets/purchase.md
+++ b/snippets/purchase.md
@@ -33,6 +33,21 @@ ID: `mint_system.purchase.mail_notification_confirm.modify_buttons`
 Source: [snippets/purchase.mail_notification_confirm.modify_buttons.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/purchase.mail_notification_confirm.modify_buttons.xml)
 
 ## Purchase Order Form  
+### Add Qty To Invoice  
+ID: `mint_system.purchase.purchase_order_form.add_qty_to_invoice`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="purchase.purchase_order_form" priority="50">
+
+  <xpath expr="//page[@name='products']//tree/field[@name='date_planned']" position="after">
+    <field name="qty_to_invoice" optional="hide"/>
+  </xpath>
+
+</data>
+
+```
+Source: [snippets/purchase.purchase_order_form.add_qty_to_invoice.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/purchase.purchase_order_form.add_qty_to_invoice.xml)
+
 ### Add X Comment  
 ID: `mint_system.purchase.purchase_order_form.add_x_comment`  
 ```xml
@@ -459,58 +474,66 @@ ID: `mint_system.purchase.report_purchaseorder_document.add_infotable`
       width: 100%;
       margin-bottom: 25px;
       font-size: 9pt;
+      font-family: arial;
     }
-      table#info tr {
+     table#info tr {
       line-height: 1.2;
       text-align: left;
     }
-       .note {
-        font-size: 9pt;
+    .note {
+      font-size: 9pt;
     }
     </style>
     <table id='info'>
       <tr>
-        <td width="17%">Bestelldatum</td>
-        <td width="44%">
+        <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>
+            <span t-field='o.date_order' t-options='{ "widget": "date" }'/>
+          </t>
         </td>
-        <td width="14%"></td>
-        <td width="25%"></td>
-      </tr>
-
-      <tr>
-        <td>Kunden-Nr.</td>
-        <td>
-          <span t-field='o.partner_id.ref'/>
-        </td>
-        <td></td>
-        <td></td>
-      </tr>
-      <tr>
-        <td></td>
-        <td>
-          <span t-field='o.partner_ref'/>
-        </td>
-        <td>U/Referenz</td>
-        <td>
+        <td width="18%">Our Reference</td>
+        <td width="25%">
           <span t-field='o.user_id'/>
         </td>
       </tr>
       <tr>
-        <td>Referenz</td>
+        <td>Customer No.</td>
         <td>
-          <span t-field='o.comment'/>
+          <span t-field='o.partner_id.ref'/>
         </td>
-        <td>Lieferkondition</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;'">
@@ -1223,8 +1246,8 @@ ID: `mint_system.purchase.report_purchasequotation_document.add_infotable`
 <?xml version="1.0"?>
 <data inherit_id="purchase.report_purchasequotation_document" priority="50">
 
-    <xpath expr="//h2" position="after">
-        <style>
+  <xpath expr="//h2" position="after">
+    <style>
       table#info {
         width: 100%;
         margin-bottom: 25px;
@@ -1238,49 +1261,61 @@ ID: `mint_system.purchase.report_purchasequotation_document.add_infotable`
         .note {
         font-size: 9pt;
       }
-        </style>
-        <table id='info'>
-            <tr>
-                <td width="17%">Date</td>
-                <td width="44%">
-                    <span t-field='o.ordering_date' t-options='{ "widget": "date" }'/>
-                </td>
-                <td width="14%"></td>
-                <td width="25%"></td>
-            </tr>
-            <tr>
-                <td>Customer No.</td>
-                <td>
-                    <span t-field='o.vendor_id.ref'/>
-                </td>
-                <td></td>
-                <td></td>
-            </tr>
-            <tr>
-                <td></td>
-                <td>
-                    <span t-field='o.partner_ref'/>
-                </td>
-                <td>Our Reference</td>
-                <td>
-                    <span t-field='o.user_id'/>
-                </td>
-            </tr>
-            <tr>
-                <td>Reference</td>
-                <td>
-                    <span t-field='o.comment'/>
-                </td>
-                <td>Incoterm</td>
-                <td>
-                    <span t-field='o.incoterm_id'/>
-                </td>
-            </tr>
-        </table>
+    </style>
+    <table id='info'>
+      <tr>
+        <td width="17%">Order Deadline</td>
+        <td width="40%">
+          <span t-field='o.date_order' t-options='{ "widget": "date" }'/>
+        </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>
 
-    </xpath>
+        <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>
 
-</data>
+      </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_purchasequotation_document.add_infotable.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/purchase.report_purchasequotation_document.add_infotable.xml)
 
diff --git a/snippets/purchase.purchase_order_form.add_qty_to_invoice.xml b/snippets/purchase.purchase_order_form.add_qty_to_invoice.xml
new file mode 100644
index 00000000..3d63cf03
--- /dev/null
+++ b/snippets/purchase.purchase_order_form.add_qty_to_invoice.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<data inherit_id="purchase.purchase_order_form" priority="50">
+
+  <xpath expr="//page[@name='products']//tree/field[@name='date_planned']" position="after">
+    <field name="qty_to_invoice" optional="hide"/>
+  </xpath>
+
+</data>
diff --git a/snippets/purchase.report_purchaseorder_document.add_infotable.xml b/snippets/purchase.report_purchaseorder_document.add_infotable.xml
index 043707cc..1f864ef5 100644
--- a/snippets/purchase.report_purchaseorder_document.add_infotable.xml
+++ b/snippets/purchase.report_purchaseorder_document.add_infotable.xml
@@ -7,58 +7,66 @@
       width: 100%;
       margin-bottom: 25px;
       font-size: 9pt;
+      font-family: arial;
     }
-      table#info tr {
+     table#info tr {
       line-height: 1.2;
       text-align: left;
     }
-       .note {
-        font-size: 9pt;
+    .note {
+      font-size: 9pt;
     }
     </style>
     <table id='info'>
       <tr>
-        <td width="17%">Bestelldatum</td>
-        <td width="44%">
+        <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>
+            <span t-field='o.date_order' t-options='{ "widget": "date" }'/>
+          </t>
         </td>
-        <td width="14%"></td>
-        <td width="25%"></td>
-      </tr>
-
-      <tr>
-        <td>Kunden-Nr.</td>
-        <td>
-          <span t-field='o.partner_id.ref'/>
-        </td>
-        <td></td>
-        <td></td>
-      </tr>
-      <tr>
-        <td></td>
-        <td>
-          <span t-field='o.partner_ref'/>
-        </td>
-        <td>U/Referenz</td>
-        <td>
+        <td width="18%">Our Reference</td>
+        <td width="25%">
           <span t-field='o.user_id'/>
         </td>
       </tr>
       <tr>
-        <td>Referenz</td>
+        <td>Customer No.</td>
         <td>
-          <span t-field='o.comment'/>
+          <span t-field='o.partner_id.ref'/>
         </td>
-        <td>Lieferkondition</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;'">
diff --git a/snippets/purchase.report_purchasequotation_document.add_infotable.xml b/snippets/purchase.report_purchasequotation_document.add_infotable.xml
index a35845e3..bdaaab54 100644
--- a/snippets/purchase.report_purchasequotation_document.add_infotable.xml
+++ b/snippets/purchase.report_purchasequotation_document.add_infotable.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <data inherit_id="purchase.report_purchasequotation_document" priority="50">
 
-    <xpath expr="//h2" position="after">
-        <style>
+  <xpath expr="//h2" position="after">
+    <style>
       table#info {
         width: 100%;
         margin-bottom: 25px;
@@ -16,46 +16,58 @@
         .note {
         font-size: 9pt;
       }
-        </style>
-        <table id='info'>
-            <tr>
-                <td width="17%">Date</td>
-                <td width="44%">
-                    <span t-field='o.ordering_date' t-options='{ "widget": "date" }'/>
-                </td>
-                <td width="14%"></td>
-                <td width="25%"></td>
-            </tr>
-            <tr>
-                <td>Customer No.</td>
-                <td>
-                    <span t-field='o.vendor_id.ref'/>
-                </td>
-                <td></td>
-                <td></td>
-            </tr>
-            <tr>
-                <td></td>
-                <td>
-                    <span t-field='o.partner_ref'/>
-                </td>
-                <td>Our Reference</td>
-                <td>
-                    <span t-field='o.user_id'/>
-                </td>
-            </tr>
-            <tr>
-                <td>Reference</td>
-                <td>
-                    <span t-field='o.comment'/>
-                </td>
-                <td>Incoterm</td>
-                <td>
-                    <span t-field='o.incoterm_id'/>
-                </td>
-            </tr>
-        </table>
+    </style>
+    <table id='info'>
+      <tr>
+        <td width="17%">Order Deadline</td>
+        <td width="40%">
+          <span t-field='o.date_order' t-options='{ "widget": "date" }'/>
+        </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>
 
-    </xpath>
+        <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>
 
-</data>
\ No newline at end of file
+      </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>  
\ No newline at end of file
diff --git a/snippets/purchase_requisition.md b/snippets/purchase_requisition.md
index 7d0ec297..b9a0410b 100644
--- a/snippets/purchase_requisition.md
+++ b/snippets/purchase_requisition.md
@@ -24,17 +24,34 @@ ID: `mint_system.purchase_requisition.report_purchaserequisitions.add_address_bl
 <?xml version="1.0"?>
 <data inherit_id="purchase_requisition.report_purchaserequisitions" priority="50">
 
-  <xpath expr="//t/div/div[1]" position="after">
-    <div class="row address">
-      <div class="col-5"/>
-      <div class="col-5 offset-2" id="address_right">
-        <div t-field="o.vendor_id" t-options="{&quot;widget&quot;: &quot;contact&quot;, &quot;fields&quot;: [&quot;address&quot;, &quot;name&quot;], &quot;no_marker&quot;: True}"/>
+  <xpath expr="//t/div/div[1]" position="before">
+    <t t-set="o" t-value="o.with_context(lang=o.vendor_id.lang)"/>
+    <t t-set="address">
+      <t t-if="o.partner_order_id">
+        <div id="address" t-field="o.partner_order_id" t-options="{&quot;widget&quot;: &quot;contact&quot;, &quot;fields&quot;: [&quot;address&quot;, &quot;name&quot;], &quot;no_marker&quot;: True}"/>
+      </t>
+      <t t-else="">
+        <div id="address" t-field="o.vendor_id" t-options="{&quot;widget&quot;: &quot;contact&quot;, &quot;fields&quot;: [&quot;address&quot;, &quot;name&quot;], &quot;no_marker&quot;: True}"/>
+      </t>
+    </t>
+  </xpath>
+
+</data>
+
+<!--
+<?xml version="1.0"?>
+<data inherit_id="purchase_requisition.report_purchaserequisitions" priority="50">
+
+  <xpath expr="//t/div/div[1]" position="before">
+    <div class="container">
+      <div class="row">
+        <div id="address" class="col-5 offset-7" t-field="o.vendor_id" t-options="{&quot;widget&quot;: &quot;contact&quot;, &quot;fields&quot;: [&quot;address&quot;, &quot;name&quot;], &quot;no_marker&quot;: True}"/>
       </div>
     </div>
   </xpath>
 
 </data>
-
+-->
 ```
 Source: [snippets/purchase_requisition.report_purchaserequisitions.add_address_block.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/purchase_requisition.report_purchaserequisitions.add_address_block.xml)
 
@@ -44,12 +61,12 @@ ID: `mint_system.purchase_requisition.report_purchaserequisitions.add_descriptio
 <?xml version="1.0"?>
 <data inherit_id="purchase_requisition.report_purchaserequisitions" priority="50">
 
-<xpath expr="//div/t[2]" position="after">
-  <div style="font-size:16px; margin-top: 4rem">
-    <p t-field="o.description"/>
-  </div>
-</xpath>
-  
+  <xpath expr="//div/t[2]" position="after">
+    <div id="description">
+      <p t-field="o.description"/>
+    </div>
+  </xpath>
+
 </data>
 ```
 Source: [snippets/purchase_requisition.report_purchaserequisitions.add_description.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/purchase_requisition.report_purchaserequisitions.add_description.xml)
@@ -175,30 +192,32 @@ ID: `mint_system.purchase_requisition.report_purchaserequisitions.add_infotable`
     <table id='info'>
       <tr>
         <td width="17%">Date</td>
-        <td width="44%">
+        <td width="40%">
           <span t-field='o.ordering_date' t-options='{ "widget": "date" }'/>
         </td>
-        <td width="14%"></td>
-        <td width="25%"></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.vendor_id.ref'/>
         </td>
-        <td>Our Reference</td>
+        <td>Incoterm</td>
         <td>
-          <span t-field='o.user_id'/>
+          <span t-field='o.incoterm_id'/>
         </td>
       </tr>
       <tr>
-        <td>Order</td>
+        <td></td>
         <td>
           <span t-field='o.partner_ref'/>
         </td>
-        <td>Delivery Method</td>
+        <td>Agreement Deadline</td>
         <td>
-         
+          <span t-field='o.date_end' t-options='{ "widget": "date" }'/>
         </td>
       </tr>
       <tr>
@@ -206,10 +225,8 @@ ID: `mint_system.purchase_requisition.report_purchaserequisitions.add_infotable`
         <td>
           <span t-field='o.comment'/>
         </td>
-        <td>Incoterm</td>
-        <td>
-          <span t-field='o.incoterm_id'/>
-        </td>
+        <td></td>
+        <td></td>
       </tr>
     </table>
 
@@ -219,6 +236,28 @@ ID: `mint_system.purchase_requisition.report_purchaserequisitions.add_infotable`
 ```
 Source: [snippets/purchase_requisition.report_purchaserequisitions.add_infotable.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/purchase_requisition.report_purchaserequisitions.add_infotable.xml)
 
+### Add Price Subtotal  
+ID: `mint_system.purchase_requisition.report_purchaserequisitions.add_price_subtotal`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="purchase_requisition.report_purchaserequisitions" priority="50">
+
+  <xpath expr="//th[@id='price_unit']" position="after">
+    <th id="price_subtotal" class="text-right">
+      <strong>Price Subtotal</strong>
+    </th>
+  </xpath>
+  
+  <xpath expr="//td[@id='price_unit']" position="after">
+    <td id="price_subtotal" class="text-right">
+       <span t-field="line_ids.price_subtotal"/>
+    </td>
+  </xpath>
+  
+</data>
+```
+Source: [snippets/purchase_requisition.report_purchaserequisitions.add_price_subtotal.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/purchase_requisition.report_purchaserequisitions.add_price_subtotal.xml)
+
 ### Add Price Unit  
 ID: `mint_system.purchase_requisition.report_purchaserequisitions.add_price_unit`  
 ```xml
@@ -226,17 +265,21 @@ ID: `mint_system.purchase_requisition.report_purchaserequisitions.add_price_unit
 <data inherit_id="purchase_requisition.report_purchaserequisitions" priority="50">
 
   <xpath expr="//th[@id='product_qty']" position="after">
-    <th id="price_unit" class="text-right">
-      <strong>Unit Price</strong>
-    </th>
+    <t t-if="o.state_blanket_order != 'draft'">
+      <th id="price_unit" class="text-right">     
+        <strong>Unit Price</strong>
+      </th>
+    </t>
   </xpath>
-  
+
   <xpath expr="//td[@id='product_qty']" position="after">
-    <td id="price_unit" class="text-right">
-       <span t-field="line_ids.price_unit"/>
-    </td>
+    <t t-if="o.state_blanket_order != 'draft'">
+      <td id="price_unit" class="text-right">
+        <span t-field="line_ids.price_unit"/>
+      </td>
+    </t>
   </xpath>
-  
+
 </data>
 ```
 Source: [snippets/purchase_requisition.report_purchaserequisitions.add_price_unit.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/purchase_requisition.report_purchaserequisitions.add_price_unit.xml)
@@ -272,6 +315,57 @@ ID: `mint_system.purchase_requisition.report_purchaserequisitions.address_block`
 ```
 Source: [snippets/purchase_requisition.report_purchaserequisitions.address_block.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/purchase_requisition.report_purchaserequisitions.address_block.xml)
 
+### Add Summary  
+ID: `mint_system.purchase_requisition.report_purchaserequisitions.add_summary`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="purchase_requisition.report_purchaserequisitions" priority="50">
+
+  <xpath expr="//table[@id='main_table']" position="after">
+
+    <table id="summary" class="table table-condensed trimada table-borderless" style="margin-top:20px; width:100%; color:black; font-family: arial; font-size:9pt; border-top-style:solid; border-bottom-style:solid; border-width:1px; border-color:black">
+      <tr>
+        <td style="width:15.5%; text-align:left">
+          <strong>Subtotal</strong>
+        </td>
+        <td style="width:23%; text-align:left">
+          <t t-if="o.state_blanket_order != 'draft'">
+            <span t-field="o.amount_untaxed" t-options="{&quot;widget&quot;: &quot;monetary&quot;, &quot;display_currency&quot;: o.currency_id}"/>
+          </t>
+          <t t-else="">
+            <span>CHF</span>
+          </t>
+        </td>
+        <td style="width:12%; text-align:left">
+          <t t-if="o.state_blanket_order != 'draft'">
+            <span>VAT</span>
+          </t>
+        </td>
+        <td style="width:17%; text-align:left">
+          <t t-if="o.state_blanket_order != 'draft'">
+            <span t-field="o.amount_tax" t-options="{&quot;widget&quot;: &quot;monetary&quot;, &quot;display_currency&quot;: o.currency_id}"/>
+          </t>
+        </td>
+        <td style="width:14%; text-align:right">
+          <strong>Total</strong>
+        </td>
+        <td style="width:18%; text-align:right">
+          <t t-if="o.state_blanket_order != 'draft'">
+            <span t-field="o.amount_total" t-options="{&quot;widget&quot;: &quot;monetary&quot;, &quot;display_currency&quot;: o.currency_id}"/>
+          </t>
+          <t t-else="">
+            <span>CHF</span>
+          </t>
+        </td>
+      </tr>
+    </table>
+
+  </xpath>
+
+</data> 
+```
+Source: [snippets/purchase_requisition.report_purchaserequisitions.add_summary.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/purchase_requisition.report_purchaserequisitions.add_summary.xml)
+
 ### Add User Id  
 ID: `mint_system.purchase_requisition.report_purchaserequisitions.add_user_id`  
 ```xml
@@ -313,12 +407,12 @@ ID: `mint_system.purchase_requisition.report_purchaserequisitions.format_qty_wit
 <?xml version="1.0"?>
 <data inherit_id="purchase_requisition.report_purchaserequisitions" priority="50">
 
-    <xpath expr="//span[@id='qty']" position="replace">
+    <xpath expr="//span[@id='product_qty']" position="replace">
         <t t-if="line_ids.product_uom_id.id == 1">
-            <span id="qty" t-field="line_ids.product_qty" t-options="{'widget': 'integer'}"/>
+            <span id="product_qty" t-field="line_ids.product_qty" t-options="{'widget': 'integer'}"/>
         </t>
         <t t-else="">
-            <span id="qty" t-field="line_ids.product_qty"/>
+            <span id="product_qty" t-field="line_ids.product_qty"/>
         </t>
     </xpath>
 
@@ -332,11 +426,6 @@ ID: `mint_system.purchase_requisition.report_purchaserequisitions.hide_details`
 <?xml version="1.0"?>
 <data inherit_id="purchase_requisition.report_purchaserequisitions" priority="50">
 
-<!--
-<xpath expr="//div/t[2]" position="replace">  
-</xpath>
--->
-
   <xpath expr="//table[@id='details']" position="replace"/>
   
 </data>
@@ -369,17 +458,37 @@ ID: `mint_system.purchase_requisition.report_purchaserequisitions.hide_product_u
 ```
 Source: [snippets/purchase_requisition.report_purchaserequisitions.hide_product_uom.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/purchase_requisition.report_purchaserequisitions.hide_product_uom.xml)
 
+### Hide Schedule Date  
+ID: `mint_system.purchase_requisition.report_purchaserequisitions.hide_schedule_date`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="purchase_requisition.report_purchaserequisitions" priority="50">
+
+  <xpath expr="//th[@id='schedule_date']" position="replace"/>
+  <xpath expr="//td[@id='schedule_date']" position="replace"/>
+  
+</data>
+```
+Source: [snippets/purchase_requisition.report_purchaserequisitions.hide_schedule_date.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/purchase_requisition.report_purchaserequisitions.hide_schedule_date.xml)
+
+### Hide Title Details  
+ID: `mint_system.purchase_requisition.report_purchaserequisitions.hide_title_details`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="purchase_requisition.report_purchaserequisitions" priority="50">
+
+ <xpath expr="//h3[@id='title_details']" position="replace"/> 
+
+</data>
+```
+Source: [snippets/purchase_requisition.report_purchaserequisitions.hide_title_details.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/purchase_requisition.report_purchaserequisitions.hide_title_details.xml)
+
 ### Hide Title Product  
 ID: `mint_system.purchase_requisition.report_purchaserequisitions.hide_title_product`  
 ```xml
 <?xml version="1.0"?>
 <data inherit_id="purchase_requisition.report_purchaserequisitions" priority="50">
 
-<!--
-<xpath expr="//h3" position="replace">  
-</xpath>
--->
-
  <xpath expr="//h3[@id='title_product']" position="replace"/> 
 
 </data>
@@ -458,11 +567,11 @@ ID: `mint_system.purchase_requisition.report_purchaserequisitions.replace_produc
 
   <xpath expr="//td[@id='name']" position="replace">
     <td id="name" >
-      <t t-if="o.product_id.type_description">
-        <span style="font-weight: bold" t-field="o.product_id.type_description"/>
+      <t t-if="line_ids.product_id.type_description">
+        <span style="font-weight: bold" t-field="line_ids.product_id.type_description"/>
       </t>
-      <t t-if="not o.product_id.type_description">
-        <span t-field="o.product_id.name"/>
+      <t t-if="not line_ids.product_id.type_description">
+        <span t-field="line_ids.product_description_variants"/>
       </t>
     </td>
   </xpath>
@@ -518,7 +627,7 @@ ID: `mint_system.purchase_requisition.report_purchaserequisitions.replace_title`
 <data inherit_id="purchase_requisition.report_purchaserequisitions" priority="50">
 
   <xpath expr="//h2" position="replace">
-    <t t-if="state_blanket_order == draft">
+    <t t-if="o.state_blanket_order == 'draft'">
       <h2>Request for Quotation purchase contract <span t-field="o.name"/></h2>
     </t>
     <t t-else="">
@@ -552,41 +661,42 @@ ID: `mint_system.purchase_requisition.report_purchaserequisitions.second_row`
 <?xml version="1.0"?>
 <data inherit_id="purchase_requisition.report_purchaserequisitions" priority="50">
 
-  <xpath expr="//tr[@id='first']" position="attributes">
+  <xpath expr="//table[@id='main_table']/tbody[1]/tr[1]" position="attributes">
     <attribute name="t-att-class">"first"</attribute>
   </xpath>
 
-  <xpath expr="//tr[@id='first']" position="after">
-    <t t-if="o.product_id.type_description">
-    <tr class="second">
-      <td></td>
-      <td colspan="5">
-        <span t-field="o.product_id.name"/><br/>
-        <t t-if="o.product_id.country_of_origin_id.code">
+  <xpath expr="//table[@id='main_table']/tbody[1]/tr[1]/td[3]" position="after">
+    <t t-if="line_ids.product_id.type_description">
+      <tr class="second">
+        <td></td>
+        <td colspan="5">
+          <span t-field="line_ids.product_description_variants"/>
+          <br/>
+          <t t-if="line_ids.product_id.country_of_origin_id.code">
           Ursprungsland:
-          <span t-field="o.product_id.country_of_origin_id.code" />
-        </t>
-        <t t-if="o.product_id.hs_code">
+            <span t-field="line_ids.product_id.country_of_origin_id.code" />
+          </t>
+          <t t-if="line_ids.product_id.hs_code">
           / Zollposition:
-          <span t-field="o.product_id.hs_code" />
-        </t>
-      </td>
-    </tr>
+            <span t-field="line_ids.product_id.hs_code" />
+          </t>
+        </td>
+      </tr>
     </t>
-    <t t-if="not o.product_id.type_description">
-    <tr class="second">
-      <td></td>
-      <td colspan="5">
-        <t t-if="o.product_id.country_of_origin_id.code">
+    <t t-if="not line_ids.product_id.type_description">
+      <tr class="second">
+        <td></td>
+        <td colspan="5">
+          <t t-if="line_ids.product_id.country_of_origin_id.code">
           Ursprungsland:
-          <span t-field="o.product_id.country_of_origin_id.code" />
-        </t>
-        <t t-if="o.product_id.hs_code">
+            <span t-field="line_ids.product_id.country_of_origin_id.code" />
+          </t>
+          <t t-if="line_ids.product_id.hs_code">
           / Zollposition:
-          <span t-field="o.product_id.hs_code" />
-        </t>
-      </td>
-    </tr>
+            <span t-field="line_ids.product_id.hs_code" />
+          </t>
+        </td>
+      </tr>
     </t>
   </xpath>
 
@@ -683,6 +793,29 @@ ID: `mint_system.purchase_requisition.report_purchaserequisitions.set_ids`
 	</xpath>
 
 </data>
+
+<!--
+<?xml version="1.0"?>
+<data inherit_id="purchase_requisition.report_purchaserequisitions" priority="50">
+
+	<xpath expr="//t[1]/h3" position="attributes">
+		<attribute name="id">title_product</attribute>
+	</xpath>
+
+	<xpath expr="//t[2]/h3" position="attributes">
+		<attribute name="id">title_details</attribute>
+	</xpath>
+	
+	<xpath expr="//span[@t-field='line_ids.product_qty']" position="attributes">
+		<attribute name="id">product_qty</attribute>
+	</xpath>
+	
+	<xpath expr="//t[2]/table" position="attributes">
+		<attribute name="id">details</attribute>
+	</xpath>
+
+</data>
+-->
 ```
 Source: [snippets/purchase_requisition.report_purchaserequisitions.set_ids.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/purchase_requisition.report_purchaserequisitions.set_ids.xml)
 
@@ -717,17 +850,25 @@ ID: `mint_system.purchase_requisition.report_purchaserequisitions.style_gelso`
 	<xpath expr="//div[hasclass('page')]" position="before">
 		<style>
 			.o_company_1_layout {
-				font-family: Arial;
+				font-family: Roboto;
 				color: #000000;
 			}
-			h2 {
-       			margin-top:10mm;
-       			margin-bottom:3mm;
+			.o_report_layout_boxed {
+        		color: #495057;
+			}
+			.o_report_layout_boxed h2 {
+       			color: #000000;
+			}
+			.o_report_layout_boxed strong {
+       			color: #000000;
+			}
+			.col-3 {
+			  	margin-bottom: 1rem !important;
+			}
+			div#address {
+				font-size: 16px;
+				margin-bottom: 2rem;
 			}
-			div#address_right {
-				font-size: 9pt;
-      }
-	
 		</style>
 	</xpath>
 
@@ -789,6 +930,9 @@ ID: `mint_system.purchase_requisition.report_purchaserequisitions.style_trimada`
 			span#qty {
 			  font-weight: bold;
 			}
+			table#summary td {
+			  padding: 0.3rem;
+			}
 	
 		</style>
 	</xpath>
@@ -801,7 +945,79 @@ ID: `mint_system.purchase_requisition.report_purchaserequisitions.style_trimada`
 ```
 Source: [snippets/purchase_requisition.report_purchaserequisitions.style_trimada.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/purchase_requisition.report_purchaserequisitions.style_trimada.xml)
 
+## View Purchase Requisition Filter  
+### Replace Filter  
+ID: `mint_system.purchase_requisition.view_purchase_requisition_filter.replace_filter`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="purchase_requisition.view_purchase_requisition_filter" priority="50">
+
+  <xpath expr="/search" position="replace">
+    <search>
+
+      <!-- Filter -->
+      <filter name="my_orders" string="Meine Aufträge" domain="[('user_id', '=', uid)]"/>
+      <filter string="Meine Aufträge in Arbeit" name="in_progress" domain="['&amp;',('user_id', '=', uid),('state', 'in', ('draft','sent', 'open', 'expired'))]"/>
+      <separator/>
+      <filter string="Entwurf" name="filter_state_draft" domain="[('state', '=', 'draft')]"/>
+      <filter string="Gesendet" name="filter_state_sent" domain="[('state', '=', 'sent')]"/>
+      <filter string="Offen" name="filter_state_open" domain="[('state', '=', 'open')]"/>
+      <filter string="Erledigt" name="filter_state_erledigt" domain="[('state', '=', 'done')]"/>
+      <filter string="Abgelaufen" name="filter_state_expired" domain="[('state', '=', 'expired')]"/>
+      <filter string="Abgebrochen" name="filter_state_cancel" domain="[('state', '=', 'cancel')]"/>
+      <separator/>
+      <filter string="Auftragsdatum" name="filter_ordering_date" date="ordering_date"/>
+
+      <!-- Gruppierung -->
+      <filter string="Einkaufsbeauftragter" name="user_id" domain="[]" context="{'group_by': 'user_id'}"/>
+      <filter string="Lieferant" name="vendor_id" domain="[]" context="{'group_by': 'vendor_id'}"/>
+      <filter string="Datum" name="ordering_date" domain="[]" context="{'group_by': 'ordering_date'}"/>
+      <filter string="Status" name="state" domain="[]" context="{'group_by': 'state'}"/>
+
+      <!-- Suche -->
+      <group>
+        <field name="name" string="Order" filter_domain="['|', '|', ('name', 'ilike', self), ('partner_ref', 'ilike', self), ('vendor_id', 'child_of', self)]"/>
+        <field name="vendor_id"/>
+        <field name="user_id"/>
+        <field name="product_id" filter_domain="['|','|',('line_ids.product_id', 'ilike', self),('line_ids.product_id.type_description', 'ilike', self),('line_ids.product_id.type_description2', 'ilike', self)]"/>
+      </group>
+
+    </search>
+  </xpath>
+
+</data>
+```
+Source: [snippets/purchase_requisition.view_purchase_requisition_filter.replace_filter.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/purchase_requisition.view_purchase_requisition_filter.replace_filter.xml)
+
 ## View Purchase Requisition Form  
+### Date End Attributes Readonly  
+ID: `mint_system.purchase_requisition.view_purchase_requisition_form.date_end_attributes_readonly`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="purchase_requisition.view_purchase_requisition_form" priority="50">
+
+  <xpath expr="//field[@name='date_end']" position="attributes">
+    <attribute name="attrs">{'readonly': [('state','not in',('draft','sent','in_progress','open','ongoing'))]}</attribute>
+  </xpath>
+
+</data>
+```
+Source: [snippets/purchase_requisition.view_purchase_requisition_form.date_end_attributes_readonly.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/purchase_requisition.view_purchase_requisition_form.date_end_attributes_readonly.xml)
+
+### Date End Attributes Required  
+ID: `mint_system.purchase_requisition.view_purchase_requisition_form.date_end_attributes_required`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="purchase_requisition.view_purchase_requisition_form" priority="50">
+
+  <xpath expr="//field[@name='date_end']" position="attributes">
+    <attribute name="required">1</attribute>
+  </xpath>
+
+</data>
+```
+Source: [snippets/purchase_requisition.view_purchase_requisition_form.date_end_attributes_required.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/purchase_requisition.view_purchase_requisition_form.date_end_attributes_required.xml)
+
 ### Filter Customer Is Company  
 ID: `mint_system.purchase_requisition.view_purchase_requisition_form.filter_customer_is_company`  
 ```xml
@@ -831,6 +1047,34 @@ ID: `mint_system.purchase_requisition.view_purchase_requisition_form.hide_schedu
 ```
 Source: [snippets/purchase_requisition.view_purchase_requisition_form.hide_schedule_date.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/purchase_requisition.view_purchase_requisition_form.hide_schedule_date.xml)
 
+### Modify Attributes Button Action Cancel  
+ID: `mint_system.purchase_requisition.view_purchase_requisition_form.modify_attributes_button_action_cancel`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="purchase_requisition.view_purchase_requisition_form" priority="50">
+
+    <xpath expr="//button[@name='action_cancel']" position="attributes">
+        <attribute name="states">ongoing,open</attribute>
+    </xpath>
+    
+</data>
+```
+Source: [snippets/purchase_requisition.view_purchase_requisition_form.modify_attributes_button_action_cancel.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/purchase_requisition.view_purchase_requisition_form.modify_attributes_button_action_cancel.xml)
+
+### Modify Attributes Name  
+ID: `mint_system.purchase_requisition.view_purchase_requisition_form.modify_attributes_name`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="purchase_requisition.view_purchase_requisition_form" priority="50">
+
+  <xpath expr="//h1/field[@name='name']" position="attributes">
+      <attribute name="attrs">{'readonly': [('state', 'in', ('done','cancel'))]}</attribute>
+  </xpath>
+
+</data>
+```
+Source: [snippets/purchase_requisition.view_purchase_requisition_form.modify_attributes_name.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/purchase_requisition.view_purchase_requisition_form.modify_attributes_name.xml)
+
 ### Modify Attributes Origin  
 ID: `mint_system.purchase_requisition.view_purchase_requisition_form.modify_attributes_origin`  
 ```xml
@@ -859,6 +1103,101 @@ ID: `mint_system.purchase_requisition.view_purchase_requisition_form.modify_attr
 ```
 Source: [snippets/purchase_requisition.view_purchase_requisition_form.modify_attributes_type_id.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/purchase_requisition.view_purchase_requisition_form.modify_attributes_type_id.xml)
 
+### Modify Status Workflow  
+ID: `mint_system.purchase_requisition.view_purchase_requisition_form.modify_status_workflow`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="purchase_requisition.view_purchase_requisition_form" priority="50">
+
+    <xpath expr="//button[@name='493']" position="after">
+        <button name="action_order_send" states="draft,sent,open" string="Send by Email" type="object" class="btn-primary"/>
+        <button name="action_open" states="sent" string="Validate" type="object" class="btn-primary"/>
+    </xpath>
+
+    <xpath expr="//button[@name='action_cancel']" position="attributes">
+        <attribute name="states">open</attribute>
+    </xpath>
+
+    <field name="state_blanket_order" position="attributes">
+        <attribute name="statusbar_visible">draft,sent,open,cancel,done</attribute>
+    </field>
+
+    <xpath expr="//button[@name='493']" position="replace">
+        <button name="493" type="action" string="New Quotation" class="btn-primary" attrs="{'invisible': [('state', 'in', ('draft','sent','done','cancel'))]}"/>
+    </xpath>
+
+    <xpath expr="//button[@name='action_draft']" position="attributes">
+        <attribute name="states">done,cancel,done</attribute>
+    </xpath>
+
+    <xpath expr="//button[@name='action_in_progress']" position="replace">
+        <button name="action_open" states="draft" string="Validate" type="object" class="btn-primary"/>
+    </xpath>
+
+</data>
+```
+Source: [snippets/purchase_requisition.view_purchase_requisition_form.modify_status_workflow.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/purchase_requisition.view_purchase_requisition_form.modify_status_workflow.xml)
+
+### Ordering Date Attributes Required  
+ID: `mint_system.purchase_requisition.view_purchase_requisition_form.ordering_date_attributes_required`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="purchase_requisition.view_purchase_requisition_form" priority="50">
+
+  <xpath expr="//field[@name='ordering_date']" position="attributes">
+    <attribute name="required">1</attribute>
+  </xpath>
+
+</data>
+```
+Source: [snippets/purchase_requisition.view_purchase_requisition_form.ordering_date_attributes_required.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/purchase_requisition.view_purchase_requisition_form.ordering_date_attributes_required.xml)
+
+### Relocate Price Unit  
+ID: `mint_system.purchase_requisition.view_purchase_requisition_form.relocate_price_unit`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="purchase_requisition.view_purchase_requisition_form" priority="50">
+
+  <xpath expr="//page[@name='products']//field[@name='price_unit']" position="replace"/>
+  <xpath expr="//page[@name='products']//field[@name='product_uom_id']" position="after">
+    <field name="price_unit"/>
+  </xpath>
+
+</data>
+```
+Source: [snippets/purchase_requisition.view_purchase_requisition_form.relocate_price_unit.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/purchase_requisition.view_purchase_requisition_form.relocate_price_unit.xml)
+
+### Relocate Qty Ordered  
+ID: `mint_system.purchase_requisition.view_purchase_requisition_form.relocate_qty_ordered`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="purchase_requisition.view_purchase_requisition_form" priority="50">
+
+  <xpath expr="//page[@name='products']//field[@name='qty_ordered']" position="replace"/>
+  <xpath expr="//page[@name='products']//field[@name='schedule_date']" position="after">
+    <field name="qty_ordered" optional="show"/>
+  </xpath>
+
+</data>
+```
+Source: [snippets/purchase_requisition.view_purchase_requisition_form.relocate_qty_ordered.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/purchase_requisition.view_purchase_requisition_form.relocate_qty_ordered.xml)
+
+### Replace Title  
+ID: `mint_system.purchase_requisition.view_purchase_requisition_form.replace_title`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="purchase_requisition.view_purchase_requisition_form" priority="50">
+
+  <xpath expr="//h1/../label" position="replace">
+    <span class="o_form_label" attrs="{'invisible': [('state','not in',('draft','sent'))]}">Request for Quotation </span>
+    <span class="o_form_label" attrs="{'invisible': [('state','in',('draft','sent'))]}">Purchase Order </span>
+  </xpath>
+
+</data>
+
+```
+Source: [snippets/purchase_requisition.view_purchase_requisition_form.replace_title.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/purchase_requisition.view_purchase_requisition_form.replace_title.xml)
+
 ### Show Schedule Date In Notebook  
 ID: `mint_system.purchase_requisition.view_purchase_requisition_form.show_schedule_date_in_notebook`  
 ```xml
@@ -874,3 +1213,66 @@ ID: `mint_system.purchase_requisition.view_purchase_requisition_form.show_schedu
 ```
 Source: [snippets/purchase_requisition.view_purchase_requisition_form.show_schedule_date_in_notebook.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/purchase_requisition.view_purchase_requisition_form.show_schedule_date_in_notebook.xml)
 
+## View Purchase Requisition Tree  
+### Add Comment  
+ID: `mint_system.purchase_requisition.view_purchase_requisition_tree.add_comment`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="purchase_requisition.view_purchase_requisition_tree" priority="50">
+
+  <xpath expr="//field[@name='partner_ref']" position="after">
+    <field name="comment"/>
+  </xpath>
+
+</data>
+
+```
+Source: [snippets/purchase_requisition.view_purchase_requisition_tree.add_comment.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/purchase_requisition.view_purchase_requisition_tree.add_comment.xml)
+
+### Add Partner Ref  
+ID: `mint_system.purchase_requisition.view_purchase_requisition_tree.add_partner_ref`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="purchase_requisition.view_purchase_requisition_tree" priority="50">
+
+  <xpath expr="//field[@name='name']" position="after">
+    <field name="partner_ref"/>
+  </xpath>
+
+</data>
+
+```
+Source: [snippets/purchase_requisition.view_purchase_requisition_tree.add_partner_ref.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/purchase_requisition.view_purchase_requisition_tree.add_partner_ref.xml)
+
+### Add Vendor Id  
+ID: `mint_system.purchase_requisition.view_purchase_requisition_tree.add_vendor_id`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="purchase_requisition.view_purchase_requisition_tree" priority="50">
+
+  <xpath expr="//field[@name='ordering_date']" position="after">
+    <field name="vendor_id"/>
+  </xpath>
+
+</data>
+```
+Source: [snippets/purchase_requisition.view_purchase_requisition_tree.add_vendor_id.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/purchase_requisition.view_purchase_requisition_tree.add_vendor_id.xml)
+
+### Relocate User Id  
+ID: `mint_system.purchase_requisition.view_purchase_requisition_tree.relocate_user_id`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="purchase_requisition.view_purchase_requisition_tree" priority="50">
+
+  <xpath expr="//field[@name='user_id']" position="replace">
+  </xpath>
+
+  <xpath expr="//field[@name='partner_ref']" position="after">
+    <field name="user_id"/>
+  </xpath>
+
+</data>
+
+```
+Source: [snippets/purchase_requisition.view_purchase_requisition_tree.relocate_user_id.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/purchase_requisition.view_purchase_requisition_tree.relocate_user_id.xml)
+
diff --git a/snippets/purchase_requisition.report_purchaserequisitions.add_address_block.xml b/snippets/purchase_requisition.report_purchaserequisitions.add_address_block.xml
index de63506d..5b075f6e 100644
--- a/snippets/purchase_requisition.report_purchaserequisitions.add_address_block.xml
+++ b/snippets/purchase_requisition.report_purchaserequisitions.add_address_block.xml
@@ -1,13 +1,31 @@
 <?xml version="1.0"?>
 <data inherit_id="purchase_requisition.report_purchaserequisitions" priority="50">
 
-  <xpath expr="//t/div/div[1]" position="after">
-    <div class="row address">
-      <div class="col-5"/>
-      <div class="col-5 offset-2" id="address_right">
-        <div t-field="o.vendor_id" t-options="{&quot;widget&quot;: &quot;contact&quot;, &quot;fields&quot;: [&quot;address&quot;, &quot;name&quot;], &quot;no_marker&quot;: True}"/>
+  <xpath expr="//t/div/div[1]" position="before">
+    <t t-set="o" t-value="o.with_context(lang=o.vendor_id.lang)"/>
+    <t t-set="address">
+      <t t-if="o.partner_order_id">
+        <div id="address" t-field="o.partner_order_id" t-options="{&quot;widget&quot;: &quot;contact&quot;, &quot;fields&quot;: [&quot;address&quot;, &quot;name&quot;], &quot;no_marker&quot;: True}"/>
+      </t>
+      <t t-else="">
+        <div id="address" t-field="o.vendor_id" t-options="{&quot;widget&quot;: &quot;contact&quot;, &quot;fields&quot;: [&quot;address&quot;, &quot;name&quot;], &quot;no_marker&quot;: True}"/>
+      </t>
+    </t>
+  </xpath>
+
+</data>
+
+<!--
+<?xml version="1.0"?>
+<data inherit_id="purchase_requisition.report_purchaserequisitions" priority="50">
+
+  <xpath expr="//t/div/div[1]" position="before">
+    <div class="container">
+      <div class="row">
+        <div id="address" class="col-5 offset-7" t-field="o.vendor_id" t-options="{&quot;widget&quot;: &quot;contact&quot;, &quot;fields&quot;: [&quot;address&quot;, &quot;name&quot;], &quot;no_marker&quot;: True}"/>
       </div>
     </div>
   </xpath>
 
 </data>
+-->
\ No newline at end of file
diff --git a/snippets/purchase_requisition.report_purchaserequisitions.add_description.xml b/snippets/purchase_requisition.report_purchaserequisitions.add_description.xml
index 7c0f3f8c..44b2b241 100644
--- a/snippets/purchase_requisition.report_purchaserequisitions.add_description.xml
+++ b/snippets/purchase_requisition.report_purchaserequisitions.add_description.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0"?>
 <data inherit_id="purchase_requisition.report_purchaserequisitions" priority="50">
 
-<xpath expr="//div/t[2]" position="after">
-  <div style="font-size:16px; margin-top: 4rem">
-    <p t-field="o.description"/>
-  </div>
-</xpath>
-  
+  <xpath expr="//div/t[2]" position="after">
+    <div id="description">
+      <p t-field="o.description"/>
+    </div>
+  </xpath>
+
 </data>
\ No newline at end of file
diff --git a/snippets/purchase_requisition.report_purchaserequisitions.add_infotable.xml b/snippets/purchase_requisition.report_purchaserequisitions.add_infotable.xml
index 37857c8c..7abc6564 100644
--- a/snippets/purchase_requisition.report_purchaserequisitions.add_infotable.xml
+++ b/snippets/purchase_requisition.report_purchaserequisitions.add_infotable.xml
@@ -20,30 +20,32 @@
     <table id='info'>
       <tr>
         <td width="17%">Date</td>
-        <td width="44%">
+        <td width="40%">
           <span t-field='o.ordering_date' t-options='{ "widget": "date" }'/>
         </td>
-        <td width="14%"></td>
-        <td width="25%"></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.vendor_id.ref'/>
         </td>
-        <td>Our Reference</td>
+        <td>Incoterm</td>
         <td>
-          <span t-field='o.user_id'/>
+          <span t-field='o.incoterm_id'/>
         </td>
       </tr>
       <tr>
-        <td>Order</td>
+        <td></td>
         <td>
           <span t-field='o.partner_ref'/>
         </td>
-        <td>Delivery Method</td>
+        <td>Agreement Deadline</td>
         <td>
-         
+          <span t-field='o.date_end' t-options='{ "widget": "date" }'/>
         </td>
       </tr>
       <tr>
@@ -51,10 +53,8 @@
         <td>
           <span t-field='o.comment'/>
         </td>
-        <td>Incoterm</td>
-        <td>
-          <span t-field='o.incoterm_id'/>
-        </td>
+        <td></td>
+        <td></td>
       </tr>
     </table>
 
diff --git a/snippets/purchase_requisition.report_purchaserequisitions.add_price_subtotal.xml b/snippets/purchase_requisition.report_purchaserequisitions.add_price_subtotal.xml
new file mode 100644
index 00000000..3355065d
--- /dev/null
+++ b/snippets/purchase_requisition.report_purchaserequisitions.add_price_subtotal.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<data inherit_id="purchase_requisition.report_purchaserequisitions" priority="50">
+
+  <xpath expr="//th[@id='price_unit']" position="after">
+    <th id="price_subtotal" class="text-right">
+      <strong>Price Subtotal</strong>
+    </th>
+  </xpath>
+  
+  <xpath expr="//td[@id='price_unit']" position="after">
+    <td id="price_subtotal" class="text-right">
+       <span t-field="line_ids.price_subtotal"/>
+    </td>
+  </xpath>
+  
+</data>
\ No newline at end of file
diff --git a/snippets/purchase_requisition.report_purchaserequisitions.add_price_unit.xml b/snippets/purchase_requisition.report_purchaserequisitions.add_price_unit.xml
index 3cc12c62..739c6909 100644
--- a/snippets/purchase_requisition.report_purchaserequisitions.add_price_unit.xml
+++ b/snippets/purchase_requisition.report_purchaserequisitions.add_price_unit.xml
@@ -2,15 +2,19 @@
 <data inherit_id="purchase_requisition.report_purchaserequisitions" priority="50">
 
   <xpath expr="//th[@id='product_qty']" position="after">
-    <th id="price_unit" class="text-right">
-      <strong>Unit Price</strong>
-    </th>
+    <t t-if="o.state_blanket_order != 'draft'">
+      <th id="price_unit" class="text-right">     
+        <strong>Unit Price</strong>
+      </th>
+    </t>
   </xpath>
-  
+
   <xpath expr="//td[@id='product_qty']" position="after">
-    <td id="price_unit" class="text-right">
-       <span t-field="line_ids.price_unit"/>
-    </td>
+    <t t-if="o.state_blanket_order != 'draft'">
+      <td id="price_unit" class="text-right">
+        <span t-field="line_ids.price_unit"/>
+      </td>
+    </t>
   </xpath>
-  
+
 </data>
\ No newline at end of file
diff --git a/snippets/purchase_requisition.report_purchaserequisitions.add_summary.xml b/snippets/purchase_requisition.report_purchaserequisitions.add_summary.xml
new file mode 100644
index 00000000..f76b9bc3
--- /dev/null
+++ b/snippets/purchase_requisition.report_purchaserequisitions.add_summary.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0"?>
+<data inherit_id="purchase_requisition.report_purchaserequisitions" priority="50">
+
+  <xpath expr="//table[@id='main_table']" position="after">
+
+    <table id="summary" class="table table-condensed trimada table-borderless" style="margin-top:20px; width:100%; color:black; font-family: arial; font-size:9pt; border-top-style:solid; border-bottom-style:solid; border-width:1px; border-color:black">
+      <tr>
+        <td style="width:15.5%; text-align:left">
+          <strong>Subtotal</strong>
+        </td>
+        <td style="width:23%; text-align:left">
+          <t t-if="o.state_blanket_order != 'draft'">
+            <span t-field="o.amount_untaxed" t-options="{&quot;widget&quot;: &quot;monetary&quot;, &quot;display_currency&quot;: o.currency_id}"/>
+          </t>
+          <t t-else="">
+            <span>CHF</span>
+          </t>
+        </td>
+        <td style="width:12%; text-align:left">
+          <t t-if="o.state_blanket_order != 'draft'">
+            <span>VAT</span>
+          </t>
+        </td>
+        <td style="width:17%; text-align:left">
+          <t t-if="o.state_blanket_order != 'draft'">
+            <span t-field="o.amount_tax" t-options="{&quot;widget&quot;: &quot;monetary&quot;, &quot;display_currency&quot;: o.currency_id}"/>
+          </t>
+        </td>
+        <td style="width:14%; text-align:right">
+          <strong>Total</strong>
+        </td>
+        <td style="width:18%; text-align:right">
+          <t t-if="o.state_blanket_order != 'draft'">
+            <span t-field="o.amount_total" t-options="{&quot;widget&quot;: &quot;monetary&quot;, &quot;display_currency&quot;: o.currency_id}"/>
+          </t>
+          <t t-else="">
+            <span>CHF</span>
+          </t>
+        </td>
+      </tr>
+    </table>
+
+  </xpath>
+
+</data> 
\ No newline at end of file
diff --git a/snippets/purchase_requisition.report_purchaserequisitions.format_qty_with_decimal.xml b/snippets/purchase_requisition.report_purchaserequisitions.format_qty_with_decimal.xml
index dd3e40fb..6765b083 100644
--- a/snippets/purchase_requisition.report_purchaserequisitions.format_qty_with_decimal.xml
+++ b/snippets/purchase_requisition.report_purchaserequisitions.format_qty_with_decimal.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0"?>
 <data inherit_id="purchase_requisition.report_purchaserequisitions" priority="50">
 
-    <xpath expr="//span[@id='qty']" position="replace">
+    <xpath expr="//span[@id='product_qty']" position="replace">
         <t t-if="line_ids.product_uom_id.id == 1">
-            <span id="qty" t-field="line_ids.product_qty" t-options="{'widget': 'integer'}"/>
+            <span id="product_qty" t-field="line_ids.product_qty" t-options="{'widget': 'integer'}"/>
         </t>
         <t t-else="">
-            <span id="qty" t-field="line_ids.product_qty"/>
+            <span id="product_qty" t-field="line_ids.product_qty"/>
         </t>
     </xpath>
 
diff --git a/snippets/purchase_requisition.report_purchaserequisitions.hide_details.xml b/snippets/purchase_requisition.report_purchaserequisitions.hide_details.xml
index 2a71edc5..340e67f6 100644
--- a/snippets/purchase_requisition.report_purchaserequisitions.hide_details.xml
+++ b/snippets/purchase_requisition.report_purchaserequisitions.hide_details.xml
@@ -1,11 +1,6 @@
 <?xml version="1.0"?>
 <data inherit_id="purchase_requisition.report_purchaserequisitions" priority="50">
 
-<!--
-<xpath expr="//div/t[2]" position="replace">  
-</xpath>
--->
-
   <xpath expr="//table[@id='details']" position="replace"/>
   
 </data>
\ No newline at end of file
diff --git a/snippets/purchase_requisition.report_purchaserequisitions.hide_schedule_date.xml b/snippets/purchase_requisition.report_purchaserequisitions.hide_schedule_date.xml
new file mode 100644
index 00000000..e5ab447d
--- /dev/null
+++ b/snippets/purchase_requisition.report_purchaserequisitions.hide_schedule_date.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<data inherit_id="purchase_requisition.report_purchaserequisitions" priority="50">
+
+  <xpath expr="//th[@id='schedule_date']" position="replace"/>
+  <xpath expr="//td[@id='schedule_date']" position="replace"/>
+  
+</data>
\ No newline at end of file
diff --git a/snippets/purchase_requisition.report_purchaserequisitions.hide_title_details.xml b/snippets/purchase_requisition.report_purchaserequisitions.hide_title_details.xml
new file mode 100644
index 00000000..837e42c1
--- /dev/null
+++ b/snippets/purchase_requisition.report_purchaserequisitions.hide_title_details.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<data inherit_id="purchase_requisition.report_purchaserequisitions" priority="50">
+
+ <xpath expr="//h3[@id='title_details']" position="replace"/> 
+
+</data>
\ No newline at end of file
diff --git a/snippets/purchase_requisition.report_purchaserequisitions.hide_title_product.xml b/snippets/purchase_requisition.report_purchaserequisitions.hide_title_product.xml
index eb702324..ea034a96 100644
--- a/snippets/purchase_requisition.report_purchaserequisitions.hide_title_product.xml
+++ b/snippets/purchase_requisition.report_purchaserequisitions.hide_title_product.xml
@@ -1,11 +1,6 @@
 <?xml version="1.0"?>
 <data inherit_id="purchase_requisition.report_purchaserequisitions" priority="50">
 
-<!--
-<xpath expr="//h3" position="replace">  
-</xpath>
--->
-
  <xpath expr="//h3[@id='title_product']" position="replace"/> 
 
 </data>
\ No newline at end of file
diff --git a/snippets/purchase_requisition.report_purchaserequisitions.replace_product_description.xml b/snippets/purchase_requisition.report_purchaserequisitions.replace_product_description.xml
index 60601df8..7c2aa49f 100644
--- a/snippets/purchase_requisition.report_purchaserequisitions.replace_product_description.xml
+++ b/snippets/purchase_requisition.report_purchaserequisitions.replace_product_description.xml
@@ -3,11 +3,11 @@
 
   <xpath expr="//td[@id='name']" position="replace">
     <td id="name" >
-      <t t-if="o.product_id.type_description">
-        <span style="font-weight: bold" t-field="o.product_id.type_description"/>
+      <t t-if="line_ids.product_id.type_description">
+        <span style="font-weight: bold" t-field="line_ids.product_id.type_description"/>
       </t>
-      <t t-if="not o.product_id.type_description">
-        <span t-field="o.product_id.name"/>
+      <t t-if="not line_ids.product_id.type_description">
+        <span t-field="line_ids.product_description_variants"/>
       </t>
     </td>
   </xpath>
diff --git a/snippets/purchase_requisition.report_purchaserequisitions.replace_title.xml b/snippets/purchase_requisition.report_purchaserequisitions.replace_title.xml
index c2f5d15b..fc444cb1 100644
--- a/snippets/purchase_requisition.report_purchaserequisitions.replace_title.xml
+++ b/snippets/purchase_requisition.report_purchaserequisitions.replace_title.xml
@@ -2,7 +2,7 @@
 <data inherit_id="purchase_requisition.report_purchaserequisitions" priority="50">
 
   <xpath expr="//h2" position="replace">
-    <t t-if="state_blanket_order == draft">
+    <t t-if="o.state_blanket_order == 'draft'">
       <h2>Request for Quotation purchase contract <span t-field="o.name"/></h2>
     </t>
     <t t-else="">
diff --git a/snippets/purchase_requisition.report_purchaserequisitions.second_row.xml b/snippets/purchase_requisition.report_purchaserequisitions.second_row.xml
index d9598424..a3a56034 100644
--- a/snippets/purchase_requisition.report_purchaserequisitions.second_row.xml
+++ b/snippets/purchase_requisition.report_purchaserequisitions.second_row.xml
@@ -1,41 +1,42 @@
 <?xml version="1.0"?>
 <data inherit_id="purchase_requisition.report_purchaserequisitions" priority="50">
 
-  <xpath expr="//tr[@id='first']" position="attributes">
+  <xpath expr="//table[@id='main_table']/tbody[1]/tr[1]" position="attributes">
     <attribute name="t-att-class">"first"</attribute>
   </xpath>
 
-  <xpath expr="//tr[@id='first']" position="after">
-    <t t-if="o.product_id.type_description">
-    <tr class="second">
-      <td></td>
-      <td colspan="5">
-        <span t-field="o.product_id.name"/><br/>
-        <t t-if="o.product_id.country_of_origin_id.code">
+  <xpath expr="//table[@id='main_table']/tbody[1]/tr[1]/td[3]" position="after">
+    <t t-if="line_ids.product_id.type_description">
+      <tr class="second">
+        <td></td>
+        <td colspan="5">
+          <span t-field="line_ids.product_description_variants"/>
+          <br/>
+          <t t-if="line_ids.product_id.country_of_origin_id.code">
           Ursprungsland:
-          <span t-field="o.product_id.country_of_origin_id.code" />
-        </t>
-        <t t-if="o.product_id.hs_code">
+            <span t-field="line_ids.product_id.country_of_origin_id.code" />
+          </t>
+          <t t-if="line_ids.product_id.hs_code">
           / Zollposition:
-          <span t-field="o.product_id.hs_code" />
-        </t>
-      </td>
-    </tr>
+            <span t-field="line_ids.product_id.hs_code" />
+          </t>
+        </td>
+      </tr>
     </t>
-    <t t-if="not o.product_id.type_description">
-    <tr class="second">
-      <td></td>
-      <td colspan="5">
-        <t t-if="o.product_id.country_of_origin_id.code">
+    <t t-if="not line_ids.product_id.type_description">
+      <tr class="second">
+        <td></td>
+        <td colspan="5">
+          <t t-if="line_ids.product_id.country_of_origin_id.code">
           Ursprungsland:
-          <span t-field="o.product_id.country_of_origin_id.code" />
-        </t>
-        <t t-if="o.product_id.hs_code">
+            <span t-field="line_ids.product_id.country_of_origin_id.code" />
+          </t>
+          <t t-if="line_ids.product_id.hs_code">
           / Zollposition:
-          <span t-field="o.product_id.hs_code" />
-        </t>
-      </td>
-    </tr>
+            <span t-field="line_ids.product_id.hs_code" />
+          </t>
+        </td>
+      </tr>
     </t>
   </xpath>
 
diff --git a/snippets/purchase_requisition.report_purchaserequisitions.set_ids.xml b/snippets/purchase_requisition.report_purchaserequisitions.set_ids.xml
index ca6029b1..15d51040 100644
--- a/snippets/purchase_requisition.report_purchaserequisitions.set_ids.xml
+++ b/snippets/purchase_requisition.report_purchaserequisitions.set_ids.xml
@@ -57,4 +57,27 @@
 		<attribute name="id">schedule_date</attribute>
 	</xpath>
 
-</data>
\ No newline at end of file
+</data>
+
+<!--
+<?xml version="1.0"?>
+<data inherit_id="purchase_requisition.report_purchaserequisitions" priority="50">
+
+	<xpath expr="//t[1]/h3" position="attributes">
+		<attribute name="id">title_product</attribute>
+	</xpath>
+
+	<xpath expr="//t[2]/h3" position="attributes">
+		<attribute name="id">title_details</attribute>
+	</xpath>
+	
+	<xpath expr="//span[@t-field='line_ids.product_qty']" position="attributes">
+		<attribute name="id">product_qty</attribute>
+	</xpath>
+	
+	<xpath expr="//t[2]/table" position="attributes">
+		<attribute name="id">details</attribute>
+	</xpath>
+
+</data>
+-->
\ No newline at end of file
diff --git a/snippets/purchase_requisition.report_purchaserequisitions.style_gelso.xml b/snippets/purchase_requisition.report_purchaserequisitions.style_gelso.xml
index bca88e56..8e6a136b 100644
--- a/snippets/purchase_requisition.report_purchaserequisitions.style_gelso.xml
+++ b/snippets/purchase_requisition.report_purchaserequisitions.style_gelso.xml
@@ -4,17 +4,25 @@
 	<xpath expr="//div[hasclass('page')]" position="before">
 		<style>
 			.o_company_1_layout {
-				font-family: Arial;
+				font-family: Roboto;
 				color: #000000;
 			}
-			h2 {
-       			margin-top:10mm;
-       			margin-bottom:3mm;
+			.o_report_layout_boxed {
+        		color: #495057;
+			}
+			.o_report_layout_boxed h2 {
+       			color: #000000;
+			}
+			.o_report_layout_boxed strong {
+       			color: #000000;
+			}
+			.col-3 {
+			  	margin-bottom: 1rem !important;
+			}
+			div#address {
+				font-size: 16px;
+				margin-bottom: 2rem;
 			}
-			div#address_right {
-				font-size: 9pt;
-      }
-	
 		</style>
 	</xpath>
 
diff --git a/snippets/purchase_requisition.report_purchaserequisitions.style_trimada.xml b/snippets/purchase_requisition.report_purchaserequisitions.style_trimada.xml
index af35fb34..69729aa8 100644
--- a/snippets/purchase_requisition.report_purchaserequisitions.style_trimada.xml
+++ b/snippets/purchase_requisition.report_purchaserequisitions.style_trimada.xml
@@ -49,6 +49,9 @@
 			span#qty {
 			  font-weight: bold;
 			}
+			table#summary td {
+			  padding: 0.3rem;
+			}
 	
 		</style>
 	</xpath>
diff --git a/snippets/purchase_requisition.view_purchase_requisition_filter.replace_filter.xml b/snippets/purchase_requisition.view_purchase_requisition_filter.replace_filter.xml
new file mode 100644
index 00000000..281180a5
--- /dev/null
+++ b/snippets/purchase_requisition.view_purchase_requisition_filter.replace_filter.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0"?>
+<data inherit_id="purchase_requisition.view_purchase_requisition_filter" priority="50">
+
+  <xpath expr="/search" position="replace">
+    <search>
+
+      <!-- Filter -->
+      <filter name="my_orders" string="Meine Aufträge" domain="[('user_id', '=', uid)]"/>
+      <filter string="Meine Aufträge in Arbeit" name="in_progress" domain="['&amp;',('user_id', '=', uid),('state', 'in', ('draft','sent', 'open', 'expired'))]"/>
+      <separator/>
+      <filter string="Entwurf" name="filter_state_draft" domain="[('state', '=', 'draft')]"/>
+      <filter string="Gesendet" name="filter_state_sent" domain="[('state', '=', 'sent')]"/>
+      <filter string="Offen" name="filter_state_open" domain="[('state', '=', 'open')]"/>
+      <filter string="Erledigt" name="filter_state_erledigt" domain="[('state', '=', 'done')]"/>
+      <filter string="Abgelaufen" name="filter_state_expired" domain="[('state', '=', 'expired')]"/>
+      <filter string="Abgebrochen" name="filter_state_cancel" domain="[('state', '=', 'cancel')]"/>
+      <separator/>
+      <filter string="Auftragsdatum" name="filter_ordering_date" date="ordering_date"/>
+
+      <!-- Gruppierung -->
+      <filter string="Einkaufsbeauftragter" name="user_id" domain="[]" context="{'group_by': 'user_id'}"/>
+      <filter string="Lieferant" name="vendor_id" domain="[]" context="{'group_by': 'vendor_id'}"/>
+      <filter string="Datum" name="ordering_date" domain="[]" context="{'group_by': 'ordering_date'}"/>
+      <filter string="Status" name="state" domain="[]" context="{'group_by': 'state'}"/>
+
+      <!-- Suche -->
+      <group>
+        <field name="name" string="Order" filter_domain="['|', '|', ('name', 'ilike', self), ('partner_ref', 'ilike', self), ('vendor_id', 'child_of', self)]"/>
+        <field name="vendor_id"/>
+        <field name="user_id"/>
+        <field name="product_id" filter_domain="['|','|',('line_ids.product_id', 'ilike', self),('line_ids.product_id.type_description', 'ilike', self),('line_ids.product_id.type_description2', 'ilike', self)]"/>
+      </group>
+
+    </search>
+  </xpath>
+
+</data>
\ No newline at end of file
diff --git a/snippets/purchase_requisition.view_purchase_requisition_form.date_end_attributes_readonly.xml b/snippets/purchase_requisition.view_purchase_requisition_form.date_end_attributes_readonly.xml
new file mode 100644
index 00000000..eb11859e
--- /dev/null
+++ b/snippets/purchase_requisition.view_purchase_requisition_form.date_end_attributes_readonly.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<data inherit_id="purchase_requisition.view_purchase_requisition_form" priority="50">
+
+  <xpath expr="//field[@name='date_end']" position="attributes">
+    <attribute name="attrs">{'readonly': [('state','not in',('draft','sent','in_progress','open','ongoing'))]}</attribute>
+  </xpath>
+
+</data>
\ No newline at end of file
diff --git a/snippets/purchase_requisition.view_purchase_requisition_form.date_end_attributes_required.xml b/snippets/purchase_requisition.view_purchase_requisition_form.date_end_attributes_required.xml
new file mode 100644
index 00000000..80e7c949
--- /dev/null
+++ b/snippets/purchase_requisition.view_purchase_requisition_form.date_end_attributes_required.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<data inherit_id="purchase_requisition.view_purchase_requisition_form" priority="50">
+
+  <xpath expr="//field[@name='date_end']" position="attributes">
+    <attribute name="required">1</attribute>
+  </xpath>
+
+</data>
\ No newline at end of file
diff --git a/snippets/purchase_requisition.view_purchase_requisition_form.modify_readonly.xml b/snippets/purchase_requisition.view_purchase_requisition_form.modify_readonly.xml
new file mode 100644
index 00000000..15a3f588
--- /dev/null
+++ b/snippets/purchase_requisition.view_purchase_requisition_form.modify_readonly.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<data inherit_id="purchase_requisition.view_purchase_requisition_form" priority="50">
+
+  <xpath expr="//h1/field[@name='name']" position="attributes">
+      <attribute name="attrs">{'readonly': [('state', 'in', ('done','cancel'))]}</attribute>
+  </xpath>
+
+</data>
\ No newline at end of file
diff --git a/snippets/purchase_requisition.view_purchase_requisition_form.modify_states.xml b/snippets/purchase_requisition.view_purchase_requisition_form.modify_states.xml
new file mode 100644
index 00000000..3ae027e2
--- /dev/null
+++ b/snippets/purchase_requisition.view_purchase_requisition_form.modify_states.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<data inherit_id="purchase_requisition.view_purchase_requisition_form" priority="50">
+
+    <xpath expr="//button[@name='action_cancel']" position="attributes">
+        <attribute name="states">ongoing,open</attribute>
+    </xpath>
+    
+</data>
\ No newline at end of file
diff --git a/snippets/purchase_requisition.view_purchase_requisition_form.modify_status_workflow.xml b/snippets/purchase_requisition.view_purchase_requisition_form.modify_status_workflow.xml
new file mode 100644
index 00000000..82f02f9e
--- /dev/null
+++ b/snippets/purchase_requisition.view_purchase_requisition_form.modify_status_workflow.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0"?>
+<data inherit_id="purchase_requisition.view_purchase_requisition_form" priority="50">
+
+    <xpath expr="//button[@name='493']" position="after">
+        <button name="action_order_send" states="draft,sent,open" string="Send by Email" type="object" class="btn-primary"/>
+        <button name="action_open" states="sent" string="Validate" type="object" class="btn-primary"/>
+    </xpath>
+
+    <xpath expr="//button[@name='action_cancel']" position="attributes">
+        <attribute name="states">open</attribute>
+    </xpath>
+
+    <field name="state_blanket_order" position="attributes">
+        <attribute name="statusbar_visible">draft,sent,open,cancel,done</attribute>
+    </field>
+
+    <xpath expr="//button[@name='493']" position="replace">
+        <button name="493" type="action" string="New Quotation" class="btn-primary" attrs="{'invisible': [('state', 'in', ('draft','sent','done','cancel'))]}"/>
+    </xpath>
+
+    <xpath expr="//button[@name='action_draft']" position="attributes">
+        <attribute name="states">done,cancel,done</attribute>
+    </xpath>
+
+    <xpath expr="//button[@name='action_in_progress']" position="replace">
+        <button name="action_open" states="draft" string="Validate" type="object" class="btn-primary"/>
+    </xpath>
+
+</data>
\ No newline at end of file
diff --git a/snippets/purchase_requisition.view_purchase_requisition_form.ordering_date_attributes_required.xml b/snippets/purchase_requisition.view_purchase_requisition_form.ordering_date_attributes_required.xml
new file mode 100644
index 00000000..c44391ab
--- /dev/null
+++ b/snippets/purchase_requisition.view_purchase_requisition_form.ordering_date_attributes_required.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<data inherit_id="purchase_requisition.view_purchase_requisition_form" priority="50">
+
+  <xpath expr="//field[@name='ordering_date']" position="attributes">
+    <attribute name="required">1</attribute>
+  </xpath>
+
+</data>
\ No newline at end of file
diff --git a/snippets/purchase_requisition.view_purchase_requisition_form.relocate_price_unit.xml b/snippets/purchase_requisition.view_purchase_requisition_form.relocate_price_unit.xml
new file mode 100644
index 00000000..905c4f8c
--- /dev/null
+++ b/snippets/purchase_requisition.view_purchase_requisition_form.relocate_price_unit.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<data inherit_id="purchase_requisition.view_purchase_requisition_form" priority="50">
+
+  <xpath expr="//page[@name='products']//field[@name='price_unit']" position="replace"/>
+  <xpath expr="//page[@name='products']//field[@name='product_uom_id']" position="after">
+    <field name="price_unit"/>
+  </xpath>
+
+</data>
\ No newline at end of file
diff --git a/snippets/purchase_requisition.view_purchase_requisition_form.relocate_qty_ordered.xml b/snippets/purchase_requisition.view_purchase_requisition_form.relocate_qty_ordered.xml
new file mode 100644
index 00000000..ea1c7c44
--- /dev/null
+++ b/snippets/purchase_requisition.view_purchase_requisition_form.relocate_qty_ordered.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<data inherit_id="purchase_requisition.view_purchase_requisition_form" priority="50">
+
+  <xpath expr="//page[@name='products']//field[@name='qty_ordered']" position="replace"/>
+  <xpath expr="//page[@name='products']//field[@name='schedule_date']" position="after">
+    <field name="qty_ordered" optional="show"/>
+  </xpath>
+
+</data>
\ No newline at end of file
diff --git a/snippets/purchase_requisition.view_purchase_requisition_form.replace_title.xml b/snippets/purchase_requisition.view_purchase_requisition_form.replace_title.xml
new file mode 100644
index 00000000..0c2d9da4
--- /dev/null
+++ b/snippets/purchase_requisition.view_purchase_requisition_form.replace_title.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<data inherit_id="purchase_requisition.view_purchase_requisition_form" priority="50">
+
+  <xpath expr="//h1/../label" position="replace">
+    <span class="o_form_label" attrs="{'invisible': [('state','not in',('draft','sent'))]}">Request for Quotation </span>
+    <span class="o_form_label" attrs="{'invisible': [('state','in',('draft','sent'))]}">Purchase Order </span>
+  </xpath>
+
+</data>
diff --git a/snippets/purchase_requisition.view_purchase_requisition_tree.add_comment.xml b/snippets/purchase_requisition.view_purchase_requisition_tree.add_comment.xml
new file mode 100644
index 00000000..a6e95340
--- /dev/null
+++ b/snippets/purchase_requisition.view_purchase_requisition_tree.add_comment.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<data inherit_id="purchase_requisition.view_purchase_requisition_tree" priority="50">
+
+  <xpath expr="//field[@name='partner_ref']" position="after">
+    <field name="comment"/>
+  </xpath>
+
+</data>
diff --git a/snippets/purchase_requisition.view_purchase_requisition_tree.add_partner_ref.xml b/snippets/purchase_requisition.view_purchase_requisition_tree.add_partner_ref.xml
new file mode 100644
index 00000000..2d2e0ae5
--- /dev/null
+++ b/snippets/purchase_requisition.view_purchase_requisition_tree.add_partner_ref.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<data inherit_id="purchase_requisition.view_purchase_requisition_tree" priority="50">
+
+  <xpath expr="//field[@name='name']" position="after">
+    <field name="partner_ref"/>
+  </xpath>
+
+</data>
diff --git a/snippets/purchase_requisition.view_purchase_requisition_tree.add_vendor_id.xml b/snippets/purchase_requisition.view_purchase_requisition_tree.add_vendor_id.xml
new file mode 100644
index 00000000..dbba6368
--- /dev/null
+++ b/snippets/purchase_requisition.view_purchase_requisition_tree.add_vendor_id.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<data inherit_id="purchase_requisition.view_purchase_requisition_tree" priority="50">
+
+  <xpath expr="//field[@name='ordering_date']" position="after">
+    <field name="vendor_id"/>
+  </xpath>
+
+</data>
\ No newline at end of file
diff --git a/snippets/purchase_requisition.view_purchase_requisition_tree.relocate_user_id.xml b/snippets/purchase_requisition.view_purchase_requisition_tree.relocate_user_id.xml
new file mode 100644
index 00000000..65b40917
--- /dev/null
+++ b/snippets/purchase_requisition.view_purchase_requisition_tree.relocate_user_id.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<data inherit_id="purchase_requisition.view_purchase_requisition_tree" priority="50">
+
+  <xpath expr="//field[@name='user_id']" position="replace">
+  </xpath>
+
+  <xpath expr="//field[@name='partner_ref']" position="after">
+    <field name="user_id"/>
+  </xpath>
+
+</data>
diff --git a/snippets/purchase_requisition_send.md b/snippets/purchase_requisition_send.md
new file mode 100644
index 00000000..9533cf4e
--- /dev/null
+++ b/snippets/purchase_requisition_send.md
@@ -0,0 +1,21 @@
+---
+prev: ./snippets.md
+---
+# Purchase Requisition Send
+## View Purchase Requisition Form  
+### Relocate Button Action Order Send  
+ID: `mint_system.purchase_requisition_send.view_purchase_requisition_form.relocate_button_action_order_send`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="purchase_requisition_send.view_purchase_requisition_form" priority="50">
+
+    <xpath expr="//button[@name='action_order_send']" position="replace"/>
+    
+    <xpath expr="//button[@name='493']" position="after">
+        <button name="action_order_send" states="draft,sent,ongoing,open" string="Send by Email" type="object" class="btn-primary"/>
+    </xpath>
+
+</data>
+```
+Source: [snippets/purchase_requisition_send.view_purchase_requisition_form.relocate_button_action_order_send.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/purchase_requisition_send.view_purchase_requisition_form.relocate_button_action_order_send.xml)
+
diff --git a/snippets/purchase_requisition_send.view_purchase_requisition_form.relocate_send_button.xml b/snippets/purchase_requisition_send.view_purchase_requisition_form.relocate_send_button.xml
new file mode 100644
index 00000000..50cb8db2
--- /dev/null
+++ b/snippets/purchase_requisition_send.view_purchase_requisition_form.relocate_send_button.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<data inherit_id="purchase_requisition_send.view_purchase_requisition_form" priority="50">
+
+    <xpath expr="//button[@name='action_order_send']" position="replace"/>
+    
+    <xpath expr="//button[@name='493']" position="after">
+        <button name="action_order_send" states="draft,sent,ongoing,open" string="Send by Email" type="object" class="btn-primary"/>
+    </xpath>
+
+</data>
\ No newline at end of file
diff --git a/snippets/sale.md b/snippets/sale.md
index 8b2ced94..8f9b15f0 100644
--- a/snippets/sale.md
+++ b/snippets/sale.md
@@ -1001,42 +1001,52 @@ ID: `mint_system.sale.report_saleorder_document.add_infotable`
     <table id='info'>
       <tr>
         <td width="17%">Date</td>
-        <td width="44%">
+        <td width="40%">
           <span t-field='doc.date_order' t-options='{ "widget": "date" }'/>
         </td>
-        <td width="14%"></td>
-        <td width="25%"></td>
+        <td width="18%">Our Reference</td>
+        <td width="25%">
+          <span t-field='doc.user_id'/>
+        </td>
       </tr>
       <tr>
         <td>Customer No.</td>
         <td>
           <span t-field='doc.partner_id.ref'/>
         </td>
-        <td>Our Reference</td>
-        <td>
-          <span t-field='doc.user_id'/>
-        </td>
-      </tr>
-      <tr>
-        <td>Order</td>
-        <td>
-          <span t-field='doc.client_order_ref'/>
-        </td>
         <td>Delivery Method</td>
         <td>
           <span t-field='doc.carrier_id'/>
         </td>
       </tr>
       <tr>
-        <td>Reference</td>
+        <td>Order</td>
         <td>
-          <span t-field='doc.comment'/>
+          <span t-field='doc.client_order_ref'/>
         </td>
         <td>Incoterm</td>
         <td>
           <span t-field='doc.incoterm'/>
         </td>
       </tr>
+      <tr>
+        <td>Reference</td>
+        <td>
+          <span t-field='doc.comment'/>
+        </td>
+        <t t-if="doc.blanket_order_id">
+          <td>Blanket Order</td>
+          <td>
+            <span t-field='doc.blanket_order_id'/>
+            <t t-if="doc.blanket_order_id.client_order_ref"> /              <span t-field='doc.blanket_order_id.client_order_ref'/>
+            </t>
+          </td>
+        </t>
+        <t t-else="">
+          <td></td>
+          <td></td>
+        </t>
+      </tr>
     </table>
 
   </xpath>
@@ -1894,6 +1904,25 @@ ID: `mint_system.sale.report_saleorder_document.show_default_code`
 ```
 Source: [snippets/sale.report_saleorder_document.show_default_code.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/sale.report_saleorder_document.show_default_code.xml)
 
+### Show Partner Contact Id  
+ID: `mint_system.sale.report_saleorder_document.show_partner_contact_id`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="sale.report_saleorder_document" priority="50">
+
+  <xpath expr="//div[@t-field='doc.partner_id']" position="replace">
+    <t t-if="doc.partner_contact_id">
+      <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}" />
+    </t>
+    <t t-if="not doc.partner_contact_id">
+      <div t-field="doc.partner_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>
+  </xpath>
+
+</data>
+```
+Source: [snippets/sale.report_saleorder_document.show_partner_contact_id.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/sale.report_saleorder_document.show_partner_contact_id.xml)
+
 ### Style Trimada  
 ID: `mint_system.sale.report_saleorder_document.style_trimada`  
 ```xml
@@ -1975,6 +2004,20 @@ ID: `mint_system.sale.report_saleorder_document.style_trimada`
 ```
 Source: [snippets/sale.report_saleorder_document.style_trimada.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/sale.report_saleorder_document.style_trimada.xml)
 
+### X Hide On Sale Order  
+ID: `mint_system.sale.report_saleorder_document.x_hide_on_sale_order`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="sale.report_saleorder_document" priority="50">
+
+	  <xpath expr="//t[@t-foreach='doc.order_line']" position="attributes">
+		<attribute name="t-foreach">doc.order_line.filtered(lambda l: not l.product_id.x_hide_on_sale_order)</attribute>
+	  </xpath>
+
+</data>
+```
+Source: [snippets/sale.report_saleorder_document.x_hide_on_sale_order.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/sale.report_saleorder_document.x_hide_on_sale_order.xml)
+
 ### X Sudio Description  
 ID: `mint_system.sale.report_saleorder_document.x_sudio_description`  
 ```xml
diff --git a/snippets/sale.report_saleorder_document.add_infotable.xml b/snippets/sale.report_saleorder_document.add_infotable.xml
index dc233294..80096026 100644
--- a/snippets/sale.report_saleorder_document.add_infotable.xml
+++ b/snippets/sale.report_saleorder_document.add_infotable.xml
@@ -20,42 +20,52 @@
     <table id='info'>
       <tr>
         <td width="17%">Date</td>
-        <td width="44%">
+        <td width="40%">
           <span t-field='doc.date_order' t-options='{ "widget": "date" }'/>
         </td>
-        <td width="14%"></td>
-        <td width="25%"></td>
+        <td width="18%">Our Reference</td>
+        <td width="25%">
+          <span t-field='doc.user_id'/>
+        </td>
       </tr>
       <tr>
         <td>Customer No.</td>
         <td>
           <span t-field='doc.partner_id.ref'/>
         </td>
-        <td>Our Reference</td>
-        <td>
-          <span t-field='doc.user_id'/>
-        </td>
-      </tr>
-      <tr>
-        <td>Order</td>
-        <td>
-          <span t-field='doc.client_order_ref'/>
-        </td>
         <td>Delivery Method</td>
         <td>
           <span t-field='doc.carrier_id'/>
         </td>
       </tr>
       <tr>
-        <td>Reference</td>
+        <td>Order</td>
         <td>
-          <span t-field='doc.comment'/>
+          <span t-field='doc.client_order_ref'/>
         </td>
         <td>Incoterm</td>
         <td>
           <span t-field='doc.incoterm'/>
         </td>
       </tr>
+      <tr>
+        <td>Reference</td>
+        <td>
+          <span t-field='doc.comment'/>
+        </td>
+        <t t-if="doc.blanket_order_id">
+          <td>Blanket Order</td>
+          <td>
+            <span t-field='doc.blanket_order_id'/>
+            <t t-if="doc.blanket_order_id.client_order_ref"> /              <span t-field='doc.blanket_order_id.client_order_ref'/>
+            </t>
+          </td>
+        </t>
+        <t t-else="">
+          <td></td>
+          <td></td>
+        </t>
+      </tr>
     </table>
 
   </xpath>
diff --git a/snippets/sale.report_saleorder_document.show_partner_contact_id.xml b/snippets/sale.report_saleorder_document.show_partner_contact_id.xml
new file mode 100644
index 00000000..f840379a
--- /dev/null
+++ b/snippets/sale.report_saleorder_document.show_partner_contact_id.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<data inherit_id="sale.report_saleorder_document" priority="50">
+
+  <xpath expr="//div[@t-field='doc.partner_id']" position="replace">
+    <t t-if="doc.partner_contact_id">
+      <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}" />
+    </t>
+    <t t-if="not doc.partner_contact_id">
+      <div t-field="doc.partner_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>
+  </xpath>
+
+</data>
\ No newline at end of file
diff --git a/snippets/sale.report_saleorder_document.x_hide_on_sale_order.xml b/snippets/sale.report_saleorder_document.x_hide_on_sale_order.xml
new file mode 100644
index 00000000..95897183
--- /dev/null
+++ b/snippets/sale.report_saleorder_document.x_hide_on_sale_order.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<data inherit_id="sale.report_saleorder_document" priority="50">
+
+	  <xpath expr="//t[@t-foreach='doc.order_line']" position="attributes">
+		<attribute name="t-foreach">doc.order_line.filtered(lambda l: not l.product_id.x_hide_on_sale_order)</attribute>
+	  </xpath>
+
+</data>
\ No newline at end of file
diff --git a/snippets/sale_blanket_order.md b/snippets/sale_blanket_order.md
index e7ec115b..8d67cbdb 100644
--- a/snippets/sale_blanket_order.md
+++ b/snippets/sale_blanket_order.md
@@ -3,6 +3,33 @@ prev: ./snippets.md
 ---
 # Sale Blanket Order
 ## Report Blanketorder Document  
+### Add Discount  
+ID: `mint_system.sale_blanket_order.report_blanketorder_document.add_discount`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="sale_blanket_order.report_blanketorder_document" priority="50">
+
+
+  <xpath expr="//th[@id='price_subtotal']" position="after">
+
+    <!-- Is there a discount on at least one line? -->
+    <t t-set="display_discount" t-value="any(l.discount for l in doc.line_ids)"/>
+
+    <th name="th_discount" t-if="display_discount" class="text-right" groups="product.group_discount_per_so_line">
+      <span>Disc.%</span>
+    </th>
+  </xpath>
+
+  <xpath expr="//td[@id='price_subtotal']" position="after">
+    <td t-if="display_discount" class="text-right" groups="product.group_discount_per_so_line">
+      <span t-field="l.discount"/>%
+    </td>
+  </xpath>
+
+</data>
+```
+Source: [snippets/sale_blanket_order.report_blanketorder_document.add_discount.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/sale_blanket_order.report_blanketorder_document.add_discount.xml)
+
 ### Add Footer  
 ID: `mint_system.sale_blanket_order.report_blanketorder_document.add_footer`  
 ```xml
@@ -132,39 +159,41 @@ ID: `mint_system.sale_blanket_order.report_blanketorder_document.add_infotable`
         <td width="44%">
           <span t-field='doc.date_confirmed' t-options='{ "widget": "date" }'/>
         </td>
-        <td width="14%"></td>
-        <td width="25%"></td>
+        <td width="14%">Our Reference</td>
+        <td width="25%">
+          <span t-field='doc.user_id'/>
+        </td>
       </tr>
       <tr>
         <td>Customer No.</td>
         <td>
           <span t-field='doc.partner_id.ref'/>
         </td>
-        <td>Our Reference</td>
-        <td>
-          <span t-field='doc.user_id'/>
-        </td>
-      </tr>
-      <tr>
-        <td>Order</td>
-        <td>
-          <span t-field='doc.client_order_ref'/>
-        </td>
         <td>Delivery Method</td>
         <td>
           <span t-field='doc.carrier_id'/>
         </td>
       </tr>
       <tr>
-        <td>Reference</td>
+        <td>Order</td>
         <td>
-          <span t-field='doc.comment'/>
+          <span t-field='doc.client_order_ref'/>
         </td>
         <td>Incoterm</td>
         <td>
           <span t-field='doc.incoterm'/>
         </td>
       </tr>
+      <tr>
+        <td>Reference</td>
+        <td>
+          <span t-field='doc.comment'/>
+        </td>
+        <td>Validity Date</td>
+        <td>
+          <span t-field='doc.validity_date'/>
+        </td>
+      </tr>
     </table>
 
   </xpath>
@@ -278,6 +307,19 @@ ID: `mint_system.sale_blanket_order.report_blanketorder_document.get_position`
 ```
 Source: [snippets/sale_blanket_order.report_blanketorder_document.get_position.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/sale_blanket_order.report_blanketorder_document.get_position.xml)
 
+### Hide Date Schedule  
+ID: `mint_system.sale_blanket_order.report_blanketorder_document.hide_date_schedule`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="sale_blanket_order.report_blanketorder_document" priority="50">
+
+  <xpath expr="//th[@id='date_schedule']" position="replace"/>
+  <xpath expr="//td[@id='date_schedule']" position="replace"/>
+  
+</data>
+```
+Source: [snippets/sale_blanket_order.report_blanketorder_document.hide_date_schedule.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/sale_blanket_order.report_blanketorder_document.hide_date_schedule.xml)
+
 ### Modify Information Block  
 ID: `mint_system.sale_blanket_order.report_blanketorder_document.modify_information_block`  
 ```xml
@@ -359,11 +401,11 @@ ID: `mint_system.sale_blanket_order.report_blanketorder_document.replace_partner
 <data inherit_id="sale_blanket_order.report_blanketorder_document" priority="50">>
 
  <xpath expr="//div[@t-field='doc.partner_id']" position="replace">    
-      <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-if="doc.partner_contact_id">
+        <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}"/>
       </t>
-      <t t-if="not doc.partner_contact_id.parent_name">
-        <div t-field="doc.partner_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-if="not doc.partner_contact_id">
+        <div t-field="doc.partner_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>   
   </xpath>
 
@@ -409,7 +451,7 @@ ID: `mint_system.sale_blanket_order.report_blanketorder_document.replace_summary
           <span t-field="doc.amount_untaxed" t-options="{&quot;widget&quot;: &quot;monetary&quot;, &quot;display_currency&quot;: doc.currency_id}"/>
         </td>
         <td style="width:12%; text-align:left">
-          <span>VAT 7.7%</span>
+          <span>VAT</span>
         </td>
         <td style="width:17%; text-align:left">
           <span t-field="doc.amount_tax" t-options="{&quot;widget&quot;: &quot;monetary&quot;, &quot;display_currency&quot;: doc.currency_id}"/>
@@ -426,7 +468,6 @@ ID: `mint_system.sale_blanket_order.report_blanketorder_document.replace_summary
   </xpath>
 
 </data>
-
 ```
 Source: [snippets/sale_blanket_order.report_blanketorder_document.replace_summary.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/sale_blanket_order.report_blanketorder_document.replace_summary.xml)
 
@@ -555,6 +596,10 @@ ID: `mint_system.sale_blanket_order.report_blanketorder_document.set_ids`
 		<attribute name="id">price_subtotal</attribute>
 	</xpath>
 	
+	xpath expr="//table[2]//td[5]" position="attributes">
+		<attribute name="id">price_subtotal</attribute>
+	</xpath>
+	
 	<xpath expr="//table[2]//th[6]" position="attributes">
 		<attribute name="id">price_total</attribute>
 	</xpath>
@@ -707,6 +752,24 @@ ID: `mint_system.sale_blanket_order.view_blanket_order_form.modify_attributes_da
 ```
 Source: [snippets/sale_blanket_order.view_blanket_order_form.modify_attributes_date_confirmed.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/sale_blanket_order.view_blanket_order_form.modify_attributes_date_confirmed.xml)
 
+### X Product Uom Category Id  
+ID: `mint_system.sale_blanket_order.view_blanket_order_form.x_product_uom_category_id`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="sale_blanket_order.view_blanket_order_form" priority="50">
+
+  <xpath expr="//page[@name='order_lines']//field[@name='product_uom']" position="before">
+    <field name="x_product_uom_category_id" invisible="1" />
+  </xpath>
+
+  <xpath expr="//page[@name='order_lines']//field[@name='product_uom']" position="attributes">
+    <attribute name="domain">[["category_id","=",x_product_uom_category_id]]</attribute>
+  </xpath>
+
+</data>
+```
+Source: [snippets/sale_blanket_order.view_blanket_order_form.x_product_uom_category_id.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/sale_blanket_order.view_blanket_order_form.x_product_uom_category_id.xml)
+
 ## View Blanket Order Search  
 ### Replace Filter  
 ID: `mint_system.sale_blanket_order.view_blanket_order_search.replace_filter`  
@@ -738,7 +801,7 @@ ID: `mint_system.sale_blanket_order.view_blanket_order_search.replace_filter`
 
       <!-- Suche -->
       <group>
-        <field name="name" string="Auftrag"/>
+        <field name="name" string="Order" filter_domain="['|', '|', ('name', 'ilike', self), ('client_order_ref', 'ilike', self), ('partner_id', 'child_of', self)]"/>
         <field name="partner_id"/>
         <field name="user_id"/>
         <field name="team_id"/>
@@ -784,3 +847,22 @@ ID: `mint_system.sale_blanket_order.view_blanket_order_tree.reset_view`
 ```
 Source: [snippets/sale_blanket_order.view_blanket_order_tree.reset_view.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/sale_blanket_order.view_blanket_order_tree.reset_view.xml)
 
+## View Order Form  
+### Modify Attributes Blanket Order Line  
+ID: `mint_system.sale_blanket_order.view_order_form.modify_attributes_blanket_order_line`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="sale_blanket_order.view_order_form" priority="50">
+
+  <xpath expr="//field[@name='blanket_order_line']" position="before">
+    <field name="order_partner_id" invisible="1" />
+  </xpath>
+
+  <xpath expr="//field[@name='blanket_order_line']" position="attributes">
+    <attribute name="domain">[["partner_id","=",order_partner_id]]</attribute>
+  </xpath>
+
+</data>
+```
+Source: [snippets/sale_blanket_order.view_order_form.modify_attributes_blanket_order_line.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/sale_blanket_order.view_order_form.modify_attributes_blanket_order_line.xml)
+
diff --git a/snippets/sale_blanket_order.report_blanketorder_document.add_discount.xml b/snippets/sale_blanket_order.report_blanketorder_document.add_discount.xml
new file mode 100644
index 00000000..196a0335
--- /dev/null
+++ b/snippets/sale_blanket_order.report_blanketorder_document.add_discount.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+<data inherit_id="sale_blanket_order.report_blanketorder_document" priority="50">
+
+
+  <xpath expr="//th[@id='price_subtotal']" position="after">
+
+    <!-- Is there a discount on at least one line? -->
+    <t t-set="display_discount" t-value="any(l.discount for l in doc.line_ids)"/>
+
+    <th name="th_discount" t-if="display_discount" class="text-right" groups="product.group_discount_per_so_line">
+      <span>Disc.%</span>
+    </th>
+  </xpath>
+
+  <xpath expr="//td[@id='price_subtotal']" position="after">
+    <td t-if="display_discount" class="text-right" groups="product.group_discount_per_so_line">
+      <span t-field="l.discount"/>%
+    </td>
+  </xpath>
+
+</data>
\ No newline at end of file
diff --git a/snippets/sale_blanket_order.report_blanketorder_document.add_infotable.xml b/snippets/sale_blanket_order.report_blanketorder_document.add_infotable.xml
index 81798ea9..f7cf77d3 100644
--- a/snippets/sale_blanket_order.report_blanketorder_document.add_infotable.xml
+++ b/snippets/sale_blanket_order.report_blanketorder_document.add_infotable.xml
@@ -23,39 +23,41 @@
         <td width="44%">
           <span t-field='doc.date_confirmed' t-options='{ "widget": "date" }'/>
         </td>
-        <td width="14%"></td>
-        <td width="25%"></td>
+        <td width="14%">Our Reference</td>
+        <td width="25%">
+          <span t-field='doc.user_id'/>
+        </td>
       </tr>
       <tr>
         <td>Customer No.</td>
         <td>
           <span t-field='doc.partner_id.ref'/>
         </td>
-        <td>Our Reference</td>
-        <td>
-          <span t-field='doc.user_id'/>
-        </td>
-      </tr>
-      <tr>
-        <td>Order</td>
-        <td>
-          <span t-field='doc.client_order_ref'/>
-        </td>
         <td>Delivery Method</td>
         <td>
           <span t-field='doc.carrier_id'/>
         </td>
       </tr>
       <tr>
-        <td>Reference</td>
+        <td>Order</td>
         <td>
-          <span t-field='doc.comment'/>
+          <span t-field='doc.client_order_ref'/>
         </td>
         <td>Incoterm</td>
         <td>
           <span t-field='doc.incoterm'/>
         </td>
       </tr>
+      <tr>
+        <td>Reference</td>
+        <td>
+          <span t-field='doc.comment'/>
+        </td>
+        <td>Validity Date</td>
+        <td>
+          <span t-field='doc.validity_date'/>
+        </td>
+      </tr>
     </table>
 
   </xpath>
diff --git a/snippets/sale_blanket_order.report_blanketorder_document.hide_date_schedule.xml b/snippets/sale_blanket_order.report_blanketorder_document.hide_date_schedule.xml
new file mode 100644
index 00000000..aa81e85f
--- /dev/null
+++ b/snippets/sale_blanket_order.report_blanketorder_document.hide_date_schedule.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<data inherit_id="sale_blanket_order.report_blanketorder_document" priority="50">
+
+  <xpath expr="//th[@id='date_schedule']" position="replace"/>
+  <xpath expr="//td[@id='date_schedule']" position="replace"/>
+  
+</data>
\ No newline at end of file
diff --git a/snippets/sale_blanket_order.report_blanketorder_document.replace_partner_id.xml b/snippets/sale_blanket_order.report_blanketorder_document.replace_partner_id.xml
index 40a7f72c..f8629120 100644
--- a/snippets/sale_blanket_order.report_blanketorder_document.replace_partner_id.xml
+++ b/snippets/sale_blanket_order.report_blanketorder_document.replace_partner_id.xml
@@ -2,11 +2,11 @@
 <data inherit_id="sale_blanket_order.report_blanketorder_document" priority="50">>
 
  <xpath expr="//div[@t-field='doc.partner_id']" position="replace">    
-      <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-if="doc.partner_contact_id">
+        <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}"/>
       </t>
-      <t t-if="not doc.partner_contact_id.parent_name">
-        <div t-field="doc.partner_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-if="not doc.partner_contact_id">
+        <div t-field="doc.partner_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>   
   </xpath>
 
diff --git a/snippets/sale_blanket_order.report_blanketorder_document.replace_summary.xml b/snippets/sale_blanket_order.report_blanketorder_document.replace_summary.xml
index dcedf72f..6c7210ee 100644
--- a/snippets/sale_blanket_order.report_blanketorder_document.replace_summary.xml
+++ b/snippets/sale_blanket_order.report_blanketorder_document.replace_summary.xml
@@ -12,7 +12,7 @@
           <span t-field="doc.amount_untaxed" t-options="{&quot;widget&quot;: &quot;monetary&quot;, &quot;display_currency&quot;: doc.currency_id}"/>
         </td>
         <td style="width:12%; text-align:left">
-          <span>VAT 7.7%</span>
+          <span>VAT</span>
         </td>
         <td style="width:17%; text-align:left">
           <span t-field="doc.amount_tax" t-options="{&quot;widget&quot;: &quot;monetary&quot;, &quot;display_currency&quot;: doc.currency_id}"/>
@@ -28,4 +28,4 @@
 
   </xpath>
 
-</data>
+</data>
\ No newline at end of file
diff --git a/snippets/sale_blanket_order.report_blanketorder_document.set_ids.xml b/snippets/sale_blanket_order.report_blanketorder_document.set_ids.xml
index 2b71e210..91aacf98 100644
--- a/snippets/sale_blanket_order.report_blanketorder_document.set_ids.xml
+++ b/snippets/sale_blanket_order.report_blanketorder_document.set_ids.xml
@@ -43,6 +43,10 @@
 		<attribute name="id">price_subtotal</attribute>
 	</xpath>
 	
+	xpath expr="//table[2]//td[5]" position="attributes">
+		<attribute name="id">price_subtotal</attribute>
+	</xpath>
+	
 	<xpath expr="//table[2]//th[6]" position="attributes">
 		<attribute name="id">price_total</attribute>
 	</xpath>
diff --git a/snippets/sale_blanket_order.view_blanket_order_form.x_product_uom_category_id.xml b/snippets/sale_blanket_order.view_blanket_order_form.x_product_uom_category_id.xml
new file mode 100644
index 00000000..ddc26d6b
--- /dev/null
+++ b/snippets/sale_blanket_order.view_blanket_order_form.x_product_uom_category_id.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<data inherit_id="sale_blanket_order.view_blanket_order_form" priority="50">
+
+  <xpath expr="//page[@name='order_lines']//field[@name='product_uom']" position="before">
+    <field name="x_product_uom_category_id" invisible="1" />
+  </xpath>
+
+  <xpath expr="//page[@name='order_lines']//field[@name='product_uom']" position="attributes">
+    <attribute name="domain">[["category_id","=",x_product_uom_category_id]]</attribute>
+  </xpath>
+
+</data>
\ No newline at end of file
diff --git a/snippets/sale_blanket_order.view_blanket_order_search.replace_filter.xml b/snippets/sale_blanket_order.view_blanket_order_search.replace_filter.xml
index 82363060..665f904a 100644
--- a/snippets/sale_blanket_order.view_blanket_order_search.replace_filter.xml
+++ b/snippets/sale_blanket_order.view_blanket_order_search.replace_filter.xml
@@ -25,7 +25,7 @@
 
       <!-- Suche -->
       <group>
-        <field name="name" string="Auftrag"/>
+        <field name="name" string="Order" filter_domain="['|', '|', ('name', 'ilike', self), ('client_order_ref', 'ilike', self), ('partner_id', 'child_of', self)]"/>
         <field name="partner_id"/>
         <field name="user_id"/>
         <field name="team_id"/>
diff --git a/snippets/sale_blanket_order.view_order_form.modify_attributes_blanket_order_line.xml b/snippets/sale_blanket_order.view_order_form.modify_attributes_blanket_order_line.xml
new file mode 100644
index 00000000..2ac53276
--- /dev/null
+++ b/snippets/sale_blanket_order.view_order_form.modify_attributes_blanket_order_line.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<data inherit_id="sale_blanket_order.view_order_form" priority="50">
+
+  <xpath expr="//field[@name='blanket_order_line']" position="before">
+    <field name="order_partner_id" invisible="1" />
+  </xpath>
+
+  <xpath expr="//field[@name='blanket_order_line']" position="attributes">
+    <attribute name="domain">[["partner_id","=",order_partner_id]]</attribute>
+  </xpath>
+
+</data>
\ No newline at end of file
diff --git a/snippets/stock.label_transfer_template_view.trimada.xml b/snippets/stock.label_transfer_template_view.trimada.xml
index badcc1a9..31bd66d6 100644
--- a/snippets/stock.label_transfer_template_view.trimada.xml
+++ b/snippets/stock.label_transfer_template_view.trimada.xml
@@ -27,6 +27,7 @@
                         font-weight: bold;
                         text-align: center;
                         border-bottom: solid 1px;
+                        line-height: 1;
                     }
                     .frame {
                         border-bottom: solid 1px;
@@ -66,7 +67,7 @@
                 <div class="page">
                     <div class="label">
                         <div class="row title">
-                            <div class="col-6 box1">
+                            <div class="col-6 box2">
                                 <span t-esc="move.product_id.default_code"/>
                             </div>
                             <div t-if="move.product_id.barcode" class="col-6 box2 text-right">
diff --git a/snippets/stock.md b/snippets/stock.md
index d5268d7d..32823168 100644
--- a/snippets/stock.md
+++ b/snippets/stock.md
@@ -304,6 +304,7 @@ ID: `mint_system.stock.label_transfer_template_view.trimada`
                         font-weight: bold;
                         text-align: center;
                         border-bottom: solid 1px;
+                        line-height: 1;
                     }
                     .frame {
                         border-bottom: solid 1px;
@@ -343,7 +344,7 @@ ID: `mint_system.stock.label_transfer_template_view.trimada`
                 <div class="page">
                     <div class="label">
                         <div class="row title">
-                            <div class="col-6 box1">
+                            <div class="col-6 box2">
                                 <span t-esc="move.product_id.default_code"/>
                             </div>
                             <div t-if="move.product_id.barcode" class="col-6 box2 text-right">
@@ -393,6 +394,46 @@ ID: `mint_system.stock.label_transfer_template_view.trimada`
 ```
 Source: [snippets/stock.label_transfer_template_view.trimada.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/stock.label_transfer_template_view.trimada.xml)
 
+## Product Template Search Form View Stock  
+### Hide Location Id  
+ID: `mint_system.stock.product_template_search_form_view_stock.hide_location_id`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="stock.product_template_search_form_view_stock" priority="50">
+  
+  <xpath expr="//field[@name='location_id']" position="replace">   
+  </xpath>
+
+</data>
+```
+Source: [snippets/stock.product_template_search_form_view_stock.hide_location_id.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/stock.product_template_search_form_view_stock.hide_location_id.xml)
+
+### Hide Pricelist Id  
+ID: `mint_system.stock.product_template_search_form_view_stock.hide_pricelist_id`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="stock.product_template_search_form_view_stock" priority="50">
+  
+  <xpath expr="//field[@name='pricelist_id']" position="replace">   
+  </xpath>
+
+</data>
+```
+Source: [snippets/stock.product_template_search_form_view_stock.hide_pricelist_id.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/stock.product_template_search_form_view_stock.hide_pricelist_id.xml)
+
+### Hide Warehouse Id  
+ID: `mint_system.stock.product_template_search_form_view_stock.hide_warehouse_id`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="stock.product_template_search_form_view_stock" priority="50">
+  
+  <xpath expr="//field[@name='warehouse_id']" position="replace">   
+  </xpath>
+
+</data>
+```
+Source: [snippets/stock.product_template_search_form_view_stock.hide_warehouse_id.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/stock.product_template_search_form_view_stock.hide_warehouse_id.xml)
+
 ## Report Bordero  
 ### Basis57  
 ID: `mint_system.stock.report_bordero.basis57`  
@@ -425,6 +466,7 @@ ID: `mint_system.stock.report_bordero.basis57`
                             <t t-set="partner_moves" t-value="docs.move_ids_without_package.filtered(lambda x: x.partner_id == partner_id)"/>
                             <t t-set="count_boxes" t-value="sum(partner_moves.mapped('x_count_boxes'))"/>
                             <t t-set="boxes_weight" t-value="sum(partner_moves.mapped('weight'))"/>
+                            <t t-set="cold_storage" t-value="partner_moves.filtered(lambda m: m.product_id.x_storage_temperature &lt; -20)"/>
                             <t t-set="total_boxes" t-value="total_boxes + count_boxes"/>
                             <t t-set="total_weight" t-value="total_weight + boxes_weight"/>
 
@@ -442,6 +484,9 @@ ID: `mint_system.stock.report_bordero.basis57`
                             </td>
                             <td class="text-right">
                                 <span t-esc="count_boxes"/>
+                                <t t-if="cold_storage">
+                                  <span> (TK)</span>
+                                </t>
                             </td>
                             <td class="text-right">
                                 <span t-esc="round(boxes_weight,2)"/>
@@ -475,7 +520,11 @@ ID: `mint_system.stock.report_bordero.basis57`
                 </div>
                 
                 <br/>
-                <p>Bitte die Gebinde beim Kunden sofort zurücknehmen und beim Abholen in Erstfeld die Gebinde retournieren.<br/>Vielen Dank</p>
+                
+                <t t-set="footer" t-value="docs.env['ir.translation'].search([('src', '=', 'stock.report_bordero.basis57.footer')], limit=1)"/>
+                <t t-if="footer">
+                  <p><t t-raw="footer.value"/></p>
+                </t>
 
             </div>
         </t>
@@ -484,6 +533,202 @@ ID: `mint_system.stock.report_bordero.basis57`
 ```
 Source: [snippets/stock.report_bordero.basis57.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/stock.report_bordero.basis57.xml)
 
+## Report Certificatecofc  
+### Tissa  
+ID: `mint_system.stock.report_certificatecofc.tissa`  
+```xml
+<?xml version="1.0"?>
+<t t-name="stock.report_certificatecofc.tissa">
+  <t t-call="web.html_container">
+    <t t-call="web.external_layout">
+      <t t-foreach="docs" t-as="o">
+
+        <style>
+                 table {
+                    width: 100%;
+                    margin-bottom: 25px;
+                    font-size: 11pt;
+                    font-family: arial;
+                  }
+                  table th {
+                    padding: 0 5px 0 5px;
+                  }
+                  table td {
+                    padding: 0 5px 0 5px;
+                  }
+                  table#title {
+                     background-color: rgb(216,216,216);
+                  }
+                  table#subtitel {
+                     margin-bottom: 5px;
+                  }                  
+                  table#info {
+                     border: solid 1px;
+                  }
+                  table#workorder {
+                     border: solid 1px;
+                  }
+                  table#components {
+                     border: solid 1px;
+                  }
+                  h2 {
+                    font-size: 16pt;
+                    font-weight: bold;
+                    margin-top: 10mm;
+                    margin-bottom: 10mm;
+                    text-align: center;
+                  }
+        </style>
+
+        <t t-set="o" t-value="o.with_context(lang=o.partner_id.lang)"/>
+
+        <div class="page">
+
+          <h2>
+            <span>Werkszeugnis nach EN 10 204-3.1 für Glasgewebe</span>
+          </h2>
+
+          <table id='title'>
+            <tr>
+              <td width="50%">Hersteller:</td>
+              <td>
+                <span t-field="o.company_id.name"/>
+,                <span t-field="o.company_id.country_id.code"/>
+-                <span t-field="o.company_id.zip"/>
+                <span t-field="o.company_id.city"/>
+              </td>
+            </tr>
+          </table>
+
+          <table id='info'>
+            <tr>
+              <td width="50%">Hersteller Bezeichnung:</td>
+              <td width="50%">
+                <span t-field="o.product_id.categ_id"/>
+              </td>
+            </tr>
+            <tr>
+              <td>Artikelnr.</td>
+              <td width="50%">
+                <span t-field="o.product_id.name"/>
+              </td>
+            </tr>
+            <tr>
+              <td></td>
+              <td>
+                <span t-field="o.product_id.x_studio_kundenartikelnr"/>
+              </td>
+            </tr>
+            <tr>
+              <td>Liefermenge:</td>
+              <td></td>
+            </tr>
+          </table>
+
+          <table id='workorder'>
+            <tr>
+              <th width="15%">Auftragsnr.</th>
+
+              <th width="25%">Liefermenge</th>
+              <th width="25%">Chargennummer</th>
+
+              <th width="20%">Ausgangsmaterial</th>
+              <th width="15%">Los</th>
+              <th>Auftrag</th>
+
+            </tr>
+
+            <tr>
+              <t t-set="lines" t-value="o.move_line_ids"/>
+              <tr t-foreach="lines" t-as="move_line">
+                <td width="15%">
+                  <span t-field="move_line.lot_id.x_production_id_long"/>
+                </td>
+
+                <td width="25%">
+                  <span t-field="move_line.qty_done"/>
+                </td>
+                <td width="25%">
+                  <span t-field="move_line.lot_id"/>
+                </td>
+
+                <td width="20%">
+                  <span t-field="move_line.lot_id.x_production_ids.move_raw_ids.product_id"/>
+                </td>
+                <td width="15%">
+                  <span t-field="move_line.lot_id.x_production_ids.move_raw_ids.move_line_ids.lot_id"/>
+                </td>
+                <td>
+                  <span t-field="move_line.lot_id.x_production_ids.move_raw_ids.move_line_ids.lot_id.x_production_id"/>
+                  <br/>
+                </td>
+              </tr>
+            </tr>
+          </table>
+
+          <table id='subtitel'>
+            <tr>
+              <td colspan="8" width="100%">
+                          Ausgangsmaterial <span t-field="o.move_line_ids.lot_id.x_production_ids.move_raw_ids.product_id"/>
+, 
+                          Los <span t-field="o.move_line_ids.lot_id.x_production_ids.move_raw_ids.move_line_ids.lot_id"/>
+, 
+                          Auftrag <span t-field="o.move_line_ids.lot_id.x_production_ids.move_raw_ids.move_line_ids.lot_id.x_production_id"/>
+          </td>
+        </tr>
+      </table>
+
+      <table id='components'>
+        <tr>
+          <th width="30%">Komponente</th>
+          <th width="10%">WHG</th>
+          <th width="10%">Titer</th>
+          <th width="10%">Rohmaterialtyp</th>
+          <th width="10%">Filament</th>
+          <th width="10%">Drehung</th>
+          <th width="10%">Schlichte</th>
+          <th width="10%"></th>
+        </tr>
+        <tr>
+
+          <t t-set="prod_lines" t-value="o.move_line_ids.lot_id.x_production_ids.move_raw_ids.move_line_ids.lot_id.x_production_ids.move_raw_ids"/>
+
+          <tr t-foreach="prod_lines" t-as="prod_move_line">
+            <td>
+              <span t-field="prod_move_line.product_id"/>
+            </td>
+            <td>
+            </td>
+            <td>
+              <span t-field="prod_move_line.product_id.product_tmpl_id.x_studio_tex_2"/>
+              <span t-field="prod_move_line.product_id.product_tmpl_id.x_studio_tex_3"/>
+            </td>
+            <td>
+              <span t-field="prod_move_line.product_id.product_tmpl_id.x_studio_rohmaterialtyp"/>
+            </td>
+            <td>
+              <span t-field="prod_move_line.product_id.product_tmpl_id.x_studio_filament"/>
+            </td>
+            <td>
+              <span t-field="prod_move_line.product_id.product_tmpl_id.x_studio_drehung"/>
+            </td>
+            <td>
+            </td>
+            <td>
+            </td>
+          </tr>
+        </tr>
+
+      </table>
+
+    </div>
+  </t>
+</t>
+</t>
+</t>  
+```
+Source: [snippets/stock.report_certificatecofc.tissa.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/stock.report_certificatecofc.tissa.xml)
+
 ## Report Delivery Document  
 ### Add Date  
 ID: `mint_system.stock.report_delivery_document.add_date`  
@@ -1990,6 +2235,22 @@ ID: `mint_system.stock.report_picking.add_delivery_note`
 ```
 Source: [snippets/stock.report_picking.add_delivery_note.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/stock.report_picking.add_delivery_note.xml)
 
+### Add Mrp Production X Note  
+ID: `mint_system.stock.report_picking.add_mrp_production_x_note`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="stock.report_picking" priority="50">
+
+  <xpath expr="//table[@id='main_table']" position="after">
+    <t t-if="o.group_id.mrp_production_ids.x_note != '&lt;p&gt;&lt;br&gt;&lt;/p&gt;'">
+      <p class="mrp_note" t-field="o.group_id.mrp_production_ids.x_note"/>
+    </t>
+  </xpath>
+
+</data>
+```
+Source: [snippets/stock.report_picking.add_mrp_production_x_note.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/stock.report_picking.add_mrp_production_x_note.xml)
+
 ### Barcode Label  
 ID: `mint_system.stock.report_picking.barcode_label`  
 ```xml
@@ -2313,7 +2574,7 @@ ID: `mint_system.stock.report_picking.modify_no_reserved_product`
 <data inherit_id="stock.report_picking" priority="50">
 
   <xpath expr="//t[@t-set='no_reserved_product']" position="attributes">
-    <attribute name="t-value">o.move_lines.filtered(lambda x: x.product_uom_qty != x.reserved_availability)</attribute>
+    <attribute name="t-value">o.move_lines.filtered(lambda x: x.product_uom_qty != x.reserved_availability and x.state!='done')</attribute>
   </xpath>
   
 </data>
@@ -2424,12 +2685,22 @@ ID: `mint_system.stock.report_picking.relocate_quantity`
 		</th>
 	</xpath>
 
-	<xpath expr="//td[@id='product_uom_qty']" position="replace"/>
-
-	<xpath expr="//td[@id='location_dest_id']" position="after">
+  <xpath expr="//td[@id='product_uom_qty']" position="replace"/>
+  
+  <xpath expr="//td[@id='location_dest_id']" position="after">
 		<td id="product_uom_qty">
-			<span id="product_uom_qty" t-if="o.state != 'done'" t-field="ml.product_uom_qty"/>
-			<span id="product_uom_qty_done" t-if="o.state == 'done'" t-field="ml.qty_done"/>
+		  
+			<t t-if="o.state != 'done'">
+			  <span id="product_uom_qty" t-esc="'%g' % ml.product_uom_qty"/>
+			</t>
+			
+			<t t-if="o.state == 'done'">
+			  <span id="qty_done">
+			    (<span t-esc="'%g' % ml.qty_done"/>)
+			  </span>
+			  <span id="product_uom_qty" t-esc="'%g' % ml.product_uom_qty"/>
+			</t>
+	
 			<span t-field="ml.product_uom_id" groups="uom.group_uom"/>
 			<br/>
 			<span id="qty_available" t-field="ml.product_id.qty_available"/>
@@ -2842,6 +3113,10 @@ ID: `mint_system.stock.report_picking.set_ids`
 	<xpath expr="//td[@t-if='has_barcode']" position="attributes">
 		<attribute name="id">barcode</attribute>
 	</xpath>
+	
+	<xpath expr="//th[@name='th_product']/../../.." position="attributes">
+	  <attribute name="id">main_table</attribute>
+	</xpath>
 
 </data>
 ```
@@ -3066,7 +3341,7 @@ ID: `mint_system.stock.report_picking.style_trimada`
 			  text-align: right !important;
 			}
 			table.trimada thead th#product_uom_qty {
-			  width: 25mm;
+			  width: 35mm;
 			  text-align: right;
 			}
 			table.trimada tbody td#position {
@@ -3098,6 +3373,10 @@ ID: `mint_system.stock.report_picking.style_trimada`
 			table.trimada tbody td span#qty_available_uom_id {
 			  font-size: 7pt;
 			}
+			table.trimada tbody td span#qty_done {
+			  font-weight: normal;
+			  font-size: 9pt;
+			}
 			table.trimada #barcode {
 			  text-align: right;
 			}
@@ -3116,6 +3395,11 @@ ID: `mint_system.stock.report_picking.style_trimada`
 				font-size: 9pt;
 				font-family: arial;
 			}
+			.mrp_note {
+				font-size: 9pt;
+				font-family: arial;
+				padding-bottom: 3mm;
+			}
 		</style>
 	</xpath>
 
@@ -3364,6 +3648,24 @@ ID: `mint_system.stock.stock_report_delivery_has_serial_move_line.description_sa
 ```
 Source: [snippets/stock.stock_report_delivery_has_serial_move_line.description_sale.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/stock.stock_report_delivery_has_serial_move_line.description_sale.xml)
 
+### Get Position  
+ID: `mint_system.stock.stock_report_delivery_has_serial_move_line.get_position`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="stock.stock_report_delivery_has_serial_move_line" priority="50">
+
+    <xpath expr="//td[1]" position="before">
+         <t t-if="o.sale_id or o.purchase_id">
+            <td id="position">
+                <span t-esc="move_line.x_position.position"/>
+            </td>
+         </t>
+    </xpath>
+
+</data>
+```
+Source: [snippets/stock.stock_report_delivery_has_serial_move_line.get_position.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/stock.stock_report_delivery_has_serial_move_line.get_position.xml)
+
 ### Pos In Table  
 ID: `mint_system.stock.stock_report_delivery_has_serial_move_line.pos_in_table`  
 ```xml
@@ -3637,6 +3939,21 @@ ID: `mint_system.stock.view_move_form.show_partner`
 ```
 Source: [snippets/stock.view_move_form.show_partner.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/stock.view_move_form.show_partner.xml)
 
+### Show Picking Code  
+ID: `mint_system.stock.view_move_form.show_picking_code`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="stock.view_move_form" priority="50">
+
+  <field name="origin" position="after">
+    <field name="picking_code"/>
+  </field>
+
+</data>
+
+```
+Source: [snippets/stock.view_move_form.show_picking_code.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/stock.view_move_form.show_picking_code.xml)
+
 ### Show Picking Id  
 ID: `mint_system.stock.view_move_form.show_picking_id`  
 ```xml
@@ -3682,6 +3999,21 @@ ID: `mint_system.stock.view_move_form.show_quantity_done`
 ```
 Source: [snippets/stock.view_move_form.show_quantity_done.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/stock.view_move_form.show_quantity_done.xml)
 
+### Show Stock Valuation Layer Ids  
+ID: `mint_system.stock.view_move_form.show_stock_valuation_layer_ids`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="stock.view_move_form" priority="50">
+
+  <field name="move_dest_ids" position="after">
+    <field name="stock_valuation_layer_ids"/>
+  </field>
+
+</data>
+
+```
+Source: [snippets/stock.view_move_form.show_stock_valuation_layer_ids.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/stock.view_move_form.show_stock_valuation_layer_ids.xml)
+
 ## View Move Line Form  
 ### Enable Edit And Create  
 ID: `mint_system.stock.view_move_line_form.enable_edit_and_create`  
@@ -3699,6 +4031,21 @@ ID: `mint_system.stock.view_move_line_form.enable_edit_and_create`
 ```
 Source: [snippets/stock.view_move_line_form.enable_edit_and_create.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/stock.view_move_line_form.enable_edit_and_create.xml)
 
+### Show Move Id  
+ID: `mint_system.stock.view_move_line_form.show_move_id`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="stock.view_move_line_form" priority="50">
+
+  <field name="origin" position="after">
+    <field name="move_id"/>
+  </field>
+
+</data>
+
+```
+Source: [snippets/stock.view_move_line_form.show_move_id.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/stock.view_move_line_form.show_move_id.xml)
+
 ### Show Picking Id  
 ID: `mint_system.stock.view_move_line_form.show_picking_id`  
 ```xml
@@ -3999,6 +4346,22 @@ ID: `mint_system.stock.view_picking_form.x_count_boxes`
 ```
 Source: [snippets/stock.view_picking_form.x_count_boxes.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/stock.view_picking_form.x_count_boxes.xml)
 
+## View Picking Internal Search  
+### Filter Groupby Expected Date  
+ID: `mint_system.stock.view_picking_internal_search.filter_groupby_expected_date`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="stock.view_picking_internal_search" priority="50">
+
+  <filter name="expected_date" position="after">
+    <filter string="Scheduled Date by Day" name="expected_date_day" domain="[]" context="{'group_by': 'scheduled_date:day'}"/>
+  </filter>
+
+</data>
+
+```
+Source: [snippets/stock.view_picking_internal_search.filter_groupby_expected_date.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/stock.view_picking_internal_search.filter_groupby_expected_date.xml)
+
 ## View Production Lot Form  
 ### X Production Id  
 ID: `mint_system.stock.view_production_lot_form.x_production_id`  
@@ -4044,6 +4407,22 @@ ID: `mint_system.stock.view_production_lot_tree.show_qty`
 ```
 Source: [snippets/stock.view_production_lot_tree.show_qty.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/stock.view_production_lot_tree.show_qty.xml)
 
+## View Stock Move Line Operation Tree  
+### Edit Reserved Qty  
+ID: `mint_system.stock.view_stock_move_line_operation_tree.edit_reserved_qty`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="stock.view_stock_move_line_operation_tree" priority="50">
+
+  <field name="product_uom_qty" position="attributes">
+    <attribute name="readonly">0</attribute>
+  </field>
+
+</data>
+
+```
+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 Tree Editable  
 ### Show Reserved Quantity  
 ID: `mint_system.stock.view_stock_quant_tree_editable.show_reserved_quantity`  
diff --git a/snippets/stock.product_template_search_form_view_stock.hide_location_id.xml b/snippets/stock.product_template_search_form_view_stock.hide_location_id.xml
new file mode 100644
index 00000000..2b0ec75b
--- /dev/null
+++ b/snippets/stock.product_template_search_form_view_stock.hide_location_id.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<data inherit_id="stock.product_template_search_form_view_stock" priority="50">
+  
+  <xpath expr="//field[@name='location_id']" position="replace">   
+  </xpath>
+
+</data>
\ No newline at end of file
diff --git a/snippets/stock.product_template_search_form_view_stock.hide_pricelist_id.xml b/snippets/stock.product_template_search_form_view_stock.hide_pricelist_id.xml
new file mode 100644
index 00000000..6fdbdb75
--- /dev/null
+++ b/snippets/stock.product_template_search_form_view_stock.hide_pricelist_id.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<data inherit_id="stock.product_template_search_form_view_stock" priority="50">
+  
+  <xpath expr="//field[@name='pricelist_id']" position="replace">   
+  </xpath>
+
+</data>
\ No newline at end of file
diff --git a/snippets/stock.product_template_search_form_view_stock.hide_warehouse_id.xml b/snippets/stock.product_template_search_form_view_stock.hide_warehouse_id.xml
new file mode 100644
index 00000000..20858af3
--- /dev/null
+++ b/snippets/stock.product_template_search_form_view_stock.hide_warehouse_id.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<data inherit_id="stock.product_template_search_form_view_stock" priority="50">
+  
+  <xpath expr="//field[@name='warehouse_id']" position="replace">   
+  </xpath>
+
+</data>
\ No newline at end of file
diff --git a/snippets/stock.report_bordero.basis57.xml b/snippets/stock.report_bordero.basis57.xml
index aa7d2c58..9f0e4f59 100644
--- a/snippets/stock.report_bordero.basis57.xml
+++ b/snippets/stock.report_bordero.basis57.xml
@@ -26,6 +26,7 @@
                             <t t-set="partner_moves" t-value="docs.move_ids_without_package.filtered(lambda x: x.partner_id == partner_id)"/>
                             <t t-set="count_boxes" t-value="sum(partner_moves.mapped('x_count_boxes'))"/>
                             <t t-set="boxes_weight" t-value="sum(partner_moves.mapped('weight'))"/>
+                            <t t-set="cold_storage" t-value="partner_moves.filtered(lambda m: m.product_id.x_storage_temperature &lt; -20)"/>
                             <t t-set="total_boxes" t-value="total_boxes + count_boxes"/>
                             <t t-set="total_weight" t-value="total_weight + boxes_weight"/>
 
@@ -43,6 +44,9 @@
                             </td>
                             <td class="text-right">
                                 <span t-esc="count_boxes"/>
+                                <t t-if="cold_storage">
+                                  <span> (TK)</span>
+                                </t>
                             </td>
                             <td class="text-right">
                                 <span t-esc="round(boxes_weight,2)"/>
@@ -76,7 +80,11 @@
                 </div>
                 
                 <br/>
-                <p>Bitte die Gebinde beim Kunden sofort zurücknehmen und beim Abholen in Erstfeld die Gebinde retournieren.<br/>Vielen Dank</p>
+                
+                <t t-set="footer" t-value="docs.env['ir.translation'].search([('src', '=', 'stock.report_bordero.basis57.footer')], limit=1)"/>
+                <t t-if="footer">
+                  <p><t t-raw="footer.value"/></p>
+                </t>
 
             </div>
         </t>
diff --git a/snippets/stock.report_certificatecofc.tissa.xml b/snippets/stock.report_certificatecofc.tissa.xml
new file mode 100644
index 00000000..4eddd212
--- /dev/null
+++ b/snippets/stock.report_certificatecofc.tissa.xml
@@ -0,0 +1,189 @@
+<?xml version="1.0"?>
+<t t-name="stock.report_certificatecofc.tissa">
+  <t t-call="web.html_container">
+    <t t-call="web.external_layout">
+      <t t-foreach="docs" t-as="o">
+
+        <style>
+                 table {
+                    width: 100%;
+                    margin-bottom: 25px;
+                    font-size: 11pt;
+                    font-family: arial;
+                  }
+                  table th {
+                    padding: 0 5px 0 5px;
+                  }
+                  table td {
+                    padding: 0 5px 0 5px;
+                  }
+                  table#title {
+                     background-color: rgb(216,216,216);
+                  }
+                  table#subtitel {
+                     margin-bottom: 5px;
+                  }                  
+                  table#info {
+                     border: solid 1px;
+                  }
+                  table#workorder {
+                     border: solid 1px;
+                  }
+                  table#components {
+                     border: solid 1px;
+                  }
+                  h2 {
+                    font-size: 16pt;
+                    font-weight: bold;
+                    margin-top: 10mm;
+                    margin-bottom: 10mm;
+                    text-align: center;
+                  }
+        </style>
+
+        <t t-set="o" t-value="o.with_context(lang=o.partner_id.lang)"/>
+
+        <div class="page">
+
+          <h2>
+            <span>Werkszeugnis nach EN 10 204-3.1 für Glasgewebe</span>
+          </h2>
+
+          <table id='title'>
+            <tr>
+              <td width="50%">Hersteller:</td>
+              <td>
+                <span t-field="o.company_id.name"/>
+,                <span t-field="o.company_id.country_id.code"/>
+-                <span t-field="o.company_id.zip"/>
+                <span t-field="o.company_id.city"/>
+              </td>
+            </tr>
+          </table>
+
+          <table id='info'>
+            <tr>
+              <td width="50%">Hersteller Bezeichnung:</td>
+              <td width="50%">
+                <span t-field="o.product_id.categ_id"/>
+              </td>
+            </tr>
+            <tr>
+              <td>Artikelnr.</td>
+              <td width="50%">
+                <span t-field="o.product_id.name"/>
+              </td>
+            </tr>
+            <tr>
+              <td></td>
+              <td>
+                <span t-field="o.product_id.x_studio_kundenartikelnr"/>
+              </td>
+            </tr>
+            <tr>
+              <td>Liefermenge:</td>
+              <td></td>
+            </tr>
+          </table>
+
+          <table id='workorder'>
+            <tr>
+              <th width="15%">Auftragsnr.</th>
+
+              <th width="25%">Liefermenge</th>
+              <th width="25%">Chargennummer</th>
+
+              <th width="20%">Ausgangsmaterial</th>
+              <th width="15%">Los</th>
+              <th>Auftrag</th>
+
+            </tr>
+
+            <tr>
+              <t t-set="lines" t-value="o.move_line_ids"/>
+              <tr t-foreach="lines" t-as="move_line">
+                <td width="15%">
+                  <span t-field="move_line.lot_id.x_production_id_long"/>
+                </td>
+
+                <td width="25%">
+                  <span t-field="move_line.qty_done"/>
+                </td>
+                <td width="25%">
+                  <span t-field="move_line.lot_id"/>
+                </td>
+
+                <td width="20%">
+                  <span t-field="move_line.lot_id.x_production_ids.move_raw_ids.product_id"/>
+                </td>
+                <td width="15%">
+                  <span t-field="move_line.lot_id.x_production_ids.move_raw_ids.move_line_ids.lot_id"/>
+                </td>
+                <td>
+                  <span t-field="move_line.lot_id.x_production_ids.move_raw_ids.move_line_ids.lot_id.x_production_id"/>
+                  <br/>
+                </td>
+              </tr>
+            </tr>
+          </table>
+
+          <table id='subtitel'>
+            <tr>
+              <td colspan="8" width="100%">
+                          Ausgangsmaterial <span t-field="o.move_line_ids.lot_id.x_production_ids.move_raw_ids.product_id"/>
+, 
+                          Los <span t-field="o.move_line_ids.lot_id.x_production_ids.move_raw_ids.move_line_ids.lot_id"/>
+, 
+                          Auftrag <span t-field="o.move_line_ids.lot_id.x_production_ids.move_raw_ids.move_line_ids.lot_id.x_production_id"/>
+          </td>
+        </tr>
+      </table>
+
+      <table id='components'>
+        <tr>
+          <th width="30%">Komponente</th>
+          <th width="10%">WHG</th>
+          <th width="10%">Titer</th>
+          <th width="10%">Rohmaterialtyp</th>
+          <th width="10%">Filament</th>
+          <th width="10%">Drehung</th>
+          <th width="10%">Schlichte</th>
+          <th width="10%"></th>
+        </tr>
+        <tr>
+
+          <t t-set="prod_lines" t-value="o.move_line_ids.lot_id.x_production_ids.move_raw_ids.move_line_ids.lot_id.x_production_ids.move_raw_ids"/>
+
+          <tr t-foreach="prod_lines" t-as="prod_move_line">
+            <td>
+              <span t-field="prod_move_line.product_id"/>
+            </td>
+            <td>
+            </td>
+            <td>
+              <span t-field="prod_move_line.product_id.product_tmpl_id.x_studio_tex_2"/>
+              <span t-field="prod_move_line.product_id.product_tmpl_id.x_studio_tex_3"/>
+            </td>
+            <td>
+              <span t-field="prod_move_line.product_id.product_tmpl_id.x_studio_rohmaterialtyp"/>
+            </td>
+            <td>
+              <span t-field="prod_move_line.product_id.product_tmpl_id.x_studio_filament"/>
+            </td>
+            <td>
+              <span t-field="prod_move_line.product_id.product_tmpl_id.x_studio_drehung"/>
+            </td>
+            <td>
+            </td>
+            <td>
+            </td>
+          </tr>
+        </tr>
+
+      </table>
+
+    </div>
+  </t>
+</t>
+</t>
+</t>  
\ No newline at end of file
diff --git a/snippets/stock.report_picking.add_mrp_production_x_note.xml b/snippets/stock.report_picking.add_mrp_production_x_note.xml
new file mode 100644
index 00000000..b73c98db
--- /dev/null
+++ b/snippets/stock.report_picking.add_mrp_production_x_note.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<data inherit_id="stock.report_picking" priority="50">
+
+  <xpath expr="//table[@id='main_table']" position="after">
+    <t t-if="o.group_id.mrp_production_ids.x_note != '&lt;p&gt;&lt;br&gt;&lt;/p&gt;'">
+      <p class="mrp_note" t-field="o.group_id.mrp_production_ids.x_note"/>
+    </t>
+  </xpath>
+
+</data>
\ No newline at end of file
diff --git a/snippets/stock.report_picking.modify_no_reserved_product.xml b/snippets/stock.report_picking.modify_no_reserved_product.xml
index 2888ad40..cada21c5 100644
--- a/snippets/stock.report_picking.modify_no_reserved_product.xml
+++ b/snippets/stock.report_picking.modify_no_reserved_product.xml
@@ -2,7 +2,7 @@
 <data inherit_id="stock.report_picking" priority="50">
 
   <xpath expr="//t[@t-set='no_reserved_product']" position="attributes">
-    <attribute name="t-value">o.move_lines.filtered(lambda x: x.product_uom_qty != x.reserved_availability)</attribute>
+    <attribute name="t-value">o.move_lines.filtered(lambda x: x.product_uom_qty != x.reserved_availability and x.state!='done')</attribute>
   </xpath>
   
 </data>
\ No newline at end of file
diff --git a/snippets/stock.report_picking.relocate_quantity.xml b/snippets/stock.report_picking.relocate_quantity.xml
index 512b6577..4ddbfe39 100644
--- a/snippets/stock.report_picking.relocate_quantity.xml
+++ b/snippets/stock.report_picking.relocate_quantity.xml
@@ -9,12 +9,22 @@
 		</th>
 	</xpath>
 
-	<xpath expr="//td[@id='product_uom_qty']" position="replace"/>
-
-	<xpath expr="//td[@id='location_dest_id']" position="after">
+  <xpath expr="//td[@id='product_uom_qty']" position="replace"/>
+  
+  <xpath expr="//td[@id='location_dest_id']" position="after">
 		<td id="product_uom_qty">
-			<span id="product_uom_qty" t-if="o.state != 'done'" t-field="ml.product_uom_qty"/>
-			<span id="product_uom_qty_done" t-if="o.state == 'done'" t-field="ml.qty_done"/>
+		  
+			<t t-if="o.state != 'done'">
+			  <span id="product_uom_qty" t-esc="'%g' % ml.product_uom_qty"/>
+			</t>
+			
+			<t t-if="o.state == 'done'">
+			  <span id="qty_done">
+			    (<span t-esc="'%g' % ml.qty_done"/>)
+			  </span>
+			  <span id="product_uom_qty" t-esc="'%g' % ml.product_uom_qty"/>
+			</t>
+	
 			<span t-field="ml.product_uom_id" groups="uom.group_uom"/>
 			<br/>
 			<span id="qty_available" t-field="ml.product_id.qty_available"/>
diff --git a/snippets/stock.report_picking.set_ids.xml b/snippets/stock.report_picking.set_ids.xml
index d0092e33..67625ae3 100644
--- a/snippets/stock.report_picking.set_ids.xml
+++ b/snippets/stock.report_picking.set_ids.xml
@@ -16,5 +16,9 @@
 	<xpath expr="//td[@t-if='has_barcode']" position="attributes">
 		<attribute name="id">barcode</attribute>
 	</xpath>
+	
+	<xpath expr="//th[@name='th_product']/../../.." position="attributes">
+	  <attribute name="id">main_table</attribute>
+	</xpath>
 
 </data>
\ No newline at end of file
diff --git a/snippets/stock.report_picking.style_trimada.xml b/snippets/stock.report_picking.style_trimada.xml
index fd8c1b5b..45398ad7 100644
--- a/snippets/stock.report_picking.style_trimada.xml
+++ b/snippets/stock.report_picking.style_trimada.xml
@@ -30,7 +30,7 @@
 			  text-align: right !important;
 			}
 			table.trimada thead th#product_uom_qty {
-			  width: 25mm;
+			  width: 35mm;
 			  text-align: right;
 			}
 			table.trimada tbody td#position {
@@ -62,6 +62,10 @@
 			table.trimada tbody td span#qty_available_uom_id {
 			  font-size: 7pt;
 			}
+			table.trimada tbody td span#qty_done {
+			  font-weight: normal;
+			  font-size: 9pt;
+			}
 			table.trimada #barcode {
 			  text-align: right;
 			}
@@ -80,6 +84,11 @@
 				font-size: 9pt;
 				font-family: arial;
 			}
+			.mrp_note {
+				font-size: 9pt;
+				font-family: arial;
+				padding-bottom: 3mm;
+			}
 		</style>
 	</xpath>
 
diff --git a/snippets/stock.stock_report_delivery_has_serial_move_line.get_position.xml b/snippets/stock.stock_report_delivery_has_serial_move_line.get_position.xml
new file mode 100644
index 00000000..ddf4daab
--- /dev/null
+++ b/snippets/stock.stock_report_delivery_has_serial_move_line.get_position.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<data inherit_id="stock.stock_report_delivery_has_serial_move_line" priority="50">
+
+    <xpath expr="//td[1]" position="before">
+         <t t-if="o.sale_id or o.purchase_id">
+            <td id="position">
+                <span t-esc="move_line.move_id.position"/>
+            </td>
+         </t>
+    </xpath>
+
+</data>
\ No newline at end of file
diff --git a/snippets/stock.view_move_form.show_picking_code.xml b/snippets/stock.view_move_form.show_picking_code.xml
new file mode 100644
index 00000000..ecbcde88
--- /dev/null
+++ b/snippets/stock.view_move_form.show_picking_code.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<data inherit_id="stock.view_move_form" priority="50">
+
+  <field name="origin" position="after">
+    <field name="picking_code"/>
+  </field>
+
+</data>
diff --git a/snippets/stock.view_move_form.show_stock_valuation_layer_ids.xml b/snippets/stock.view_move_form.show_stock_valuation_layer_ids.xml
new file mode 100644
index 00000000..e892680f
--- /dev/null
+++ b/snippets/stock.view_move_form.show_stock_valuation_layer_ids.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<data inherit_id="stock.view_move_form" priority="50">
+
+  <field name="move_dest_ids" position="after">
+    <field name="stock_valuation_layer_ids"/>
+  </field>
+
+</data>
diff --git a/snippets/stock.view_move_line_form.show_move_id.xml b/snippets/stock.view_move_line_form.show_move_id.xml
new file mode 100644
index 00000000..b4b51882
--- /dev/null
+++ b/snippets/stock.view_move_line_form.show_move_id.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<data inherit_id="stock.view_move_line_form" priority="50">
+
+  <field name="origin" position="after">
+    <field name="move_id"/>
+  </field>
+
+</data>
diff --git a/snippets/stock.view_picking_internal_search.filter_groupby_expected_date.xml b/snippets/stock.view_picking_internal_search.filter_groupby_expected_date.xml
new file mode 100644
index 00000000..ca8503b2
--- /dev/null
+++ b/snippets/stock.view_picking_internal_search.filter_groupby_expected_date.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<data inherit_id="stock.view_picking_internal_search" priority="50">
+
+  <filter name="expected_date" position="after">
+    <filter string="Scheduled Date by Day" name="expected_date_day" domain="[]" context="{'group_by': 'scheduled_date:day'}"/>
+  </filter>
+
+</data>
diff --git a/snippets/stock.view_stock_move_line_operation_tree.edit_reserved_qty.xml b/snippets/stock.view_stock_move_line_operation_tree.edit_reserved_qty.xml
new file mode 100644
index 00000000..9c84c21a
--- /dev/null
+++ b/snippets/stock.view_stock_move_line_operation_tree.edit_reserved_qty.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<data inherit_id="stock.view_stock_move_line_operation_tree" priority="50">
+
+  <field name="product_uom_qty" position="attributes">
+    <attribute name="readonly">0</attribute>
+  </field>
+
+</data>
diff --git a/snippets/stock_account.md b/snippets/stock_account.md
new file mode 100644
index 00000000..a1cd3c0f
--- /dev/null
+++ b/snippets/stock_account.md
@@ -0,0 +1,48 @@
+---
+prev: ./snippets.md
+---
+# Stock Account
+## Stock Valuation Layer Tree  
+### Add Stock Move Id  
+ID: `mint_system.stock_account.stock_valuation_layer_tree.add_stock_move_id`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="stock_account.stock_valuation_layer_tree" priority="50">
+
+    <xpath expr="//field[@name='product_id']" position="after">
+        <field name="stock_move_id"/>
+    </xpath>
+
+</data>
+```
+Source: [snippets/stock_account.stock_valuation_layer_tree.add_stock_move_id.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/stock_account.stock_valuation_layer_tree.add_stock_move_id.xml)
+
+### Add X Quant Location Id  
+ID: `mint_system.stock_account.stock_valuation_layer_tree.add_x_quant_location_id`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="stock_account.stock_valuation_layer_tree" priority="50">
+
+    <xpath expr="//field[@name='product_id']" position="after">
+        <field name="x_quant_location_id"/>
+    </xpath>
+
+</data>
+```
+Source: [snippets/stock_account.stock_valuation_layer_tree.add_x_quant_location_id.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/stock_account.stock_valuation_layer_tree.add_x_quant_location_id.xml)
+
+## View Inventory Valuation Search  
+### Group By X Quant Location Id  
+ID: `mint_system.stock_account.view_inventory_valuation_search.group_by_x_quant_location_id`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="stock_account.view_inventory_valuation_search" priority="50">
+
+    <xpath expr="//field[@name='product_tmpl_id']" position="after">
+        <filter string="Ort" name="x_quant_location_id" domain="[]" context="{'group_by': 'x_quant_location_id'}"/>
+    </xpath>
+
+</data>
+```
+Source: [snippets/stock_account.view_inventory_valuation_search.group_by_x_quant_location_id.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/stock_account.view_inventory_valuation_search.group_by_x_quant_location_id.xml)
+
diff --git a/snippets/stock_account.stock_valuation_layer_tree.add_stock_move_id.xml b/snippets/stock_account.stock_valuation_layer_tree.add_stock_move_id.xml
new file mode 100644
index 00000000..2e0040cd
--- /dev/null
+++ b/snippets/stock_account.stock_valuation_layer_tree.add_stock_move_id.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<data inherit_id="stock_account.stock_valuation_layer_tree" priority="50">
+
+    <xpath expr="//field[@name='product_id']" position="after">
+        <field name="stock_move_id"/>
+    </xpath>
+
+</data>
\ No newline at end of file
diff --git a/snippets/stock_account.stock_valuation_layer_tree.add_x_quant_location_id.xml b/snippets/stock_account.stock_valuation_layer_tree.add_x_quant_location_id.xml
new file mode 100644
index 00000000..33b62af1
--- /dev/null
+++ b/snippets/stock_account.stock_valuation_layer_tree.add_x_quant_location_id.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<data inherit_id="stock_account.stock_valuation_layer_tree" priority="50">
+
+    <xpath expr="//field[@name='product_id']" position="after">
+        <field name="x_quant_location_id"/>
+    </xpath>
+
+</data>
\ No newline at end of file
diff --git a/snippets/stock_account.view_inventory_valuation_search.group_by_x_quant_location_id.xml b/snippets/stock_account.view_inventory_valuation_search.group_by_x_quant_location_id.xml
new file mode 100644
index 00000000..4fb8f2b0
--- /dev/null
+++ b/snippets/stock_account.view_inventory_valuation_search.group_by_x_quant_location_id.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<data inherit_id="stock_account.view_inventory_valuation_search" priority="50">
+
+    <xpath expr="//field[@name='product_tmpl_id']" position="after">
+        <filter string="Ort" name="x_quant_location_id" domain="[]" context="{'group_by': 'x_quant_location_id'}"/>
+    </xpath>
+
+</data>
\ No newline at end of file
diff --git a/snippets/web.assets_common.set_chatter_width.xml b/snippets/web.assets_common.set_chatter_width.xml
new file mode 100644
index 00000000..5e939cb2
--- /dev/null
+++ b/snippets/web.assets_common.set_chatter_width.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<data inherit_id="web.assets_common" priority="50">
+
+    <xpath expr="." position="inside">
+        <style>
+          @media (min-width: 1534px) {
+            .o_FormRenderer_chatterContainer {
+              max-width: 600px !important;
+            }
+          }
+        </style>
+    </xpath>
+
+</data>
\ No newline at end of file
diff --git a/snippets/web.assets_common.set_form_width.xml b/snippets/web.assets_common.set_form_width.xml
new file mode 100644
index 00000000..00409f7d
--- /dev/null
+++ b/snippets/web.assets_common.set_form_width.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<data inherit_id="web.assets_common" priority="50">
+
+  <xpath expr="." position="inside">
+    <style>
+          @media (min-width: 992px) {
+          .o_form_view .o_form_sheet_bg > .o_form_sheet {
+               max-width: 1450px !important;
+            }
+          }
+    </style>
+  </xpath>
+
+</data>
\ No newline at end of file
diff --git a/snippets/web.external_layout_standard.remove_contact.xml b/snippets/web.external_layout_standard.remove_contact.xml
index 5e0bed20..a88437e8 100644
--- a/snippets/web.external_layout_standard.remove_contact.xml
+++ b/snippets/web.external_layout_standard.remove_contact.xml
@@ -2,6 +2,7 @@
 <!-- Remove contact info in footer -->
 <data inherit_id="web.external_layout_standard" priority="50">
 
+  <!-- Works until Odoo 14.0 -->
 	<xpath expr="//li[@t-if='company.phone']" position="replace">
   </xpath>
   <xpath expr="//li[@t-if='company.email']" position="replace">
diff --git a/snippets/web.external_layout_standard.replace_url.xml b/snippets/web.external_layout_standard.replace_url.xml
index b0ba0538..339ccb71 100644
--- a/snippets/web.external_layout_standard.replace_url.xml
+++ b/snippets/web.external_layout_standard.replace_url.xml
@@ -2,6 +2,7 @@
 <!-- Replace website url in document footer -->
 <data inherit_id="web.external_layout_standard" priority="50">
 
+  <!-- Works until Odoo 14.0 -->
   <xpath expr="//li[@t-if='company.website']" position="replace">
   	<li t-if="company.website" class="list-inline-item d-inline">www.example.ch</li>
   </xpath>
diff --git a/snippets/web.md b/snippets/web.md
index 9af80aba..46417dad 100644
--- a/snippets/web.md
+++ b/snippets/web.md
@@ -81,6 +81,46 @@ ID: `mint_system.web.assets_common.pivot_measure_white_space`
 ```
 Source: [snippets/web.assets_common.pivot_measure_white_space.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/web.assets_common.pivot_measure_white_space.xml)
 
+### Set Chatter Width  
+ID: `mint_system.web.assets_common.set_chatter_width`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="web.assets_common" priority="50">
+
+    <xpath expr="." position="inside">
+        <style>
+          @media (min-width: 1534px) {
+            .o_FormRenderer_chatterContainer {
+              max-width: 600px !important;
+            }
+          }
+        </style>
+    </xpath>
+
+</data>
+```
+Source: [snippets/web.assets_common.set_chatter_width.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/web.assets_common.set_chatter_width.xml)
+
+### Set Form Width  
+ID: `mint_system.web.assets_common.set_form_width`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="web.assets_common" priority="50">
+
+  <xpath expr="." position="inside">
+    <style>
+          @media (min-width: 992px) {
+          .o_form_view .o_form_sheet_bg > .o_form_sheet {
+               max-width: 1450px !important;
+            }
+          }
+    </style>
+  </xpath>
+
+</data>
+```
+Source: [snippets/web.assets_common.set_form_width.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/web.assets_common.set_form_width.xml)
+
 ## Brand Promotion Message  
 ### Remove  
 ID: `mint_system.web.brand_promotion_message.remove`  
@@ -263,6 +303,7 @@ ID: `mint_system.web.external_layout_standard.remove_contact`
 <!-- Remove contact info in footer -->
 <data inherit_id="web.external_layout_standard" priority="50">
 
+  <!-- Works until Odoo 14.0 -->
 	<xpath expr="//li[@t-if='company.phone']" position="replace">
   </xpath>
   <xpath expr="//li[@t-if='company.email']" position="replace">
@@ -355,6 +396,7 @@ ID: `mint_system.web.external_layout_standard.replace_url`
 <!-- Replace website url in document footer -->
 <data inherit_id="web.external_layout_standard" priority="50">
 
+  <!-- Works until Odoo 14.0 -->
   <xpath expr="//li[@t-if='company.website']" position="replace">
   	<li t-if="company.website" class="list-inline-item d-inline">www.example.ch</li>
   </xpath>
diff --git a/task b/task
index 4387a6f9..f61a9063 100755
--- a/task
+++ b/task
@@ -51,9 +51,6 @@ function update-readme() {
         SUMMARY=$(grep 'summary' "$MANIFEST_FILE" -A 1 | tail -1)
         echo "| [$MODULE_NAME]($MODULE_NAME) | $SUMMARY |" >> $1
     done
-
-    # Stage readme file
-    git add REAMDE.md
 }
 
 function get-module-version() {
@@ -116,8 +113,14 @@ function install-native() {
     init-venv
     activate-venv
     
+    # Source: https://gist.github.com/faniska/37f896d5e9de5fee925925d7caf3cb9e
     echo "Install wkhtmltopdf"
-    sudo apt install wkhtmltopdf
+    sudo apt remove wkhtmltopdf
+    cd ~
+    wget https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/0.12.4/wkhtmltox-0.12.4_linux-generic-amd64.tar.xz
+    tar xvf wkhtmltox*.tar.xz
+    sudo mv wkhtmltox/bin/wkhtmlto* /usr/bin
+    sudo apt-get install -y openssl build-essential libssl-dev libxrender-dev git-core libx11-dev libxext-dev libfontconfig1-dev libfreetype6-dev fontconfig
 
     echo "Install xmllint"
     sudo apt install libxml2-utils
@@ -161,7 +164,7 @@ function start() {
     fi
 
     if [[ "$1" =~ "db" ]]; then
-        docker-compose up -d db pgadmin
+        docker-compose up -d db admin
         echo "Open http://localhost:8000 url in your browser."
     fi
 
@@ -175,7 +178,23 @@ function start() {
         activate-venv
         echo "Open http://localhost:8069 url in your browser."
         open-url-with-delay "http://localhost:8069?db=$GIT_BRANCH" & 
-        odoo-bin --config 'config/odoo-native.conf' --dev=all
+        odoo-bin --config 'config/odoo-native.conf' --dev=all --log-handler odoo.tools.convert:DEBUG
+    fi
+
+    if [[ "$1" =~ "mail" ]]; then
+        docker-compose up -d mail
+        echo "Run \`docker exec -it mail setup email add odoo@example.com\`"
+        echo "Run \`docker exec -it mail setup email add test@example.com\`"
+    fi
+}
+
+function down() {
+    if test -z "$1"; then
+        docker-compose down -v
+    fi
+
+    if [[ "$1" =~ "mail" ]]; then
+        docker-compose rm -f -s -v mail
     fi
 }
 
@@ -294,22 +313,6 @@ function generate-module-translation() {
     odoo-bin -d $DATABASE --config 'config/odoo-native.conf' --modules $MODULE_NAME -l $ODOO_LANGUAGE --i18n-export "$MODULE_PATH/i18n/de.po"
 }
 
-function restore-database() {
-    if test -z "$1"; then echo "\$1 is empty."; exit; fi
-    if test -z "$2"; then echo "\$2 is empty."; exit; fi
-
-    # Get database name
-
-    # Extract zip file.
-
-    # Drop database
-
-    # Import databse
-
-    # Copy filestore
-    
-}
-
 function install-module() {
     if test -z "$1"; then echo "\$1 is empty."; exit; fi
 
@@ -386,23 +389,6 @@ function set-admin() {
     docker exec db psql postgres://odoo:odoo@localhost:5432/$DATABASE -c "SELECT login, password FROM res_users WHERE id=2;"
 }
 
-function send-support-mail() {
-    echo "Send mail for support@localhost using curl."
-
-    mkdir -p tmp
-    cat >tmp/email.txt <<EOL
-From: Lara User <user@yourcompany.example.com>
-To: Odoo Support <support@localhost>
-Subject: Support Request
-echo "\$2 is
-Dear Odoo Support,
-
-I request your help
-EOL
-
-    curl smtp://localhost --mail-from admin@yourcompany.example.com --mail-rcpt support@localhost --upload-file tmp/email.txt
-}
-
 function clear-assets() {
     DATABASE=$1
     DATABASE=${DATABASE:="$GIT_BRANCH"}
@@ -491,12 +477,6 @@ function git-pull-submodules() {
         fi;
         cd $CWD
     done
-    # git submodule foreach '
-    #     update=$(git config -f $toplevel/.gitmodules submodule.$name.update)
-    #     if [ -z $update ]; then
-    #         git pull
-    #     fi;
-    # ' | tee git-pull-submodules.log
 }
 
 function release-module() {
@@ -504,12 +484,17 @@ function release-module() {
 
     VERSION=$(get-module-version $1)
     cd $1
+    LAST_TAG=$(git describe --tags)
+    RELEASE_NOTES=$(git log $LAST_TAG..HEAD --oneline)
 
     echo "Tag with v$VERSION ..."
     git tag -a v$VERSION -m "v$VERSION"
 
-    echo "Create release $VERSION ..."
-    gh release create "v$VERSION" -t "Release $VERSION"
+    echo "Release notes:"
+    echo $RELEASE_NOTES
+
+    # echo "Create release $VERSION ..."
+    # gh release create "v$VERSION" -t "Release $VERSION"
 }
 
 function zip-module() {
@@ -743,8 +728,8 @@ function upload-module() {
             curl -u "$NEXTCLOUD_USERNAME:$NEXTCLOUD_PASSWORD" -T "$FILE_PATH" "$NEXTCLOUD_UPLOAD_URL"
             echo "File $FILE_PATH uploaded to $NEXTCLOUD_UPLOAD_URL."
             
-            UPLOADS+="- name: $MODULE\n"
-            UPLOADS+="  version: $VERSION\n"
+            UPLOADS+="  - name: $MODULE\n"
+            UPLOADS+="    version: $VERSION\n"
         fi
     done
 
@@ -831,13 +816,21 @@ function git-mig-branch(){
 
 function patch-database() {
     if test -z "$1"; then echo "\$1 is empty."; exit; fi
-    if test -z "$2"; then echo "\$1 is empty."; exit; fi
+
+    DATABASE=$1
+    MODULE_NAME=$(basename $2)
+
+    # Use default database if second param is not given 
+    if test -z "$2"; then
+        DATABASE="$GIT_BRANCH"
+        MODULE_NAME=$(basename $1)
+    fi
 
     # Generate view name from filename
-    FILENAME=$(basename $2)
+    FILENAME=$(basename $1)
 
-    echo "Apply patch $FILENAME to Database $1."
-    cat $2 | docker exec -i db psql postgres://$POSTGRES_USER:$POSTGRES_PASSWORD@localhost/$1
+    echo "Apply patch $FILENAME to Database $DATABASE."
+    cat $FILENAME | docker exec -i db psql postgres://$POSTGRES_USER:$POSTGRES_PASSWORD@localhost/$DATABASE
     echo "Patching database succeeded"
 }
 
@@ -931,7 +924,7 @@ case "$1" in
         stop $2
         ;;
     kill)
-        docker-compose down -v
+        down $2
         ;;
     logs)
         docker logs odoo -f
diff --git a/task.md b/task.md
index 5c0f438e..22835018 100644
--- a/task.md
+++ b/task.md
@@ -27,20 +27,19 @@
 | install-native              |                  | Install Odoo requirements in source folder.                                               |
 | install-odoo-scripts        |                  | Install Odoo scripts.                                                                     |
 | install-snippet             | [env][path]      | Install snippet xml definition.                                                           |
-| kill                        |                  | Remove docker containers and volumes.                                                     |
+| kill                        | [name]           | Remove docker containers and volumes.                                                     |
 | lint-module                 | [path]           | Run pylint odoo for module.                                                               |
 | lint-snippets               |                  | Run checks for all snippets.                                                              |
 | list                        |                  | List docker services.                                                                     |
 | list-odoo-env               |                  | List odoo env files.                                                                      |
 | logs                        |                  | Tail Odoo Docker container logs.                                                          |
 | odoo-cloc                   | [db]             | Count custom line of codes. Default is branch name.                                       |
-| patch-database              | [db][path]       | Apply sql file to database                                                                |
+| patch-database              | [db][path]       | Apply sql file to database. Default database is branch name.                              |
 | ps                          |                  | List docker processes.                                                                    |
 | release-module              | [path]           | Create GitHub release for a module.                                                       |
 | remove-module               | [db][name]       | Remove target Odoo module.                                                                |
 | remove-submodule            | [path]           | Remove git submodule.                                                                     |
 | restart                     | [name]           | Restart docker container.                                                                 |
-| restore-database            | [path][name]     | Restore target database zip.                                                              |
 | save-config                 | [name]           | Save Odoo database config                                                                 |
 | send-support-mail           |                  | Sends an mail for support@local to smtp://localhost                                       |
 | set-admin                   | [db]             | Sets the password for the first user in database.   Default is branch name.               |
diff --git a/template/ms_custom_module/__manifest__.py b/template/ms_custom_module/__manifest__.py
index c115ee5a..139bcb74 100644
--- a/template/ms_custom_module/__manifest__.py
+++ b/template/ms_custom_module/__manifest__.py
@@ -11,10 +11,10 @@
     "depends": ["base"],
     "data": [
         "security/ir.model.access.csv",
-        "views/report_invoice_document.xml",
+        "report/invoice_document.xml",
         "data/ir_sequence.xml",
         "views/assets.xml",
-        "views/views.xml"
+        "views/sale_order.xml"
     ],
     "qweb": ["static/src/xml/board.xml"],
     "demo": ["demo/demo.xml"],
diff --git a/template/ms_custom_module/views/report_invoice_document.xml b/template/ms_custom_module/report/invoice_document.xml
similarity index 100%
rename from template/ms_custom_module/views/report_invoice_document.xml
rename to template/ms_custom_module/report/invoice_document.xml
diff --git a/template/ms_custom_module/views/views.xml b/template/ms_custom_module/views/sale_order.xml
similarity index 100%
rename from template/ms_custom_module/views/views.xml
rename to template/ms_custom_module/views/sale_order.xml