diff --git a/.gitignore b/.gitignore
index 7b54632e..ecfbd54c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,4 +19,7 @@ public
 dist
 =2.0.0
 =4.0.0
-origin.dump
\ No newline at end of file
+origin.dump
+filestore
+upgraded.dump
+sozialinfo
diff --git a/.gitmodules b/.gitmodules
index 1ccb13c5..a847a992 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -82,10 +82,6 @@
 	path = oca/sale-workflow
 	url = git@github.com:OCA/sale-workflow.git
 	branch = 16.0
-[submodule "oca/dms"]
-	path = oca/dms
-	url = git@github.com:OCA/dms.git
-	branch = 16.0
 [submodule "oca/social"]
 	path = oca/social
 	url = git@github.com:OCA/social.git
@@ -182,10 +178,6 @@
 	path = addons/stock_logistics_workflow
 	url = git@github.com:Mint-System/Odoo-Apps-Stock-Logistics-Workflow.git
 	branch = 16.0
-[submodule "addons/swiss_payroll"]
-	path = addons/swiss_payroll
-	url = git@gitlab.com:mint-system/odoo-apps-swiss-payroll.git
-	branch = 16.0
 [submodule "oca/stock-logistics-workflow"]
 	path = oca/stock-logistics-workflow
 	url = git@github.com:OCA/stock-logistics-workflow.git
@@ -204,5 +196,45 @@
 	branch = 16.0
 [submodule "addons/vertical_saas"]
 	path = addons/vertical_saas
-	url = git@github.com:Mint-System/Odoo-Apps-SaaS.git
+	url = git@github.com:Mint-System/Odoo-Apps-Vertical-SaaS.git
+	branch = 16.0
+[submodule "addons/social"]
+	path = addons/social
+	url = git@github.com:Mint-System/Odoo-Apps-Social.git
+	branch = 16.0
+[submodule "addons/vertical_job_portal"]
+	path = addons/vertical_job_portal
+	url = git@github.com:sozialinfo/odoo-apps-vertical-job-portal.git
+	branch = 16.0
+[submodule "oca/management-system"]
+	path = oca/management-system
+	url = git@github.com:OCA/management-system.git
+	branch = 16.0
+[submodule "oca/hr-holidays"]
+	path = oca/hr-holidays
+	url = git@github.com:OCA/hr-holidays.git
+	branch = 16.0
+[submodule "oca/sale-reporting"]
+	path = oca/sale-reporting
+	url = https://github.com/OCA/sale-reporting.git
+	branch = 16.0
+[submodule "oca/account-reconcile"]
+	path = oca/account-reconcile
+	url = git@github.com:OCA/account-reconcile.git
+	branch = 16.0
+[submodule "addons/account_financial_reporting"]
+	path = addons/account_financial_reporting
+	url = git@github.com:Mint-System/Odoo-Apps-Account-Financial-Reporting.git
+	branch = 16.0
+[submodule "addons/purchase_workflow"]
+	path = addons/purchase_workflow
+	url = git@github.com:Mint-System/Odoo-Apps-Purchase-Workflow.git
+	branch = 16.0
+[submodule "addons/account_invoicing"]
+	path = addons/account_invoicing
+	url = git@github.com:mint-system/odoo-apps-account-invoicing.git
+	branch = 16.0
+[submodule "oca/e-commerce"]
+	path = oca/e-commerce
+	url = git@github.com:OCA/e-commerce.git
 	branch = 16.0
diff --git a/.vscode/settings.json b/.vscode/settings.json
index a32de325..d85556c5 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,11 +1,13 @@
 {
-    "spellright.language": [
-        "en"
-    ],
-    "spellright.documentTypes": [
-        "markdown",
-        "latex",
-        "plaintext"
+    "python.autoComplete.extraPaths": ["./odoo/odoo", "./odoo/addons"],
+    "python.linting.enabled": true,
+    "python.linting.pylintArgs": [
+        "--load-plugins",
+        "pylint_odoo"
     ],
+    "python.formatting.provider": "black",
+    "files.exclude": {
+        "**/*.pyc": true
+    },
     "git.ignoreLimitWarning": true
 }
\ No newline at end of file
diff --git a/.vuepress/sidebar.js b/.vuepress/sidebar.js
index d1123a77..ee486008 100644
--- a/.vuepress/sidebar.js
+++ b/.vuepress/sidebar.js
@@ -1 +1 @@
-export default ['/snippets/account.md','/snippets/account_asset.md','/snippets/account_budget.md','/snippets/account_financial_report.md','/snippets/account_followup.md','/snippets/account_journal_items_report.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_expense.md','/snippets/hr_holidays.md','/snippets/hr_holidays_delegations.md','/snippets/hr_payroll.md','/snippets/hr_recruitment.md','/snippets/hr_timesheet.md','/snippets/industry_fsm.md','/snippets/industry_fsm_sale.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_account.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/survey.md','/snippets/timesheet_grid.md','/snippets/web.md','/snippets/website_discount_voucher.md','/snippets/website_sale.md',]
+export default ['/snippets/account.md','/snippets/account_asset.md','/snippets/account_budget.md','/snippets/account_financial_report.md','/snippets/account_followup.md','/snippets/account_journal_items_report.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_expense.md','/snippets/hr_holidays.md','/snippets/hr_holidays_delegations.md','/snippets/hr_payroll.md','/snippets/hr_recruitment.md','/snippets/hr_timesheet.md','/snippets/industry_fsm.md','/snippets/industry_fsm_sale.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_account.md','/snippets/mrp_workorder.md','/snippets/payment.md','/snippets/portal.md','/snippets/printnode_base.md','/snippets/product.md','/snippets/project.md','/snippets/project_enterprise.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/survey.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 c44f2a23..8d612a72 100644
--- a/README.md
+++ b/README.md
@@ -100,6 +100,14 @@ Scaffold a new module.
 task create-module addons/project_report
 ```
 
+**Load modules from thirdpary folder**
+
+To load modules from a thirdparty folder, set this env var in your `.env` file
+
+```
+ODOO_ADDONS_PATH=,path/to/module/folder
+```
+
 ### Docker
 
 Run Odoo with Docker container.
diff --git a/addons/account_financial_reporting b/addons/account_financial_reporting
new file mode 160000
index 00000000..49fc21e6
--- /dev/null
+++ b/addons/account_financial_reporting
@@ -0,0 +1 @@
+Subproject commit 49fc21e6b5cd85c899faec2382e392591f998bb6
diff --git a/addons/account_invoicing b/addons/account_invoicing
new file mode 160000
index 00000000..2fa54c1a
--- /dev/null
+++ b/addons/account_invoicing
@@ -0,0 +1 @@
+Subproject commit 2fa54c1abe46ca06a67c5db303586cbfa49078de
diff --git a/addons/odoo_apps_partner b/addons/odoo_apps_partner
index 71f3ab67..c3807a5e 160000
--- a/addons/odoo_apps_partner
+++ b/addons/odoo_apps_partner
@@ -1 +1 @@
-Subproject commit 71f3ab67d80fe5a5bb63f2108d53f698fd3fd73e
+Subproject commit c3807a5ea3257d13213a43ffb7b4b48e1a73ca10
diff --git a/addons/partner_contact b/addons/partner_contact
index 7cde1181..4a3744cb 160000
--- a/addons/partner_contact
+++ b/addons/partner_contact
@@ -1 +1 @@
-Subproject commit 7cde11812955be1b96b7e4373a6bc316f124d69d
+Subproject commit 4a3744cbc9a00c55f2dd9a81802a7c6b20c66832
diff --git a/addons/product_attribute b/addons/product_attribute
index 04258d5c..5ef9026d 160000
--- a/addons/product_attribute
+++ b/addons/product_attribute
@@ -1 +1 @@
-Subproject commit 04258d5c91db528982882398e659b21a9a4ec52b
+Subproject commit 5ef9026d310b0939e2b742a3571b604642186b5f
diff --git a/addons/project b/addons/project
index 9a918d22..ecccf10e 160000
--- a/addons/project
+++ b/addons/project
@@ -1 +1 @@
-Subproject commit 9a918d227aa6ef638d8fcc010218b166a6a3f601
+Subproject commit ecccf10ee9deabc3506f32202b9076849fc683a2
diff --git a/addons/purchase_workflow b/addons/purchase_workflow
new file mode 160000
index 00000000..73506478
--- /dev/null
+++ b/addons/purchase_workflow
@@ -0,0 +1 @@
+Subproject commit 7350647884fa1743faf1a022a5cf2be163c25904
diff --git a/addons/sale_workflow b/addons/sale_workflow
index fc3f7a75..37817480 160000
--- a/addons/sale_workflow
+++ b/addons/sale_workflow
@@ -1 +1 @@
-Subproject commit fc3f7a75c649bc57547c04ba088ae294fbc1d3b5
+Subproject commit 37817480edec95c3872762438cd312337af58fd0
diff --git a/addons/server_tools b/addons/server_tools
index 44134c7c..751aff0c 160000
--- a/addons/server_tools
+++ b/addons/server_tools
@@ -1 +1 @@
-Subproject commit 44134c7c6f699261225789f7e17fcf7f0ca9ff53
+Subproject commit 751aff0cabfc20c25f45521c2328d254e7094381
diff --git a/addons/social b/addons/social
new file mode 160000
index 00000000..2bd69fcc
--- /dev/null
+++ b/addons/social
@@ -0,0 +1 @@
+Subproject commit 2bd69fcc760eac3de3c27c5a90f93d36253e53ef
diff --git a/addons/vertical_job_portal b/addons/vertical_job_portal
new file mode 160000
index 00000000..ea74f3ac
--- /dev/null
+++ b/addons/vertical_job_portal
@@ -0,0 +1 @@
+Subproject commit ea74f3ac26818a7cc5fdc839217f5253a6ff7c8f
diff --git a/addons/vertical_saas b/addons/vertical_saas
index eb42976d..90556651 160000
--- a/addons/vertical_saas
+++ b/addons/vertical_saas
@@ -1 +1 @@
-Subproject commit eb42976d03ed37f6189122862dcb54730d65b641
+Subproject commit 90556651f7b2542f398e18bf8f6cefe95d090362
diff --git a/addons/website b/addons/website
index 43cc4a86..a5ed1be9 160000
--- a/addons/website
+++ b/addons/website
@@ -1 +1 @@
-Subproject commit 43cc4a86d797f55413cd6c617a58c39702d611d5
+Subproject commit a5ed1be9f04d96d716af81f25064d0268af60b68
diff --git a/build/cd.Dockerfile b/build/cd.Dockerfile
deleted file mode 100644
index c8ca2715..00000000
--- a/build/cd.Dockerfile
+++ /dev/null
@@ -1,7 +0,0 @@
-FROM jenkins/jenkins
-USER root
-RUN apt-get update \
- && DEBIAN_FRONTEND=noninteractive \
-    apt-get install --no-install-recommends --assume-yes \
-      docker.io
-USER jenkins
\ No newline at end of file
diff --git a/config/checkout_files b/config/checkout_files
index 11b4382c..25375dae 100644
--- a/config/checkout_files
+++ b/config/checkout_files
@@ -11,5 +11,4 @@ package-lock.json
 config/checkout_files
 logo.png
 docker-compose.yml
-snippets.md
-build
\ No newline at end of file
+snippets.md
\ No newline at end of file
diff --git a/config/odoo-native.conf b/config/odoo-native.conf
index 7554621c..bf8ee383 100644
--- a/config/odoo-native.conf
+++ b/config/odoo-native.conf
@@ -1,11 +1,6 @@
 [options]
-addons_path = odoo/addons,enterprise,themes,odoo,oca/partner-contact,addons/server_tools,addons/project,oca/project,oca/web,oca/timesheet,oca/crm,oca/knowledge,oca/server-auth,oca/server-backend,oca/server-ux,oca/brand,oca/hr,oca/website,oca/reporting-engine,oca/server-tools,oca/product-attribute,oca/sale-workflow,oca/dms,oca/social,oca/bank-statement-import,oca/rest-framework,oca/contract,oca/purchase-workflow,oca/stock-logistics-warehouse,oca/account-invoicing,oca/server-env,oca/business-requirement,oca/connector,oca/edi,oca/community-data-files,oca/account-financial-reporting,oca/iot,oca/manufacture,oca/account-closing,oca/account-financial-tools,oca/bank-payment,addons/odoo_apps_partner,addons/sale_workflow,oca/credit-control,addons/hr,addons/manufacture,addons/stock_logistics_workflow,addons/swiss_payroll,oca/stock-logistics-workflow,addons/website,addons/product_attribute,addons/partner_contact,addons/vertical_saas
-; admin_passwd = admin
-admin_passwd = $pbkdf2-sha512$25000$rlUqpfTe2ztn7P2fcw7BOA$J9DDQN5WeT/.hyYeLNtJTOS6PhOsEbCeIN4iFaynjEY1PjW5zZwYVdR19qOEFVPOkR4HuHLi1EsV.juSjEc90w
-limit_time_real = 480
-dbfilter = .*
+admin_passwd = $pbkdf2-sha512$25000$v7dWau29F0LIee/9n/M.pw$uB2sLuvV7I.QlnLCYlR1enNps2D.chZbzavM2g/MAsMXgfkx/AC2X8sTejf4zfe21yOSPOpmdhWTgQSoYqGAPA
+limit_time_real = 600
 db_host = localhost
 db_password = odoo
 db_user = odoo
-;without_demo = True
-;log_level = debug
diff --git a/config/odoo.conf b/config/odoo.conf
index c20a8ee1..71be7ea9 100644
--- a/config/odoo.conf
+++ b/config/odoo.conf
@@ -1,6 +1,6 @@
 [options]
-addons_path = /mnt/enterprise,/mnt/themes,/mnt/oca/partner-contact,/mnt/addons/server_tools,/mnt/addons/project,/mnt/oca/project,/mnt/oca/web,/mnt/oca/timesheet,/mnt/oca/crm,/mnt/oca/knowledge,/mnt/oca/server-auth,/mnt/oca/server-backend,/mnt/oca/server-ux,/mnt/oca/brand,/mnt/oca/hr,/mnt/oca/website,/mnt/oca/reporting-engine,/mnt/oca/server-tools,/mnt/oca/product-attribute,/mnt/oca/sale-workflow,/mnt/oca/dms,/mnt/oca/social,/mnt/oca/bank-statement-import,/mnt/oca/rest-framework,/mnt/oca/contract,/mnt/oca/purchase-workflow,/mnt/oca/stock-logistics-warehouse,/mnt/oca/account-invoicing,/mnt/oca/server-env,/mnt/oca/business-requirement,/mnt/oca/connector,/mnt/oca/edi,/mnt/oca/community-data-files,/mnt/oca/account-financial-reporting,/mnt/oca/iot,/mnt/oca/manufacture,/mnt/oca/account-closing,/mnt/oca/account-financial-tools,/mnt/oca/bank-payment,/mnt/addons/odoo_apps_partner,/mnt/addons/sale_workflow,/mnt/oca/credit-control,/mnt/addons/hr,/mnt/addons/manufacture,/mnt/addons/stock_logistics_workflow,/mnt/addons/swiss_payroll,/mnt/oca/stock-logistics-workflow,/mnt/addons/website,/mnt/addons/product_attribute,/mnt/addons/partner_contact,/mnt/addons/vertical_saas
-admin_passwd = admin
+addons_path = /mnt/enterprise,/mnt/themes,/mnt/oca/partner-contact,/mnt/addons/server_tools,/mnt/addons/project,/mnt/oca/project,/mnt/oca/web,/mnt/oca/timesheet,/mnt/oca/crm,/mnt/oca/knowledge,/mnt/oca/server-auth,/mnt/oca/server-backend,/mnt/oca/server-ux,/mnt/oca/brand,/mnt/oca/hr,/mnt/oca/website,/mnt/oca/reporting-engine,/mnt/oca/server-tools,/mnt/oca/product-attribute,/mnt/oca/sale-workflow,/mnt/oca/social,/mnt/oca/bank-statement-import,/mnt/oca/rest-framework,/mnt/oca/contract,/mnt/oca/purchase-workflow,/mnt/oca/stock-logistics-warehouse,/mnt/oca/account-invoicing,/mnt/oca/server-env,/mnt/oca/business-requirement,/mnt/oca/connector,/mnt/oca/edi,/mnt/oca/community-data-files,/mnt/oca/account-financial-reporting,/mnt/oca/iot,/mnt/oca/manufacture,/mnt/oca/account-closing,/mnt/oca/account-financial-tools,/mnt/oca/bank-payment,/mnt/addons/odoo_apps_partner,/mnt/addons/sale_workflow,/mnt/oca/credit-control,/mnt/addons/hr,/mnt/addons/manufacture,/mnt/addons/stock_logistics_workflow,/mnt/addons/swiss_payroll,/mnt/oca/stock-logistics-workflow,/mnt/addons/website,/mnt/addons/product_attribute,/mnt/addons/partner_contact,/mnt/addons/vertical_saas,/mnt/addons/social,/mnt/addons/vertical_job_portal,/mnt/oca/management-system,/mnt/oca/hr-holidays,/mnt/oca/sale-reporting,/mnt/oca/account-reconcile
+admin_passwd = $pbkdf2-sha512$25000$v7dWau29F0LIee/9n/M.pw$uB2sLuvV7I.QlnLCYlR1enNps2D.chZbzavM2g/MAsMXgfkx/AC2X8sTejf4zfe21yOSPOpmdhWTgQSoYqGAPA
 data_dir = /var/lib/odoo
-limit_time_real = 480
+limit_time_real = 600
 worker = 2
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index c34117f7..a2aeab9f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -49,33 +49,8 @@ services:
     ports:
       - "1025:1025"
       - "8025:8025"
-  dind:
-    image: docker:dind
-    container_name: dind
-    hostname: dind
-    privileged: true
-    environment:
-      DOCKER_TLS_CERTDIR: ''
-    volumes:
-      - cd-data:/var/jenkins_home
-  cd:
-    build:
-      context: build
-      dockerfile: cd.Dockerfile
-    container_name: cd
-    hostname: cd
-    depends_on:
-      - dind
-    privileged: true
-    ports:
-      - "8080:8080"
-    environment:
-      DOCKER_HOST: tcp://dind:2375
-    volumes:
-      - cd-data:/var/jenkins_home
 volumes:
   odoo-data:
   db-data:
   admin-data:
   mail-data:
-  cd-data:
diff --git a/enterprise b/enterprise
index 2540ef93..09d6293c 160000
--- a/enterprise
+++ b/enterprise
@@ -1 +1 @@
-Subproject commit 2540ef93b92e04c46f5731bd382ca2bf031efca2
+Subproject commit 09d6293cbad97ac53430733e03951fc56fbba93d
diff --git a/oca/account-closing b/oca/account-closing
index 128f44fd..e5e0bca4 160000
--- a/oca/account-closing
+++ b/oca/account-closing
@@ -1 +1 @@
-Subproject commit 128f44fd568c34dd7f019953555950a73b274aeb
+Subproject commit e5e0bca4cf5f65652b934d9ed2eb460790b97ca4
diff --git a/oca/account-financial-reporting b/oca/account-financial-reporting
index 9989c4ec..3a74f639 160000
--- a/oca/account-financial-reporting
+++ b/oca/account-financial-reporting
@@ -1 +1 @@
-Subproject commit 9989c4ec2ab1acf002f4e6b40ebbdcd107dcca0e
+Subproject commit 3a74f6394114ba642c9a233089c862d1631f6d98
diff --git a/oca/account-financial-tools b/oca/account-financial-tools
index 855e061e..cda322ce 160000
--- a/oca/account-financial-tools
+++ b/oca/account-financial-tools
@@ -1 +1 @@
-Subproject commit 855e061e5c3e939d87adb5a9ab220d8f27c65f7d
+Subproject commit cda322ce6f37b3bae27ad6805524b86ff3092675
diff --git a/oca/account-invoicing b/oca/account-invoicing
index fc53efde..fc8fbcbc 160000
--- a/oca/account-invoicing
+++ b/oca/account-invoicing
@@ -1 +1 @@
-Subproject commit fc53efde622bd0372aa06d9ab94032a0504d1a10
+Subproject commit fc8fbcbc228a876c66221e959d41fae73cb420d8
diff --git a/oca/account-reconcile b/oca/account-reconcile
new file mode 160000
index 00000000..ed0c352f
--- /dev/null
+++ b/oca/account-reconcile
@@ -0,0 +1 @@
+Subproject commit ed0c352f5e045e42d521cea336e43dcbc5f52c21
diff --git a/oca/bank-payment b/oca/bank-payment
index bd092012..42eb528d 160000
--- a/oca/bank-payment
+++ b/oca/bank-payment
@@ -1 +1 @@
-Subproject commit bd0920127571554e53c9820e3ca94ad08d2b1513
+Subproject commit 42eb528d02100e9e3ac631bc495f68caec48335e
diff --git a/oca/bank-statement-import b/oca/bank-statement-import
index c24add14..db018786 160000
--- a/oca/bank-statement-import
+++ b/oca/bank-statement-import
@@ -1 +1 @@
-Subproject commit c24add14ed5d18638971a3289a58f48467d58382
+Subproject commit db0187863592c16c707e4bd9b1a145d84e4f33b4
diff --git a/oca/brand b/oca/brand
index 727faee2..1eca8ad7 160000
--- a/oca/brand
+++ b/oca/brand
@@ -1 +1 @@
-Subproject commit 727faee29e5196007f407890995b68ecdde7a7cb
+Subproject commit 1eca8ad74ca22b417b37c4b3ec305c2b471bdafb
diff --git a/oca/business-requirement b/oca/business-requirement
index 7da6b420..8cfb5f4b 160000
--- a/oca/business-requirement
+++ b/oca/business-requirement
@@ -1 +1 @@
-Subproject commit 7da6b42091b8a43abcb113a05838fb0cf753a284
+Subproject commit 8cfb5f4b405c88d98429a58870c474582fdbebb6
diff --git a/oca/community-data-files b/oca/community-data-files
index f30be9a4..164f3e32 160000
--- a/oca/community-data-files
+++ b/oca/community-data-files
@@ -1 +1 @@
-Subproject commit f30be9a406b8bdcd845d391f381a625957b6fdcb
+Subproject commit 164f3e328a00fea7b10ea9bba604551963202607
diff --git a/oca/connector b/oca/connector
index f83b233b..46effeac 160000
--- a/oca/connector
+++ b/oca/connector
@@ -1 +1 @@
-Subproject commit f83b233bb02683e674c2fa2c360524dcfa5ddb7f
+Subproject commit 46effeac5a3c879510e4d50213f0c89dfc455ea5
diff --git a/oca/contract b/oca/contract
index dbaacd46..38b35570 160000
--- a/oca/contract
+++ b/oca/contract
@@ -1 +1 @@
-Subproject commit dbaacd46775af9c54645629bf093320ae92e7dd4
+Subproject commit 38b355709f6f0c0e3f5c50c128d850e3c3ff7b99
diff --git a/oca/credit-control b/oca/credit-control
index 672a2217..d02f51f3 160000
--- a/oca/credit-control
+++ b/oca/credit-control
@@ -1 +1 @@
-Subproject commit 672a2217e8eb8c1bb3fc3570e9cf4692c2cc6c38
+Subproject commit d02f51f30ba65b03573ead14a354a131ab3d66bf
diff --git a/oca/crm b/oca/crm
index e2f6fdf7..3474b985 160000
--- a/oca/crm
+++ b/oca/crm
@@ -1 +1 @@
-Subproject commit e2f6fdf736b682d4dfff682a3a309076b1f4ffdf
+Subproject commit 3474b98511d8a0a80be07ffd7f1816a48b56430b
diff --git a/oca/dms b/oca/dms
index c4a707a5..592d7a7f 160000
--- a/oca/dms
+++ b/oca/dms
@@ -1 +1 @@
-Subproject commit c4a707a565b783a841d61fb11a9988a5acde1691
+Subproject commit 592d7a7ff9c64a03b2a2f4bfd8bf4333997d7cb0
diff --git a/oca/e-commerce b/oca/e-commerce
new file mode 160000
index 00000000..2314f0e0
--- /dev/null
+++ b/oca/e-commerce
@@ -0,0 +1 @@
+Subproject commit 2314f0e0014591c6986f431d71b25ab1e7c49511
diff --git a/oca/edi b/oca/edi
index b92e8f48..32a0e493 160000
--- a/oca/edi
+++ b/oca/edi
@@ -1 +1 @@
-Subproject commit b92e8f482af746870f719598b9ed52da4d34955f
+Subproject commit 32a0e4938f755cbcce815c5ab613794056a8ad2c
diff --git a/oca/hr b/oca/hr
index 9b4ed10a..2503296e 160000
--- a/oca/hr
+++ b/oca/hr
@@ -1 +1 @@
-Subproject commit 9b4ed10a473bf7b9398adfd2e09c1254ebba1c2f
+Subproject commit 2503296ecbb20fbf2890b0df6340545f4d30d6b2
diff --git a/oca/hr-attendance b/oca/hr-attendance
index c3557e5a..35e0e0f4 160000
--- a/oca/hr-attendance
+++ b/oca/hr-attendance
@@ -1 +1 @@
-Subproject commit c3557e5af1cb732ab9b3a630b60b3254612270af
+Subproject commit 35e0e0f4332052eeb749b69ddd1960954ea9a955
diff --git a/oca/hr-holidays b/oca/hr-holidays
index a831e7cc..5d30c886 160000
--- a/oca/hr-holidays
+++ b/oca/hr-holidays
@@ -1 +1 @@
-Subproject commit a831e7cc950d890ed38a977acb6afe23b8f1e08a
+Subproject commit 5d30c88677037fa28d4f95303a92d6c7d83ea111
diff --git a/oca/iot b/oca/iot
index 520eba08..b8e1e3d6 160000
--- a/oca/iot
+++ b/oca/iot
@@ -1 +1 @@
-Subproject commit 520eba08122e047a08aa05c9e1e80774acf7f6a1
+Subproject commit b8e1e3d63efbdb3bc029a0da3e7adbdd60485658
diff --git a/oca/knowledge b/oca/knowledge
index cb2f10d8..acebd9ca 160000
--- a/oca/knowledge
+++ b/oca/knowledge
@@ -1 +1 @@
-Subproject commit cb2f10d8ce4080965ce6a1421ca21eb214a63171
+Subproject commit acebd9ca3be5755abfcd62b2603795c55a262660
diff --git a/oca/l10n-switzerland b/oca/l10n-switzerland
index bb7affa6..370e2390 160000
--- a/oca/l10n-switzerland
+++ b/oca/l10n-switzerland
@@ -1 +1 @@
-Subproject commit bb7affa612a459bcdf094bd13a5116896bea8f19
+Subproject commit 370e23903c56c3300dfa7369ec94321bca0f8b30
diff --git a/oca/maintenance b/oca/maintenance
new file mode 160000
index 00000000..01a9f91a
--- /dev/null
+++ b/oca/maintenance
@@ -0,0 +1 @@
+Subproject commit 01a9f91afa03eee833c3d8507f0aa2a03bcbca79
diff --git a/oca/management-system b/oca/management-system
new file mode 160000
index 00000000..33eaad2d
--- /dev/null
+++ b/oca/management-system
@@ -0,0 +1 @@
+Subproject commit 33eaad2d980501ac6ad4b216f4d98ec3d422f04f
diff --git a/oca/manufacture b/oca/manufacture
index fe33b288..e3cb91d1 160000
--- a/oca/manufacture
+++ b/oca/manufacture
@@ -1 +1 @@
-Subproject commit fe33b288b2a9d31524c935b280cd3ae5119f32e8
+Subproject commit e3cb91d140100ce9de4273109299b86658dccf6a
diff --git a/oca/partner-contact b/oca/partner-contact
index b45d89cc..ef760295 160000
--- a/oca/partner-contact
+++ b/oca/partner-contact
@@ -1 +1 @@
-Subproject commit b45d89ccd20781acfa9af3ba15aaa910762f4166
+Subproject commit ef760295302254d74d09217c2072386fc3694d3f
diff --git a/oca/product-attribute b/oca/product-attribute
index aedd5ecb..bda6cf08 160000
--- a/oca/product-attribute
+++ b/oca/product-attribute
@@ -1 +1 @@
-Subproject commit aedd5ecbaa060ef556b5ddb85afef725e1572508
+Subproject commit bda6cf083b6fe5cfe8402f449e1a6b7e058b9df3
diff --git a/oca/project b/oca/project
index 61db201e..6fc93584 160000
--- a/oca/project
+++ b/oca/project
@@ -1 +1 @@
-Subproject commit 61db201e0b7715dbee43272cc553db7ac7e39372
+Subproject commit 6fc935848f82ff0d82f7a983c8f1c5ee12a1f221
diff --git a/oca/purchase-workflow b/oca/purchase-workflow
index b22e7337..973e865a 160000
--- a/oca/purchase-workflow
+++ b/oca/purchase-workflow
@@ -1 +1 @@
-Subproject commit b22e7337a32a956ba8cb66135a042ab8a7d38d9e
+Subproject commit 973e865ad8fed78e7b170de725ab44fe3d0e91a8
diff --git a/oca/reporting-engine b/oca/reporting-engine
index a32ae6f1..7b7a04f4 160000
--- a/oca/reporting-engine
+++ b/oca/reporting-engine
@@ -1 +1 @@
-Subproject commit a32ae6f1913b7f613b61c63e8932a68655a80685
+Subproject commit 7b7a04f4bf62c82eda95e1a7201fe7b8160a0a7b
diff --git a/oca/rest-framework b/oca/rest-framework
index e0d438cc..e9b65cf1 160000
--- a/oca/rest-framework
+++ b/oca/rest-framework
@@ -1 +1 @@
-Subproject commit e0d438cc6247ae5e8d8d595a0bcca476b9c365c7
+Subproject commit e9b65cf1ceb30101cdf0d951d29e056a2d2c284a
diff --git a/oca/sale-reporting b/oca/sale-reporting
new file mode 160000
index 00000000..91209558
--- /dev/null
+++ b/oca/sale-reporting
@@ -0,0 +1 @@
+Subproject commit 91209558d47455814f6209170a14b81889cd30a4
diff --git a/oca/sale-workflow b/oca/sale-workflow
index 9bfedca7..37ac9ba3 160000
--- a/oca/sale-workflow
+++ b/oca/sale-workflow
@@ -1 +1 @@
-Subproject commit 9bfedca79d801493a66bb5ee7ae047e62d75a361
+Subproject commit 37ac9ba3fabf1fdab7aca885661a37e75b8b24ff
diff --git a/oca/server-auth b/oca/server-auth
index 474ee205..6c78001d 160000
--- a/oca/server-auth
+++ b/oca/server-auth
@@ -1 +1 @@
-Subproject commit 474ee20533596d30ce5fab65f85a0368838e629e
+Subproject commit 6c78001d180a30c4b4048d7c24f488e3ca140e15
diff --git a/oca/server-backend b/oca/server-backend
index 73e42f7e..3890046f 160000
--- a/oca/server-backend
+++ b/oca/server-backend
@@ -1 +1 @@
-Subproject commit 73e42f7e3f3bbd745f6cbbe7699501f79d5f18d9
+Subproject commit 3890046f3565850e0cc733c20fe0f2928e0cc091
diff --git a/oca/server-env b/oca/server-env
index a652e169..c32e1200 160000
--- a/oca/server-env
+++ b/oca/server-env
@@ -1 +1 @@
-Subproject commit a652e1690e05d239edf8b3d772894c2d34786ad2
+Subproject commit c32e12002481847854375db8077910e6848b419a
diff --git a/oca/server-tools b/oca/server-tools
index 462a3db5..3a530518 160000
--- a/oca/server-tools
+++ b/oca/server-tools
@@ -1 +1 @@
-Subproject commit 462a3db5d65621d9c3cf76ddb5adec104e25642e
+Subproject commit 3a5305184a8eb87ce60b7acaa0b0465b1e5f8afc
diff --git a/oca/server-ux b/oca/server-ux
index a3de5198..7daab0ad 160000
--- a/oca/server-ux
+++ b/oca/server-ux
@@ -1 +1 @@
-Subproject commit a3de5198df014210f7f7050798ea0fdcc41d6c8b
+Subproject commit 7daab0ad9006ee1d6de60e817febdcb317f3f52b
diff --git a/oca/social b/oca/social
index 49e79f73..190fc700 160000
--- a/oca/social
+++ b/oca/social
@@ -1 +1 @@
-Subproject commit 49e79f73016da06b453cccce422a051015d634ed
+Subproject commit 190fc700c26e66421577acb4d67a982c1644b323
diff --git a/oca/stock-logistics-warehouse b/oca/stock-logistics-warehouse
index d0e598bb..3b0e90f3 160000
--- a/oca/stock-logistics-warehouse
+++ b/oca/stock-logistics-warehouse
@@ -1 +1 @@
-Subproject commit d0e598bb65d7029a32010bdb3fb08f3e84559af8
+Subproject commit 3b0e90f3e0a84358b051e1797a543b3f9ecd5880
diff --git a/oca/stock-logistics-workflow b/oca/stock-logistics-workflow
index a39fa273..d85eb899 160000
--- a/oca/stock-logistics-workflow
+++ b/oca/stock-logistics-workflow
@@ -1 +1 @@
-Subproject commit a39fa27335656aac19b6a882f8d9b1ad3b23c20a
+Subproject commit d85eb8998d73e6c33bc272ebddcdff367adaca1a
diff --git a/oca/survey b/oca/survey
new file mode 160000
index 00000000..8be897a1
--- /dev/null
+++ b/oca/survey
@@ -0,0 +1 @@
+Subproject commit 8be897a176c3d98d277eb6b8138e9c30e671e841
diff --git a/oca/timesheet b/oca/timesheet
index 3cbade3e..b289ee29 160000
--- a/oca/timesheet
+++ b/oca/timesheet
@@ -1 +1 @@
-Subproject commit 3cbade3e87b362b59c2c6ec8afb10ee43c436e05
+Subproject commit b289ee293cad294181089acafc1f0ba789493e0b
diff --git a/oca/web b/oca/web
index 2441ebfc..5dc42ccd 160000
--- a/oca/web
+++ b/oca/web
@@ -1 +1 @@
-Subproject commit 2441ebfc68878bb0eef374817258184aa60887e4
+Subproject commit 5dc42ccd75641d6de4c0dd7a0b82ae781441d424
diff --git a/oca/website b/oca/website
index 6eff3efc..bf9fd731 160000
--- a/oca/website
+++ b/oca/website
@@ -1 +1 @@
-Subproject commit 6eff3efcf40756e9a63d9e37d272df5f85b289ff
+Subproject commit bf9fd7314f1dde157718e8ff9d2ca947f2f6bac3
diff --git a/odoo b/odoo
index 3619f77c..b2727949 160000
--- a/odoo
+++ b/odoo
@@ -1 +1 @@
-Subproject commit 3619f77c73092e800aab10f0df09ca5775545da3
+Subproject commit b27279492fea98f2cd6bfba962bfd570e464d361
diff --git a/package.json b/package.json
index 334d7b26..be5d442c 100644
--- a/package.json
+++ b/package.json
@@ -27,7 +27,7 @@
     "build"
   ],
   "author": "Mint System",
-  "license": "GPL3",
+  "license": "GPL-3.0",
   "bugs": {
     "url": "https://github.com/Mint-System/Odoo-Build/issues"
   },
diff --git a/scripts/odoo16_ir_actions_report_check b/scripts/odoo16_ir_actions_report_check
new file mode 100755
index 00000000..480e6b44
--- /dev/null
+++ b/scripts/odoo16_ir_actions_report_check
@@ -0,0 +1,34 @@
+#!/bin/bash
+
+# Get script name
+SCRIPT=$(basename "$0")
+
+# First param is docker container
+CONTAINER=odoo36
+
+# Default configuration
+PACKAGE_PATH="/usr/lib/python3/dist-packages/"
+
+# Custom configuration
+FILE_PATH="${PACKAGE_PATH}odoo/addons/base/models/ir_actions_report.py"
+FIND="if report_sudo.attachment and set(res_ids_wo_stream) != set(html_ids):"
+REPLACE="if not report_sudo.attachment and set(res_ids_wo_stream) != set(html_ids):"
+
+# Get filename
+FILE=$(basename "$FILE_PATH")
+
+# Copy from docker
+docker cp "$CONTAINER":"$FILE_PATH" .
+
+# Find and replace
+sed -i'' "s/$FIND/$REPLACE/g" $FILE
+
+# Copy back to docker
+docker cp $FILE "$CONTAINER":"$FILE_PATH"
+
+# Remove file
+rm -f $FILE
+
+# Register patch installation
+echo "Patch $SCRIPT applied."
+touch "/etc/odoo/${SCRIPT}_${CONTAINER}_installed"
diff --git a/scripts/odoo16_microsoft_outlook_expires_in_patch b/scripts/odoo16_microsoft_outlook_expires_in_patch
new file mode 100755
index 00000000..6c4f8f32
--- /dev/null
+++ b/scripts/odoo16_microsoft_outlook_expires_in_patch
@@ -0,0 +1,34 @@
+#!/bin/bash
+
+# Get script name
+SCRIPT=$(basename "$0")
+
+# First param is docker container
+CONTAINER=$1
+
+# Default configuration
+PACKAGE_PATH="/usr/lib/python3/dist-packages/"
+
+# Custom configuration
+FILE_PATH="${PACKAGE_PATH}odoo/addons/microsoft_outlook/models/microsoft_outlook_mixin.py"
+FIND="response\['expires_in'\],"
+REPLACE="int(response['expires_in']),"
+
+# Get filename
+FILE=`basename "$FILE_PATH"`
+
+# Copy from docker
+docker cp "$CONTAINER":"$FILE_PATH" .
+
+# Find and replace
+sed -i'' "s/$FIND/$REPLACE/g" $FILE
+
+# Copy back to docker
+docker cp $FILE "$CONTAINER":"$FILE_PATH"
+
+# Remove file
+# rm -f $FILE
+
+# Register patch installation
+echo "Patch $SCRIPT applied."
+touch "/etc/odoo/${SCRIPT}_${CONTAINER}_installed"
diff --git a/scripts/odoo16_sale_timesheet_line_exclude_depends b/scripts/odoo16_sale_timesheet_line_exclude_depends
new file mode 100755
index 00000000..d451a968
--- /dev/null
+++ b/scripts/odoo16_sale_timesheet_line_exclude_depends
@@ -0,0 +1,31 @@
+#!/bin/bash
+
+# Get script name
+SCRIPT=$(basename "$0")
+
+# First param is docker container
+CONTAINER=$1
+
+# Custom configuration
+FILE_PATH="/mnt/addons/sale_timesheet_line_exclude/__manifest__.py"
+FIND='"depends": ["sale_timesheet"],'
+REPLACE='"depends": ["sale_timesheet", "industry_fsm_sale"],'
+
+# Get filename
+FILE=`basename "$FILE_PATH"`
+
+# Copy from docker
+docker cp "$CONTAINER":"$FILE_PATH" .
+
+# Find and replace
+sed -i'' "s/$FIND/$REPLACE/g" $FILE
+
+# Copy back to docker
+docker cp $FILE "$CONTAINER":"$FILE_PATH"
+
+# Remove file
+rm -f $FILE
+
+# Register patch installation
+echo "Patch $SCRIPT applied."
+touch "/etc/odoo/${SCRIPT}_${CONTAINER}_installed"
diff --git a/snippets.md b/snippets.md
index e78d4129..50c2da28 100644
--- a/snippets.md
+++ b/snippets.md
@@ -41,9 +41,12 @@ In Odoo everything is described as an XML document.     Snippets are modificatio
 ## [Mrp](snippets/mrp.md)
 ## [Mrp Account](snippets/mrp_account.md)
 ## [Mrp Workorder](snippets/mrp_workorder.md)
+## [Payment](snippets/payment.md)
+## [Portal](snippets/portal.md)
 ## [Printnode Base](snippets/printnode_base.md)
 ## [Product](snippets/product.md)
 ## [Project](snippets/project.md)
+## [Project Enterprise](snippets/project_enterprise.md)
 ## [Purchase](snippets/purchase.md)
 ## [Purchase Requisition](snippets/purchase_requisition.md)
 ## [Purchase Requisition Send](snippets/purchase_requisition_send.md)
diff --git a/snippets/account.md b/snippets/account.md
index ef65dbbc..9adee849 100644
--- a/snippets/account.md
+++ b/snippets/account.md
@@ -1,4 +1,29 @@
 # Account
+## Portal Invoice Page  
+### Convert Html Note  
+ID: `mint_system.account.portal_invoice_page.convert_html_note`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="account.portal_invoice_page" priority="50">
+
+    <t t-if="line.display_type == 'line_note'" position="replace">
+        <t t-if="line.display_type == 'line_note' and '&lt;!DOCTYPE html&gt;' in line.name">
+            <td colspan="99">
+                <t t-raw="line.name.replace('&lt;!DOCTYPE html&gt;', '')" />
+            </td>
+        </t>
+        <t t-elif="line.display_type == 'line_note' and '&lt;!DOCTYPE html&gt;' not in line.name">
+            <td colspan="99">
+                <span t-field="line.name"/>
+            </td>
+        </t>
+    </t>
+
+</data>
+
+```
+Source: [snippets/account.portal_invoice_page.convert_html_note.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.portal_invoice_page.convert_html_note.xml)
+
 ## Report Invoice Document  
 ### Add Address Space  
 ID: `mint_system.account.report_invoice_document.add_address_space`  
@@ -85,7 +110,7 @@ ID: `mint_system.account.report_invoice_document.add_header_padding`
 
   <xpath expr="//h2" position="attributes">
     <attribute name="style">padding-top: 2rem</attribute>
-	</xpath>
+    </xpath>
 
 </data>
 
@@ -98,9 +123,9 @@ ID: `mint_system.account.report_invoice_document.add_header_space`
 <?xml version="1.0"?>
 <data inherit_id="account.report_invoice_document" priority="50">
 
-	<xpath expr="//h2" position="attributes">
-		 <attribute name="style">padding-top: 5rem</attribute>
-	</xpath>
+    <xpath expr="//h2" position="attributes">
+         <attribute name="style">padding-top: 5rem</attribute>
+    </xpath>
 
 </data>
 
@@ -270,6 +295,34 @@ ID: `mint_system.account.report_invoice_document.add_salesperson`
 ```
 Source: [snippets/account.report_invoice_document.add_salesperson.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.report_invoice_document.add_salesperson.xml)
 
+### Add Taxes  
+ID: `mint_system.account.report_invoice_document.add_taxes`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="account.report_invoice_document" priority="60">
+
+    <xpath expr="//div[hasclass('page')]" position="before">
+        <style>
+        .o_company_1_layout {
+            font-family: Dobra-Book;
+            font-size: 80%;
+            }
+    .mb-4 {
+          margin-bottom: 0rem !important;
+          }
+    #total {
+          margin-bottom: 2rem;
+          }
+    h2 {
+               font-size: 1.5rem;
+              }
+        </style>
+    </xpath>
+
+</data>
+```
+Source: [snippets/account.report_invoice_document.add_taxes.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.report_invoice_document.add_taxes.xml)
+
 ### Align Taxes  
 ID: `mint_system.account.report_invoice_document.align_taxes`  
 ```xml
@@ -324,6 +377,28 @@ ID: `mint_system.account.report_invoice_document.bank_account`
 ```
 Source: [snippets/account.report_invoice_document.bank_account.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.report_invoice_document.bank_account.xml)
 
+### Convert Html Note  
+ID: `mint_system.account.report_invoice_document.convert_html_note`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="account.report_invoice_document" priority="50">
+
+    <t t-if="line.display_type == 'line_note'" position="replace">
+        <t t-if="line.display_type == 'line_note' and '&lt;!DOCTYPE html&gt;' in line.name">
+            <td colspan="99">
+                <t t-raw="line.name.replace('&lt;!DOCTYPE html&gt;', '')" />
+            </td>
+        </t>
+        <t t-elif="line.display_type == 'line_note' and '&lt;!DOCTYPE html&gt;' not in line.name">
+            <td colspan="99">
+                <span t-field="line.name"/>
+            </td>
+        </t>
+    </t>
+</data>
+```
+Source: [snippets/account.report_invoice_document.convert_html_note.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.report_invoice_document.convert_html_note.xml)
+
 ### Custom Address  
 ID: `mint_system.account.report_invoice_document.custom_address`  
 ```xml
@@ -358,6 +433,23 @@ ID: `mint_system.account.report_invoice_document.custom_address`
 ```
 Source: [snippets/account.report_invoice_document.custom_address.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.report_invoice_document.custom_address.xml)
 
+### Custom Pament Term  
+ID: `mint_system.account.report_invoice_document.custom_pament_term`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="account.report_invoice_document" priority="50">
+
+  <xpath expr="//p[@name='payment_term']" position="replace">
+    <p t-if="o.invoice_payment_term_id" name="payment_term">
+      Payment terms: <strong t-field="o.invoice_payment_term_id.name"/>
+    </p>
+  </xpath>
+
+</data>
+
+```
+Source: [snippets/account.report_invoice_document.custom_pament_term.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.report_invoice_document.custom_pament_term.xml)
+
 ### Custom Taxes  
 ID: `mint_system.account.report_invoice_document.custom_taxes`  
 ```xml
@@ -365,12 +457,12 @@ ID: `mint_system.account.report_invoice_document.custom_taxes`
 <data inherit_id="account.report_invoice_document" priority="50">
 
   <xpath expr="//th[@name='th_taxes']" position="replace">
-  	<th name="th_taxes" t-attf-class="text-right {{ 'd-none d-md-table-cell' if report_type == 'html' else '' }}"><span>Steuern</span></th>
+      <th name="th_taxes" t-attf-class="text-right {{ 'd-none d-md-table-cell' if report_type == 'html' else '' }}"><span>Steuern</span></th>
   </xpath>
   <xpath expr="//t[@name='account_invoice_line_accountable']/td[5]" position="replace">
-  	<td t-attf-class="text-right {{ 'd-none d-md-table-cell' if report_type == 'html' else '' }}">
-  		<span t-esc="', '.join(map(lambda x: (x.description or x.name), line.tax_ids))" id="line_tax_ids"/>
-  	</td>
+      <td t-attf-class="text-right {{ 'd-none d-md-table-cell' if report_type == 'html' else '' }}">
+          <span t-esc="', '.join(map(lambda x: (x.description or x.name), line.tax_ids))" id="line_tax_ids"/>
+      </td>
   </xpath>
 
 </data>
@@ -400,6 +492,20 @@ ID: `mint_system.account.report_invoice_document.display_shipping_address`
 ```
 Source: [snippets/account.report_invoice_document.display_shipping_address.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.report_invoice_document.display_shipping_address.xml)
 
+### Force Company Vat  
+ID: `mint_system.account.report_invoice_document.force_company_vat`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="account.report_invoice_document" priority="60">
+
+  <t t-set="forced_vat" position="replace">
+    <t t-set="forced_vat" t-value="o.company_id.vat"/>
+  </t>
+
+</data>
+```
+Source: [snippets/account.report_invoice_document.force_company_vat.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.report_invoice_document.force_company_vat.xml)
+
 ### Format Address Blocks  
 ID: `mint_system.account.report_invoice_document.format_address_blocks`  
 ```xml
@@ -455,14 +561,14 @@ ID: `mint_system.account.report_invoice_document.format_qty_with_decimal`
 <?xml version="1.0"?>
 <data inherit_id="account.report_invoice_document" priority="50">
 
-	<xpath expr="//span[@id='qty']" position="replace">
-		<t t-if="line.quantity.is_integer()">
-			<span id="qty" t-field="line.quantity" t-options="{'widget': 'integer'}"/>
-		</t>
-		<t t-else="">
-			<span id="qty" t-field="line.quantity"/>
-		</t>
-	</xpath>
+    <xpath expr="//span[@id='qty']" position="replace">
+        <t t-if="line.quantity.is_integer()">
+            <span id="qty" t-field="line.quantity" t-options="{'widget': 'integer'}"/>
+        </t>
+        <t t-else="">
+            <span id="qty" t-field="line.quantity"/>
+        </t>
+    </xpath>
 
 </data>
 ```
@@ -779,6 +885,30 @@ ID: `mint_system.account.report_invoice_document.group_by_sale_order`
 ```
 Source: [snippets/account.report_invoice_document.group_by_sale_order.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.report_invoice_document.group_by_sale_order.xml)
 
+### Hide Incoterm  
+ID: `mint_system.account.report_invoice_document.hide_incoterm`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="account.report_invoice_document" priority="50">
+
+  <xpath expr="//p[@name='incoterm']" position="replace"/>
+  
+</data>
+```
+Source: [snippets/account.report_invoice_document.hide_incoterm.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.report_invoice_document.hide_incoterm.xml)
+
+### Hide Payment Term  
+ID: `mint_system.account.report_invoice_document.hide_payment_term`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="account.report_invoice_document" priority="50">
+
+  <xpath expr="//p[@name='payment_term']" position="replace"/>
+  
+</data>
+```
+Source: [snippets/account.report_invoice_document.hide_payment_term.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.report_invoice_document.hide_payment_term.xml)
+
 ### Margin After Title  
 ID: `mint_system.account.report_invoice_document.margin_after_title`  
 ```xml
@@ -943,6 +1073,23 @@ ID: `mint_system.account.report_invoice_document.modify_main_table`
 ```
 Source: [snippets/account.report_invoice_document.modify_main_table.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.report_invoice_document.modify_main_table.xml)
 
+### Move Incoterm  
+ID: `mint_system.account.report_invoice_document.move_incoterm`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="account.report_invoice_document" priority="60">
+
+  <xpath expr="//p[@name='incoterm']" position="replace"/>
+  <xpath expr="//p[2]" position="after">
+    <p t-if="o.invoice_incoterm_id" name="incoterm">Incoterm: 
+      <strong t-field="o.invoice_incoterm_id.display_name"/>
+    </p>
+  </xpath>
+  
+</data>
+```
+Source: [snippets/account.report_invoice_document.move_incoterm.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.report_invoice_document.move_incoterm.xml)
+
 ### Net Value Summary  
 ID: `mint_system.account.report_invoice_document.net_value_summary`  
 ```xml
@@ -1005,8 +1152,8 @@ ID: `mint_system.account.report_invoice_document.product_weight`
   <xpath expr="//table/tbody/t[3]/tr/t[1]/td[1]/span" position="after">
   <t t-if="line.product_id.weight">
     <br/>
-		Weight: <span t-field="line.product_id.weight"/>
-		<span t-field="line.product_id.weight_uom_id.display_name"/>
+        Weight: <span t-field="line.product_id.weight"/>
+        <span t-field="line.product_id.weight_uom_id.display_name"/>
   </t>
   </xpath>
 
@@ -1015,19 +1162,19 @@ ID: `mint_system.account.report_invoice_document.product_weight`
 ```
 Source: [snippets/account.report_invoice_document.product_weight.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.report_invoice_document.product_weight.xml)
 
-### Remove Incoterms  
-ID: `mint_system.account.report_invoice_document.remove_incoterms`  
+### Remove Incoterm  
+ID: `mint_system.account.report_invoice_document.remove_incoterm`  
 ```xml
 <?xml version="1.0"?>
 <data inherit_id="account.report_invoice_document" priority="50">
 
-	<xpath expr="//p[@name='payment_communication']" position="replace">
+    <xpath expr="//p[@name='incoterm']" position="replace">
   </xpath>
 
 </data>
 
 ```
-Source: [snippets/account.report_invoice_document.remove_incoterms.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.report_invoice_document.remove_incoterms.xml)
+Source: [snippets/account.report_invoice_document.remove_incoterm.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.report_invoice_document.remove_incoterm.xml)
 
 ### Remove Payment Communication  
 ID: `mint_system.account.report_invoice_document.remove_payment_communication`  
@@ -1035,7 +1182,7 @@ ID: `mint_system.account.report_invoice_document.remove_payment_communication`
 <?xml version="1.0"?>
 <data inherit_id="account.report_invoice_document" priority="50">
 
-	<xpath expr="//p[@name='payment_communication']" position="replace" />
+    <xpath expr="//p[@name='payment_communication']" position="replace" />
 
 </data>
 
@@ -1048,7 +1195,7 @@ ID: `mint_system.account.report_invoice_document.remove_payment_term`
 <?xml version="1.0"?>
 <data inherit_id="account.report_invoice_document" priority="50">
 
-	<p name="payment_term" position="replace" />
+    <p name="payment_term" position="replace" />
 
 </data>
 
@@ -1082,6 +1229,67 @@ ID: `mint_system.account.report_invoice_document.remove_taxes`
 ```
 Source: [snippets/account.report_invoice_document.remove_taxes.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.report_invoice_document.remove_taxes.xml)
 
+### Replace Address And Information Block  
+ID: `mint_system.account.report_invoice_document.replace_address_and_information_block`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="account.report_invoice_document" priority="50">
+
+  <xpath expr="//t[@t-set='address']" position="replace">
+
+    <div class="row text-900 o_bold">
+      <div class="col-7">Customer</div>
+      <div class="col-5">Invoice Address</div>
+    </div>
+
+    <div class="row">
+      <div class="col-7">
+        <span t-field="o.partner_id" t-options-widget="&quot;contact&quot;" t-options-fields="['name', 'address']" t-options-no_marker="True"/>
+      </div>
+      <div class="col-5">
+        <span t-field="o.partner_id" t-options-widget="&quot;contact&quot;" t-options-fields="['name', 'address']" t-options-no_marker="True"/>
+      </div>
+    </div>
+
+    <div class="row">
+      <div class="col-5 text-900 o_bold offset-7" style="margin-top:25px">Delivery Address</div>
+    </div>
+
+    <div class="row">
+      <div class="col-5 offset-7">
+        <span t-field="o.partner_shipping_id" t-options-widget="&quot;contact&quot;" t-options-fields="['name', 'address']" t-options-no_marker="True"/>
+      </div>
+    </div>
+
+    <div class="row o_bold text-900" style="margin-top:25px">
+      <div class="col-7">Your Contact</div>
+      <div class="col-5">Our Contact</div>
+    </div>
+
+    <div class="row">
+      <div class="col-7">
+        <span t-field="o.partner_id.name"/>
+      </div>
+      <div class="col-5">
+        <span t-field="o.user_id.name"/>
+      </div>
+    </div>
+
+    <div class="row">
+      <div class="col-7" style="margin-bottom:25px">
+        <span t-field="o.partner_id" t-options-widget="&quot;contact&quot;" t-options-fields="['phone', 'email']" t-options-no_marker="True"/>
+      </div>
+      <div class="col-5">
+        <span t-field="o.user_id" t-options-widget="&quot;contact&quot;" t-options-fields="['phone', 'email']" t-options-no_marker="True"/>
+      </div>
+    </div>
+
+  </xpath>
+
+</data>
+```
+Source: [snippets/account.report_invoice_document.replace_address_and_information_block.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.report_invoice_document.replace_address_and_information_block.xml)
+
 ### Replace Address  
 ID: `mint_system.account.report_invoice_document.replace_address`  
 ```xml
@@ -1496,19 +1704,28 @@ ID: `mint_system.account.report_invoice_document.replace_product_description`
 <?xml version="1.0"?>
 <data inherit_id="account.report_invoice_document" priority="50">
 
-<xpath expr="//td[@name='account_invoice_line_name']" position="replace">
-  <t t-if="line.product_id.type_description">
-	<td>
-		<span style="font-weight: bold" t-field="line.product_id.type_description"/>
-	</td>
-  </t>
-  <t t-if="not line.product_id.type_description">
-	<td>
-    <span t-field="line.external_name"/>
-	</td>
-  </t>
+  <xpath expr="//td[@name='account_invoice_line_name']" position="replace">
+    <t t-if="line.product_id.type_description">
+      <td>
+        <span style="font-weight: bold" t-field="line.product_id.type_description"/>
+      </td>
+    </t>
+    <t t-if="not line.product_id.type_description">
+      <td>
+        <span t-field="line.external_name"/>
+      </td>
+    </t>
 
-</xpath>
+    <!---
+    <xpath expr="//td[@name='account_invoice_line_name']" position="replace">
+      <td name="td_name">
+        <span class="o_bold" t-field="line.product_id.name"/><br/>
+        <span t-field="line.name"/>  
+      </td>
+    </xpath>
+    -->
+
+  </xpath>
 
 </data>
 ```
@@ -1523,50 +1740,50 @@ ID: `mint_system.account.report_invoice_document.replace_summary`
   <xpath expr="//table[@name='invoice_line_table']" position="after">
 
     <style>
-			table.trimada_summary tr {
-				border-top: solid 1px !important;
-				border-bottom: solid 1px;
-				page-break-inside: avoid;
-			}
-			table.trimada_details tr {
-			  border-top: 0px !important;
-			  border-bottom: 0px;
-			  line-height: 0.7;
-			}
-			table.trimada_summary #amount_untaxed_label {
-				width: 11.5%;
-				text-align: left;
-			}
-			table.trimada_details td#amount_by_group0 {
-				width: 8%;
-				text-align: left;
-			}
-			table.trimada_details td#amount_by_group3 {
-				width: 21%;
-				text-align: right;
-				padding-right: 10%;
-			}
-			table.trimada_details td#amount_by_group4 {
-				width: 27%;
-				text-align: right;
-				padding-right: 15%;
-			}
-			table.trimada_summary td#amount_by_group_label {
-				width: 12%;
-				text-align: left;
-			}
-			table.trimada_summary td#amount_by_group {
-				width: 17%;
-				text-align: left;
-			}
-			table.trimada_summary #amount_total_label {
-				width: 14%;
-				text-align: right;
-			}
-			table.trimada_summary #amount_total {
-				width: 18%;
-				text-align: right;
-			}
+            table.trimada_summary tr {
+                border-top: solid 1px !important;
+                border-bottom: solid 1px;
+                page-break-inside: avoid;
+            }
+            table.trimada_details tr {
+              border-top: 0px !important;
+              border-bottom: 0px;
+              line-height: 0.7;
+            }
+            table.trimada_summary #amount_untaxed_label {
+                width: 11.5%;
+                text-align: left;
+            }
+            table.trimada_details td#amount_by_group0 {
+                width: 8%;
+                text-align: left;
+            }
+            table.trimada_details td#amount_by_group3 {
+                width: 21%;
+                text-align: right;
+                padding-right: 10%;
+            }
+            table.trimada_details td#amount_by_group4 {
+                width: 27%;
+                text-align: right;
+                padding-right: 15%;
+            }
+            table.trimada_summary td#amount_by_group_label {
+                width: 12%;
+                text-align: left;
+            }
+            table.trimada_summary td#amount_by_group {
+                width: 17%;
+                text-align: left;
+            }
+            table.trimada_summary #amount_total_label {
+                width: 14%;
+                text-align: right;
+            }
+            table.trimada_summary #amount_total {
+                width: 18%;
+                text-align: right;
+            }
     </style>
 
     <table class="table table-borderless table-sm trimada trimada_summary">
@@ -1646,7 +1863,6 @@ ID: `mint_system.account.report_invoice_document.replace_summary`
 
 </data>
 
-
 ```
 Source: [snippets/account.report_invoice_document.replace_summary.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.report_invoice_document.replace_summary.xml)
 
@@ -1668,6 +1884,21 @@ ID: `mint_system.account.report_invoice_document.reset_address`
 ```
 Source: [snippets/account.report_invoice_document.reset_address.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.report_invoice_document.reset_address.xml)
 
+### Round Price Unit  
+ID: `mint_system.account.report_invoice_document.round_price_unit`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="account.report_invoice_document" priority="50">
+
+  <xpath expr="//span[@t-field='line.price_unit']" position="replace">
+    <span class="text-nowrap" t-esc="'{0:,.2f}'.format(float(line.price_unit)).replace(',','\'')"/>
+  </xpath>
+
+</data>
+
+```
+Source: [snippets/account.report_invoice_document.round_price_unit.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.report_invoice_document.round_price_unit.xml)
+
 ### Round Price  
 ID: `mint_system.account.report_invoice_document.round_price`  
 ```xml
@@ -1675,7 +1906,7 @@ ID: `mint_system.account.report_invoice_document.round_price`
 <data inherit_id="account.report_invoice_document" priority="50">
 
   <xpath expr="//span[@t-field='line.price_unit']" position="replace">
-		 <span t-esc="'%g' % line.price_unit if str(line.price_unit)[::-1].find('.') >= 3 else '{0:,.2f}'.format(float(line.price_unit)).replace(',','\'')"/>
+         <span t-esc="'%g' % line.price_unit if str(line.price_unit)[::-1].find('.') >= 3 else '{0:,.2f}'.format(float(line.price_unit)).replace(',','\'')"/>
   </xpath>
    
 </data>
@@ -1794,23 +2025,23 @@ ID: `mint_system.account.report_invoice_document.set_ids`
 <?xml version="1.0"?>
 <data inherit_id="account.report_invoice_document" priority="50">
   
-	<xpath expr="//th[@name='th_quantity']" position="attributes">
-		<attribute name="id">th_quantity</attribute>
-	</xpath>
+    <xpath expr="//th[@name='th_quantity']" position="attributes">
+        <attribute name="id">th_quantity</attribute>
+    </xpath>
 
-	<xpath expr="//th[@name='th_description']" position="attributes">
-		<attribute name="id">description</attribute>
-	</xpath>
-	<xpath expr="//table[@name='invoice_line_table']//td[2]" position="attributes">
-		<attribute name="id">quantity</attribute>
-	</xpath>
-	<xpath expr="//table[@name='invoice_line_table']//td[2]/span[1]" position="attributes">
-		<attribute name="id">qty</attribute>
-	</xpath>
-	
-	<xpath expr="//table[@name='invoice_line_table']//td[3]/span[1]" position="attributes">
-		<attribute name="id">price</attribute>
-	</xpath>
+    <xpath expr="//th[@name='th_description']" position="attributes">
+        <attribute name="id">description</attribute>
+    </xpath>
+    <xpath expr="//table[@name='invoice_line_table']//td[2]" position="attributes">
+        <attribute name="id">quantity</attribute>
+    </xpath>
+    <xpath expr="//table[@name='invoice_line_table']//td[2]/span[1]" position="attributes">
+        <attribute name="id">qty</attribute>
+    </xpath>
+    
+    <xpath expr="//table[@name='invoice_line_table']//td[3]/span[1]" position="attributes">
+        <attribute name="id">price</attribute>
+    </xpath>
 
 </data>
 ```
@@ -1871,6 +2102,22 @@ ID: `mint_system.account.report_invoice_document.set_title_font_size`
 ```
 Source: [snippets/account.report_invoice_document.set_title_font_size.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.report_invoice_document.set_title_font_size.xml)
 
+### Show Categ Id  
+ID: `mint_system.account.report_invoice_document.show_categ_id`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="account.report_invoice_document" priority="50">
+  
+  <xpath expr="//span[@t-field='line.name']" position="after">
+    <div>
+      <span t-field="line.product_id.categ_id"/>
+    </div>
+ </xpath>
+
+</data>
+```
+Source: [snippets/account.report_invoice_document.show_categ_id.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.report_invoice_document.show_categ_id.xml)
+
 ### Show Customer Info Product Code  
 ID: `mint_system.account.report_invoice_document.show_customer_info_product_code`  
 ```xml
@@ -1878,7 +2125,7 @@ ID: `mint_system.account.report_invoice_document.show_customer_info_product_code
 <data inherit_id="account.report_invoice_document" priority="50">
 
   <span t-field="line.name" position="before">
-    <t t-set="customer_info" t-value="line.product_id._select_customerinfo(partner=o.commercial_partner_id)" />
+    <t t-if="line.product_id" t-set="customer_info" t-value="line.product_id._select_customerinfo(partner=o.commercial_partner_id)" />
     <t t-if="customer_info">
       <span t-esc="'[%s] ' % customer_info[0].product_code" />
     </t>
@@ -1919,6 +2166,28 @@ ID: `mint_system.account.report_invoice_document.show_default_code`
 ```
 Source: [snippets/account.report_invoice_document.show_default_code.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.report_invoice_document.show_default_code.xml)
 
+### Show Hs Code  
+ID: `mint_system.account.report_invoice_document.show_hs_code`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="account.report_invoice_document" priority="60">
+
+  <xpath expr="//table[@name='invoice_line_table']//th[@name='th_quantity']" position="after">
+    <th name="th_hs_code" class="text-right">
+      <span>H.S. Code</span>
+    </th>
+  </xpath>
+
+  <xpath expr="//table[@name='invoice_line_table']//span[@t-field='line.quantity']/.." position="after">
+    <td name="td_hs_code" class="text-right">
+       <span t-esc="line.product_id.intrastat_id.code"/>
+    </td>
+  </xpath>
+
+</data>
+```
+Source: [snippets/account.report_invoice_document.show_hs_code.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.report_invoice_document.show_hs_code.xml)
+
 ### Show Lot Ids  
 ID: `mint_system.account.report_invoice_document.show_lot_ids`  
 ```xml
@@ -1930,9 +2199,12 @@ ID: `mint_system.account.report_invoice_document.show_lot_ids`
     <t t-if="lot_ids">
       <br />
       <span>Seriennummern:</span>
-      <ul t-foreach="lot_ids" t-as="lot">
-        <li t-esc="lot.name" />
-      </ul>
+      <t t-esc="', '.join(lot_ids.mapped('name'))" />
+      <!-- <ul class="list-unstyled">
+        <t t-foreach="lot_ids" t-as="lot">
+          <li t-esc="lot.name" />
+        </t>
+      </ul> -->
     </t>
   </xpath>
 
@@ -1940,6 +2212,29 @@ ID: `mint_system.account.report_invoice_document.show_lot_ids`
 ```
 Source: [snippets/account.report_invoice_document.show_lot_ids.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.report_invoice_document.show_lot_ids.xml)
 
+### Show Order Id  
+ID: `mint_system.account.report_invoice_document.show_order_id`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="account.report_invoice_document" priority="60">
+
+  <xpath expr="//td[@name='account_invoice_line_name']" position="replace">
+
+    <td name="account_invoice_line_name">
+      <t t-if="not line.sale_line_ids.task_id.sale_line_id.order_id">
+        <span t-field="line.name" t-options="{'widget': 'text'}"/>
+      </t>
+      <t t-if="line.sale_line_ids.task_id.sale_line_id.order_id">
+        Dienstleistung gemäss Rapport # <span t-field="line.sale_line_ids.task_id.sale_line_id.order_id"/>
+      </t>
+    </td>
+  </xpath>
+
+</data>
+
+```
+Source: [snippets/account.report_invoice_document.show_order_id.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.report_invoice_document.show_order_id.xml)
+
 ### Show Product Name  
 ID: `mint_system.account.report_invoice_document.show_product_name`  
 ```xml
@@ -1961,6 +2256,28 @@ ID: `mint_system.account.report_invoice_document.show_product_name`
 ```
 Source: [snippets/account.report_invoice_document.show_product_name.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.report_invoice_document.show_product_name.xml)
 
+### Show Sale Line Ids  
+ID: `mint_system.account.report_invoice_document.show_sale_line_ids`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="account.report_invoice_document" priority="60">
+
+  <xpath expr="//table[@name='invoice_line_table']//th[@name='th_quantity']" position="after">
+    <th name="th_hs_code" class="text-right">
+      <span>H.S. Code</span>
+    </th>
+  </xpath>
+
+  <xpath expr="//table[@name='invoice_line_table']//span[@t-field='line.quantity']/.." position="after">
+    <td name="td_hs_code" class="text-right">
+       <span t-esc="line.product_id.intrastat_id.code"/>
+    </td>
+  </xpath>
+
+</data>
+```
+Source: [snippets/account.report_invoice_document.show_sale_line_ids.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.report_invoice_document.show_sale_line_ids.xml)
+
 ### Show Shipping Address  
 ID: `mint_system.account.report_invoice_document.show_shipping_address`  
 ```xml
@@ -1981,94 +2298,245 @@ ID: `mint_system.account.report_invoice_document.show_shipping_address`
 ```
 Source: [snippets/account.report_invoice_document.show_shipping_address.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.report_invoice_document.show_shipping_address.xml)
 
+### Show Weight  
+ID: `mint_system.account.report_invoice_document.show_weight`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="account.report_invoice_document" priority="60">
+
+  <xpath expr="//table[@name='invoice_line_table']//th[@name='th_quantity']" position="inside">
+    <br/>
+    <i>Weight</i>
+  </xpath>
+
+  <xpath expr="//table[@name='invoice_line_table']//th[@name='th_subtotal']" position="inside">
+    <br/>
+    <i>Total Weight</i>
+  </xpath>
+
+  <xpath expr="//table[@name='invoice_line_table']//span[@t-field='line.quantity']/.." position="inside">
+    <br/>
+    <i>
+      <span t-field="line.product_id.weight"/>
+      <span t-field="line.product_id.weight_uom_name"/>
+    </i>
+  </xpath>
+
+ <xpath expr="//table[@name='invoice_line_table']//span[@t-field='line.price_subtotal']/.." position="inside">
+    <br/>
+    <i>
+      <span t-esc="line.product_id.weight * line.quantity" t-options="{&quot;widget&quot;: &quot;float&quot;, &quot;decimal_precision&quot;: &quot;Stock Weight&quot;}"/>
+      <span t-field="line.product_id.weight_uom_name"/>
+    </i>
+  </xpath>
+
+</data>
+```
+Source: [snippets/account.report_invoice_document.show_weight.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.report_invoice_document.show_weight.xml)
+
+### Style Carbo Link  
+ID: `mint_system.account.report_invoice_document.style_carbo_link`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="account.report_invoice_document" priority="60">
+
+    <xpath expr="//div[hasclass('page')]" position="before">
+        <style>
+        .o_company_1_layout {
+            font-family: Dobra-Book;
+            font-size: 80%;
+            }
+    .mb-4 {
+          margin-bottom: 0rem !important;
+          }
+    #total {
+          margin-bottom: 2rem;
+          }
+    h2 {
+               font-size: 1.5rem;
+              }
+        </style>
+    </xpath>
+
+</data>
+```
+Source: [snippets/account.report_invoice_document.style_carbo_link.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.report_invoice_document.style_carbo_link.xml)
+
+### Style Moser  
+ID: `mint_system.account.report_invoice_document.style_moser`  
+```xml
+<data inherit_id="account.report_invoice_document" priority="60">
+
+    <xpath expr="//div[hasclass('page')]" position="before">
+        <style>
+        .o_company_1_layout {
+            font-family: arial;
+         }
+        .o_company_1_layout.o_report_layout_standard h2 {
+            color: black;
+               font-size: 1.4rem;
+                font-weight: bold;
+         }
+         .o_company_1_layout.o_report_layout_standard #total strong {
+            color: black;
+         }
+         div#informations {
+              margin-top: 30px;
+              margin-bottom: 60px;
+         }
+         h2.mt-4 {
+              margin-top: 70px !important;
+         }
+         th#tax_amount {
+              text-align: right;
+         }
+         td#tax_amount {
+              text-align: right;
+         }
+        </style>
+    </xpath>
+    
+    <xpath expr="//table[@name='invoice_line_table']" position="attributes">
+        <attribute name="class">table table-sm o_main_table mt-4</attribute>
+    </xpath>
+    
+</data>
+```
+Source: [snippets/account.report_invoice_document.style_moser.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.report_invoice_document.style_moser.xml)
+
+### Style Tissa  
+ID: `mint_system.account.report_invoice_document.style_tissa`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="account.report_invoice_document" priority="60">
+
+    <xpath expr="//div[hasclass('page')]" position="before">
+        <style>
+            table#info {
+                font-size: 9pt;
+                font-family: arial;
+            }
+            h2 {
+            font-size: 1.2rem;
+            font-weight: bold;
+            margin: 50px 0 30px 0
+            }
+            body {
+                font-size: 11pt;
+                font-family: arial;
+            }
+        </style>
+    </xpath>
+
+    <xpath expr="//table[@name='invoice_line_table']/thead/tr/th[5]" position="attributes">
+        <attribute name="t-attf-class">text-right {{ 'd-none d-md-table-cell' if report_type == 'html' else '' }}</attribute>
+    </xpath>
+
+    <xpath expr="//table[@name='invoice_line_table']/tbody/t/tr/t/td[5]" position="attributes">
+        <attribute name="t-attf-class">text-right {{ 'd-none d-md-table-cell' if report_type == 'html' else '' }}</attribute>
+    </xpath>
+
+    <xpath expr="//p[@name='payment_communication']" position="attributes">
+        <attribute name="style">margin-bottom: 0px</attribute>
+    </xpath>
+
+    <xpath expr="//p[@name='payment_term']" position="attributes">
+        <attribute name="style">margin-bottom: 0px</attribute>
+    </xpath>
+
+</data>
+
+```
+Source: [snippets/account.report_invoice_document.style_tissa.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.report_invoice_document.style_tissa.xml)
+
 ### Style Trimada  
 ID: `mint_system.account.report_invoice_document.style_trimada`  
 ```xml
 <?xml version="1.0"?>
 <data inherit_id="account.report_invoice_document" priority="60">
 
-	<xpath expr="//div[hasclass('page')]" position="before">
-		<style>
-			table.trimada {
-				font-size: 9pt;
-				font-family: arial;
-				color: black;
-			}
-			table.trimada tr.first td {
-				padding-bottom: 0;
-			}
-			table.trimada tr.second td {
-				padding-top: 0;
-			}
-			table.trimada tr.second {
-				border-bottom: 1px solid rgb(220,220,220);
-			}
-			table.trimada thead tr {
-				border-top:solid 1px;
-				border-bottom: solid 1px;
-			}
-			table.trimada thead th#position {
-				width: 5mm;
-			}
-			table.trimada thead th#default_code {
-			  width: 27mm;
-			  text-align: right;
-			}
-			table.trimada thead th#open_quantity {
-			  width: 30mm;
-			  text-align: right;
-			}
-			table.trimada thead th#quantity {
-			  width: 25mm;
-			  text-align: right !important;
-			}
-			table.trimada tbody td#position {
-			  text-align: right;
-			}
-			table.trimada tbody td#default_code {
-			  text-align: right;
-			}
-			table.trimada tbody td#open_quantity {
-			  text-align: right !important;
-			}
-			table.trimada tbody td#quantity {
-			  text-align: right;
-			}			
-			table.trimada tbody span#qty {
-			  font-weight: bold;
-			}
-			table.trimada tbody span#open_qty {
-			  font-weight: bold;
-			}
-			.address {
-			  font-size: 10pt;
-			  line-height: 1.2;
-			  padding-bottom:33mm;
-			}
-			.subtitel {
-				font-size: 11pt;
-				font-family: arial;
-				margin-top: 10mm;
-			}
-			.note {
-				font-size: 9pt;
-				font-family: arial;
-			}
-		</style>
-	</xpath>
+    <xpath expr="//div[hasclass('page')]" position="before">
+        <style>
+            table.trimada {
+                font-size: 9pt;
+                font-family: arial;
+                color: black;
+            }
+            table.trimada tr.first td {
+                padding-bottom: 0;
+            }
+            table.trimada tr.second td {
+                padding-top: 0;
+            }
+            table.trimada tr.second {
+                border-bottom: 1px solid rgb(220,220,220);
+            }
+            table.trimada thead tr {
+                border-top:solid 1px;
+                border-bottom: solid 1px;
+            }
+            table.trimada thead th#position {
+                width: 5mm;
+            }
+            table.trimada thead th#default_code {
+              width: 27mm;
+              text-align: right;
+            }
+            table.trimada thead th#open_quantity {
+              width: 30mm;
+              text-align: right;
+            }
+            table.trimada thead th#quantity {
+              width: 25mm;
+              text-align: right !important;
+            }
+            table.trimada tbody td#position {
+              text-align: right;
+            }
+            table.trimada tbody td#default_code {
+              text-align: right;
+            }
+            table.trimada tbody td#open_quantity {
+              text-align: right !important;
+            }
+            table.trimada tbody td#quantity {
+              text-align: right;
+            }            
+            table.trimada tbody span#qty {
+              font-weight: bold;
+            }
+            table.trimada tbody span#open_qty {
+              font-weight: bold;
+            }
+            .address {
+              font-size: 10pt;
+              line-height: 1.2;
+              padding-bottom:33mm;
+            }
+            .subtitel {
+                font-size: 11pt;
+                font-family: arial;
+                margin-top: 10mm;
+            }
+            .note {
+                font-size: 9pt;
+                font-family: arial;
+            }
+        </style>
+    </xpath>
 
-	<table name="invoice_line_table" position="attributes">
-		<attribute name="class" separator=" " add="trimada table-borderless"/>
-	</table>
+    <table name="invoice_line_table" position="attributes">
+        <attribute name="class" separator=" " add="trimada table-borderless"/>
+    </table>
 
-	<table name="invoice_line_table" position="attributes">
-		<attribute name="class" separator=" " add="trimada table-borderless"/>
-	</table>
+    <table name="invoice_line_table" position="attributes">
+        <attribute name="class" separator=" " add="trimada table-borderless"/>
+    </table>
 
   <span id="qty" position="attributes">
-		<attribute name="t-options-widget">"integer"</attribute>
-	</span>
-	
+        <attribute name="t-options-widget">"integer"</attribute>
+    </span>
+    
 </data>
 
 ```
@@ -2117,6 +2585,115 @@ ID: `mint_system.account.report_invoice_document.tissa_rechnungstext`
 ```
 Source: [snippets/account.report_invoice_document.tissa_rechnungstext.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.report_invoice_document.tissa_rechnungstext.xml)
 
+### Tissa Replace Infotable  
+ID: `mint_system.account.report_invoice_document.tissa_replace_infotable`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="account.report_invoice_document" priority="50">
+
+  <xpath expr="//div[@id='informations']" position="replace">
+    <style>
+    table#info {
+      width: 100%;
+      margin-bottom: 45px;
+      font-size: 11pt;
+    }
+    table#info tr {
+      line-height: 1.2;
+      text-align: left;
+    }
+    .note {
+      font-size: 9pt;
+    }
+    </style>
+    <table id='info'>
+
+      <tr>
+        <td>
+          Kundennummer:
+        </td>
+        <td>
+          <span t-field='o.partner_id.ref'/>
+        </td>
+        <td>
+          Datum:
+        </td>
+        <td>
+          <span t-field='o.invoice_date'/>
+        </td>
+      </tr>
+
+      <tr>
+        <td>
+          USt-IdNr:
+        </td>
+        <td>
+          <span t-field='o.partner_id.vat'/>
+        </td>
+
+        <td>Unser Auftrag:</td>
+        <td>
+          <t t-if='o.sale_order_id.origin'>
+            <span t-field='o.sale_order_id.origin'/>
+ / 
+          </t>
+          <span t-field='o.invoice_origin'/>
+        </td>
+      </tr>
+
+      <tr>
+        <td width="16%">EORI-Nummer:</td>
+        <td width="44%">
+          <span t-field="o.partner_id.x_studio_eori_nummer"/>
+        </td>
+        <td>Abruf:</td>
+        <td>
+          <span t-field='o.sale_order_id.comment'/>
+          <t t-if='o.sale_order_id.x_studio_kommission'>
+             /            <span t-field='o.sale_order_id.x_studio_kommission'/>
+          </t>
+        </td>
+      </tr>
+
+      <tr>
+        <td>Ihre Bestellung:</td>
+        <td>
+          <span t-field='o.sale_order_id.blanket_order_id.client_order_ref'/>          
+        </td>
+        <td>Kundenbetreuer/in:</td>
+        <td>
+          <span t-field='o.partner_id.user_id'/>
+        </td>
+      </tr>
+
+      <tr>
+        <td></td>
+        <td>         
+          <span t-field='o.sale_order_id.blanket_order_id.date_confirmed'/>         
+        </td>
+        <td width="19%">Sachbearbeiter/in:</td>
+        <td width="21%">
+          <span t-field='o.user_id'/>
+        </td>
+      </tr>
+
+      <tr>
+        <td></td>
+        <td></td>
+        <td>
+          MwSt-Nr:
+        </td>
+        <td>
+          CHE-103.327.797 MWST
+        </td>
+      </tr>
+
+    </table>
+  </xpath>
+</data>
+```
+Source: [snippets/account.report_invoice_document.tissa_replace_infotable.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.report_invoice_document.tissa_replace_infotable.xml)
+
 ### Unit Precision  
 ID: `mint_system.account.report_invoice_document.unit_precision`  
 ```xml
@@ -2124,7 +2701,7 @@ ID: `mint_system.account.report_invoice_document.unit_precision`
 <data inherit_id="account.report_invoice_document" priority="50">
 
   <xpath expr="//tbody[1]/t[3]/tr[1]/t[1]/td[2]/span[1]" position="attributes">
-		<attribute name="t-options-widget">"integer"</attribute>
+        <attribute name="t-options-widget">"integer"</attribute>
   </xpath>
 
 </data>
@@ -2132,6 +2709,20 @@ ID: `mint_system.account.report_invoice_document.unit_precision`
 ```
 Source: [snippets/account.report_invoice_document.unit_precision.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.report_invoice_document.unit_precision.xml)
 
+### X Hide On Invoice  
+ID: `mint_system.account.report_invoice_document.x_hide_on_invoice`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="account.report_invoice_document" priority="50">
+
+    <xpath expr="//t[@t-set='lines']" position="after">
+        <t t-set="lines" t-value="lines.filtered(lambda l: not l.product_id.x_hide_on_invoice)" />
+    </xpath>
+
+</data>
+```
+Source: [snippets/account.report_invoice_document.x_hide_on_invoice.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.report_invoice_document.x_hide_on_invoice.xml)
+
 ### X Picking List  
 ID: `mint_system.account.report_invoice_document.x_picking_list`  
 ```xml
@@ -2264,7 +2855,7 @@ ID: `mint_system.account.report_invoice_document.add_header_padding`
 
   <xpath expr="//h2" position="attributes">
     <attribute name="style">padding-top: 2rem</attribute>
-	</xpath>
+    </xpath>
 
 </data>
 
@@ -2277,9 +2868,9 @@ ID: `mint_system.account.report_invoice_document.add_header_space`
 <?xml version="1.0"?>
 <data inherit_id="account.report_invoice_document" priority="50">
 
-	<xpath expr="//h2" position="attributes">
-		 <attribute name="style">padding-top: 5rem</attribute>
-	</xpath>
+    <xpath expr="//h2" position="attributes">
+         <attribute name="style">padding-top: 5rem</attribute>
+    </xpath>
 
 </data>
 
@@ -2449,6 +3040,34 @@ ID: `mint_system.account.report_invoice_document.add_salesperson`
 ```
 Source: [snippets/account.report_invoice_document.add_salesperson.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.report_invoice_document.add_salesperson.xml)
 
+### Add Taxes  
+ID: `mint_system.account.report_invoice_document.add_taxes`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="account.report_invoice_document" priority="60">
+
+    <xpath expr="//div[hasclass('page')]" position="before">
+        <style>
+        .o_company_1_layout {
+            font-family: Dobra-Book;
+            font-size: 80%;
+            }
+    .mb-4 {
+          margin-bottom: 0rem !important;
+          }
+    #total {
+          margin-bottom: 2rem;
+          }
+    h2 {
+               font-size: 1.5rem;
+              }
+        </style>
+    </xpath>
+
+</data>
+```
+Source: [snippets/account.report_invoice_document.add_taxes.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.report_invoice_document.add_taxes.xml)
+
 ### Align Taxes  
 ID: `mint_system.account.report_invoice_document.align_taxes`  
 ```xml
@@ -2503,6 +3122,28 @@ ID: `mint_system.account.report_invoice_document.bank_account`
 ```
 Source: [snippets/account.report_invoice_document.bank_account.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.report_invoice_document.bank_account.xml)
 
+### Convert Html Note  
+ID: `mint_system.account.report_invoice_document.convert_html_note`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="account.report_invoice_document" priority="50">
+
+    <t t-if="line.display_type == 'line_note'" position="replace">
+        <t t-if="line.display_type == 'line_note' and '&lt;!DOCTYPE html&gt;' in line.name">
+            <td colspan="99">
+                <t t-raw="line.name.replace('&lt;!DOCTYPE html&gt;', '')" />
+            </td>
+        </t>
+        <t t-elif="line.display_type == 'line_note' and '&lt;!DOCTYPE html&gt;' not in line.name">
+            <td colspan="99">
+                <span t-field="line.name"/>
+            </td>
+        </t>
+    </t>
+</data>
+```
+Source: [snippets/account.report_invoice_document.convert_html_note.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.report_invoice_document.convert_html_note.xml)
+
 ### Custom Address  
 ID: `mint_system.account.report_invoice_document.custom_address`  
 ```xml
@@ -2537,6 +3178,23 @@ ID: `mint_system.account.report_invoice_document.custom_address`
 ```
 Source: [snippets/account.report_invoice_document.custom_address.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.report_invoice_document.custom_address.xml)
 
+### Custom Pament Term  
+ID: `mint_system.account.report_invoice_document.custom_pament_term`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="account.report_invoice_document" priority="50">
+
+  <xpath expr="//p[@name='payment_term']" position="replace">
+    <p t-if="o.invoice_payment_term_id" name="payment_term">
+      Payment terms: <strong t-field="o.invoice_payment_term_id.name"/>
+    </p>
+  </xpath>
+
+</data>
+
+```
+Source: [snippets/account.report_invoice_document.custom_pament_term.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.report_invoice_document.custom_pament_term.xml)
+
 ### Custom Taxes  
 ID: `mint_system.account.report_invoice_document.custom_taxes`  
 ```xml
@@ -2544,12 +3202,12 @@ ID: `mint_system.account.report_invoice_document.custom_taxes`
 <data inherit_id="account.report_invoice_document" priority="50">
 
   <xpath expr="//th[@name='th_taxes']" position="replace">
-  	<th name="th_taxes" t-attf-class="text-right {{ 'd-none d-md-table-cell' if report_type == 'html' else '' }}"><span>Steuern</span></th>
+      <th name="th_taxes" t-attf-class="text-right {{ 'd-none d-md-table-cell' if report_type == 'html' else '' }}"><span>Steuern</span></th>
   </xpath>
   <xpath expr="//t[@name='account_invoice_line_accountable']/td[5]" position="replace">
-  	<td t-attf-class="text-right {{ 'd-none d-md-table-cell' if report_type == 'html' else '' }}">
-  		<span t-esc="', '.join(map(lambda x: (x.description or x.name), line.tax_ids))" id="line_tax_ids"/>
-  	</td>
+      <td t-attf-class="text-right {{ 'd-none d-md-table-cell' if report_type == 'html' else '' }}">
+          <span t-esc="', '.join(map(lambda x: (x.description or x.name), line.tax_ids))" id="line_tax_ids"/>
+      </td>
   </xpath>
 
 </data>
@@ -2579,6 +3237,20 @@ ID: `mint_system.account.report_invoice_document.display_shipping_address`
 ```
 Source: [snippets/account.report_invoice_document.display_shipping_address.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.report_invoice_document.display_shipping_address.xml)
 
+### Force Company Vat  
+ID: `mint_system.account.report_invoice_document.force_company_vat`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="account.report_invoice_document" priority="60">
+
+  <t t-set="forced_vat" position="replace">
+    <t t-set="forced_vat" t-value="o.company_id.vat"/>
+  </t>
+
+</data>
+```
+Source: [snippets/account.report_invoice_document.force_company_vat.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.report_invoice_document.force_company_vat.xml)
+
 ### Format Address Blocks  
 ID: `mint_system.account.report_invoice_document.format_address_blocks`  
 ```xml
@@ -2634,14 +3306,14 @@ ID: `mint_system.account.report_invoice_document.format_qty_with_decimal`
 <?xml version="1.0"?>
 <data inherit_id="account.report_invoice_document" priority="50">
 
-	<xpath expr="//span[@id='qty']" position="replace">
-		<t t-if="line.quantity.is_integer()">
-			<span id="qty" t-field="line.quantity" t-options="{'widget': 'integer'}"/>
-		</t>
-		<t t-else="">
-			<span id="qty" t-field="line.quantity"/>
-		</t>
-	</xpath>
+    <xpath expr="//span[@id='qty']" position="replace">
+        <t t-if="line.quantity.is_integer()">
+            <span id="qty" t-field="line.quantity" t-options="{'widget': 'integer'}"/>
+        </t>
+        <t t-else="">
+            <span id="qty" t-field="line.quantity"/>
+        </t>
+    </xpath>
 
 </data>
 ```
@@ -2958,6 +3630,30 @@ ID: `mint_system.account.report_invoice_document.group_by_sale_order`
 ```
 Source: [snippets/account.report_invoice_document.group_by_sale_order.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.report_invoice_document.group_by_sale_order.xml)
 
+### Hide Incoterm  
+ID: `mint_system.account.report_invoice_document.hide_incoterm`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="account.report_invoice_document" priority="50">
+
+  <xpath expr="//p[@name='incoterm']" position="replace"/>
+  
+</data>
+```
+Source: [snippets/account.report_invoice_document.hide_incoterm.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.report_invoice_document.hide_incoterm.xml)
+
+### Hide Payment Term  
+ID: `mint_system.account.report_invoice_document.hide_payment_term`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="account.report_invoice_document" priority="50">
+
+  <xpath expr="//p[@name='payment_term']" position="replace"/>
+  
+</data>
+```
+Source: [snippets/account.report_invoice_document.hide_payment_term.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.report_invoice_document.hide_payment_term.xml)
+
 ### Margin After Title  
 ID: `mint_system.account.report_invoice_document.margin_after_title`  
 ```xml
@@ -3122,6 +3818,23 @@ ID: `mint_system.account.report_invoice_document.modify_main_table`
 ```
 Source: [snippets/account.report_invoice_document.modify_main_table.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.report_invoice_document.modify_main_table.xml)
 
+### Move Incoterm  
+ID: `mint_system.account.report_invoice_document.move_incoterm`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="account.report_invoice_document" priority="60">
+
+  <xpath expr="//p[@name='incoterm']" position="replace"/>
+  <xpath expr="//p[2]" position="after">
+    <p t-if="o.invoice_incoterm_id" name="incoterm">Incoterm: 
+      <strong t-field="o.invoice_incoterm_id.display_name"/>
+    </p>
+  </xpath>
+  
+</data>
+```
+Source: [snippets/account.report_invoice_document.move_incoterm.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.report_invoice_document.move_incoterm.xml)
+
 ### Net Value Summary  
 ID: `mint_system.account.report_invoice_document.net_value_summary`  
 ```xml
@@ -3184,8 +3897,8 @@ ID: `mint_system.account.report_invoice_document.product_weight`
   <xpath expr="//table/tbody/t[3]/tr/t[1]/td[1]/span" position="after">
   <t t-if="line.product_id.weight">
     <br/>
-		Weight: <span t-field="line.product_id.weight"/>
-		<span t-field="line.product_id.weight_uom_id.display_name"/>
+        Weight: <span t-field="line.product_id.weight"/>
+        <span t-field="line.product_id.weight_uom_id.display_name"/>
   </t>
   </xpath>
 
@@ -3194,19 +3907,19 @@ ID: `mint_system.account.report_invoice_document.product_weight`
 ```
 Source: [snippets/account.report_invoice_document.product_weight.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.report_invoice_document.product_weight.xml)
 
-### Remove Incoterms  
-ID: `mint_system.account.report_invoice_document.remove_incoterms`  
+### Remove Incoterm  
+ID: `mint_system.account.report_invoice_document.remove_incoterm`  
 ```xml
 <?xml version="1.0"?>
 <data inherit_id="account.report_invoice_document" priority="50">
 
-	<xpath expr="//p[@name='payment_communication']" position="replace">
+    <xpath expr="//p[@name='incoterm']" position="replace">
   </xpath>
 
 </data>
 
 ```
-Source: [snippets/account.report_invoice_document.remove_incoterms.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.report_invoice_document.remove_incoterms.xml)
+Source: [snippets/account.report_invoice_document.remove_incoterm.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.report_invoice_document.remove_incoterm.xml)
 
 ### Remove Payment Communication  
 ID: `mint_system.account.report_invoice_document.remove_payment_communication`  
@@ -3214,7 +3927,7 @@ ID: `mint_system.account.report_invoice_document.remove_payment_communication`
 <?xml version="1.0"?>
 <data inherit_id="account.report_invoice_document" priority="50">
 
-	<xpath expr="//p[@name='payment_communication']" position="replace" />
+    <xpath expr="//p[@name='payment_communication']" position="replace" />
 
 </data>
 
@@ -3227,7 +3940,7 @@ ID: `mint_system.account.report_invoice_document.remove_payment_term`
 <?xml version="1.0"?>
 <data inherit_id="account.report_invoice_document" priority="50">
 
-	<p name="payment_term" position="replace" />
+    <p name="payment_term" position="replace" />
 
 </data>
 
@@ -3261,6 +3974,67 @@ ID: `mint_system.account.report_invoice_document.remove_taxes`
 ```
 Source: [snippets/account.report_invoice_document.remove_taxes.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.report_invoice_document.remove_taxes.xml)
 
+### Replace Address And Information Block  
+ID: `mint_system.account.report_invoice_document.replace_address_and_information_block`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="account.report_invoice_document" priority="50">
+
+  <xpath expr="//t[@t-set='address']" position="replace">
+
+    <div class="row text-900 o_bold">
+      <div class="col-7">Customer</div>
+      <div class="col-5">Invoice Address</div>
+    </div>
+
+    <div class="row">
+      <div class="col-7">
+        <span t-field="o.partner_id" t-options-widget="&quot;contact&quot;" t-options-fields="['name', 'address']" t-options-no_marker="True"/>
+      </div>
+      <div class="col-5">
+        <span t-field="o.partner_id" t-options-widget="&quot;contact&quot;" t-options-fields="['name', 'address']" t-options-no_marker="True"/>
+      </div>
+    </div>
+
+    <div class="row">
+      <div class="col-5 text-900 o_bold offset-7" style="margin-top:25px">Delivery Address</div>
+    </div>
+
+    <div class="row">
+      <div class="col-5 offset-7">
+        <span t-field="o.partner_shipping_id" t-options-widget="&quot;contact&quot;" t-options-fields="['name', 'address']" t-options-no_marker="True"/>
+      </div>
+    </div>
+
+    <div class="row o_bold text-900" style="margin-top:25px">
+      <div class="col-7">Your Contact</div>
+      <div class="col-5">Our Contact</div>
+    </div>
+
+    <div class="row">
+      <div class="col-7">
+        <span t-field="o.partner_id.name"/>
+      </div>
+      <div class="col-5">
+        <span t-field="o.user_id.name"/>
+      </div>
+    </div>
+
+    <div class="row">
+      <div class="col-7" style="margin-bottom:25px">
+        <span t-field="o.partner_id" t-options-widget="&quot;contact&quot;" t-options-fields="['phone', 'email']" t-options-no_marker="True"/>
+      </div>
+      <div class="col-5">
+        <span t-field="o.user_id" t-options-widget="&quot;contact&quot;" t-options-fields="['phone', 'email']" t-options-no_marker="True"/>
+      </div>
+    </div>
+
+  </xpath>
+
+</data>
+```
+Source: [snippets/account.report_invoice_document.replace_address_and_information_block.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.report_invoice_document.replace_address_and_information_block.xml)
+
 ### Replace Address  
 ID: `mint_system.account.report_invoice_document.replace_address`  
 ```xml
@@ -3675,19 +4449,28 @@ ID: `mint_system.account.report_invoice_document.replace_product_description`
 <?xml version="1.0"?>
 <data inherit_id="account.report_invoice_document" priority="50">
 
-<xpath expr="//td[@name='account_invoice_line_name']" position="replace">
-  <t t-if="line.product_id.type_description">
-	<td>
-		<span style="font-weight: bold" t-field="line.product_id.type_description"/>
-	</td>
-  </t>
-  <t t-if="not line.product_id.type_description">
-	<td>
-    <span t-field="line.external_name"/>
-	</td>
-  </t>
+  <xpath expr="//td[@name='account_invoice_line_name']" position="replace">
+    <t t-if="line.product_id.type_description">
+      <td>
+        <span style="font-weight: bold" t-field="line.product_id.type_description"/>
+      </td>
+    </t>
+    <t t-if="not line.product_id.type_description">
+      <td>
+        <span t-field="line.external_name"/>
+      </td>
+    </t>
 
-</xpath>
+    <!---
+    <xpath expr="//td[@name='account_invoice_line_name']" position="replace">
+      <td name="td_name">
+        <span class="o_bold" t-field="line.product_id.name"/><br/>
+        <span t-field="line.name"/>  
+      </td>
+    </xpath>
+    -->
+
+  </xpath>
 
 </data>
 ```
@@ -3702,50 +4485,50 @@ ID: `mint_system.account.report_invoice_document.replace_summary`
   <xpath expr="//table[@name='invoice_line_table']" position="after">
 
     <style>
-			table.trimada_summary tr {
-				border-top: solid 1px !important;
-				border-bottom: solid 1px;
-				page-break-inside: avoid;
-			}
-			table.trimada_details tr {
-			  border-top: 0px !important;
-			  border-bottom: 0px;
-			  line-height: 0.7;
-			}
-			table.trimada_summary #amount_untaxed_label {
-				width: 11.5%;
-				text-align: left;
-			}
-			table.trimada_details td#amount_by_group0 {
-				width: 8%;
-				text-align: left;
-			}
-			table.trimada_details td#amount_by_group3 {
-				width: 21%;
-				text-align: right;
-				padding-right: 10%;
-			}
-			table.trimada_details td#amount_by_group4 {
-				width: 27%;
-				text-align: right;
-				padding-right: 15%;
-			}
-			table.trimada_summary td#amount_by_group_label {
-				width: 12%;
-				text-align: left;
-			}
-			table.trimada_summary td#amount_by_group {
-				width: 17%;
-				text-align: left;
-			}
-			table.trimada_summary #amount_total_label {
-				width: 14%;
-				text-align: right;
-			}
-			table.trimada_summary #amount_total {
-				width: 18%;
-				text-align: right;
-			}
+            table.trimada_summary tr {
+                border-top: solid 1px !important;
+                border-bottom: solid 1px;
+                page-break-inside: avoid;
+            }
+            table.trimada_details tr {
+              border-top: 0px !important;
+              border-bottom: 0px;
+              line-height: 0.7;
+            }
+            table.trimada_summary #amount_untaxed_label {
+                width: 11.5%;
+                text-align: left;
+            }
+            table.trimada_details td#amount_by_group0 {
+                width: 8%;
+                text-align: left;
+            }
+            table.trimada_details td#amount_by_group3 {
+                width: 21%;
+                text-align: right;
+                padding-right: 10%;
+            }
+            table.trimada_details td#amount_by_group4 {
+                width: 27%;
+                text-align: right;
+                padding-right: 15%;
+            }
+            table.trimada_summary td#amount_by_group_label {
+                width: 12%;
+                text-align: left;
+            }
+            table.trimada_summary td#amount_by_group {
+                width: 17%;
+                text-align: left;
+            }
+            table.trimada_summary #amount_total_label {
+                width: 14%;
+                text-align: right;
+            }
+            table.trimada_summary #amount_total {
+                width: 18%;
+                text-align: right;
+            }
     </style>
 
     <table class="table table-borderless table-sm trimada trimada_summary">
@@ -3825,7 +4608,6 @@ ID: `mint_system.account.report_invoice_document.replace_summary`
 
 </data>
 
-
 ```
 Source: [snippets/account.report_invoice_document.replace_summary.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.report_invoice_document.replace_summary.xml)
 
@@ -3847,6 +4629,21 @@ ID: `mint_system.account.report_invoice_document.reset_address`
 ```
 Source: [snippets/account.report_invoice_document.reset_address.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.report_invoice_document.reset_address.xml)
 
+### Round Price Unit  
+ID: `mint_system.account.report_invoice_document.round_price_unit`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="account.report_invoice_document" priority="50">
+
+  <xpath expr="//span[@t-field='line.price_unit']" position="replace">
+    <span class="text-nowrap" t-esc="'{0:,.2f}'.format(float(line.price_unit)).replace(',','\'')"/>
+  </xpath>
+
+</data>
+
+```
+Source: [snippets/account.report_invoice_document.round_price_unit.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.report_invoice_document.round_price_unit.xml)
+
 ### Round Price  
 ID: `mint_system.account.report_invoice_document.round_price`  
 ```xml
@@ -3854,7 +4651,7 @@ ID: `mint_system.account.report_invoice_document.round_price`
 <data inherit_id="account.report_invoice_document" priority="50">
 
   <xpath expr="//span[@t-field='line.price_unit']" position="replace">
-		 <span t-esc="'%g' % line.price_unit if str(line.price_unit)[::-1].find('.') >= 3 else '{0:,.2f}'.format(float(line.price_unit)).replace(',','\'')"/>
+         <span t-esc="'%g' % line.price_unit if str(line.price_unit)[::-1].find('.') >= 3 else '{0:,.2f}'.format(float(line.price_unit)).replace(',','\'')"/>
   </xpath>
    
 </data>
@@ -3973,23 +4770,23 @@ ID: `mint_system.account.report_invoice_document.set_ids`
 <?xml version="1.0"?>
 <data inherit_id="account.report_invoice_document" priority="50">
   
-	<xpath expr="//th[@name='th_quantity']" position="attributes">
-		<attribute name="id">th_quantity</attribute>
-	</xpath>
+    <xpath expr="//th[@name='th_quantity']" position="attributes">
+        <attribute name="id">th_quantity</attribute>
+    </xpath>
 
-	<xpath expr="//th[@name='th_description']" position="attributes">
-		<attribute name="id">description</attribute>
-	</xpath>
-	<xpath expr="//table[@name='invoice_line_table']//td[2]" position="attributes">
-		<attribute name="id">quantity</attribute>
-	</xpath>
-	<xpath expr="//table[@name='invoice_line_table']//td[2]/span[1]" position="attributes">
-		<attribute name="id">qty</attribute>
-	</xpath>
-	
-	<xpath expr="//table[@name='invoice_line_table']//td[3]/span[1]" position="attributes">
-		<attribute name="id">price</attribute>
-	</xpath>
+    <xpath expr="//th[@name='th_description']" position="attributes">
+        <attribute name="id">description</attribute>
+    </xpath>
+    <xpath expr="//table[@name='invoice_line_table']//td[2]" position="attributes">
+        <attribute name="id">quantity</attribute>
+    </xpath>
+    <xpath expr="//table[@name='invoice_line_table']//td[2]/span[1]" position="attributes">
+        <attribute name="id">qty</attribute>
+    </xpath>
+    
+    <xpath expr="//table[@name='invoice_line_table']//td[3]/span[1]" position="attributes">
+        <attribute name="id">price</attribute>
+    </xpath>
 
 </data>
 ```
@@ -4050,6 +4847,22 @@ ID: `mint_system.account.report_invoice_document.set_title_font_size`
 ```
 Source: [snippets/account.report_invoice_document.set_title_font_size.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.report_invoice_document.set_title_font_size.xml)
 
+### Show Categ Id  
+ID: `mint_system.account.report_invoice_document.show_categ_id`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="account.report_invoice_document" priority="50">
+  
+  <xpath expr="//span[@t-field='line.name']" position="after">
+    <div>
+      <span t-field="line.product_id.categ_id"/>
+    </div>
+ </xpath>
+
+</data>
+```
+Source: [snippets/account.report_invoice_document.show_categ_id.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.report_invoice_document.show_categ_id.xml)
+
 ### Show Customer Info Product Code  
 ID: `mint_system.account.report_invoice_document.show_customer_info_product_code`  
 ```xml
@@ -4057,7 +4870,7 @@ ID: `mint_system.account.report_invoice_document.show_customer_info_product_code
 <data inherit_id="account.report_invoice_document" priority="50">
 
   <span t-field="line.name" position="before">
-    <t t-set="customer_info" t-value="line.product_id._select_customerinfo(partner=o.commercial_partner_id)" />
+    <t t-if="line.product_id" t-set="customer_info" t-value="line.product_id._select_customerinfo(partner=o.commercial_partner_id)" />
     <t t-if="customer_info">
       <span t-esc="'[%s] ' % customer_info[0].product_code" />
     </t>
@@ -4098,6 +4911,28 @@ ID: `mint_system.account.report_invoice_document.show_default_code`
 ```
 Source: [snippets/account.report_invoice_document.show_default_code.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.report_invoice_document.show_default_code.xml)
 
+### Show Hs Code  
+ID: `mint_system.account.report_invoice_document.show_hs_code`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="account.report_invoice_document" priority="60">
+
+  <xpath expr="//table[@name='invoice_line_table']//th[@name='th_quantity']" position="after">
+    <th name="th_hs_code" class="text-right">
+      <span>H.S. Code</span>
+    </th>
+  </xpath>
+
+  <xpath expr="//table[@name='invoice_line_table']//span[@t-field='line.quantity']/.." position="after">
+    <td name="td_hs_code" class="text-right">
+       <span t-esc="line.product_id.intrastat_id.code"/>
+    </td>
+  </xpath>
+
+</data>
+```
+Source: [snippets/account.report_invoice_document.show_hs_code.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.report_invoice_document.show_hs_code.xml)
+
 ### Show Lot Ids  
 ID: `mint_system.account.report_invoice_document.show_lot_ids`  
 ```xml
@@ -4109,9 +4944,12 @@ ID: `mint_system.account.report_invoice_document.show_lot_ids`
     <t t-if="lot_ids">
       <br />
       <span>Seriennummern:</span>
-      <ul t-foreach="lot_ids" t-as="lot">
-        <li t-esc="lot.name" />
-      </ul>
+      <t t-esc="', '.join(lot_ids.mapped('name'))" />
+      <!-- <ul class="list-unstyled">
+        <t t-foreach="lot_ids" t-as="lot">
+          <li t-esc="lot.name" />
+        </t>
+      </ul> -->
     </t>
   </xpath>
 
@@ -4119,6 +4957,29 @@ ID: `mint_system.account.report_invoice_document.show_lot_ids`
 ```
 Source: [snippets/account.report_invoice_document.show_lot_ids.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.report_invoice_document.show_lot_ids.xml)
 
+### Show Order Id  
+ID: `mint_system.account.report_invoice_document.show_order_id`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="account.report_invoice_document" priority="60">
+
+  <xpath expr="//td[@name='account_invoice_line_name']" position="replace">
+
+    <td name="account_invoice_line_name">
+      <t t-if="not line.sale_line_ids.task_id.sale_line_id.order_id">
+        <span t-field="line.name" t-options="{'widget': 'text'}"/>
+      </t>
+      <t t-if="line.sale_line_ids.task_id.sale_line_id.order_id">
+        Dienstleistung gemäss Rapport # <span t-field="line.sale_line_ids.task_id.sale_line_id.order_id"/>
+      </t>
+    </td>
+  </xpath>
+
+</data>
+
+```
+Source: [snippets/account.report_invoice_document.show_order_id.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.report_invoice_document.show_order_id.xml)
+
 ### Show Product Name  
 ID: `mint_system.account.report_invoice_document.show_product_name`  
 ```xml
@@ -4140,6 +5001,28 @@ ID: `mint_system.account.report_invoice_document.show_product_name`
 ```
 Source: [snippets/account.report_invoice_document.show_product_name.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.report_invoice_document.show_product_name.xml)
 
+### Show Sale Line Ids  
+ID: `mint_system.account.report_invoice_document.show_sale_line_ids`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="account.report_invoice_document" priority="60">
+
+  <xpath expr="//table[@name='invoice_line_table']//th[@name='th_quantity']" position="after">
+    <th name="th_hs_code" class="text-right">
+      <span>H.S. Code</span>
+    </th>
+  </xpath>
+
+  <xpath expr="//table[@name='invoice_line_table']//span[@t-field='line.quantity']/.." position="after">
+    <td name="td_hs_code" class="text-right">
+       <span t-esc="line.product_id.intrastat_id.code"/>
+    </td>
+  </xpath>
+
+</data>
+```
+Source: [snippets/account.report_invoice_document.show_sale_line_ids.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.report_invoice_document.show_sale_line_ids.xml)
+
 ### Show Shipping Address  
 ID: `mint_system.account.report_invoice_document.show_shipping_address`  
 ```xml
@@ -4160,94 +5043,245 @@ ID: `mint_system.account.report_invoice_document.show_shipping_address`
 ```
 Source: [snippets/account.report_invoice_document.show_shipping_address.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.report_invoice_document.show_shipping_address.xml)
 
+### Show Weight  
+ID: `mint_system.account.report_invoice_document.show_weight`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="account.report_invoice_document" priority="60">
+
+  <xpath expr="//table[@name='invoice_line_table']//th[@name='th_quantity']" position="inside">
+    <br/>
+    <i>Weight</i>
+  </xpath>
+
+  <xpath expr="//table[@name='invoice_line_table']//th[@name='th_subtotal']" position="inside">
+    <br/>
+    <i>Total Weight</i>
+  </xpath>
+
+  <xpath expr="//table[@name='invoice_line_table']//span[@t-field='line.quantity']/.." position="inside">
+    <br/>
+    <i>
+      <span t-field="line.product_id.weight"/>
+      <span t-field="line.product_id.weight_uom_name"/>
+    </i>
+  </xpath>
+
+ <xpath expr="//table[@name='invoice_line_table']//span[@t-field='line.price_subtotal']/.." position="inside">
+    <br/>
+    <i>
+      <span t-esc="line.product_id.weight * line.quantity" t-options="{&quot;widget&quot;: &quot;float&quot;, &quot;decimal_precision&quot;: &quot;Stock Weight&quot;}"/>
+      <span t-field="line.product_id.weight_uom_name"/>
+    </i>
+  </xpath>
+
+</data>
+```
+Source: [snippets/account.report_invoice_document.show_weight.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.report_invoice_document.show_weight.xml)
+
+### Style Carbo Link  
+ID: `mint_system.account.report_invoice_document.style_carbo_link`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="account.report_invoice_document" priority="60">
+
+    <xpath expr="//div[hasclass('page')]" position="before">
+        <style>
+        .o_company_1_layout {
+            font-family: Dobra-Book;
+            font-size: 80%;
+            }
+    .mb-4 {
+          margin-bottom: 0rem !important;
+          }
+    #total {
+          margin-bottom: 2rem;
+          }
+    h2 {
+               font-size: 1.5rem;
+              }
+        </style>
+    </xpath>
+
+</data>
+```
+Source: [snippets/account.report_invoice_document.style_carbo_link.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.report_invoice_document.style_carbo_link.xml)
+
+### Style Moser  
+ID: `mint_system.account.report_invoice_document.style_moser`  
+```xml
+<data inherit_id="account.report_invoice_document" priority="60">
+
+    <xpath expr="//div[hasclass('page')]" position="before">
+        <style>
+        .o_company_1_layout {
+            font-family: arial;
+         }
+        .o_company_1_layout.o_report_layout_standard h2 {
+            color: black;
+               font-size: 1.4rem;
+                font-weight: bold;
+         }
+         .o_company_1_layout.o_report_layout_standard #total strong {
+            color: black;
+         }
+         div#informations {
+              margin-top: 30px;
+              margin-bottom: 60px;
+         }
+         h2.mt-4 {
+              margin-top: 70px !important;
+         }
+         th#tax_amount {
+              text-align: right;
+         }
+         td#tax_amount {
+              text-align: right;
+         }
+        </style>
+    </xpath>
+    
+    <xpath expr="//table[@name='invoice_line_table']" position="attributes">
+        <attribute name="class">table table-sm o_main_table mt-4</attribute>
+    </xpath>
+    
+</data>
+```
+Source: [snippets/account.report_invoice_document.style_moser.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.report_invoice_document.style_moser.xml)
+
+### Style Tissa  
+ID: `mint_system.account.report_invoice_document.style_tissa`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="account.report_invoice_document" priority="60">
+
+    <xpath expr="//div[hasclass('page')]" position="before">
+        <style>
+            table#info {
+                font-size: 9pt;
+                font-family: arial;
+            }
+            h2 {
+            font-size: 1.2rem;
+            font-weight: bold;
+            margin: 50px 0 30px 0
+            }
+            body {
+                font-size: 11pt;
+                font-family: arial;
+            }
+        </style>
+    </xpath>
+
+    <xpath expr="//table[@name='invoice_line_table']/thead/tr/th[5]" position="attributes">
+        <attribute name="t-attf-class">text-right {{ 'd-none d-md-table-cell' if report_type == 'html' else '' }}</attribute>
+    </xpath>
+
+    <xpath expr="//table[@name='invoice_line_table']/tbody/t/tr/t/td[5]" position="attributes">
+        <attribute name="t-attf-class">text-right {{ 'd-none d-md-table-cell' if report_type == 'html' else '' }}</attribute>
+    </xpath>
+
+    <xpath expr="//p[@name='payment_communication']" position="attributes">
+        <attribute name="style">margin-bottom: 0px</attribute>
+    </xpath>
+
+    <xpath expr="//p[@name='payment_term']" position="attributes">
+        <attribute name="style">margin-bottom: 0px</attribute>
+    </xpath>
+
+</data>
+
+```
+Source: [snippets/account.report_invoice_document.style_tissa.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.report_invoice_document.style_tissa.xml)
+
 ### Style Trimada  
 ID: `mint_system.account.report_invoice_document.style_trimada`  
 ```xml
 <?xml version="1.0"?>
 <data inherit_id="account.report_invoice_document" priority="60">
 
-	<xpath expr="//div[hasclass('page')]" position="before">
-		<style>
-			table.trimada {
-				font-size: 9pt;
-				font-family: arial;
-				color: black;
-			}
-			table.trimada tr.first td {
-				padding-bottom: 0;
-			}
-			table.trimada tr.second td {
-				padding-top: 0;
-			}
-			table.trimada tr.second {
-				border-bottom: 1px solid rgb(220,220,220);
-			}
-			table.trimada thead tr {
-				border-top:solid 1px;
-				border-bottom: solid 1px;
-			}
-			table.trimada thead th#position {
-				width: 5mm;
-			}
-			table.trimada thead th#default_code {
-			  width: 27mm;
-			  text-align: right;
-			}
-			table.trimada thead th#open_quantity {
-			  width: 30mm;
-			  text-align: right;
-			}
-			table.trimada thead th#quantity {
-			  width: 25mm;
-			  text-align: right !important;
-			}
-			table.trimada tbody td#position {
-			  text-align: right;
-			}
-			table.trimada tbody td#default_code {
-			  text-align: right;
-			}
-			table.trimada tbody td#open_quantity {
-			  text-align: right !important;
-			}
-			table.trimada tbody td#quantity {
-			  text-align: right;
-			}			
-			table.trimada tbody span#qty {
-			  font-weight: bold;
-			}
-			table.trimada tbody span#open_qty {
-			  font-weight: bold;
-			}
-			.address {
-			  font-size: 10pt;
-			  line-height: 1.2;
-			  padding-bottom:33mm;
-			}
-			.subtitel {
-				font-size: 11pt;
-				font-family: arial;
-				margin-top: 10mm;
-			}
-			.note {
-				font-size: 9pt;
-				font-family: arial;
-			}
-		</style>
-	</xpath>
+    <xpath expr="//div[hasclass('page')]" position="before">
+        <style>
+            table.trimada {
+                font-size: 9pt;
+                font-family: arial;
+                color: black;
+            }
+            table.trimada tr.first td {
+                padding-bottom: 0;
+            }
+            table.trimada tr.second td {
+                padding-top: 0;
+            }
+            table.trimada tr.second {
+                border-bottom: 1px solid rgb(220,220,220);
+            }
+            table.trimada thead tr {
+                border-top:solid 1px;
+                border-bottom: solid 1px;
+            }
+            table.trimada thead th#position {
+                width: 5mm;
+            }
+            table.trimada thead th#default_code {
+              width: 27mm;
+              text-align: right;
+            }
+            table.trimada thead th#open_quantity {
+              width: 30mm;
+              text-align: right;
+            }
+            table.trimada thead th#quantity {
+              width: 25mm;
+              text-align: right !important;
+            }
+            table.trimada tbody td#position {
+              text-align: right;
+            }
+            table.trimada tbody td#default_code {
+              text-align: right;
+            }
+            table.trimada tbody td#open_quantity {
+              text-align: right !important;
+            }
+            table.trimada tbody td#quantity {
+              text-align: right;
+            }            
+            table.trimada tbody span#qty {
+              font-weight: bold;
+            }
+            table.trimada tbody span#open_qty {
+              font-weight: bold;
+            }
+            .address {
+              font-size: 10pt;
+              line-height: 1.2;
+              padding-bottom:33mm;
+            }
+            .subtitel {
+                font-size: 11pt;
+                font-family: arial;
+                margin-top: 10mm;
+            }
+            .note {
+                font-size: 9pt;
+                font-family: arial;
+            }
+        </style>
+    </xpath>
 
-	<table name="invoice_line_table" position="attributes">
-		<attribute name="class" separator=" " add="trimada table-borderless"/>
-	</table>
+    <table name="invoice_line_table" position="attributes">
+        <attribute name="class" separator=" " add="trimada table-borderless"/>
+    </table>
 
-	<table name="invoice_line_table" position="attributes">
-		<attribute name="class" separator=" " add="trimada table-borderless"/>
-	</table>
+    <table name="invoice_line_table" position="attributes">
+        <attribute name="class" separator=" " add="trimada table-borderless"/>
+    </table>
 
   <span id="qty" position="attributes">
-		<attribute name="t-options-widget">"integer"</attribute>
-	</span>
-	
+        <attribute name="t-options-widget">"integer"</attribute>
+    </span>
+    
 </data>
 
 ```
@@ -4296,6 +5330,115 @@ ID: `mint_system.account.report_invoice_document.tissa_rechnungstext`
 ```
 Source: [snippets/account.report_invoice_document.tissa_rechnungstext.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.report_invoice_document.tissa_rechnungstext.xml)
 
+### Tissa Replace Infotable  
+ID: `mint_system.account.report_invoice_document.tissa_replace_infotable`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="account.report_invoice_document" priority="50">
+
+  <xpath expr="//div[@id='informations']" position="replace">
+    <style>
+    table#info {
+      width: 100%;
+      margin-bottom: 45px;
+      font-size: 11pt;
+    }
+    table#info tr {
+      line-height: 1.2;
+      text-align: left;
+    }
+    .note {
+      font-size: 9pt;
+    }
+    </style>
+    <table id='info'>
+
+      <tr>
+        <td>
+          Kundennummer:
+        </td>
+        <td>
+          <span t-field='o.partner_id.ref'/>
+        </td>
+        <td>
+          Datum:
+        </td>
+        <td>
+          <span t-field='o.invoice_date'/>
+        </td>
+      </tr>
+
+      <tr>
+        <td>
+          USt-IdNr:
+        </td>
+        <td>
+          <span t-field='o.partner_id.vat'/>
+        </td>
+
+        <td>Unser Auftrag:</td>
+        <td>
+          <t t-if='o.sale_order_id.origin'>
+            <span t-field='o.sale_order_id.origin'/>
+ / 
+          </t>
+          <span t-field='o.invoice_origin'/>
+        </td>
+      </tr>
+
+      <tr>
+        <td width="16%">EORI-Nummer:</td>
+        <td width="44%">
+          <span t-field="o.partner_id.x_studio_eori_nummer"/>
+        </td>
+        <td>Abruf:</td>
+        <td>
+          <span t-field='o.sale_order_id.comment'/>
+          <t t-if='o.sale_order_id.x_studio_kommission'>
+             /            <span t-field='o.sale_order_id.x_studio_kommission'/>
+          </t>
+        </td>
+      </tr>
+
+      <tr>
+        <td>Ihre Bestellung:</td>
+        <td>
+          <span t-field='o.sale_order_id.blanket_order_id.client_order_ref'/>          
+        </td>
+        <td>Kundenbetreuer/in:</td>
+        <td>
+          <span t-field='o.partner_id.user_id'/>
+        </td>
+      </tr>
+
+      <tr>
+        <td></td>
+        <td>         
+          <span t-field='o.sale_order_id.blanket_order_id.date_confirmed'/>         
+        </td>
+        <td width="19%">Sachbearbeiter/in:</td>
+        <td width="21%">
+          <span t-field='o.user_id'/>
+        </td>
+      </tr>
+
+      <tr>
+        <td></td>
+        <td></td>
+        <td>
+          MwSt-Nr:
+        </td>
+        <td>
+          CHE-103.327.797 MWST
+        </td>
+      </tr>
+
+    </table>
+  </xpath>
+</data>
+```
+Source: [snippets/account.report_invoice_document.tissa_replace_infotable.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.report_invoice_document.tissa_replace_infotable.xml)
+
 ### Unit Precision  
 ID: `mint_system.account.report_invoice_document.unit_precision`  
 ```xml
@@ -4303,7 +5446,7 @@ ID: `mint_system.account.report_invoice_document.unit_precision`
 <data inherit_id="account.report_invoice_document" priority="50">
 
   <xpath expr="//tbody[1]/t[3]/tr[1]/t[1]/td[2]/span[1]" position="attributes">
-		<attribute name="t-options-widget">"integer"</attribute>
+        <attribute name="t-options-widget">"integer"</attribute>
   </xpath>
 
 </data>
@@ -4311,6 +5454,20 @@ ID: `mint_system.account.report_invoice_document.unit_precision`
 ```
 Source: [snippets/account.report_invoice_document.unit_precision.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.report_invoice_document.unit_precision.xml)
 
+### X Hide On Invoice  
+ID: `mint_system.account.report_invoice_document.x_hide_on_invoice`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="account.report_invoice_document" priority="50">
+
+    <xpath expr="//t[@t-set='lines']" position="after">
+        <t t-set="lines" t-value="lines.filtered(lambda l: not l.product_id.x_hide_on_invoice)" />
+    </xpath>
+
+</data>
+```
+Source: [snippets/account.report_invoice_document.x_hide_on_invoice.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.report_invoice_document.x_hide_on_invoice.xml)
+
 ### X Picking List  
 ID: `mint_system.account.report_invoice_document.x_picking_list`  
 ```xml
@@ -4356,6 +5513,36 @@ ID: `mint_system.account.res_config_settings_view_form.domain_expense_currency_e
 ```
 Source: [snippets/account.res_config_settings_view_form.domain_expense_currency_exchange_account_id.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.res_config_settings_view_form.domain_expense_currency_exchange_account_id.xml)
 
+## View Account Journal Form  
+### Show Payment Method Code  
+ID: `mint_system.account.view_account_journal_form.show_payment_method_code`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="account.view_account_journal_form" priority="50">
+
+    <xpath expr="//field[@name='inbound_payment_method_line_ids']//field[@name='payment_method_id']" position="before">
+        <field name="code" />
+    </xpath>
+
+</data>
+```
+Source: [snippets/account.view_account_journal_form.show_payment_method_code.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.view_account_journal_form.show_payment_method_code.xml)
+
+## View Account List  
+### Show Deprecated  
+ID: `mint_system.account.view_account_list.show_deprecated`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="account.view_account_list" priority="50">
+
+    <xpath expr="//field[@name='reconcile']" position="after">
+        <field name="deprecated"  widget="boolean_toggle" />
+    </xpath>
+
+</data>
+```
+Source: [snippets/account.view_account_list.show_deprecated.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.view_account_list.show_deprecated.xml)
+
 ## View Account Move Filter  
 ### X Account Codes  
 ID: `mint_system.account.view_account_move_filter.x_account_codes`  
@@ -4531,6 +5718,20 @@ ID: `mint_system.account.view_in_invoice_tree.add_discount_date`
 ```
 Source: [snippets/account.view_in_invoice_tree.add_discount_date.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.view_in_invoice_tree.add_discount_date.xml)
 
+### Format Invoice Date Due  
+ID: `mint_system.account.view_in_invoice_tree.format_invoice_date_due`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="account.view_in_invoice_tree" priority="50">
+
+    <xpath expr="//field[@name='invoice_date_due']" position="attributes">
+        <attribute name="widget">date</attribute>
+    </xpath>
+
+</data>
+```
+Source: [snippets/account.view_in_invoice_tree.format_invoice_date_due.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.view_in_invoice_tree.format_invoice_date_due.xml)
+
 ## View Invoice Tree  
 ### Add Currency Id  
 ID: `mint_system.account.view_invoice_tree.add_currency_id`  
@@ -4546,6 +5747,20 @@ ID: `mint_system.account.view_invoice_tree.add_currency_id`
 ```
 Source: [snippets/account.view_invoice_tree.add_currency_id.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.view_invoice_tree.add_currency_id.xml)
 
+### Format Ref  
+ID: `mint_system.account.view_invoice_tree.format_ref`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="account.view_invoice_tree" priority="50">
+
+    <xpath expr="//field[@name='ref']" position="attributes">
+        <attribute name="string">Bestellnummer Kunde</attribute>        
+    </xpath>
+
+</data>
+```
+Source: [snippets/account.view_invoice_tree.format_ref.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.view_invoice_tree.format_ref.xml)
+
 ### Show Date  
 ID: `mint_system.account.view_invoice_tree.show_date`  
 ```xml
@@ -4617,6 +5832,20 @@ ID: `mint_system.account.view_move_form.edit_invoice_date`
 ```
 Source: [snippets/account.view_move_form.edit_invoice_date.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.view_move_form.edit_invoice_date.xml)
 
+### Format Partner Bank Id  
+ID: `mint_system.account.view_move_form.format_partner_bank_id`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="account.view_move_form" priority="50">
+
+    <xpath expr="//group[@name='sale_info_group']/field[@name='partner_bank_id']" position="attributes">
+        <attribute name="readonly">1</attribute>
+    </xpath>
+
+</data>
+```
+Source: [snippets/account.view_move_form.format_partner_bank_id.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.view_move_form.format_partner_bank_id.xml)
+
 ### Hide Payment Reference  
 ID: `mint_system.account.view_move_form.hide_payment_reference`  
 ```xml
@@ -4649,6 +5878,39 @@ ID: `mint_system.account.view_move_form.hide_send_button_on_refund`
 ```
 Source: [snippets/account.view_move_form.hide_send_button_on_refund.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.view_move_form.hide_send_button_on_refund.xml)
 
+### Move Ref  
+ID: `mint_system.account.view_move_form.move_ref`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="account.view_move_form" priority="50">
+
+    <xpath expr="//field[@name='partner_shipping_id']" position="after">
+        <field string="Bestellnummer Kunde" name="ref"/>
+    </xpath>
+
+    <xpath expr="//group[@name='sale_info_group']/label[1]" position="replace"/>
+    <xpath expr="//group[@name='sale_info_group']/field[@name='ref']" position="replace"/>
+
+</data>
+```
+Source: [snippets/account.view_move_form.move_ref.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.view_move_form.move_ref.xml)
+
+### Move To Check  
+ID: `mint_system.account.view_move_form.move_to_check`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="account.view_move_form" priority="50" >
+
+    <xpath expr="//field[@name='to_check']" position="replace" />
+
+    <xpath expr="//field[@name='ref']" position="after">
+        <field name="to_check" />
+    </xpath>
+
+</data>
+```
+Source: [snippets/account.view_move_form.move_to_check.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.view_move_form.move_to_check.xml)
+
 ### Payment Reference Readonly  
 ID: `mint_system.account.view_move_form.payment_reference_readonly`  
 ```xml
@@ -4739,6 +6001,34 @@ ID: `mint_system.account.view_move_form.show_line_partner_id`
 ```
 Source: [snippets/account.view_move_form.show_line_partner_id.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.view_move_form.show_line_partner_id.xml)
 
+### Show Payment Ids  
+ID: `mint_system.account.view_move_form.show_payment_ids`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="account.view_move_form" priority="50" >
+
+    <field name="journal_id" position="after">
+        <field name="payment_ids" />
+    </field>
+
+</data>
+```
+Source: [snippets/account.view_move_form.show_payment_ids.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.view_move_form.show_payment_ids.xml)
+
+### Show Payment State  
+ID: `mint_system.account.view_move_form.show_payment_state`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="account.view_move_form" priority="50" >
+
+    <field name="payment_reference" position="after">
+        <field name="x_payment_state" />
+    </field>
+
+</data>
+```
+Source: [snippets/account.view_move_form.show_payment_state.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.view_move_form.show_payment_state.xml)
+
 ### Show Posted Before  
 ID: `mint_system.account.view_move_form.show_posted_before`  
 ```xml
@@ -4813,6 +6103,23 @@ ID: `mint_system.account.view_move_form.x_duplicate_found`
 ```
 Source: [snippets/account.view_move_form.x_duplicate_found.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.view_move_form.x_duplicate_found.xml)
 
+### X Has Downpayment Warn Msg  
+ID: `mint_system.account.view_move_form.x_has_downpayment_warn_msg`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="account.view_move_form" priority="50" >
+
+    <header position="after">
+        <field name="x_has_downpayment" invisible="1"/>
+        <div groups="account.group_account_invoice" class="alert alert-warning" role="alert" style="margin-bottom:0px;" attrs="{'invisible': [('x_has_downpayment', '=', False)]}">
+            Der Verkaufsauftrag dieser Rechnung enthält Auftragszeilen mit einer Anzahlung.
+        </div>
+    </header>
+
+</data>
+```
+Source: [snippets/account.view_move_form.x_has_downpayment_warn_msg.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.view_move_form.x_has_downpayment_warn_msg.xml)
+
 ### X Invoice Warn Msg  
 ID: `mint_system.account.view_move_form.x_invoice_warn_msg`  
 ```xml
@@ -4904,6 +6211,21 @@ ID: `mint_system.account.view_move_line_tree_grouped_general.amount_currency_opt
 ```
 Source: [snippets/account.view_move_line_tree_grouped_general.amount_currency_optional.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.view_move_line_tree_grouped_general.amount_currency_optional.xml)
 
+## View Move Line Tree  
+### Show Cumulated Balance  
+ID: `mint_system.account.view_move_line_tree.show_cumulated_balance`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="account.view_move_line_tree" priority="50">
+
+    <field name="balance" position="after">
+        <field name="cumulated_balance" optional="hide" />
+    </field>
+    
+</data>
+```
+Source: [snippets/account.view_move_line_tree.show_cumulated_balance.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.view_move_line_tree.show_cumulated_balance.xml)
+
 ## View Move Tree  
 ### X Account Codes  
 ID: `mint_system.account.view_move_tree.x_account_codes`  
@@ -4920,6 +6242,20 @@ ID: `mint_system.account.view_move_tree.x_account_codes`
 Source: [snippets/account.view_move_tree.x_account_codes.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.view_move_tree.x_account_codes.xml)
 
 ## View Out Invoice Tree  
+### Format Invoice Date Due  
+ID: `mint_system.account.view_out_invoice_tree.format_invoice_date_due`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="account.view_out_invoice_tree" priority="50">
+
+  <xpath expr="//field[@name='invoice_date_due']" position="attributes">
+    <attribute name="widget">date</attribute>
+  </xpath>
+
+</data>
+```
+Source: [snippets/account.view_out_invoice_tree.format_invoice_date_due.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account.view_out_invoice_tree.format_invoice_date_due.xml)
+
 ### Show Partner Shipping  
 ID: `mint_system.account.view_out_invoice_tree.show_partner_shipping`  
 ```xml
diff --git a/snippets/account.portal_invoice_page.convert_html_note.xml b/snippets/account.portal_invoice_page.convert_html_note.xml
new file mode 100644
index 00000000..74292388
--- /dev/null
+++ b/snippets/account.portal_invoice_page.convert_html_note.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+<data inherit_id="account.portal_invoice_page" priority="50">
+
+    <t t-if="line.display_type == 'line_note'" position="replace">
+        <t t-if="line.display_type == 'line_note' and '&lt;!DOCTYPE html&gt;' in line.name">
+            <td colspan="99">
+                <t t-raw="line.name.replace('&lt;!DOCTYPE html&gt;', '')" />
+            </td>
+        </t>
+        <t t-elif="line.display_type == 'line_note' and '&lt;!DOCTYPE html&gt;' not in line.name">
+            <td colspan="99">
+                <span t-field="line.name"/>
+            </td>
+        </t>
+    </t>
+
+</data>
diff --git a/snippets/account.report_invoice_document.add_header_padding.xml b/snippets/account.report_invoice_document.add_header_padding.xml
index 56a68329..623693cb 100644
--- a/snippets/account.report_invoice_document.add_header_padding.xml
+++ b/snippets/account.report_invoice_document.add_header_padding.xml
@@ -3,6 +3,6 @@
 
   <xpath expr="//h2" position="attributes">
     <attribute name="style">padding-top: 2rem</attribute>
-	</xpath>
+    </xpath>
 
 </data>
diff --git a/snippets/account.report_invoice_document.add_header_space.xml b/snippets/account.report_invoice_document.add_header_space.xml
index 607e7951..2577560b 100644
--- a/snippets/account.report_invoice_document.add_header_space.xml
+++ b/snippets/account.report_invoice_document.add_header_space.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <data inherit_id="account.report_invoice_document" priority="50">
 
-	<xpath expr="//h2" position="attributes">
-		 <attribute name="style">padding-top: 5rem</attribute>
-	</xpath>
+    <xpath expr="//h2" position="attributes">
+         <attribute name="style">padding-top: 5rem</attribute>
+    </xpath>
 
 </data>
diff --git a/snippets/account.report_invoice_document.add_taxes.xml b/snippets/account.report_invoice_document.add_taxes.xml
new file mode 100644
index 00000000..32459881
--- /dev/null
+++ b/snippets/account.report_invoice_document.add_taxes.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+<data inherit_id="account.report_invoice_document" priority="60">
+
+    <xpath expr="//div[hasclass('page')]" position="before">
+        <style>
+        .o_company_1_layout {
+            font-family: Dobra-Book;
+            font-size: 80%;
+            }
+    .mb-4 {
+          margin-bottom: 0rem !important;
+          }
+    #total {
+          margin-bottom: 2rem;
+          }
+    h2 {
+               font-size: 1.5rem;
+              }
+        </style>
+    </xpath>
+
+</data>
\ No newline at end of file
diff --git a/snippets/account.report_invoice_document.convert_html_note.xml b/snippets/account.report_invoice_document.convert_html_note.xml
new file mode 100644
index 00000000..7db2c6d0
--- /dev/null
+++ b/snippets/account.report_invoice_document.convert_html_note.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<data inherit_id="account.report_invoice_document" priority="50">
+
+    <t t-if="line.display_type == 'line_note'" position="replace">
+        <t t-if="line.display_type == 'line_note' and '&lt;!DOCTYPE html&gt;' in line.name">
+            <td colspan="99">
+                <t t-raw="line.name.replace('&lt;!DOCTYPE html&gt;', '')" />
+            </td>
+        </t>
+        <t t-elif="line.display_type == 'line_note' and '&lt;!DOCTYPE html&gt;' not in line.name">
+            <td colspan="99">
+                <span t-field="line.name"/>
+            </td>
+        </t>
+    </t>
+</data>
\ No newline at end of file
diff --git a/snippets/account.report_invoice_document.custom_pament_term.xml b/snippets/account.report_invoice_document.custom_pament_term.xml
new file mode 100644
index 00000000..4ac9af72
--- /dev/null
+++ b/snippets/account.report_invoice_document.custom_pament_term.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<data inherit_id="account.report_invoice_document" priority="50">
+
+  <xpath expr="//p[@name='payment_term']" position="replace">
+    <p t-if="o.invoice_payment_term_id" name="payment_term">
+      Payment terms: <strong t-field="o.invoice_payment_term_id.name"/>
+    </p>
+  </xpath>
+
+</data>
diff --git a/snippets/account.report_invoice_document.custom_taxes.xml b/snippets/account.report_invoice_document.custom_taxes.xml
index 877a97cb..0fd2e204 100644
--- a/snippets/account.report_invoice_document.custom_taxes.xml
+++ b/snippets/account.report_invoice_document.custom_taxes.xml
@@ -2,12 +2,12 @@
 <data inherit_id="account.report_invoice_document" priority="50">
 
   <xpath expr="//th[@name='th_taxes']" position="replace">
-  	<th name="th_taxes" t-attf-class="text-right {{ 'd-none d-md-table-cell' if report_type == 'html' else '' }}"><span>Steuern</span></th>
+      <th name="th_taxes" t-attf-class="text-right {{ 'd-none d-md-table-cell' if report_type == 'html' else '' }}"><span>Steuern</span></th>
   </xpath>
   <xpath expr="//t[@name='account_invoice_line_accountable']/td[5]" position="replace">
-  	<td t-attf-class="text-right {{ 'd-none d-md-table-cell' if report_type == 'html' else '' }}">
-  		<span t-esc="', '.join(map(lambda x: (x.description or x.name), line.tax_ids))" id="line_tax_ids"/>
-  	</td>
+      <td t-attf-class="text-right {{ 'd-none d-md-table-cell' if report_type == 'html' else '' }}">
+          <span t-esc="', '.join(map(lambda x: (x.description or x.name), line.tax_ids))" id="line_tax_ids"/>
+      </td>
   </xpath>
 
 </data>
diff --git a/snippets/account.report_invoice_document.force_company_vat.xml b/snippets/account.report_invoice_document.force_company_vat.xml
new file mode 100644
index 00000000..4b73b682
--- /dev/null
+++ b/snippets/account.report_invoice_document.force_company_vat.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<data inherit_id="account.report_invoice_document" priority="60">
+
+  <t t-set="forced_vat" position="replace">
+    <t t-set="forced_vat" t-value="o.company_id.vat"/>
+  </t>
+
+</data>
\ No newline at end of file
diff --git a/snippets/account.report_invoice_document.format_qty_with_decimal.xml b/snippets/account.report_invoice_document.format_qty_with_decimal.xml
index ad37e512..f9825953 100644
--- a/snippets/account.report_invoice_document.format_qty_with_decimal.xml
+++ b/snippets/account.report_invoice_document.format_qty_with_decimal.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0"?>
 <data inherit_id="account.report_invoice_document" priority="50">
 
-	<xpath expr="//span[@id='qty']" position="replace">
-		<t t-if="line.quantity.is_integer()">
-			<span id="qty" t-field="line.quantity" t-options="{'widget': 'integer'}"/>
-		</t>
-		<t t-else="">
-			<span id="qty" t-field="line.quantity"/>
-		</t>
-	</xpath>
+    <xpath expr="//span[@id='qty']" position="replace">
+        <t t-if="line.quantity.is_integer()">
+            <span id="qty" t-field="line.quantity" t-options="{'widget': 'integer'}"/>
+        </t>
+        <t t-else="">
+            <span id="qty" t-field="line.quantity"/>
+        </t>
+    </xpath>
 
 </data>
\ No newline at end of file
diff --git a/snippets/account.report_invoice_document.hide_incoterm.xml b/snippets/account.report_invoice_document.hide_incoterm.xml
new file mode 100644
index 00000000..210b0379
--- /dev/null
+++ b/snippets/account.report_invoice_document.hide_incoterm.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<data inherit_id="account.report_invoice_document" priority="50">
+
+  <xpath expr="//p[@name='incoterm']" position="replace"/>
+  
+</data>
\ No newline at end of file
diff --git a/snippets/account.report_invoice_document.hide_payment_term.xml b/snippets/account.report_invoice_document.hide_payment_term.xml
new file mode 100644
index 00000000..f7a6db0e
--- /dev/null
+++ b/snippets/account.report_invoice_document.hide_payment_term.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<data inherit_id="account.report_invoice_document" priority="50">
+
+  <xpath expr="//p[@name='payment_term']" position="replace"/>
+  
+</data>
\ No newline at end of file
diff --git a/snippets/account.report_invoice_document.move_incoterm.xml b/snippets/account.report_invoice_document.move_incoterm.xml
new file mode 100644
index 00000000..116aeb91
--- /dev/null
+++ b/snippets/account.report_invoice_document.move_incoterm.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<data inherit_id="account.report_invoice_document" priority="60">
+
+  <xpath expr="//p[@name='incoterm']" position="replace"/>
+  <xpath expr="//p[2]" position="after">
+    <p t-if="o.invoice_incoterm_id" name="incoterm">Incoterm: 
+      <strong t-field="o.invoice_incoterm_id.display_name"/>
+    </p>
+  </xpath>
+  
+</data>
\ No newline at end of file
diff --git a/snippets/account.report_invoice_document.product_weight.xml b/snippets/account.report_invoice_document.product_weight.xml
index a8187473..a6905a1f 100644
--- a/snippets/account.report_invoice_document.product_weight.xml
+++ b/snippets/account.report_invoice_document.product_weight.xml
@@ -4,8 +4,8 @@
   <xpath expr="//table/tbody/t[3]/tr/t[1]/td[1]/span" position="after">
   <t t-if="line.product_id.weight">
     <br/>
-		Weight: <span t-field="line.product_id.weight"/>
-		<span t-field="line.product_id.weight_uom_id.display_name"/>
+        Weight: <span t-field="line.product_id.weight"/>
+        <span t-field="line.product_id.weight_uom_id.display_name"/>
   </t>
   </xpath>
 
diff --git a/snippets/account.report_invoice_document.remove_incoterms.xml b/snippets/account.report_invoice_document.remove_incoterm.xml
similarity index 60%
rename from snippets/account.report_invoice_document.remove_incoterms.xml
rename to snippets/account.report_invoice_document.remove_incoterm.xml
index fae47db0..77248f31 100644
--- a/snippets/account.report_invoice_document.remove_incoterms.xml
+++ b/snippets/account.report_invoice_document.remove_incoterm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <data inherit_id="account.report_invoice_document" priority="50">
 
-	<xpath expr="//p[@name='payment_communication']" position="replace">
+    <xpath expr="//p[@name='incoterm']" position="replace">
   </xpath>
 
 </data>
diff --git a/snippets/account.report_invoice_document.remove_payment_communication.xml b/snippets/account.report_invoice_document.remove_payment_communication.xml
index ece2d9fd..48b89f6a 100644
--- a/snippets/account.report_invoice_document.remove_payment_communication.xml
+++ b/snippets/account.report_invoice_document.remove_payment_communication.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <data inherit_id="account.report_invoice_document" priority="50">
 
-	<xpath expr="//p[@name='payment_communication']" position="replace" />
+    <xpath expr="//p[@name='payment_communication']" position="replace" />
 
 </data>
diff --git a/snippets/account.report_invoice_document.remove_payment_term.xml b/snippets/account.report_invoice_document.remove_payment_term.xml
index bf90be4e..3b58e51e 100644
--- a/snippets/account.report_invoice_document.remove_payment_term.xml
+++ b/snippets/account.report_invoice_document.remove_payment_term.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <data inherit_id="account.report_invoice_document" priority="50">
 
-	<p name="payment_term" position="replace" />
+    <p name="payment_term" position="replace" />
 
 </data>
diff --git a/snippets/account.report_invoice_document.replace_address_and_information_block.xml b/snippets/account.report_invoice_document.replace_address_and_information_block.xml
new file mode 100644
index 00000000..8d37376b
--- /dev/null
+++ b/snippets/account.report_invoice_document.replace_address_and_information_block.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0"?>
+<data inherit_id="account.report_invoice_document" priority="50">
+
+  <xpath expr="//t[@t-set='address']" position="replace">
+
+    <div class="row text-900 o_bold">
+      <div class="col-7">Customer</div>
+      <div class="col-5">Invoice Address</div>
+    </div>
+
+    <div class="row">
+      <div class="col-7">
+        <span t-field="o.partner_id" t-options-widget="&quot;contact&quot;" t-options-fields="['name', 'address']" t-options-no_marker="True"/>
+      </div>
+      <div class="col-5">
+        <span t-field="o.partner_id" t-options-widget="&quot;contact&quot;" t-options-fields="['name', 'address']" t-options-no_marker="True"/>
+      </div>
+    </div>
+
+    <div class="row">
+      <div class="col-5 text-900 o_bold offset-7" style="margin-top:25px">Delivery Address</div>
+    </div>
+
+    <div class="row">
+      <div class="col-5 offset-7">
+        <span t-field="o.partner_shipping_id" t-options-widget="&quot;contact&quot;" t-options-fields="['name', 'address']" t-options-no_marker="True"/>
+      </div>
+    </div>
+
+    <div class="row o_bold text-900" style="margin-top:25px">
+      <div class="col-7">Your Contact</div>
+      <div class="col-5">Our Contact</div>
+    </div>
+
+    <div class="row">
+      <div class="col-7">
+        <span t-field="o.partner_id.name"/>
+      </div>
+      <div class="col-5">
+        <span t-field="o.user_id.name"/>
+      </div>
+    </div>
+
+    <div class="row">
+      <div class="col-7" style="margin-bottom:25px">
+        <span t-field="o.partner_id" t-options-widget="&quot;contact&quot;" t-options-fields="['phone', 'email']" t-options-no_marker="True"/>
+      </div>
+      <div class="col-5">
+        <span t-field="o.user_id" t-options-widget="&quot;contact&quot;" t-options-fields="['phone', 'email']" t-options-no_marker="True"/>
+      </div>
+    </div>
+
+  </xpath>
+
+</data>
\ No newline at end of file
diff --git a/snippets/account.report_invoice_document.replace_product_description.xml b/snippets/account.report_invoice_document.replace_product_description.xml
index 5948bdee..e779a36d 100644
--- a/snippets/account.report_invoice_document.replace_product_description.xml
+++ b/snippets/account.report_invoice_document.replace_product_description.xml
@@ -1,18 +1,27 @@
 <?xml version="1.0"?>
 <data inherit_id="account.report_invoice_document" priority="50">
 
-<xpath expr="//td[@name='account_invoice_line_name']" position="replace">
-  <t t-if="line.product_id.type_description">
-	<td>
-		<span style="font-weight: bold" t-field="line.product_id.type_description"/>
-	</td>
-  </t>
-  <t t-if="not line.product_id.type_description">
-	<td>
-    <span t-field="line.external_name"/>
-	</td>
-  </t>
+  <xpath expr="//td[@name='account_invoice_line_name']" position="replace">
+    <t t-if="line.product_id.type_description">
+      <td>
+        <span style="font-weight: bold" t-field="line.product_id.type_description"/>
+      </td>
+    </t>
+    <t t-if="not line.product_id.type_description">
+      <td>
+        <span t-field="line.external_name"/>
+      </td>
+    </t>
 
-</xpath>
+    <!---
+    <xpath expr="//td[@name='account_invoice_line_name']" position="replace">
+      <td name="td_name">
+        <span class="o_bold" t-field="line.product_id.name"/><br/>
+        <span t-field="line.name"/>  
+      </td>
+    </xpath>
+    -->
+
+  </xpath>
 
 </data>
\ No newline at end of file
diff --git a/snippets/account.report_invoice_document.replace_summary.xml b/snippets/account.report_invoice_document.replace_summary.xml
index ec3d8122..712c8ec9 100644
--- a/snippets/account.report_invoice_document.replace_summary.xml
+++ b/snippets/account.report_invoice_document.replace_summary.xml
@@ -4,50 +4,50 @@
   <xpath expr="//table[@name='invoice_line_table']" position="after">
 
     <style>
-			table.trimada_summary tr {
-				border-top: solid 1px !important;
-				border-bottom: solid 1px;
-				page-break-inside: avoid;
-			}
-			table.trimada_details tr {
-			  border-top: 0px !important;
-			  border-bottom: 0px;
-			  line-height: 0.7;
-			}
-			table.trimada_summary #amount_untaxed_label {
-				width: 11.5%;
-				text-align: left;
-			}
-			table.trimada_details td#amount_by_group0 {
-				width: 8%;
-				text-align: left;
-			}
-			table.trimada_details td#amount_by_group3 {
-				width: 21%;
-				text-align: right;
-				padding-right: 10%;
-			}
-			table.trimada_details td#amount_by_group4 {
-				width: 27%;
-				text-align: right;
-				padding-right: 15%;
-			}
-			table.trimada_summary td#amount_by_group_label {
-				width: 12%;
-				text-align: left;
-			}
-			table.trimada_summary td#amount_by_group {
-				width: 17%;
-				text-align: left;
-			}
-			table.trimada_summary #amount_total_label {
-				width: 14%;
-				text-align: right;
-			}
-			table.trimada_summary #amount_total {
-				width: 18%;
-				text-align: right;
-			}
+            table.trimada_summary tr {
+                border-top: solid 1px !important;
+                border-bottom: solid 1px;
+                page-break-inside: avoid;
+            }
+            table.trimada_details tr {
+              border-top: 0px !important;
+              border-bottom: 0px;
+              line-height: 0.7;
+            }
+            table.trimada_summary #amount_untaxed_label {
+                width: 11.5%;
+                text-align: left;
+            }
+            table.trimada_details td#amount_by_group0 {
+                width: 8%;
+                text-align: left;
+            }
+            table.trimada_details td#amount_by_group3 {
+                width: 21%;
+                text-align: right;
+                padding-right: 10%;
+            }
+            table.trimada_details td#amount_by_group4 {
+                width: 27%;
+                text-align: right;
+                padding-right: 15%;
+            }
+            table.trimada_summary td#amount_by_group_label {
+                width: 12%;
+                text-align: left;
+            }
+            table.trimada_summary td#amount_by_group {
+                width: 17%;
+                text-align: left;
+            }
+            table.trimada_summary #amount_total_label {
+                width: 14%;
+                text-align: right;
+            }
+            table.trimada_summary #amount_total {
+                width: 18%;
+                text-align: right;
+            }
     </style>
 
     <table class="table table-borderless table-sm trimada trimada_summary">
@@ -126,4 +126,3 @@
   </xpath>
 
 </data>
-
diff --git a/snippets/account.report_invoice_document.round_price.xml b/snippets/account.report_invoice_document.round_price.xml
index fadaca87..0c493c45 100644
--- a/snippets/account.report_invoice_document.round_price.xml
+++ b/snippets/account.report_invoice_document.round_price.xml
@@ -2,7 +2,7 @@
 <data inherit_id="account.report_invoice_document" priority="50">
 
   <xpath expr="//span[@t-field='line.price_unit']" position="replace">
-		 <span t-esc="'%g' % line.price_unit if str(line.price_unit)[::-1].find('.') >= 3 else '{0:,.2f}'.format(float(line.price_unit)).replace(',','\'')"/>
+         <span t-esc="'%g' % line.price_unit if str(line.price_unit)[::-1].find('.') >= 3 else '{0:,.2f}'.format(float(line.price_unit)).replace(',','\'')"/>
   </xpath>
    
 </data>
\ No newline at end of file
diff --git a/snippets/account.report_invoice_document.round_price_unit.xml b/snippets/account.report_invoice_document.round_price_unit.xml
new file mode 100644
index 00000000..d691cce3
--- /dev/null
+++ b/snippets/account.report_invoice_document.round_price_unit.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<data inherit_id="account.report_invoice_document" priority="50">
+
+  <xpath expr="//span[@t-field='line.price_unit']" position="replace">
+    <span class="text-nowrap" t-esc="'{0:,.2f}'.format(float(line.price_unit)).replace(',','\'')"/>
+  </xpath>
+
+</data>
diff --git a/snippets/account.report_invoice_document.set_ids.xml b/snippets/account.report_invoice_document.set_ids.xml
index ca39188f..fc817530 100644
--- a/snippets/account.report_invoice_document.set_ids.xml
+++ b/snippets/account.report_invoice_document.set_ids.xml
@@ -1,22 +1,22 @@
 <?xml version="1.0"?>
 <data inherit_id="account.report_invoice_document" priority="50">
   
-	<xpath expr="//th[@name='th_quantity']" position="attributes">
-		<attribute name="id">th_quantity</attribute>
-	</xpath>
+    <xpath expr="//th[@name='th_quantity']" position="attributes">
+        <attribute name="id">th_quantity</attribute>
+    </xpath>
 
-	<xpath expr="//th[@name='th_description']" position="attributes">
-		<attribute name="id">description</attribute>
-	</xpath>
-	<xpath expr="//table[@name='invoice_line_table']//td[2]" position="attributes">
-		<attribute name="id">quantity</attribute>
-	</xpath>
-	<xpath expr="//table[@name='invoice_line_table']//td[2]/span[1]" position="attributes">
-		<attribute name="id">qty</attribute>
-	</xpath>
-	
-	<xpath expr="//table[@name='invoice_line_table']//td[3]/span[1]" position="attributes">
-		<attribute name="id">price</attribute>
-	</xpath>
+    <xpath expr="//th[@name='th_description']" position="attributes">
+        <attribute name="id">description</attribute>
+    </xpath>
+    <xpath expr="//table[@name='invoice_line_table']//td[2]" position="attributes">
+        <attribute name="id">quantity</attribute>
+    </xpath>
+    <xpath expr="//table[@name='invoice_line_table']//td[2]/span[1]" position="attributes">
+        <attribute name="id">qty</attribute>
+    </xpath>
+    
+    <xpath expr="//table[@name='invoice_line_table']//td[3]/span[1]" position="attributes">
+        <attribute name="id">price</attribute>
+    </xpath>
 
 </data>
\ No newline at end of file
diff --git a/snippets/account.report_invoice_document.show_categ_id.xml b/snippets/account.report_invoice_document.show_categ_id.xml
new file mode 100644
index 00000000..0ff9d930
--- /dev/null
+++ b/snippets/account.report_invoice_document.show_categ_id.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<data inherit_id="account.report_invoice_document" priority="50">
+  
+  <xpath expr="//span[@t-field='line.name']" position="after">
+    <div>
+      <span t-field="line.product_id.categ_id"/>
+    </div>
+ </xpath>
+
+</data>
\ No newline at end of file
diff --git a/snippets/account.report_invoice_document.show_customer_info_product_code.xml b/snippets/account.report_invoice_document.show_customer_info_product_code.xml
index a612b9c8..2d8c9f29 100644
--- a/snippets/account.report_invoice_document.show_customer_info_product_code.xml
+++ b/snippets/account.report_invoice_document.show_customer_info_product_code.xml
@@ -2,7 +2,7 @@
 <data inherit_id="account.report_invoice_document" priority="50">
 
   <span t-field="line.name" position="before">
-    <t t-set="customer_info" t-value="line.product_id._select_customerinfo(partner=o.commercial_partner_id)" />
+    <t t-if="line.product_id" t-set="customer_info" t-value="line.product_id._select_customerinfo(partner=o.commercial_partner_id)" />
     <t t-if="customer_info">
       <span t-esc="'[%s] ' % customer_info[0].product_code" />
     </t>
diff --git a/snippets/account.report_invoice_document.show_hs_code.xml b/snippets/account.report_invoice_document.show_hs_code.xml
new file mode 100644
index 00000000..0968bbdb
--- /dev/null
+++ b/snippets/account.report_invoice_document.show_hs_code.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<data inherit_id="account.report_invoice_document" priority="60">
+
+  <xpath expr="//table[@name='invoice_line_table']//th[@name='th_quantity']" position="after">
+    <th name="th_hs_code" class="text-right">
+      <span>H.S. Code</span>
+    </th>
+  </xpath>
+
+  <xpath expr="//table[@name='invoice_line_table']//span[@t-field='line.quantity']/.." position="after">
+    <td name="td_hs_code" class="text-right">
+       <span t-esc="line.product_id.intrastat_id.code"/>
+    </td>
+  </xpath>
+
+</data>
\ No newline at end of file
diff --git a/snippets/account.report_invoice_document.show_lot_ids.xml b/snippets/account.report_invoice_document.show_lot_ids.xml
index fefffb35..149f55fe 100644
--- a/snippets/account.report_invoice_document.show_lot_ids.xml
+++ b/snippets/account.report_invoice_document.show_lot_ids.xml
@@ -6,9 +6,12 @@
     <t t-if="lot_ids">
       <br />
       <span>Seriennummern:</span>
-      <ul t-foreach="lot_ids" t-as="lot">
-        <li t-esc="lot.name" />
-      </ul>
+      <t t-esc="', '.join(lot_ids.mapped('name'))" />
+      <!-- <ul class="list-unstyled">
+        <t t-foreach="lot_ids" t-as="lot">
+          <li t-esc="lot.name" />
+        </t>
+      </ul> -->
     </t>
   </xpath>
 
diff --git a/snippets/account.report_invoice_document.show_order_id.xml b/snippets/account.report_invoice_document.show_order_id.xml
new file mode 100644
index 00000000..b7f5a8c2
--- /dev/null
+++ b/snippets/account.report_invoice_document.show_order_id.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<data inherit_id="account.report_invoice_document" priority="60">
+
+  <xpath expr="//td[@name='account_invoice_line_name']" position="replace">
+
+    <td name="account_invoice_line_name">
+      <t t-if="not line.sale_line_ids.task_id.sale_line_id.order_id">
+        <span t-field="line.name" t-options="{'widget': 'text'}"/>
+      </t>
+      <t t-if="line.sale_line_ids.task_id.sale_line_id.order_id">
+        Dienstleistung gemäss Rapport # <span t-field="line.sale_line_ids.task_id.sale_line_id.order_id"/>
+      </t>
+    </td>
+  </xpath>
+
+</data>
diff --git a/snippets/account.report_invoice_document.show_sale_line_ids.xml b/snippets/account.report_invoice_document.show_sale_line_ids.xml
new file mode 100644
index 00000000..0968bbdb
--- /dev/null
+++ b/snippets/account.report_invoice_document.show_sale_line_ids.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<data inherit_id="account.report_invoice_document" priority="60">
+
+  <xpath expr="//table[@name='invoice_line_table']//th[@name='th_quantity']" position="after">
+    <th name="th_hs_code" class="text-right">
+      <span>H.S. Code</span>
+    </th>
+  </xpath>
+
+  <xpath expr="//table[@name='invoice_line_table']//span[@t-field='line.quantity']/.." position="after">
+    <td name="td_hs_code" class="text-right">
+       <span t-esc="line.product_id.intrastat_id.code"/>
+    </td>
+  </xpath>
+
+</data>
\ No newline at end of file
diff --git a/snippets/account.report_invoice_document.show_weight.xml b/snippets/account.report_invoice_document.show_weight.xml
new file mode 100644
index 00000000..eaebe772
--- /dev/null
+++ b/snippets/account.report_invoice_document.show_weight.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0"?>
+<data inherit_id="account.report_invoice_document" priority="60">
+
+  <xpath expr="//table[@name='invoice_line_table']//th[@name='th_quantity']" position="inside">
+    <br/>
+    <i>Weight</i>
+  </xpath>
+
+  <xpath expr="//table[@name='invoice_line_table']//th[@name='th_subtotal']" position="inside">
+    <br/>
+    <i>Total Weight</i>
+  </xpath>
+
+  <xpath expr="//table[@name='invoice_line_table']//span[@t-field='line.quantity']/.." position="inside">
+    <br/>
+    <i>
+      <span t-field="line.product_id.weight"/>
+      <span t-field="line.product_id.weight_uom_name"/>
+    </i>
+  </xpath>
+
+ <xpath expr="//table[@name='invoice_line_table']//span[@t-field='line.price_subtotal']/.." position="inside">
+    <br/>
+    <i>
+      <span t-esc="line.product_id.weight * line.quantity" t-options="{&quot;widget&quot;: &quot;float&quot;, &quot;decimal_precision&quot;: &quot;Stock Weight&quot;}"/>
+      <span t-field="line.product_id.weight_uom_name"/>
+    </i>
+  </xpath>
+
+</data>
\ No newline at end of file
diff --git a/snippets/account.report_invoice_document.style_carbo_link.xml b/snippets/account.report_invoice_document.style_carbo_link.xml
new file mode 100644
index 00000000..32459881
--- /dev/null
+++ b/snippets/account.report_invoice_document.style_carbo_link.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+<data inherit_id="account.report_invoice_document" priority="60">
+
+    <xpath expr="//div[hasclass('page')]" position="before">
+        <style>
+        .o_company_1_layout {
+            font-family: Dobra-Book;
+            font-size: 80%;
+            }
+    .mb-4 {
+          margin-bottom: 0rem !important;
+          }
+    #total {
+          margin-bottom: 2rem;
+          }
+    h2 {
+               font-size: 1.5rem;
+              }
+        </style>
+    </xpath>
+
+</data>
\ No newline at end of file
diff --git a/snippets/account.report_invoice_document.style_moser.xml b/snippets/account.report_invoice_document.style_moser.xml
new file mode 100644
index 00000000..ff1582d8
--- /dev/null
+++ b/snippets/account.report_invoice_document.style_moser.xml
@@ -0,0 +1,36 @@
+<data inherit_id="account.report_invoice_document" priority="60">
+
+    <xpath expr="//div[hasclass('page')]" position="before">
+        <style>
+        .o_company_1_layout {
+            font-family: arial;
+         }
+        .o_company_1_layout.o_report_layout_standard h2 {
+            color: black;
+               font-size: 1.4rem;
+                font-weight: bold;
+         }
+         .o_company_1_layout.o_report_layout_standard #total strong {
+            color: black;
+         }
+         div#informations {
+              margin-top: 30px;
+              margin-bottom: 60px;
+         }
+         h2.mt-4 {
+              margin-top: 70px !important;
+         }
+         th#tax_amount {
+              text-align: right;
+         }
+         td#tax_amount {
+              text-align: right;
+         }
+        </style>
+    </xpath>
+    
+    <xpath expr="//table[@name='invoice_line_table']" position="attributes">
+        <attribute name="class">table table-sm o_main_table mt-4</attribute>
+    </xpath>
+    
+</data>
\ No newline at end of file
diff --git a/snippets/account.report_invoice_document.style_tissa.xml b/snippets/account.report_invoice_document.style_tissa.xml
new file mode 100644
index 00000000..b3ac7144
--- /dev/null
+++ b/snippets/account.report_invoice_document.style_tissa.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0"?>
+<data inherit_id="account.report_invoice_document" priority="60">
+
+    <xpath expr="//div[hasclass('page')]" position="before">
+        <style>
+            table#info {
+                font-size: 9pt;
+                font-family: arial;
+            }
+            h2 {
+            font-size: 1.2rem;
+            font-weight: bold;
+            margin: 50px 0 30px 0
+            }
+            body {
+                font-size: 11pt;
+                font-family: arial;
+            }
+        </style>
+    </xpath>
+
+    <xpath expr="//table[@name='invoice_line_table']/thead/tr/th[5]" position="attributes">
+        <attribute name="t-attf-class">text-right {{ 'd-none d-md-table-cell' if report_type == 'html' else '' }}</attribute>
+    </xpath>
+
+    <xpath expr="//table[@name='invoice_line_table']/tbody/t/tr/t/td[5]" position="attributes">
+        <attribute name="t-attf-class">text-right {{ 'd-none d-md-table-cell' if report_type == 'html' else '' }}</attribute>
+    </xpath>
+
+    <xpath expr="//p[@name='payment_communication']" position="attributes">
+        <attribute name="style">margin-bottom: 0px</attribute>
+    </xpath>
+
+    <xpath expr="//p[@name='payment_term']" position="attributes">
+        <attribute name="style">margin-bottom: 0px</attribute>
+    </xpath>
+
+</data>
diff --git a/snippets/account.report_invoice_document.style_trimada.xml b/snippets/account.report_invoice_document.style_trimada.xml
index e5f4ecbc..1dbbd39a 100644
--- a/snippets/account.report_invoice_document.style_trimada.xml
+++ b/snippets/account.report_invoice_document.style_trimada.xml
@@ -1,86 +1,86 @@
 <?xml version="1.0"?>
 <data inherit_id="account.report_invoice_document" priority="60">
 
-	<xpath expr="//div[hasclass('page')]" position="before">
-		<style>
-			table.trimada {
-				font-size: 9pt;
-				font-family: arial;
-				color: black;
-			}
-			table.trimada tr.first td {
-				padding-bottom: 0;
-			}
-			table.trimada tr.second td {
-				padding-top: 0;
-			}
-			table.trimada tr.second {
-				border-bottom: 1px solid rgb(220,220,220);
-			}
-			table.trimada thead tr {
-				border-top:solid 1px;
-				border-bottom: solid 1px;
-			}
-			table.trimada thead th#position {
-				width: 5mm;
-			}
-			table.trimada thead th#default_code {
-			  width: 27mm;
-			  text-align: right;
-			}
-			table.trimada thead th#open_quantity {
-			  width: 30mm;
-			  text-align: right;
-			}
-			table.trimada thead th#quantity {
-			  width: 25mm;
-			  text-align: right !important;
-			}
-			table.trimada tbody td#position {
-			  text-align: right;
-			}
-			table.trimada tbody td#default_code {
-			  text-align: right;
-			}
-			table.trimada tbody td#open_quantity {
-			  text-align: right !important;
-			}
-			table.trimada tbody td#quantity {
-			  text-align: right;
-			}			
-			table.trimada tbody span#qty {
-			  font-weight: bold;
-			}
-			table.trimada tbody span#open_qty {
-			  font-weight: bold;
-			}
-			.address {
-			  font-size: 10pt;
-			  line-height: 1.2;
-			  padding-bottom:33mm;
-			}
-			.subtitel {
-				font-size: 11pt;
-				font-family: arial;
-				margin-top: 10mm;
-			}
-			.note {
-				font-size: 9pt;
-				font-family: arial;
-			}
-		</style>
-	</xpath>
+    <xpath expr="//div[hasclass('page')]" position="before">
+        <style>
+            table.trimada {
+                font-size: 9pt;
+                font-family: arial;
+                color: black;
+            }
+            table.trimada tr.first td {
+                padding-bottom: 0;
+            }
+            table.trimada tr.second td {
+                padding-top: 0;
+            }
+            table.trimada tr.second {
+                border-bottom: 1px solid rgb(220,220,220);
+            }
+            table.trimada thead tr {
+                border-top:solid 1px;
+                border-bottom: solid 1px;
+            }
+            table.trimada thead th#position {
+                width: 5mm;
+            }
+            table.trimada thead th#default_code {
+              width: 27mm;
+              text-align: right;
+            }
+            table.trimada thead th#open_quantity {
+              width: 30mm;
+              text-align: right;
+            }
+            table.trimada thead th#quantity {
+              width: 25mm;
+              text-align: right !important;
+            }
+            table.trimada tbody td#position {
+              text-align: right;
+            }
+            table.trimada tbody td#default_code {
+              text-align: right;
+            }
+            table.trimada tbody td#open_quantity {
+              text-align: right !important;
+            }
+            table.trimada tbody td#quantity {
+              text-align: right;
+            }            
+            table.trimada tbody span#qty {
+              font-weight: bold;
+            }
+            table.trimada tbody span#open_qty {
+              font-weight: bold;
+            }
+            .address {
+              font-size: 10pt;
+              line-height: 1.2;
+              padding-bottom:33mm;
+            }
+            .subtitel {
+                font-size: 11pt;
+                font-family: arial;
+                margin-top: 10mm;
+            }
+            .note {
+                font-size: 9pt;
+                font-family: arial;
+            }
+        </style>
+    </xpath>
 
-	<table name="invoice_line_table" position="attributes">
-		<attribute name="class" separator=" " add="trimada table-borderless"/>
-	</table>
+    <table name="invoice_line_table" position="attributes">
+        <attribute name="class" separator=" " add="trimada table-borderless"/>
+    </table>
 
-	<table name="invoice_line_table" position="attributes">
-		<attribute name="class" separator=" " add="trimada table-borderless"/>
-	</table>
+    <table name="invoice_line_table" position="attributes">
+        <attribute name="class" separator=" " add="trimada table-borderless"/>
+    </table>
 
   <span id="qty" position="attributes">
-		<attribute name="t-options-widget">"integer"</attribute>
-	</span>
-	
+        <attribute name="t-options-widget">"integer"</attribute>
+    </span>
+    
 </data>
diff --git a/snippets/account.report_invoice_document.tissa_replace_infotable.xml b/snippets/account.report_invoice_document.tissa_replace_infotable.xml
new file mode 100644
index 00000000..27678e59
--- /dev/null
+++ b/snippets/account.report_invoice_document.tissa_replace_infotable.xml
@@ -0,0 +1,103 @@
+<?xml version="1.0"?>
+<data inherit_id="account.report_invoice_document" priority="50">
+
+  <xpath expr="//div[@id='informations']" position="replace">
+    <style>
+    table#info {
+      width: 100%;
+      margin-bottom: 45px;
+      font-size: 11pt;
+    }
+    table#info tr {
+      line-height: 1.2;
+      text-align: left;
+    }
+    .note {
+      font-size: 9pt;
+    }
+    </style>
+    <table id='info'>
+
+      <tr>
+        <td>
+          Kundennummer:
+        </td>
+        <td>
+          <span t-field='o.partner_id.ref'/>
+        </td>
+        <td>
+          Datum:
+        </td>
+        <td>
+          <span t-field='o.invoice_date'/>
+        </td>
+      </tr>
+
+      <tr>
+        <td>
+          USt-IdNr:
+        </td>
+        <td>
+          <span t-field='o.partner_id.vat'/>
+        </td>
+
+        <td>Unser Auftrag:</td>
+        <td>
+          <t t-if='o.sale_order_id.origin'>
+            <span t-field='o.sale_order_id.origin'/>
+ / 
+          </t>
+          <span t-field='o.invoice_origin'/>
+        </td>
+      </tr>
+
+      <tr>
+        <td width="16%">EORI-Nummer:</td>
+        <td width="44%">
+          <span t-field="o.partner_id.x_studio_eori_nummer"/>
+        </td>
+        <td>Abruf:</td>
+        <td>
+          <span t-field='o.sale_order_id.comment'/>
+          <t t-if='o.sale_order_id.x_studio_kommission'>
+             /            <span t-field='o.sale_order_id.x_studio_kommission'/>
+          </t>
+        </td>
+      </tr>
+
+      <tr>
+        <td>Ihre Bestellung:</td>
+        <td>
+          <span t-field='o.sale_order_id.blanket_order_id.client_order_ref'/>          
+        </td>
+        <td>Kundenbetreuer/in:</td>
+        <td>
+          <span t-field='o.partner_id.user_id'/>
+        </td>
+      </tr>
+
+      <tr>
+        <td></td>
+        <td>         
+          <span t-field='o.sale_order_id.blanket_order_id.date_confirmed'/>         
+        </td>
+        <td width="19%">Sachbearbeiter/in:</td>
+        <td width="21%">
+          <span t-field='o.user_id'/>
+        </td>
+      </tr>
+
+      <tr>
+        <td></td>
+        <td></td>
+        <td>
+          MwSt-Nr:
+        </td>
+        <td>
+          CHE-103.327.797 MWST
+        </td>
+      </tr>
+
+    </table>
+  </xpath>
+</data>
\ No newline at end of file
diff --git a/snippets/account.report_invoice_document.unit_precision.xml b/snippets/account.report_invoice_document.unit_precision.xml
index 687f2db9..f02f9566 100644
--- a/snippets/account.report_invoice_document.unit_precision.xml
+++ b/snippets/account.report_invoice_document.unit_precision.xml
@@ -2,7 +2,7 @@
 <data inherit_id="account.report_invoice_document" priority="50">
 
   <xpath expr="//tbody[1]/t[3]/tr[1]/t[1]/td[2]/span[1]" position="attributes">
-		<attribute name="t-options-widget">"integer"</attribute>
+        <attribute name="t-options-widget">"integer"</attribute>
   </xpath>
 
 </data>
diff --git a/snippets/account.report_invoice_document.x_hide_on_invoice.xml b/snippets/account.report_invoice_document.x_hide_on_invoice.xml
new file mode 100644
index 00000000..a1c497ea
--- /dev/null
+++ b/snippets/account.report_invoice_document.x_hide_on_invoice.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<data inherit_id="account.report_invoice_document" priority="50">
+
+    <xpath expr="//t[@t-set='lines']" position="after">
+        <t t-set="lines" t-value="lines.filtered(lambda l: not l.product_id.x_hide_on_invoice)" />
+    </xpath>
+
+</data>
\ No newline at end of file
diff --git a/snippets/account.view_account_journal_form.show_payment_method_code.xml b/snippets/account.view_account_journal_form.show_payment_method_code.xml
new file mode 100644
index 00000000..49b8a3f3
--- /dev/null
+++ b/snippets/account.view_account_journal_form.show_payment_method_code.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<data inherit_id="account.view_account_journal_form" priority="50">
+
+    <xpath expr="//field[@name='inbound_payment_method_line_ids']//field[@name='payment_method_id']" position="before">
+        <field name="code" />
+    </xpath>
+
+</data>
\ No newline at end of file
diff --git a/snippets/account.view_account_list.show_deprecated.xml b/snippets/account.view_account_list.show_deprecated.xml
new file mode 100644
index 00000000..71554878
--- /dev/null
+++ b/snippets/account.view_account_list.show_deprecated.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<data inherit_id="account.view_account_list" priority="50">
+
+    <xpath expr="//field[@name='reconcile']" position="after">
+        <field name="deprecated"  widget="boolean_toggle" />
+    </xpath>
+
+</data>
\ No newline at end of file
diff --git a/snippets/account.view_in_invoice_tree.format_invoice_date_due.xml b/snippets/account.view_in_invoice_tree.format_invoice_date_due.xml
new file mode 100644
index 00000000..63e03267
--- /dev/null
+++ b/snippets/account.view_in_invoice_tree.format_invoice_date_due.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<data inherit_id="account.view_in_invoice_tree" priority="50">
+
+    <xpath expr="//field[@name='invoice_date_due']" position="attributes">
+        <attribute name="widget">date</attribute>
+    </xpath>
+
+</data>
\ No newline at end of file
diff --git a/snippets/account.view_invoice_tree.format_ref.xml b/snippets/account.view_invoice_tree.format_ref.xml
new file mode 100644
index 00000000..aead6e93
--- /dev/null
+++ b/snippets/account.view_invoice_tree.format_ref.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<data inherit_id="account.view_invoice_tree" priority="50">
+
+    <xpath expr="//field[@name='ref']" position="attributes">
+        <attribute name="string">Bestellnummer Kunde</attribute>        
+    </xpath>
+
+</data>
\ No newline at end of file
diff --git a/snippets/account.view_move_form.format_partner_bank_id.xml b/snippets/account.view_move_form.format_partner_bank_id.xml
new file mode 100644
index 00000000..082cbc8c
--- /dev/null
+++ b/snippets/account.view_move_form.format_partner_bank_id.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<data inherit_id="account.view_move_form" priority="50">
+
+    <xpath expr="//group[@name='sale_info_group']/field[@name='partner_bank_id']" position="attributes">
+        <attribute name="readonly">1</attribute>
+    </xpath>
+
+</data>
\ No newline at end of file
diff --git a/snippets/account.view_move_form.move_ref.xml b/snippets/account.view_move_form.move_ref.xml
new file mode 100644
index 00000000..6a8d5009
--- /dev/null
+++ b/snippets/account.view_move_form.move_ref.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<data inherit_id="account.view_move_form" priority="50">
+
+    <xpath expr="//field[@name='partner_shipping_id']" position="after">
+        <field string="Bestellnummer Kunde" name="ref"/>
+    </xpath>
+
+    <xpath expr="//group[@name='sale_info_group']/label[1]" position="replace"/>
+    <xpath expr="//group[@name='sale_info_group']/field[@name='ref']" position="replace"/>
+
+</data>
\ No newline at end of file
diff --git a/snippets/account.view_move_form.move_to_check.xml b/snippets/account.view_move_form.move_to_check.xml
new file mode 100644
index 00000000..2eebbda5
--- /dev/null
+++ b/snippets/account.view_move_form.move_to_check.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<data inherit_id="account.view_move_form" priority="50" >
+
+    <xpath expr="//field[@name='to_check']" position="replace" />
+
+    <xpath expr="//field[@name='ref']" position="after">
+        <field name="to_check" />
+    </xpath>
+
+</data>
\ No newline at end of file
diff --git a/snippets/account.view_move_form.show_payment_ids.xml b/snippets/account.view_move_form.show_payment_ids.xml
new file mode 100644
index 00000000..845203f4
--- /dev/null
+++ b/snippets/account.view_move_form.show_payment_ids.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<data inherit_id="account.view_move_form" priority="50" >
+
+    <field name="journal_id" position="after">
+        <field name="payment_ids" />
+    </field>
+
+</data>
\ No newline at end of file
diff --git a/snippets/account.view_move_form.show_payment_state.xml b/snippets/account.view_move_form.show_payment_state.xml
new file mode 100644
index 00000000..8e3bbde4
--- /dev/null
+++ b/snippets/account.view_move_form.show_payment_state.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<data inherit_id="account.view_move_form" priority="50" >
+
+    <field name="payment_reference" position="after">
+        <field name="x_payment_state" />
+    </field>
+
+</data>
\ No newline at end of file
diff --git a/snippets/account.view_move_form.x_has_downpayment_warn_msg.xml b/snippets/account.view_move_form.x_has_downpayment_warn_msg.xml
new file mode 100644
index 00000000..f52a7e4d
--- /dev/null
+++ b/snippets/account.view_move_form.x_has_downpayment_warn_msg.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<data inherit_id="account.view_move_form" priority="50" >
+
+    <header position="after">
+        <field name="x_has_downpayment" invisible="1"/>
+        <div groups="account.group_account_invoice" class="alert alert-warning" role="alert" style="margin-bottom:0px;" attrs="{'invisible': [('x_has_downpayment', '=', False)]}">
+            Der Verkaufsauftrag dieser Rechnung enthält Auftragszeilen mit einer Anzahlung.
+        </div>
+    </header>
+
+</data>
\ No newline at end of file
diff --git a/snippets/account.view_move_line_tree.show_cumulated_balance.xml b/snippets/account.view_move_line_tree.show_cumulated_balance.xml
new file mode 100644
index 00000000..aa190243
--- /dev/null
+++ b/snippets/account.view_move_line_tree.show_cumulated_balance.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<data inherit_id="account.view_move_line_tree" priority="50">
+
+    <field name="balance" position="after">
+        <field name="cumulated_balance" optional="hide" />
+    </field>
+    
+</data>
\ No newline at end of file
diff --git a/snippets/account.view_out_invoice_tree.format_invoice_date_due.xml b/snippets/account.view_out_invoice_tree.format_invoice_date_due.xml
new file mode 100644
index 00000000..c32c5535
--- /dev/null
+++ b/snippets/account.view_out_invoice_tree.format_invoice_date_due.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<data inherit_id="account.view_out_invoice_tree" priority="50">
+
+  <xpath expr="//field[@name='invoice_date_due']" position="attributes">
+    <attribute name="widget">date</attribute>
+  </xpath>
+
+</data>
\ No newline at end of file
diff --git a/snippets/account_asset.md b/snippets/account_asset.md
index 18cbfb9c..83e55669 100644
--- a/snippets/account_asset.md
+++ b/snippets/account_asset.md
@@ -7,16 +7,16 @@ ID: `mint_system.account_asset.view_account_asset_form.account_ids_optional`
 <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>
+        <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_expense_id" position="attributes">
+        <attribute name="required">0</attribute>
+    </field>
 
     <field name="account_depreciation_id" position="attributes">
-		<attribute name="required">0</attribute>
-	</field>
+        <attribute name="required">0</attribute>
+    </field>
 
 </data>
 ```
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
index 0ed475e4..4e7f116c 100644
--- a/snippets/account_asset.view_account_asset_form.account_ids_optional.xml
+++ b/snippets/account_asset.view_account_asset_form.account_ids_optional.xml
@@ -2,15 +2,15 @@
 <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>
+        <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_expense_id" position="attributes">
+        <attribute name="required">0</attribute>
+    </field>
 
     <field name="account_depreciation_id" position="attributes">
-		<attribute name="required">0</attribute>
-	</field>
+        <attribute name="required">0</attribute>
+    </field>
 
 </data>
\ No newline at end of file
diff --git a/snippets/account_budget.md b/snippets/account_budget.md
index 4bf7c6b8..2001c951 100644
--- a/snippets/account_budget.md
+++ b/snippets/account_budget.md
@@ -6,9 +6,9 @@ ID: `mint_system.account_budget.view_crossovered_budget_line_tree.show_budget`
 <?xml version="1.0"?>
 <data inherit_id="account_budget.view_crossovered_budget_line_tree" priority="50">
 
-	<field name="analytic_account_id" position="before">
-		<field name="crossovered_budget_id" optional="show" />
-	</field>
+    <field name="analytic_account_id" position="before">
+        <field name="crossovered_budget_id" optional="show" />
+    </field>
 
 </data>
 ```
diff --git a/snippets/account_budget.view_crossovered_budget_line_tree.show_budget.xml b/snippets/account_budget.view_crossovered_budget_line_tree.show_budget.xml
index 5ef49e4d..e718ebec 100644
--- a/snippets/account_budget.view_crossovered_budget_line_tree.show_budget.xml
+++ b/snippets/account_budget.view_crossovered_budget_line_tree.show_budget.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <data inherit_id="account_budget.view_crossovered_budget_line_tree" priority="50">
 
-	<field name="analytic_account_id" position="before">
-		<field name="crossovered_budget_id" optional="show" />
-	</field>
+    <field name="analytic_account_id" position="before">
+        <field name="crossovered_budget_id" optional="show" />
+    </field>
 
 </data>
\ No newline at end of file
diff --git a/snippets/account_financial_report.general_ledger.replace_layout.xml b/snippets/account_financial_report.general_ledger.replace_layout.xml
index c0a120d8..bb3636a7 100644
--- a/snippets/account_financial_report.general_ledger.replace_layout.xml
+++ b/snippets/account_financial_report.general_ledger.replace_layout.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <data inherit_id="account_financial_report.general_ledger" priority="50">
 
-	<xpath expr="//t[@t-call='account_financial_report.internal_layout']" position="attributes">		
-		<attribute name="t-call">account_financial_report.internal_layout_trimada</attribute>		
-	</xpath>
+    <xpath expr="//t[@t-call='account_financial_report.internal_layout']" position="attributes">        
+        <attribute name="t-call">account_financial_report.internal_layout_trimada</attribute>        
+    </xpath>
 
 </data>
\ No newline at end of file
diff --git a/snippets/account_financial_report.internal_layout.style_trimada.xml b/snippets/account_financial_report.internal_layout.style_trimada.xml
index 32474ba6..05ed942d 100644
--- a/snippets/account_financial_report.internal_layout.style_trimada.xml
+++ b/snippets/account_financial_report.internal_layout.style_trimada.xml
@@ -1,123 +1,123 @@
 <?xml version="1.0"?>
 <data inherit_id="account_financial_report.internal_layout" priority="60">
 
-	<xpath expr="//link" position="replace">
+    <xpath expr="//link" position="replace">
 
-		<style>
-			.act_as_table {
-				display: table !important;
-				background-color: white;
-			}
-			.act_as_row {
-				display: table-row !important;
-				page-break-inside: avoid;
-			}
-			.act_as_cell {
-				display: table-cell !important;
-				page-break-inside: avoid;
-			}
-			.act_as_thead {
-				display: table-header-group !important;
-			}
-			.act_as_tbody {
-				display: table-row-group !important;
-			}
-			.list_table,
-			.data_table,
-			.totals_table {
-				width: 100% !important;
-			}
-			.act_as_row.labels {
-				background-color: #f0f0f0 !important;
-			}
-			.list_table,
-			.data_table,
-			.totals_table,
-			.list_table .act_as_row {
-				border-left: 0px;
-				border-right: 0px;
-				text-align: center;
-				font-size: 10px;
-				padding-right: 3px;
-				padding-left: 3px;
-				padding-top: 2px;
-				padding-bottom: 2px;
-				border-collapse: collapse;
-			}
-			.totals_table {
-				font-weight: bold;
-				text-align: center;
-			}
-			.list_table .act_as_row.labels,
-			.list_table .act_as_row.initial_balance,
-			.list_table .act_as_row.lines {
-				border-color: grey !important;
-				border-bottom: 1px solid lightGrey !important;
-			}
-			.data_table .act_as_cell {
-				border: 1px solid lightGrey;
-				text-align: center;
-			}
-			.data_table .act_as_cell,
-			.list_table .act_as_cell,
-			.totals_table .act_as_cell {
-				word-wrap: break-word;
-			}
-			.data_table .act_as_row.labels,
-			.totals_table .act_as_row.labels {
-				font-weight: bold;
-			}
-			.initial_balance .act_as_cell {
-				font-style: italic;
-			}
-			.account_title {
-				font-size: 11px;
-				font-weight: bold;
-			}
-			.account_title.labels {
-				background-color: #f0f0f0 !important;
-			}
-			.act_as_cell.amount {
-				word-wrap: normal;
-				text-align: right;
-			}
-			.act_as_cell.left {
-				text-align: left;
-			}
-			.act_as_cell.right {
-				text-align: right;
-			}
-			/*.list_table .act_as_cell {*/
-			/*    border-right:1px solid lightGrey;  uncomment to active column lines */
-			/*}*/
-			.list_table .act_as_cell.first_column {
-				padding-left: 0px;
-				/*    border-left:1px solid lightGrey; uncomment to active column lines */
-			}
-			.overflow_ellipsis {
-				text-overflow: ellipsis;
-				overflow: hidden;
-				white-space: nowrap;
-			}
-			.custom_footer {
-				font-size: 7px !important;
-			}
-			.page_break {
-				page-break-inside: avoid;
-			}
+        <style>
+            .act_as_table {
+                display: table !important;
+                background-color: white;
+            }
+            .act_as_row {
+                display: table-row !important;
+                page-break-inside: avoid;
+            }
+            .act_as_cell {
+                display: table-cell !important;
+                page-break-inside: avoid;
+            }
+            .act_as_thead {
+                display: table-header-group !important;
+            }
+            .act_as_tbody {
+                display: table-row-group !important;
+            }
+            .list_table,
+            .data_table,
+            .totals_table {
+                width: 100% !important;
+            }
+            .act_as_row.labels {
+                background-color: #f0f0f0 !important;
+            }
+            .list_table,
+            .data_table,
+            .totals_table,
+            .list_table .act_as_row {
+                border-left: 0px;
+                border-right: 0px;
+                text-align: center;
+                font-size: 10px;
+                padding-right: 3px;
+                padding-left: 3px;
+                padding-top: 2px;
+                padding-bottom: 2px;
+                border-collapse: collapse;
+            }
+            .totals_table {
+                font-weight: bold;
+                text-align: center;
+            }
+            .list_table .act_as_row.labels,
+            .list_table .act_as_row.initial_balance,
+            .list_table .act_as_row.lines {
+                border-color: grey !important;
+                border-bottom: 1px solid lightGrey !important;
+            }
+            .data_table .act_as_cell {
+                border: 1px solid lightGrey;
+                text-align: center;
+            }
+            .data_table .act_as_cell,
+            .list_table .act_as_cell,
+            .totals_table .act_as_cell {
+                word-wrap: break-word;
+            }
+            .data_table .act_as_row.labels,
+            .totals_table .act_as_row.labels {
+                font-weight: bold;
+            }
+            .initial_balance .act_as_cell {
+                font-style: italic;
+            }
+            .account_title {
+                font-size: 11px;
+                font-weight: bold;
+            }
+            .account_title.labels {
+                background-color: #f0f0f0 !important;
+            }
+            .act_as_cell.amount {
+                word-wrap: normal;
+                text-align: right;
+            }
+            .act_as_cell.left {
+                text-align: left;
+            }
+            .act_as_cell.right {
+                text-align: right;
+            }
+            /*.list_table .act_as_cell {*/
+            /*    border-right:1px solid lightGrey;  uncomment to active column lines */
+            /*}*/
+            .list_table .act_as_cell.first_column {
+                padding-left: 0px;
+                /*    border-left:1px solid lightGrey; uncomment to active column lines */
+            }
+            .overflow_ellipsis {
+                text-overflow: ellipsis;
+                overflow: hidden;
+                white-space: nowrap;
+            }
+            .custom_footer {
+                font-size: 7px !important;
+            }
+            .page_break {
+                page-break-inside: avoid;
+            }
 
-			.button_row {
-				padding-bottom: 10px;
-			}
+            .button_row {
+                padding-bottom: 10px;
+            }
 
-			.o_account_financial_reports_page {
-				padding-top: 10px;
-				width: 90%;
-				margin-right: auto;
-				margin-left: auto;
-				font-family: Helvetica, Arial;
-			}
-		</style>
+            .o_account_financial_reports_page {
+                padding-top: 10px;
+                width: 90%;
+                margin-right: auto;
+                margin-left: auto;
+                font-family: Helvetica, Arial;
+            }
+        </style>
 
-	</xpath>
+    </xpath>
 </data>
\ No newline at end of file
diff --git a/snippets/account_financial_report.internal_layout.trimada.xml b/snippets/account_financial_report.internal_layout.trimada.xml
index e24f0e96..6e3db73e 100644
--- a/snippets/account_financial_report.internal_layout.trimada.xml
+++ b/snippets/account_financial_report.internal_layout.trimada.xml
@@ -1,167 +1,167 @@
 <?xml version="1.0"?>
 <t t-name="account_financial_report.internal_layout">
 
-	<t t-if="not o" t-set="o" t-value="doc"/>
+    <t t-if="not o" t-set="o" t-value="doc"/>
 
-	<t t-if="not company">
-		<!-- Multicompany -->
-		<t t-if="company_id">
-			<t t-set="company" t-value="company_id"/>
-		</t>
-		<t t-elif="o and 'company_id' in o and o.company_id.sudo()">
-			<t t-set="company" t-value="o.company_id.sudo()"/>
-		</t>
-		<t t-else="else">
-			<t t-set="company" t-value="res_company"/>
-		</t>
-	</t>
+    <t t-if="not company">
+        <!-- Multicompany -->
+        <t t-if="company_id">
+            <t t-set="company" t-value="company_id"/>
+        </t>
+        <t t-elif="o and 'company_id' in o and o.company_id.sudo()">
+            <t t-set="company" t-value="o.company_id.sudo()"/>
+        </t>
+        <t t-else="else">
+            <t t-set="company" t-value="res_company"/>
+        </t>
+    </t>
 
-	<div class="header">
-		<div class="row" style="height: 20px;">
-			<div class="col-3">
-				<span t-esc="context_timestamp(datetime.datetime.now()).strftime('%Y-%m-%d')"/>
-			</div>
-			<div class="col-2 offset-2 text-center">
-				<span t-esc="company_name"/>
-			</div>
-			<div class="col-2 offset-3 text-right">
-				<ul class="list-inline">
-					<li class="list-inline-item">
-						<span class="page"/>
-					</li>
-					<li class="list-inline-item">/</li>
-					<li class="list-inline-item">
-						<span class="topage"/>
-					</li>
-				</ul>
-			</div>
-		</div>
-	</div>
+    <div class="header">
+        <div class="row" style="height: 20px;">
+            <div class="col-3">
+                <span t-esc="context_timestamp(datetime.datetime.now()).strftime('%Y-%m-%d')"/>
+            </div>
+            <div class="col-2 offset-2 text-center">
+                <span t-esc="company_name"/>
+            </div>
+            <div class="col-2 offset-3 text-right">
+                <ul class="list-inline">
+                    <li class="list-inline-item">
+                        <span class="page"/>
+                    </li>
+                    <li class="list-inline-item">/</li>
+                    <li class="list-inline-item">
+                        <span class="topage"/>
+                    </li>
+                </ul>
+            </div>
+        </div>
+    </div>
 
-	<div class="article o_account_financial_reports_page">
+    <div class="article o_account_financial_reports_page">
 
-		<style>
-			.act_as_table {
-				display: table !important;
-				background-color: white;
-			}
-			.act_as_row {
-				display: table-row !important;
-				page-break-inside: avoid;
-			}
-			.act_as_cell {
-				display: table-cell !important;
-				page-break-inside: avoid;
-				
-				padding: 3px;
-				border-style: none none solid none !important;			
-			}
-			.act_as_thead {
-				display: table-header-group !important;
-			}
-			.act_as_tbody {
-				display: table-row-group !important;
-			}
-			.list_table,
-			.data_table,
-			.totals_table {
-				width: 100% !important;
-			}
-			.act_as_row.labels {
-				background-color: #f0f0f0 !important;
-			}
-			.list_table,
-			.data_table,
-			.totals_table,
-			.list_table .act_as_row {
-				border-left: 0px;
-				border-right: 0px;
-				text-align: center;		
-				font-size: 12px;				
-				padding-right: 3px;
-				padding-left: 3px;
-				padding-top: 2px;
-				padding-bottom: 2px;
-				border-collapse: collapse;
-			}
-			.totals_table {
-				font-weight: bold;
-				text-align: center;
-			}
-			.list_table .act_as_row.labels,
-			.list_table .act_as_row.initial_balance,
-			.list_table .act_as_row.lines {
-				border-color: grey !important;
-				border-bottom: 1px solid lightGrey !important;
-			}
-			.data_table .act_as_cell {
-				border: 1px solid lightGrey;
-				text-align: center;
-			}
-			.data_table .act_as_cell,
-			.list_table .act_as_cell,
-			.totals_table .act_as_cell {
-				word-wrap: break-word;
-			}
-			.data_table .act_as_row.labels,
-			.totals_table .act_as_row.labels {
-				font-weight: bold;
-			}
-			.initial_balance .act_as_cell {
-				font-style: italic;
-			}
-			.account_title {			  			
-				font-size: 16px;				
-				font-weight: bold;
-			}
-			.account_title.labels {
-				background-color: #f0f0f0 !important;
-			}
-			.act_as_cell.amount {
-				word-wrap: normal;
-				text-align: right;
-			}
-			.act_as_cell.left {
-				text-align: left;
-			}
-			.act_as_cell.right {
-				text-align: right;
-			}
-			/*.list_table .act_as_cell {*/
-			/*    border-right:1px solid lightGrey;  uncomment to active column lines */
-			/*}*/
-			.list_table .act_as_cell.first_column {
-				padding-left: 0px;
-				/*    border-left:1px solid lightGrey; uncomment to active column lines */
-			}
-			.overflow_ellipsis {
-				text-overflow: ellipsis;
-				overflow: hidden;
-				white-space: nowrap;
-			}
-			.custom_footer {
-				font-size: 7px !important;
-			}
-			.page_break {
-				page-break-inside: avoid;
-			}
+        <style>
+            .act_as_table {
+                display: table !important;
+                background-color: white;
+            }
+            .act_as_row {
+                display: table-row !important;
+                page-break-inside: avoid;
+            }
+            .act_as_cell {
+                display: table-cell !important;
+                page-break-inside: avoid;
+                
+                padding: 3px;
+                border-style: none none solid none !important;            
+            }
+            .act_as_thead {
+                display: table-header-group !important;
+            }
+            .act_as_tbody {
+                display: table-row-group !important;
+            }
+            .list_table,
+            .data_table,
+            .totals_table {
+                width: 100% !important;
+            }
+            .act_as_row.labels {
+                background-color: #f0f0f0 !important;
+            }
+            .list_table,
+            .data_table,
+            .totals_table,
+            .list_table .act_as_row {
+                border-left: 0px;
+                border-right: 0px;
+                text-align: center;        
+                font-size: 12px;                
+                padding-right: 3px;
+                padding-left: 3px;
+                padding-top: 2px;
+                padding-bottom: 2px;
+                border-collapse: collapse;
+            }
+            .totals_table {
+                font-weight: bold;
+                text-align: center;
+            }
+            .list_table .act_as_row.labels,
+            .list_table .act_as_row.initial_balance,
+            .list_table .act_as_row.lines {
+                border-color: grey !important;
+                border-bottom: 1px solid lightGrey !important;
+            }
+            .data_table .act_as_cell {
+                border: 1px solid lightGrey;
+                text-align: center;
+            }
+            .data_table .act_as_cell,
+            .list_table .act_as_cell,
+            .totals_table .act_as_cell {
+                word-wrap: break-word;
+            }
+            .data_table .act_as_row.labels,
+            .totals_table .act_as_row.labels {
+                font-weight: bold;
+            }
+            .initial_balance .act_as_cell {
+                font-style: italic;
+            }
+            .account_title {                          
+                font-size: 16px;                
+                font-weight: bold;
+            }
+            .account_title.labels {
+                background-color: #f0f0f0 !important;
+            }
+            .act_as_cell.amount {
+                word-wrap: normal;
+                text-align: right;
+            }
+            .act_as_cell.left {
+                text-align: left;
+            }
+            .act_as_cell.right {
+                text-align: right;
+            }
+            /*.list_table .act_as_cell {*/
+            /*    border-right:1px solid lightGrey;  uncomment to active column lines */
+            /*}*/
+            .list_table .act_as_cell.first_column {
+                padding-left: 0px;
+                /*    border-left:1px solid lightGrey; uncomment to active column lines */
+            }
+            .overflow_ellipsis {
+                text-overflow: ellipsis;
+                overflow: hidden;
+                white-space: nowrap;
+            }
+            .custom_footer {
+                font-size: 7px !important;
+            }
+            .page_break {
+                page-break-inside: avoid;
+            }
 
-			.button_row {
-				padding-bottom: 10px;
-			}
+            .button_row {
+                padding-bottom: 10px;
+            }
 
-			.o_account_financial_reports_page {
-				padding-top: 10px;
-				width: 100%;
-				margin-right: 0px;
-				margin-left: 0px;
-				font-family: Helvetica, Arial;
-			}
-			.title {
-			  font-weight: bold;
-			}
-		</style>
+            .o_account_financial_reports_page {
+                padding-top: 10px;
+                width: 100%;
+                margin-right: 0px;
+                margin-left: 0px;
+                font-family: Helvetica, Arial;
+            }
+            .title {
+              font-weight: bold;
+            }
+        </style>
 
-		<t t-raw="0"/>
-	</div>
+        <t t-raw="0"/>
+    </div>
 </t>
\ No newline at end of file
diff --git a/snippets/account_financial_report.md b/snippets/account_financial_report.md
index f7c07a94..232a98e2 100644
--- a/snippets/account_financial_report.md
+++ b/snippets/account_financial_report.md
@@ -6,9 +6,9 @@ ID: `mint_system.account_financial_report.general_ledger.replace_layout`
 <?xml version="1.0"?>
 <data inherit_id="account_financial_report.general_ledger" priority="50">
 
-	<xpath expr="//t[@t-call='account_financial_report.internal_layout']" position="attributes">		
-		<attribute name="t-call">account_financial_report.internal_layout_trimada</attribute>		
-	</xpath>
+    <xpath expr="//t[@t-call='account_financial_report.internal_layout']" position="attributes">        
+        <attribute name="t-call">account_financial_report.internal_layout_trimada</attribute>        
+    </xpath>
 
 </data>
 ```
@@ -21,125 +21,125 @@ ID: `mint_system.account_financial_report.internal_layout.style_trimada`
 <?xml version="1.0"?>
 <data inherit_id="account_financial_report.internal_layout" priority="60">
 
-	<xpath expr="//link" position="replace">
+    <xpath expr="//link" position="replace">
 
-		<style>
-			.act_as_table {
-				display: table !important;
-				background-color: white;
-			}
-			.act_as_row {
-				display: table-row !important;
-				page-break-inside: avoid;
-			}
-			.act_as_cell {
-				display: table-cell !important;
-				page-break-inside: avoid;
-			}
-			.act_as_thead {
-				display: table-header-group !important;
-			}
-			.act_as_tbody {
-				display: table-row-group !important;
-			}
-			.list_table,
-			.data_table,
-			.totals_table {
-				width: 100% !important;
-			}
-			.act_as_row.labels {
-				background-color: #f0f0f0 !important;
-			}
-			.list_table,
-			.data_table,
-			.totals_table,
-			.list_table .act_as_row {
-				border-left: 0px;
-				border-right: 0px;
-				text-align: center;
-				font-size: 10px;
-				padding-right: 3px;
-				padding-left: 3px;
-				padding-top: 2px;
-				padding-bottom: 2px;
-				border-collapse: collapse;
-			}
-			.totals_table {
-				font-weight: bold;
-				text-align: center;
-			}
-			.list_table .act_as_row.labels,
-			.list_table .act_as_row.initial_balance,
-			.list_table .act_as_row.lines {
-				border-color: grey !important;
-				border-bottom: 1px solid lightGrey !important;
-			}
-			.data_table .act_as_cell {
-				border: 1px solid lightGrey;
-				text-align: center;
-			}
-			.data_table .act_as_cell,
-			.list_table .act_as_cell,
-			.totals_table .act_as_cell {
-				word-wrap: break-word;
-			}
-			.data_table .act_as_row.labels,
-			.totals_table .act_as_row.labels {
-				font-weight: bold;
-			}
-			.initial_balance .act_as_cell {
-				font-style: italic;
-			}
-			.account_title {
-				font-size: 11px;
-				font-weight: bold;
-			}
-			.account_title.labels {
-				background-color: #f0f0f0 !important;
-			}
-			.act_as_cell.amount {
-				word-wrap: normal;
-				text-align: right;
-			}
-			.act_as_cell.left {
-				text-align: left;
-			}
-			.act_as_cell.right {
-				text-align: right;
-			}
-			/*.list_table .act_as_cell {*/
-			/*    border-right:1px solid lightGrey;  uncomment to active column lines */
-			/*}*/
-			.list_table .act_as_cell.first_column {
-				padding-left: 0px;
-				/*    border-left:1px solid lightGrey; uncomment to active column lines */
-			}
-			.overflow_ellipsis {
-				text-overflow: ellipsis;
-				overflow: hidden;
-				white-space: nowrap;
-			}
-			.custom_footer {
-				font-size: 7px !important;
-			}
-			.page_break {
-				page-break-inside: avoid;
-			}
+        <style>
+            .act_as_table {
+                display: table !important;
+                background-color: white;
+            }
+            .act_as_row {
+                display: table-row !important;
+                page-break-inside: avoid;
+            }
+            .act_as_cell {
+                display: table-cell !important;
+                page-break-inside: avoid;
+            }
+            .act_as_thead {
+                display: table-header-group !important;
+            }
+            .act_as_tbody {
+                display: table-row-group !important;
+            }
+            .list_table,
+            .data_table,
+            .totals_table {
+                width: 100% !important;
+            }
+            .act_as_row.labels {
+                background-color: #f0f0f0 !important;
+            }
+            .list_table,
+            .data_table,
+            .totals_table,
+            .list_table .act_as_row {
+                border-left: 0px;
+                border-right: 0px;
+                text-align: center;
+                font-size: 10px;
+                padding-right: 3px;
+                padding-left: 3px;
+                padding-top: 2px;
+                padding-bottom: 2px;
+                border-collapse: collapse;
+            }
+            .totals_table {
+                font-weight: bold;
+                text-align: center;
+            }
+            .list_table .act_as_row.labels,
+            .list_table .act_as_row.initial_balance,
+            .list_table .act_as_row.lines {
+                border-color: grey !important;
+                border-bottom: 1px solid lightGrey !important;
+            }
+            .data_table .act_as_cell {
+                border: 1px solid lightGrey;
+                text-align: center;
+            }
+            .data_table .act_as_cell,
+            .list_table .act_as_cell,
+            .totals_table .act_as_cell {
+                word-wrap: break-word;
+            }
+            .data_table .act_as_row.labels,
+            .totals_table .act_as_row.labels {
+                font-weight: bold;
+            }
+            .initial_balance .act_as_cell {
+                font-style: italic;
+            }
+            .account_title {
+                font-size: 11px;
+                font-weight: bold;
+            }
+            .account_title.labels {
+                background-color: #f0f0f0 !important;
+            }
+            .act_as_cell.amount {
+                word-wrap: normal;
+                text-align: right;
+            }
+            .act_as_cell.left {
+                text-align: left;
+            }
+            .act_as_cell.right {
+                text-align: right;
+            }
+            /*.list_table .act_as_cell {*/
+            /*    border-right:1px solid lightGrey;  uncomment to active column lines */
+            /*}*/
+            .list_table .act_as_cell.first_column {
+                padding-left: 0px;
+                /*    border-left:1px solid lightGrey; uncomment to active column lines */
+            }
+            .overflow_ellipsis {
+                text-overflow: ellipsis;
+                overflow: hidden;
+                white-space: nowrap;
+            }
+            .custom_footer {
+                font-size: 7px !important;
+            }
+            .page_break {
+                page-break-inside: avoid;
+            }
 
-			.button_row {
-				padding-bottom: 10px;
-			}
+            .button_row {
+                padding-bottom: 10px;
+            }
 
-			.o_account_financial_reports_page {
-				padding-top: 10px;
-				width: 90%;
-				margin-right: auto;
-				margin-left: auto;
-				font-family: Helvetica, Arial;
-			}
-		</style>
+            .o_account_financial_reports_page {
+                padding-top: 10px;
+                width: 90%;
+                margin-right: auto;
+                margin-left: auto;
+                font-family: Helvetica, Arial;
+            }
+        </style>
 
-	</xpath>
+    </xpath>
 </data>
 ```
 Source: [snippets/account_financial_report.internal_layout.style_trimada.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account_financial_report.internal_layout.style_trimada.xml)
@@ -150,169 +150,169 @@ ID: `mint_system.account_financial_report.internal_layout.trimada`
 <?xml version="1.0"?>
 <t t-name="account_financial_report.internal_layout">
 
-	<t t-if="not o" t-set="o" t-value="doc"/>
+    <t t-if="not o" t-set="o" t-value="doc"/>
 
-	<t t-if="not company">
-		<!-- Multicompany -->
-		<t t-if="company_id">
-			<t t-set="company" t-value="company_id"/>
-		</t>
-		<t t-elif="o and 'company_id' in o and o.company_id.sudo()">
-			<t t-set="company" t-value="o.company_id.sudo()"/>
-		</t>
-		<t t-else="else">
-			<t t-set="company" t-value="res_company"/>
-		</t>
-	</t>
+    <t t-if="not company">
+        <!-- Multicompany -->
+        <t t-if="company_id">
+            <t t-set="company" t-value="company_id"/>
+        </t>
+        <t t-elif="o and 'company_id' in o and o.company_id.sudo()">
+            <t t-set="company" t-value="o.company_id.sudo()"/>
+        </t>
+        <t t-else="else">
+            <t t-set="company" t-value="res_company"/>
+        </t>
+    </t>
 
-	<div class="header">
-		<div class="row" style="height: 20px;">
-			<div class="col-3">
-				<span t-esc="context_timestamp(datetime.datetime.now()).strftime('%Y-%m-%d')"/>
-			</div>
-			<div class="col-2 offset-2 text-center">
-				<span t-esc="company_name"/>
-			</div>
-			<div class="col-2 offset-3 text-right">
-				<ul class="list-inline">
-					<li class="list-inline-item">
-						<span class="page"/>
-					</li>
-					<li class="list-inline-item">/</li>
-					<li class="list-inline-item">
-						<span class="topage"/>
-					</li>
-				</ul>
-			</div>
-		</div>
-	</div>
+    <div class="header">
+        <div class="row" style="height: 20px;">
+            <div class="col-3">
+                <span t-esc="context_timestamp(datetime.datetime.now()).strftime('%Y-%m-%d')"/>
+            </div>
+            <div class="col-2 offset-2 text-center">
+                <span t-esc="company_name"/>
+            </div>
+            <div class="col-2 offset-3 text-right">
+                <ul class="list-inline">
+                    <li class="list-inline-item">
+                        <span class="page"/>
+                    </li>
+                    <li class="list-inline-item">/</li>
+                    <li class="list-inline-item">
+                        <span class="topage"/>
+                    </li>
+                </ul>
+            </div>
+        </div>
+    </div>
 
-	<div class="article o_account_financial_reports_page">
+    <div class="article o_account_financial_reports_page">
 
-		<style>
-			.act_as_table {
-				display: table !important;
-				background-color: white;
-			}
-			.act_as_row {
-				display: table-row !important;
-				page-break-inside: avoid;
-			}
-			.act_as_cell {
-				display: table-cell !important;
-				page-break-inside: avoid;
-				
-				padding: 3px;
-				border-style: none none solid none !important;			
-			}
-			.act_as_thead {
-				display: table-header-group !important;
-			}
-			.act_as_tbody {
-				display: table-row-group !important;
-			}
-			.list_table,
-			.data_table,
-			.totals_table {
-				width: 100% !important;
-			}
-			.act_as_row.labels {
-				background-color: #f0f0f0 !important;
-			}
-			.list_table,
-			.data_table,
-			.totals_table,
-			.list_table .act_as_row {
-				border-left: 0px;
-				border-right: 0px;
-				text-align: center;		
-				font-size: 12px;				
-				padding-right: 3px;
-				padding-left: 3px;
-				padding-top: 2px;
-				padding-bottom: 2px;
-				border-collapse: collapse;
-			}
-			.totals_table {
-				font-weight: bold;
-				text-align: center;
-			}
-			.list_table .act_as_row.labels,
-			.list_table .act_as_row.initial_balance,
-			.list_table .act_as_row.lines {
-				border-color: grey !important;
-				border-bottom: 1px solid lightGrey !important;
-			}
-			.data_table .act_as_cell {
-				border: 1px solid lightGrey;
-				text-align: center;
-			}
-			.data_table .act_as_cell,
-			.list_table .act_as_cell,
-			.totals_table .act_as_cell {
-				word-wrap: break-word;
-			}
-			.data_table .act_as_row.labels,
-			.totals_table .act_as_row.labels {
-				font-weight: bold;
-			}
-			.initial_balance .act_as_cell {
-				font-style: italic;
-			}
-			.account_title {			  			
-				font-size: 16px;				
-				font-weight: bold;
-			}
-			.account_title.labels {
-				background-color: #f0f0f0 !important;
-			}
-			.act_as_cell.amount {
-				word-wrap: normal;
-				text-align: right;
-			}
-			.act_as_cell.left {
-				text-align: left;
-			}
-			.act_as_cell.right {
-				text-align: right;
-			}
-			/*.list_table .act_as_cell {*/
-			/*    border-right:1px solid lightGrey;  uncomment to active column lines */
-			/*}*/
-			.list_table .act_as_cell.first_column {
-				padding-left: 0px;
-				/*    border-left:1px solid lightGrey; uncomment to active column lines */
-			}
-			.overflow_ellipsis {
-				text-overflow: ellipsis;
-				overflow: hidden;
-				white-space: nowrap;
-			}
-			.custom_footer {
-				font-size: 7px !important;
-			}
-			.page_break {
-				page-break-inside: avoid;
-			}
+        <style>
+            .act_as_table {
+                display: table !important;
+                background-color: white;
+            }
+            .act_as_row {
+                display: table-row !important;
+                page-break-inside: avoid;
+            }
+            .act_as_cell {
+                display: table-cell !important;
+                page-break-inside: avoid;
+                
+                padding: 3px;
+                border-style: none none solid none !important;            
+            }
+            .act_as_thead {
+                display: table-header-group !important;
+            }
+            .act_as_tbody {
+                display: table-row-group !important;
+            }
+            .list_table,
+            .data_table,
+            .totals_table {
+                width: 100% !important;
+            }
+            .act_as_row.labels {
+                background-color: #f0f0f0 !important;
+            }
+            .list_table,
+            .data_table,
+            .totals_table,
+            .list_table .act_as_row {
+                border-left: 0px;
+                border-right: 0px;
+                text-align: center;        
+                font-size: 12px;                
+                padding-right: 3px;
+                padding-left: 3px;
+                padding-top: 2px;
+                padding-bottom: 2px;
+                border-collapse: collapse;
+            }
+            .totals_table {
+                font-weight: bold;
+                text-align: center;
+            }
+            .list_table .act_as_row.labels,
+            .list_table .act_as_row.initial_balance,
+            .list_table .act_as_row.lines {
+                border-color: grey !important;
+                border-bottom: 1px solid lightGrey !important;
+            }
+            .data_table .act_as_cell {
+                border: 1px solid lightGrey;
+                text-align: center;
+            }
+            .data_table .act_as_cell,
+            .list_table .act_as_cell,
+            .totals_table .act_as_cell {
+                word-wrap: break-word;
+            }
+            .data_table .act_as_row.labels,
+            .totals_table .act_as_row.labels {
+                font-weight: bold;
+            }
+            .initial_balance .act_as_cell {
+                font-style: italic;
+            }
+            .account_title {                          
+                font-size: 16px;                
+                font-weight: bold;
+            }
+            .account_title.labels {
+                background-color: #f0f0f0 !important;
+            }
+            .act_as_cell.amount {
+                word-wrap: normal;
+                text-align: right;
+            }
+            .act_as_cell.left {
+                text-align: left;
+            }
+            .act_as_cell.right {
+                text-align: right;
+            }
+            /*.list_table .act_as_cell {*/
+            /*    border-right:1px solid lightGrey;  uncomment to active column lines */
+            /*}*/
+            .list_table .act_as_cell.first_column {
+                padding-left: 0px;
+                /*    border-left:1px solid lightGrey; uncomment to active column lines */
+            }
+            .overflow_ellipsis {
+                text-overflow: ellipsis;
+                overflow: hidden;
+                white-space: nowrap;
+            }
+            .custom_footer {
+                font-size: 7px !important;
+            }
+            .page_break {
+                page-break-inside: avoid;
+            }
 
-			.button_row {
-				padding-bottom: 10px;
-			}
+            .button_row {
+                padding-bottom: 10px;
+            }
 
-			.o_account_financial_reports_page {
-				padding-top: 10px;
-				width: 100%;
-				margin-right: 0px;
-				margin-left: 0px;
-				font-family: Helvetica, Arial;
-			}
-			.title {
-			  font-weight: bold;
-			}
-		</style>
+            .o_account_financial_reports_page {
+                padding-top: 10px;
+                width: 100%;
+                margin-right: 0px;
+                margin-left: 0px;
+                font-family: Helvetica, Arial;
+            }
+            .title {
+              font-weight: bold;
+            }
+        </style>
 
-		<t t-raw="0"/>
-	</div>
+        <t t-raw="0"/>
+    </div>
 </t>
 ```
 Source: [snippets/account_financial_report.internal_layout.trimada.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account_financial_report.internal_layout.trimada.xml)
@@ -324,7 +324,7 @@ ID: `mint_system.account_financial_report.report_general_ledger_base.hide_filter
 <?xml version="1.0"?>
 <data inherit_id="account_financial_report.report_general_ledger_base" priority="50">
 
-	<xpath expr="//t[@t-call='account_financial_report.report_general_ledger_filters']" position="replace"/>
+    <xpath expr="//t[@t-call='account_financial_report.report_general_ledger_filters']" position="replace"/>
 
 </data>
 ```
@@ -336,11 +336,11 @@ ID: `mint_system.account_financial_report.report_general_ledger_base.replace_tit
 <?xml version="1.0"?>
 <data inherit_id="account_financial_report.report_general_ledger_base" priority="50">
 
-	<xpath expr="//h4/.." position="replace">
-		<div class="title">Kontoauszug vom <span t-esc="date_from" t-options='{"widget": "date"}' />
-			bis <span t-esc="date_to" t-options='{"widget": "date"}' />
-		</div>
-	</xpath>
+    <xpath expr="//h4/.." position="replace">
+        <div class="title">Kontoauszug vom <span t-esc="date_from" t-options='{"widget": "date"}' />
+            bis <span t-esc="date_to" t-options='{"widget": "date"}' />
+        </div>
+    </xpath>
 
 </data>
 ```
@@ -353,8 +353,8 @@ ID: `mint_system.account_financial_report.report_general_ledger_ending_cumul.hid
 <?xml version="1.0"?>
 <data inherit_id="account_financial_report.report_general_ledger_ending_cumul" priority="50">
 
-	<xpath expr="//div[@class='act_as_row labels']" position="replace"/>
-	
+    <xpath expr="//div[@class='act_as_row labels']" position="replace"/>
+    
 </data>
 ```
 Source: [snippets/account_financial_report.report_general_ledger_ending_cumul.hide.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account_financial_report.report_general_ledger_ending_cumul.hide.xml)
@@ -542,44 +542,44 @@ ID: `mint_system.account_financial_report.report_general_ledger_lines.replace_he
 <?xml version="1.0"?>
 <data inherit_id="account_financial_report.report_general_ledger_lines" priority="50">
 
-	<xpath expr="//div[@class='act_as_row labels']" position="replace">
+    <xpath expr="//div[@class='act_as_row labels']" position="replace">
 
-		<div class="act_as_row labels">
+        <div class="act_as_row labels">
 
-			<!--## col1 date-->
-			<div class="act_as_cell first_column" style="width: 7.78%; text-align: left">
+            <!--## col1 date-->
+            <div class="act_as_cell first_column" style="width: 7.78%; text-align: left">
             Date
-			</div>
+            </div>
 
-			<!--## col2 move-->
-			<div class="act_as_cell" style="width: 28%; text-align: left">Entry</div>
+            <!--## col2 move-->
+            <div class="act_as_cell" style="width: 28%; text-align: left">Entry</div>
 
-			<!--## col3 account code-->
-			<div class="act_as_cell" style="width: 20%; text-align: left">
-				<t>Account</t>
-			</div>
+            <!--## col3 account code-->
+            <div class="act_as_cell" style="width: 20%; text-align: left">
+                <t>Account</t>
+            </div>
 
-			<!--## col4 debit-->
-			<div class="act_as_cell amount" style="width: 8.89%;">Debit</div>
+            <!--## col4 debit-->
+            <div class="act_as_cell amount" style="width: 8.89%;">Debit</div>
 
-			<!--## col5 credit-->
-			<div class="act_as_cell amount" style="width: 8.89%;">Credit</div>
+            <!--## col5 credit-->
+            <div class="act_as_cell amount" style="width: 8.89%;">Credit</div>
 
-			<!--## col6 balance cumulated-->
-			<div class="act_as_cell amount" style="width: 8.89%;">
+            <!--## col6 balance cumulated-->
+            <div class="act_as_cell amount" style="width: 8.89%;">
             Cumul. Bal.
-			</div>
+            </div>
 
-			<t t-if="foreign_currency">
-				<!--## col7 amount_currency-->
-				<div class="act_as_cell amount" style="width: 8.89%;">Amount cur.</div>
-				<!--## col8 amount_currency cumulated-->
-				<div class="act_as_cell amount" style="width: 8.89%;">Cumul cur.</div>
-			</t>
+            <t t-if="foreign_currency">
+                <!--## col7 amount_currency-->
+                <div class="act_as_cell amount" style="width: 8.89%;">Amount cur.</div>
+                <!--## col8 amount_currency cumulated-->
+                <div class="act_as_cell amount" style="width: 8.89%;">Cumul cur.</div>
+            </t>
 
-		</div>
+        </div>
 
-	</xpath>
+    </xpath>
 
 </data>
 ```
diff --git a/snippets/account_financial_report.report_general_ledger_base.hide_filters.xml b/snippets/account_financial_report.report_general_ledger_base.hide_filters.xml
index 40f7b288..488ca603 100644
--- a/snippets/account_financial_report.report_general_ledger_base.hide_filters.xml
+++ b/snippets/account_financial_report.report_general_ledger_base.hide_filters.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <data inherit_id="account_financial_report.report_general_ledger_base" priority="50">
 
-	<xpath expr="//t[@t-call='account_financial_report.report_general_ledger_filters']" position="replace"/>
+    <xpath expr="//t[@t-call='account_financial_report.report_general_ledger_filters']" position="replace"/>
 
 </data>
\ No newline at end of file
diff --git a/snippets/account_financial_report.report_general_ledger_base.replace_title.xml b/snippets/account_financial_report.report_general_ledger_base.replace_title.xml
index 2d6e611c..c6296dd2 100644
--- a/snippets/account_financial_report.report_general_ledger_base.replace_title.xml
+++ b/snippets/account_financial_report.report_general_ledger_base.replace_title.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0"?>
 <data inherit_id="account_financial_report.report_general_ledger_base" priority="50">
 
-	<xpath expr="//h4/.." position="replace">
-		<div class="title">Kontoauszug vom <span t-esc="date_from" t-options='{"widget": "date"}' />
-			bis <span t-esc="date_to" t-options='{"widget": "date"}' />
-		</div>
-	</xpath>
+    <xpath expr="//h4/.." position="replace">
+        <div class="title">Kontoauszug vom <span t-esc="date_from" t-options='{"widget": "date"}' />
+            bis <span t-esc="date_to" t-options='{"widget": "date"}' />
+        </div>
+    </xpath>
 
 </data>
\ No newline at end of file
diff --git a/snippets/account_financial_report.report_general_ledger_ending_cumul.hide.xml b/snippets/account_financial_report.report_general_ledger_ending_cumul.hide.xml
index b09ac2ea..de3e9de2 100644
--- a/snippets/account_financial_report.report_general_ledger_ending_cumul.hide.xml
+++ b/snippets/account_financial_report.report_general_ledger_ending_cumul.hide.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <data inherit_id="account_financial_report.report_general_ledger_ending_cumul" priority="50">
 
-	<xpath expr="//div[@class='act_as_row labels']" position="replace"/>
-	
+    <xpath expr="//div[@class='act_as_row labels']" position="replace"/>
+    
 </data>
\ No newline at end of file
diff --git a/snippets/account_financial_report.report_general_ledger_lines.replace_header.xml b/snippets/account_financial_report.report_general_ledger_lines.replace_header.xml
index 2d81203b..913757ba 100644
--- a/snippets/account_financial_report.report_general_ledger_lines.replace_header.xml
+++ b/snippets/account_financial_report.report_general_ledger_lines.replace_header.xml
@@ -1,43 +1,43 @@
 <?xml version="1.0"?>
 <data inherit_id="account_financial_report.report_general_ledger_lines" priority="50">
 
-	<xpath expr="//div[@class='act_as_row labels']" position="replace">
+    <xpath expr="//div[@class='act_as_row labels']" position="replace">
 
-		<div class="act_as_row labels">
+        <div class="act_as_row labels">
 
-			<!--## col1 date-->
-			<div class="act_as_cell first_column" style="width: 7.78%; text-align: left">
+            <!--## col1 date-->
+            <div class="act_as_cell first_column" style="width: 7.78%; text-align: left">
             Date
-			</div>
+            </div>
 
-			<!--## col2 move-->
-			<div class="act_as_cell" style="width: 28%; text-align: left">Entry</div>
+            <!--## col2 move-->
+            <div class="act_as_cell" style="width: 28%; text-align: left">Entry</div>
 
-			<!--## col3 account code-->
-			<div class="act_as_cell" style="width: 20%; text-align: left">
-				<t>Account</t>
-			</div>
+            <!--## col3 account code-->
+            <div class="act_as_cell" style="width: 20%; text-align: left">
+                <t>Account</t>
+            </div>
 
-			<!--## col4 debit-->
-			<div class="act_as_cell amount" style="width: 8.89%;">Debit</div>
+            <!--## col4 debit-->
+            <div class="act_as_cell amount" style="width: 8.89%;">Debit</div>
 
-			<!--## col5 credit-->
-			<div class="act_as_cell amount" style="width: 8.89%;">Credit</div>
+            <!--## col5 credit-->
+            <div class="act_as_cell amount" style="width: 8.89%;">Credit</div>
 
-			<!--## col6 balance cumulated-->
-			<div class="act_as_cell amount" style="width: 8.89%;">
+            <!--## col6 balance cumulated-->
+            <div class="act_as_cell amount" style="width: 8.89%;">
             Cumul. Bal.
-			</div>
+            </div>
 
-			<t t-if="foreign_currency">
-				<!--## col7 amount_currency-->
-				<div class="act_as_cell amount" style="width: 8.89%;">Amount cur.</div>
-				<!--## col8 amount_currency cumulated-->
-				<div class="act_as_cell amount" style="width: 8.89%;">Cumul cur.</div>
-			</t>
+            <t t-if="foreign_currency">
+                <!--## col7 amount_currency-->
+                <div class="act_as_cell amount" style="width: 8.89%;">Amount cur.</div>
+                <!--## col8 amount_currency cumulated-->
+                <div class="act_as_cell amount" style="width: 8.89%;">Cumul cur.</div>
+            </t>
 
-		</div>
+        </div>
 
-	</xpath>
+    </xpath>
 
 </data>
\ No newline at end of file
diff --git a/snippets/account_sale_timesheet_report.md b/snippets/account_sale_timesheet_report.md
index 0020fc71..b71751e2 100644
--- a/snippets/account_sale_timesheet_report.md
+++ b/snippets/account_sale_timesheet_report.md
@@ -45,6 +45,43 @@ ID: `mint_system.account_sale_timesheet_report.report_invoice_with_timesheets.pr
 ```
 Source: [snippets/account_sale_timesheet_report.report_invoice_with_timesheets.print_with_payments.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account_sale_timesheet_report.report_invoice_with_timesheets.print_with_payments.xml)
 
+## Report Sale  
+### Set Page Font Size  
+ID: `mint_system.account_sale_timesheet_report.report_sale.set_page_font_size`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="account_sale_timesheet_report.report_sale" priority="50">
+
+    <xpath expr="//div[hasclass('page')]" position="inside">
+        <style>
+            body {
+                font-size: 0.9rem;
+            }
+        </style>
+    </xpath>
+
+</data>
+```
+Source: [snippets/account_sale_timesheet_report.report_sale.set_page_font_size.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account_sale_timesheet_report.report_sale.set_page_font_size.xml)
+
+### Set Title Font Size  
+ID: `mint_system.account_sale_timesheet_report.report_sale.set_title_font_size`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="account_sale_timesheet_report.report_sale" priority="50">
+
+    <xpath expr="//div[hasclass('page')]" position="inside">
+        <style>
+            h2 {
+                font-size: 1.5rem;
+            }
+        </style>
+    </xpath>
+
+</data>
+```
+Source: [snippets/account_sale_timesheet_report.report_sale.set_title_font_size.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/account_sale_timesheet_report.report_sale.set_title_font_size.xml)
+
 ## Timesheet Report  
 ### Add Title Space  
 ID: `mint_system.account_sale_timesheet_report.timesheet_report.add_title_space`  
diff --git a/snippets/account_sale_timesheet_report.report_sale.set_page_font_size.xml b/snippets/account_sale_timesheet_report.report_sale.set_page_font_size.xml
new file mode 100644
index 00000000..dbcb9861
--- /dev/null
+++ b/snippets/account_sale_timesheet_report.report_sale.set_page_font_size.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<data inherit_id="account_sale_timesheet_report.report_sale" priority="50">
+
+    <xpath expr="//div[hasclass('page')]" position="inside">
+        <style>
+            body {
+                font-size: 0.9rem;
+            }
+        </style>
+    </xpath>
+
+</data>
\ No newline at end of file
diff --git a/snippets/account_sale_timesheet_report.report_sale.set_title_font_size.xml b/snippets/account_sale_timesheet_report.report_sale.set_title_font_size.xml
new file mode 100644
index 00000000..8b80bc23
--- /dev/null
+++ b/snippets/account_sale_timesheet_report.report_sale.set_title_font_size.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<data inherit_id="account_sale_timesheet_report.report_sale" priority="50">
+
+    <xpath expr="//div[hasclass('page')]" position="inside">
+        <style>
+            h2 {
+                font-size: 1.5rem;
+            }
+        </style>
+    </xpath>
+
+</data>
\ No newline at end of file
diff --git a/snippets/base.md b/snippets/base.md
index 2e1830a4..48040fd2 100644
--- a/snippets/base.md
+++ b/snippets/base.md
@@ -185,9 +185,9 @@ ID: `mint_system.base.view_company_form.show_account_onboarding_panel`
 <?xml version="1.0"?>
 <data inherit_id="base.view_company_form" priority="50">
 
-	<field name="website" position="after">
-		<field name="account_dashboard_onboarding_state" />
-	</field>
+    <field name="website" position="after">
+        <field name="account_dashboard_onboarding_state" />
+    </field>
 
 </data>
 
@@ -200,15 +200,31 @@ ID: `mint_system.base.view_company_form.show_analytic_plan_id`
 <?xml version="1.0"?>
 <data inherit_id="base.view_company_form" priority="50">
 
-	<field name="website" position="after">
-		<field name="analytic_plan_id" />
-	</field>
+    <field name="website" position="after">
+        <field name="analytic_plan_id" />
+    </field>
 
 </data>
 
 ```
 Source: [snippets/base.view_company_form.show_analytic_plan_id.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/base.view_company_form.show_analytic_plan_id.xml)
 
+## View Country Tree  
+### Set Limit  
+ID: `mint_system.base.view_country_tree.set_limit`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="base.view_country_tree" priority="50">
+
+  <tree position="attributes">
+    <attribute name="limit">250</attribute>
+  </tree>
+
+</data>
+
+```
+Source: [snippets/base.view_country_tree.set_limit.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/base.view_country_tree.set_limit.xml)
+
 ## View Model Fields Form  
 ### Show State  
 ID: `mint_system.base.view_model_fields_form.show_state`  
@@ -291,6 +307,53 @@ ID: `mint_system.base.view_partner_form.add_display_name`
 ```
 Source: [snippets/base.view_partner_form.add_display_name.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/base.view_partner_form.add_display_name.xml)
 
+### Attributes Child Ids  
+ID: `mint_system.base.view_partner_form.attributes_child_ids`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="base.view_partner_form" priority="50">
+
+  <xpath expr="//field[@name='child_ids']" position="attributes">
+    <attribute name="mode">tree</attribute>
+  </xpath>
+
+</data>
+```
+Source: [snippets/base.view_partner_form.attributes_child_ids.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/base.view_partner_form.attributes_child_ids.xml)
+
+### Move Company Registry  
+ID: `mint_system.base.view_partner_form.move_company_registry`  
+```xml
+<data inherit_id="base.view_partner_form" priority="50">
+
+  <xpath expr="//field[@name='vat']" position="after">
+    <xpath expr="//page[@name='sales_purchases']//field[@name='company_registry']" position="move"/>
+  </xpath>
+
+</data>
+```
+Source: [snippets/base.view_partner_form.move_company_registry.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/base.view_partner_form.move_company_registry.xml)
+
+### Move Property Product Pricelist  
+ID: `mint_system.base.view_partner_form.move_property_product_pricelist`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="base.view_partner_form" priority="50">
+
+  <xpath expr="//field[@name='property_product_pricelist']" position="replace" />
+
+  <xpath expr="//field[@name='vat']" position="after">
+    <field name="property_product_pricelist" groups="product.group_product_pricelist" attrs="{'invisible': [('is_company','=',False),('parent_id','!=',False)]}"/>
+    <div name="parent_pricelists" groups="product.group_product_pricelist" colspan="2" attrs="{'invisible': ['|',('is_company','=',True),('parent_id','=',False)]}">
+      <p>Preislisten werden auf dem Unternehmen verwaltet.</p>
+    </div>
+  </xpath>
+
+</data>
+
+```
+Source: [snippets/base.view_partner_form.move_property_product_pricelist.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/base.view_partner_form.move_property_product_pricelist.xml)
+
 ### Move Ref  
 ID: `mint_system.base.view_partner_form.move_ref`  
 ```xml
@@ -309,6 +372,42 @@ ID: `mint_system.base.view_partner_form.move_ref`
 ```
 Source: [snippets/base.view_partner_form.move_ref.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/base.view_partner_form.move_ref.xml)
 
+### Move Zip And City  
+ID: `mint_system.base.view_partner_form.move_zip_and_city`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="base.view_partner_form" priority="50">
+
+  <xpath expr="//field[@name='city']" position="replace" />
+  <xpath expr="//field[@name='state_id']" position="replace" />
+  <xpath expr="//field[@name='zip']" position="replace" />
+
+  <xpath expr="//field[@name='street2']" position="after">
+    <field name="zip" placeholder="PLZ" class="o_address_zip" attrs="{'readonly': [('type', '=', 'contact'),('parent_id', '!=', False)]}"/>
+    <field name="city" placeholder="Stadt" class="o_address_city" attrs="{'readonly': [('type', '=', 'contact'),('parent_id', '!=', False)]}"/>
+    <field name="state_id" class="o_address_state" placeholder="Bundesland" options="{'no_open': True, 'no_quick_create': True}" attrs="{'readonly': [('type', '=', 'contact'),('parent_id', '!=', False)]}" context="{'country_id': country_id, 'default_country_id': country_id, 'zip': zip}"/>
+  </xpath>
+
+</data>
+
+```
+Source: [snippets/base.view_partner_form.move_zip_and_city.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/base.view_partner_form.move_zip_and_city.xml)
+
+### Show Color  
+ID: `mint_system.base.view_partner_form.show_color`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="base.view_partner_form" priority="50">
+
+  <xpath expr="//field[@name='category_id']" position="after">
+    <field name="color"  widget="color_picker"/>
+  </xpath>
+
+</data>
+
+```
+Source: [snippets/base.view_partner_form.show_color.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/base.view_partner_form.show_color.xml)
+
 ### Show Industry  
 ID: `mint_system.base.view_partner_form.show_industry`  
 ```xml
@@ -324,6 +423,21 @@ ID: `mint_system.base.view_partner_form.show_industry`
 ```
 Source: [snippets/base.view_partner_form.show_industry.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/base.view_partner_form.show_industry.xml)
 
+### Show Type  
+ID: `mint_system.base.view_partner_form.show_type`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="base.view_partner_form" priority="50">
+
+  <xpath expr="//field[@name='category_id']" position="after">
+    <field name="type"/>
+  </xpath>
+
+</data>
+
+```
+Source: [snippets/base.view_partner_form.show_type.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/base.view_partner_form.show_type.xml)
+
 ### Show User Id  
 ID: `mint_system.base.view_partner_form.show_user_id`  
 ```xml
@@ -368,6 +482,21 @@ ID: `mint_system.base.view_partner_form.x_created_on`
 ```
 Source: [snippets/base.view_partner_form.x_created_on.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/base.view_partner_form.x_created_on.xml)
 
+### X Eori  
+ID: `mint_system.base.view_partner_form.x_eori`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="base.view_partner_form" priority="50">
+
+  <xpath expr="//field[@name='vat']" position="after">
+    <field name="x_eori"/>
+  </xpath>
+
+</data>
+
+```
+Source: [snippets/base.view_partner_form.x_eori.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/base.view_partner_form.x_eori.xml)
+
 ### X External Ref  
 ID: `mint_system.base.view_partner_form.x_external_ref`  
 ```xml
@@ -383,6 +512,21 @@ ID: `mint_system.base.view_partner_form.x_external_ref`
 ```
 Source: [snippets/base.view_partner_form.x_external_ref.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/base.view_partner_form.x_external_ref.xml)
 
+### X Global Location Number  
+ID: `mint_system.base.view_partner_form.x_global_location_number`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="base.view_partner_form" priority="50">
+
+  <xpath expr="//field[@name='vat']" position="after">
+    <field name="x_global_location_number"/>
+  </xpath>
+
+</data>
+
+```
+Source: [snippets/base.view_partner_form.x_global_location_number.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/base.view_partner_form.x_global_location_number.xml)
+
 ### X Packaging Ref  
 ID: `mint_system.base.view_partner_form.x_packaging_ref`  
 ```xml
@@ -398,6 +542,36 @@ ID: `mint_system.base.view_partner_form.x_packaging_ref`
 ```
 Source: [snippets/base.view_partner_form.x_packaging_ref.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/base.view_partner_form.x_packaging_ref.xml)
 
+### X Privacy Visibility  
+ID: `mint_system.base.view_partner_form.x_privacy_visibility`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="base.view_partner_form" priority="50">
+
+  <xpath expr="//field[@name='category_id']" position="after">
+    <field name="x_privacy_visibility"/>
+  </xpath>
+
+</data>
+
+```
+Source: [snippets/base.view_partner_form.x_privacy_visibility.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/base.view_partner_form.x_privacy_visibility.xml)
+
+### X Vst  
+ID: `mint_system.base.view_partner_form.x_vst`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="base.view_partner_form" priority="50">
+
+  <xpath expr="//field[@name='vat']" position="after">
+    <field name="x_vst"/>
+  </xpath>
+
+</data>
+
+```
+Source: [snippets/base.view_partner_form.x_vst.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/base.view_partner_form.x_vst.xml)
+
 ## View Partner Tree  
 ### Add Ref Zip Type  
 ID: `mint_system.base.view_partner_tree.add_ref_zip_type`  
@@ -421,6 +595,15 @@ ID: `mint_system.base.view_partner_tree.add_ref_zip_type`
 ```
 Source: [snippets/base.view_partner_tree.add_ref_zip_type.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/base.view_partner_tree.add_ref_zip_type.xml)
 
+### Format Decoration  
+ID: `mint_system.base.view_partner_tree.format_decoration`  
+```xml
+<xpath expr="//field[@name='display_name']" position="attributes">
+  <attribute name="decoration-bf">is_company</attribute>
+</xpath>
+```
+Source: [snippets/base.view_partner_tree.format_decoration.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/base.view_partner_tree.format_decoration.xml)
+
 ### Move Zip And City  
 ID: `mint_system.base.view_partner_tree.move_zip_and_city`  
 ```xml
@@ -484,6 +667,21 @@ ID: `mint_system.base.view_partner_tree.property_payment_term_id`
 ```
 Source: [snippets/base.view_partner_tree.property_payment_term_id.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/base.view_partner_tree.property_payment_term_id.xml)
 
+### Show Company Registry  
+ID: `mint_system.base.view_partner_tree.show_company_registry`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="base.view_partner_tree" priority="50">
+
+  <field name="vat" position="before">
+    <field name="company_registry" optional="show"/>
+  </field>
+
+</data>
+
+```
+Source: [snippets/base.view_partner_tree.show_company_registry.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/base.view_partner_tree.show_company_registry.xml)
+
 ### Show Industry  
 ID: `mint_system.base.view_partner_tree.show_industry`  
 ```xml
@@ -499,6 +697,21 @@ ID: `mint_system.base.view_partner_tree.show_industry`
 ```
 Source: [snippets/base.view_partner_tree.show_industry.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/base.view_partner_tree.show_industry.xml)
 
+### Show Property Payment Term Id  
+ID: `mint_system.base.view_partner_tree.show_property_payment_term_id`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="base.view_partner_tree" priority="50">
+
+  <field name="category_id" position="after">
+    <field name="property_payment_term_id" optional="show"/>
+  </field>
+
+</data>
+
+```
+Source: [snippets/base.view_partner_tree.show_property_payment_term_id.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/base.view_partner_tree.show_property_payment_term_id.xml)
+
 ### Show Property Product Pricelist  
 ID: `mint_system.base.view_partner_tree.show_property_product_pricelist`  
 ```xml
@@ -514,6 +727,21 @@ ID: `mint_system.base.view_partner_tree.show_property_product_pricelist`
 ```
 Source: [snippets/base.view_partner_tree.show_property_product_pricelist.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/base.view_partner_tree.show_property_product_pricelist.xml)
 
+### Show Street  
+ID: `mint_system.base.view_partner_tree.show_street`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="base.view_partner_tree" priority="50">
+
+  <field name="city" position="before">
+    <field name="street" optional="show"/>
+  </field>
+
+</data>
+
+```
+Source: [snippets/base.view_partner_tree.show_street.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/base.view_partner_tree.show_street.xml)
+
 ### Show Type  
 ID: `mint_system.base.view_partner_tree.show_type`  
 ```xml
@@ -521,7 +749,7 @@ ID: `mint_system.base.view_partner_tree.show_type`
 <data inherit_id="base.view_partner_tree" priority="50">
 
   <field name="display_name" position="before">
-    <field name="type" optional="hide"/>
+    <field name="type" optional="show"/>
   </field>
 
 </data>
@@ -529,12 +757,72 @@ ID: `mint_system.base.view_partner_tree.show_type`
 ```
 Source: [snippets/base.view_partner_tree.show_type.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/base.view_partner_tree.show_type.xml)
 
+### X Bexioid  
+ID: `mint_system.base.view_partner_tree.x_bexioid`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="base.view_partner_tree" priority="50">
+
+  <field name="active" position="after">
+    <field name="x_bexioid" optional="hide"/>
+  </field>
+  
+</data>
+
+```
+Source: [snippets/base.view_partner_tree.x_bexioid.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/base.view_partner_tree.x_bexioid.xml)
+
+### X First Sale Date  
+ID: `mint_system.base.view_partner_tree.x_first_sale_date`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="base.view_partner_tree" priority="50">
+
+  <field name="user_id" position="after">
+    <field name="x_first_sale_date" optional="hide"/>
+  </field>
+  
+</data>
+
+```
+Source: [snippets/base.view_partner_tree.x_first_sale_date.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/base.view_partner_tree.x_first_sale_date.xml)
+
+### X Global Location Number  
+ID: `mint_system.base.view_partner_tree.x_global_location_number`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="base.view_partner_tree" priority="60">
+
+  <field name="active" position="after">
+    <field name="x_global_location_number" optional="hide"/>
+  </field>
+  
+</data>
+
+```
+Source: [snippets/base.view_partner_tree.x_global_location_number.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/base.view_partner_tree.x_global_location_number.xml)
+
+### X Vst  
+ID: `mint_system.base.view_partner_tree.x_vst`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="base.view_partner_tree" priority="60">
+
+  <field name="active" position="after">
+    <field name="x_vst" optional="hide"/>
+  </field>
+  
+</data>
+
+```
+Source: [snippets/base.view_partner_tree.x_vst.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/base.view_partner_tree.x_vst.xml)
+
 ## View Res Bank Tree  
 ### Add Zip  
 ID: `mint_system.base.view_res_bank_tree.add_zip`  
 ```xml
 <?xml version="1.0"?>
-<data inherit_id="base.view_res_bank_tree" priority="50">	
+<data inherit_id="base.view_res_bank_tree" priority="50">    
 
 <xpath expr="//field[@name='city']" position="before">
   <field name="zip"/>
@@ -682,3 +970,18 @@ ID: `mint_system.base.view_users_form.write_partner_id`
 ```
 Source: [snippets/base.view_users_form.write_partner_id.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/base.view_users_form.write_partner_id.xml)
 
+## View View Form  
+### Add Key  
+ID: `mint_system.base.view_view_form.add_key`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="base.view_view_form" priority="50">
+
+  <xpath expr="//group[1]/field[@name='name']" position="before">
+    <field name="key"/>
+  </xpath>
+
+</data>
+```
+Source: [snippets/base.view_view_form.add_key.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/base.view_view_form.add_key.xml)
+
diff --git a/snippets/base.view_company_form.show_account_onboarding_panel.xml b/snippets/base.view_company_form.show_account_onboarding_panel.xml
index 817b9edb..563787e1 100644
--- a/snippets/base.view_company_form.show_account_onboarding_panel.xml
+++ b/snippets/base.view_company_form.show_account_onboarding_panel.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <data inherit_id="base.view_company_form" priority="50">
 
-	<field name="website" position="after">
-		<field name="account_dashboard_onboarding_state" />
-	</field>
+    <field name="website" position="after">
+        <field name="account_dashboard_onboarding_state" />
+    </field>
 
 </data>
diff --git a/snippets/base.view_company_form.show_analytic_plan_id.xml b/snippets/base.view_company_form.show_analytic_plan_id.xml
index ef2198c6..5dd0a18d 100644
--- a/snippets/base.view_company_form.show_analytic_plan_id.xml
+++ b/snippets/base.view_company_form.show_analytic_plan_id.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <data inherit_id="base.view_company_form" priority="50">
 
-	<field name="website" position="after">
-		<field name="analytic_plan_id" />
-	</field>
+    <field name="website" position="after">
+        <field name="analytic_plan_id" />
+    </field>
 
 </data>
diff --git a/snippets/base.view_country_tree.set_limit.xml b/snippets/base.view_country_tree.set_limit.xml
new file mode 100644
index 00000000..693697d2
--- /dev/null
+++ b/snippets/base.view_country_tree.set_limit.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<data inherit_id="base.view_country_tree" priority="50">
+
+  <tree position="attributes">
+    <attribute name="limit">250</attribute>
+  </tree>
+
+</data>
diff --git a/snippets/base.view_partner_form.attributes_child_ids.xml b/snippets/base.view_partner_form.attributes_child_ids.xml
new file mode 100644
index 00000000..aee3d59b
--- /dev/null
+++ b/snippets/base.view_partner_form.attributes_child_ids.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<data inherit_id="base.view_partner_form" priority="50">
+
+  <xpath expr="//field[@name='child_ids']" position="attributes">
+    <attribute name="mode">tree</attribute>
+  </xpath>
+
+</data>
\ No newline at end of file
diff --git a/snippets/base.view_partner_form.move_company_registry.xml b/snippets/base.view_partner_form.move_company_registry.xml
new file mode 100644
index 00000000..ae05bcc5
--- /dev/null
+++ b/snippets/base.view_partner_form.move_company_registry.xml
@@ -0,0 +1,7 @@
+<data inherit_id="base.view_partner_form" priority="50">
+
+  <xpath expr="//field[@name='vat']" position="after">
+    <xpath expr="//page[@name='sales_purchases']//field[@name='company_registry']" position="move"/>
+  </xpath>
+
+</data>
\ No newline at end of file
diff --git a/snippets/base.view_partner_form.move_property_product_pricelist.xml b/snippets/base.view_partner_form.move_property_product_pricelist.xml
new file mode 100644
index 00000000..f153f7c4
--- /dev/null
+++ b/snippets/base.view_partner_form.move_property_product_pricelist.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<data inherit_id="base.view_partner_form" priority="50">
+
+  <xpath expr="//field[@name='property_product_pricelist']" position="replace" />
+
+  <xpath expr="//field[@name='vat']" position="after">
+    <field name="property_product_pricelist" groups="product.group_product_pricelist" attrs="{'invisible': [('is_company','=',False),('parent_id','!=',False)]}"/>
+    <div name="parent_pricelists" groups="product.group_product_pricelist" colspan="2" attrs="{'invisible': ['|',('is_company','=',True),('parent_id','=',False)]}">
+      <p>Preislisten werden auf dem Unternehmen verwaltet.</p>
+    </div>
+  </xpath>
+
+</data>
diff --git a/snippets/base.view_partner_form.move_zip_and_city.xml b/snippets/base.view_partner_form.move_zip_and_city.xml
new file mode 100644
index 00000000..c9c320fc
--- /dev/null
+++ b/snippets/base.view_partner_form.move_zip_and_city.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<data inherit_id="base.view_partner_form" priority="50">
+
+  <xpath expr="//field[@name='city']" position="replace" />
+  <xpath expr="//field[@name='state_id']" position="replace" />
+  <xpath expr="//field[@name='zip']" position="replace" />
+
+  <xpath expr="//field[@name='street2']" position="after">
+    <field name="zip" placeholder="PLZ" class="o_address_zip" attrs="{'readonly': [('type', '=', 'contact'),('parent_id', '!=', False)]}"/>
+    <field name="city" placeholder="Stadt" class="o_address_city" attrs="{'readonly': [('type', '=', 'contact'),('parent_id', '!=', False)]}"/>
+    <field name="state_id" class="o_address_state" placeholder="Bundesland" options="{'no_open': True, 'no_quick_create': True}" attrs="{'readonly': [('type', '=', 'contact'),('parent_id', '!=', False)]}" context="{'country_id': country_id, 'default_country_id': country_id, 'zip': zip}"/>
+  </xpath>
+
+</data>
diff --git a/snippets/base.view_partner_form.show_color.xml b/snippets/base.view_partner_form.show_color.xml
new file mode 100644
index 00000000..00245ff5
--- /dev/null
+++ b/snippets/base.view_partner_form.show_color.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<data inherit_id="base.view_partner_form" priority="50">
+
+  <xpath expr="//field[@name='category_id']" position="after">
+    <field name="color"  widget="color_picker"/>
+  </xpath>
+
+</data>
diff --git a/snippets/base.view_partner_form.show_type.xml b/snippets/base.view_partner_form.show_type.xml
new file mode 100644
index 00000000..b626c284
--- /dev/null
+++ b/snippets/base.view_partner_form.show_type.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<data inherit_id="base.view_partner_form" priority="50">
+
+  <xpath expr="//field[@name='category_id']" position="after">
+    <field name="type"/>
+  </xpath>
+
+</data>
diff --git a/snippets/base.view_partner_form.x_eori.xml b/snippets/base.view_partner_form.x_eori.xml
new file mode 100644
index 00000000..32018a4e
--- /dev/null
+++ b/snippets/base.view_partner_form.x_eori.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<data inherit_id="base.view_partner_form" priority="50">
+
+  <xpath expr="//field[@name='vat']" position="after">
+    <field name="x_eori"/>
+  </xpath>
+
+</data>
diff --git a/snippets/base.view_partner_form.x_global_location_number.xml b/snippets/base.view_partner_form.x_global_location_number.xml
new file mode 100644
index 00000000..561afe67
--- /dev/null
+++ b/snippets/base.view_partner_form.x_global_location_number.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<data inherit_id="base.view_partner_form" priority="50">
+
+  <xpath expr="//field[@name='vat']" position="after">
+    <field name="x_global_location_number"/>
+  </xpath>
+
+</data>
diff --git a/snippets/base.view_partner_form.x_privacy_visibility.xml b/snippets/base.view_partner_form.x_privacy_visibility.xml
new file mode 100644
index 00000000..59eb39a6
--- /dev/null
+++ b/snippets/base.view_partner_form.x_privacy_visibility.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<data inherit_id="base.view_partner_form" priority="50">
+
+  <xpath expr="//field[@name='category_id']" position="after">
+    <field name="x_privacy_visibility"/>
+  </xpath>
+
+</data>
diff --git a/snippets/base.view_partner_form.x_vst.xml b/snippets/base.view_partner_form.x_vst.xml
new file mode 100644
index 00000000..932abccb
--- /dev/null
+++ b/snippets/base.view_partner_form.x_vst.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<data inherit_id="base.view_partner_form" priority="50">
+
+  <xpath expr="//field[@name='vat']" position="after">
+    <field name="x_vst"/>
+  </xpath>
+
+</data>
diff --git a/snippets/base.view_partner_tree.format_decoration.xml b/snippets/base.view_partner_tree.format_decoration.xml
new file mode 100644
index 00000000..7c4afaac
--- /dev/null
+++ b/snippets/base.view_partner_tree.format_decoration.xml
@@ -0,0 +1,3 @@
+<xpath expr="//field[@name='display_name']" position="attributes">
+  <attribute name="decoration-bf">is_company</attribute>
+</xpath>
\ No newline at end of file
diff --git a/snippets/base.view_partner_tree.show_company_registry.xml b/snippets/base.view_partner_tree.show_company_registry.xml
new file mode 100644
index 00000000..72c08217
--- /dev/null
+++ b/snippets/base.view_partner_tree.show_company_registry.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<data inherit_id="base.view_partner_tree" priority="50">
+
+  <field name="vat" position="before">
+    <field name="company_registry" optional="show"/>
+  </field>
+
+</data>
diff --git a/snippets/base.view_partner_tree.show_property_payment_term_id.xml b/snippets/base.view_partner_tree.show_property_payment_term_id.xml
new file mode 100644
index 00000000..2676d9dd
--- /dev/null
+++ b/snippets/base.view_partner_tree.show_property_payment_term_id.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<data inherit_id="base.view_partner_tree" priority="50">
+
+  <field name="category_id" position="after">
+    <field name="property_payment_term_id" optional="show"/>
+  </field>
+
+</data>
diff --git a/snippets/base.view_partner_tree.show_street.xml b/snippets/base.view_partner_tree.show_street.xml
new file mode 100644
index 00000000..736ea286
--- /dev/null
+++ b/snippets/base.view_partner_tree.show_street.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<data inherit_id="base.view_partner_tree" priority="50">
+
+  <field name="city" position="before">
+    <field name="street" optional="show"/>
+  </field>
+
+</data>
diff --git a/snippets/base.view_partner_tree.show_type.xml b/snippets/base.view_partner_tree.show_type.xml
index 0039e04c..8cf91cac 100644
--- a/snippets/base.view_partner_tree.show_type.xml
+++ b/snippets/base.view_partner_tree.show_type.xml
@@ -2,7 +2,7 @@
 <data inherit_id="base.view_partner_tree" priority="50">
 
   <field name="display_name" position="before">
-    <field name="type" optional="hide"/>
+    <field name="type" optional="show"/>
   </field>
 
 </data>
diff --git a/snippets/base.view_partner_tree.x_bexioid.xml b/snippets/base.view_partner_tree.x_bexioid.xml
new file mode 100644
index 00000000..c7ace11d
--- /dev/null
+++ b/snippets/base.view_partner_tree.x_bexioid.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<data inherit_id="base.view_partner_tree" priority="50">
+
+  <field name="active" position="after">
+    <field name="x_bexioid" optional="hide"/>
+  </field>
+  
+</data>
diff --git a/snippets/base.view_partner_tree.x_first_sale_date.xml b/snippets/base.view_partner_tree.x_first_sale_date.xml
new file mode 100644
index 00000000..dc84ab4b
--- /dev/null
+++ b/snippets/base.view_partner_tree.x_first_sale_date.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<data inherit_id="base.view_partner_tree" priority="50">
+
+  <field name="user_id" position="after">
+    <field name="x_first_sale_date" optional="hide"/>
+  </field>
+  
+</data>
diff --git a/snippets/base.view_partner_tree.x_global_location_number.xml b/snippets/base.view_partner_tree.x_global_location_number.xml
new file mode 100644
index 00000000..b33ccd47
--- /dev/null
+++ b/snippets/base.view_partner_tree.x_global_location_number.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<data inherit_id="base.view_partner_tree" priority="60">
+
+  <field name="active" position="after">
+    <field name="x_global_location_number" optional="hide"/>
+  </field>
+  
+</data>
diff --git a/snippets/base.view_partner_tree.x_vst.xml b/snippets/base.view_partner_tree.x_vst.xml
new file mode 100644
index 00000000..cea40014
--- /dev/null
+++ b/snippets/base.view_partner_tree.x_vst.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<data inherit_id="base.view_partner_tree" priority="60">
+
+  <field name="active" position="after">
+    <field name="x_vst" optional="hide"/>
+  </field>
+  
+</data>
diff --git a/snippets/base.view_res_bank_tree.add_zip.xml b/snippets/base.view_res_bank_tree.add_zip.xml
index 883ad2d1..5a848735 100644
--- a/snippets/base.view_res_bank_tree.add_zip.xml
+++ b/snippets/base.view_res_bank_tree.add_zip.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<data inherit_id="base.view_res_bank_tree" priority="50">	
+<data inherit_id="base.view_res_bank_tree" priority="50">    
 
 <xpath expr="//field[@name='city']" position="before">
   <field name="zip"/>
diff --git a/snippets/base.view_view_form.add_key.xml b/snippets/base.view_view_form.add_key.xml
new file mode 100644
index 00000000..69a40e74
--- /dev/null
+++ b/snippets/base.view_view_form.add_key.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<data inherit_id="base.view_view_form" priority="50">
+
+  <xpath expr="//group[1]/field[@name='name']" position="before">
+    <field name="key"/>
+  </xpath>
+
+</data>
\ No newline at end of file
diff --git a/snippets/business_requirement.md b/snippets/business_requirement.md
index c9bcd5fe..93994ea0 100644
--- a/snippets/business_requirement.md
+++ b/snippets/business_requirement.md
@@ -6,9 +6,9 @@ ID: `mint_system.business_requirement.view_business_requirement_form.clickable_s
 <?xml version="1.0"?>
 <data inherit_id="business_requirement.view_business_requirement_form" priority="50">
 
-	<field name="state" position="attributes">
-		<attribute name="clickable">1</attribute>
-	</field>
+    <field name="state" position="attributes">
+        <attribute name="clickable">1</attribute>
+    </field>
 
 </data>
 ```
@@ -20,7 +20,7 @@ ID: `mint_system.business_requirement.view_business_requirement_form.hide_scenar
 <?xml version="1.0"?>
 <data inherit_id="business_requirement.view_business_requirement_form" priority="50">
   
-	<xpath expr="//field[@name='scenario']/.." position="replace" />
+    <xpath expr="//field[@name='scenario']/.." position="replace" />
 
 </data>
 ```
@@ -32,7 +32,7 @@ ID: `mint_system.business_requirement.view_business_requirement_form.hide_terms_
 <?xml version="1.0"?>
 <data inherit_id="business_requirement.view_business_requirement_form" priority="50">
   
-	<xpath expr="//field[@name='terms_and_conditions']/.." position="replace" />
+    <xpath expr="//field[@name='terms_and_conditions']/.." position="replace" />
 
 </data>
 ```
@@ -44,7 +44,7 @@ ID: `mint_system.business_requirement.view_business_requirement_form.hide_test_c
 <?xml version="1.0"?>
 <data inherit_id="business_requirement.view_business_requirement_form" priority="50">
   
-	<xpath expr="//field[@name='test_case']/.." position="replace" />
+    <xpath expr="//field[@name='test_case']/.." position="replace" />
 
 </data>
 ```
@@ -56,10 +56,10 @@ ID: `mint_system.business_requirement.view_business_requirement_form.x_planned_h
 <?xml version="1.0"?>
 <data inherit_id="business_requirement.view_business_requirement_form" priority="50">
 
-	<field name="category_ids" position="after">
-		<field name="x_planned_hours" />
-		<field name="x_estimated_cost" widget="monetary" />
-	</field>
+    <field name="category_ids" position="after">
+        <field name="x_planned_hours" />
+        <field name="x_estimated_cost" widget="monetary" />
+    </field>
 
 </data>
 ```
@@ -71,8 +71,8 @@ ID: `mint_system.business_requirement.view_business_requirement_form.x_project_i
 <?xml version="1.0"?>
 <data inherit_id="business_requirement.view_business_requirement_form" priority="50">
   
-	<field name="origin" position="before">
-	   <field name="x_project_id" />
+    <field name="origin" position="before">
+       <field name="x_project_id" />
   </field>
 
 </data>
@@ -85,8 +85,8 @@ ID: `mint_system.business_requirement.view_business_requirement_form.x_task_id`
 <?xml version="1.0"?>
 <data inherit_id="business_requirement.view_business_requirement_form" priority="50">
   
-	<field name="category_ids" position="before">
-	   <field name="x_task_id" domain="[('project_id', '=', x_project_id)]" context="{'default_project_id': x_project_id}"/>
+    <field name="category_ids" position="before">
+       <field name="x_task_id" domain="[('project_id', '=', x_project_id)]" context="{'default_project_id': x_project_id}"/>
   </field>
 
 </data>
@@ -100,8 +100,8 @@ ID: `mint_system.business_requirement.view_business_requirement_search.x_project
 <?xml version="1.0"?>
 <data inherit_id="business_requirement.view_business_requirement_search" priority="50">
   
-	<field name="name" position="after">
-	   <field name="x_project_id" string="Project"/>
+    <field name="name" position="after">
+       <field name="x_project_id" string="Project"/>
   </field>
 
 </data>
@@ -115,7 +115,7 @@ ID: `mint_system.business_requirement.view_business_requirement_tree.hide_catego
 <?xml version="1.0"?>
 <data inherit_id="business_requirement.view_business_requirement_tree" priority="50">
 
-	<field name="category_ids" position="replace" />
+    <field name="category_ids" position="replace" />
 
 </data>
 ```
@@ -127,8 +127,8 @@ ID: `mint_system.business_requirement.view_business_requirement_tree.x_planned_h
 <?xml version="1.0"?>
 <data inherit_id="business_requirement.view_business_requirement_tree" priority="50">
   
-	<field name="state" position="after">
-	   <field name="x_planned_hours" optional="show" sum="Geplante Stunden"/>
+    <field name="state" position="after">
+       <field name="x_planned_hours" optional="show" sum="Geplante Stunden"/>
   </field>
 
 </data>
@@ -141,8 +141,8 @@ ID: `mint_system.business_requirement.view_business_requirement_tree.x_project_i
 <?xml version="1.0"?>
 <data inherit_id="business_requirement.view_business_requirement_tree" priority="50">
   
-	<field name="category_ids" position="before">
-	   <field name="x_project_id" />
+    <field name="category_ids" position="before">
+       <field name="x_project_id" />
   </field>
 
 </data>
diff --git a/snippets/business_requirement.view_business_requirement_form.clickable_state.xml b/snippets/business_requirement.view_business_requirement_form.clickable_state.xml
index 2a0ccf05..f97beb66 100644
--- a/snippets/business_requirement.view_business_requirement_form.clickable_state.xml
+++ b/snippets/business_requirement.view_business_requirement_form.clickable_state.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <data inherit_id="business_requirement.view_business_requirement_form" priority="50">
 
-	<field name="state" position="attributes">
-		<attribute name="clickable">1</attribute>
-	</field>
+    <field name="state" position="attributes">
+        <attribute name="clickable">1</attribute>
+    </field>
 
 </data>
\ No newline at end of file
diff --git a/snippets/business_requirement.view_business_requirement_form.hide_scenario.xml b/snippets/business_requirement.view_business_requirement_form.hide_scenario.xml
index 263f7905..fac70991 100644
--- a/snippets/business_requirement.view_business_requirement_form.hide_scenario.xml
+++ b/snippets/business_requirement.view_business_requirement_form.hide_scenario.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <data inherit_id="business_requirement.view_business_requirement_form" priority="50">
   
-	<xpath expr="//field[@name='scenario']/.." position="replace" />
+    <xpath expr="//field[@name='scenario']/.." position="replace" />
 
 </data>
\ No newline at end of file
diff --git a/snippets/business_requirement.view_business_requirement_form.hide_terms_and_conditions.xml b/snippets/business_requirement.view_business_requirement_form.hide_terms_and_conditions.xml
index 73502c9f..51bff6be 100644
--- a/snippets/business_requirement.view_business_requirement_form.hide_terms_and_conditions.xml
+++ b/snippets/business_requirement.view_business_requirement_form.hide_terms_and_conditions.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <data inherit_id="business_requirement.view_business_requirement_form" priority="50">
   
-	<xpath expr="//field[@name='terms_and_conditions']/.." position="replace" />
+    <xpath expr="//field[@name='terms_and_conditions']/.." position="replace" />
 
 </data>
\ No newline at end of file
diff --git a/snippets/business_requirement.view_business_requirement_form.hide_test_case.xml b/snippets/business_requirement.view_business_requirement_form.hide_test_case.xml
index f2c6695e..218c776c 100644
--- a/snippets/business_requirement.view_business_requirement_form.hide_test_case.xml
+++ b/snippets/business_requirement.view_business_requirement_form.hide_test_case.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <data inherit_id="business_requirement.view_business_requirement_form" priority="50">
   
-	<xpath expr="//field[@name='test_case']/.." position="replace" />
+    <xpath expr="//field[@name='test_case']/.." position="replace" />
 
 </data>
\ No newline at end of file
diff --git a/snippets/business_requirement.view_business_requirement_form.x_planned_hours_x_estimated_cost.xml b/snippets/business_requirement.view_business_requirement_form.x_planned_hours_x_estimated_cost.xml
index d3106f65..79c5162d 100644
--- a/snippets/business_requirement.view_business_requirement_form.x_planned_hours_x_estimated_cost.xml
+++ b/snippets/business_requirement.view_business_requirement_form.x_planned_hours_x_estimated_cost.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0"?>
 <data inherit_id="business_requirement.view_business_requirement_form" priority="50">
 
-	<field name="category_ids" position="after">
-		<field name="x_planned_hours" />
-		<field name="x_estimated_cost" widget="monetary" />
-	</field>
+    <field name="category_ids" position="after">
+        <field name="x_planned_hours" />
+        <field name="x_estimated_cost" widget="monetary" />
+    </field>
 
 </data>
\ No newline at end of file
diff --git a/snippets/business_requirement.view_business_requirement_form.x_project_id.xml b/snippets/business_requirement.view_business_requirement_form.x_project_id.xml
index de806605..12cff261 100644
--- a/snippets/business_requirement.view_business_requirement_form.x_project_id.xml
+++ b/snippets/business_requirement.view_business_requirement_form.x_project_id.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <data inherit_id="business_requirement.view_business_requirement_form" priority="50">
   
-	<field name="origin" position="before">
-	   <field name="x_project_id" />
+    <field name="origin" position="before">
+       <field name="x_project_id" />
   </field>
 
 </data>
\ No newline at end of file
diff --git a/snippets/business_requirement.view_business_requirement_form.x_task_id.xml b/snippets/business_requirement.view_business_requirement_form.x_task_id.xml
index 33bb79fc..f7df2f30 100644
--- a/snippets/business_requirement.view_business_requirement_form.x_task_id.xml
+++ b/snippets/business_requirement.view_business_requirement_form.x_task_id.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <data inherit_id="business_requirement.view_business_requirement_form" priority="50">
   
-	<field name="category_ids" position="before">
-	   <field name="x_task_id" domain="[('project_id', '=', x_project_id)]" context="{'default_project_id': x_project_id}"/>
+    <field name="category_ids" position="before">
+       <field name="x_task_id" domain="[('project_id', '=', x_project_id)]" context="{'default_project_id': x_project_id}"/>
   </field>
 
 </data>
\ No newline at end of file
diff --git a/snippets/business_requirement.view_business_requirement_search.x_project_id.xml b/snippets/business_requirement.view_business_requirement_search.x_project_id.xml
index 2b9fe326..1840d12b 100644
--- a/snippets/business_requirement.view_business_requirement_search.x_project_id.xml
+++ b/snippets/business_requirement.view_business_requirement_search.x_project_id.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <data inherit_id="business_requirement.view_business_requirement_search" priority="50">
   
-	<field name="name" position="after">
-	   <field name="x_project_id" string="Project"/>
+    <field name="name" position="after">
+       <field name="x_project_id" string="Project"/>
   </field>
 
 </data>
\ No newline at end of file
diff --git a/snippets/business_requirement.view_business_requirement_tree.hide_category_ids.xml b/snippets/business_requirement.view_business_requirement_tree.hide_category_ids.xml
index 9f4cc630..054770a1 100644
--- a/snippets/business_requirement.view_business_requirement_tree.hide_category_ids.xml
+++ b/snippets/business_requirement.view_business_requirement_tree.hide_category_ids.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <data inherit_id="business_requirement.view_business_requirement_tree" priority="50">
 
-	<field name="category_ids" position="replace" />
+    <field name="category_ids" position="replace" />
 
 </data>
\ No newline at end of file
diff --git a/snippets/business_requirement.view_business_requirement_tree.x_planned_hours.xml b/snippets/business_requirement.view_business_requirement_tree.x_planned_hours.xml
index 3165e120..ef2a99d8 100644
--- a/snippets/business_requirement.view_business_requirement_tree.x_planned_hours.xml
+++ b/snippets/business_requirement.view_business_requirement_tree.x_planned_hours.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <data inherit_id="business_requirement.view_business_requirement_tree" priority="50">
   
-	<field name="state" position="after">
-	   <field name="x_planned_hours" optional="show" sum="Geplante Stunden"/>
+    <field name="state" position="after">
+       <field name="x_planned_hours" optional="show" sum="Geplante Stunden"/>
   </field>
 
 </data>
\ No newline at end of file
diff --git a/snippets/business_requirement.view_business_requirement_tree.x_project_id.xml b/snippets/business_requirement.view_business_requirement_tree.x_project_id.xml
index 893e842f..bad1556b 100644
--- a/snippets/business_requirement.view_business_requirement_tree.x_project_id.xml
+++ b/snippets/business_requirement.view_business_requirement_tree.x_project_id.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <data inherit_id="business_requirement.view_business_requirement_tree" priority="50">
   
-	<field name="category_ids" position="before">
-	   <field name="x_project_id" />
+    <field name="category_ids" position="before">
+       <field name="x_project_id" />
   </field>
 
 </data>
\ No newline at end of file
diff --git a/snippets/calendar.md b/snippets/calendar.md
index 8decb82b..1941af5a 100644
--- a/snippets/calendar.md
+++ b/snippets/calendar.md
@@ -15,6 +15,21 @@ ID: `mint_system.calendar.view_calendar_event_calendar.default_mode_week`
 ```
 Source: [snippets/calendar.view_calendar_event_calendar.default_mode_week.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/calendar.view_calendar_event_calendar.default_mode_week.xml)
 
+### Set Color  
+ID: `mint_system.calendar.view_calendar_event_calendar.set_color`  
+```xml
+<?xml version='1.0' encoding='UTF-8' ?>
+<odoo>
+
+  <xpath expr="//calendar" position="attributes">
+    <attribute name="color">user_id</attribute>
+  </xpath>
+
+</odoo>
+
+```
+Source: [snippets/calendar.view_calendar_event_calendar.set_color.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/calendar.view_calendar_event_calendar.set_color.xml)
+
 ### Show Location  
 ID: `mint_system.calendar.view_calendar_event_calendar.show_location`  
 ```xml
@@ -30,6 +45,21 @@ ID: `mint_system.calendar.view_calendar_event_calendar.show_location`
 ```
 Source: [snippets/calendar.view_calendar_event_calendar.show_location.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/calendar.view_calendar_event_calendar.show_location.xml)
 
+### X Color  
+ID: `mint_system.calendar.view_calendar_event_calendar.x_color`  
+```xml
+<?xml version='1.0' encoding='UTF-8' ?>
+<odoo>
+
+  <xpath expr="//calendar" position="attributes">
+    <attribute name="color">x_color</attribute>
+  </xpath>
+
+</odoo>
+
+```
+Source: [snippets/calendar.view_calendar_event_calendar.x_color.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/calendar.view_calendar_event_calendar.x_color.xml)
+
 ## View Calendar Event Calendar Timeline  
 ### View  
 ID: `mint_system.calendar.view_calendar_event_calendar_timeline.view`  
@@ -51,6 +81,67 @@ ID: `mint_system.calendar.view_calendar_event_calendar_timeline.view`
 ```
 Source: [snippets/calendar.view_calendar_event_calendar_timeline.view.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/calendar.view_calendar_event_calendar_timeline.view.xml)
 
+## View Calendar Event Calendar  
+### Default Mode Week  
+ID: `mint_system.calendar.view_calendar_event_calendar.default_mode_week`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="calendar.view_calendar_event_calendar" priority="50">
+
+  <xpath expr="//calendar[1]" position="attributes">
+    <attribute name="mode">week</attribute>
+  </xpath>
+
+</data>
+
+```
+Source: [snippets/calendar.view_calendar_event_calendar.default_mode_week.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/calendar.view_calendar_event_calendar.default_mode_week.xml)
+
+### Set Color  
+ID: `mint_system.calendar.view_calendar_event_calendar.set_color`  
+```xml
+<?xml version='1.0' encoding='UTF-8' ?>
+<odoo>
+
+  <xpath expr="//calendar" position="attributes">
+    <attribute name="color">user_id</attribute>
+  </xpath>
+
+</odoo>
+
+```
+Source: [snippets/calendar.view_calendar_event_calendar.set_color.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/calendar.view_calendar_event_calendar.set_color.xml)
+
+### Show Location  
+ID: `mint_system.calendar.view_calendar_event_calendar.show_location`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="calendar.view_calendar_event_calendar" priority="50">
+
+  <xpath expr="//field[@name='attendee_status']" position="after">
+    <field name="location" />
+  </xpath>
+
+</data>
+
+```
+Source: [snippets/calendar.view_calendar_event_calendar.show_location.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/calendar.view_calendar_event_calendar.show_location.xml)
+
+### X Color  
+ID: `mint_system.calendar.view_calendar_event_calendar.x_color`  
+```xml
+<?xml version='1.0' encoding='UTF-8' ?>
+<odoo>
+
+  <xpath expr="//calendar" position="attributes">
+    <attribute name="color">x_color</attribute>
+  </xpath>
+
+</odoo>
+
+```
+Source: [snippets/calendar.view_calendar_event_calendar.x_color.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/calendar.view_calendar_event_calendar.x_color.xml)
+
 ## View Calendar Event Form  
 ### Show Res Model And Id  
 ID: `mint_system.calendar.view_calendar_event_form.show_res_model_and_id`  
@@ -67,3 +158,17 @@ ID: `mint_system.calendar.view_calendar_event_form.show_res_model_and_id`
 ```
 Source: [snippets/calendar.view_calendar_event_form.show_res_model_and_id.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/calendar.view_calendar_event_form.show_res_model_and_id.xml)
 
+### X Color  
+ID: `mint_system.calendar.view_calendar_event_form.x_color`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="calendar.view_calendar_event_form" priority="50">
+
+  <xpath expr="//field[@name='user_id']" position="after">
+    <field name="x_color" />
+  </xpath>
+
+</data>
+```
+Source: [snippets/calendar.view_calendar_event_form.x_color.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/calendar.view_calendar_event_form.x_color.xml)
+
diff --git a/snippets/calendar.view_calendar_event_calendar.set_color.xml b/snippets/calendar.view_calendar_event_calendar.set_color.xml
new file mode 100644
index 00000000..983e0449
--- /dev/null
+++ b/snippets/calendar.view_calendar_event_calendar.set_color.xml
@@ -0,0 +1,8 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+<odoo>
+
+  <xpath expr="//calendar" position="attributes">
+    <attribute name="color">user_id</attribute>
+  </xpath>
+
+</odoo>
diff --git a/snippets/calendar.view_calendar_event_calendar.x_color.xml b/snippets/calendar.view_calendar_event_calendar.x_color.xml
new file mode 100644
index 00000000..88fcfc9a
--- /dev/null
+++ b/snippets/calendar.view_calendar_event_calendar.x_color.xml
@@ -0,0 +1,8 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+<odoo>
+
+  <xpath expr="//calendar" position="attributes">
+    <attribute name="color">x_color</attribute>
+  </xpath>
+
+</odoo>
diff --git a/snippets/calendar.view_calendar_event_form.x_color.xml b/snippets/calendar.view_calendar_event_form.x_color.xml
new file mode 100644
index 00000000..0d0a360e
--- /dev/null
+++ b/snippets/calendar.view_calendar_event_form.x_color.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<data inherit_id="calendar.view_calendar_event_form" priority="50">
+
+  <xpath expr="//field[@name='user_id']" position="after">
+    <field name="x_color" />
+  </xpath>
+
+</data>
\ No newline at end of file
diff --git a/snippets/certificate_planer.mcr_report_view.hide_mcr_planning_columns.xml b/snippets/certificate_planer.mcr_report_view.hide_mcr_planning_columns.xml
new file mode 100644
index 00000000..b0b6f263
--- /dev/null
+++ b/snippets/certificate_planer.mcr_report_view.hide_mcr_planning_columns.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<data inherit_id="certificate_planer.mcr_report_view" priority="50">
+
+  <xpath expr="//table[@name='mcr_planning']//th[2]" position="replace" />
+  <xpath expr="//table[@name='mcr_planning']//th[3]" position="replace" />
+
+
+  <xpath expr="//table[@name='mcr_planning']//td[2]" position="replace" />
+  <xpath expr="//table[@name='mcr_planning']//td[3]" position="replace" />
+
+</data>
diff --git a/snippets/certificate_planer.md b/snippets/certificate_planer.md
index c9c01a79..0b9e4211 100644
--- a/snippets/certificate_planer.md
+++ b/snippets/certificate_planer.md
@@ -15,3 +15,22 @@ ID: `mint_system.certificate_planer.document_form.hide_view_report_button`
 ```
 Source: [snippets/certificate_planer.document_form.hide_view_report_button.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/certificate_planer.document_form.hide_view_report_button.xml)
 
+## Mcr Report View  
+### Hide Mcr Planning Columns  
+ID: `mint_system.certificate_planer.mcr_report_view.hide_mcr_planning_columns`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="certificate_planer.mcr_report_view" priority="50">
+
+  <xpath expr="//table[@name='mcr_planning']//th[2]" position="replace" />
+  <xpath expr="//table[@name='mcr_planning']//th[3]" position="replace" />
+
+
+  <xpath expr="//table[@name='mcr_planning']//td[2]" position="replace" />
+  <xpath expr="//table[@name='mcr_planning']//td[3]" position="replace" />
+
+</data>
+
+```
+Source: [snippets/certificate_planer.mcr_report_view.hide_mcr_planning_columns.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/certificate_planer.mcr_report_view.hide_mcr_planning_columns.xml)
+
diff --git a/snippets/helpdesk.helpdesk_ticket_view_form.domain_so_line.xml b/snippets/helpdesk.helpdesk_ticket_view_form.domain_so_line.xml
new file mode 100644
index 00000000..af8a5c9d
--- /dev/null
+++ b/snippets/helpdesk.helpdesk_ticket_view_form.domain_so_line.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<data inherit_id="helpdesk.helpdesk_ticket_view_form" priority="50">
+
+  <field name="so_line"  position="attributes">
+    <attribute name="domain">[('is_service', '=', True), ('order_partner_id', 'child_of', parent.commercial_partner_id), ('is_expense', '=', False), ('state', 'in', ['sale'])]</attribute>
+  </field>
+
+</data>
diff --git a/snippets/helpdesk.md b/snippets/helpdesk.md
index a07e65e9..46c5cfcd 100644
--- a/snippets/helpdesk.md
+++ b/snippets/helpdesk.md
@@ -30,6 +30,21 @@ ID: `mint_system.helpdesk.helpdesk_tickets_view_tree.x_date_deadline`
 Source: [snippets/helpdesk.helpdesk_tickets_view_tree.x_date_deadline.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/helpdesk.helpdesk_tickets_view_tree.x_date_deadline.xml)
 
 ## Helpdesk Ticket View Form  
+### Domain So Line  
+ID: `mint_system.helpdesk.helpdesk_ticket_view_form.domain_so_line`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="helpdesk.helpdesk_ticket_view_form" priority="50">
+
+  <field name="so_line"  position="attributes">
+    <attribute name="domain">[('is_service', '=', True), ('order_partner_id', 'child_of', parent.commercial_partner_id), ('is_expense', '=', False), ('state', 'in', ['sale'])]</attribute>
+  </field>
+
+</data>
+
+```
+Source: [snippets/helpdesk.helpdesk_ticket_view_form.domain_so_line.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/helpdesk.helpdesk_ticket_view_form.domain_so_line.xml)
+
 ### X Date Deadline  
 ID: `mint_system.helpdesk.helpdesk_ticket_view_form.x_date_deadline`  
 ```xml
diff --git a/snippets/hr.hr_employee_public_view_form.add_action_time_off_dashboard.xml b/snippets/hr.hr_employee_public_view_form.add_action_time_off_dashboard.xml
new file mode 100644
index 00000000..fa7e7e51
--- /dev/null
+++ b/snippets/hr.hr_employee_public_view_form.add_action_time_off_dashboard.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+<data inherit_id="hr.hr_employee_public_view_form" priority="50">
+
+    <xpath expr="//div[hasclass('oe_button_box')]" position="inside">
+        <button name="action_time_off_dashboard" type="object" class="oe_stat_button" icon="fa-calendar" context="{'search_default_employee_id': id}" groups="base.group_user" help="Remaining leaves">
+            <div class="o_field_widget o_stat_info">
+                <span class="o_stat_value">
+                    <field name="allocation_used_display"/>/<field name="allocation_display"/> Days
+                </span>
+                <span class="o_stat_text">
+                    Time Off
+                </span>
+            </div>
+        </button>
+    </xpath>
+
+</data>
\ No newline at end of file
diff --git a/snippets/hr.md b/snippets/hr.md
index bb9cb495..604c3918 100644
--- a/snippets/hr.md
+++ b/snippets/hr.md
@@ -1,4 +1,28 @@
 # Hr
+## Hr Employee Public View Form  
+### Add Action Time Off Dashboard  
+ID: `mint_system.hr.hr_employee_public_view_form.add_action_time_off_dashboard`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="hr.hr_employee_public_view_form" priority="50">
+
+    <xpath expr="//div[hasclass('oe_button_box')]" position="inside">
+        <button name="action_time_off_dashboard" type="object" class="oe_stat_button" icon="fa-calendar" context="{'search_default_employee_id': id}" groups="base.group_user" help="Remaining leaves">
+            <div class="o_field_widget o_stat_info">
+                <span class="o_stat_value">
+                    <field name="allocation_used_display"/>/<field name="allocation_display"/> Days
+                </span>
+                <span class="o_stat_text">
+                    Time Off
+                </span>
+            </div>
+        </button>
+    </xpath>
+
+</data>
+```
+Source: [snippets/hr.hr_employee_public_view_form.add_action_time_off_dashboard.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/hr.hr_employee_public_view_form.add_action_time_off_dashboard.xml)
+
 ## Hr Employee Public View Kanban  
 ### Add Mobile Phone  
 ID: `mint_system.hr.hr_employee_public_view_kanban.add_mobile_phone`  
@@ -155,6 +179,21 @@ ID: `mint_system.hr.view_employee_form.plan_permission`
 ```
 Source: [snippets/hr.view_employee_form.plan_permission.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/hr.view_employee_form.plan_permission.xml)
 
+### User Id Domain  
+ID: `mint_system.hr.view_employee_form.user_id_domain`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="hr.view_employee_form" priority="50">
+
+  <xpath expr="//field[@name='user_id']" position="attributes">
+    <attribute name="domain">[]</attribute>
+  </xpath>
+
+</data>
+
+```
+Source: [snippets/hr.view_employee_form.user_id_domain.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/hr.view_employee_form.user_id_domain.xml)
+
 ## View Employee Tree  
 ### Add Mobile Phone  
 ID: `mint_system.hr.view_employee_tree.add_mobile_phone`  
diff --git a/snippets/hr.view_employee_form.user_id_domain.xml b/snippets/hr.view_employee_form.user_id_domain.xml
new file mode 100644
index 00000000..f2c64e6c
--- /dev/null
+++ b/snippets/hr.view_employee_form.user_id_domain.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<data inherit_id="hr.view_employee_form" priority="50">
+
+  <xpath expr="//field[@name='user_id']" position="attributes">
+    <attribute name="domain">[]</attribute>
+  </xpath>
+
+</data>
diff --git a/snippets/hr_expense.hr_expense_view_form.show_payment_mode.xml b/snippets/hr_expense.hr_expense_view_form.show_payment_mode.xml
new file mode 100644
index 00000000..51074a28
--- /dev/null
+++ b/snippets/hr_expense.hr_expense_view_form.show_payment_mode.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<data inherit_id="hr_expense.hr_expense_view_form" priority="50">
+
+  <xpath expr="//label[@for='payment_mode']" position="attributes">
+    <attribute name="attrs">{}</attribute>
+  </xpath>
+
+  <xpath expr="//div[@id='payment_mode']" position="attributes">
+    <attribute name="attrs">{}</attribute>
+  </xpath>
+
+</data>
diff --git a/snippets/hr_expense.md b/snippets/hr_expense.md
index 6f9699c5..c76bf760 100644
--- a/snippets/hr_expense.md
+++ b/snippets/hr_expense.md
@@ -15,6 +15,25 @@ ID: `mint_system.hr_expense.hr_expense_view_form.set_group_tax_ids`
 ```
 Source: [snippets/hr_expense.hr_expense_view_form.set_group_tax_ids.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/hr_expense.hr_expense_view_form.set_group_tax_ids.xml)
 
+### Show Payment Mode  
+ID: `mint_system.hr_expense.hr_expense_view_form.show_payment_mode`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="hr_expense.hr_expense_view_form" priority="50">
+
+  <xpath expr="//label[@for='payment_mode']" position="attributes">
+    <attribute name="attrs">{}</attribute>
+  </xpath>
+
+  <xpath expr="//div[@id='payment_mode']" position="attributes">
+    <attribute name="attrs">{}</attribute>
+  </xpath>
+
+</data>
+
+```
+Source: [snippets/hr_expense.hr_expense_view_form.show_payment_mode.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/hr_expense.hr_expense_view_form.show_payment_mode.xml)
+
 ### X Partner Id  
 ID: `mint_system.hr_expense.hr_expense_view_form.x_partner_id`  
 ```xml
diff --git a/snippets/hr_timesheet.hr_timesheet_line_search.filter_validated.xml b/snippets/hr_timesheet.hr_timesheet_line_search.filter_validated.xml
new file mode 100644
index 00000000..7f670f13
--- /dev/null
+++ b/snippets/hr_timesheet.hr_timesheet_line_search.filter_validated.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<data inherit_id="hr_timesheet.hr_timesheet_line_search" priority="50">
+
+  <filter name="non_billable" position="after">
+    <filter string="Validiert" name="validated" />
+  </filter>
+
+</data>
diff --git a/snippets/hr_timesheet.md b/snippets/hr_timesheet.md
index dc0d6381..8df25e47 100644
--- a/snippets/hr_timesheet.md
+++ b/snippets/hr_timesheet.md
@@ -19,6 +19,21 @@ ID: `mint_system.hr_timesheet.hr_timesheet_line_search.filter_project_id`
 ```
 Source: [snippets/hr_timesheet.hr_timesheet_line_search.filter_project_id.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/hr_timesheet.hr_timesheet_line_search.filter_project_id.xml)
 
+### Filter Validated  
+ID: `mint_system.hr_timesheet.hr_timesheet_line_search.filter_validated`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="hr_timesheet.hr_timesheet_line_search" priority="50">
+
+  <filter name="non_billable" position="after">
+    <filter string="Validiert" name="validated" />
+  </filter>
+
+</data>
+
+```
+Source: [snippets/hr_timesheet.hr_timesheet_line_search.filter_validated.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/hr_timesheet.hr_timesheet_line_search.filter_validated.xml)
+
 ## Hr Timesheet Line Tree  
 ### Always Show So Line  
 ID: `mint_system.hr_timesheet.hr_timesheet_line_tree.always_show_so_line`  
@@ -351,13 +366,14 @@ ID: `mint_system.hr_timesheet.report_timesheet.user_report`
   <xpath expr="/t/t/t/div/div[2]" position="after">
     <t t-set="min_date" t-value="min(docs.mapped('date'))" />
     <t t-set="max_date" t-value="max(docs.mapped('date'))" />
-    <h3>Arbeitsrapport <t t-if="len(docs.mapped('project_id')) == 1"> für das Projekt "<t
-          t-esc="docs.mapped('project_id')[0].name" />" </t>
-    </h3>
+    <t t-set="default_project" t-value="docs.filtered(lambda d: d.project_id.partner_id)[:1].project_id" />
+    
+    <h3>Arbeitsrapport für das Projekt "<t t-esc="default_project.name" />"</h3>
+    
     <p>Zeitraum: <t t-esc="min_date" t-options="{'widget': 'date'}" /> bis <t t-esc="max_date"
         t-options="{'widget': 'date'}" />
     </p>
-    <p>Kunde: <t t-esc="docs.mapped('project_id')[0].partner_id.name" /><br /> Erstellt von: <span
+    <p>Kunde: <t t-esc="default_project.partner_id.name" /><br /> Erstellt von: <span
         t-field="user.name" />
     </p>
     <br />
@@ -408,6 +424,22 @@ ID: `mint_system.hr_timesheet.timesheet_view_tree_user.show_billable_type`
 ```
 Source: [snippets/hr_timesheet.timesheet_view_tree_user.show_billable_type.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/hr_timesheet.timesheet_view_tree_user.show_billable_type.xml)
 
+### Show Product Uom Id  
+ID: `mint_system.hr_timesheet.timesheet_view_tree_user.show_product_uom_id`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="hr_timesheet.timesheet_view_tree_user" priority="50">
+
+  <xpath expr="//field[@name='unit_amount']" position="after">
+    <field name="product_uom_category_id" invisible="1" />
+    <field name="product_uom_id" optional="show" />
+  </xpath>
+
+</data>
+
+```
+Source: [snippets/hr_timesheet.timesheet_view_tree_user.show_product_uom_id.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/hr_timesheet.timesheet_view_tree_user.show_product_uom_id.xml)
+
 ### X Timesheet Invoice Type  
 ID: `mint_system.hr_timesheet.timesheet_view_tree_user.x_timesheet_invoice_type`  
 ```xml
diff --git a/snippets/hr_timesheet.report_timesheet.user_report.xml b/snippets/hr_timesheet.report_timesheet.user_report.xml
index a96cdf94..9b4ce603 100644
--- a/snippets/hr_timesheet.report_timesheet.user_report.xml
+++ b/snippets/hr_timesheet.report_timesheet.user_report.xml
@@ -5,13 +5,14 @@
   <xpath expr="/t/t/t/div/div[2]" position="after">
     <t t-set="min_date" t-value="min(docs.mapped('date'))" />
     <t t-set="max_date" t-value="max(docs.mapped('date'))" />
-    <h3>Arbeitsrapport <t t-if="len(docs.mapped('project_id')) == 1"> für das Projekt "<t
-          t-esc="docs.mapped('project_id')[0].name" />" </t>
-    </h3>
+    <t t-set="default_project" t-value="docs.filtered(lambda d: d.project_id.partner_id)[:1].project_id" />
+    
+    <h3>Arbeitsrapport für das Projekt "<t t-esc="default_project.name" />"</h3>
+    
     <p>Zeitraum: <t t-esc="min_date" t-options="{'widget': 'date'}" /> bis <t t-esc="max_date"
         t-options="{'widget': 'date'}" />
     </p>
-    <p>Kunde: <t t-esc="docs.mapped('project_id')[0].partner_id.name" /><br /> Erstellt von: <span
+    <p>Kunde: <t t-esc="default_project.partner_id.name" /><br /> Erstellt von: <span
         t-field="user.name" />
     </p>
     <br />
diff --git a/snippets/hr_timesheet.timesheet_view_tree_user.show_product_uom_id.xml b/snippets/hr_timesheet.timesheet_view_tree_user.show_product_uom_id.xml
new file mode 100644
index 00000000..75afc79c
--- /dev/null
+++ b/snippets/hr_timesheet.timesheet_view_tree_user.show_product_uom_id.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<data inherit_id="hr_timesheet.timesheet_view_tree_user" priority="50">
+
+  <xpath expr="//field[@name='unit_amount']" position="after">
+    <field name="product_uom_category_id" invisible="1" />
+    <field name="product_uom_id" optional="show" />
+  </xpath>
+
+</data>
diff --git a/snippets/industry_fsm.md b/snippets/industry_fsm.md
index bf45ea56..8ba39b9e 100644
--- a/snippets/industry_fsm.md
+++ b/snippets/industry_fsm.md
@@ -1,4 +1,19 @@
 # Industry Fsm
+## Project Task View List Fsm  
+### Show Id  
+ID: `mint_system.industry_fsm.project_task_view_list_fsm.show_id`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="industry_fsm.project_task_view_list_fsm" priority="50">
+
+    <xpath expr="//field[@name='progress']" position="after">
+        <field name="id" string="ID" optional="hide"/>
+    </xpath>
+
+</data>
+```
+Source: [snippets/industry_fsm.project_task_view_list_fsm.show_id.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/industry_fsm.project_task_view_list_fsm.show_id.xml)
+
 ## Worksheet Custom  
 ### Add Info  
 ID: `mint_system.industry_fsm.worksheet_custom.add_info`  
@@ -91,21 +106,21 @@ ID: `mint_system.industry_fsm.worksheet_custom_page.style_moser`
 ```xml
 <data inherit_id="industry_fsm.worksheet_custom_page" priority="60">
 
-	<xpath expr="//div[hasclass('page')]" position="before">
-		<style>
-		  	h1 {
-        	font-size: 1.8rem;
-        	margin-top: 60px;
+    <xpath expr="//div[hasclass('page')]" position="before">
+        <style>
+              h1 {
+            font-size: 1.8rem;
+            margin-top: 60px;
             }
-			h2 {
-        	font-size: 1.4rem;
-        	margin-top: 60px;
+            h2 {
+            font-size: 1.4rem;
+            margin-top: 60px;
             }   
-      		#title {
-         	font-size: 1.2rem;
-      		}
-		</style>
-	</xpath>
+              #title {
+             font-size: 1.2rem;
+              }
+        </style>
+    </xpath>
 
 </data>
 ```
diff --git a/snippets/industry_fsm.project_task_view_list_fsm.show_id.xml b/snippets/industry_fsm.project_task_view_list_fsm.show_id.xml
new file mode 100644
index 00000000..c740aad5
--- /dev/null
+++ b/snippets/industry_fsm.project_task_view_list_fsm.show_id.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<data inherit_id="industry_fsm.project_task_view_list_fsm" priority="50">
+
+    <xpath expr="//field[@name='progress']" position="after">
+        <field name="id" string="ID" optional="hide"/>
+    </xpath>
+
+</data>
\ No newline at end of file
diff --git a/snippets/industry_fsm.worksheet_custom_page.style_moser.xml b/snippets/industry_fsm.worksheet_custom_page.style_moser.xml
index d632b2f7..a9bdc028 100644
--- a/snippets/industry_fsm.worksheet_custom_page.style_moser.xml
+++ b/snippets/industry_fsm.worksheet_custom_page.style_moser.xml
@@ -1,19 +1,19 @@
 <data inherit_id="industry_fsm.worksheet_custom_page" priority="60">
 
-	<xpath expr="//div[hasclass('page')]" position="before">
-		<style>
-		  	h1 {
-        	font-size: 1.8rem;
-        	margin-top: 60px;
+    <xpath expr="//div[hasclass('page')]" position="before">
+        <style>
+              h1 {
+            font-size: 1.8rem;
+            margin-top: 60px;
             }
-			h2 {
-        	font-size: 1.4rem;
-        	margin-top: 60px;
+            h2 {
+            font-size: 1.4rem;
+            margin-top: 60px;
             }   
-      		#title {
-         	font-size: 1.2rem;
-      		}
-		</style>
-	</xpath>
+              #title {
+             font-size: 1.2rem;
+              }
+        </style>
+    </xpath>
 
 </data>
\ No newline at end of file
diff --git a/snippets/industry_fsm_sale.md b/snippets/industry_fsm_sale.md
index 60e2ca3f..5c592ff4 100644
--- a/snippets/industry_fsm_sale.md
+++ b/snippets/industry_fsm_sale.md
@@ -90,6 +90,19 @@ ID: `mint_system.industry_fsm_sale.worksheet_time_and_material.replace_product_d
 ```
 Source: [snippets/industry_fsm_sale.worksheet_time_and_material.replace_product_description.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/industry_fsm_sale.worksheet_time_and_material.replace_product_description.xml)
 
+### Round Final Total  
+ID: `mint_system.industry_fsm_sale.worksheet_time_and_material.round_final_total`  
+```xml
+<data inherit_id="industry_fsm_sale.worksheet_time_and_material" priority="60">
+
+    <xpath expr="//span[@t-esc='final_total']" position="replace">
+        <span t-esc="round(float(final_total) * 20) / 20" t-options="{&quot;widget&quot;: &quot;monetary&quot;, &quot;display_currency&quot;: doc.sale_order_id.pricelist_id.currency_id}"/>
+    </xpath>
+
+</data>
+```
+Source: [snippets/industry_fsm_sale.worksheet_time_and_material.round_final_total.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/industry_fsm_sale.worksheet_time_and_material.round_final_total.xml)
+
 ### Style Moser  
 ID: `mint_system.industry_fsm_sale.worksheet_time_and_material.style_moser`  
 ```xml
@@ -97,9 +110,9 @@ ID: `mint_system.industry_fsm_sale.worksheet_time_and_material.style_moser`
 
     <xpath expr="//div[1]" position="before">
         <style>
-		  	.text-start {
-        	padding: 0.25rem 0rem !important;
-      		}
+              .text-start {
+            padding: 0.25rem 0rem !important;
+              }
         </style>
     </xpath>
 
diff --git a/snippets/industry_fsm_sale.worksheet_time_and_material.round_final_total.xml b/snippets/industry_fsm_sale.worksheet_time_and_material.round_final_total.xml
new file mode 100644
index 00000000..f450ed5f
--- /dev/null
+++ b/snippets/industry_fsm_sale.worksheet_time_and_material.round_final_total.xml
@@ -0,0 +1,7 @@
+<data inherit_id="industry_fsm_sale.worksheet_time_and_material" priority="60">
+
+    <xpath expr="//span[@t-esc='final_total']" position="replace">
+        <span t-esc="round(float(final_total) * 20) / 20" t-options="{&quot;widget&quot;: &quot;monetary&quot;, &quot;display_currency&quot;: doc.sale_order_id.pricelist_id.currency_id}"/>
+    </xpath>
+
+</data>
\ No newline at end of file
diff --git a/snippets/industry_fsm_sale.worksheet_time_and_material.style_moser.xml b/snippets/industry_fsm_sale.worksheet_time_and_material.style_moser.xml
index f4ce8742..b294e356 100644
--- a/snippets/industry_fsm_sale.worksheet_time_and_material.style_moser.xml
+++ b/snippets/industry_fsm_sale.worksheet_time_and_material.style_moser.xml
@@ -2,9 +2,9 @@
 
     <xpath expr="//div[1]" position="before">
         <style>
-		  	.text-start {
-        	padding: 0.25rem 0rem !important;
-      		}
+              .text-start {
+            padding: 0.25rem 0rem !important;
+              }
         </style>
     </xpath>
 
diff --git a/snippets/ir_model.account_analytic_line.x_sale_order_id.xml b/snippets/ir_model.account_analytic_line.x_sale_order_id.xml
index 35a6d865..b6b9a4c0 100644
--- a/snippets/ir_model.account_analytic_line.x_sale_order_id.xml
+++ b/snippets/ir_model.account_analytic_line.x_sale_order_id.xml
@@ -2,7 +2,6 @@
 <odoo>
 
   <record id="x_sale_order_id" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Verkaufsauftrag</field>
     <field name="model">account.move.line</field>
     <field name="model_id" ref="account.model_account_analytic_line"/>
diff --git a/snippets/ir_model.account_analytic_line.x_timesheet_invoice_type.xml b/snippets/ir_model.account_analytic_line.x_timesheet_invoice_type.xml
index a83bf530..e88c532f 100644
--- a/snippets/ir_model.account_analytic_line.x_timesheet_invoice_type.xml
+++ b/snippets/ir_model.account_analytic_line.x_timesheet_invoice_type.xml
@@ -2,7 +2,6 @@
 <odoo>
 
   <record id="x_timesheet_invoice_type" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Abrechenbarer Typ</field>
     <field name="model">account.move.line</field>
     <field name="model_id" ref="account.model_account_analytic_line"/>
diff --git a/snippets/ir_model.account_bank_statement.x_cashbox_end_ids.xml b/snippets/ir_model.account_bank_statement.x_cashbox_end_ids.xml
index 5fc2d472..9d02088e 100644
--- a/snippets/ir_model.account_bank_statement.x_cashbox_end_ids.xml
+++ b/snippets/ir_model.account_bank_statement.x_cashbox_end_ids.xml
@@ -2,7 +2,6 @@
 <odoo>
 
   <record id="x_cashbox_end_ids" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Kassenprüfung Endpositionen</field>
     <field name="model">account.bank.statement</field>
     <field name="model_id" ref="account.model_account_bank_statement"/>
diff --git a/snippets/ir_model.account_bank_statement.x_cashbox_start_ids.xml b/snippets/ir_model.account_bank_statement.x_cashbox_start_ids.xml
index 4b0569d5..7d1d35a8 100644
--- a/snippets/ir_model.account_bank_statement.x_cashbox_start_ids.xml
+++ b/snippets/ir_model.account_bank_statement.x_cashbox_start_ids.xml
@@ -2,7 +2,6 @@
 <odoo>
 
   <record id="x_cashbox_start_ids" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Kassenprüfung Startpositionen</field>
     <field name="model">account.bank.statement</field>
     <field name="model_id" ref="account.model_account_bank_statement"/>
diff --git a/snippets/ir_model.account_move.x_account_codes.xml b/snippets/ir_model.account_move.x_account_codes.xml
index 7d3e02a5..2a1b095c 100644
--- a/snippets/ir_model.account_move.x_account_codes.xml
+++ b/snippets/ir_model.account_move.x_account_codes.xml
@@ -2,7 +2,6 @@
 <odoo>
 
   <record id="x_account_codes" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Kontos</field>
     <field name="model">account.move</field>
     <field name="model_id" ref="account.model_account_move"/>
diff --git a/snippets/ir_model.account_move.x_date_done.xml b/snippets/ir_model.account_move.x_date_done.xml
index 72502896..5bf916a6 100644
--- a/snippets/ir_model.account_move.x_date_done.xml
+++ b/snippets/ir_model.account_move.x_date_done.xml
@@ -2,7 +2,6 @@
 <odoo>
 
   <record id="x_date_done" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">date_done</field>
     <field name="model">account.move</field>
     <field name="model_id" ref="account.model_account_move"/>
diff --git a/snippets/ir_model.account_move.x_duplicate_found.xml b/snippets/ir_model.account_move.x_duplicate_found.xml
index 5b0c2b3e..a3c690c6 100644
--- a/snippets/ir_model.account_move.x_duplicate_found.xml
+++ b/snippets/ir_model.account_move.x_duplicate_found.xml
@@ -2,7 +2,6 @@
 <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"/>
diff --git a/snippets/ir_model.account_move.x_has_downpayment.xml b/snippets/ir_model.account_move.x_has_downpayment.xml
new file mode 100644
index 00000000..f3332b38
--- /dev/null
+++ b/snippets/ir_model.account_move.x_has_downpayment.xml
@@ -0,0 +1,21 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+<odoo>
+
+  <record id="x_has_downpayment" model="ir.model.fields">
+    <field name="field_description">Hat Anzahlung</field>
+    <field name="model">account.move</field>
+    <field name="model_id" ref="account.model_account_move"/>
+    <field name="name">x_has_downpayment</field>
+    <field name="store" eval="False"/>
+    <field name="readonly" eval="True"/>
+    <field name="copied" eval="False"/>
+    <field name="ttype">boolean</field>
+    <field name="depends">invoice_line_ids.sale_line_ids</field>
+    <field name="compute">for rec in self:
+  if any(line.is_downpayment for line in rec.invoice_line_ids.sale_line_ids.order_id.order_line):
+    rec['x_has_downpayment'] = True
+  else:
+    rec['x_has_downpayment'] = False</field>
+  </record>
+
+</odoo>
diff --git a/snippets/ir_model.account_move.x_hr_expense_sheet_ids.xml b/snippets/ir_model.account_move.x_hr_expense_sheet_ids.xml
index 499f9796..b0159470 100644
--- a/snippets/ir_model.account_move.x_hr_expense_sheet_ids.xml
+++ b/snippets/ir_model.account_move.x_hr_expense_sheet_ids.xml
@@ -2,7 +2,6 @@
 <odoo>
 
   <record id="x_hr_expense_sheet_ids" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Auslagen Abrechnungen</field>
     <field name="model">account.move</field>
     <field name="model_id" ref="account.model_account_move"/>
diff --git a/snippets/ir_model.account_move.x_picking_list.xml b/snippets/ir_model.account_move.x_picking_list.xml
index 0106ae7a..377a6999 100644
--- a/snippets/ir_model.account_move.x_picking_list.xml
+++ b/snippets/ir_model.account_move.x_picking_list.xml
@@ -2,7 +2,6 @@
 <odoo>
 
   <record id="x_picking_list" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Picking List</field>
     <field name="model">account.move</field>
     <field name="model_id" ref="account.model_account_move"/>
diff --git a/snippets/ir_model.account_move.x_recurring_inverval.xml b/snippets/ir_model.account_move.x_recurring_inverval.xml
index 8fb48f7b..f274bcfa 100644
--- a/snippets/ir_model.account_move.x_recurring_inverval.xml
+++ b/snippets/ir_model.account_move.x_recurring_inverval.xml
@@ -2,7 +2,6 @@
 <odoo>
 
   <record id="x_recurring_inverval" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Abrechnungsintervall</field>
     <field name="model">account.move</field>
     <field name="model_id" ref="account.model_account_move"/>
diff --git a/snippets/ir_model.account_move.x_studio_description.xml b/snippets/ir_model.account_move.x_studio_description.xml
index aae77d9a..190f3332 100644
--- a/snippets/ir_model.account_move.x_studio_description.xml
+++ b/snippets/ir_model.account_move.x_studio_description.xml
@@ -2,7 +2,6 @@
 <odoo>
 
   <record id="x_studio_description" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Beschreibung Rechnung</field>
     <field name="model">account.move</field>
     <field name="model_id" ref="sale.model_sale_order"/>
diff --git a/snippets/ir_model.account_move_line.x_sale_order_id.xml b/snippets/ir_model.account_move_line.x_sale_order_id.xml
index 298d5380..fa02fe01 100644
--- a/snippets/ir_model.account_move_line.x_sale_order_id.xml
+++ b/snippets/ir_model.account_move_line.x_sale_order_id.xml
@@ -2,7 +2,6 @@
 <odoo>
 
   <record id="x_sale_order_id" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Verkaufsauftrag</field>
     <field name="model">account.move.line</field>
     <field name="model_id" ref="account.model_account_move_line"/>
diff --git a/snippets/ir_model.agreement_agreement.x_group_ids.xml b/snippets/ir_model.agreement_agreement.x_group_ids.xml
index 03b1266c..db2a64d7 100644
--- a/snippets/ir_model.agreement_agreement.x_group_ids.xml
+++ b/snippets/ir_model.agreement_agreement.x_group_ids.xml
@@ -2,7 +2,6 @@
 <odoo>
 
   <record id="x_group_ids" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Gruppen</field>
     <field name="model">agreement.agreement</field>
     <field name="model_id" ref="crm.model_crm_lead"/>
diff --git a/snippets/ir_model.agreement_agreement.x_user_ids.xml b/snippets/ir_model.agreement_agreement.x_user_ids.xml
index b08a197d..a54cc2d4 100644
--- a/snippets/ir_model.agreement_agreement.x_user_ids.xml
+++ b/snippets/ir_model.agreement_agreement.x_user_ids.xml
@@ -2,7 +2,6 @@
 <odoo>
 
   <record id="x_user_ids" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Benutzer</field>
     <field name="model">agreement.agreement</field>
     <field name="model_id" ref="crm.model_crm_lead"/>
diff --git a/snippets/ir_model.business_requirement.x_estimated_cost.xml b/snippets/ir_model.business_requirement.x_estimated_cost.xml
index 5a7800f8..95480465 100644
--- a/snippets/ir_model.business_requirement.x_estimated_cost.xml
+++ b/snippets/ir_model.business_requirement.x_estimated_cost.xml
@@ -2,7 +2,6 @@
 <odoo>
 
   <record id="x_estimated_cost" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Estimated Cost</field>
     <field name="model">business.requirement</field>
     <field name="model_id" ref="business_requirement.model_business_requirement"/>
diff --git a/snippets/ir_model.business_requirement.x_planned_hours.xml b/snippets/ir_model.business_requirement.x_planned_hours.xml
index adef2b76..62de4ded 100644
--- a/snippets/ir_model.business_requirement.x_planned_hours.xml
+++ b/snippets/ir_model.business_requirement.x_planned_hours.xml
@@ -2,7 +2,6 @@
 <odoo>
 
   <record id="x_planned_hours" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Planned Hours</field>
     <field name="model">business.requirement</field>
     <field name="model_id" ref="business_requirement.model_business_requirement"/>
diff --git a/snippets/ir_model.business_requirement.x_project_id.xml b/snippets/ir_model.business_requirement.x_project_id.xml
index f22d2dda..87b9e030 100644
--- a/snippets/ir_model.business_requirement.x_project_id.xml
+++ b/snippets/ir_model.business_requirement.x_project_id.xml
@@ -2,7 +2,6 @@
 <odoo>
 
   <record id="x_project_id" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Project</field>
     <field name="model">business.requirement</field>
     <field name="model_id" ref="business_requirement.model_business_requirement"/>
diff --git a/snippets/ir_model.business_requirement.x_task_id.xml b/snippets/ir_model.business_requirement.x_task_id.xml
index c937dd9d..4e95e743 100644
--- a/snippets/ir_model.business_requirement.x_task_id.xml
+++ b/snippets/ir_model.business_requirement.x_task_id.xml
@@ -2,7 +2,6 @@
 <odoo>
 
   <record id="x_task_id" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Task</field>
     <field name="model">business.requirement</field>
     <field name="model_id" ref="business_requirement.model_business_requirement"/>
diff --git a/snippets/ir_model.calendar_event.x_color.xml b/snippets/ir_model.calendar_event.x_color.xml
new file mode 100644
index 00000000..7d398768
--- /dev/null
+++ b/snippets/ir_model.calendar_event.x_color.xml
@@ -0,0 +1,15 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+<odoo>
+
+  <record id="x_color" model="ir.model.fields">
+    <field name="field_description">Farbkennzeichnung</field>
+    <field name="model">calendar.event</field>
+    <field name="model_id" ref="calendar.model_calendar_event"/>
+    <field name="name">x_color</field>
+    <field name="store" eval="False"/>
+    <field name="readonly" eval="True"/>
+    <field name="copied" eval="False"/>
+    <field name="ttype">integer</field>
+  </record>
+
+</odoo>
diff --git a/snippets/ir_model.crm_lead.x_date_start.xml b/snippets/ir_model.crm_lead.x_date_start.xml
index 76ef4bb5..1833fa0e 100644
--- a/snippets/ir_model.crm_lead.x_date_start.xml
+++ b/snippets/ir_model.crm_lead.x_date_start.xml
@@ -2,7 +2,6 @@
 <odoo>
 
   <record id="x_date_start" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Date Start</field>
     <field name="model">crm.lead</field>
     <field name="model_id" ref="crm.model_crm_lead"/>
diff --git a/snippets/ir_model.crm_lead.x_date_stop.xml b/snippets/ir_model.crm_lead.x_date_stop.xml
index 953867ce..d5de5201 100644
--- a/snippets/ir_model.crm_lead.x_date_stop.xml
+++ b/snippets/ir_model.crm_lead.x_date_stop.xml
@@ -2,7 +2,6 @@
 <odoo>
 
   <record id="x_date_stop" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Date Stop</field>
     <field name="model">crm.lead</field>
     <field name="model_id" ref="crm.model_crm_lead"/>
diff --git a/snippets/ir_model.crm_lead.x_mobile.xml b/snippets/ir_model.crm_lead.x_mobile.xml
index f395ba57..5f45889c 100644
--- a/snippets/ir_model.crm_lead.x_mobile.xml
+++ b/snippets/ir_model.crm_lead.x_mobile.xml
@@ -2,7 +2,6 @@
 <odoo>
 
   <record id="x_mobile" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Mobile</field>
     <field name="model">crm.lead</field>
     <field name="model_id" ref="crm.model_crm_lead"/>
diff --git a/snippets/ir_model.crm_lead.x_task_id.xml b/snippets/ir_model.crm_lead.x_task_id.xml
index d5521d69..a6825cc0 100644
--- a/snippets/ir_model.crm_lead.x_task_id.xml
+++ b/snippets/ir_model.crm_lead.x_task_id.xml
@@ -2,7 +2,6 @@
 <odoo>
 
   <record id="x_task_id" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Aufgabe</field>
     <field name="model">business.requirement</field>
     <field name="model_id" ref="crm.model_crm_lead"/>
diff --git a/snippets/ir_model.helpdesk_ticket.x_date_deadline.xml b/snippets/ir_model.helpdesk_ticket.x_date_deadline.xml
index d9c41df2..cf0acf58 100644
--- a/snippets/ir_model.helpdesk_ticket.x_date_deadline.xml
+++ b/snippets/ir_model.helpdesk_ticket.x_date_deadline.xml
@@ -2,7 +2,6 @@
 <odoo>
 
   <record id="x_date_deadline" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Frist</field>
     <field name="model">helpdesk.ticket</field>
     <field name="model_id" ref="helpdesk.model_helpdesk_ticket"/>
diff --git a/snippets/ir_model.hr_applicant.x_gdpr.xml b/snippets/ir_model.hr_applicant.x_gdpr.xml
index 03532606..850ae2cd 100644
--- a/snippets/ir_model.hr_applicant.x_gdpr.xml
+++ b/snippets/ir_model.hr_applicant.x_gdpr.xml
@@ -2,7 +2,6 @@
 <odoo>
 
   <record id="x_gdpr" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Datenschutz</field>
     <field name="model">hr.applicant</field>
     <field name="model_id" ref="hr.model_hr_applicant"/>
diff --git a/snippets/ir_model.hr_contract.x_struct_id.xml b/snippets/ir_model.hr_contract.x_struct_id.xml
index 1b82381a..91528d0d 100644
--- a/snippets/ir_model.hr_contract.x_struct_id.xml
+++ b/snippets/ir_model.hr_contract.x_struct_id.xml
@@ -2,7 +2,6 @@
 <odoo>
 
   <record id="x_struct_id" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Lohnstruktur</field>
     <field name="model">hr.applicant</field>
     <field name="model_id" ref="hr.model_hr_contract"/>
diff --git a/snippets/ir_model.hr_expense.x_partner_id.xml b/snippets/ir_model.hr_expense.x_partner_id.xml
index fcc8ec61..db6b74df 100644
--- a/snippets/ir_model.hr_expense.x_partner_id.xml
+++ b/snippets/ir_model.hr_expense.x_partner_id.xml
@@ -2,7 +2,6 @@
 <odoo>
 
   <record id="x_partner_id" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Kunde</field>
     <field name="model">hr.expense</field>
     <field name="model_id" ref="hr.model_hr_expense"/>
diff --git a/snippets/ir_model.hr_leave.x_number_of_hours.xml b/snippets/ir_model.hr_leave.x_number_of_hours.xml
index 88655fca..f7b112ea 100644
--- a/snippets/ir_model.hr_leave.x_number_of_hours.xml
+++ b/snippets/ir_model.hr_leave.x_number_of_hours.xml
@@ -2,7 +2,6 @@
 <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"/>
diff --git a/snippets/ir_model.hr_leave.x_requires_allocation.xml b/snippets/ir_model.hr_leave.x_requires_allocation.xml
index 2b6e4cc5..a4f951e0 100644
--- a/snippets/ir_model.hr_leave.x_requires_allocation.xml
+++ b/snippets/ir_model.hr_leave.x_requires_allocation.xml
@@ -2,7 +2,6 @@
 <odoo>
 
   <record id="x_requires_allocation" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Erfordert Zuweisung</field>
     <field name="model">hr.leave</field>
     <field name="model_id" ref="hr.model_hr_leave"/>
diff --git a/snippets/ir_model.hr_payslip_line.x_code_name.xml b/snippets/ir_model.hr_payslip_line.x_code_name.xml
index c305206b..03edb7d0 100644
--- a/snippets/ir_model.hr_payslip_line.x_code_name.xml
+++ b/snippets/ir_model.hr_payslip_line.x_code_name.xml
@@ -2,7 +2,6 @@
 <odoo>
 
   <record id="x_code_name" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Code mit Name</field>
     <field name="model">hr.payslip.line</field>
     <field name="model_id" ref="hr_payroll.model_hr_payslip_line"/>
diff --git a/snippets/ir_model.md b/snippets/ir_model.md
index e0444f6a..356489fe 100644
--- a/snippets/ir_model.md
+++ b/snippets/ir_model.md
@@ -7,7 +7,6 @@ ID: `mint_system.ir_model.account_analytic_line.x_sale_order_id`
 <odoo>
 
   <record id="x_sale_order_id" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Verkaufsauftrag</field>
     <field name="model">account.move.line</field>
     <field name="model_id" ref="account.model_account_analytic_line"/>
@@ -33,7 +32,6 @@ ID: `mint_system.ir_model.account_analytic_line.x_timesheet_invoice_type`
 <odoo>
 
   <record id="x_timesheet_invoice_type" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Abrechenbarer Typ</field>
     <field name="model">account.move.line</field>
     <field name="model_id" ref="account.model_account_analytic_line"/>
@@ -61,7 +59,6 @@ ID: `mint_system.ir_model.account_bank_statement.x_cashbox_end_ids`
 <odoo>
 
   <record id="x_cashbox_end_ids" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Kassenprüfung Endpositionen</field>
     <field name="model">account.bank.statement</field>
     <field name="model_id" ref="account.model_account_bank_statement"/>
@@ -87,7 +84,6 @@ ID: `mint_system.ir_model.account_bank_statement.x_cashbox_start_ids`
 <odoo>
 
   <record id="x_cashbox_start_ids" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Kassenprüfung Startpositionen</field>
     <field name="model">account.bank.statement</field>
     <field name="model_id" ref="account.model_account_bank_statement"/>
@@ -114,7 +110,6 @@ ID: `mint_system.ir_model.account_move_line.x_sale_order_id`
 <odoo>
 
   <record id="x_sale_order_id" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Verkaufsauftrag</field>
     <field name="model">account.move.line</field>
     <field name="model_id" ref="account.model_account_move_line"/>
@@ -143,7 +138,6 @@ ID: `mint_system.ir_model.account_move.x_account_codes`
 <odoo>
 
   <record id="x_account_codes" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Kontos</field>
     <field name="model">account.move</field>
     <field name="model_id" ref="account.model_account_move"/>
@@ -172,7 +166,6 @@ ID: `mint_system.ir_model.account_move.x_date_done`
 <odoo>
 
   <record id="x_date_done" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">date_done</field>
     <field name="model">account.move</field>
     <field name="model_id" ref="account.model_account_move"/>
@@ -196,7 +189,6 @@ ID: `mint_system.ir_model.account_move.x_duplicate_found`
 <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"/>
@@ -226,6 +218,34 @@ ID: `mint_system.ir_model.account_move.x_duplicate_found`
 ```
 Source: [snippets/ir_model.account_move.x_duplicate_found.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/ir_model.account_move.x_duplicate_found.xml)
 
+### X Has Downpayment  
+ID: `mint_system.ir_model.account_move.x_has_downpayment`  
+```xml
+<?xml version='1.0' encoding='UTF-8' ?>
+<odoo>
+
+  <record id="x_has_downpayment" model="ir.model.fields">
+    <field name="field_description">Hat Anzahlung</field>
+    <field name="model">account.move</field>
+    <field name="model_id" ref="account.model_account_move"/>
+    <field name="name">x_has_downpayment</field>
+    <field name="store" eval="False"/>
+    <field name="readonly" eval="True"/>
+    <field name="copied" eval="False"/>
+    <field name="ttype">boolean</field>
+    <field name="depends">invoice_line_ids.sale_line_ids</field>
+    <field name="compute">for rec in self:
+  if any(line.is_downpayment for line in rec.invoice_line_ids.sale_line_ids.order_id.order_line):
+    rec['x_has_downpayment'] = True
+  else:
+    rec['x_has_downpayment'] = False</field>
+  </record>
+
+</odoo>
+
+```
+Source: [snippets/ir_model.account_move.x_has_downpayment.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/ir_model.account_move.x_has_downpayment.xml)
+
 ### X Hr Expense Sheet Ids  
 ID: `mint_system.ir_model.account_move.x_hr_expense_sheet_ids`  
 ```xml
@@ -233,7 +253,6 @@ ID: `mint_system.ir_model.account_move.x_hr_expense_sheet_ids`
 <odoo>
 
   <record id="x_hr_expense_sheet_ids" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Auslagen Abrechnungen</field>
     <field name="model">account.move</field>
     <field name="model_id" ref="account.model_account_move"/>
@@ -281,7 +300,6 @@ ID: `mint_system.ir_model.account_move.x_picking_list`
 <odoo>
 
   <record id="x_picking_list" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Picking List</field>
     <field name="model">account.move</field>
     <field name="model_id" ref="account.model_account_move"/>
@@ -311,7 +329,6 @@ ID: `mint_system.ir_model.account_move.x_recurring_inverval`
 <odoo>
 
   <record id="x_recurring_inverval" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Abrechnungsintervall</field>
     <field name="model">account.move</field>
     <field name="model_id" ref="account.model_account_move"/>
@@ -340,7 +357,6 @@ ID: `mint_system.ir_model.account_move.x_studio_description`
 <odoo>
 
   <record id="x_studio_description" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Beschreibung Rechnung</field>
     <field name="model">account.move</field>
     <field name="model_id" ref="sale.model_sale_order"/>
@@ -363,7 +379,6 @@ ID: `mint_system.ir_model.agreement_agreement.x_group_ids`
 <odoo>
 
   <record id="x_group_ids" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Gruppen</field>
     <field name="model">agreement.agreement</field>
     <field name="model_id" ref="crm.model_crm_lead"/>
@@ -387,7 +402,6 @@ ID: `mint_system.ir_model.agreement_agreement.x_user_ids`
 <odoo>
 
   <record id="x_user_ids" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Benutzer</field>
     <field name="model">agreement.agreement</field>
     <field name="model_id" ref="crm.model_crm_lead"/>
@@ -412,7 +426,6 @@ ID: `mint_system.ir_model.business_requirement.x_estimated_cost`
 <odoo>
 
   <record id="x_estimated_cost" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Estimated Cost</field>
     <field name="model">business.requirement</field>
     <field name="model_id" ref="business_requirement.model_business_requirement"/>
@@ -435,7 +448,6 @@ ID: `mint_system.ir_model.business_requirement.x_planned_hours`
 <odoo>
 
   <record id="x_planned_hours" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Planned Hours</field>
     <field name="model">business.requirement</field>
     <field name="model_id" ref="business_requirement.model_business_requirement"/>
@@ -458,7 +470,6 @@ ID: `mint_system.ir_model.business_requirement.x_project_id`
 <odoo>
 
   <record id="x_project_id" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Project</field>
     <field name="model">business.requirement</field>
     <field name="model_id" ref="business_requirement.model_business_requirement"/>
@@ -482,7 +493,6 @@ ID: `mint_system.ir_model.business_requirement.x_task_id`
 <odoo>
 
   <record id="x_task_id" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Task</field>
     <field name="model">business.requirement</field>
     <field name="model_id" ref="business_requirement.model_business_requirement"/>
@@ -503,6 +513,29 @@ ID: `mint_system.ir_model.business_requirement.x_task_id`
 ```
 Source: [snippets/ir_model.business_requirement.x_task_id.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/ir_model.business_requirement.x_task_id.xml)
 
+## Calendar Event  
+### X Color  
+ID: `mint_system.ir_model.calendar_event.x_color`  
+```xml
+<?xml version='1.0' encoding='UTF-8' ?>
+<odoo>
+
+  <record id="x_color" model="ir.model.fields">
+    <field name="field_description">Farbkennzeichnung</field>
+    <field name="model">calendar.event</field>
+    <field name="model_id" ref="calendar.model_calendar_event"/>
+    <field name="name">x_color</field>
+    <field name="store" eval="False"/>
+    <field name="readonly" eval="True"/>
+    <field name="copied" eval="False"/>
+    <field name="ttype">integer</field>
+  </record>
+
+</odoo>
+
+```
+Source: [snippets/ir_model.calendar_event.x_color.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/ir_model.calendar_event.x_color.xml)
+
 ## Crm Lead  
 ### X Date Start  
 ID: `mint_system.ir_model.crm_lead.x_date_start`  
@@ -511,7 +544,6 @@ ID: `mint_system.ir_model.crm_lead.x_date_start`
 <odoo>
 
   <record id="x_date_start" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Date Start</field>
     <field name="model">crm.lead</field>
     <field name="model_id" ref="crm.model_crm_lead"/>
@@ -534,7 +566,6 @@ ID: `mint_system.ir_model.crm_lead.x_date_stop`
 <odoo>
 
   <record id="x_date_stop" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Date Stop</field>
     <field name="model">crm.lead</field>
     <field name="model_id" ref="crm.model_crm_lead"/>
@@ -561,7 +592,6 @@ ID: `mint_system.ir_model.crm_lead.x_mobile`
 <odoo>
 
   <record id="x_mobile" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Mobile</field>
     <field name="model">crm.lead</field>
     <field name="model_id" ref="crm.model_crm_lead"/>
@@ -586,7 +616,6 @@ ID: `mint_system.ir_model.crm_lead.x_task_id`
 <odoo>
 
   <record id="x_task_id" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Aufgabe</field>
     <field name="model">business.requirement</field>
     <field name="model_id" ref="crm.model_crm_lead"/>
@@ -611,7 +640,6 @@ ID: `mint_system.ir_model.helpdesk_ticket.x_date_deadline`
 <odoo>
 
   <record id="x_date_deadline" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Frist</field>
     <field name="model">helpdesk.ticket</field>
     <field name="model_id" ref="helpdesk.model_helpdesk_ticket"/>
@@ -635,7 +663,6 @@ ID: `mint_system.ir_model.hr_applicant.x_gdpr`
 <odoo>
 
   <record id="x_gdpr" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Datenschutz</field>
     <field name="model">hr.applicant</field>
     <field name="model_id" ref="hr.model_hr_applicant"/>
@@ -660,7 +687,6 @@ ID: `mint_system.ir_model.hr_contract.x_struct_id`
 <odoo>
 
   <record id="x_struct_id" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Lohnstruktur</field>
     <field name="model">hr.applicant</field>
     <field name="model_id" ref="hr.model_hr_contract"/>
@@ -685,7 +711,6 @@ ID: `mint_system.ir_model.hr_expense.x_partner_id`
 <odoo>
 
   <record id="x_partner_id" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Kunde</field>
     <field name="model">hr.expense</field>
     <field name="model_id" ref="hr.model_hr_expense"/>
@@ -709,7 +734,6 @@ ID: `mint_system.ir_model.hr_leave.x_number_of_hours`
 <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"/>
@@ -735,7 +759,6 @@ ID: `mint_system.ir_model.hr_leave.x_requires_allocation`
 <odoo>
 
   <record id="x_requires_allocation" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Erfordert Zuweisung</field>
     <field name="model">hr.leave</field>
     <field name="model_id" ref="hr.model_hr_leave"/>
@@ -760,7 +783,6 @@ ID: `mint_system.ir_model.hr_payslip_line.x_code_name`
 <odoo>
 
   <record id="x_code_name" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Code mit Name</field>
     <field name="model">hr.payslip.line</field>
     <field name="model_id" ref="hr_payroll.model_hr_payslip_line"/>
@@ -787,7 +809,6 @@ ID: `mint_system.ir_model.mrp_bom.x_note`
 <odoo>
 
   <record id="x_note" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Notiz</field>
     <field name="model">mrp.bom</field>
     <field name="model_id" ref="mrp.model_mrp_bom"/>
@@ -810,7 +831,6 @@ ID: `mint_system.ir_model.mrp_bom.x_type_description`
 <odoo>
 
   <record id="x_type_description" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Typenbezeichnung</field>
     <field name="model">mrp.bom</field>
     <field name="model_id" ref="mrp.model_mrp_bom"/>
@@ -836,7 +856,6 @@ ID: `mint_system.ir_model.mrp_production.x_date_deadline`
 <odoo>
 
   <record id="x_date_deadline" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Frist</field>
     <field name="model">mrp.production</field>
     <field name="model_id" ref="mrp.model_mrp_production"/>
@@ -859,7 +878,6 @@ ID: `mint_system.ir_model.mrp_production.x_note`
 <odoo>
 
   <record id="x_note" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Notiz</field>
     <field name="model">mrp.production</field>
     <field name="model_id" ref="mrp.model_mrp_production"/>
@@ -887,7 +905,6 @@ ID: `mint_system.ir_model.mrp_production.x_quality_check_ids`
 <odoo>
 
   <record id="x_quality_check_ids" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Qualitätsprüfungen</field>
     <field name="model">mrp.production</field>
     <field name="model_id" ref="mrp.model_mrp_production"/>
@@ -913,7 +930,6 @@ ID: `mint_system.ir_model.mrp_workorder.x_reservation_state`
 <odoo>
 
   <record id="x_reservation_state" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Materialverfügbarkeit</field>
     <field name="model">mrp.workorder</field>
     <field name="model_id" ref="mrp.model_mrp_workorder"/>
@@ -937,7 +953,6 @@ ID: `mint_system.ir_model.mrp_workorder.x_type_description2`
 <odoo>
 
   <record id="x_type_description2" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Typenbezeichnung 2</field>
     <field name="model">mrp.workorder</field>
     <field name="model_id" ref="mrp.model_mrp_workorder"/>
@@ -960,7 +975,6 @@ ID: `mint_system.ir_model.mrp_workorder.x_type_description`
 <odoo>
 
   <record id="x_type_description" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Typenbezeichnung</field>
     <field name="model">mrp.workorder</field>
     <field name="model_id" ref="mrp.model_mrp_workorder"/>
@@ -984,7 +998,6 @@ ID: `mint_system.ir_model.product_category.x_relevant_for_certificate`
 <odoo>
 
   <record id="x_relevant_for_certificate" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Für Werkszeugnis relevant</field>
     <field name="model">product.category</field>
     <field name="model_id" ref="product.product_category"/>
@@ -1008,7 +1021,6 @@ ID: `mint_system.ir_model.product_packaging.x_description`
 <odoo>
 
   <record id="x_description" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Beschreibung</field>
     <field name="model">product.packaging</field>
     <field name="model_id" ref="product.model_product_packaging"/>
@@ -1031,7 +1043,6 @@ ID: `mint_system.ir_model.product_packaging.x_qty_description`
 <odoo>
 
   <record id="x_qty_description" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Label Gewicht</field>
     <field name="model">product.packaging</field>
     <field name="model_id" ref="product.model_product_packaging"/>
@@ -1055,7 +1066,6 @@ ID: `mint_system.ir_model.product_set_line.x_categ_id`
 <odoo>
 
   <record id="x_categ_id" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Produktkategorie</field>
     <field name="model">product.set.line</field>
     <field name="model_id" ref="product.model_product_set_line"/>
@@ -1081,7 +1091,6 @@ ID: `mint_system.ir_model.product_template.x_calibre`
 <odoo>
 
   <record id="x_calibre" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Kaliber</field>
     <field name="model">product.template</field>
     <field name="model_id" ref="product.model_product_template"/>
@@ -1104,7 +1113,6 @@ ID: `mint_system.ir_model.product_template.x_expiration_days`
 <odoo>
 
   <record id="x_expiration_days" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Haltbarkeit in Tagen</field>
     <field name="model">product.template</field>
     <field name="model_id" ref="product.model_product_template"/>
@@ -1127,14 +1135,13 @@ ID: `mint_system.ir_model.product_template.x_hide_on_delivery`
 <odoo>
 
   <record id="x_hide_on_delivery" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Auf Lieferschein ausblenden</field>
     <field name="model">product.template</field>
     <field name="model_id" ref="product.model_product_template"/>
     <field name="name">x_hide_on_delivery</field>
     <field name="store" eval="True"/>
     <field name="readonly" eval="False"/>
-    <field name="copied" eval="False"/>
+    <field name="copied" eval="True"/>
     <field name="ttype">boolean</field>
   </record>
 
@@ -1143,6 +1150,28 @@ 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-Build/tree/14.0/snippets/ir_model.product_template.x_hide_on_delivery.xml)
 
+### X Hide On Invoice  
+ID: `mint_system.ir_model.product_template.x_hide_on_invoice`  
+```xml
+<?xml version='1.0' encoding='UTF-8' ?>
+<odoo>
+
+  <record id="x_hide_on_invoice" model="ir.model.fields">
+    <field name="field_description">Auf Rechnung ausblenden</field>
+    <field name="model">product.template</field>
+    <field name="model_id" ref="product.model_product_template"/>
+    <field name="name">x_hide_on_invoice</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_invoice.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/ir_model.product_template.x_hide_on_invoice.xml)
+
 ### X Hide On Sale Order  
 ID: `mint_system.ir_model.product_template.x_hide_on_sale_order`  
 ```xml
@@ -1150,7 +1179,6 @@ ID: `mint_system.ir_model.product_template.x_hide_on_sale_order`
 <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"/>
@@ -1185,7 +1213,6 @@ ID: `mint_system.ir_model.product_template.x_product_label`
     <field name="relation">ir.actions.report</field>
     <field name="group_expand" eval="False"/> 
     <field name="on_delete">Set NULL</field>
-    <field name="domain">[]</field>
   </record>
 
 </odoo>
@@ -1200,7 +1227,6 @@ ID: `mint_system.ir_model.product_template.x_storage_temperature`
 <odoo>
 
   <record id="x_storage_temperature" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Aufbewahrung bei</field>
     <field name="model">product.template</field>
     <field name="model_id" ref="product.model_product_template"/>
@@ -1223,7 +1249,6 @@ ID: `mint_system.ir_model.product_template.x_warranty`
 <odoo>
 
   <record id="x_warranty" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Garantie</field>
     <field name="model">product.template</field>
     <field name="model_id" ref="product.model_product_template"/>
@@ -1246,7 +1271,6 @@ ID: `mint_system.ir_model.product_template.x_xml_id`
 <odoo>
 
   <record id="x_xml_id" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">External ID</field>
     <field name="model">product.template</field>
     <field name="model_id" ref="product.model_product_template"/>
@@ -1274,7 +1298,6 @@ ID: `mint_system.ir_model.project_task.x_business_requirement_id`
 <odoo>
 
   <record id="x_business_requirement_id" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Business Requirement</field>
     <field name="model">project.task</field>
     <field name="model_id" ref="project.model_project_task"/>
@@ -1301,7 +1324,6 @@ ID: `mint_system.ir_model.project_task.x_lead_id`
 <odoo>
 
   <record id="x_lead_id" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Lead</field>
     <field name="model">project.task</field>
     <field name="model_id" ref="product.model_project_task"/>
@@ -1327,7 +1349,6 @@ ID: `mint_system.ir_model.project_task.x_not_billable`
 <odoo>
 
   <record id="x_not_billable" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Nicht Verrechenbar</field>
     <field name="model">project.task</field>
     <field name="model_id" ref="product.model_project_task"/>
@@ -1349,7 +1370,6 @@ ID: `mint_system.ir_model.project_task.x_systemname`
 <odoo>
 
   <record id="x_systemname" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Benutzer</field>
     <field name="model">project.task</field>
     <field name="model_id" ref="project.model_project_task"/>
@@ -1372,7 +1392,6 @@ ID: `mint_system.ir_model.project_task.x_user_text`
 <odoo>
 
   <record id="x_user_text" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Benutzer</field>
     <field name="model">project.task</field>
     <field name="model_id" ref="project.model_project_task"/>
@@ -1395,7 +1414,6 @@ ID: `mint_system.ir_model.project_task.x_vehicle_id`
 <odoo>
 
   <record id="x_vehicle_id" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Fahrzeug</field>
     <field name="model">project.task</field>
     <field name="model_id" ref="product.model_project_task"/>
@@ -1419,7 +1437,6 @@ ID: `mint_system.ir_model.purchase_order_line.x_date_approve`
 <odoo>
 
   <record id="x_date_approve" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Bestätigung am</field>
     <field name="model">purchase.order.line</field>
     <field name="model_id" ref="purchase.model_purchase_order_line"/>
@@ -1443,7 +1460,6 @@ ID: `mint_system.ir_model.purchase_order_line.x_drawing_file`
 <odoo>
 
   <record id="x_drawing_file" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Zeichnung</field>
     <field name="model">purchase.order.line</field>
     <field name="model_id" ref="purchase.model_purchase_order_line"/>
@@ -1466,7 +1482,6 @@ ID: `mint_system.ir_model.purchase_order_line.x_origin`
 <odoo>
 
   <record id="x_origin" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Referenzbeleg</field>
     <field name="model">purchase.order.line</field>
     <field name="model_id" ref="purchase.model_purchase_order_line"/>
@@ -1490,7 +1505,6 @@ ID: `mint_system.ir_model.purchase_order_line.x_partner_ref`
 <odoo>
 
   <record id="x_partner_ref" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Lieferantenreferenz</field>
     <field name="model">purchase.order.line</field>
     <field name="model_id" ref="purchase.model_purchase_order_line"/>
@@ -1514,7 +1528,6 @@ ID: `mint_system.ir_model.purchase_order_line.x_state`
 <odoo>
 
   <record id="x_state" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Status Bestellposition</field>
     <field name="model">purchase.order.line</field>
     <field name="model_id" ref="purchase.model_purchase_order_line"/>
@@ -1538,7 +1551,6 @@ ID: `mint_system.ir_model.purchase_order_line.x_user_id`
 <odoo>
 
   <record id="x_user_id" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Einkaufsbeauftragter</field>
     <field name="model">purchase.order.line</field>
     <field name="model_id" ref="purchase.model_purchase_order_line"/>
@@ -1564,7 +1576,6 @@ ID: `mint_system.ir_model.purchase_order.x_comment`
 <odoo>
 
   <record id="x_comment" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Kommentar</field>
     <field name="model">purchase.order</field>
     <field name="model_id" ref="purchase.model_purchase_order"/>
@@ -1580,6 +1591,76 @@ ID: `mint_system.ir_model.purchase_order.x_comment`
 ```
 Source: [snippets/ir_model.purchase_order.x_comment.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/ir_model.purchase_order.x_comment.xml)
 
+### X Payment State  
+ID: `mint_system.ir_model.purchase_order.x_payment_state`  
+```xml
+<?xml version='1.0' encoding='UTF-8' ?>
+<odoo>
+
+  <record id="x_payment_state" model="ir.model.fields">
+    <field name="field_description">Zahlungsstatus</field>
+    <field name="model">purchase.order</field>
+    <field name="model_id" ref="purchase.model_purchase_order"/>
+    <field name="name">x_payment_state</field>
+    <field name="store" eval="True"/>
+    <field name="readonly" eval="True"/>
+    <field name="copied" eval="False"/>
+    <field name="ttype">selection</field>
+    <field name="selection_id">[
+      {'value':'not_paid','name':'Nicht Bezahlt'},
+      {'value':'in_payment','name':'In Zahlung'},
+      {'value':'paid','name':'Bezahlt'},
+    ]</field>
+    <field name="depends">invoice_ids,invoice_ids.payment_state</field>
+    <field name="compute">for rec in self:
+      if rec.invoice_ids:
+        has_only_paid_invoices = all(rec.invoice_ids.mapped(lambda i: i.payment_state == 'paid'))
+        has_in_payment_invoices = any(rec.invoice_ids.mapped(lambda i: i.payment_state == 'in_payment'))
+        has_not_paid_invoices = any(rec.invoice_ids.mapped(lambda i: i.payment_state == 'not_paid'))
+      
+        if has_only_paid_invoices:
+          rec['x_payment_state'] = 'paid'
+        elif has_in_payment_invoices:
+          rec['x_payment_state'] = 'in_payment'
+        elif has_not_paid_invoices:
+          rec['x_payment_state'] = 'not_paid'
+      else:
+        rec['x_payment_state'] = 'not_paid' </field>
+  </record>
+
+</odoo>
+
+```
+Source: [snippets/ir_model.purchase_order.x_payment_state.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/ir_model.purchase_order.x_payment_state.xml)
+
+### X Recurring Inverval  
+ID: `mint_system.ir_model.purchase_order.x_recurring_inverval`  
+```xml
+<?xml version='1.0' encoding='UTF-8' ?>
+<odoo>
+
+  <record id="x_recurring_inverval" model="ir.model.fields">
+    <field name="field_description">Vertragsintervall</field>
+    <field name="model">purchase.order</field>
+    <field name="model_id" ref="purchase.model_purchase_order"/>
+    <field name="name">x_recurring_inverval</field>
+    <field name="store" eval="True"/>
+    <field name="readonly" eval="False"/>
+    <field name="copied" eval="False"/>
+    <field name="ttype">selection</field>
+    <field name="selection_id">[
+      {'value':'daily','name':'Daily'},
+      {'value':'monthly','name':'Monthly'},
+      {'value':'quarterly','name':'Quarterly'},
+      {'value':'yearly','name':'Yearly'}
+    ]</field>
+  </record>
+
+</odoo>
+
+```
+Source: [snippets/ir_model.purchase_order.x_recurring_inverval.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/ir_model.purchase_order.x_recurring_inverval.xml)
+
 ## Quality Check  
 ### X Active  
 ID: `mint_system.ir_model.quality_check.x_active`  
@@ -1588,7 +1669,6 @@ ID: `mint_system.ir_model.quality_check.x_active`
 <odoo>
 
   <record id="x_active" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Aktiv</field>
     <field name="model">quality.check</field>
     <field name="model_id" ref="quality.model_quality_check"/>
@@ -1618,10 +1698,9 @@ ID: `mint_system.ir_model.res_partner.x_birthdate`
 <odoo>
 
   <record id="x_birthdate" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Geburtstag</field>
     <field name="model">res.partner</field>
-    <field name="model_id" ref="base.model_res_partnee"/>
+    <field name="model_id" ref="base.model_res_partner"/>
     <field name="name">x_birthdate</field>
     <field name="store" eval="True"/>
     <field name="readonly" eval="False"/>
@@ -1641,7 +1720,6 @@ ID: `mint_system.ir_model.res_partner.x_created_on`
 <odoo>
 
   <record id="x_created_on" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Erstellt am</field>
     <field name="model">res.partner</field>
     <field name="model_id" ref="base.model_res_partnee"/>
@@ -1657,6 +1735,28 @@ ID: `mint_system.ir_model.res_partner.x_created_on`
 ```
 Source: [snippets/ir_model.res_partner.x_created_on.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/ir_model.res_partner.x_created_on.xml)
 
+### X Eori  
+ID: `mint_system.ir_model.res_partner.x_eori`  
+```xml
+<?xml version='1.0' encoding='UTF-8' ?>
+<odoo>
+
+  <record id="x_eori" model="ir.model.fields">
+    <field name="domain">[]</field>
+    <field name="field_description">EORI</field>
+    <field name="model">res.partner</field>
+    <field name="model_id" ref="base.model_res_partner"/>
+    <field name="name">x_eori</field>
+    <field name="store" eval="True"/>
+    <field name="readonly" eval="False"/>
+    <field name="copied" eval="False"/>
+    <field name="ttype">char</field>
+  </record>
+
+</odoo>
+```
+Source: [snippets/ir_model.res_partner.x_eori.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/ir_model.res_partner.x_eori.xml)
+
 ### X External Ref  
 ID: `mint_system.ir_model.res_partner.x_external_ref`  
 ```xml
@@ -1664,7 +1764,6 @@ ID: `mint_system.ir_model.res_partner.x_external_ref`
 <odoo>
 
   <record id="x_external_ref" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Externe Referenz</field>
     <field name="model">res.partner</field>
     <field name="model_id" ref="base.model_res_partner"/>
@@ -1680,6 +1779,58 @@ ID: `mint_system.ir_model.res_partner.x_external_ref`
 ```
 Source: [snippets/ir_model.res_partner.x_external_ref.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/ir_model.res_partner.x_external_ref.xml)
 
+### X First Sale Date  
+ID: `mint_system.ir_model.res_partner.x_first_sale_date`  
+```xml
+<?xml version='1.0' encoding='UTF-8' ?>
+<odoo>
+
+  <record id="x_first_sale_date" model="ir.model.fields">
+    <field name="field_description">Erstes Verkaufsdatum</field>
+    <field name="model">res.partner</field>
+    <field name="model_id" ref="base.model_res_partnee"/>
+    <field name="name">x_first_sale_date</field>
+    <field name="store" eval="True"/>
+    <field name="readonly" eval="True"/>
+    <field name="copied" eval="False"/>
+    <field name="ttype">date</field>
+    <field name="depends">sale_order_ids</field>
+    <field name="compute">for rec in self:
+      first_sale_order = rec.sale_order_ids.filtered(lambda s: s.state == 'sale').sorted('date_order')[:1]
+      if first_sale_order:
+        rec['x_first_sale_date'] = first_sale_order.date_order
+      else:
+        rec['x_first_sale_date'] = False
+    </field>
+  </record>
+
+</odoo>
+
+```
+Source: [snippets/ir_model.res_partner.x_first_sale_date.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/ir_model.res_partner.x_first_sale_date.xml)
+
+### X Global Location Number  
+ID: `mint_system.ir_model.res_partner.x_global_location_number`  
+```xml
+<?xml version='1.0' encoding='UTF-8' ?>
+<odoo>
+
+  <record id="x_global_location_number" model="ir.model.fields">
+    <field name="domain">[]</field>
+    <field name="field_description">VSTGLN</field>
+    <field name="model">res.partner</field>
+    <field name="model_id" ref="base.model_res_partner"/>
+    <field name="name">x_global_location_number</field>
+    <field name="store" eval="True"/>
+    <field name="readonly" eval="False"/>
+    <field name="copied" eval="False"/>
+    <field name="ttype">char</field>
+  </record>
+
+</odoo>
+```
+Source: [snippets/ir_model.res_partner.x_global_location_number.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/ir_model.res_partner.x_global_location_number.xml)
+
 ### X Packaging Ref  
 ID: `mint_system.ir_model.res_partner.x_packaging_ref`  
 ```xml
@@ -1687,7 +1838,6 @@ ID: `mint_system.ir_model.res_partner.x_packaging_ref`
 <odoo>
 
   <record id="x_packaging_ref" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Verpackungsreferenz</field>
     <field name="model">res.partner</field>
     <field name="model_id" ref="base.model_res_partner"/>
@@ -1703,6 +1853,28 @@ ID: `mint_system.ir_model.res_partner.x_packaging_ref`
 ```
 Source: [snippets/ir_model.res_partner.x_packaging_ref.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/ir_model.res_partner.x_packaging_ref.xml)
 
+### X Privacy Visibility  
+ID: `mint_system.ir_model.res_partner.x_privacy_visibility`  
+```xml
+<?xml version='1.0' encoding='UTF-8' ?>
+<odoo>
+
+  <record id="x_privacy_visibility" model="ir.model.fields">
+    <field name="domain">[]</field>
+    <field name="field_description">Sichtbarkeit</field>
+    <field name="model">res.partner</field>
+    <field name="model_id" ref="base.model_res_partner"/>
+    <field name="name">x_privacy_visibility</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.res_partner.x_privacy_visibility.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/ir_model.res_partner.x_privacy_visibility.xml)
+
 ### X Stock Move Ids  
 ID: `mint_system.ir_model.res_partner.x_stock_move_ids`  
 ```xml
@@ -1710,7 +1882,6 @@ ID: `mint_system.ir_model.res_partner.x_stock_move_ids`
 <odoo>
 
   <record id="x_stock_move_ids" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Lagerbuchungen</field>
     <field name="model">res.partner</field>
     <field name="model_id" ref="base.model_res_partner"/>
@@ -1728,6 +1899,28 @@ 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-Build/tree/14.0/snippets/ir_model.res_partner.x_stock_move_ids.xml)
 
+### X Vst  
+ID: `mint_system.ir_model.res_partner.x_vst`  
+```xml
+<?xml version='1.0' encoding='UTF-8' ?>
+<odoo>
+
+  <record id="x_vst" model="ir.model.fields">
+    <field name="domain">[]</field>
+    <field name="field_description">VST</field>
+    <field name="model">res.partner</field>
+    <field name="model_id" ref="base.model_res_partner"/>
+    <field name="name">x_vst</field>
+    <field name="store" eval="True"/>
+    <field name="readonly" eval="False"/>
+    <field name="copied" eval="False"/>
+    <field name="ttype">char</field>
+  </record>
+
+</odoo>
+```
+Source: [snippets/ir_model.res_partner.x_vst.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/ir_model.res_partner.x_vst.xml)
+
 ## Sale Blanket Order Line  
 ### X Product Uom Category Id  
 ID: `mint_system.ir_model.sale_blanket_order_line.x_product_uom_category_id`  
@@ -1736,7 +1929,6 @@ ID: `mint_system.ir_model.sale_blanket_order_line.x_product_uom_category_id`
 <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"/>
@@ -1762,7 +1954,6 @@ ID: `mint_system.ir_model.sale_order_line.x_client_order_ref`
 <odoo>
 
   <record id="x_client_order_ref" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Kundenreferenz</field>
     <field name="model">sale.order.line</field>
     <field name="model_id" ref="sale.model_sale_order_line"/>
@@ -1786,7 +1977,6 @@ ID: `mint_system.ir_model.sale_order_line.x_commitment_date`
 <odoo>
 
   <record id="x_commitment_date" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Lieferdatum</field>
     <field name="model">sale.order.line</field>
     <field name="model_id" ref="sale.model_sale_order_line"/>
@@ -1810,7 +2000,6 @@ ID: `mint_system.ir_model.sale_order_line.x_date_order`
 <odoo>
 
   <record id="x_date_order" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Auftragsdatum</field>
     <field name="model">sale.order.line</field>
     <field name="model_id" ref="sale.model_sale_order_line"/>
@@ -1834,7 +2023,6 @@ ID: `mint_system.ir_model.sale_order_line.x_drawing_file`
 <odoo>
 
   <record id="x_drawing_file" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Zeichnung</field>
     <field name="model">sale.order.line</field>
     <field name="model_id" ref="sale.model_sale_order_line"/>
@@ -1858,7 +2046,6 @@ ID: `mint_system.ir_model.sale_order_line.x_industry_id`
 <odoo>
 
   <record id="x_industry_id" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Branche</field>
     <field name="model">sale.order.line</field>
     <field name="model_id" ref="sale.model_sale_order_line"/>
@@ -1882,7 +2069,6 @@ ID: `mint_system.ir_model.sale_order_line.x_margin_percent`
 <odoo>
 
   <record id="x_margin_percent" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Marge (%)</field>
     <field name="help">Marge Aufschlagsrechnung</field>
     <field name="model">sale.order.line</field>
@@ -1913,7 +2099,6 @@ ID: `mint_system.ir_model.sale_order_line.x_pricelist_id`
 <odoo>
 
   <record id="x_pricelist_id" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Preisliste</field>
     <field name="model">sale.order.line</field>
     <field name="model_id" ref="sale.model_sale_order_line"/>
@@ -1937,7 +2122,6 @@ ID: `mint_system.ir_model.sale_order_line.x_service_policy`
 <odoo>
 
   <record id="x_service_policy" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Faktierungsregel</field>
     <field name="model">sale.order.line</field>
     <field name="model_id" ref="sale.model_sale_order_line"/>
@@ -1961,7 +2145,6 @@ ID: `mint_system.ir_model.sale_order_line.x_service_tracking`
 <odoo>
 
   <record id="x_service_tracking" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Dienstverfolgung</field>
     <field name="model">sale.order.line</field>
     <field name="model_id" ref="sale.model_sale_order_line"/>
@@ -1985,7 +2168,6 @@ ID: `mint_system.ir_model.sale_order_line.x_state`
 <odoo>
 
   <record id="x_state" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Status Auftragsposition</field>
     <field name="model">sale.order.line</field>
     <field name="model_id" ref="sale.model_sale_order_line"/>
@@ -2009,7 +2191,6 @@ ID: `mint_system.ir_model.sale_order_line.x_taxed_amount_invoiced`
 <odoo>
 
   <record id="x_taxed_amount_invoiced" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Rechnungsbetrag inkl. MWST</field>
     <field name="model">sale.order.line</field>
     <field name="model_id" ref="sale.model_sale_order_line"/>
@@ -2035,7 +2216,6 @@ ID: `mint_system.ir_model.sale_order_line.x_taxed_amount`
 <odoo>
 
   <record id="x_taxed_amount" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Total inkl. MWST</field>
     <field name="model">sale.order.line</field>
     <field name="model_id" ref="sale.model_sale_order_line"/>
@@ -2061,7 +2241,6 @@ ID: `mint_system.ir_model.sale_order_line.x_untaxed_amount`
 <odoo>
 
   <record id="x_untaxed_amount" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Total exkl. MWST</field>
     <field name="model">sale.order.line</field>
     <field name="model_id" ref="sale.model_sale_order_line"/>
@@ -2087,7 +2266,6 @@ ID: `mint_system.ir_model.sale_order_line.x_weight_delivered`
 <odoo>
 
   <record id="x_weight_delivered" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Geliefertes Gewicht</field>
     <field name="model">sale.order.line</field>
     <field name="model_id" ref="sale.model_sale_order_line" />
@@ -2106,6 +2284,28 @@ ID: `mint_system.ir_model.sale_order_line.x_weight_delivered`
 Source: [snippets/ir_model.sale_order_line.x_weight_delivered.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/ir_model.sale_order_line.x_weight_delivered.xml)
 
 ## Sale Order  
+### X As4import  
+ID: `mint_system.ir_model.sale_order.x_as4import`  
+```xml
+<?xml version='1.0' encoding='UTF-8' ?>
+<odoo>
+
+  <record id="x_as4import" model="ir.model.fields">
+    <field name="field_description">AS4 Import</field>
+    <field name="model">sale.order</field>
+    <field name="model_id" ref="sale.model_sale_order"/>
+    <field name="name">x_as4import</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.sale_order.x_as4import.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/ir_model.sale_order.x_as4import.xml)
+
 ### X Client Project Ref  
 ID: `mint_system.ir_model.sale_order.x_client_project_ref`  
 ```xml
@@ -2113,7 +2313,6 @@ ID: `mint_system.ir_model.sale_order.x_client_project_ref`
 <odoo>
 
   <record id="x_client_project_ref" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Projektnummer Kunde</field>
     <field name="model">sale.order</field>
     <field name="model_id" ref="sale.model_sale_order"/>
@@ -2136,7 +2335,6 @@ ID: `mint_system.ir_model.sale_order.x_incoterm_blanket_order`
 <odoo>
 
   <record id="x_incoterm_blanket_order" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Incoterm Rahmenauftrag</field>
     <field name="model">sale.order</field>
     <field name="model_id" ref="sale.model_sale_order"/>
@@ -2154,6 +2352,118 @@ ID: `mint_system.ir_model.sale_order.x_incoterm_blanket_order`
 ```
 Source: [snippets/ir_model.sale_order.x_incoterm_blanket_order.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/ir_model.sale_order.x_incoterm_blanket_order.xml)
 
+### X Industry Id  
+ID: `mint_system.ir_model.sale_order.x_industry_id`  
+```xml
+<?xml version='1.0' encoding='UTF-8' ?>
+<odoo>
+
+  <record id="x_industry_id" model="ir.model.fields">
+    <field name="field_description">Branche</field>
+    <field name="model">sale.order</field>
+    <field name="model_id" ref="sale.model_sale_order_line"/>
+    <field name="name">x_industry_id</field>
+    <field name="store" eval="True"/>
+    <field name="readonly" eval="True"/>
+    <field name="copied" eval="False"/>
+    <field name="ttype">char</field>
+    <field name="related">partner_id.industry_id.name</field>
+  </record>
+
+</odoo>
+
+
+```
+Source: [snippets/ir_model.sale_order.x_industry_id.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/ir_model.sale_order.x_industry_id.xml)
+
+### X Order Number  
+ID: `mint_system.ir_model.sale_order.x_order_number`  
+```xml
+<?xml version='1.0' encoding='UTF-8' ?>
+<odoo>
+
+  <record id="x_order_number" model="ir.model.fields">
+    <field name="field_description">Bestellnummer Kunde</field>
+    <field name="model">sale.order</field>
+    <field name="model_id" ref="sale.model_sale_order"/>
+    <field name="name">x_order_number</field>
+    <field name="store" eval="True"/>
+    <field name="readonly" eval="False"/>
+    <field name="copied" eval="True"/>
+    <field name="ttype">Char</field>
+  </record>
+
+</odoo>
+
+```
+Source: [snippets/ir_model.sale_order.x_order_number.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/ir_model.sale_order.x_order_number.xml)
+
+### X Payment State  
+ID: `mint_system.ir_model.sale_order.x_payment_state`  
+```xml
+<?xml version='1.0' encoding='UTF-8' ?>
+<odoo>
+
+  <record id="x_payment_state" model="ir.model.fields">
+    <field name="field_description">Zahlungsstatus</field>
+    <field name="model">sale.order</field>
+    <field name="model_id" ref="sale.model_sale_order"/>
+    <field name="name">x_payment_state</field>
+    <field name="store" eval="True"/>
+    <field name="readonly" eval="True"/>
+    <field name="copied" eval="False"/>
+    <field name="ttype">selection</field>
+    <field name="selection_id">[
+      {'value':'not_paid','name':'Nicht Bezahlt'},
+      {'value':'in_payment','name':'In Zahlung'},
+      {'value':'paid','name':'Bezahlt'},
+    ]</field>
+    <field name="depends">invoice_ids,invoice_ids.payment_state</field>
+    <field name="compute">for rec in self:
+      if rec.invoice_ids:
+        has_only_paid_invoices = all(rec.invoice_ids.mapped(lambda i: i.payment_state == 'paid'))
+        has_in_payment_invoices = any(rec.invoice_ids.mapped(lambda i: i.payment_state == 'in_payment'))
+        has_not_paid_invoices = any(rec.invoice_ids.mapped(lambda i: i.payment_state == 'not_paid'))
+      
+        if has_only_paid_invoices:
+          rec['x_payment_state'] = 'paid'
+        elif has_in_payment_invoices:
+          rec['x_payment_state'] = 'in_payment'
+        elif has_not_paid_invoices:
+          rec['x_payment_state'] = 'not_paid'
+      else:
+        rec['x_payment_state'] = 'not_paid' </field>
+  </record>
+
+</odoo>
+
+```
+Source: [snippets/ir_model.sale_order.x_payment_state.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/ir_model.sale_order.x_payment_state.xml)
+
+### X Payment Term Blanket Order  
+ID: `mint_system.ir_model.sale_order.x_payment_term_blanket_order`  
+```xml
+<?xml version='1.0' encoding='UTF-8' ?>
+<odoo>
+
+  <record id="x_payment_term_blanket_order" model="ir.model.fields">
+    <field name="field_description">Zahlungsbedingungen Rahmenauftrag</field>
+    <field name="model">sale.order</field>
+    <field name="model_id" ref="sale.model_sale_order"/>
+    <field name="name">x_payment_term_blanket_order</field>
+    <field name="store" eval="False"/>
+    <field name="readonly" eval="True"/>
+    <field name="copied" eval="False"/>
+    <field name="ttype">many2one</field>
+    <field name="relation">account.payment.terms</field>
+    <field name="related">order_line.blanket_order_line.order_id.payment_term_id</field>
+  </record>
+
+</odoo>
+
+```
+Source: [snippets/ir_model.sale_order.x_payment_term_blanket_order.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/ir_model.sale_order.x_payment_term_blanket_order.xml)
+
 ### X Product Uom Qty  
 ID: `mint_system.ir_model.sale_order.x_product_uom_qty`  
 ```xml
@@ -2161,7 +2471,6 @@ ID: `mint_system.ir_model.sale_order.x_product_uom_qty`
 <odoo>
 
   <record id="x_product_uom_qty" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Gesamtmenge</field>
     <field name="model">sale.order</field>
     <field name="model_id" ref="sale.model_sale_order"/>
@@ -2188,7 +2497,6 @@ ID: `mint_system.ir_model.sale_order.x_studio_description`
 <odoo>
 
   <record id="x_studio_description" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Beschreibung Verkausauftrag</field>
     <field name="model">sale.order</field>
     <field name="model_id" ref="sale.model_sale_order"/>
@@ -2211,7 +2519,6 @@ ID: `mint_system.ir_model.stock_location.x_should_be_valued`
 <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"/>
@@ -2237,65 +2544,33 @@ ID: `mint_system.ir_model.stock_move.x_count_boxes`
 <?xml version='1.0' encoding='UTF-8' ?>
 <odoo>
 
-  <record id="x_count_boxes" model="ir.model.fields">
-    <field name="domain">[]</field>
-    <field name="field_description">Anzahl Kisten</field>
-    <field name="model">stock.move</field>
-    <field name="model_id" ref="stock.model_stock_move"/>
-    <field name="name">x_count_boxes</field>
-    <field name="store" eval="True"/>
-    <field name="readonly" eval="True"/>
-    <field name="copied" eval="False"/>
-    <field name="ttype">int</field>
-    <field name="depends">quantity_done</field>
-    <field name="compute"># Count the number of packaging boxes
-for rec in self:
-    rec['x_count_boxes'] = 0
-    if rec.product_packaging:
-        
-        # Get picking delivery product name
-        delivery_name = rec.picking_id.carrier_id.product_id.name
-    
-        # Calculate the number of boxes depending on the selected packaging
-    
-        if rec.product_packaging.name == "Schale Gross":
-            rec['x_count_boxes'] = (rec.quantity_done/4 + 2.4)/2.5
-            
-        elif rec.product_packaging.name == "Schale Klein":
-            rec['x_count_boxes'] = (rec.quantity_done/6 + 0.9)/1
-            
-        elif rec.product_packaging.name == "Vakuum Gross":
-            rec['x_count_boxes'] = (rec.quantity_done/4 + 2.4)/2.5
-            
-        elif rec.product_packaging.name == "Aktionären Gutschein":
-            rec['x_count_boxes'] = ((rec.quantity_done + 9)/20)
-            
-        elif rec.product_packaging.name == "Vakuum Klein":
-            if rec.product_id.id == 68: # Filet mit Haut TK
-                rec['x_count_boxes'] = (rec.product_uom_qty + 9)/10
-            elif rec.product_id.id == 74: # Filet mit Haut V-Schnitt Tiefgekühlt
-                rec['x_count_boxes'] = (rec.product_uom_qty + 9)/20
-            else:
-                rec['x_count_boxes'] = (rec.quantity_done/8 + 0.9)/1
+    <record id="x_count_boxes" model="ir.model.fields">
+        <field name="field_description">Anzahl Kisten</field>
+        <field name="help">Count the number of packaging boxes.</field>
+        <field name="model">stock.move</field>
+        <field name="model_id" ref="stock.model_stock_move"/>
+        <field name="name">x_count_boxes</field>
+        <field name="store" eval="True"/>
+        <field name="readonly" eval="True"/>
+        <field name="copied" eval="False"/>
+        <field name="ttype">int</field>
+        <field name="depends">quantity_done,product_packaging</field>
+        <field name="compute">for rec in self:
+            rec['x_count_boxes'] = 0
+            if rec.product_packaging and rec.product_packaging.qty:
+              product_qty = rec.product_packaging.qty
+              count_boxes = rec.quantity_done / product_qty
+              
+              rec['x_count_boxes'] = int(-(-count_boxes // 1))
+              
+              if rec.product_packaging.parent_packaging and rec.product_packaging.parent_packaging.qty:
+                parent_qty = rec.product_packaging.parent_packaging.qty
+                count_boxes = rec.quantity_done / parent_qty
                 
-        elif rec.product_packaging.name == "Karton":
-            rec['x_count_boxes'] = rec.quantity_done/rec.product_packaging.qty
-            
-            if rec.product_packaging.parent_packaging and rec.product_packaging.parent_packaging.qty:
-              rec['x_count_boxes'] = rec.quantity_done/rec.product_packaging.parent_packaging.qty
-            
-        elif rec.product_packaging.name == "Kiste":
-            if rec.product_id.id == 68: # Filet mit Haut TK
-                rec['x_count_boxes'] = (rec.product_uom_qty + 9)/10
-            elif rec.product_id.id == 51: # Kopf / Backen
-                rec['x_count_boxes'] = (rec.product_uom_qty + 99)/100
-            elif rec.product_id.id == 33: # Filet mit Haut
-                rec['x_count_boxes'] = (rec.product_uom_qty + 9)/10
-            else:
-                rec['x_count_boxes'] = (rec.product_uom_qty + 14)/15
-    </field>
-  </record>
-
+                rec['x_count_boxes'] = int(-(-count_boxes // 1))
+        </field>
+    </record>
+    
 </odoo>
 
 ```
@@ -2308,8 +2583,8 @@ ID: `mint_system.ir_model.stock_move.x_count_packaging`
 <odoo>
 
   <record id="x_count_packaging" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Anzahl Verpackungen</field>
+    <field name="help">Counts the number of packages for dispaying in on the picking report.</field>
     <field name="model">stock.move</field>
     <field name="model_id" ref="stock.model_stock_move"/>
     <field name="name">x_count_packaging</field>
@@ -2318,15 +2593,9 @@ ID: `mint_system.ir_model.stock_move.x_count_packaging`
     <field name="copied" eval="False"/>
     <field name="ttype">int</field>
     <field name="depends">product_uom_qty</field>
-    <field name="compute"># Counts the number of packages for dispaying in on the picking report
-      for rec in self:
-        if rec.product_packaging:
-          if rec.product_packaging.name == "Kiste":
-            rec['x_count_packaging'] = (rec.product_uom_qty + 14)/15
-          if rec.product_packaging.name == "Schale Gross":
-            rec['x_count_packaging'] = (rec.product_uom_qty + 2.4)/2.5
-          if rec.product_packaging.name in ["Vakuum", "Schale Klein", "Karton"]:
-            rec['x_count_packaging'] = (rec.product_uom_qty + 0.9)/1</field>
+    <field name="compute">for rec in self:
+	if rec.product_packaging:
+	  rec['x_count_packaging'] = rec.product_uom_qty // rec.product_packaging.qty</field>
   </record>
 
 </odoo>
@@ -2334,6 +2603,32 @@ ID: `mint_system.ir_model.stock_move.x_count_packaging`
 ```
 Source: [snippets/ir_model.stock_move.x_count_packaging.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/ir_model.stock_move.x_count_packaging.xml)
 
+### X Label Qty  
+ID: `mint_system.ir_model.stock_move.x_label_qty`  
+```xml
+<?xml version='1.0' encoding='UTF-8' ?>
+<odoo>
+
+  <record id="x_label_qty" model="ir.model.fields">
+    <field name="field_description">Anzahl Etiketten</field>
+    <field name="model">stock.move</field>
+    <field name="model_id" ref="stock.model_stock_move"/>
+    <field name="name">x_label_qty</field>
+    <field name="store" eval="True"/>
+    <field name="readonly" eval="False"/>
+    <field name="copied" eval="False"/>
+    <field name="ttype">int</field>
+    <field name="depends">product_uom_qty</field>
+    <field name="compute">for rec in self:
+      rec['x_label_qty'] = 1
+    </field>
+  </record>
+
+</odoo>
+
+```
+Source: [snippets/ir_model.stock_move.x_label_qty.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/ir_model.stock_move.x_label_qty.xml)
+
 ### X Operation Qty  
 ID: `mint_system.ir_model.stock_move.x_operation_qty`  
 ```xml
@@ -2341,7 +2636,6 @@ ID: `mint_system.ir_model.stock_move.x_operation_qty`
 <odoo>
 
   <record id="x_operation_qty" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Inventory +/-</field>
     <field name="model">stock.move</field>
     <field name="model_id" ref="stock.model_stock_move"/>
@@ -2371,7 +2665,6 @@ ID: `mint_system.ir_model.stock_move.x_packaging_uom_id`
 <odoo>
 
   <record id="x_packaging_uom_id" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Mengeneinheit</field>
     <field name="model">product.packaging</field>
     <field name="model_id" ref="product.model_product_packaging"/>
@@ -2395,7 +2688,6 @@ ID: `mint_system.ir_model.stock_move.x_picking_partner_id`
 <odoo>
 
   <record id="x_picking_partner_id" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Lieferadresse</field>
     <field name="model">stock.move</field>
     <field name="model_id" ref="stock.model_stock_move"/>
@@ -2420,7 +2712,6 @@ ID: `mint_system.ir_model.stock_move.x_print_parent_only`
 <odoo>
 
   <record id="x_print_parent_only" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Nur übergeordnete Verpackung drucken</field>
     <field name="model">product.packaging</field>
     <field name="model_id" ref="product.model_product_packaging"/>
@@ -2443,7 +2734,6 @@ ID: `mint_system.ir_model.stock_move.x_print_without_parent`
 <odoo>
 
   <record id="x_print_without_parent" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Ohne übergeordnete Verpackung drucken</field>
     <field name="model">product.packaging</field>
     <field name="model_id" ref="product.model_product_packaging"/>
@@ -2466,7 +2756,6 @@ ID: `mint_system.ir_model.stock_move.x_scrap_id`
 <odoo>
 
   <record id="x_scrap_id" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Buchung Lagerschwund</field>
     <field name="model">product.packaging</field>
     <field name="model_id" ref="product.model_product_packaging"/>
@@ -2499,7 +2788,6 @@ ID: `mint_system.ir_model.stock_picking.x_autocomplete`
 <odoo>
 
   <record id="x_autocomplete" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Automatisch Erledigen</field>
     <field name="model">stock.picking</field>
     <field name="model_id" ref="stock.model_stock_picking"/>
@@ -2514,6 +2802,72 @@ ID: `mint_system.ir_model.stock_picking.x_autocomplete`
 ```
 Source: [snippets/ir_model.stock_picking.x_autocomplete.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/ir_model.stock_picking.x_autocomplete.xml)
 
+### X Client Order Ref  
+ID: `mint_system.ir_model.stock_picking.x_client_order_ref`  
+```xml
+<?xml version='1.0' encoding='UTF-8' ?>
+<odoo>
+
+  <record id="x_client_order_ref" model="ir.model.fields">
+    <field name="field_description">Bestellnummer Kunde</field>
+    <field name="model">stock.picking</field>
+    <field name="model_id" ref="stock.model_stock_picking"/>
+    <field name="name">x_client_order_ref</field>
+    <field name="store" eval="True"/>
+    <field name="readonly" eval="True"/>
+    <field name="copied" eval="False"/>
+    <field name="ttype">char</field> 
+    <field name="related">sale_id.client_order_ref</field>
+  </record>
+
+</odoo>
+```
+Source: [snippets/ir_model.stock_picking.x_client_order_ref.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/ir_model.stock_picking.x_client_order_ref.xml)
+
+### X Date Order  
+ID: `mint_system.ir_model.stock_picking.x_date_order`  
+```xml
+<?xml version='1.0' encoding='UTF-8' ?>
+<odoo>
+
+  <record id="x_date_order" model="ir.model.fields">
+    <field name="field_description">Bestelldatum</field>
+    <field name="model">stock.picking</field>
+    <field name="model_id" ref="stock.model_stock_picking"/>
+    <field name="name">x_date_order</field>
+    <field name="store" eval="True"/>
+    <field name="readonly" eval="True"/>
+    <field name="copied" eval="False"/>
+    <field name="ttype">datetime</field> 
+    <field name="related">sale_id.date_order</field>
+  </record>
+
+</odoo>
+```
+Source: [snippets/ir_model.stock_picking.x_date_order.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/ir_model.stock_picking.x_date_order.xml)
+
+### X Vst  
+ID: `mint_system.ir_model.stock_picking.x_vst`  
+```xml
+<?xml version='1.0' encoding='UTF-8' ?>
+<odoo>
+
+  <record id="x_vst" model="ir.model.fields">
+    <field name="field_description">VST</field>
+    <field name="model">stock.picking</field>
+    <field name="model_id" ref="stock.model_stock_picking"/>
+    <field name="name">x_vst</field>
+    <field name="store" eval="True"/>
+    <field name="readonly" eval="True"/>
+    <field name="copied" eval="False"/>
+    <field name="ttype">char</field> 
+    <field name="related">sale_id.x_vst</field>
+  </record>
+
+</odoo>
+```
+Source: [snippets/ir_model.stock_picking.x_vst.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/ir_model.stock_picking.x_vst.xml)
+
 ## Stock Production Lot  
 ### X Autoremove  
 ID: `mint_system.ir_model.stock_production_lot.x_autoremove`  
@@ -2543,7 +2897,6 @@ ID: `mint_system.ir_model.stock_production_lot.x_production_ids`
 <odoo>
 
   <record id="x_production_ids" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Fertigungsaufträge</field>
     <field name="model">stock.production.lot</field>
     <field name="model_id" ref="stock.model_stock_production_lot"/>
@@ -2567,7 +2920,6 @@ ID: `mint_system.ir_model.stock_production_lot.x_production_id`
 <odoo>
 
   <record id="x_production_id" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Fertigungsauftrag</field>
     <field name="model">stock.production.lot</field>
     <field name="model_id" ref="stock.model_stock_production_lot"/>
@@ -2596,7 +2948,6 @@ ID: `mint_system.ir_model.stock_production_lot.x_weight_uom`
 <odoo>
 
   <record id="x_weight_uom" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Nettogewicht [kg]</field>
     <field name="model">stock.production.lot</field>
     <field name="model_id" ref="stock.model_stock_production_lot"/>
@@ -2616,6 +2967,29 @@ ID: `mint_system.ir_model.stock_production_lot.x_weight_uom`
 Source: [snippets/ir_model.stock_production_lot.x_weight_uom.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/ir_model.stock_production_lot.x_weight_uom.xml)
 
 ## Stock Quant  
+### X Expiration Date  
+ID: `mint_system.ir_model.stock_quant.x_expiration_date`  
+```xml
+<?xml version='1.0' encoding='UTF-8' ?>
+<odoo>
+
+  <record id="x_expiration_date" model="ir.model.fields">
+    <field name="field_description">Ablaufdatum</field>
+    <field name="model">stock.quant</field>
+    <field name="model_id" ref="stock.model_stock_quant"/>
+    <field name="name">x_expiration_date</field>
+    <field name="store" eval="True"/>
+    <field name="readonly" eval="True"/>
+    <field name="copied" eval="False"/>
+    <field name="ttype">datetime</field>
+    <field name="relation">stock.lot</field>
+    <field name="related">lot_id.x_expiration_date</field>
+  </record>
+
+</odoo>
+```
+Source: [snippets/ir_model.stock_quant.x_expiration_date.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/ir_model.stock_quant.x_expiration_date.xml)
+
 ### X Last Delivery Partner Id  
 ID: `mint_system.ir_model.stock_quant.x_last_delivery_partner_id`  
 ```xml
@@ -2623,7 +2997,6 @@ ID: `mint_system.ir_model.stock_quant.x_last_delivery_partner_id`
 <odoo>
 
   <record id="x_last_delivery_partner_id" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Lieferadresse</field>
     <field name="model">stock.quant</field>
     <field name="model_id" ref="stock.model_stock_quant"/>
@@ -2648,7 +3021,6 @@ ID: `mint_system.ir_model.stock_valuation_layer.x_quant_location_id`
 <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" />
diff --git a/snippets/ir_model.mrp_bom.x_note.xml b/snippets/ir_model.mrp_bom.x_note.xml
index b8ab3b21..bd4fccc4 100644
--- a/snippets/ir_model.mrp_bom.x_note.xml
+++ b/snippets/ir_model.mrp_bom.x_note.xml
@@ -2,7 +2,6 @@
 <odoo>
 
   <record id="x_note" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Notiz</field>
     <field name="model">mrp.bom</field>
     <field name="model_id" ref="mrp.model_mrp_bom"/>
diff --git a/snippets/ir_model.mrp_bom.x_type_description.xml b/snippets/ir_model.mrp_bom.x_type_description.xml
index 75e5ebb2..41288683 100644
--- a/snippets/ir_model.mrp_bom.x_type_description.xml
+++ b/snippets/ir_model.mrp_bom.x_type_description.xml
@@ -2,7 +2,6 @@
 <odoo>
 
   <record id="x_type_description" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Typenbezeichnung</field>
     <field name="model">mrp.bom</field>
     <field name="model_id" ref="mrp.model_mrp_bom"/>
diff --git a/snippets/ir_model.mrp_production.x_date_deadline.xml b/snippets/ir_model.mrp_production.x_date_deadline.xml
index 06590c1e..70ec5e7a 100644
--- a/snippets/ir_model.mrp_production.x_date_deadline.xml
+++ b/snippets/ir_model.mrp_production.x_date_deadline.xml
@@ -2,7 +2,6 @@
 <odoo>
 
   <record id="x_date_deadline" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Frist</field>
     <field name="model">mrp.production</field>
     <field name="model_id" ref="mrp.model_mrp_production"/>
diff --git a/snippets/ir_model.mrp_production.x_note.xml b/snippets/ir_model.mrp_production.x_note.xml
index fff258b5..8d474edd 100644
--- a/snippets/ir_model.mrp_production.x_note.xml
+++ b/snippets/ir_model.mrp_production.x_note.xml
@@ -2,7 +2,6 @@
 <odoo>
 
   <record id="x_note" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Notiz</field>
     <field name="model">mrp.production</field>
     <field name="model_id" ref="mrp.model_mrp_production"/>
diff --git a/snippets/ir_model.mrp_production.x_quality_check_ids.xml b/snippets/ir_model.mrp_production.x_quality_check_ids.xml
index aa04bea0..4c67ca43 100644
--- a/snippets/ir_model.mrp_production.x_quality_check_ids.xml
+++ b/snippets/ir_model.mrp_production.x_quality_check_ids.xml
@@ -2,7 +2,6 @@
 <odoo>
 
   <record id="x_quality_check_ids" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Qualitätsprüfungen</field>
     <field name="model">mrp.production</field>
     <field name="model_id" ref="mrp.model_mrp_production"/>
diff --git a/snippets/ir_model.mrp_workorder.x_reservation_state.xml b/snippets/ir_model.mrp_workorder.x_reservation_state.xml
index 1b765a04..f051c1d0 100644
--- a/snippets/ir_model.mrp_workorder.x_reservation_state.xml
+++ b/snippets/ir_model.mrp_workorder.x_reservation_state.xml
@@ -2,7 +2,6 @@
 <odoo>
 
   <record id="x_reservation_state" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Materialverfügbarkeit</field>
     <field name="model">mrp.workorder</field>
     <field name="model_id" ref="mrp.model_mrp_workorder"/>
diff --git a/snippets/ir_model.mrp_workorder.x_type_description.xml b/snippets/ir_model.mrp_workorder.x_type_description.xml
index f76bc8d0..54090f3d 100644
--- a/snippets/ir_model.mrp_workorder.x_type_description.xml
+++ b/snippets/ir_model.mrp_workorder.x_type_description.xml
@@ -2,7 +2,6 @@
 <odoo>
 
   <record id="x_type_description" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Typenbezeichnung</field>
     <field name="model">mrp.workorder</field>
     <field name="model_id" ref="mrp.model_mrp_workorder"/>
diff --git a/snippets/ir_model.mrp_workorder.x_type_description2.xml b/snippets/ir_model.mrp_workorder.x_type_description2.xml
index a5086f7a..90be555f 100644
--- a/snippets/ir_model.mrp_workorder.x_type_description2.xml
+++ b/snippets/ir_model.mrp_workorder.x_type_description2.xml
@@ -2,7 +2,6 @@
 <odoo>
 
   <record id="x_type_description2" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Typenbezeichnung 2</field>
     <field name="model">mrp.workorder</field>
     <field name="model_id" ref="mrp.model_mrp_workorder"/>
diff --git a/snippets/ir_model.product_category.x_relevant_for_certificate.xml b/snippets/ir_model.product_category.x_relevant_for_certificate.xml
index b5209c7b..4efdbd6f 100644
--- a/snippets/ir_model.product_category.x_relevant_for_certificate.xml
+++ b/snippets/ir_model.product_category.x_relevant_for_certificate.xml
@@ -2,7 +2,6 @@
 <odoo>
 
   <record id="x_relevant_for_certificate" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Für Werkszeugnis relevant</field>
     <field name="model">product.category</field>
     <field name="model_id" ref="product.product_category"/>
diff --git a/snippets/ir_model.product_packaging.x_description.xml b/snippets/ir_model.product_packaging.x_description.xml
index 3e065e6a..8a2a5dd2 100644
--- a/snippets/ir_model.product_packaging.x_description.xml
+++ b/snippets/ir_model.product_packaging.x_description.xml
@@ -2,7 +2,6 @@
 <odoo>
 
   <record id="x_description" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Beschreibung</field>
     <field name="model">product.packaging</field>
     <field name="model_id" ref="product.model_product_packaging"/>
diff --git a/snippets/ir_model.product_packaging.x_qty_description.xml b/snippets/ir_model.product_packaging.x_qty_description.xml
index b635073b..25d139bc 100644
--- a/snippets/ir_model.product_packaging.x_qty_description.xml
+++ b/snippets/ir_model.product_packaging.x_qty_description.xml
@@ -2,7 +2,6 @@
 <odoo>
 
   <record id="x_qty_description" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Label Gewicht</field>
     <field name="model">product.packaging</field>
     <field name="model_id" ref="product.model_product_packaging"/>
diff --git a/snippets/ir_model.product_set_line.x_categ_id.xml b/snippets/ir_model.product_set_line.x_categ_id.xml
index b075a0c5..2678d2f3 100644
--- a/snippets/ir_model.product_set_line.x_categ_id.xml
+++ b/snippets/ir_model.product_set_line.x_categ_id.xml
@@ -2,7 +2,6 @@
 <odoo>
 
   <record id="x_categ_id" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Produktkategorie</field>
     <field name="model">product.set.line</field>
     <field name="model_id" ref="product.model_product_set_line"/>
diff --git a/snippets/ir_model.product_template.x_calibre.xml b/snippets/ir_model.product_template.x_calibre.xml
index e8671894..87e89ee8 100644
--- a/snippets/ir_model.product_template.x_calibre.xml
+++ b/snippets/ir_model.product_template.x_calibre.xml
@@ -2,7 +2,6 @@
 <odoo>
 
   <record id="x_calibre" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Kaliber</field>
     <field name="model">product.template</field>
     <field name="model_id" ref="product.model_product_template"/>
diff --git a/snippets/ir_model.product_template.x_expiration_days.xml b/snippets/ir_model.product_template.x_expiration_days.xml
index 54e30cf2..93c45b74 100644
--- a/snippets/ir_model.product_template.x_expiration_days.xml
+++ b/snippets/ir_model.product_template.x_expiration_days.xml
@@ -2,7 +2,6 @@
 <odoo>
 
   <record id="x_expiration_days" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Haltbarkeit in Tagen</field>
     <field name="model">product.template</field>
     <field name="model_id" ref="product.model_product_template"/>
diff --git a/snippets/ir_model.product_template.x_hide_on_delivery.xml b/snippets/ir_model.product_template.x_hide_on_delivery.xml
index 479181a3..68c9903a 100644
--- a/snippets/ir_model.product_template.x_hide_on_delivery.xml
+++ b/snippets/ir_model.product_template.x_hide_on_delivery.xml
@@ -2,14 +2,13 @@
 <odoo>
 
   <record id="x_hide_on_delivery" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Auf Lieferschein ausblenden</field>
     <field name="model">product.template</field>
     <field name="model_id" ref="product.model_product_template"/>
     <field name="name">x_hide_on_delivery</field>
     <field name="store" eval="True"/>
     <field name="readonly" eval="False"/>
-    <field name="copied" eval="False"/>
+    <field name="copied" eval="True"/>
     <field name="ttype">boolean</field>
   </record>
 
diff --git a/snippets/ir_model.product_template.x_hide_on_invoice.xml b/snippets/ir_model.product_template.x_hide_on_invoice.xml
new file mode 100644
index 00000000..be36e02e
--- /dev/null
+++ b/snippets/ir_model.product_template.x_hide_on_invoice.xml
@@ -0,0 +1,15 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+<odoo>
+
+  <record id="x_hide_on_invoice" model="ir.model.fields">
+    <field name="field_description">Auf Rechnung ausblenden</field>
+    <field name="model">product.template</field>
+    <field name="model_id" ref="product.model_product_template"/>
+    <field name="name">x_hide_on_invoice</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.product_template.x_hide_on_sale_order.xml b/snippets/ir_model.product_template.x_hide_on_sale_order.xml
index 37e8f216..2a0f789d 100644
--- a/snippets/ir_model.product_template.x_hide_on_sale_order.xml
+++ b/snippets/ir_model.product_template.x_hide_on_sale_order.xml
@@ -2,7 +2,6 @@
 <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"/>
diff --git a/snippets/ir_model.product_template.x_product_label.xml b/snippets/ir_model.product_template.x_product_label.xml
index c0aef544..e8c930ae 100644
--- a/snippets/ir_model.product_template.x_product_label.xml
+++ b/snippets/ir_model.product_template.x_product_label.xml
@@ -14,7 +14,6 @@
     <field name="relation">ir.actions.report</field>
     <field name="group_expand" eval="False"/> 
     <field name="on_delete">Set NULL</field>
-    <field name="domain">[]</field>
   </record>
 
 </odoo>
diff --git a/snippets/ir_model.product_template.x_storage_temperature.xml b/snippets/ir_model.product_template.x_storage_temperature.xml
index 41f451cf..7f9e612d 100644
--- a/snippets/ir_model.product_template.x_storage_temperature.xml
+++ b/snippets/ir_model.product_template.x_storage_temperature.xml
@@ -2,7 +2,6 @@
 <odoo>
 
   <record id="x_storage_temperature" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Aufbewahrung bei</field>
     <field name="model">product.template</field>
     <field name="model_id" ref="product.model_product_template"/>
diff --git a/snippets/ir_model.product_template.x_warranty.xml b/snippets/ir_model.product_template.x_warranty.xml
index f74ca630..bd8a4e10 100644
--- a/snippets/ir_model.product_template.x_warranty.xml
+++ b/snippets/ir_model.product_template.x_warranty.xml
@@ -2,7 +2,6 @@
 <odoo>
 
   <record id="x_warranty" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Garantie</field>
     <field name="model">product.template</field>
     <field name="model_id" ref="product.model_product_template"/>
diff --git a/snippets/ir_model.product_template.x_xml_id.xml b/snippets/ir_model.product_template.x_xml_id.xml
index 35c0daea..7c4e5cbd 100644
--- a/snippets/ir_model.product_template.x_xml_id.xml
+++ b/snippets/ir_model.product_template.x_xml_id.xml
@@ -2,7 +2,6 @@
 <odoo>
 
   <record id="x_xml_id" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">External ID</field>
     <field name="model">product.template</field>
     <field name="model_id" ref="product.model_product_template"/>
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 875b35a2..a3a46e2b 100644
--- a/snippets/ir_model.project_task.x_business_requirement_id.xml
+++ b/snippets/ir_model.project_task.x_business_requirement_id.xml
@@ -2,7 +2,6 @@
 <odoo>
 
   <record id="x_business_requirement_id" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Business Requirement</field>
     <field name="model">project.task</field>
     <field name="model_id" ref="project.model_project_task"/>
diff --git a/snippets/ir_model.project_task.x_lead_id.xml b/snippets/ir_model.project_task.x_lead_id.xml
index f106a2d7..0b18ea19 100644
--- a/snippets/ir_model.project_task.x_lead_id.xml
+++ b/snippets/ir_model.project_task.x_lead_id.xml
@@ -2,7 +2,6 @@
 <odoo>
 
   <record id="x_lead_id" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Lead</field>
     <field name="model">project.task</field>
     <field name="model_id" ref="product.model_project_task"/>
diff --git a/snippets/ir_model.project_task.x_not_billable.xml b/snippets/ir_model.project_task.x_not_billable.xml
index b777a0a8..178bb56f 100644
--- a/snippets/ir_model.project_task.x_not_billable.xml
+++ b/snippets/ir_model.project_task.x_not_billable.xml
@@ -2,7 +2,6 @@
 <odoo>
 
   <record id="x_not_billable" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Nicht Verrechenbar</field>
     <field name="model">project.task</field>
     <field name="model_id" ref="product.model_project_task"/>
diff --git a/snippets/ir_model.project_task.x_systemname.xml b/snippets/ir_model.project_task.x_systemname.xml
index bcd41fb6..97759e90 100644
--- a/snippets/ir_model.project_task.x_systemname.xml
+++ b/snippets/ir_model.project_task.x_systemname.xml
@@ -2,7 +2,6 @@
 <odoo>
 
   <record id="x_systemname" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Benutzer</field>
     <field name="model">project.task</field>
     <field name="model_id" ref="project.model_project_task"/>
diff --git a/snippets/ir_model.project_task.x_user_text.xml b/snippets/ir_model.project_task.x_user_text.xml
index 718643f3..840ce165 100644
--- a/snippets/ir_model.project_task.x_user_text.xml
+++ b/snippets/ir_model.project_task.x_user_text.xml
@@ -2,7 +2,6 @@
 <odoo>
 
   <record id="x_user_text" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Benutzer</field>
     <field name="model">project.task</field>
     <field name="model_id" ref="project.model_project_task"/>
diff --git a/snippets/ir_model.project_task.x_vehicle_id.xml b/snippets/ir_model.project_task.x_vehicle_id.xml
index f8c60687..15acc753 100644
--- a/snippets/ir_model.project_task.x_vehicle_id.xml
+++ b/snippets/ir_model.project_task.x_vehicle_id.xml
@@ -2,7 +2,6 @@
 <odoo>
 
   <record id="x_vehicle_id" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Fahrzeug</field>
     <field name="model">project.task</field>
     <field name="model_id" ref="product.model_project_task"/>
diff --git a/snippets/ir_model.purchase_order.x_comment.xml b/snippets/ir_model.purchase_order.x_comment.xml
index c2990f1b..4f706b22 100644
--- a/snippets/ir_model.purchase_order.x_comment.xml
+++ b/snippets/ir_model.purchase_order.x_comment.xml
@@ -2,7 +2,6 @@
 <odoo>
 
   <record id="x_comment" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Kommentar</field>
     <field name="model">purchase.order</field>
     <field name="model_id" ref="purchase.model_purchase_order"/>
diff --git a/snippets/ir_model.purchase_order.x_payment_state.xml b/snippets/ir_model.purchase_order.x_payment_state.xml
new file mode 100644
index 00000000..0a347942
--- /dev/null
+++ b/snippets/ir_model.purchase_order.x_payment_state.xml
@@ -0,0 +1,35 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+<odoo>
+
+  <record id="x_payment_state" model="ir.model.fields">
+    <field name="field_description">Zahlungsstatus</field>
+    <field name="model">purchase.order</field>
+    <field name="model_id" ref="purchase.model_purchase_order"/>
+    <field name="name">x_payment_state</field>
+    <field name="store" eval="True"/>
+    <field name="readonly" eval="True"/>
+    <field name="copied" eval="False"/>
+    <field name="ttype">selection</field>
+    <field name="selection_id">[
+      {'value':'not_paid','name':'Nicht Bezahlt'},
+      {'value':'in_payment','name':'In Zahlung'},
+      {'value':'paid','name':'Bezahlt'},
+    ]</field>
+    <field name="depends">invoice_ids,invoice_ids.payment_state</field>
+    <field name="compute">for rec in self:
+      if rec.invoice_ids:
+        has_only_paid_invoices = all(rec.invoice_ids.mapped(lambda i: i.payment_state == 'paid'))
+        has_in_payment_invoices = any(rec.invoice_ids.mapped(lambda i: i.payment_state == 'in_payment'))
+        has_not_paid_invoices = any(rec.invoice_ids.mapped(lambda i: i.payment_state == 'not_paid'))
+      
+        if has_only_paid_invoices:
+          rec['x_payment_state'] = 'paid'
+        elif has_in_payment_invoices:
+          rec['x_payment_state'] = 'in_payment'
+        elif has_not_paid_invoices:
+          rec['x_payment_state'] = 'not_paid'
+      else:
+        rec['x_payment_state'] = 'not_paid' </field>
+  </record>
+
+</odoo>
diff --git a/snippets/ir_model.purchase_order.x_recurring_inverval.xml b/snippets/ir_model.purchase_order.x_recurring_inverval.xml
new file mode 100644
index 00000000..a5cd8fd7
--- /dev/null
+++ b/snippets/ir_model.purchase_order.x_recurring_inverval.xml
@@ -0,0 +1,21 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+<odoo>
+
+  <record id="x_recurring_inverval" model="ir.model.fields">
+    <field name="field_description">Vertragsintervall</field>
+    <field name="model">purchase.order</field>
+    <field name="model_id" ref="purchase.model_purchase_order"/>
+    <field name="name">x_recurring_inverval</field>
+    <field name="store" eval="True"/>
+    <field name="readonly" eval="False"/>
+    <field name="copied" eval="False"/>
+    <field name="ttype">selection</field>
+    <field name="selection_id">[
+      {'value':'daily','name':'Daily'},
+      {'value':'monthly','name':'Monthly'},
+      {'value':'quarterly','name':'Quarterly'},
+      {'value':'yearly','name':'Yearly'}
+    ]</field>
+  </record>
+
+</odoo>
diff --git a/snippets/ir_model.purchase_order_line.x_date_approve.xml b/snippets/ir_model.purchase_order_line.x_date_approve.xml
index 38d8bc7d..570e429b 100644
--- a/snippets/ir_model.purchase_order_line.x_date_approve.xml
+++ b/snippets/ir_model.purchase_order_line.x_date_approve.xml
@@ -2,7 +2,6 @@
 <odoo>
 
   <record id="x_date_approve" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Bestätigung am</field>
     <field name="model">purchase.order.line</field>
     <field name="model_id" ref="purchase.model_purchase_order_line"/>
diff --git a/snippets/ir_model.purchase_order_line.x_drawing_file.xml b/snippets/ir_model.purchase_order_line.x_drawing_file.xml
index bf5fe3f4..944d9274 100644
--- a/snippets/ir_model.purchase_order_line.x_drawing_file.xml
+++ b/snippets/ir_model.purchase_order_line.x_drawing_file.xml
@@ -2,7 +2,6 @@
 <odoo>
 
   <record id="x_drawing_file" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Zeichnung</field>
     <field name="model">purchase.order.line</field>
     <field name="model_id" ref="purchase.model_purchase_order_line"/>
diff --git a/snippets/ir_model.purchase_order_line.x_origin.xml b/snippets/ir_model.purchase_order_line.x_origin.xml
index 97106730..cebf9e7c 100644
--- a/snippets/ir_model.purchase_order_line.x_origin.xml
+++ b/snippets/ir_model.purchase_order_line.x_origin.xml
@@ -2,7 +2,6 @@
 <odoo>
 
   <record id="x_origin" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Referenzbeleg</field>
     <field name="model">purchase.order.line</field>
     <field name="model_id" ref="purchase.model_purchase_order_line"/>
diff --git a/snippets/ir_model.purchase_order_line.x_partner_ref.xml b/snippets/ir_model.purchase_order_line.x_partner_ref.xml
index 02ca2e33..8cddec3a 100644
--- a/snippets/ir_model.purchase_order_line.x_partner_ref.xml
+++ b/snippets/ir_model.purchase_order_line.x_partner_ref.xml
@@ -2,7 +2,6 @@
 <odoo>
 
   <record id="x_partner_ref" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Lieferantenreferenz</field>
     <field name="model">purchase.order.line</field>
     <field name="model_id" ref="purchase.model_purchase_order_line"/>
diff --git a/snippets/ir_model.purchase_order_line.x_state.xml b/snippets/ir_model.purchase_order_line.x_state.xml
index 1be81dcf..546edbea 100644
--- a/snippets/ir_model.purchase_order_line.x_state.xml
+++ b/snippets/ir_model.purchase_order_line.x_state.xml
@@ -2,7 +2,6 @@
 <odoo>
 
   <record id="x_state" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Status Bestellposition</field>
     <field name="model">purchase.order.line</field>
     <field name="model_id" ref="purchase.model_purchase_order_line"/>
diff --git a/snippets/ir_model.purchase_order_line.x_user_id.xml b/snippets/ir_model.purchase_order_line.x_user_id.xml
index 821c962b..ae3edfe9 100644
--- a/snippets/ir_model.purchase_order_line.x_user_id.xml
+++ b/snippets/ir_model.purchase_order_line.x_user_id.xml
@@ -2,7 +2,6 @@
 <odoo>
 
   <record id="x_user_id" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Einkaufsbeauftragter</field>
     <field name="model">purchase.order.line</field>
     <field name="model_id" ref="purchase.model_purchase_order_line"/>
diff --git a/snippets/ir_model.quality_check.x_active.xml b/snippets/ir_model.quality_check.x_active.xml
index dfb275eb..dcd40368 100644
--- a/snippets/ir_model.quality_check.x_active.xml
+++ b/snippets/ir_model.quality_check.x_active.xml
@@ -2,7 +2,6 @@
 <odoo>
 
   <record id="x_active" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Aktiv</field>
     <field name="model">quality.check</field>
     <field name="model_id" ref="quality.model_quality_check"/>
diff --git a/snippets/ir_model.res_partner.x_birthdate.xml b/snippets/ir_model.res_partner.x_birthdate.xml
index 819f0daa..17f26bf6 100644
--- a/snippets/ir_model.res_partner.x_birthdate.xml
+++ b/snippets/ir_model.res_partner.x_birthdate.xml
@@ -2,10 +2,9 @@
 <odoo>
 
   <record id="x_birthdate" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Geburtstag</field>
     <field name="model">res.partner</field>
-    <field name="model_id" ref="base.model_res_partnee"/>
+    <field name="model_id" ref="base.model_res_partner"/>
     <field name="name">x_birthdate</field>
     <field name="store" eval="True"/>
     <field name="readonly" eval="False"/>
diff --git a/snippets/ir_model.res_partner.x_created_on.xml b/snippets/ir_model.res_partner.x_created_on.xml
index 3917bfbb..205ef24d 100644
--- a/snippets/ir_model.res_partner.x_created_on.xml
+++ b/snippets/ir_model.res_partner.x_created_on.xml
@@ -2,7 +2,6 @@
 <odoo>
 
   <record id="x_created_on" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Erstellt am</field>
     <field name="model">res.partner</field>
     <field name="model_id" ref="base.model_res_partnee"/>
diff --git a/snippets/ir_model.res_partner.x_eori.xml b/snippets/ir_model.res_partner.x_eori.xml
new file mode 100644
index 00000000..899935e9
--- /dev/null
+++ b/snippets/ir_model.res_partner.x_eori.xml
@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+<odoo>
+
+  <record id="x_eori" model="ir.model.fields">
+    <field name="domain">[]</field>
+    <field name="field_description">EORI</field>
+    <field name="model">res.partner</field>
+    <field name="model_id" ref="base.model_res_partner"/>
+    <field name="name">x_eori</field>
+    <field name="store" eval="True"/>
+    <field name="readonly" eval="False"/>
+    <field name="copied" eval="False"/>
+    <field name="ttype">char</field>
+  </record>
+
+</odoo>
\ No newline at end of file
diff --git a/snippets/ir_model.res_partner.x_external_ref.xml b/snippets/ir_model.res_partner.x_external_ref.xml
index b66a1aa6..6c5774a5 100644
--- a/snippets/ir_model.res_partner.x_external_ref.xml
+++ b/snippets/ir_model.res_partner.x_external_ref.xml
@@ -2,7 +2,6 @@
 <odoo>
 
   <record id="x_external_ref" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Externe Referenz</field>
     <field name="model">res.partner</field>
     <field name="model_id" ref="base.model_res_partner"/>
diff --git a/snippets/ir_model.res_partner.x_first_sale_date.xml b/snippets/ir_model.res_partner.x_first_sale_date.xml
new file mode 100644
index 00000000..7ad7b593
--- /dev/null
+++ b/snippets/ir_model.res_partner.x_first_sale_date.xml
@@ -0,0 +1,23 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+<odoo>
+
+  <record id="x_first_sale_date" model="ir.model.fields">
+    <field name="field_description">Erstes Verkaufsdatum</field>
+    <field name="model">res.partner</field>
+    <field name="model_id" ref="base.model_res_partnee"/>
+    <field name="name">x_first_sale_date</field>
+    <field name="store" eval="True"/>
+    <field name="readonly" eval="True"/>
+    <field name="copied" eval="False"/>
+    <field name="ttype">date</field>
+    <field name="depends">sale_order_ids</field>
+    <field name="compute">for rec in self:
+      first_sale_order = rec.sale_order_ids.filtered(lambda s: s.state == 'sale').sorted('date_order')[:1]
+      if first_sale_order:
+        rec['x_first_sale_date'] = first_sale_order.date_order
+      else:
+        rec['x_first_sale_date'] = False
+    </field>
+  </record>
+
+</odoo>
diff --git a/snippets/ir_model.res_partner.x_global_location_number.xml b/snippets/ir_model.res_partner.x_global_location_number.xml
new file mode 100644
index 00000000..48861bd6
--- /dev/null
+++ b/snippets/ir_model.res_partner.x_global_location_number.xml
@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+<odoo>
+
+  <record id="x_global_location_number" model="ir.model.fields">
+    <field name="domain">[]</field>
+    <field name="field_description">VSTGLN</field>
+    <field name="model">res.partner</field>
+    <field name="model_id" ref="base.model_res_partner"/>
+    <field name="name">x_global_location_number</field>
+    <field name="store" eval="True"/>
+    <field name="readonly" eval="False"/>
+    <field name="copied" eval="False"/>
+    <field name="ttype">char</field>
+  </record>
+
+</odoo>
\ No newline at end of file
diff --git a/snippets/ir_model.res_partner.x_packaging_ref.xml b/snippets/ir_model.res_partner.x_packaging_ref.xml
index 6b0194d7..5b71015a 100644
--- a/snippets/ir_model.res_partner.x_packaging_ref.xml
+++ b/snippets/ir_model.res_partner.x_packaging_ref.xml
@@ -2,7 +2,6 @@
 <odoo>
 
   <record id="x_packaging_ref" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Verpackungsreferenz</field>
     <field name="model">res.partner</field>
     <field name="model_id" ref="base.model_res_partner"/>
diff --git a/snippets/ir_model.res_partner.x_privacy_visibility.xml b/snippets/ir_model.res_partner.x_privacy_visibility.xml
new file mode 100644
index 00000000..216645da
--- /dev/null
+++ b/snippets/ir_model.res_partner.x_privacy_visibility.xml
@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+<odoo>
+
+  <record id="x_privacy_visibility" model="ir.model.fields">
+    <field name="domain">[]</field>
+    <field name="field_description">Sichtbarkeit</field>
+    <field name="model">res.partner</field>
+    <field name="model_id" ref="base.model_res_partner"/>
+    <field name="name">x_privacy_visibility</field>
+    <field name="store" eval="True"/>
+    <field name="readonly" eval="False"/>
+    <field name="copied" eval="True"/>
+    <field name="ttype">boolean</field>
+  </record>
+
+</odoo>
\ No newline at end of file
diff --git a/snippets/ir_model.res_partner.x_stock_move_ids.xml b/snippets/ir_model.res_partner.x_stock_move_ids.xml
index baa76b68..9103ada9 100644
--- a/snippets/ir_model.res_partner.x_stock_move_ids.xml
+++ b/snippets/ir_model.res_partner.x_stock_move_ids.xml
@@ -2,7 +2,6 @@
 <odoo>
 
   <record id="x_stock_move_ids" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Lagerbuchungen</field>
     <field name="model">res.partner</field>
     <field name="model_id" ref="base.model_res_partner"/>
diff --git a/snippets/ir_model.res_partner.x_vst.xml b/snippets/ir_model.res_partner.x_vst.xml
new file mode 100644
index 00000000..79b4c29b
--- /dev/null
+++ b/snippets/ir_model.res_partner.x_vst.xml
@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+<odoo>
+
+  <record id="x_vst" model="ir.model.fields">
+    <field name="domain">[]</field>
+    <field name="field_description">VST</field>
+    <field name="model">res.partner</field>
+    <field name="model_id" ref="base.model_res_partner"/>
+    <field name="name">x_vst</field>
+    <field name="store" eval="True"/>
+    <field name="readonly" eval="False"/>
+    <field name="copied" eval="False"/>
+    <field name="ttype">char</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
index 7556bb43..df357597 100644
--- 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
@@ -2,7 +2,6 @@
 <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"/>
diff --git a/snippets/ir_model.sale_order.x_as4import.xml b/snippets/ir_model.sale_order.x_as4import.xml
new file mode 100644
index 00000000..30768c3d
--- /dev/null
+++ b/snippets/ir_model.sale_order.x_as4import.xml
@@ -0,0 +1,15 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+<odoo>
+
+  <record id="x_as4import" model="ir.model.fields">
+    <field name="field_description">AS4 Import</field>
+    <field name="model">sale.order</field>
+    <field name="model_id" ref="sale.model_sale_order"/>
+    <field name="name">x_as4import</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.sale_order.x_client_project_ref.xml b/snippets/ir_model.sale_order.x_client_project_ref.xml
index 319ac0dd..5bda0ec9 100644
--- a/snippets/ir_model.sale_order.x_client_project_ref.xml
+++ b/snippets/ir_model.sale_order.x_client_project_ref.xml
@@ -2,7 +2,6 @@
 <odoo>
 
   <record id="x_client_project_ref" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Projektnummer Kunde</field>
     <field name="model">sale.order</field>
     <field name="model_id" ref="sale.model_sale_order"/>
diff --git a/snippets/ir_model.sale_order.x_incoterm_blanket_order.xml b/snippets/ir_model.sale_order.x_incoterm_blanket_order.xml
index 9af88f2d..2ff26ab0 100644
--- a/snippets/ir_model.sale_order.x_incoterm_blanket_order.xml
+++ b/snippets/ir_model.sale_order.x_incoterm_blanket_order.xml
@@ -2,7 +2,6 @@
 <odoo>
 
   <record id="x_incoterm_blanket_order" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Incoterm Rahmenauftrag</field>
     <field name="model">sale.order</field>
     <field name="model_id" ref="sale.model_sale_order"/>
diff --git a/snippets/ir_model.sale_order.x_industry_id.xml b/snippets/ir_model.sale_order.x_industry_id.xml
new file mode 100644
index 00000000..edc02042
--- /dev/null
+++ b/snippets/ir_model.sale_order.x_industry_id.xml
@@ -0,0 +1,17 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+<odoo>
+
+  <record id="x_industry_id" model="ir.model.fields">
+    <field name="field_description">Branche</field>
+    <field name="model">sale.order</field>
+    <field name="model_id" ref="sale.model_sale_order_line"/>
+    <field name="name">x_industry_id</field>
+    <field name="store" eval="True"/>
+    <field name="readonly" eval="True"/>
+    <field name="copied" eval="False"/>
+    <field name="ttype">char</field>
+    <field name="related">partner_id.industry_id.name</field>
+  </record>
+
+</odoo>
+
diff --git a/snippets/ir_model.sale_order.x_order_number.xml b/snippets/ir_model.sale_order.x_order_number.xml
new file mode 100644
index 00000000..076e52ca
--- /dev/null
+++ b/snippets/ir_model.sale_order.x_order_number.xml
@@ -0,0 +1,15 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+<odoo>
+
+  <record id="x_order_number" model="ir.model.fields">
+    <field name="field_description">Bestellnummer Kunde</field>
+    <field name="model">sale.order</field>
+    <field name="model_id" ref="sale.model_sale_order"/>
+    <field name="name">x_order_number</field>
+    <field name="store" eval="True"/>
+    <field name="readonly" eval="False"/>
+    <field name="copied" eval="True"/>
+    <field name="ttype">Char</field>
+  </record>
+
+</odoo>
diff --git a/snippets/ir_model.sale_order.x_payment_state.xml b/snippets/ir_model.sale_order.x_payment_state.xml
new file mode 100644
index 00000000..f000c1b9
--- /dev/null
+++ b/snippets/ir_model.sale_order.x_payment_state.xml
@@ -0,0 +1,35 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+<odoo>
+
+  <record id="x_payment_state" model="ir.model.fields">
+    <field name="field_description">Zahlungsstatus</field>
+    <field name="model">sale.order</field>
+    <field name="model_id" ref="sale.model_sale_order"/>
+    <field name="name">x_payment_state</field>
+    <field name="store" eval="True"/>
+    <field name="readonly" eval="True"/>
+    <field name="copied" eval="False"/>
+    <field name="ttype">selection</field>
+    <field name="selection_id">[
+      {'value':'not_paid','name':'Nicht Bezahlt'},
+      {'value':'in_payment','name':'In Zahlung'},
+      {'value':'paid','name':'Bezahlt'},
+    ]</field>
+    <field name="depends">invoice_ids,invoice_ids.payment_state</field>
+    <field name="compute">for rec in self:
+      if rec.invoice_ids:
+        has_only_paid_invoices = all(rec.invoice_ids.mapped(lambda i: i.payment_state == 'paid'))
+        has_in_payment_invoices = any(rec.invoice_ids.mapped(lambda i: i.payment_state == 'in_payment'))
+        has_not_paid_invoices = any(rec.invoice_ids.mapped(lambda i: i.payment_state == 'not_paid'))
+      
+        if has_only_paid_invoices:
+          rec['x_payment_state'] = 'paid'
+        elif has_in_payment_invoices:
+          rec['x_payment_state'] = 'in_payment'
+        elif has_not_paid_invoices:
+          rec['x_payment_state'] = 'not_paid'
+      else:
+        rec['x_payment_state'] = 'not_paid' </field>
+  </record>
+
+</odoo>
diff --git a/snippets/ir_model.sale_order.x_payment_term_blanket_order.xml b/snippets/ir_model.sale_order.x_payment_term_blanket_order.xml
new file mode 100644
index 00000000..91f7c8a0
--- /dev/null
+++ b/snippets/ir_model.sale_order.x_payment_term_blanket_order.xml
@@ -0,0 +1,17 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+<odoo>
+
+  <record id="x_payment_term_blanket_order" model="ir.model.fields">
+    <field name="field_description">Zahlungsbedingungen Rahmenauftrag</field>
+    <field name="model">sale.order</field>
+    <field name="model_id" ref="sale.model_sale_order"/>
+    <field name="name">x_payment_term_blanket_order</field>
+    <field name="store" eval="False"/>
+    <field name="readonly" eval="True"/>
+    <field name="copied" eval="False"/>
+    <field name="ttype">many2one</field>
+    <field name="relation">account.payment.terms</field>
+    <field name="related">order_line.blanket_order_line.order_id.payment_term_id</field>
+  </record>
+
+</odoo>
diff --git a/snippets/ir_model.sale_order.x_product_uom_qty.xml b/snippets/ir_model.sale_order.x_product_uom_qty.xml
index eaee9fa4..57159850 100644
--- a/snippets/ir_model.sale_order.x_product_uom_qty.xml
+++ b/snippets/ir_model.sale_order.x_product_uom_qty.xml
@@ -2,7 +2,6 @@
 <odoo>
 
   <record id="x_product_uom_qty" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Gesamtmenge</field>
     <field name="model">sale.order</field>
     <field name="model_id" ref="sale.model_sale_order"/>
diff --git a/snippets/ir_model.sale_order.x_studio_description.xml b/snippets/ir_model.sale_order.x_studio_description.xml
index a70601af..271d5a63 100644
--- a/snippets/ir_model.sale_order.x_studio_description.xml
+++ b/snippets/ir_model.sale_order.x_studio_description.xml
@@ -2,7 +2,6 @@
 <odoo>
 
   <record id="x_studio_description" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Beschreibung Verkausauftrag</field>
     <field name="model">sale.order</field>
     <field name="model_id" ref="sale.model_sale_order"/>
diff --git a/snippets/ir_model.sale_order_line.x_client_order_ref.xml b/snippets/ir_model.sale_order_line.x_client_order_ref.xml
index d1b68031..6c65533a 100644
--- a/snippets/ir_model.sale_order_line.x_client_order_ref.xml
+++ b/snippets/ir_model.sale_order_line.x_client_order_ref.xml
@@ -2,7 +2,6 @@
 <odoo>
 
   <record id="x_client_order_ref" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Kundenreferenz</field>
     <field name="model">sale.order.line</field>
     <field name="model_id" ref="sale.model_sale_order_line"/>
diff --git a/snippets/ir_model.sale_order_line.x_commitment_date.xml b/snippets/ir_model.sale_order_line.x_commitment_date.xml
index c60bca9d..bce45808 100644
--- a/snippets/ir_model.sale_order_line.x_commitment_date.xml
+++ b/snippets/ir_model.sale_order_line.x_commitment_date.xml
@@ -2,7 +2,6 @@
 <odoo>
 
   <record id="x_commitment_date" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Lieferdatum</field>
     <field name="model">sale.order.line</field>
     <field name="model_id" ref="sale.model_sale_order_line"/>
diff --git a/snippets/ir_model.sale_order_line.x_date_order.xml b/snippets/ir_model.sale_order_line.x_date_order.xml
index 8cdda81f..016d58f7 100644
--- a/snippets/ir_model.sale_order_line.x_date_order.xml
+++ b/snippets/ir_model.sale_order_line.x_date_order.xml
@@ -2,7 +2,6 @@
 <odoo>
 
   <record id="x_date_order" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Auftragsdatum</field>
     <field name="model">sale.order.line</field>
     <field name="model_id" ref="sale.model_sale_order_line"/>
diff --git a/snippets/ir_model.sale_order_line.x_drawing_file.xml b/snippets/ir_model.sale_order_line.x_drawing_file.xml
index 228d23cf..3241a6c4 100644
--- a/snippets/ir_model.sale_order_line.x_drawing_file.xml
+++ b/snippets/ir_model.sale_order_line.x_drawing_file.xml
@@ -2,7 +2,6 @@
 <odoo>
 
   <record id="x_drawing_file" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Zeichnung</field>
     <field name="model">sale.order.line</field>
     <field name="model_id" ref="sale.model_sale_order_line"/>
diff --git a/snippets/ir_model.sale_order_line.x_industry_id.xml b/snippets/ir_model.sale_order_line.x_industry_id.xml
index 30e427d1..b53c5560 100644
--- a/snippets/ir_model.sale_order_line.x_industry_id.xml
+++ b/snippets/ir_model.sale_order_line.x_industry_id.xml
@@ -2,7 +2,6 @@
 <odoo>
 
   <record id="x_industry_id" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Branche</field>
     <field name="model">sale.order.line</field>
     <field name="model_id" ref="sale.model_sale_order_line"/>
diff --git a/snippets/ir_model.sale_order_line.x_margin_percent.xml b/snippets/ir_model.sale_order_line.x_margin_percent.xml
index b6fa0b2a..bb75c244 100644
--- a/snippets/ir_model.sale_order_line.x_margin_percent.xml
+++ b/snippets/ir_model.sale_order_line.x_margin_percent.xml
@@ -2,7 +2,6 @@
 <odoo>
 
   <record id="x_margin_percent" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Marge (%)</field>
     <field name="help">Marge Aufschlagsrechnung</field>
     <field name="model">sale.order.line</field>
diff --git a/snippets/ir_model.sale_order_line.x_pricelist_id.xml b/snippets/ir_model.sale_order_line.x_pricelist_id.xml
index 947e4dec..ffbca49f 100644
--- a/snippets/ir_model.sale_order_line.x_pricelist_id.xml
+++ b/snippets/ir_model.sale_order_line.x_pricelist_id.xml
@@ -2,7 +2,6 @@
 <odoo>
 
   <record id="x_pricelist_id" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Preisliste</field>
     <field name="model">sale.order.line</field>
     <field name="model_id" ref="sale.model_sale_order_line"/>
diff --git a/snippets/ir_model.sale_order_line.x_service_policy.xml b/snippets/ir_model.sale_order_line.x_service_policy.xml
index b14858e2..e4f0adc6 100644
--- a/snippets/ir_model.sale_order_line.x_service_policy.xml
+++ b/snippets/ir_model.sale_order_line.x_service_policy.xml
@@ -2,7 +2,6 @@
 <odoo>
 
   <record id="x_service_policy" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Faktierungsregel</field>
     <field name="model">sale.order.line</field>
     <field name="model_id" ref="sale.model_sale_order_line"/>
diff --git a/snippets/ir_model.sale_order_line.x_service_tracking.xml b/snippets/ir_model.sale_order_line.x_service_tracking.xml
index ca82407f..afa93027 100644
--- a/snippets/ir_model.sale_order_line.x_service_tracking.xml
+++ b/snippets/ir_model.sale_order_line.x_service_tracking.xml
@@ -2,7 +2,6 @@
 <odoo>
 
   <record id="x_service_tracking" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Dienstverfolgung</field>
     <field name="model">sale.order.line</field>
     <field name="model_id" ref="sale.model_sale_order_line"/>
diff --git a/snippets/ir_model.sale_order_line.x_state.xml b/snippets/ir_model.sale_order_line.x_state.xml
index e0cb34ad..a315cb2d 100644
--- a/snippets/ir_model.sale_order_line.x_state.xml
+++ b/snippets/ir_model.sale_order_line.x_state.xml
@@ -2,7 +2,6 @@
 <odoo>
 
   <record id="x_state" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Status Auftragsposition</field>
     <field name="model">sale.order.line</field>
     <field name="model_id" ref="sale.model_sale_order_line"/>
diff --git a/snippets/ir_model.sale_order_line.x_taxed_amount.xml b/snippets/ir_model.sale_order_line.x_taxed_amount.xml
index 8601246f..9db24cd7 100644
--- a/snippets/ir_model.sale_order_line.x_taxed_amount.xml
+++ b/snippets/ir_model.sale_order_line.x_taxed_amount.xml
@@ -2,7 +2,6 @@
 <odoo>
 
   <record id="x_taxed_amount" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Total inkl. MWST</field>
     <field name="model">sale.order.line</field>
     <field name="model_id" ref="sale.model_sale_order_line"/>
diff --git a/snippets/ir_model.sale_order_line.x_taxed_amount_invoiced.xml b/snippets/ir_model.sale_order_line.x_taxed_amount_invoiced.xml
index 0b28e9a2..718e9d53 100644
--- a/snippets/ir_model.sale_order_line.x_taxed_amount_invoiced.xml
+++ b/snippets/ir_model.sale_order_line.x_taxed_amount_invoiced.xml
@@ -2,7 +2,6 @@
 <odoo>
 
   <record id="x_taxed_amount_invoiced" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Rechnungsbetrag inkl. MWST</field>
     <field name="model">sale.order.line</field>
     <field name="model_id" ref="sale.model_sale_order_line"/>
diff --git a/snippets/ir_model.sale_order_line.x_untaxed_amount.xml b/snippets/ir_model.sale_order_line.x_untaxed_amount.xml
index 19de9d27..3c27fb17 100644
--- a/snippets/ir_model.sale_order_line.x_untaxed_amount.xml
+++ b/snippets/ir_model.sale_order_line.x_untaxed_amount.xml
@@ -2,7 +2,6 @@
 <odoo>
 
   <record id="x_untaxed_amount" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Total exkl. MWST</field>
     <field name="model">sale.order.line</field>
     <field name="model_id" ref="sale.model_sale_order_line"/>
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 8662dce2..fdba586f 100644
--- a/snippets/ir_model.sale_order_line.x_weight_delivered.xml
+++ b/snippets/ir_model.sale_order_line.x_weight_delivered.xml
@@ -2,7 +2,6 @@
 <odoo>
 
   <record id="x_weight_delivered" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Geliefertes Gewicht</field>
     <field name="model">sale.order.line</field>
     <field name="model_id" ref="sale.model_sale_order_line" />
diff --git a/snippets/ir_model.stock_location.x_should_be_valued.xml b/snippets/ir_model.stock_location.x_should_be_valued.xml
index 19258aa4..0916d7f8 100644
--- a/snippets/ir_model.stock_location.x_should_be_valued.xml
+++ b/snippets/ir_model.stock_location.x_should_be_valued.xml
@@ -2,7 +2,6 @@
 <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"/>
diff --git a/snippets/ir_model.stock_move.x_count_boxes.xml b/snippets/ir_model.stock_move.x_count_boxes.xml
index 53f19b9f..cf40d31d 100644
--- a/snippets/ir_model.stock_move.x_count_boxes.xml
+++ b/snippets/ir_model.stock_move.x_count_boxes.xml
@@ -1,63 +1,31 @@
 <?xml version='1.0' encoding='UTF-8' ?>
 <odoo>
 
-  <record id="x_count_boxes" model="ir.model.fields">
-    <field name="domain">[]</field>
-    <field name="field_description">Anzahl Kisten</field>
-    <field name="model">stock.move</field>
-    <field name="model_id" ref="stock.model_stock_move"/>
-    <field name="name">x_count_boxes</field>
-    <field name="store" eval="True"/>
-    <field name="readonly" eval="True"/>
-    <field name="copied" eval="False"/>
-    <field name="ttype">int</field>
-    <field name="depends">quantity_done</field>
-    <field name="compute"># Count the number of packaging boxes
-for rec in self:
-    rec['x_count_boxes'] = 0
-    if rec.product_packaging:
-        
-        # Get picking delivery product name
-        delivery_name = rec.picking_id.carrier_id.product_id.name
-    
-        # Calculate the number of boxes depending on the selected packaging
-    
-        if rec.product_packaging.name == "Schale Gross":
-            rec['x_count_boxes'] = (rec.quantity_done/4 + 2.4)/2.5
-            
-        elif rec.product_packaging.name == "Schale Klein":
-            rec['x_count_boxes'] = (rec.quantity_done/6 + 0.9)/1
-            
-        elif rec.product_packaging.name == "Vakuum Gross":
-            rec['x_count_boxes'] = (rec.quantity_done/4 + 2.4)/2.5
-            
-        elif rec.product_packaging.name == "Aktionären Gutschein":
-            rec['x_count_boxes'] = ((rec.quantity_done + 9)/20)
-            
-        elif rec.product_packaging.name == "Vakuum Klein":
-            if rec.product_id.id == 68: # Filet mit Haut TK
-                rec['x_count_boxes'] = (rec.product_uom_qty + 9)/10
-            elif rec.product_id.id == 74: # Filet mit Haut V-Schnitt Tiefgekühlt
-                rec['x_count_boxes'] = (rec.product_uom_qty + 9)/20
-            else:
-                rec['x_count_boxes'] = (rec.quantity_done/8 + 0.9)/1
+    <record id="x_count_boxes" model="ir.model.fields">
+        <field name="field_description">Anzahl Kisten</field>
+        <field name="help">Count the number of packaging boxes.</field>
+        <field name="model">stock.move</field>
+        <field name="model_id" ref="stock.model_stock_move"/>
+        <field name="name">x_count_boxes</field>
+        <field name="store" eval="True"/>
+        <field name="readonly" eval="True"/>
+        <field name="copied" eval="False"/>
+        <field name="ttype">int</field>
+        <field name="depends">quantity_done,product_packaging</field>
+        <field name="compute">for rec in self:
+            rec['x_count_boxes'] = 0
+            if rec.product_packaging and rec.product_packaging.qty:
+              product_qty = rec.product_packaging.qty
+              count_boxes = rec.quantity_done / product_qty
+              
+              rec['x_count_boxes'] = int(-(-count_boxes // 1))
+              
+              if rec.product_packaging.parent_packaging and rec.product_packaging.parent_packaging.qty:
+                parent_qty = rec.product_packaging.parent_packaging.qty
+                count_boxes = rec.quantity_done / parent_qty
                 
-        elif rec.product_packaging.name == "Karton":
-            rec['x_count_boxes'] = rec.quantity_done/rec.product_packaging.qty
-            
-            if rec.product_packaging.parent_packaging and rec.product_packaging.parent_packaging.qty:
-              rec['x_count_boxes'] = rec.quantity_done/rec.product_packaging.parent_packaging.qty
-            
-        elif rec.product_packaging.name == "Kiste":
-            if rec.product_id.id == 68: # Filet mit Haut TK
-                rec['x_count_boxes'] = (rec.product_uom_qty + 9)/10
-            elif rec.product_id.id == 51: # Kopf / Backen
-                rec['x_count_boxes'] = (rec.product_uom_qty + 99)/100
-            elif rec.product_id.id == 33: # Filet mit Haut
-                rec['x_count_boxes'] = (rec.product_uom_qty + 9)/10
-            else:
-                rec['x_count_boxes'] = (rec.product_uom_qty + 14)/15
-    </field>
-  </record>
-
+                rec['x_count_boxes'] = int(-(-count_boxes // 1))
+        </field>
+    </record>
+    
 </odoo>
diff --git a/snippets/ir_model.stock_move.x_count_packaging.xml b/snippets/ir_model.stock_move.x_count_packaging.xml
index 64750787..8efaa8e2 100644
--- a/snippets/ir_model.stock_move.x_count_packaging.xml
+++ b/snippets/ir_model.stock_move.x_count_packaging.xml
@@ -2,8 +2,8 @@
 <odoo>
 
   <record id="x_count_packaging" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Anzahl Verpackungen</field>
+    <field name="help">Counts the number of packages for dispaying in on the picking report.</field>
     <field name="model">stock.move</field>
     <field name="model_id" ref="stock.model_stock_move"/>
     <field name="name">x_count_packaging</field>
@@ -12,15 +12,9 @@
     <field name="copied" eval="False"/>
     <field name="ttype">int</field>
     <field name="depends">product_uom_qty</field>
-    <field name="compute"># Counts the number of packages for dispaying in on the picking report
-      for rec in self:
-        if rec.product_packaging:
-          if rec.product_packaging.name == "Kiste":
-            rec['x_count_packaging'] = (rec.product_uom_qty + 14)/15
-          if rec.product_packaging.name == "Schale Gross":
-            rec['x_count_packaging'] = (rec.product_uom_qty + 2.4)/2.5
-          if rec.product_packaging.name in ["Vakuum", "Schale Klein", "Karton"]:
-            rec['x_count_packaging'] = (rec.product_uom_qty + 0.9)/1</field>
+    <field name="compute">for rec in self:
+	if rec.product_packaging:
+	  rec['x_count_packaging'] = rec.product_uom_qty // rec.product_packaging.qty</field>
   </record>
 
 </odoo>
diff --git a/snippets/ir_model.stock_move.x_label_qty.xml b/snippets/ir_model.stock_move.x_label_qty.xml
new file mode 100644
index 00000000..35d67dd2
--- /dev/null
+++ b/snippets/ir_model.stock_move.x_label_qty.xml
@@ -0,0 +1,19 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+<odoo>
+
+  <record id="x_label_qty" model="ir.model.fields">
+    <field name="field_description">Anzahl Etiketten</field>
+    <field name="model">stock.move</field>
+    <field name="model_id" ref="stock.model_stock_move"/>
+    <field name="name">x_label_qty</field>
+    <field name="store" eval="True"/>
+    <field name="readonly" eval="False"/>
+    <field name="copied" eval="False"/>
+    <field name="ttype">int</field>
+    <field name="depends">product_uom_qty</field>
+    <field name="compute">for rec in self:
+      rec['x_label_qty'] = 1
+    </field>
+  </record>
+
+</odoo>
diff --git a/snippets/ir_model.stock_move.x_operation_qty.xml b/snippets/ir_model.stock_move.x_operation_qty.xml
index 027df588..1e70cdee 100644
--- a/snippets/ir_model.stock_move.x_operation_qty.xml
+++ b/snippets/ir_model.stock_move.x_operation_qty.xml
@@ -2,7 +2,6 @@
 <odoo>
 
   <record id="x_operation_qty" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Inventory +/-</field>
     <field name="model">stock.move</field>
     <field name="model_id" ref="stock.model_stock_move"/>
diff --git a/snippets/ir_model.stock_move.x_packaging_uom_id.xml b/snippets/ir_model.stock_move.x_packaging_uom_id.xml
index 2d14920a..623e6d0d 100644
--- a/snippets/ir_model.stock_move.x_packaging_uom_id.xml
+++ b/snippets/ir_model.stock_move.x_packaging_uom_id.xml
@@ -2,7 +2,6 @@
 <odoo>
 
   <record id="x_packaging_uom_id" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Mengeneinheit</field>
     <field name="model">product.packaging</field>
     <field name="model_id" ref="product.model_product_packaging"/>
diff --git a/snippets/ir_model.stock_move.x_picking_partner_id.xml b/snippets/ir_model.stock_move.x_picking_partner_id.xml
index 38b964dd..cf8fd4fa 100644
--- a/snippets/ir_model.stock_move.x_picking_partner_id.xml
+++ b/snippets/ir_model.stock_move.x_picking_partner_id.xml
@@ -2,7 +2,6 @@
 <odoo>
 
   <record id="x_picking_partner_id" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Lieferadresse</field>
     <field name="model">stock.move</field>
     <field name="model_id" ref="stock.model_stock_move"/>
diff --git a/snippets/ir_model.stock_move.x_print_parent_only.xml b/snippets/ir_model.stock_move.x_print_parent_only.xml
index 65792a95..9b7043c6 100644
--- a/snippets/ir_model.stock_move.x_print_parent_only.xml
+++ b/snippets/ir_model.stock_move.x_print_parent_only.xml
@@ -2,7 +2,6 @@
 <odoo>
 
   <record id="x_print_parent_only" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Nur übergeordnete Verpackung drucken</field>
     <field name="model">product.packaging</field>
     <field name="model_id" ref="product.model_product_packaging"/>
diff --git a/snippets/ir_model.stock_move.x_print_without_parent.xml b/snippets/ir_model.stock_move.x_print_without_parent.xml
index 851a44aa..af4d7422 100644
--- a/snippets/ir_model.stock_move.x_print_without_parent.xml
+++ b/snippets/ir_model.stock_move.x_print_without_parent.xml
@@ -2,7 +2,6 @@
 <odoo>
 
   <record id="x_print_without_parent" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Ohne übergeordnete Verpackung drucken</field>
     <field name="model">product.packaging</field>
     <field name="model_id" ref="product.model_product_packaging"/>
diff --git a/snippets/ir_model.stock_move.x_scrap_id.xml b/snippets/ir_model.stock_move.x_scrap_id.xml
index 0c6beafa..d01487dc 100644
--- a/snippets/ir_model.stock_move.x_scrap_id.xml
+++ b/snippets/ir_model.stock_move.x_scrap_id.xml
@@ -2,7 +2,6 @@
 <odoo>
 
   <record id="x_scrap_id" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Buchung Lagerschwund</field>
     <field name="model">product.packaging</field>
     <field name="model_id" ref="product.model_product_packaging"/>
diff --git a/snippets/ir_model.stock_picking.x_autocomplete.xml b/snippets/ir_model.stock_picking.x_autocomplete.xml
index ce3edc04..248fa5d0 100644
--- a/snippets/ir_model.stock_picking.x_autocomplete.xml
+++ b/snippets/ir_model.stock_picking.x_autocomplete.xml
@@ -2,7 +2,6 @@
 <odoo>
 
   <record id="x_autocomplete" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Automatisch Erledigen</field>
     <field name="model">stock.picking</field>
     <field name="model_id" ref="stock.model_stock_picking"/>
diff --git a/snippets/ir_model.stock_picking.x_client_order_ref.xml b/snippets/ir_model.stock_picking.x_client_order_ref.xml
new file mode 100644
index 00000000..313cc427
--- /dev/null
+++ b/snippets/ir_model.stock_picking.x_client_order_ref.xml
@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+<odoo>
+
+  <record id="x_client_order_ref" model="ir.model.fields">
+    <field name="field_description">Bestellnummer Kunde</field>
+    <field name="model">stock.picking</field>
+    <field name="model_id" ref="stock.model_stock_picking"/>
+    <field name="name">x_client_order_ref</field>
+    <field name="store" eval="True"/>
+    <field name="readonly" eval="True"/>
+    <field name="copied" eval="False"/>
+    <field name="ttype">char</field> 
+    <field name="related">sale_id.client_order_ref</field>
+  </record>
+
+</odoo>
\ No newline at end of file
diff --git a/snippets/ir_model.stock_picking.x_date_order.xml b/snippets/ir_model.stock_picking.x_date_order.xml
new file mode 100644
index 00000000..78b59989
--- /dev/null
+++ b/snippets/ir_model.stock_picking.x_date_order.xml
@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+<odoo>
+
+  <record id="x_date_order" model="ir.model.fields">
+    <field name="field_description">Bestelldatum</field>
+    <field name="model">stock.picking</field>
+    <field name="model_id" ref="stock.model_stock_picking"/>
+    <field name="name">x_date_order</field>
+    <field name="store" eval="True"/>
+    <field name="readonly" eval="True"/>
+    <field name="copied" eval="False"/>
+    <field name="ttype">datetime</field> 
+    <field name="related">sale_id.date_order</field>
+  </record>
+
+</odoo>
\ No newline at end of file
diff --git a/snippets/ir_model.stock_picking.x_vst.xml b/snippets/ir_model.stock_picking.x_vst.xml
new file mode 100644
index 00000000..f98ae216
--- /dev/null
+++ b/snippets/ir_model.stock_picking.x_vst.xml
@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+<odoo>
+
+  <record id="x_vst" model="ir.model.fields">
+    <field name="field_description">VST</field>
+    <field name="model">stock.picking</field>
+    <field name="model_id" ref="stock.model_stock_picking"/>
+    <field name="name">x_vst</field>
+    <field name="store" eval="True"/>
+    <field name="readonly" eval="True"/>
+    <field name="copied" eval="False"/>
+    <field name="ttype">char</field> 
+    <field name="related">sale_id.x_vst</field>
+  </record>
+
+</odoo>
\ No newline at end of file
diff --git a/snippets/ir_model.stock_production_lot.x_production_id.xml b/snippets/ir_model.stock_production_lot.x_production_id.xml
index d5de0602..2b81353f 100644
--- a/snippets/ir_model.stock_production_lot.x_production_id.xml
+++ b/snippets/ir_model.stock_production_lot.x_production_id.xml
@@ -2,7 +2,6 @@
 <odoo>
 
   <record id="x_production_id" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Fertigungsauftrag</field>
     <field name="model">stock.production.lot</field>
     <field name="model_id" ref="stock.model_stock_production_lot"/>
diff --git a/snippets/ir_model.stock_production_lot.x_production_ids.xml b/snippets/ir_model.stock_production_lot.x_production_ids.xml
index 32a0a98c..adcc0364 100644
--- a/snippets/ir_model.stock_production_lot.x_production_ids.xml
+++ b/snippets/ir_model.stock_production_lot.x_production_ids.xml
@@ -2,7 +2,6 @@
 <odoo>
 
   <record id="x_production_ids" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Fertigungsaufträge</field>
     <field name="model">stock.production.lot</field>
     <field name="model_id" ref="stock.model_stock_production_lot"/>
diff --git a/snippets/ir_model.stock_production_lot.x_weight_uom.xml b/snippets/ir_model.stock_production_lot.x_weight_uom.xml
index 69b7c8dd..a0632d7c 100644
--- a/snippets/ir_model.stock_production_lot.x_weight_uom.xml
+++ b/snippets/ir_model.stock_production_lot.x_weight_uom.xml
@@ -2,7 +2,6 @@
 <odoo>
 
   <record id="x_weight_uom" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Nettogewicht [kg]</field>
     <field name="model">stock.production.lot</field>
     <field name="model_id" ref="stock.model_stock_production_lot"/>
diff --git a/snippets/ir_model.stock_quant.x_expiration_date.xml b/snippets/ir_model.stock_quant.x_expiration_date.xml
new file mode 100644
index 00000000..4df3cf59
--- /dev/null
+++ b/snippets/ir_model.stock_quant.x_expiration_date.xml
@@ -0,0 +1,17 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+<odoo>
+
+  <record id="x_expiration_date" model="ir.model.fields">
+    <field name="field_description">Ablaufdatum</field>
+    <field name="model">stock.quant</field>
+    <field name="model_id" ref="stock.model_stock_quant"/>
+    <field name="name">x_expiration_date</field>
+    <field name="store" eval="True"/>
+    <field name="readonly" eval="True"/>
+    <field name="copied" eval="False"/>
+    <field name="ttype">datetime</field>
+    <field name="relation">stock.lot</field>
+    <field name="related">lot_id.x_expiration_date</field>
+  </record>
+
+</odoo>
\ No newline at end of file
diff --git a/snippets/ir_model.stock_quant.x_last_delivery_partner_id.xml b/snippets/ir_model.stock_quant.x_last_delivery_partner_id.xml
index d993da19..f660b6ed 100644
--- a/snippets/ir_model.stock_quant.x_last_delivery_partner_id.xml
+++ b/snippets/ir_model.stock_quant.x_last_delivery_partner_id.xml
@@ -2,7 +2,6 @@
 <odoo>
 
   <record id="x_last_delivery_partner_id" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Lieferadresse</field>
     <field name="model">stock.quant</field>
     <field name="model_id" ref="stock.model_stock_quant"/>
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
index 0d40d863..357b78b7 100644
--- a/snippets/ir_model.stock_valuation_layer.x_quant_location_id.xml
+++ b/snippets/ir_model.stock_valuation_layer.x_quant_location_id.xml
@@ -2,7 +2,6 @@
 <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" />
diff --git a/snippets/l10n_ch.l10n_ch_swissqr_template.style_moser.xml b/snippets/l10n_ch.l10n_ch_swissqr_template.style_moser.xml
new file mode 100644
index 00000000..1bdbbf34
--- /dev/null
+++ b/snippets/l10n_ch.l10n_ch_swissqr_template.style_moser.xml
@@ -0,0 +1,19 @@
+<data inherit_id="l10n_ch.l10n_ch_swissqr_template" priority="60">
+
+    <xpath expr="//div[hasclass('swissqr_page_title')]" position="before">
+      
+        <style>
+      .swissqr_receipt {
+      border-top-style: none !important;
+      }
+      .swissqr_body {
+      border-top-style: none !important;
+      border-left-style: none !important;
+      }
+    </style>
+  </xpath>
+    
+  <xpath expr="//img[@class='scissors vertical_scissors']" position="replace"/>
+  <xpath expr="//img[@class='scissors horizontal_scissors']" position="replace"/>
+
+</data>
\ No newline at end of file
diff --git a/snippets/l10n_ch.md b/snippets/l10n_ch.md
index a0e3fbfd..b315e899 100644
--- a/snippets/l10n_ch.md
+++ b/snippets/l10n_ch.md
@@ -108,3 +108,28 @@ ID: `mint_system.l10n_ch.l10n_ch_swissqr_template.set_additional_information`
 ```
 Source: [snippets/l10n_ch.l10n_ch_swissqr_template.set_additional_information.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/l10n_ch.l10n_ch_swissqr_template.set_additional_information.xml)
 
+### Style Moser  
+ID: `mint_system.l10n_ch.l10n_ch_swissqr_template.style_moser`  
+```xml
+<data inherit_id="l10n_ch.l10n_ch_swissqr_template" priority="60">
+
+    <xpath expr="//div[hasclass('swissqr_page_title')]" position="before">
+      
+        <style>
+      .swissqr_receipt {
+      border-top-style: none !important;
+      }
+      .swissqr_body {
+      border-top-style: none !important;
+      border-left-style: none !important;
+      }
+    </style>
+  </xpath>
+    
+  <xpath expr="//img[@class='scissors vertical_scissors']" position="replace"/>
+  <xpath expr="//img[@class='scissors horizontal_scissors']" position="replace"/>
+
+</data>
+```
+Source: [snippets/l10n_ch.l10n_ch_swissqr_template.style_moser.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/l10n_ch.l10n_ch_swissqr_template.style_moser.xml)
+
diff --git a/snippets/mail.activity.x_reference.xml b/snippets/mail.activity.x_reference.xml
index cad0e648..00145c92 100644
--- a/snippets/mail.activity.x_reference.xml
+++ b/snippets/mail.activity.x_reference.xml
@@ -2,7 +2,6 @@
 <odoo>
 
   <record id="x_reference" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Reference</field>
     <field name="model">mail.activity</field>
     <field name="model_id" ref="mail.model_mail_activity"/>
diff --git a/snippets/mail.mail_activity_view_tree.activity_view.xml b/snippets/mail.mail_activity_view_tree.activity_view.xml
new file mode 100644
index 00000000..e21d6ca9
--- /dev/null
+++ b/snippets/mail.mail_activity_view_tree.activity_view.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+<data inherit_id="mail.mail_activity_view_tree" priority="50">
+
+  <tree position="replace">
+    <tree string="Next Activities" expand="1" decoration-danger="date_deadline &lt; current_date" decoration-success="date_deadline == current_date" default_order="date_deadline" create="false">
+      <field name="date_deadline_time"/>
+      <field string="Verantwortlich" name="user_id"/>
+      <field name="activity_type_id"/>
+      <field name="res_model_id"/>
+      <field name="res_name"/>
+      <field name="summary"/>
+      <field name="note"/>
+      <field name="date_deadline" invisible="1"/>
+    </tree>
+  </tree>
+
+</data>
diff --git a/snippets/mail.mail_notification_light.replace_footer.xml b/snippets/mail.mail_notification_light.replace_footer.xml
index 203e814d..0ea662ce 100644
--- a/snippets/mail.mail_notification_light.replace_footer.xml
+++ b/snippets/mail.mail_notification_light.replace_footer.xml
@@ -2,11 +2,11 @@
 <data inherit_id="mail.mail_notification_light" priority="50">
 
   <xpath expr="//tbody/tr[3]/td/div" position="replace">
-	  <div style="color: #999999">
-			<a t-att-href="'%s' % company.website" style="text-decoration:none; color: #999999;">
-				example.ch
-			</a>
-		</div>
+      <div style="color: #999999">
+            <a t-att-href="'%s' % company.website" style="text-decoration:none; color: #999999;">
+                example.ch
+            </a>
+        </div>
   </xpath>
 
 </data>
diff --git a/snippets/mail.mail_notification_paynow.remove_access_link.xml b/snippets/mail.mail_notification_paynow.remove_access_link.xml
index bdba0679..6785615d 100644
--- a/snippets/mail.mail_notification_paynow.remove_access_link.xml
+++ b/snippets/mail.mail_notification_paynow.remove_access_link.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <data inherit_id="mail.mail_notification_paynow" priority="60">
 
-  <t t-if="record._name == 'sale.order'" position="remove"/>
+  <t t-if="record._name == 'sale.order'" position="replace"/>
 
 </data>
diff --git a/snippets/mail.mail_notification_paynow.replace_footer.xml b/snippets/mail.mail_notification_paynow.replace_footer.xml
index 16a9fa80..df4e7155 100644
--- a/snippets/mail.mail_notification_paynow.replace_footer.xml
+++ b/snippets/mail.mail_notification_paynow.replace_footer.xml
@@ -2,11 +2,11 @@
 <data inherit_id="mail.mail_notification_paynow" priority="50">
 
   <xpath expr="//tbody/tr[3]/td/div" position="replace">
-	  <div style="color: #999999">
-			<a t-att-href="'%s' % company.website" style="text-decoration:none; color: #999999;">
-				example.ch
-			</a>
-		</div>
+      <div style="color: #999999">
+            <a t-att-href="'%s' % company.website" style="text-decoration:none; color: #999999;">
+                example.ch
+            </a>
+        </div>
   </xpath>
 
 </data>
diff --git a/snippets/mail.md b/snippets/mail.md
index e8e890e4..8edd7ee6 100644
--- a/snippets/mail.md
+++ b/snippets/mail.md
@@ -7,7 +7,6 @@ ID: `mint_system.mail.activity.x_reference`
 <odoo>
 
   <record id="x_reference" model="ir.model.fields">
-    <field name="domain">[]</field>
     <field name="field_description">Reference</field>
     <field name="model">mail.activity</field>
     <field name="model_id" ref="mail.model_mail_activity"/>
@@ -42,6 +41,31 @@ ID: `mint_system.mail.mail_activity_view_form_popup.x_reference`
 ```
 Source: [snippets/mail.mail_activity_view_form_popup.x_reference.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/mail.mail_activity_view_form_popup.x_reference.xml)
 
+## Mail Activity View Tree  
+### Activity View  
+ID: `mint_system.mail.mail_activity_view_tree.activity_view`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="mail.mail_activity_view_tree" priority="50">
+
+  <tree position="replace">
+    <tree string="Next Activities" expand="1" decoration-danger="date_deadline &lt; current_date" decoration-success="date_deadline == current_date" default_order="date_deadline" create="false">
+      <field name="date_deadline_time"/>
+      <field string="Verantwortlich" name="user_id"/>
+      <field name="activity_type_id"/>
+      <field name="res_model_id"/>
+      <field name="res_name"/>
+      <field name="summary"/>
+      <field name="note"/>
+      <field name="date_deadline" invisible="1"/>
+    </tree>
+  </tree>
+
+</data>
+
+```
+Source: [snippets/mail.mail_activity_view_tree.activity_view.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/mail.mail_activity_view_tree.activity_view.xml)
+
 ## Mail Notification Borders  
 ### Reduce To Content  
 ID: `mint_system.mail.mail_notification_borders.reduce_to_content`  
@@ -220,11 +244,11 @@ ID: `mint_system.mail.mail_notification_light.replace_footer`
 <data inherit_id="mail.mail_notification_light" priority="50">
 
   <xpath expr="//tbody/tr[3]/td/div" position="replace">
-	  <div style="color: #999999">
-			<a t-att-href="'%s' % company.website" style="text-decoration:none; color: #999999;">
-				example.ch
-			</a>
-		</div>
+      <div style="color: #999999">
+            <a t-att-href="'%s' % company.website" style="text-decoration:none; color: #999999;">
+                example.ch
+            </a>
+        </div>
   </xpath>
 
 </data>
@@ -318,7 +342,7 @@ ID: `mint_system.mail.mail_notification_paynow.remove_access_link`
 <?xml version="1.0"?>
 <data inherit_id="mail.mail_notification_paynow" priority="60">
 
-  <t t-if="record._name == 'sale.order'" position="remove"/>
+  <t t-if="record._name == 'sale.order'" position="replace"/>
 
 </data>
 
@@ -360,11 +384,11 @@ ID: `mint_system.mail.mail_notification_paynow.replace_footer`
 <data inherit_id="mail.mail_notification_paynow" priority="50">
 
   <xpath expr="//tbody/tr[3]/td/div" position="replace">
-	  <div style="color: #999999">
-			<a t-att-href="'%s' % company.website" style="text-decoration:none; color: #999999;">
-				example.ch
-			</a>
-		</div>
+      <div style="color: #999999">
+            <a t-att-href="'%s' % company.website" style="text-decoration:none; color: #999999;">
+                example.ch
+            </a>
+        </div>
   </xpath>
 
 </data>
diff --git a/snippets/mrp.label_production_view_pdf.aersolution.xml b/snippets/mrp.label_production_view_pdf.aersolution.xml
new file mode 100644
index 00000000..5e786d89
--- /dev/null
+++ b/snippets/mrp.label_production_view_pdf.aersolution.xml
@@ -0,0 +1,16 @@
+<t t-name="stock.report_reception_report_label.aersolution">
+    <t t-call="web.basic_layout">
+        <div class="page">
+
+            <t t-foreach="docs" t-as="production">
+                <t t-set="label_qty" t-value="int(production.product_qty)"/>
+                <t t-set="company_id" t-value="production.company_id"/>
+                <t t-set="lot_id" t-value="production.lot_producing_id"/>
+                <t t-set="product_id" t-value="production.product_id"/>
+
+                <t t-call="mint_system.stock.report_label.aersolution"/>
+            </t>
+
+        </div>
+    </t>
+</t>
\ No newline at end of file
diff --git a/snippets/mrp.label_production_view_pdf.basis57.xml b/snippets/mrp.label_production_view_pdf.basis57.xml
index 6444b391..4377b8b8 100644
--- a/snippets/mrp.label_production_view_pdf.basis57.xml
+++ b/snippets/mrp.label_production_view_pdf.basis57.xml
@@ -157,7 +157,7 @@
                                     <span class="use-font-opensans-medium default">Verpackt am: </span>
                                     <span class="use-font-opensans-medium default" t-esc="today.strftime('%d.%m.%Y')" />
                                     <br />
-                                    <span class="use-font-opensans-medium default">Zu verbrauchen bis: </span>
+                                    <span class="use-font-opensans-medium default">Mindestens haltbar bis: </span>
                                     <span class="use-font-opensans-medium default" t-esc="consume_until.strftime('%d.%m.%Y')" />
                                     <br />
                                     <span class="use-font-opensans-medium default">
diff --git a/snippets/mrp.md b/snippets/mrp.md
index 6bc6ab5c..050ee84c 100644
--- a/snippets/mrp.md
+++ b/snippets/mrp.md
@@ -1,5 +1,27 @@
 # Mrp
 ## Label Production View Pdf  
+### Aersolution  
+ID: `mint_system.mrp.label_production_view_pdf.aersolution`  
+```xml
+<t t-name="stock.report_reception_report_label.aersolution">
+    <t t-call="web.basic_layout">
+        <div class="page">
+
+            <t t-foreach="docs" t-as="production">
+                <t t-set="label_qty" t-value="int(production.product_qty)"/>
+                <t t-set="company_id" t-value="production.company_id"/>
+                <t t-set="lot_id" t-value="production.lot_producing_id"/>
+                <t t-set="product_id" t-value="production.product_id"/>
+
+                <t t-call="mint_system.stock.report_label.aersolution"/>
+            </t>
+
+        </div>
+    </t>
+</t>
+```
+Source: [snippets/mrp.label_production_view_pdf.aersolution.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/mrp.label_production_view_pdf.aersolution.xml)
+
 ### Basis57  
 ID: `mint_system.mrp.label_production_view_pdf.basis57`  
 ```xml
@@ -162,7 +184,7 @@ ID: `mint_system.mrp.label_production_view_pdf.basis57`
                                     <span class="use-font-opensans-medium default">Verpackt am: </span>
                                     <span class="use-font-opensans-medium default" t-esc="today.strftime('%d.%m.%Y')" />
                                     <br />
-                                    <span class="use-font-opensans-medium default">Zu verbrauchen bis: </span>
+                                    <span class="use-font-opensans-medium default">Mindestens haltbar bis: </span>
                                     <span class="use-font-opensans-medium default" t-esc="consume_until.strftime('%d.%m.%Y')" />
                                     <br />
                                     <span class="use-font-opensans-medium default">
@@ -496,7 +518,7 @@ ID: `mint_system.mrp.mrp_bom_tree_view.sort_id`
   <xpath expr="//tree" position="attributes">
         <attribute name="default_order">id desc</attribute>
   </xpath>
-	
+    
 </data>
 ```
 Source: [snippets/mrp.mrp_bom_tree_view.sort_id.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/mrp.mrp_bom_tree_view.sort_id.xml)
@@ -644,10 +666,10 @@ ID: `mint_system.mrp.mrp_production_form_view.show_backorder_and_procurement_gro
 <?xml version="1.0"?>
 <data inherit_id="mrp.mrp_production_form_view" priority="50">
   
-	<xpath expr="//page[@name='miscellaneous']//field[@name='picking_type_id']" position="after">
-    	<field name="procurement_group_id"/>
-    	<field name="backorder_sequence"/>
-  	</xpath>
+    <xpath expr="//page[@name='miscellaneous']//field[@name='picking_type_id']" position="after">
+        <field name="procurement_group_id"/>
+        <field name="backorder_sequence"/>
+      </xpath>
 
 </data>
 
@@ -705,9 +727,9 @@ ID: `mint_system.mrp.mrp_production_form_view.x_note`
 <?xml version="1.0"?>
 <data inherit_id="mrp.mrp_production_form_view" priority="50">
   
-	<xpath expr="//page[@name='miscellaneous']//field[@name='origin']" position="after">
-    	<field name="x_note"/>
-  	</xpath>
+    <xpath expr="//page[@name='miscellaneous']//field[@name='origin']" position="after">
+        <field name="x_note"/>
+      </xpath>
 
 </data>
 
@@ -723,12 +745,27 @@ ID: `mint_system.mrp.mrp_production_tree_view.hide_date_deadline`
   
   <xpath expr="//field[@name='date_deadline']" position="replace">
   </xpath>
-	
+    
 </data>
 
 ```
 Source: [snippets/mrp.mrp_production_tree_view.hide_date_deadline.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/mrp.mrp_production_tree_view.hide_date_deadline.xml)
 
+### Show Format Date Planned Start  
+ID: `mint_system.mrp.mrp_production_tree_view.show_format_date_planned_start`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="mrp.mrp_production_tree_view" priority="50">
+ 
+ <xpath expr="//field[@name='date_planned_start']" position="attributes">
+    <attribute name="widget">date</attribute>
+</xpath>
+
+</data>
+
+```
+Source: [snippets/mrp.mrp_production_tree_view.show_format_date_planned_start.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/mrp.mrp_production_tree_view.show_format_date_planned_start.xml)
+
 ### Show X Date Deadline  
 ID: `mint_system.mrp.mrp_production_tree_view.show_x_date_deadline`  
 ```xml
@@ -738,7 +775,7 @@ ID: `mint_system.mrp.mrp_production_tree_view.show_x_date_deadline`
   <xpath expr="//field[@name='date_planned_start']" position="after">
      <field name="x_date_deadline"/>
   </xpath>
-	
+    
 </data>
 
 ```
@@ -753,7 +790,7 @@ ID: `mint_system.mrp.mrp_production_tree_view.sort_date_planned_start`
   <xpath expr="//tree" position="attributes">
         <attribute name="default_order">date_planned_start asc</attribute>
   </xpath>
-	
+    
 </data>
 
 ```
@@ -822,30 +859,11 @@ ID: `mint_system.mrp.report_mrporder.add_padding`
 <?xml version="1.0"?>
 <data inherit_id="mrp.report_mrporder" priority="50">
 
-  <!-- First row -->
   <xpath expr="/t/t/t/t/div/div[2]" position="attributes">
     <attribute name="style" add="padding-bottom: 2rem"/>
   </xpath>
 
-  <!-- Header level 3 -->
-  <xpath expr="/t/t/t/t/div/div[3]/div[2]" position="attributes">
-    <attribute name="class">col-5</attribute>
-  </xpath>
-  <xpath expr="/t/t/t/t/div/div[3]/div[1]" position="attributes">
-    <attribute name="class">col-5</attribute>
-  </xpath>
-  <xpath expr="/t/t/t/t/div/div[4]/div[1]" position="attributes">
-    <attribute name="class">col-5</attribute>
-  </xpath>
-  <xpath expr="/t/t/t/t/div/div[4]/div[3]" position="attributes">
-    <attribute name="class">col-5</attribute>
-  </xpath>
-
-  <!-- Header level 3 -->
-  <xpath expr="/t/t/t/t/div/div[5]/h3" position="attributes">
-    <attribute name="style">padding-top: 2rem</attribute>
-  </xpath>
-  <xpath expr="/t/t/t/t/div/h3" position="attributes">
+  <xpath expr="//h3" position="attributes">
     <attribute name="style">padding-top: 2rem</attribute>
   </xpath>
 
@@ -861,10 +879,10 @@ ID: `mint_system.mrp.report_mrporder.list_quality_points`
 <!-- List quality points in mrp order -->
 <data inherit_id="mrp.report_mrporder" priority="50">
 
-	<xpath expr="/t/t/t/t/div/div[5]/table/tr[2]/td[1]/span" position="after">
-		<ul>
-		  <li t-foreach="line2.operation_id.quality_point_ids" t-as="quality_point"><span t-field="quality_point.title"/></li>
-	  </ul>
+    <xpath expr="/t/t/t/t/div/div[5]/table/tr[2]/td[1]/span" position="after">
+        <ul>
+          <li t-foreach="line2.operation_id.quality_point_ids" t-as="quality_point"><span t-field="quality_point.title"/></li>
+      </ul>
   </xpath>
 
 </data>
@@ -891,13 +909,13 @@ ID: `mint_system.mrp.report_mrporder.modify_section_consumed_products`
       }
     </style>
     <table id='to_produce'>
-     	<tr style="border-bottom: 1px solid rgb(220,220,220);">
-        	<th width="40%;"><strong>Menge</strong></th>
-        	<th width="30%;"><strong>Datum</strong></th>
-        	<th width="30%;"></th>
-     	</tr>
-    	<tr>
-        	<td>
+         <tr style="border-bottom: 1px solid rgb(220,220,220);">
+            <th width="40%;"><strong>Menge</strong></th>
+            <th width="30%;"><strong>Datum</strong></th>
+            <th width="30%;"></th>
+         </tr>
+        <tr>
+            <td>
           <strong><span t-field="o.product_qty"/>
           <span t-field="o.product_uom_id.name" groups="uom.group_uom"/></strong>
           </td>
@@ -905,7 +923,7 @@ ID: `mint_system.mrp.report_mrporder.modify_section_consumed_products`
         <td style="text-align: right"><strong>Termin: <span t-field="o.date_planned_finished" t-options='{"widget": "date"}'/></strong></td>
        </tr>
     </table>
-	
+    
   </xpath>  
 </data>
 
@@ -1177,10 +1195,10 @@ ID: `mint_system.mrp.report_mrporder.quality_points`
 <?xml version="1.0"?>
 <data inherit_id="mrp.report_mrporder" priority="50">
 
-	<xpath expr="//tr[@t-foreach='o.workorder_ids']/td[1]/span" position="after">
-		<ul style="list-style-type:none;">
-		  <li t-foreach="line2.operation_id.quality_point_ids" t-as="quality_point">☐ <span t-field="quality_point.title"/></li>
-	  </ul>
+    <xpath expr="//tr[@t-foreach='o.workorder_ids']/td[1]/span" position="after">
+        <ul style="list-style-type:none;">
+          <li t-foreach="line2.operation_id.quality_point_ids" t-as="quality_point">☐ <span t-field="quality_point.title"/></li>
+      </ul>
     </xpath>
 
 </data>
@@ -1192,10 +1210,8 @@ Source: [snippets/mrp.report_mrporder.quality_points.xml](https://github.com/Min
 ID: `mint_system.mrp.report_mrporder.remove_barcode`  
 ```xml
 <?xml version="1.0"?>
-<!-- Remove barcode from mrp order -->
 <data inherit_id="mrp.report_mrporder" priority="50">
-  <xpath expr="//table[1]/thead[1]/tr[1]/th[3]" position="replace"/>
-  <xpath expr="//table[1]/tbody[1]/t[1]/tr[1]/td[3]" position="replace"/>
+  <xpath expr="//span/div[@t-field='o.name']" position="replace"/>
 </data>
 ```
 Source: [snippets/mrp.report_mrporder.remove_barcode.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/mrp.report_mrporder.remove_barcode.xml)
@@ -1274,16 +1290,30 @@ ID: `mint_system.mrp.report_mrporder.show_expected`
 <?xml version="1.0"?>
 <data inherit_id="mrp.report_mrporder" priority="50">
 
-	<xpath expr="//tr[1]/td[1]/span[1]" position="after">
-		<t t-if="raw_line.forecast_expected_date">
-			<br/><span>Expected date: </span><span t-field="raw_line.forecast_expected_date" t-options='{"widget": "date"}'/><br/>
-		</t>
-	</xpath>
+    <xpath expr="//tr[1]/td[1]/span[1]" position="after">
+        <t t-if="raw_line.forecast_expected_date">
+            <br/><span>Expected date: </span><span t-field="raw_line.forecast_expected_date" t-options='{"widget": "date"}'/><br/>
+        </t>
+    </xpath>
 </data>
 
 ```
 Source: [snippets/mrp.report_mrporder.show_expected.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/mrp.report_mrporder.show_expected.xml)
 
+### Show Lot Producing  
+ID: `mint_system.mrp.report_mrporder.show_lot_producing`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="mrp.report_mrporder" priority="60">
+    <xpath expr="//div/div[4]/div[1]/span" position="after">
+        <span t-if="o.lot_producing_id">
+            <br/>Los: <span t-field="o.lot_producing_id.name"/>
+        </span>
+    </xpath>
+</data>
+```
+Source: [snippets/mrp.report_mrporder.show_lot_producing.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/mrp.report_mrporder.show_lot_producing.xml)
+
 ### Show Lot  
 ID: `mint_system.mrp.report_mrporder.show_lot`  
 ```xml
@@ -1291,21 +1321,21 @@ ID: `mint_system.mrp.report_mrporder.show_lot`
 <!-- If lot is not available show forecasted days. -->
 <data inherit_id="mrp.report_mrporder" priority="50">
 
-	<xpath expr="/t/t/t/t/div/table/tbody/t/tr/td[1]/span" position="after">
-		<t t-if="raw_line.forecast_expected_date">
-			<br/><span>Expected date: </span><span t-field="raw_line.forecast_expected_date" t-options='{"widget": "date"}'/><br/>
-		</t>
+    <xpath expr="/t/t/t/t/div/table/tbody/t/tr/td[1]/span" position="after">
+        <t t-if="raw_line.forecast_expected_date">
+            <br/><span>Expected date: </span><span t-field="raw_line.forecast_expected_date" t-options='{"widget": "date"}'/><br/>
+        </t>
 
-    	<!--
-		<span>Qty: </span><span t-field="raw_line.product_uom_qty"/><br/>
-    	<span>Forecast: </span><span t-field="raw_line.forecast_availability"/><br/>
-    	<span>Available: </span><span t-field="raw_line.availability"/><br/>
-		-->
+        <!--
+        <span>Qty: </span><span t-field="raw_line.product_uom_qty"/><br/>
+        <span>Forecast: </span><span t-field="raw_line.forecast_availability"/><br/>
+        <span>Available: </span><span t-field="raw_line.availability"/><br/>
+        -->
 
-		<t t-if="len(raw_line.move_line_ids) > 0 and raw_line.move_line_ids[0].lot_id">
-			<br/><span>Lot(s): </span><span t-foreach="raw_line.move_line_ids" t-as="move_line"><span t-field="move_line.lot_id"/> </span>
-		</t>
-	</xpath>
+        <t t-if="len(raw_line.move_line_ids) > 0 and raw_line.move_line_ids[0].lot_id">
+            <br/><span>Lot(s): </span><span t-foreach="raw_line.move_line_ids" t-as="move_line"><span t-field="move_line.lot_id"/> </span>
+        </t>
+    </xpath>
 
 </data>
 
@@ -1381,7 +1411,7 @@ ID: `mint_system.mrp.report_mrporder.show_stock`
 ```xml
 <?xml version="1.0"?>
 <data inherit_id="mrp.report_mrporder" priority="60">
-	<xpath expr="//table/thead/tr/th[2]" position="after">
+    <xpath expr="//table/thead/tr/th[2]" position="after">
         <th>
             <span>Lagerort (Los) Menge</span>
         </th>
@@ -1391,27 +1421,75 @@ ID: `mint_system.mrp.report_mrporder.show_stock`
             <span t-foreach="raw_line.move_line_ids" t-as="move_line">
                 <span t-field="move_line.location_id.display_name"/>
                 <t t-if="move_line.lot_id"> (<span t-field="move_line.lot_id"/>) </t>
-                <span t-field="move_line.product_uom_qty"/>
+                <span t-field="move_line.reserved_uom_qty"/>
                 <br/>
             </span>
         </td>
     </xpath>
-    <xpath expr="//div/div[4]/div[1]/span" position="after">
-        <span t-if="o.lot_producing_id">
-            <br/>Los: <span t-field="o.lot_producing_id.name"/>
-        </span>
-    </xpath>
 </data>
 ```
 Source: [snippets/mrp.report_mrporder.show_stock.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/mrp.report_mrporder.show_stock.xml)
 
+## Report Mrp Production Components  
+### Remove Barcode  
+ID: `mint_system.mrp.report_mrp_production_components.remove_barcode`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="mrp.report_mrp_production_components" priority="50">
+  <xpath expr="//th[@t-if='has_product_barcode']" position="replace"/>
+  <xpath expr="//td[@t-if='has_product_barcode']" position="replace"/>
+</data>
+```
+Source: [snippets/mrp.report_mrp_production_components.remove_barcode.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/mrp.report_mrp_production_components.remove_barcode.xml)
+
+### Show Expected  
+ID: `mint_system.mrp.report_mrp_production_components.show_expected`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="mrp.report_mrp_production_components" priority="50">
+    <xpath expr="//span[@t-field='raw_line.product_id']" position="after">
+        <t t-if="raw_line.forecast_expected_date">
+            <br />
+            <span>Expected date: </span>
+            <span t-field="raw_line.forecast_expected_date" t-options='{"widget": "date"}' />
+            <br />
+        </t>
+    </xpath>
+</data>
+```
+Source: [snippets/mrp.report_mrp_production_components.show_expected.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/mrp.report_mrp_production_components.show_expected.xml)
+
+### Show Stock  
+ID: `mint_system.mrp.report_mrp_production_components.show_stock`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="mrp.report_mrp_production_components" priority="60">
+    <xpath expr="//table//tr/th[2]" position="after">
+        <th>
+            <span>Lagerort (Los) Menge</span>
+        </th>
+    </xpath>
+    <xpath expr="//table//tr/td[2]" position="after">
+        <td>
+            <span t-foreach="raw_line.move_line_ids" t-as="move_line">
+                <span t-field="move_line.location_id.display_name" />
+                <t t-if="move_line.lot_id"> (<span t-field="move_line.lot_id" />) </t>
+                <span t-field="move_line.reserved_uom_qty"/>
+                <br />
+            </span>
+        </td>
+    </xpath>
+</data>
+```
+Source: [snippets/mrp.report_mrp_production_components.show_stock.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/mrp.report_mrp_production_components.show_stock.xml)
+
 ## Stock Report Delivery Kit Sections  
 ### Expand Section Heading  
 ID: `mint_system.mrp.stock_report_delivery_kit_sections.expand_section_heading`  
 ```xml
 <?xml version="1.0"?>
 <data inherit_id="mrp.stock_report_delivery_kit_sections" priority="50">
-	
+    
     <xpath expr="//span[@t-esc='kit.display_name']" position="after">
         <br/>bestehend aus:       
     </xpath>
@@ -1426,10 +1504,10 @@ ID: `mint_system.mrp.view_mrp_bom_filter.add_operation_ids`
 <?xml version="1.0"?>
 <data inherit_id="mrp.view_mrp_bom_filter"  priority="50">
 
-	<xpath expr="//field[@name='bom_line_ids']" position="after">
-		<filter string="Mit Vorgängen" name="operation" domain="[('operation_ids', '!=', False)]"/>
-		<filter string="Ohne Vorgänge" name="operation" domain="[('operation_ids', '=', False)]"/>
-	</xpath>
+    <xpath expr="//field[@name='bom_line_ids']" position="after">
+        <filter string="Mit Vorgängen" name="operation" domain="[('operation_ids', '!=', False)]"/>
+        <filter string="Ohne Vorgänge" name="operation" domain="[('operation_ids', '=', False)]"/>
+    </xpath>
 
 </data>
 ```
@@ -1441,9 +1519,9 @@ ID: `mint_system.mrp.view_mrp_bom_filter.add_x_type_description`
 <?xml version="1.0"?>
 <data inherit_id="mrp.view_mrp_bom_filter" priority="50">
 
-	<xpath expr="//field[@name='bom_line_ids']" position="after">
-		<field name="x_type_description" string="Typenbezeichnung" filter_domain="['|', ('x_type_description', 'ilike', self), ('x_type_description_bom_line', 'ilike', self)]"/>
-	</xpath>
+    <xpath expr="//field[@name='bom_line_ids']" position="after">
+        <field name="x_type_description" string="Typenbezeichnung" filter_domain="['|', ('x_type_description', 'ilike', self), ('x_type_description_bom_line', 'ilike', self)]"/>
+    </xpath>
 
 </data> 
 ```
@@ -1471,9 +1549,9 @@ ID: `mint_system.mrp.view_mrp_production_filter.add_not_planned`
 <?xml version="1.0"?>
 <data inherit_id="mrp.view_mrp_production_filter" priority="50">
 
-	<xpath expr="//filter[@name='filter_planned']" position="after">
-		<filter string="Nicht geplant" name="filter_not_planned" domain="[('is_planned', '!=', True)]" groups="mrp.group_mrp_routings"/>
-	</xpath>
+    <xpath expr="//filter[@name='filter_planned']" position="after">
+        <filter string="Nicht geplant" name="filter_not_planned" domain="[('is_planned', '!=', True)]" groups="mrp.group_mrp_routings"/>
+    </xpath>
 
 </data>
 ```
diff --git a/snippets/mrp.mrp_bom_tree_view.sort_id.xml b/snippets/mrp.mrp_bom_tree_view.sort_id.xml
index 8700ed55..279b02cb 100644
--- a/snippets/mrp.mrp_bom_tree_view.sort_id.xml
+++ b/snippets/mrp.mrp_bom_tree_view.sort_id.xml
@@ -4,5 +4,5 @@
   <xpath expr="//tree" position="attributes">
         <attribute name="default_order">id desc</attribute>
   </xpath>
-	
+    
 </data>
\ No newline at end of file
diff --git a/snippets/mrp.mrp_production_form_view.show_backorder_and_procurement_group.xml b/snippets/mrp.mrp_production_form_view.show_backorder_and_procurement_group.xml
index 62fc72e3..827791f8 100644
--- a/snippets/mrp.mrp_production_form_view.show_backorder_and_procurement_group.xml
+++ b/snippets/mrp.mrp_production_form_view.show_backorder_and_procurement_group.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0"?>
 <data inherit_id="mrp.mrp_production_form_view" priority="50">
   
-	<xpath expr="//page[@name='miscellaneous']//field[@name='picking_type_id']" position="after">
-    	<field name="procurement_group_id"/>
-    	<field name="backorder_sequence"/>
-  	</xpath>
+    <xpath expr="//page[@name='miscellaneous']//field[@name='picking_type_id']" position="after">
+        <field name="procurement_group_id"/>
+        <field name="backorder_sequence"/>
+      </xpath>
 
 </data>
diff --git a/snippets/mrp.mrp_production_form_view.x_note.xml b/snippets/mrp.mrp_production_form_view.x_note.xml
index e4501d6e..3431aa3d 100644
--- a/snippets/mrp.mrp_production_form_view.x_note.xml
+++ b/snippets/mrp.mrp_production_form_view.x_note.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <data inherit_id="mrp.mrp_production_form_view" priority="50">
   
-	<xpath expr="//page[@name='miscellaneous']//field[@name='origin']" position="after">
-    	<field name="x_note"/>
-  	</xpath>
+    <xpath expr="//page[@name='miscellaneous']//field[@name='origin']" position="after">
+        <field name="x_note"/>
+      </xpath>
 
 </data>
diff --git a/snippets/mrp.mrp_production_tree_view.hide_date_deadline.xml b/snippets/mrp.mrp_production_tree_view.hide_date_deadline.xml
index 38061d3a..2967c166 100644
--- a/snippets/mrp.mrp_production_tree_view.hide_date_deadline.xml
+++ b/snippets/mrp.mrp_production_tree_view.hide_date_deadline.xml
@@ -3,5 +3,5 @@
   
   <xpath expr="//field[@name='date_deadline']" position="replace">
   </xpath>
-	
+    
 </data>
diff --git a/snippets/mrp.mrp_production_tree_view.show_format_date_planned_start.xml b/snippets/mrp.mrp_production_tree_view.show_format_date_planned_start.xml
new file mode 100644
index 00000000..8580f01b
--- /dev/null
+++ b/snippets/mrp.mrp_production_tree_view.show_format_date_planned_start.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<data inherit_id="mrp.mrp_production_tree_view" priority="50">
+ 
+ <xpath expr="//field[@name='date_planned_start']" position="attributes">
+    <attribute name="widget">date</attribute>
+</xpath>
+
+</data>
diff --git a/snippets/mrp.mrp_production_tree_view.show_x_date_deadline.xml b/snippets/mrp.mrp_production_tree_view.show_x_date_deadline.xml
index 2297ca44..fe1cfb0d 100644
--- a/snippets/mrp.mrp_production_tree_view.show_x_date_deadline.xml
+++ b/snippets/mrp.mrp_production_tree_view.show_x_date_deadline.xml
@@ -4,5 +4,5 @@
   <xpath expr="//field[@name='date_planned_start']" position="after">
      <field name="x_date_deadline"/>
   </xpath>
-	
+    
 </data>
diff --git a/snippets/mrp.mrp_production_tree_view.sort_date_planned_start.xml b/snippets/mrp.mrp_production_tree_view.sort_date_planned_start.xml
index 86e996eb..6fb949d9 100644
--- a/snippets/mrp.mrp_production_tree_view.sort_date_planned_start.xml
+++ b/snippets/mrp.mrp_production_tree_view.sort_date_planned_start.xml
@@ -4,5 +4,5 @@
   <xpath expr="//tree" position="attributes">
         <attribute name="default_order">date_planned_start asc</attribute>
   </xpath>
-	
+    
 </data>
diff --git a/snippets/mrp.report_mrp_production_components.remove_barcode.xml b/snippets/mrp.report_mrp_production_components.remove_barcode.xml
new file mode 100644
index 00000000..bbb36193
--- /dev/null
+++ b/snippets/mrp.report_mrp_production_components.remove_barcode.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0"?>
+<data inherit_id="mrp.report_mrp_production_components" priority="50">
+  <xpath expr="//th[@t-if='has_product_barcode']" position="replace"/>
+  <xpath expr="//td[@t-if='has_product_barcode']" position="replace"/>
+</data>
\ No newline at end of file
diff --git a/snippets/mrp.report_mrp_production_components.show_expected.xml b/snippets/mrp.report_mrp_production_components.show_expected.xml
new file mode 100644
index 00000000..ef15bc08
--- /dev/null
+++ b/snippets/mrp.report_mrp_production_components.show_expected.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<data inherit_id="mrp.report_mrp_production_components" priority="50">
+    <xpath expr="//span[@t-field='raw_line.product_id']" position="after">
+        <t t-if="raw_line.forecast_expected_date">
+            <br />
+            <span>Expected date: </span>
+            <span t-field="raw_line.forecast_expected_date" t-options='{"widget": "date"}' />
+            <br />
+        </t>
+    </xpath>
+</data>
\ No newline at end of file
diff --git a/snippets/mrp.report_mrp_production_components.show_stock.xml b/snippets/mrp.report_mrp_production_components.show_stock.xml
new file mode 100644
index 00000000..0492e19c
--- /dev/null
+++ b/snippets/mrp.report_mrp_production_components.show_stock.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<data inherit_id="mrp.report_mrp_production_components" priority="60">
+    <xpath expr="//table//tr/th[2]" position="after">
+        <th>
+            <span>Lagerort (Los) Menge</span>
+        </th>
+    </xpath>
+    <xpath expr="//table//tr/td[2]" position="after">
+        <td>
+            <span t-foreach="raw_line.move_line_ids" t-as="move_line">
+                <span t-field="move_line.location_id.display_name" />
+                <t t-if="move_line.lot_id"> (<span t-field="move_line.lot_id" />) </t>
+                <span t-field="move_line.reserved_uom_qty"/>
+                <br />
+            </span>
+        </td>
+    </xpath>
+</data>
\ No newline at end of file
diff --git a/snippets/mrp.report_mrporder.add_padding.xml b/snippets/mrp.report_mrporder.add_padding.xml
index 1ad4c40f..2e757476 100644
--- a/snippets/mrp.report_mrporder.add_padding.xml
+++ b/snippets/mrp.report_mrporder.add_padding.xml
@@ -1,30 +1,11 @@
 <?xml version="1.0"?>
 <data inherit_id="mrp.report_mrporder" priority="50">
 
-  <!-- First row -->
   <xpath expr="/t/t/t/t/div/div[2]" position="attributes">
     <attribute name="style" add="padding-bottom: 2rem"/>
   </xpath>
 
-  <!-- Header level 3 -->
-  <xpath expr="/t/t/t/t/div/div[3]/div[2]" position="attributes">
-    <attribute name="class">col-5</attribute>
-  </xpath>
-  <xpath expr="/t/t/t/t/div/div[3]/div[1]" position="attributes">
-    <attribute name="class">col-5</attribute>
-  </xpath>
-  <xpath expr="/t/t/t/t/div/div[4]/div[1]" position="attributes">
-    <attribute name="class">col-5</attribute>
-  </xpath>
-  <xpath expr="/t/t/t/t/div/div[4]/div[3]" position="attributes">
-    <attribute name="class">col-5</attribute>
-  </xpath>
-
-  <!-- Header level 3 -->
-  <xpath expr="/t/t/t/t/div/div[5]/h3" position="attributes">
-    <attribute name="style">padding-top: 2rem</attribute>
-  </xpath>
-  <xpath expr="/t/t/t/t/div/h3" position="attributes">
+  <xpath expr="//h3" position="attributes">
     <attribute name="style">padding-top: 2rem</attribute>
   </xpath>
 
diff --git a/snippets/mrp.report_mrporder.list_quality_points.xml b/snippets/mrp.report_mrporder.list_quality_points.xml
index 0921c794..82de9c90 100644
--- a/snippets/mrp.report_mrporder.list_quality_points.xml
+++ b/snippets/mrp.report_mrporder.list_quality_points.xml
@@ -2,10 +2,10 @@
 <!-- List quality points in mrp order -->
 <data inherit_id="mrp.report_mrporder" priority="50">
 
-	<xpath expr="/t/t/t/t/div/div[5]/table/tr[2]/td[1]/span" position="after">
-		<ul>
-		  <li t-foreach="line2.operation_id.quality_point_ids" t-as="quality_point"><span t-field="quality_point.title"/></li>
-	  </ul>
+    <xpath expr="/t/t/t/t/div/div[5]/table/tr[2]/td[1]/span" position="after">
+        <ul>
+          <li t-foreach="line2.operation_id.quality_point_ids" t-as="quality_point"><span t-field="quality_point.title"/></li>
+      </ul>
   </xpath>
 
 </data>
diff --git a/snippets/mrp.report_mrporder.modify_section_consumed_products.xml b/snippets/mrp.report_mrporder.modify_section_consumed_products.xml
index 792f596a..e2445992 100644
--- a/snippets/mrp.report_mrporder.modify_section_consumed_products.xml
+++ b/snippets/mrp.report_mrporder.modify_section_consumed_products.xml
@@ -14,13 +14,13 @@
       }
     </style>
     <table id='to_produce'>
-     	<tr style="border-bottom: 1px solid rgb(220,220,220);">
-        	<th width="40%;"><strong>Menge</strong></th>
-        	<th width="30%;"><strong>Datum</strong></th>
-        	<th width="30%;"></th>
-     	</tr>
-    	<tr>
-        	<td>
+         <tr style="border-bottom: 1px solid rgb(220,220,220);">
+            <th width="40%;"><strong>Menge</strong></th>
+            <th width="30%;"><strong>Datum</strong></th>
+            <th width="30%;"></th>
+         </tr>
+        <tr>
+            <td>
           <strong><span t-field="o.product_qty"/>
           <span t-field="o.product_uom_id.name" groups="uom.group_uom"/></strong>
           </td>
@@ -28,6 +28,6 @@
         <td style="text-align: right"><strong>Termin: <span t-field="o.date_planned_finished" t-options='{"widget": "date"}'/></strong></td>
        </tr>
     </table>
-	
+    
   </xpath>  
 </data>
diff --git a/snippets/mrp.report_mrporder.quality_points.xml b/snippets/mrp.report_mrporder.quality_points.xml
index 0118fd87..3d5e79a3 100644
--- a/snippets/mrp.report_mrporder.quality_points.xml
+++ b/snippets/mrp.report_mrporder.quality_points.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0"?>
 <data inherit_id="mrp.report_mrporder" priority="50">
 
-	<xpath expr="//tr[@t-foreach='o.workorder_ids']/td[1]/span" position="after">
-		<ul style="list-style-type:none;">
-		  <li t-foreach="line2.operation_id.quality_point_ids" t-as="quality_point">☐ <span t-field="quality_point.title"/></li>
-	  </ul>
+    <xpath expr="//tr[@t-foreach='o.workorder_ids']/td[1]/span" position="after">
+        <ul style="list-style-type:none;">
+          <li t-foreach="line2.operation_id.quality_point_ids" t-as="quality_point">☐ <span t-field="quality_point.title"/></li>
+      </ul>
     </xpath>
 
 </data>
diff --git a/snippets/mrp.report_mrporder.remove_barcode.xml b/snippets/mrp.report_mrporder.remove_barcode.xml
index f0d951f5..3afcc6f8 100644
--- a/snippets/mrp.report_mrporder.remove_barcode.xml
+++ b/snippets/mrp.report_mrporder.remove_barcode.xml
@@ -1,6 +1,4 @@
 <?xml version="1.0"?>
-<!-- Remove barcode from mrp order -->
 <data inherit_id="mrp.report_mrporder" priority="50">
-  <xpath expr="//table[1]/thead[1]/tr[1]/th[3]" position="replace"/>
-  <xpath expr="//table[1]/tbody[1]/t[1]/tr[1]/td[3]" position="replace"/>
+  <xpath expr="//span/div[@t-field='o.name']" position="replace"/>
 </data>
\ No newline at end of file
diff --git a/snippets/mrp.report_mrporder.show_expected.xml b/snippets/mrp.report_mrporder.show_expected.xml
index 73b5ef42..118ac602 100644
--- a/snippets/mrp.report_mrporder.show_expected.xml
+++ b/snippets/mrp.report_mrporder.show_expected.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0"?>
 <data inherit_id="mrp.report_mrporder" priority="50">
 
-	<xpath expr="//tr[1]/td[1]/span[1]" position="after">
-		<t t-if="raw_line.forecast_expected_date">
-			<br/><span>Expected date: </span><span t-field="raw_line.forecast_expected_date" t-options='{"widget": "date"}'/><br/>
-		</t>
-	</xpath>
+    <xpath expr="//tr[1]/td[1]/span[1]" position="after">
+        <t t-if="raw_line.forecast_expected_date">
+            <br/><span>Expected date: </span><span t-field="raw_line.forecast_expected_date" t-options='{"widget": "date"}'/><br/>
+        </t>
+    </xpath>
 </data>
diff --git a/snippets/mrp.report_mrporder.show_lot.xml b/snippets/mrp.report_mrporder.show_lot.xml
index f78113bb..071d817c 100644
--- a/snippets/mrp.report_mrporder.show_lot.xml
+++ b/snippets/mrp.report_mrporder.show_lot.xml
@@ -2,20 +2,20 @@
 <!-- If lot is not available show forecasted days. -->
 <data inherit_id="mrp.report_mrporder" priority="50">
 
-	<xpath expr="/t/t/t/t/div/table/tbody/t/tr/td[1]/span" position="after">
-		<t t-if="raw_line.forecast_expected_date">
-			<br/><span>Expected date: </span><span t-field="raw_line.forecast_expected_date" t-options='{"widget": "date"}'/><br/>
-		</t>
+    <xpath expr="/t/t/t/t/div/table/tbody/t/tr/td[1]/span" position="after">
+        <t t-if="raw_line.forecast_expected_date">
+            <br/><span>Expected date: </span><span t-field="raw_line.forecast_expected_date" t-options='{"widget": "date"}'/><br/>
+        </t>
 
-    	<!--
-		<span>Qty: </span><span t-field="raw_line.product_uom_qty"/><br/>
-    	<span>Forecast: </span><span t-field="raw_line.forecast_availability"/><br/>
-    	<span>Available: </span><span t-field="raw_line.availability"/><br/>
-		-->
+        <!--
+        <span>Qty: </span><span t-field="raw_line.product_uom_qty"/><br/>
+        <span>Forecast: </span><span t-field="raw_line.forecast_availability"/><br/>
+        <span>Available: </span><span t-field="raw_line.availability"/><br/>
+        -->
 
-		<t t-if="len(raw_line.move_line_ids) > 0 and raw_line.move_line_ids[0].lot_id">
-			<br/><span>Lot(s): </span><span t-foreach="raw_line.move_line_ids" t-as="move_line"><span t-field="move_line.lot_id"/> </span>
-		</t>
-	</xpath>
+        <t t-if="len(raw_line.move_line_ids) > 0 and raw_line.move_line_ids[0].lot_id">
+            <br/><span>Lot(s): </span><span t-foreach="raw_line.move_line_ids" t-as="move_line"><span t-field="move_line.lot_id"/> </span>
+        </t>
+    </xpath>
 
 </data>
diff --git a/snippets/mrp.report_mrporder.show_lot_producing.xml b/snippets/mrp.report_mrporder.show_lot_producing.xml
new file mode 100644
index 00000000..76fda748
--- /dev/null
+++ b/snippets/mrp.report_mrporder.show_lot_producing.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<data inherit_id="mrp.report_mrporder" priority="60">
+    <xpath expr="//div/div[4]/div[1]/span" position="after">
+        <span t-if="o.lot_producing_id">
+            <br/>Los: <span t-field="o.lot_producing_id.name"/>
+        </span>
+    </xpath>
+</data>
\ No newline at end of file
diff --git a/snippets/mrp.report_mrporder.show_stock.xml b/snippets/mrp.report_mrporder.show_stock.xml
index 3027bf32..aa31658a 100644
--- a/snippets/mrp.report_mrporder.show_stock.xml
+++ b/snippets/mrp.report_mrporder.show_stock.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <data inherit_id="mrp.report_mrporder" priority="60">
-	<xpath expr="//table/thead/tr/th[2]" position="after">
+    <xpath expr="//table/thead/tr/th[2]" position="after">
         <th>
             <span>Lagerort (Los) Menge</span>
         </th>
@@ -10,14 +10,9 @@
             <span t-foreach="raw_line.move_line_ids" t-as="move_line">
                 <span t-field="move_line.location_id.display_name"/>
                 <t t-if="move_line.lot_id"> (<span t-field="move_line.lot_id"/>) </t>
-                <span t-field="move_line.product_uom_qty"/>
+                <span t-field="move_line.reserved_uom_qty"/>
                 <br/>
             </span>
         </td>
     </xpath>
-    <xpath expr="//div/div[4]/div[1]/span" position="after">
-        <span t-if="o.lot_producing_id">
-            <br/>Los: <span t-field="o.lot_producing_id.name"/>
-        </span>
-    </xpath>
 </data>
\ No newline at end of file
diff --git a/snippets/mrp.stock_report_delivery_kit_sections.expand_section_heading.xml b/snippets/mrp.stock_report_delivery_kit_sections.expand_section_heading.xml
index 9b3f05f3..69573514 100644
--- a/snippets/mrp.stock_report_delivery_kit_sections.expand_section_heading.xml
+++ b/snippets/mrp.stock_report_delivery_kit_sections.expand_section_heading.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <data inherit_id="mrp.stock_report_delivery_kit_sections" priority="50">
-	
+    
     <xpath expr="//span[@t-esc='kit.display_name']" position="after">
         <br/>bestehend aus:       
     </xpath>
diff --git a/snippets/mrp.view_mrp_bom_filter.add_operation_ids.xml b/snippets/mrp.view_mrp_bom_filter.add_operation_ids.xml
index 70730a75..a3f121aa 100644
--- a/snippets/mrp.view_mrp_bom_filter.add_operation_ids.xml
+++ b/snippets/mrp.view_mrp_bom_filter.add_operation_ids.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0"?>
 <data inherit_id="mrp.view_mrp_bom_filter"  priority="50">
 
-	<xpath expr="//field[@name='bom_line_ids']" position="after">
-		<filter string="Mit Vorgängen" name="operation" domain="[('operation_ids', '!=', False)]"/>
-		<filter string="Ohne Vorgänge" name="operation" domain="[('operation_ids', '=', False)]"/>
-	</xpath>
+    <xpath expr="//field[@name='bom_line_ids']" position="after">
+        <filter string="Mit Vorgängen" name="operation" domain="[('operation_ids', '!=', False)]"/>
+        <filter string="Ohne Vorgänge" name="operation" domain="[('operation_ids', '=', False)]"/>
+    </xpath>
 
 </data>
\ No newline at end of file
diff --git a/snippets/mrp.view_mrp_bom_filter.add_x_type_description.xml b/snippets/mrp.view_mrp_bom_filter.add_x_type_description.xml
index 2d2a229e..8bf8e435 100644
--- a/snippets/mrp.view_mrp_bom_filter.add_x_type_description.xml
+++ b/snippets/mrp.view_mrp_bom_filter.add_x_type_description.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <data inherit_id="mrp.view_mrp_bom_filter" priority="50">
 
-	<xpath expr="//field[@name='bom_line_ids']" position="after">
-		<field name="x_type_description" string="Typenbezeichnung" filter_domain="['|', ('x_type_description', 'ilike', self), ('x_type_description_bom_line', 'ilike', self)]"/>
-	</xpath>
+    <xpath expr="//field[@name='bom_line_ids']" position="after">
+        <field name="x_type_description" string="Typenbezeichnung" filter_domain="['|', ('x_type_description', 'ilike', self), ('x_type_description_bom_line', 'ilike', self)]"/>
+    </xpath>
 
 </data> 
\ No newline at end of file
diff --git a/snippets/mrp.view_mrp_production_filter.add_not_planned.xml b/snippets/mrp.view_mrp_production_filter.add_not_planned.xml
index 3d52480c..3623de39 100644
--- a/snippets/mrp.view_mrp_production_filter.add_not_planned.xml
+++ b/snippets/mrp.view_mrp_production_filter.add_not_planned.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <data inherit_id="mrp.view_mrp_production_filter" priority="50">
 
-	<xpath expr="//filter[@name='filter_planned']" position="after">
-		<filter string="Nicht geplant" name="filter_not_planned" domain="[('is_planned', '!=', True)]" groups="mrp.group_mrp_routings"/>
-	</xpath>
+    <xpath expr="//filter[@name='filter_planned']" position="after">
+        <filter string="Nicht geplant" name="filter_not_planned" domain="[('is_planned', '!=', True)]" groups="mrp.group_mrp_routings"/>
+    </xpath>
 
 </data>
\ No newline at end of file
diff --git a/snippets/payment.md b/snippets/payment.md
new file mode 100644
index 00000000..4d25aac6
--- /dev/null
+++ b/snippets/payment.md
@@ -0,0 +1,17 @@
+# Payment
+## Payment Provider List  
+### Enable Create  
+ID: `mint_system.payment.payment_provider_list.enable_create`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="payment.payment_provider_list" priority="50">
+
+  <tree position="attributes">
+    <attribute name="create">1</attribute>
+  </tree>
+  
+</data>
+
+```
+Source: [snippets/payment.payment_provider_list.enable_create.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/payment.payment_provider_list.enable_create.xml)
+
diff --git a/snippets/payment.payment_provider_list.enable_create.xml b/snippets/payment.payment_provider_list.enable_create.xml
new file mode 100644
index 00000000..b5003299
--- /dev/null
+++ b/snippets/payment.payment_provider_list.enable_create.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<data inherit_id="payment.payment_provider_list" priority="50">
+
+  <tree position="attributes">
+    <attribute name="create">1</attribute>
+  </tree>
+  
+</data>
diff --git a/snippets/portal.md b/snippets/portal.md
new file mode 100644
index 00000000..5171187e
--- /dev/null
+++ b/snippets/portal.md
@@ -0,0 +1,40 @@
+# Portal
+## Portal My Details Fields  
+### Show Firstname Lastname  
+ID: `mint_system.portal.portal_my_details_fields.show_firstname_lastname`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="portal.portal_my_details_fields" priority="50">
+
+  <xpath expr="//input[@name='name']/.." position="replace">
+    <div t-attf-class="mb-3 #{error.get('firstname') and 'o_has_error' or ''} col-xl-6">
+      <label class="col-form-label" for="firstname">Firstname</label>
+      <input type="text" name="firstname" t-attf-class="form-control #{error.get('firstname') and 'is-invalid' or ''}" t-att-value="firstname or partner.firstname" />
+    </div>
+    <div t-attf-class="mb-3 #{error.get('lastname') and 'o_has_error' or ''} col-xl-6">
+      <label class="col-form-label" for="lastname">Lastname</label>
+      <input type="text" name="lastname" t-attf-class="form-control #{error.get('lastname') and 'is-invalid' or ''}" t-att-value="lastname or partner.lastname" />
+    </div>
+  </xpath>
+
+</data>
+```
+Source: [snippets/portal.portal_my_details_fields.show_firstname_lastname.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/portal.portal_my_details_fields.show_firstname_lastname.xml)
+
+### Show Street2  
+ID: `mint_system.portal.portal_my_details_fields.show_street2`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="portal.portal_my_details_fields" priority="50">
+
+  <xpath expr="//input[@name='street']/.." position="after">
+    <div t-attf-class="mb-3 #{error.get('street') and 'o_has_error' or ''} col-xl-6">
+      <label class="col-form-label" for="street2">Street2</label>
+      <input type="text" name="street2" t-attf-class="form-control #{error.get('street2') and 'is-invalid' or ''}" t-att-value="street2 or partner.street2"/>
+    </div>
+  </xpath>
+
+</data>
+```
+Source: [snippets/portal.portal_my_details_fields.show_street2.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/portal.portal_my_details_fields.show_street2.xml)
+
diff --git a/snippets/portal.portal_my_details_fields.show_firstname_lastname.xml b/snippets/portal.portal_my_details_fields.show_firstname_lastname.xml
new file mode 100644
index 00000000..9f6cc17b
--- /dev/null
+++ b/snippets/portal.portal_my_details_fields.show_firstname_lastname.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<data inherit_id="portal.portal_my_details_fields" priority="50">
+
+  <xpath expr="//input[@name='name']/.." position="replace">
+    <div t-attf-class="mb-3 #{error.get('firstname') and 'o_has_error' or ''} col-xl-6">
+      <label class="col-form-label" for="firstname">Firstname</label>
+      <input type="text" name="firstname" t-attf-class="form-control #{error.get('firstname') and 'is-invalid' or ''}" t-att-value="firstname or partner.firstname" />
+    </div>
+    <div t-attf-class="mb-3 #{error.get('lastname') and 'o_has_error' or ''} col-xl-6">
+      <label class="col-form-label" for="lastname">Lastname</label>
+      <input type="text" name="lastname" t-attf-class="form-control #{error.get('lastname') and 'is-invalid' or ''}" t-att-value="lastname or partner.lastname" />
+    </div>
+  </xpath>
+
+</data>
\ No newline at end of file
diff --git a/snippets/portal.portal_my_details_fields.show_street2.xml b/snippets/portal.portal_my_details_fields.show_street2.xml
new file mode 100644
index 00000000..2110e54a
--- /dev/null
+++ b/snippets/portal.portal_my_details_fields.show_street2.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<data inherit_id="portal.portal_my_details_fields" priority="50">
+
+  <xpath expr="//input[@name='street']/.." position="after">
+    <div t-attf-class="mb-3 #{error.get('street') and 'o_has_error' or ''} col-xl-6">
+      <label class="col-form-label" for="street2">Street2</label>
+      <input type="text" name="street2" t-attf-class="form-control #{error.get('street2') and 'is-invalid' or ''}" t-att-value="street2 or partner.street2"/>
+    </div>
+  </xpath>
+
+</data>
\ No newline at end of file
diff --git a/snippets/product.md b/snippets/product.md
index e0cac0b3..ae37643a 100644
--- a/snippets/product.md
+++ b/snippets/product.md
@@ -531,6 +531,24 @@ 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-Build/tree/14.0/snippets/product.product_template_only_form_view.x_hide_on_delivery.xml)
 
+### X Hide On Invoice  
+ID: `mint_system.product.product_template_only_form_view.x_hide_on_invoice`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="product.product_template_only_form_view" priority="50">
+
+    <group name="properties" position="before">
+        <group>
+            <group>
+                <field name="x_hide_on_invoice" widget="boolean_toggle" />
+            </group>
+        </group>
+    </group>
+
+</data>
+```
+Source: [snippets/product.product_template_only_form_view.x_hide_on_invoice.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/product.product_template_only_form_view.x_hide_on_invoice.xml)
+
 ### X Hide On Sale Order  
 ID: `mint_system.product.product_template_only_form_view.x_hide_on_sale_order`  
 ```xml
@@ -538,7 +556,7 @@ ID: `mint_system.product.product_template_only_form_view.x_hide_on_sale_order`
 <data inherit_id="product.product_template_only_form_view" priority="50">
 
     <field name="description_sale" position="after">
-        <field name="x_hide_on_sale_order" />
+        <field name="x_hide_on_sale_order" widget="boolean_toggle" />
     </field>
 
 </data>
diff --git a/snippets/product.product_template_only_form_view.x_hide_on_invoice.xml b/snippets/product.product_template_only_form_view.x_hide_on_invoice.xml
new file mode 100644
index 00000000..c83d4fc9
--- /dev/null
+++ b/snippets/product.product_template_only_form_view.x_hide_on_invoice.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<data inherit_id="product.product_template_only_form_view" priority="50">
+
+    <group name="properties" position="before">
+        <group>
+            <group>
+                <field name="x_hide_on_invoice" widget="boolean_toggle" />
+            </group>
+        </group>
+    </group>
+
+</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
index 784c5d18..cc1fa3be 100644
--- 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
@@ -2,7 +2,7 @@
 <data inherit_id="product.product_template_only_form_view" priority="50">
 
     <field name="description_sale" position="after">
-        <field name="x_hide_on_sale_order" />
+        <field name="x_hide_on_sale_order" widget="boolean_toggle" />
     </field>
 
 </data>
\ No newline at end of file
diff --git a/snippets/project.edit_project.show_collaborator_ids.xml b/snippets/project.edit_project.show_collaborator_ids.xml
new file mode 100644
index 00000000..e7a9cf35
--- /dev/null
+++ b/snippets/project.edit_project.show_collaborator_ids.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<data inherit_id="project.edit_project" priority="50">
+
+    <field name="privacy_visibility" position="after">
+        <field name="collaborator_ids" />
+    </field>
+
+</data>
diff --git a/snippets/project.md b/snippets/project.md
index 415c9419..d9917626 100644
--- a/snippets/project.md
+++ b/snippets/project.md
@@ -15,6 +15,21 @@ ID: `mint_system.project.edit_project.domain_action_view_so`
 ```
 Source: [snippets/project.edit_project.domain_action_view_so.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/project.edit_project.domain_action_view_so.xml)
 
+### Show Collaborator Ids  
+ID: `mint_system.project.edit_project.show_collaborator_ids`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="project.edit_project" priority="50">
+
+    <field name="privacy_visibility" position="after">
+        <field name="collaborator_ids" />
+    </field>
+
+</data>
+
+```
+Source: [snippets/project.edit_project.show_collaborator_ids.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/project.edit_project.show_collaborator_ids.xml)
+
 ### Show Date Start  
 ID: `mint_system.project.edit_project.show_date_start`  
 ```xml
@@ -196,7 +211,7 @@ ID: `mint_system.project.view_task_form2.domain_sale_line_id_active`
 <data inherit_id="project.view_task_form2" priority="50">
 
     <xpath expr="//field[@name='sale_line_id']" position="attributes">
-        <attribute name="domain">[('order_id.active', '=', True),('company_id', '=', company_id), ('is_service', '=', True), ('order_partner_id', 'child_of', commercial_partner_id), ('is_expense', '=', False), ('state', 'in', ['sale', 'done']), ('order_id', '=?', project_sale_order_id)]</attribute>
+        <attribute name="domain">[('x_service_policy', '=', 'delivered_timesheet'),('order_id.active', '=', True),('company_id', '=', company_id), ('is_service', '=', True), ('order_partner_id', 'child_of', commercial_partner_id), ('is_expense', '=', False), ('state', 'in', ['sale'])]</attribute>
     </xpath>
 
 </data>
@@ -364,6 +379,19 @@ ID: `mint_system.project.view_task_form2.show_key`
 ```
 Source: [snippets/project.view_task_form2.show_key.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/project.view_task_form2.show_key.xml)
 
+### Show Partner Mobile  
+ID: `mint_system.project.view_task_form2.show_partner_mobile`  
+```xml
+<data inherit_id="project.view_task_form2" priority="50">
+
+    <xpath expr="//field[@name='partner_phone']" position="after">
+        <field name="partner_mobile" widget="phone"/>
+    </xpath>
+
+</data>
+```
+Source: [snippets/project.view_task_form2.show_partner_mobile.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/project.view_task_form2.show_partner_mobile.xml)
+
 ### Timesheet Sort Date Desc  
 ID: `mint_system.project.view_task_form2.timesheet_sort_date_desc`  
 ```xml
@@ -385,8 +413,8 @@ ID: `mint_system.project.view_task_form2.x_business_requirement_id`
 <?xml version="1.0"?>
 <data inherit_id="project.view_task_form2" priority="50">
 
-	<field name="partner_id" position="before">
-	   <field name="x_business_requirement_id" domain="[('x_project_id', '=', project_id)]" context="{'default_project_id': project_id}"/>
+    <field name="partner_id" position="before">
+       <field name="x_business_requirement_id" domain="[('x_project_id', '=', project_id)]" context="{'default_project_id': project_id}"/>
   </field>
 
 </data>
@@ -400,8 +428,8 @@ ID: `mint_system.project.view_task_form2.x_lead_id`
 <?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 name="partner_id" position="before">
+       <field name="x_lead_id" attrs="{'invisible': [('x_lead_id','=', False)]}" />
   </field>
 
 </data>
@@ -464,6 +492,26 @@ ID: `mint_system.project.view_task_form2.x_vehicle_id`
 ```
 Source: [snippets/project.view_task_form2.x_vehicle_id.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/project.view_task_form2.x_vehicle_id.xml)
 
+## View Task Kanban  
+### Show Planned Date Begin  
+ID: `mint_system.project.view_task_kanban.show_planned_date_begin`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="project.view_task_kanban" priority="50">
+
+    <div name="date_deadline" position="replace">
+
+        <div t-if="record.planned_date_begin.raw_value" name="planned_date_begin" attrs="{'invisible': [('is_closed', '=', True)]}">
+            <field name="planned_date_begin" widget="remaining_days"/>
+        </div>
+
+    </div>
+
+</data>
+
+```
+Source: [snippets/project.view_task_kanban.show_planned_date_begin.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/project.view_task_kanban.show_planned_date_begin.xml)
+
 ## View Task Tree2  
 ### Sale Line Optional  
 ID: `mint_system.project.view_task_tree2.sale_line_optional`  
diff --git a/snippets/project.view_task_form2.domain_sale_line_id_active.xml b/snippets/project.view_task_form2.domain_sale_line_id_active.xml
index ea6ef8d0..83b66adf 100644
--- a/snippets/project.view_task_form2.domain_sale_line_id_active.xml
+++ b/snippets/project.view_task_form2.domain_sale_line_id_active.xml
@@ -2,7 +2,7 @@
 <data inherit_id="project.view_task_form2" priority="50">
 
     <xpath expr="//field[@name='sale_line_id']" position="attributes">
-        <attribute name="domain">[('order_id.active', '=', True),('company_id', '=', company_id), ('is_service', '=', True), ('order_partner_id', 'child_of', commercial_partner_id), ('is_expense', '=', False), ('state', 'in', ['sale', 'done']), ('order_id', '=?', project_sale_order_id)]</attribute>
+        <attribute name="domain">[('x_service_policy', '=', 'delivered_timesheet'),('order_id.active', '=', True),('company_id', '=', company_id), ('is_service', '=', True), ('order_partner_id', 'child_of', commercial_partner_id), ('is_expense', '=', False), ('state', 'in', ['sale'])]</attribute>
     </xpath>
 
 </data>
diff --git a/snippets/project.view_task_form2.show_partner_mobile.xml b/snippets/project.view_task_form2.show_partner_mobile.xml
new file mode 100644
index 00000000..c9e9f845
--- /dev/null
+++ b/snippets/project.view_task_form2.show_partner_mobile.xml
@@ -0,0 +1,7 @@
+<data inherit_id="project.view_task_form2" priority="50">
+
+    <xpath expr="//field[@name='partner_phone']" position="after">
+        <field name="partner_mobile" widget="phone"/>
+    </xpath>
+
+</data>
\ No newline at end of file
diff --git a/snippets/project.view_task_form2.x_business_requirement_id.xml b/snippets/project.view_task_form2.x_business_requirement_id.xml
index 3c811f0b..ed93a0e9 100644
--- a/snippets/project.view_task_form2.x_business_requirement_id.xml
+++ b/snippets/project.view_task_form2.x_business_requirement_id.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <data inherit_id="project.view_task_form2" priority="50">
 
-	<field name="partner_id" position="before">
-	   <field name="x_business_requirement_id" domain="[('x_project_id', '=', project_id)]" context="{'default_project_id': project_id}"/>
+    <field name="partner_id" position="before">
+       <field name="x_business_requirement_id" domain="[('x_project_id', '=', project_id)]" context="{'default_project_id': project_id}"/>
   </field>
 
 </data>
diff --git a/snippets/project.view_task_form2.x_lead_id.xml b/snippets/project.view_task_form2.x_lead_id.xml
index 4adb61a3..82ef811a 100644
--- a/snippets/project.view_task_form2.x_lead_id.xml
+++ b/snippets/project.view_task_form2.x_lead_id.xml
@@ -1,8 +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 name="partner_id" position="before">
+       <field name="x_lead_id" attrs="{'invisible': [('x_lead_id','=', False)]}" />
   </field>
 
 </data>
diff --git a/snippets/project.view_task_kanban.show_planned_date_begin.xml b/snippets/project.view_task_kanban.show_planned_date_begin.xml
new file mode 100644
index 00000000..47add0ab
--- /dev/null
+++ b/snippets/project.view_task_kanban.show_planned_date_begin.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<data inherit_id="project.view_task_kanban" priority="50">
+
+    <div name="date_deadline" position="replace">
+
+        <div t-if="record.planned_date_begin.raw_value" name="planned_date_begin" attrs="{'invisible': [('is_closed', '=', True)]}">
+            <field name="planned_date_begin" widget="remaining_days"/>
+        </div>
+
+    </div>
+
+</data>
diff --git a/snippets/project_enterprise.md b/snippets/project_enterprise.md
new file mode 100644
index 00000000..93989580
--- /dev/null
+++ b/snippets/project_enterprise.md
@@ -0,0 +1,17 @@
+# Project Enterprise
+## Project Task View Form  
+### Attributes Planned Date  
+ID: `mint_system.project_enterprise.project_task_view_form.attributes_planned_date`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="project_enterprise.project_task_view_form" priority="50">
+
+    <xpath expr="//div[@class='w-100'][1]]" position="attributes">
+        <attributes name="invisible">False</attributes>
+    </xpath>
+
+</data>
+
+```
+Source: [snippets/project_enterprise.project_task_view_form.attributes_planned_date.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/project_enterprise.project_task_view_form.attributes_planned_date.xml)
+
diff --git a/snippets/project_enterprise.project_task_view_form.attributes_planned_date.xml b/snippets/project_enterprise.project_task_view_form.attributes_planned_date.xml
new file mode 100644
index 00000000..cfd521bc
--- /dev/null
+++ b/snippets/project_enterprise.project_task_view_form.attributes_planned_date.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<data inherit_id="project_enterprise.project_task_view_form" priority="50">
+
+    <xpath expr="//div[@class='w-100'][1]]" position="attributes">
+        <attributes name="invisible">False</attributes>
+    </xpath>
+
+</data>
diff --git a/snippets/purchase.md b/snippets/purchase.md
index 38da0956..b907948d 100644
--- a/snippets/purchase.md
+++ b/snippets/purchase.md
@@ -244,6 +244,34 @@ ID: `mint_system.purchase.purchase_order_form.x_drawing_file`
 ```
 Source: [snippets/purchase.purchase_order_form.x_drawing_file.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/purchase.purchase_order_form.x_drawing_file.xml)
 
+### X Payment State  
+ID: `mint_system.purchase.purchase_order_form.x_payment_state`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="purchase.purchase_order_form" priority="50">
+
+  <xpath expr="//field[@name='picking_type_id']" position="after">
+    <field name="x_payment_state"/>
+  </xpath>
+
+</data>
+```
+Source: [snippets/purchase.purchase_order_form.x_payment_state.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/purchase.purchase_order_form.x_payment_state.xml)
+
+### X Recurring Inverval  
+ID: `mint_system.purchase.purchase_order_form.x_recurring_inverval`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="purchase.purchase_order_form" priority="50" >
+
+    <field name="order_type" position="after">
+        <field name="x_recurring_inverval" />
+    </field>
+
+</data>
+```
+Source: [snippets/purchase.purchase_order_form.x_recurring_inverval.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/purchase.purchase_order_form.x_recurring_inverval.xml)
+
 ## Purchase Order Kpis Tree  
 ### Add Comment  
 ID: `mint_system.purchase.purchase_order_kpis_tree.add_comment`  
@@ -260,6 +288,19 @@ ID: `mint_system.purchase.purchase_order_kpis_tree.add_comment`
 ```
 Source: [snippets/purchase.purchase_order_kpis_tree.add_comment.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/purchase.purchase_order_kpis_tree.add_comment.xml)
 
+### Add Date Planned  
+ID: `mint_system.purchase.purchase_order_kpis_tree.add_date_planned`  
+```xml
+<data inherit_id="purchase.purchase_order_kpis_tree" priority="50">
+
+    <xpath expr="//field[@name='date_order']" position="after">
+        <field string="Lieferdatum" widget="date" name="date_planned" decoration-danger="date_planned &lt; current_date"/>
+    </xpath>
+
+</data>
+```
+Source: [snippets/purchase.purchase_order_kpis_tree.add_date_planned.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/purchase.purchase_order_kpis_tree.add_date_planned.xml)
+
 ### Add Mail Reception Confirmed  
 ID: `mint_system.purchase.purchase_order_kpis_tree.add_mail_reception_confirmed`  
 ```xml
@@ -275,6 +316,47 @@ ID: `mint_system.purchase.purchase_order_kpis_tree.add_mail_reception_confirmed`
 ```
 Source: [snippets/purchase.purchase_order_kpis_tree.add_mail_reception_confirmed.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/purchase.purchase_order_kpis_tree.add_mail_reception_confirmed.xml)
 
+### Add Receipt Status  
+ID: `mint_system.purchase.purchase_order_kpis_tree.add_receipt_status`  
+```xml
+<data inherit_id="purchase.purchase_order_kpis_tree" priority="50">
+
+    <xpath expr="//field[@name='state']" position="after">
+        <field name="receipt_status" decoration-success="receipt_status=='full'" decoration-danger="receipt_status=='pending'" decoration-warning="receipt_status=='partial'"/>
+    </xpath>
+
+</data>
+```
+Source: [snippets/purchase.purchase_order_kpis_tree.add_receipt_status.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/purchase.purchase_order_kpis_tree.add_receipt_status.xml)
+
+### Format Date Order  
+ID: `mint_system.purchase.purchase_order_kpis_tree.format_date_order`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="purchase.purchase_order_kpis_tree" priority="50">
+
+    <xpath expr="//field[@name='date_order']" position="attributes">
+        <attribute name="widget">date</attribute>
+    </xpath>
+
+</data>
+```
+Source: [snippets/purchase.purchase_order_kpis_tree.format_date_order.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/purchase.purchase_order_kpis_tree.format_date_order.xml)
+
+### X Payment State  
+ID: `mint_system.purchase.purchase_order_kpis_tree.x_payment_state`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="purchase.purchase_order_kpis_tree" priority="50">
+
+  <xpath expr="//field[@name='invoice_status']" position="before">
+    <field name="x_payment_state" decoration-success="x_payment_state=='paid'" decoration-danger="x_payment_state=='not_paid'" decoration-warning="x_payment_state=='in_payment'" widget="badge"/>
+  </xpath>
+  
+</data>
+```
+Source: [snippets/purchase.purchase_order_kpis_tree.x_payment_state.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/purchase.purchase_order_kpis_tree.x_payment_state.xml)
+
 ## Purchase Order Line Tree  
 ### Reset View  
 ID: `mint_system.purchase.purchase_order_line_tree.reset_view`  
@@ -369,6 +451,37 @@ ID: `mint_system.purchase.purchase_order_view_tree.add_mail_reception_confirmed`
 ```
 Source: [snippets/purchase.purchase_order_view_tree.add_mail_reception_confirmed.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/purchase.purchase_order_view_tree.add_mail_reception_confirmed.xml)
 
+### Format State  
+ID: `mint_system.purchase.purchase_order_view_tree.format_state`  
+```xml
+<data inherit_id="purchase.purchase_order_view_tree" priority="50">
+
+    <xpath expr="//field[@name='state']" position="attributes">
+        <attribute name="invisible">0</attribute>
+        <attribute name="widget">badge</attribute>
+        <attribute name="decoration-success">state == 'purchase' or state == 'done'</attribute>
+        <attribute name="decoration-warning">state == 'to approve'</attribute>
+        <attribute name="decoration-info">state == 'draft' or state == 'sent'</attribute>
+    </xpath>
+
+</data>
+```
+Source: [snippets/purchase.purchase_order_view_tree.format_state.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/purchase.purchase_order_view_tree.format_state.xml)
+
+### X Payment Tree  
+ID: `mint_system.purchase.purchase_order_view_tree.x_payment_tree`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="purchase.purchase_order_view_tree" priority="50">
+
+    <xpath expr="//field[@name='invoice_status']" position="before">
+        <field name="x_payment_state" decoration-success="x_payment_state=='paid'" decoration-danger="x_payment_state=='not_paid'" decoration-warning="x_payment_state=='in_payment'" widget="badge"/>
+    </xpath>
+
+</data>
+```
+Source: [snippets/purchase.purchase_order_view_tree.x_payment_tree.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/purchase.purchase_order_view_tree.x_payment_tree.xml)
+
 ## Report Purchaseorder Document  
 ### Add Agreement  
 ID: `mint_system.purchase.report_purchaseorder_document.add_agreement`  
@@ -480,6 +593,26 @@ ID: `mint_system.purchase.report_purchaseorder_document.add_taxes`
 ```
 Source: [snippets/purchase.report_purchaseorder_document.add_taxes.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/purchase.report_purchaseorder_document.add_taxes.xml)
 
+### Append Incoterm  
+ID: `mint_system.purchase.report_purchaseorder_document.append_incoterm`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="purchase.report_purchaseorder_document" priority="50">
+
+  <xpath expr="//div[@id='total']" position="after">
+    <div class="row">
+      <div class="col">
+        <span t-if="o.incoterm_id.display_name">
+           Lieferbedingungen: <strong t-field="o.incoterm_id.display_name"/>
+        </span>
+      </div>
+    </div>
+  </xpath>
+
+</data>
+```
+Source: [snippets/purchase.report_purchaseorder_document.append_incoterm.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/purchase.report_purchaseorder_document.append_incoterm.xml)
+
 ### Append Payment Terms  
 ID: `mint_system.purchase.report_purchaseorder_document.append_payment_terms`  
 ```xml
@@ -565,6 +698,21 @@ ID: `mint_system.purchase.report_purchaseorder_document.format_as_date`
 ```
 Source: [snippets/purchase.report_purchaseorder_document.format_as_date.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/purchase.report_purchaseorder_document.format_as_date.xml)
 
+### Format Date  
+ID: `mint_system.purchase.report_purchaseorder_document.format_date`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="purchase.report_purchaseorder_document" priority="50">>
+
+  <xpath expr="//tbody//td/span[@t-field='line.date_planned']" position="attributes">
+    <attribute name="t-options-widget">"date"</attribute>
+  </xpath>
+
+</data>
+
+```
+Source: [snippets/purchase.report_purchaseorder_document.format_date.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/purchase.report_purchaseorder_document.format_date.xml)
+
 ### Format Qty With Decimal  
 ID: `mint_system.purchase.report_purchaseorder_document.format_qty_with_decimal`  
 ```xml
@@ -840,6 +988,21 @@ ID: `mint_system.purchase.report_purchaseorder_document.product_description_repl
 ```
 Source: [snippets/purchase.report_purchaseorder_document.product_description_replace.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/purchase.report_purchaseorder_document.product_description_replace.xml)
 
+### Product Hide Bracket Description  
+ID: `mint_system.purchase.report_purchaseorder_document.product_hide_bracket_description`  
+```xml
+<data inherit_id="purchase.report_purchaseorder_document" priority="50">
+
+  <xpath expr="//td[@id='product']" position="replace">
+      <td id="product">
+        <span t-esc="line.name.split('(')[0].strip()"/>
+      </td>
+  </xpath>
+  
+</data>
+```
+Source: [snippets/purchase.report_purchaseorder_document.product_hide_bracket_description.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/purchase.report_purchaseorder_document.product_hide_bracket_description.xml)
+
 ### Qty Remaining  
 ID: `mint_system.purchase.report_purchaseorder_document.qty_remaining`  
 ```xml
@@ -902,6 +1065,19 @@ ID: `mint_system.purchase.report_purchaseorder_document.remove_taxes`
 ```
 Source: [snippets/purchase.report_purchaseorder_document.remove_taxes.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/purchase.report_purchaseorder_document.remove_taxes.xml)
 
+### Remove User Id  
+ID: `mint_system.purchase.report_purchaseorder_document.remove_user_id`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="purchase.report_purchaseorder_document" priority="50">
+
+    <xpath expr="//p[@t-field='o.user_id']/.." position="replace">
+    </xpath>
+
+</data>
+```
+Source: [snippets/purchase.report_purchaseorder_document.remove_user_id.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/purchase.report_purchaseorder_document.remove_user_id.xml)
+
 ### Remove Vat  
 ID: `mint_system.purchase.report_purchaseorder_document.remove_vat`  
 ```xml
@@ -937,6 +1113,75 @@ ID: `mint_system.purchase.report_purchaseorder_document.rename_deadline`
 ```
 Source: [snippets/purchase.report_purchaseorder_document.rename_deadline.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/purchase.report_purchaseorder_document.rename_deadline.xml)
 
+### Replace Address And Information Block  
+ID: `mint_system.purchase.report_purchaseorder_document.replace_address_and_information_block`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="purchase.report_purchaseorder_document" priority="50">
+
+  <xpath expr="//t[@t-set='address']" position="replace"/>
+
+  <xpath expr="//div[@class='page'][1]" position="before">
+
+    <div class="row text-900 o_bold">
+      <div class="col-7">Vendor</div>
+      <div class="col-5">Invoice Address</div>
+    </div>
+
+    <div class="row">
+      <div class="col-7">
+        <span t-field="o.partner_id.commercial_company_name"/>
+        <span t-field="o.partner_id" t-options-widget="&quot;contact&quot;" t-options-no_marker="True" t-options-fields="['address']"/>
+      </div>
+      <div class="col-5">
+        <span t-field="o.company_id.name"/>
+        <span t-field="o.picking_type_id.warehouse_id.partner_id" t-options-widget="&quot;contact&quot;" t-options-no_marker="True" t-options-fields="['address']"/>
+      </div>
+    </div>
+
+    <div class="row">
+      <div class="col-5 text-900 o_bold offset-7" style="margin-top:25px">Delivery Address</div>
+    </div>
+
+    <div class="row">
+      <div class="col-5 offset-7">
+        <div>
+          <span t-field="o.picking_type_id.company_id.name"/>
+        </div>
+        <span t-field="o.picking_type_id.name"/>
+        <span t-field="o.picking_type_id.warehouse_id.partner_id" t-options-widget="&quot;contact&quot;" t-options-fields="['address']" t-options-no_marker="True"/>
+      </div>
+    </div>
+
+    <div class="row o_bold text-900" style="margin-top:25px">
+      <div class="col-7">Your Contact</div>
+      <div class="col-5">Our Contact</div>
+    </div>
+
+    <div class="row">
+      <div class="col-7">
+        <span t-field="o.partner_id.name"/>
+      </div>
+      <div class="col-5">
+        <span t-field="o.user_id.name"/>
+      </div>
+    </div>
+
+    <div class="row">
+      <div class="col-7" style="margin-bottom:25px">
+        <span t-field="o.partner_id" t-options-widget="&quot;contact&quot;" t-options-fields="['phone', 'email']" t-options-no_marker="True"/>
+      </div>
+      <div class="col-5">
+        <span t-field="o.user_id" t-options-widget="&quot;contact&quot;" t-options-fields="['phone', 'email']" t-options-no_marker="True"/>
+      </div>
+    </div>
+
+  </xpath>
+
+</data>
+```
+Source: [snippets/purchase.report_purchaseorder_document.replace_address_and_information_block.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/purchase.report_purchaseorder_document.replace_address_and_information_block.xml)
+
 ### Replace Informations  
 ID: `mint_system.purchase.report_purchaseorder_document.replace_informations`  
 ```xml
@@ -1113,13 +1358,36 @@ ID: `mint_system.purchase.report_purchaseorder_document.replace_representative`
 ```
 Source: [snippets/purchase.report_purchaseorder_document.replace_representative.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/purchase.report_purchaseorder_document.replace_representative.xml)
 
+### Replace Taxes Id  
+ID: `mint_system.purchase.report_purchaseorder_document.replace_taxes_id`  
+```xml
+<data inherit_id="purchase.report_purchaseorder_document" priority="50">
+
+  <xpath expr="//thead//th[@name='th_taxes']" position="replace"/>
+  <xpath expr="//thead//th[@name='th_amount']" position="before">
+    <th name="th_taxes" class="text-right">
+      <strong>Taxes</strong>
+    </th>
+  </xpath>
+
+  <xpath expr="//tbody//td[@name='td_taxes']" position="replace"/>
+  <xpath expr="//tbody//span[@t-field='line.price_subtotal']/.." position="before">
+    <td name="td_taxes" class="text-right">
+      <span t-esc="', '.join(map(lambda x: (x.description or x.name), line.taxes_id))"/>
+    </td>
+  </xpath>
+
+</data>
+```
+Source: [snippets/purchase.report_purchaseorder_document.replace_taxes_id.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/purchase.report_purchaseorder_document.replace_taxes_id.xml)
+
 ### Round Price  
 ID: `mint_system.purchase.report_purchaseorder_document.round_price`  
 ```xml
 <?xml version="1.0"?>
 <data inherit_id="purchase.report_purchaseorder_document" priority="50">
 
-  <xpath expr="//table[2]/tbody[1]/t[2]/tr[1]/t[1]/td[6]/span[1]" position="replace">
+  <xpath expr="//tbody//span[@t-field='line.price_unit']" position="replace">
     <span t-esc="'%g' % line.price_unit if str(line.price_unit)[::-1].find('.') >= 3 else '%.2f' % line.price_unit"/>
   </xpath>
 
@@ -1180,13 +1448,13 @@ ID: `mint_system.purchase.report_purchaseorder_document.set_ids`
 <?xml version="1.0"?>
 <data inherit_id="purchase.report_purchaseorder_document" priority="50">
 
-	<xpath expr="//span[@t-field='line.product_qty']" position="attributes">
-		<attribute name="id">product_qty</attribute>
-	</xpath>
+    <xpath expr="//span[@t-field='line.product_qty']" position="attributes">
+        <attribute name="id">product_qty</attribute>
+    </xpath>
 
   <xpath expr="//span[@t-field='line.product_uom.name']" position="attributes">
-		<attribute name="id">product_uom</attribute>
-	</xpath>
+        <attribute name="id">product_uom</attribute>
+    </xpath>
 
 </data>
 
@@ -1214,57 +1482,135 @@ ID: `mint_system.purchase.report_purchaseorder_document.show_seller_product`
 ```
 Source: [snippets/purchase.report_purchaseorder_document.show_seller_product.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/purchase.report_purchaseorder_document.show_seller_product.xml)
 
+### Style Carbo Link  
+ID: `mint_system.purchase.report_purchaseorder_document.style_carbo_link`  
+```xml
+<data inherit_id="purchase.report_purchaseorder_document" priority="60">
+
+    <xpath expr="//div[hasclass('page')]" position="before">
+        <style>
+        .o_company_1_layout {
+            font-family: Dobra-Book;
+            font-size: 80%;
+            }
+        h2 {
+               font-size: 1.5rem;
+              }
+        </style>
+    </xpath>
+
+    <xpath expr="//p[@t-field='o.date_order']" position="attributes">
+        <attribute name="t-options-widget">"date"</attribute>
+    </xpath>
+
+    <xpath expr="//span[@t-field='line.date_planned']" position="attributes">
+        <attribute name="t-options-widget">"date"</attribute>
+    </xpath>
+
+</data>
+```
+Source: [snippets/purchase.report_purchaseorder_document.style_carbo_link.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/purchase.report_purchaseorder_document.style_carbo_link.xml)
+
+### Style Gelso  
+ID: `mint_system.purchase.report_purchaseorder_document.style_gelso`  
+```xml
+<data inherit_id="purchase.report_purchaseorder_document" priority="50">
+
+    <xpath expr="//th[@name='th_description']" position="attributes">
+        <attribute name="style" separator=" " add="width: 250px"/>
+    </xpath>
+
+</data>
+```
+Source: [snippets/purchase.report_purchaseorder_document.style_gelso.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/purchase.report_purchaseorder_document.style_gelso.xml)
+
 ### Style Moser  
 ID: `mint_system.purchase.report_purchaseorder_document.style_moser`  
 ```xml
 <data inherit_id="purchase.report_purchaseorder_document" priority="50">
 
 <xpath expr="//div[hasclass('page')]" position="before">
-		<style>
-		.o_company_1_layout {
-        	font-family: arial;
-     	}
-		.o_company_1_layout.o_report_layout_standard h2 {
-        	color: black;
-       		font-size: 1.4rem;
-			    font-weight: bold;
-     	}
-     	.o_company_1_layout.o_report_layout_standard #total strong {
-        	color: black;
-     	}
-     	div#informations {
-     	 	margin-top: 30px;
-     	 	margin-bottom: 60px;
-     	}
-     	h2.mt-4 {
-     	 	margin-top: 70px !important;
-     	}
-     	td#taxes_amount {
-     	 	text-align: right;
-     	}
-		</style>
-	</xpath>
+        <style>
+        .o_company_1_layout {
+            font-family: arial;
+         }
+        .o_company_1_layout.o_report_layout_standard h2 {
+            color: black;
+               font-size: 1.4rem;
+                font-weight: bold;
+         }
+         .o_company_1_layout.o_report_layout_standard #total strong {
+            color: black;
+         }
+         div#informations {
+              margin-top: 30px;
+              margin-bottom: 60px;
+         }
+         h2.mt-4 {
+              margin-top: 70px !important;
+         }
+         td#taxes_amount {
+              text-align: right;
+         }
+        </style>
+    </xpath>
 
-	<xpath expr="//th[@name='th_description']" position="attributes">
-		<attribute name="style" separator=" " add="text-align: left"/>
-	</xpath>
+    <xpath expr="//th[@name='th_description']" position="attributes">
+        <attribute name="style" separator=" " add="text-align: left"/>
+    </xpath>
 
-	<xpath expr="//span[@t-field='line.date_planned']" position="attributes">
-		<attribute name="t-options-widget">"date"</attribute>
-	</xpath>
+    <xpath expr="//span[@t-field='line.date_planned']" position="attributes">
+        <attribute name="t-options-widget">"date"</attribute>
+    </xpath>
 
-	<xpath expr="/t[1]/t[1]/t[4]/t[1]/div[1]/div[1]" position="attributes">
-		<attribute name="t-options-fields">['address']</attribute>
-	</xpath>
+    <xpath expr="/t[1]/t[1]/t[4]/t[1]/div[1]/div[1]" position="attributes">
+        <attribute name="t-options-fields">['address']</attribute>
+    </xpath>
 
-	<xpath expr="//div[@t-field='o.partner_id']" position="attributes">
-		<attribute name="t-options-fields">['address', 'name']</attribute>
-	</xpath>
+    <xpath expr="//div[@t-field='o.partner_id']" position="attributes">
+        <attribute name="t-options-fields">['address', 'name']</attribute>
+    </xpath>
 
 </data>
 ```
 Source: [snippets/purchase.report_purchaseorder_document.style_moser.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/purchase.report_purchaseorder_document.style_moser.xml)
 
+### Style Tissa  
+ID: `mint_system.purchase.report_purchaseorder_document.style_tissa`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="purchase.report_purchaseorder_document" priority="50">
+
+    <xpath expr="//div[hasclass('page')]" position="before">
+        <style>
+            table#info {
+                font-size: 9pt;
+                font-family: arial;
+            }
+            h2 {
+              font-size: 1.2rem;
+              font-weight: bold;
+              margin: 50px 0 30px 0
+            }
+            body {
+                font-size: 11pt;
+                font-family: arial;
+            }
+        </style>
+    </xpath>
+
+    <xpath expr="//div[@t-field='o.picking_type_id.warehouse_id.partner_id']" position="attributes">
+        <attribute name="t-options">{&quot;widget&quot;: &quot;contact&quot;, &quot;fields&quot;: [&quot;address&quot;], &quot;no_marker&quot;: True, &quot;phone_icons&quot;: False}</attribute>
+    </xpath>
+
+    <xpath expr="//div[@t-field='o.partner_id']" position="attributes">
+        <attribute name="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}</attribute>
+    </xpath>
+
+</data>
+```
+Source: [snippets/purchase.report_purchaseorder_document.style_tissa.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/purchase.report_purchaseorder_document.style_tissa.xml)
+
 ### Terms And Conditions  
 ID: `mint_system.purchase.report_purchaseorder_document.terms_and_conditions`  
 ```xml
@@ -1565,7 +1911,7 @@ ID: `mint_system.purchase.report_purchasequotation_document.format_date`
 <?xml version="1.0"?>
 <data inherit_id="purchase.report_purchasequotation_document" priority="50">
 
-  <xpath expr="//tbody[1]/t[1]/tr[1]/t[1]/td[2]/span[1]" position="attributes">
+  <xpath expr="//tbody//td/span[@t-field='order_line.date_planned']" position="attributes">
     <attribute name="t-options-widget">"date"</attribute>
   </xpath>
 
@@ -1764,6 +2110,22 @@ ID: `mint_system.purchase.report_purchasequotation_document.modify_main_table`
 ```
 Source: [snippets/purchase.report_purchasequotation_document.modify_main_table.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/purchase.report_purchasequotation_document.modify_main_table.xml)
 
+### Product Hide Bracket Description  
+ID: `mint_system.purchase.report_purchasequotation_document.product_hide_bracket_description`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="purchase.report_purchasequotation_document" priority="50">
+
+  <xpath expr="//td[@id='product']" position="replace">
+    <td id="product">
+      <span t-esc="order_line.name.split('(')[0].strip()"/>
+    </td>
+  </xpath>
+
+</data>
+```
+Source: [snippets/purchase.report_purchasequotation_document.product_hide_bracket_description.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/purchase.report_purchasequotation_document.product_hide_bracket_description.xml)
+
 ### Remove Date Planned  
 ID: `mint_system.purchase.report_purchasequotation_document.remove_date_planned`  
 ```xml
@@ -1913,9 +2275,9 @@ ID: `mint_system.purchase.report_purchasequotation_document.set_ids`
 <?xml version="1.0"?>
 <data inherit_id="purchase.report_purchasequotation_document" priority="50">
 
-	<xpath expr="//span[@t-field='line.product_qty']" position="attributes">
-		<attribute name="id">product_qty</attribute>
-	</xpath>
+    <xpath expr="//span[@t-field='line.product_qty']" position="attributes">
+        <attribute name="id">product_qty</attribute>
+    </xpath>
 
 </data>
 ```
@@ -1927,44 +2289,44 @@ ID: `mint_system.purchase.report_purchasequotation_document.style_moser`
 <?xml version="1.0"?>
 <data inherit_id="purchase.report_purchasequotation_document" priority="60">
 
-	<xpath expr="//div[hasclass('page')]" position="before">
-		<style>
-		.o_company_1_layout {
-        	font-family: arial;
-     	}
-		.o_company_1_layout.o_report_layout_standard h2 {
-        	color: black;
-       		font-size: 1.4rem;
-			    font-weight: bold;
-     	}
-     	.o_company_1_layout.o_report_layout_standard #total strong {
-        	color: black;
-     	}
-     	div#informations {
-     	 	margin-top: 30px;
-     	 	margin-bottom: 60px;
-     	}
-     	h2.mt-4 {
-     	 	margin-top: 70px !important;
-     	}
-		</style>
-	</xpath>
+    <xpath expr="//div[hasclass('page')]" position="before">
+        <style>
+        .o_company_1_layout {
+            font-family: arial;
+         }
+        .o_company_1_layout.o_report_layout_standard h2 {
+            color: black;
+               font-size: 1.4rem;
+                font-weight: bold;
+         }
+         .o_company_1_layout.o_report_layout_standard #total strong {
+            color: black;
+         }
+         div#informations {
+              margin-top: 30px;
+              margin-bottom: 60px;
+         }
+         h2.mt-4 {
+              margin-top: 70px !important;
+         }
+        </style>
+    </xpath>
 
-	<xpath expr="//th[@name='th_description']" position="attributes">
-		<attribute name="style" separator=" " add="text-align: left"/>
-	</xpath>
+    <xpath expr="//th[@name='th_description']" position="attributes">
+        <attribute name="style" separator=" " add="text-align: left"/>
+    </xpath>
 
-	<xpath expr="//span[@t-field='order_line.date_planned']" position="attributes">
-		<attribute name="t-options-widget">"date"</attribute>
-	</xpath>
+    <xpath expr="//span[@t-field='order_line.date_planned']" position="attributes">
+        <attribute name="t-options-widget">"date"</attribute>
+    </xpath>
 
-	<xpath expr="//div[1]/div[1]" position="attributes">
-		<attribute name="t-options-fields">['address']</attribute>
-	</xpath>
+    <xpath expr="//div[1]/div[1]" position="attributes">
+        <attribute name="t-options-fields">['address']</attribute>
+    </xpath>
 
-	<xpath expr="//div[@t-field='o.partner_id']" position="attributes">
-		<attribute name="t-options-fields">['address', 'name']</attribute>
-	</xpath>
+    <xpath expr="//div[@t-field='o.partner_id']" position="attributes">
+        <attribute name="t-options-fields">['address', 'name']</attribute>
+    </xpath>
 
 </data>
 ```
@@ -1976,78 +2338,78 @@ ID: `mint_system.purchase.report_purchasequotation_document.style_trimada`
 <?xml version="1.0"?>
 <data inherit_id="purchase.report_purchasequotation_document" priority="60">
 
-	<xpath expr="//div[hasclass('page')]" position="before">
-		<style>
-			table.trimada {
-				font-size: 9pt;
-				font-family: arial;
-				color: black;
-			}
-			table.trimada tr.first td {
-				padding-bottom: 0;
-			}
-			table.trimada tr.second td {
-				padding-top: 0;
-			}
-			table.trimada tr.second {
-				border-bottom: 1px solid rgb(220,220,220);
-			}
-			table.trimada thead tr {
-				border-top:solid 1px;
-				border-bottom: solid 1px;
-			}
-			table.trimada thead th#position {
-				width: 5mm;
-			}
-			table.trimada thead th#default_code {
-			  width: 27mm;
-			  text-align: right;
-			}
-			table.trimada thead th#open_quantity {
-			  width: 30mm;
-			  text-align: right;
-			}
-			table.trimada thead th#quantity {
-			  width: 25mm;
-			  text-align: right !important;
-			}
-			table.trimada tbody td#position {
-			  text-align: right;
-			}
-			table.trimada tbody td#default_code {
-			  text-align: right;
-			}
-			table.trimada tbody td#open_quantity {
-			  text-align: right !important;
-			}
-			table.trimada tbody td#quantity {
-			  text-align: right;
-			}			
-			table.trimada tbody span#qty {
-			  font-weight: bold;
-			}
-			table.trimada tbody span#open_qty {
-			  font-weight: bold;
-			}
-			.subtitel {
-				font-size: 11pt;
-				font-family: arial;
-				margin-top: 10mm;
-			}
-			.note {
-				font-size: 9pt;
-				font-family: arial;
-			}
-		</style>
-	</xpath>
+    <xpath expr="//div[hasclass('page')]" position="before">
+        <style>
+            table.trimada {
+                font-size: 9pt;
+                font-family: arial;
+                color: black;
+            }
+            table.trimada tr.first td {
+                padding-bottom: 0;
+            }
+            table.trimada tr.second td {
+                padding-top: 0;
+            }
+            table.trimada tr.second {
+                border-bottom: 1px solid rgb(220,220,220);
+            }
+            table.trimada thead tr {
+                border-top:solid 1px;
+                border-bottom: solid 1px;
+            }
+            table.trimada thead th#position {
+                width: 5mm;
+            }
+            table.trimada thead th#default_code {
+              width: 27mm;
+              text-align: right;
+            }
+            table.trimada thead th#open_quantity {
+              width: 30mm;
+              text-align: right;
+            }
+            table.trimada thead th#quantity {
+              width: 25mm;
+              text-align: right !important;
+            }
+            table.trimada tbody td#position {
+              text-align: right;
+            }
+            table.trimada tbody td#default_code {
+              text-align: right;
+            }
+            table.trimada tbody td#open_quantity {
+              text-align: right !important;
+            }
+            table.trimada tbody td#quantity {
+              text-align: right;
+            }            
+            table.trimada tbody span#qty {
+              font-weight: bold;
+            }
+            table.trimada tbody span#open_qty {
+              font-weight: bold;
+            }
+            .subtitel {
+                font-size: 11pt;
+                font-family: arial;
+                margin-top: 10mm;
+            }
+            .note {
+                font-size: 9pt;
+                font-family: arial;
+            }
+        </style>
+    </xpath>
 
-	<xpath expr="//table[2]" position="attributes">
-		<attribute name="class" separator=" " add="trimada table-borderless"/>
-	</xpath>
+    <xpath expr="//table[2]" position="attributes">
+        <attribute name="class" separator=" " add="trimada table-borderless"/>
+    </xpath>
 
-  	<xpath expr="//div[@name='information_block']" position="attributes">
-		<attribute name="class" separator=" " add="trimada table-borderless"/>
-	</xpath>
+      <xpath expr="//div[@name='information_block']" position="attributes">
+        <attribute name="class" separator=" " add="trimada table-borderless"/>
+    </xpath>
 
 </data>
 ```
diff --git a/snippets/purchase.purchase_order_form.x_payment_state.xml b/snippets/purchase.purchase_order_form.x_payment_state.xml
new file mode 100644
index 00000000..6f4fc3fa
--- /dev/null
+++ b/snippets/purchase.purchase_order_form.x_payment_state.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<data inherit_id="purchase.purchase_order_form" priority="50">
+
+  <xpath expr="//field[@name='picking_type_id']" position="after">
+    <field name="x_payment_state"/>
+  </xpath>
+
+</data>
\ No newline at end of file
diff --git a/snippets/purchase.purchase_order_form.x_recurring_inverval.xml b/snippets/purchase.purchase_order_form.x_recurring_inverval.xml
new file mode 100644
index 00000000..fc71e229
--- /dev/null
+++ b/snippets/purchase.purchase_order_form.x_recurring_inverval.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<data inherit_id="purchase.purchase_order_form" priority="50" >
+
+    <field name="order_type" position="after">
+        <field name="x_recurring_inverval" />
+    </field>
+
+</data>
\ No newline at end of file
diff --git a/snippets/purchase.purchase_order_kpis_tree.add_date_planned.xml b/snippets/purchase.purchase_order_kpis_tree.add_date_planned.xml
new file mode 100644
index 00000000..0b4ef648
--- /dev/null
+++ b/snippets/purchase.purchase_order_kpis_tree.add_date_planned.xml
@@ -0,0 +1,7 @@
+<data inherit_id="purchase.purchase_order_kpis_tree" priority="50">
+
+    <xpath expr="//field[@name='date_order']" position="after">
+        <field string="Lieferdatum" widget="date" name="date_planned" decoration-danger="date_planned &lt; current_date"/>
+    </xpath>
+
+</data>
\ No newline at end of file
diff --git a/snippets/purchase.purchase_order_kpis_tree.add_receipt_status.xml b/snippets/purchase.purchase_order_kpis_tree.add_receipt_status.xml
new file mode 100644
index 00000000..6657ab8d
--- /dev/null
+++ b/snippets/purchase.purchase_order_kpis_tree.add_receipt_status.xml
@@ -0,0 +1,7 @@
+<data inherit_id="purchase.purchase_order_kpis_tree" priority="50">
+
+    <xpath expr="//field[@name='state']" position="after">
+        <field name="receipt_status" decoration-success="receipt_status=='full'" decoration-danger="receipt_status=='pending'" decoration-warning="receipt_status=='partial'"/>
+    </xpath>
+
+</data>
\ No newline at end of file
diff --git a/snippets/purchase.purchase_order_kpis_tree.format_date_order.xml b/snippets/purchase.purchase_order_kpis_tree.format_date_order.xml
new file mode 100644
index 00000000..20f60979
--- /dev/null
+++ b/snippets/purchase.purchase_order_kpis_tree.format_date_order.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<data inherit_id="purchase.purchase_order_kpis_tree" priority="50">
+
+    <xpath expr="//field[@name='date_order']" position="attributes">
+        <attribute name="widget">date</attribute>
+    </xpath>
+
+</data>
\ No newline at end of file
diff --git a/snippets/purchase.purchase_order_kpis_tree.x_payment_state.xml b/snippets/purchase.purchase_order_kpis_tree.x_payment_state.xml
new file mode 100644
index 00000000..d5042dac
--- /dev/null
+++ b/snippets/purchase.purchase_order_kpis_tree.x_payment_state.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<data inherit_id="purchase.purchase_order_kpis_tree" priority="50">
+
+  <xpath expr="//field[@name='invoice_status']" position="before">
+    <field name="x_payment_state" decoration-success="x_payment_state=='paid'" decoration-danger="x_payment_state=='not_paid'" decoration-warning="x_payment_state=='in_payment'" widget="badge"/>
+  </xpath>
+  
+</data>
\ No newline at end of file
diff --git a/snippets/purchase.purchase_order_view_tree.format_state.xml b/snippets/purchase.purchase_order_view_tree.format_state.xml
new file mode 100644
index 00000000..2192103f
--- /dev/null
+++ b/snippets/purchase.purchase_order_view_tree.format_state.xml
@@ -0,0 +1,11 @@
+<data inherit_id="purchase.purchase_order_view_tree" priority="50">
+
+    <xpath expr="//field[@name='state']" position="attributes">
+        <attribute name="invisible">0</attribute>
+        <attribute name="widget">badge</attribute>
+        <attribute name="decoration-success">state == 'purchase' or state == 'done'</attribute>
+        <attribute name="decoration-warning">state == 'to approve'</attribute>
+        <attribute name="decoration-info">state == 'draft' or state == 'sent'</attribute>
+    </xpath>
+
+</data>
\ No newline at end of file
diff --git a/snippets/purchase.purchase_order_view_tree.x_payment_tree.xml b/snippets/purchase.purchase_order_view_tree.x_payment_tree.xml
new file mode 100644
index 00000000..6422fd21
--- /dev/null
+++ b/snippets/purchase.purchase_order_view_tree.x_payment_tree.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<data inherit_id="purchase.purchase_order_view_tree" priority="50">
+
+    <xpath expr="//field[@name='invoice_status']" position="before">
+        <field name="x_payment_state" decoration-success="x_payment_state=='paid'" decoration-danger="x_payment_state=='not_paid'" decoration-warning="x_payment_state=='in_payment'" widget="badge"/>
+    </xpath>
+
+</data>
\ No newline at end of file
diff --git a/snippets/purchase.report_purchaseorder_document.append_incoterm.xml b/snippets/purchase.report_purchaseorder_document.append_incoterm.xml
new file mode 100644
index 00000000..ca8c8826
--- /dev/null
+++ b/snippets/purchase.report_purchaseorder_document.append_incoterm.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<data inherit_id="purchase.report_purchaseorder_document" priority="50">
+
+  <xpath expr="//div[@id='total']" position="after">
+    <div class="row">
+      <div class="col">
+        <span t-if="o.incoterm_id.display_name">
+           Lieferbedingungen: <strong t-field="o.incoterm_id.display_name"/>
+        </span>
+      </div>
+    </div>
+  </xpath>
+
+</data>
\ No newline at end of file
diff --git a/snippets/purchase.report_purchaseorder_document.format_date.xml b/snippets/purchase.report_purchaseorder_document.format_date.xml
new file mode 100644
index 00000000..8055f448
--- /dev/null
+++ b/snippets/purchase.report_purchaseorder_document.format_date.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<data inherit_id="purchase.report_purchaseorder_document" priority="50">>
+
+  <xpath expr="//tbody//td/span[@t-field='line.date_planned']" position="attributes">
+    <attribute name="t-options-widget">"date"</attribute>
+  </xpath>
+
+</data>
diff --git a/snippets/purchase.report_purchaseorder_document.product_hide_bracket_description.xml b/snippets/purchase.report_purchaseorder_document.product_hide_bracket_description.xml
new file mode 100644
index 00000000..e23a6230
--- /dev/null
+++ b/snippets/purchase.report_purchaseorder_document.product_hide_bracket_description.xml
@@ -0,0 +1,9 @@
+<data inherit_id="purchase.report_purchaseorder_document" priority="50">
+
+  <xpath expr="//td[@id='product']" position="replace">
+      <td id="product">
+        <span t-esc="line.name.split('(')[0].strip()"/>
+      </td>
+  </xpath>
+  
+</data>
\ No newline at end of file
diff --git a/snippets/purchase.report_purchaseorder_document.remove_user_id.xml b/snippets/purchase.report_purchaseorder_document.remove_user_id.xml
new file mode 100644
index 00000000..23ba235c
--- /dev/null
+++ b/snippets/purchase.report_purchaseorder_document.remove_user_id.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<data inherit_id="purchase.report_purchaseorder_document" priority="50">
+
+    <xpath expr="//p[@t-field='o.user_id']/.." position="replace">
+    </xpath>
+
+</data>
\ No newline at end of file
diff --git a/snippets/purchase.report_purchaseorder_document.replace_address_and_information_block.xml b/snippets/purchase.report_purchaseorder_document.replace_address_and_information_block.xml
new file mode 100644
index 00000000..a188203b
--- /dev/null
+++ b/snippets/purchase.report_purchaseorder_document.replace_address_and_information_block.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0"?>
+<data inherit_id="purchase.report_purchaseorder_document" priority="50">
+
+  <xpath expr="//t[@t-set='address']" position="replace"/>
+
+  <xpath expr="//div[@class='page'][1]" position="before">
+
+    <div class="row text-900 o_bold">
+      <div class="col-7">Vendor</div>
+      <div class="col-5">Invoice Address</div>
+    </div>
+
+    <div class="row">
+      <div class="col-7">
+        <span t-field="o.partner_id.commercial_company_name"/>
+        <span t-field="o.partner_id" t-options-widget="&quot;contact&quot;" t-options-no_marker="True" t-options-fields="['address']"/>
+      </div>
+      <div class="col-5">
+        <span t-field="o.company_id.name"/>
+        <span t-field="o.picking_type_id.warehouse_id.partner_id" t-options-widget="&quot;contact&quot;" t-options-no_marker="True" t-options-fields="['address']"/>
+      </div>
+    </div>
+
+    <div class="row">
+      <div class="col-5 text-900 o_bold offset-7" style="margin-top:25px">Delivery Address</div>
+    </div>
+
+    <div class="row">
+      <div class="col-5 offset-7">
+        <div>
+          <span t-field="o.picking_type_id.company_id.name"/>
+        </div>
+        <span t-field="o.picking_type_id.name"/>
+        <span t-field="o.picking_type_id.warehouse_id.partner_id" t-options-widget="&quot;contact&quot;" t-options-fields="['address']" t-options-no_marker="True"/>
+      </div>
+    </div>
+
+    <div class="row o_bold text-900" style="margin-top:25px">
+      <div class="col-7">Your Contact</div>
+      <div class="col-5">Our Contact</div>
+    </div>
+
+    <div class="row">
+      <div class="col-7">
+        <span t-field="o.partner_id.name"/>
+      </div>
+      <div class="col-5">
+        <span t-field="o.user_id.name"/>
+      </div>
+    </div>
+
+    <div class="row">
+      <div class="col-7" style="margin-bottom:25px">
+        <span t-field="o.partner_id" t-options-widget="&quot;contact&quot;" t-options-fields="['phone', 'email']" t-options-no_marker="True"/>
+      </div>
+      <div class="col-5">
+        <span t-field="o.user_id" t-options-widget="&quot;contact&quot;" t-options-fields="['phone', 'email']" t-options-no_marker="True"/>
+      </div>
+    </div>
+
+  </xpath>
+
+</data>
\ No newline at end of file
diff --git a/snippets/purchase.report_purchaseorder_document.replace_taxes_id.xml b/snippets/purchase.report_purchaseorder_document.replace_taxes_id.xml
new file mode 100644
index 00000000..9d159b75
--- /dev/null
+++ b/snippets/purchase.report_purchaseorder_document.replace_taxes_id.xml
@@ -0,0 +1,17 @@
+<data inherit_id="purchase.report_purchaseorder_document" priority="50">
+
+  <xpath expr="//thead//th[@name='th_taxes']" position="replace"/>
+  <xpath expr="//thead//th[@name='th_amount']" position="before">
+    <th name="th_taxes" class="text-right">
+      <strong>Taxes</strong>
+    </th>
+  </xpath>
+
+  <xpath expr="//tbody//td[@name='td_taxes']" position="replace"/>
+  <xpath expr="//tbody//span[@t-field='line.price_subtotal']/.." position="before">
+    <td name="td_taxes" class="text-right">
+      <span t-esc="', '.join(map(lambda x: (x.description or x.name), line.taxes_id))"/>
+    </td>
+  </xpath>
+
+</data>
\ No newline at end of file
diff --git a/snippets/purchase.report_purchaseorder_document.round_price.xml b/snippets/purchase.report_purchaseorder_document.round_price.xml
index 07b3c0fd..3175a53a 100644
--- a/snippets/purchase.report_purchaseorder_document.round_price.xml
+++ b/snippets/purchase.report_purchaseorder_document.round_price.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <data inherit_id="purchase.report_purchaseorder_document" priority="50">
 
-  <xpath expr="//table[2]/tbody[1]/t[2]/tr[1]/t[1]/td[6]/span[1]" position="replace">
+  <xpath expr="//tbody//span[@t-field='line.price_unit']" position="replace">
     <span t-esc="'%g' % line.price_unit if str(line.price_unit)[::-1].find('.') >= 3 else '%.2f' % line.price_unit"/>
   </xpath>
 
diff --git a/snippets/purchase.report_purchaseorder_document.set_ids.xml b/snippets/purchase.report_purchaseorder_document.set_ids.xml
index 04e20ac7..0216ca4e 100644
--- a/snippets/purchase.report_purchaseorder_document.set_ids.xml
+++ b/snippets/purchase.report_purchaseorder_document.set_ids.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0"?>
 <data inherit_id="purchase.report_purchaseorder_document" priority="50">
 
-	<xpath expr="//span[@t-field='line.product_qty']" position="attributes">
-		<attribute name="id">product_qty</attribute>
-	</xpath>
+    <xpath expr="//span[@t-field='line.product_qty']" position="attributes">
+        <attribute name="id">product_qty</attribute>
+    </xpath>
 
   <xpath expr="//span[@t-field='line.product_uom.name']" position="attributes">
-		<attribute name="id">product_uom</attribute>
-	</xpath>
+        <attribute name="id">product_uom</attribute>
+    </xpath>
 
 </data>
diff --git a/snippets/purchase.report_purchaseorder_document.style_carbo_link.xml b/snippets/purchase.report_purchaseorder_document.style_carbo_link.xml
new file mode 100644
index 00000000..4f93eeaf
--- /dev/null
+++ b/snippets/purchase.report_purchaseorder_document.style_carbo_link.xml
@@ -0,0 +1,23 @@
+<data inherit_id="purchase.report_purchaseorder_document" priority="60">
+
+    <xpath expr="//div[hasclass('page')]" position="before">
+        <style>
+        .o_company_1_layout {
+            font-family: Dobra-Book;
+            font-size: 80%;
+            }
+        h2 {
+               font-size: 1.5rem;
+              }
+        </style>
+    </xpath>
+
+    <xpath expr="//p[@t-field='o.date_order']" position="attributes">
+        <attribute name="t-options-widget">"date"</attribute>
+    </xpath>
+
+    <xpath expr="//span[@t-field='line.date_planned']" position="attributes">
+        <attribute name="t-options-widget">"date"</attribute>
+    </xpath>
+
+</data>
\ No newline at end of file
diff --git a/snippets/purchase.report_purchaseorder_document.style_gelso.xml b/snippets/purchase.report_purchaseorder_document.style_gelso.xml
new file mode 100644
index 00000000..2d1ea4cf
--- /dev/null
+++ b/snippets/purchase.report_purchaseorder_document.style_gelso.xml
@@ -0,0 +1,7 @@
+<data inherit_id="purchase.report_purchaseorder_document" priority="50">
+
+    <xpath expr="//th[@name='th_description']" position="attributes">
+        <attribute name="style" separator=" " add="width: 250px"/>
+    </xpath>
+
+</data>
\ No newline at end of file
diff --git a/snippets/purchase.report_purchaseorder_document.style_moser.xml b/snippets/purchase.report_purchaseorder_document.style_moser.xml
index 19496d72..00d2a2c9 100644
--- a/snippets/purchase.report_purchaseorder_document.style_moser.xml
+++ b/snippets/purchase.report_purchaseorder_document.style_moser.xml
@@ -1,45 +1,45 @@
 <data inherit_id="purchase.report_purchaseorder_document" priority="50">
 
 <xpath expr="//div[hasclass('page')]" position="before">
-		<style>
-		.o_company_1_layout {
-        	font-family: arial;
-     	}
-		.o_company_1_layout.o_report_layout_standard h2 {
-        	color: black;
-       		font-size: 1.4rem;
-			    font-weight: bold;
-     	}
-     	.o_company_1_layout.o_report_layout_standard #total strong {
-        	color: black;
-     	}
-     	div#informations {
-     	 	margin-top: 30px;
-     	 	margin-bottom: 60px;
-     	}
-     	h2.mt-4 {
-     	 	margin-top: 70px !important;
-     	}
-     	td#taxes_amount {
-     	 	text-align: right;
-     	}
-		</style>
-	</xpath>
+        <style>
+        .o_company_1_layout {
+            font-family: arial;
+         }
+        .o_company_1_layout.o_report_layout_standard h2 {
+            color: black;
+               font-size: 1.4rem;
+                font-weight: bold;
+         }
+         .o_company_1_layout.o_report_layout_standard #total strong {
+            color: black;
+         }
+         div#informations {
+              margin-top: 30px;
+              margin-bottom: 60px;
+         }
+         h2.mt-4 {
+              margin-top: 70px !important;
+         }
+         td#taxes_amount {
+              text-align: right;
+         }
+        </style>
+    </xpath>
 
-	<xpath expr="//th[@name='th_description']" position="attributes">
-		<attribute name="style" separator=" " add="text-align: left"/>
-	</xpath>
+    <xpath expr="//th[@name='th_description']" position="attributes">
+        <attribute name="style" separator=" " add="text-align: left"/>
+    </xpath>
 
-	<xpath expr="//span[@t-field='line.date_planned']" position="attributes">
-		<attribute name="t-options-widget">"date"</attribute>
-	</xpath>
+    <xpath expr="//span[@t-field='line.date_planned']" position="attributes">
+        <attribute name="t-options-widget">"date"</attribute>
+    </xpath>
 
-	<xpath expr="/t[1]/t[1]/t[4]/t[1]/div[1]/div[1]" position="attributes">
-		<attribute name="t-options-fields">['address']</attribute>
-	</xpath>
+    <xpath expr="/t[1]/t[1]/t[4]/t[1]/div[1]/div[1]" position="attributes">
+        <attribute name="t-options-fields">['address']</attribute>
+    </xpath>
 
-	<xpath expr="//div[@t-field='o.partner_id']" position="attributes">
-		<attribute name="t-options-fields">['address', 'name']</attribute>
-	</xpath>
+    <xpath expr="//div[@t-field='o.partner_id']" position="attributes">
+        <attribute name="t-options-fields">['address', 'name']</attribute>
+    </xpath>
 
 </data>
\ No newline at end of file
diff --git a/snippets/purchase.report_purchaseorder_document.style_tissa.xml b/snippets/purchase.report_purchaseorder_document.style_tissa.xml
new file mode 100644
index 00000000..d34039bd
--- /dev/null
+++ b/snippets/purchase.report_purchaseorder_document.style_tissa.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0"?>
+<data inherit_id="purchase.report_purchaseorder_document" priority="50">
+
+    <xpath expr="//div[hasclass('page')]" position="before">
+        <style>
+            table#info {
+                font-size: 9pt;
+                font-family: arial;
+            }
+            h2 {
+              font-size: 1.2rem;
+              font-weight: bold;
+              margin: 50px 0 30px 0
+            }
+            body {
+                font-size: 11pt;
+                font-family: arial;
+            }
+        </style>
+    </xpath>
+
+    <xpath expr="//div[@t-field='o.picking_type_id.warehouse_id.partner_id']" position="attributes">
+        <attribute name="t-options">{&quot;widget&quot;: &quot;contact&quot;, &quot;fields&quot;: [&quot;address&quot;], &quot;no_marker&quot;: True, &quot;phone_icons&quot;: False}</attribute>
+    </xpath>
+
+    <xpath expr="//div[@t-field='o.partner_id']" position="attributes">
+        <attribute name="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}</attribute>
+    </xpath>
+
+</data>
\ No newline at end of file
diff --git a/snippets/purchase.report_purchasequotation_document.format_date.xml b/snippets/purchase.report_purchasequotation_document.format_date.xml
index bc1741a5..53e5795f 100644
--- a/snippets/purchase.report_purchasequotation_document.format_date.xml
+++ b/snippets/purchase.report_purchasequotation_document.format_date.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <data inherit_id="purchase.report_purchasequotation_document" priority="50">
 
-  <xpath expr="//tbody[1]/t[1]/tr[1]/t[1]/td[2]/span[1]" position="attributes">
+  <xpath expr="//tbody//td/span[@t-field='order_line.date_planned']" position="attributes">
     <attribute name="t-options-widget">"date"</attribute>
   </xpath>
 
diff --git a/snippets/purchase.report_purchasequotation_document.product_hide_bracket_description.xml b/snippets/purchase.report_purchasequotation_document.product_hide_bracket_description.xml
new file mode 100644
index 00000000..297dda13
--- /dev/null
+++ b/snippets/purchase.report_purchasequotation_document.product_hide_bracket_description.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<data inherit_id="purchase.report_purchasequotation_document" priority="50">
+
+  <xpath expr="//td[@id='product']" position="replace">
+    <td id="product">
+      <span t-esc="order_line.name.split('(')[0].strip()"/>
+    </td>
+  </xpath>
+
+</data>
\ No newline at end of file
diff --git a/snippets/purchase.report_purchasequotation_document.set_ids.xml b/snippets/purchase.report_purchasequotation_document.set_ids.xml
index 6c270ccd..f2674bbb 100644
--- a/snippets/purchase.report_purchasequotation_document.set_ids.xml
+++ b/snippets/purchase.report_purchasequotation_document.set_ids.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <data inherit_id="purchase.report_purchasequotation_document" priority="50">
 
-	<xpath expr="//span[@t-field='line.product_qty']" position="attributes">
-		<attribute name="id">product_qty</attribute>
-	</xpath>
+    <xpath expr="//span[@t-field='line.product_qty']" position="attributes">
+        <attribute name="id">product_qty</attribute>
+    </xpath>
 
 </data>
\ No newline at end of file
diff --git a/snippets/purchase.report_purchasequotation_document.style_moser.xml b/snippets/purchase.report_purchasequotation_document.style_moser.xml
index fc584047..6c98f7b7 100644
--- a/snippets/purchase.report_purchasequotation_document.style_moser.xml
+++ b/snippets/purchase.report_purchasequotation_document.style_moser.xml
@@ -1,43 +1,43 @@
 <?xml version="1.0"?>
 <data inherit_id="purchase.report_purchasequotation_document" priority="60">
 
-	<xpath expr="//div[hasclass('page')]" position="before">
-		<style>
-		.o_company_1_layout {
-        	font-family: arial;
-     	}
-		.o_company_1_layout.o_report_layout_standard h2 {
-        	color: black;
-       		font-size: 1.4rem;
-			    font-weight: bold;
-     	}
-     	.o_company_1_layout.o_report_layout_standard #total strong {
-        	color: black;
-     	}
-     	div#informations {
-     	 	margin-top: 30px;
-     	 	margin-bottom: 60px;
-     	}
-     	h2.mt-4 {
-     	 	margin-top: 70px !important;
-     	}
-		</style>
-	</xpath>
+    <xpath expr="//div[hasclass('page')]" position="before">
+        <style>
+        .o_company_1_layout {
+            font-family: arial;
+         }
+        .o_company_1_layout.o_report_layout_standard h2 {
+            color: black;
+               font-size: 1.4rem;
+                font-weight: bold;
+         }
+         .o_company_1_layout.o_report_layout_standard #total strong {
+            color: black;
+         }
+         div#informations {
+              margin-top: 30px;
+              margin-bottom: 60px;
+         }
+         h2.mt-4 {
+              margin-top: 70px !important;
+         }
+        </style>
+    </xpath>
 
-	<xpath expr="//th[@name='th_description']" position="attributes">
-		<attribute name="style" separator=" " add="text-align: left"/>
-	</xpath>
+    <xpath expr="//th[@name='th_description']" position="attributes">
+        <attribute name="style" separator=" " add="text-align: left"/>
+    </xpath>
 
-	<xpath expr="//span[@t-field='order_line.date_planned']" position="attributes">
-		<attribute name="t-options-widget">"date"</attribute>
-	</xpath>
+    <xpath expr="//span[@t-field='order_line.date_planned']" position="attributes">
+        <attribute name="t-options-widget">"date"</attribute>
+    </xpath>
 
-	<xpath expr="//div[1]/div[1]" position="attributes">
-		<attribute name="t-options-fields">['address']</attribute>
-	</xpath>
+    <xpath expr="//div[1]/div[1]" position="attributes">
+        <attribute name="t-options-fields">['address']</attribute>
+    </xpath>
 
-	<xpath expr="//div[@t-field='o.partner_id']" position="attributes">
-		<attribute name="t-options-fields">['address', 'name']</attribute>
-	</xpath>
+    <xpath expr="//div[@t-field='o.partner_id']" position="attributes">
+        <attribute name="t-options-fields">['address', 'name']</attribute>
+    </xpath>
 
 </data>
\ No newline at end of file
diff --git a/snippets/purchase.report_purchasequotation_document.style_trimada.xml b/snippets/purchase.report_purchasequotation_document.style_trimada.xml
index 825e07b0..9f124411 100644
--- a/snippets/purchase.report_purchasequotation_document.style_trimada.xml
+++ b/snippets/purchase.report_purchasequotation_document.style_trimada.xml
@@ -1,77 +1,77 @@
 <?xml version="1.0"?>
 <data inherit_id="purchase.report_purchasequotation_document" priority="60">
 
-	<xpath expr="//div[hasclass('page')]" position="before">
-		<style>
-			table.trimada {
-				font-size: 9pt;
-				font-family: arial;
-				color: black;
-			}
-			table.trimada tr.first td {
-				padding-bottom: 0;
-			}
-			table.trimada tr.second td {
-				padding-top: 0;
-			}
-			table.trimada tr.second {
-				border-bottom: 1px solid rgb(220,220,220);
-			}
-			table.trimada thead tr {
-				border-top:solid 1px;
-				border-bottom: solid 1px;
-			}
-			table.trimada thead th#position {
-				width: 5mm;
-			}
-			table.trimada thead th#default_code {
-			  width: 27mm;
-			  text-align: right;
-			}
-			table.trimada thead th#open_quantity {
-			  width: 30mm;
-			  text-align: right;
-			}
-			table.trimada thead th#quantity {
-			  width: 25mm;
-			  text-align: right !important;
-			}
-			table.trimada tbody td#position {
-			  text-align: right;
-			}
-			table.trimada tbody td#default_code {
-			  text-align: right;
-			}
-			table.trimada tbody td#open_quantity {
-			  text-align: right !important;
-			}
-			table.trimada tbody td#quantity {
-			  text-align: right;
-			}			
-			table.trimada tbody span#qty {
-			  font-weight: bold;
-			}
-			table.trimada tbody span#open_qty {
-			  font-weight: bold;
-			}
-			.subtitel {
-				font-size: 11pt;
-				font-family: arial;
-				margin-top: 10mm;
-			}
-			.note {
-				font-size: 9pt;
-				font-family: arial;
-			}
-		</style>
-	</xpath>
+    <xpath expr="//div[hasclass('page')]" position="before">
+        <style>
+            table.trimada {
+                font-size: 9pt;
+                font-family: arial;
+                color: black;
+            }
+            table.trimada tr.first td {
+                padding-bottom: 0;
+            }
+            table.trimada tr.second td {
+                padding-top: 0;
+            }
+            table.trimada tr.second {
+                border-bottom: 1px solid rgb(220,220,220);
+            }
+            table.trimada thead tr {
+                border-top:solid 1px;
+                border-bottom: solid 1px;
+            }
+            table.trimada thead th#position {
+                width: 5mm;
+            }
+            table.trimada thead th#default_code {
+              width: 27mm;
+              text-align: right;
+            }
+            table.trimada thead th#open_quantity {
+              width: 30mm;
+              text-align: right;
+            }
+            table.trimada thead th#quantity {
+              width: 25mm;
+              text-align: right !important;
+            }
+            table.trimada tbody td#position {
+              text-align: right;
+            }
+            table.trimada tbody td#default_code {
+              text-align: right;
+            }
+            table.trimada tbody td#open_quantity {
+              text-align: right !important;
+            }
+            table.trimada tbody td#quantity {
+              text-align: right;
+            }            
+            table.trimada tbody span#qty {
+              font-weight: bold;
+            }
+            table.trimada tbody span#open_qty {
+              font-weight: bold;
+            }
+            .subtitel {
+                font-size: 11pt;
+                font-family: arial;
+                margin-top: 10mm;
+            }
+            .note {
+                font-size: 9pt;
+                font-family: arial;
+            }
+        </style>
+    </xpath>
 
-	<xpath expr="//table[2]" position="attributes">
-		<attribute name="class" separator=" " add="trimada table-borderless"/>
-	</xpath>
+    <xpath expr="//table[2]" position="attributes">
+        <attribute name="class" separator=" " add="trimada table-borderless"/>
+    </xpath>
 
-  	<xpath expr="//div[@name='information_block']" position="attributes">
-		<attribute name="class" separator=" " add="trimada table-borderless"/>
-	</xpath>
+      <xpath expr="//div[@name='information_block']" position="attributes">
+        <attribute name="class" separator=" " add="trimada table-borderless"/>
+    </xpath>
 
 </data>
\ No newline at end of file
diff --git a/snippets/purchase_requisition.md b/snippets/purchase_requisition.md
index b5f2d3d4..fd63cb70 100644
--- a/snippets/purchase_requisition.md
+++ b/snippets/purchase_requisition.md
@@ -52,6 +52,24 @@ ID: `mint_system.purchase_requisition.report_purchaserequisitions.add_address_bl
 ```
 Source: [snippets/purchase_requisition.report_purchaserequisitions.add_address_block.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/purchase_requisition.report_purchaserequisitions.add_address_block.xml)
 
+### Add Date End  
+ID: `mint_system.purchase_requisition.report_purchaserequisitions.add_date_end`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="purchase_requisition.report_purchaserequisitions" priority="50">
+
+  <xpath expr="//div/span[@t-field='o.ordering_date']/.." position="after">
+    <div class="col-auto">
+      <strong>Agreement Deadline:</strong>
+      <br/>
+      <span t-field="o.date_end" t-options='{"widget": "date"}'/>
+    </div>
+  </xpath>
+
+</data>
+```
+Source: [snippets/purchase_requisition.report_purchaserequisitions.add_date_end.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/purchase_requisition.report_purchaserequisitions.add_date_end.xml)
+
 ### Add Description  
 ID: `mint_system.purchase_requisition.report_purchaserequisitions.add_description`  
 ```xml
@@ -233,6 +251,25 @@ ID: `mint_system.purchase_requisition.report_purchaserequisitions.add_infotable`
 ```
 Source: [snippets/purchase_requisition.report_purchaserequisitions.add_infotable.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/purchase_requisition.report_purchaserequisitions.add_infotable.xml)
 
+### Add Payment Term  
+ID: `mint_system.purchase_requisition.report_purchaserequisitions.add_payment_term`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="purchase_requisition.report_purchaserequisitions" priority="50">
+
+    <xpath expr="//div[@id='description']" position="before">
+        <div class="row" style="margin-top: 1rem; margin-bottom: 1rem">
+            <div class="col">
+                <span>Payment Terms: </span>
+                <span t-field="o.payment_term_id.name"/>
+            </div>
+        </div>
+    </xpath>
+
+</data>
+```
+Source: [snippets/purchase_requisition.report_purchaserequisitions.add_payment_term.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/purchase_requisition.report_purchaserequisitions.add_payment_term.xml)
+
 ### Add Price Subtotal  
 ID: `mint_system.purchase_requisition.report_purchaserequisitions.add_price_subtotal`  
 ```xml
@@ -645,8 +682,8 @@ ID: `mint_system.purchase_requisition.report_purchaserequisitions.replace_title`
       <h2>Request for Quotation purchase contract <span t-field="o.name"/></h2>
     </t>
     <t t-else="">
-			<h2>Purchase contract <span t-field="o.name"/></h2>
-		</t>
+            <h2>Purchase contract <span t-field="o.name"/></h2>
+        </t>
   </xpath>  
 
 </data>
@@ -660,9 +697,9 @@ ID: `mint_system.purchase_requisition.report_purchaserequisitions.round_price`
 <data inherit_id="purchase_requisition.report_purchaserequisitions" priority="50">
 
 <xpath expr="//td[@id='price_unit']" position="replace">
-		 <td id="price_unit" class="text-right">
-		 <span t-esc="'%g' % line_ids.price_unit if str(line_ids.price_unit)[::-1].find('.') >= 3 else '%.2f' % line_ids.price_unit"/>
-		 </td>
+         <td id="price_unit" class="text-right">
+         <span t-esc="'%g' % line_ids.price_unit if str(line_ids.price_unit)[::-1].find('.') >= 3 else '%.2f' % line_ids.price_unit"/>
+         </td>
   </xpath>
 
 </data>
@@ -750,61 +787,61 @@ ID: `mint_system.purchase_requisition.report_purchaserequisitions.set_ids`
 <?xml version="1.0"?>
 <data inherit_id="purchase_requisition.report_purchaserequisitions" priority="50">
 
-	<xpath expr="//span[@t-field='line_ids.product_qty']" position="attributes">
-		<attribute name="id">product_qty</attribute>
-	</xpath>
+    <xpath expr="//span[@t-field='line_ids.product_qty']" position="attributes">
+        <attribute name="id">product_qty</attribute>
+    </xpath>
 
-	<xpath expr="//span[@t-field='o.ordering_date']/../.." position="attributes">
-		<attribute name="id">informations</attribute>
-	</xpath>
-	
-	<xpath expr="//t[1]/table" position="attributes">
-		<attribute name="id">main_table</attribute>
-	</xpath>
-	
-	<xpath expr="//t[2]" position="attributes">
-		<attribute name="id">details</attribute>
-	</xpath>
-	
-	<xpath expr="//t[1]/h3" position="attributes">
-		<attribute name="id">title_product</attribute>
-	</xpath>
-	
-	<xpath expr="//t[1]/table/tbody/tr/td[1]" position="attributes">
-		<attribute name="id">name</attribute>
-	</xpath>
-	
-	<xpath expr="//t[1]/table/tbody/tr" position="attributes">
-		<attribute name="id">first</attribute>
-	</xpath>
-	
-	<xpath expr="//t[1]/table/thead/tr/th[1]" position="attributes">
-		<attribute name="id">name</attribute>
-	</xpath>
-	
-	<xpath expr="//t[1]/table/thead/tr/th[2]" position="attributes">
-		<attribute name="id">product_qty</attribute>
-	</xpath>
-	
-	<xpath expr="//t[1]/table/tbody/tr/td[2]" position="attributes">
-		<attribute name="id">product_qty</attribute>
-	</xpath>
-		
-	<xpath expr="//t[1]/table/thead/tr/th[3]" position="attributes">
-		<attribute name="id">product_uom</attribute>
-	</xpath>
+    <xpath expr="//span[@t-field='o.ordering_date']/../.." position="attributes">
+        <attribute name="id">informations</attribute>
+    </xpath>
+    
+    <xpath expr="//t[1]/table" position="attributes">
+        <attribute name="id">main_table</attribute>
+    </xpath>
+    
+    <xpath expr="//t[2]" position="attributes">
+        <attribute name="id">details</attribute>
+    </xpath>
+    
+    <xpath expr="//t[1]/h3" position="attributes">
+        <attribute name="id">title_product</attribute>
+    </xpath>
+    
+    <xpath expr="//t[1]/table/tbody/tr/td[1]" position="attributes">
+        <attribute name="id">name</attribute>
+    </xpath>
+    
+    <xpath expr="//t[1]/table/tbody/tr" position="attributes">
+        <attribute name="id">first</attribute>
+    </xpath>
+    
+    <xpath expr="//t[1]/table/thead/tr/th[1]" position="attributes">
+        <attribute name="id">name</attribute>
+    </xpath>
+    
+    <xpath expr="//t[1]/table/thead/tr/th[2]" position="attributes">
+        <attribute name="id">product_qty</attribute>
+    </xpath>
+    
+    <xpath expr="//t[1]/table/tbody/tr/td[2]" position="attributes">
+        <attribute name="id">product_qty</attribute>
+    </xpath>
+        
+    <xpath expr="//t[1]/table/thead/tr/th[3]" position="attributes">
+        <attribute name="id">product_uom</attribute>
+    </xpath>
 
-	<xpath expr="//t[1]/table/tbody/tr/t/td" position="attributes">
-		<attribute name="id">product_uom</attribute>
-	</xpath>
-	
-	<xpath expr="//t[1]/table/thead/tr/th[4]" position="attributes">
-		<attribute name="id">schedule_date</attribute>
-	</xpath>
-	
-	<xpath expr="//t[1]/table/tbody/tr/td[3]" position="attributes">
-		<attribute name="id">schedule_date</attribute>
-	</xpath>
+    <xpath expr="//t[1]/table/tbody/tr/t/td" position="attributes">
+        <attribute name="id">product_uom</attribute>
+    </xpath>
+    
+    <xpath expr="//t[1]/table/thead/tr/th[4]" position="attributes">
+        <attribute name="id">schedule_date</attribute>
+    </xpath>
+    
+    <xpath expr="//t[1]/table/tbody/tr/td[3]" position="attributes">
+        <attribute name="id">schedule_date</attribute>
+    </xpath>
 
 </data>
 
@@ -812,21 +849,21 @@ ID: `mint_system.purchase_requisition.report_purchaserequisitions.set_ids`
 <?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[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>
+    <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>
 -->
@@ -861,30 +898,46 @@ ID: `mint_system.purchase_requisition.report_purchaserequisitions.style_gelso`
 <?xml version="1.0"?>
 <data inherit_id="purchase_requisition.report_purchaserequisitions" priority="60">
 
-	<xpath expr="//div[hasclass('page')]" position="before">
-		<style>
-			.o_company_1_layout {
-				font-family: Roboto;
-				color: #000000;
-			}
-			.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;
-			}
-		</style>
-	</xpath>
+    <xpath expr="//div[hasclass('page')]" position="before">
+        <style>
+            .o_company_1_layout {
+                font-family: Roboto;
+                color: #000000;
+            }
+            .o_report_layout_boxed {
+                color: #495057;
+            }
+            .o_report_layout_boxed h2 {
+                   color: #000000;
+            }
+            .o_report_layout_boxed strong {
+                   color: #000000;
+            }
+            div#info_table {
+                  margin-bottom: 1rem;
+            }
+            div#address {
+                font-size: 16px;
+                margin-bottom: 2rem;
+            }
+        </style>
+    </xpath>
+
+    <xpath expr="//div/span[@t-field='o.partner_ref']/.." position="attributes">
+        <attribute name="class">col-auto</attribute>
+    </xpath>
+
+    <xpath expr="//div/span[@t-field='o.ordering_date']/.." position="attributes">
+        <attribute name="class">col-auto</attribute>
+    </xpath>
+
+    <xpath expr="//div/span[@t-field='o.incoterm_id']/.." position="attributes">
+        <attribute name="class">col-auto</attribute>
+    </xpath>
+
+    <xpath expr="//div/span[@t-field='o.user_id']/.." position="attributes">
+        <attribute name="class">col-auto</attribute>
+    </xpath>
 
 </data>
 ```
@@ -896,64 +949,64 @@ ID: `mint_system.purchase_requisition.report_purchaserequisitions.style_trimada`
 <?xml version="1.0"?>
 <data inherit_id="purchase_requisition.report_purchaserequisitions" priority="60">
 
-	<xpath expr="//div[hasclass('page')]" position="before">
-		<style>
-			.o_company_1_layout {
-				font-family: Arial;
-				font-size: 9pt;
-			}
-			.address {
-       		padding-bottom:33mm;
-			}
-			h2 {
-       			margin-top:10mm;
-       			margin-bottom:3mm;
-       			font-size: 13pt;
-				font-weight: bold;
-			}
-			.first td {
-				padding-bottom: 0;
-			}
-			.second td {
-				padding-top: 0;
-			}
-			.second {
-				border-bottom: 1px solid rgb(220,220,220);
-			}
-			table.trimada thead tr {
-				border-top:solid 1px;
-				border-bottom: solid 1px;
-				color: black;
-			}
-			table.trimada thead th#description {
-				width: 70mm;
-			}
-			table.trimada tr.first td {
-				padding-bottom: 0;
-			}
-			table.trimada tr.second td {
-				padding-top: 0;
-			}
-			table.trimada tr.second {
-				border-bottom: 1px solid rgb(220,220,220);
-			}
-			table.trimada thead th#default_code {
-			  width: 27mm;
-			  text-align: left;
-			}
-			span#qty {
-			  font-weight: bold;
-			}
-			table#summary td {
-			  padding: 0.3rem;
-			}
-	
-		</style>
-	</xpath>
-	
-	<xpath expr="//table[@id='main_table']" position="attributes">
-		<attribute name="class" separator=" " add="trimada table-borderless"/>
-	</xpath>
+    <xpath expr="//div[hasclass('page')]" position="before">
+        <style>
+            .o_company_1_layout {
+                font-family: Arial;
+                font-size: 9pt;
+            }
+            .address {
+               padding-bottom:33mm;
+            }
+            h2 {
+                   margin-top:10mm;
+                   margin-bottom:3mm;
+                   font-size: 13pt;
+                font-weight: bold;
+            }
+            .first td {
+                padding-bottom: 0;
+            }
+            .second td {
+                padding-top: 0;
+            }
+            .second {
+                border-bottom: 1px solid rgb(220,220,220);
+            }
+            table.trimada thead tr {
+                border-top:solid 1px;
+                border-bottom: solid 1px;
+                color: black;
+            }
+            table.trimada thead th#description {
+                width: 70mm;
+            }
+            table.trimada tr.first td {
+                padding-bottom: 0;
+            }
+            table.trimada tr.second td {
+                padding-top: 0;
+            }
+            table.trimada tr.second {
+                border-bottom: 1px solid rgb(220,220,220);
+            }
+            table.trimada thead th#default_code {
+              width: 27mm;
+              text-align: left;
+            }
+            span#qty {
+              font-weight: bold;
+            }
+            table#summary td {
+              padding: 0.3rem;
+            }
+    
+        </style>
+    </xpath>
+    
+    <xpath expr="//table[@id='main_table']" position="attributes">
+        <attribute name="class" separator=" " add="trimada table-borderless"/>
+    </xpath>
 
 </data>
 ```
diff --git a/snippets/purchase_requisition.report_purchaserequisitions.add_date_end.xml b/snippets/purchase_requisition.report_purchaserequisitions.add_date_end.xml
new file mode 100644
index 00000000..64d6ee47
--- /dev/null
+++ b/snippets/purchase_requisition.report_purchaserequisitions.add_date_end.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<data inherit_id="purchase_requisition.report_purchaserequisitions" priority="50">
+
+  <xpath expr="//div/span[@t-field='o.ordering_date']/.." position="after">
+    <div class="col-auto">
+      <strong>Agreement Deadline:</strong>
+      <br/>
+      <span t-field="o.date_end" t-options='{"widget": "date"}'/>
+    </div>
+  </xpath>
+
+</data>
\ No newline at end of file
diff --git a/snippets/purchase_requisition.report_purchaserequisitions.add_payment_term.xml b/snippets/purchase_requisition.report_purchaserequisitions.add_payment_term.xml
new file mode 100644
index 00000000..f3d99349
--- /dev/null
+++ b/snippets/purchase_requisition.report_purchaserequisitions.add_payment_term.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<data inherit_id="purchase_requisition.report_purchaserequisitions" priority="50">
+
+    <xpath expr="//div[@id='description']" position="before">
+        <div class="row" style="margin-top: 1rem; margin-bottom: 1rem">
+            <div class="col">
+                <span>Payment Terms: </span>
+                <span t-field="o.payment_term_id.name"/>
+            </div>
+        </div>
+    </xpath>
+
+</data>
\ No newline at end of file
diff --git a/snippets/purchase_requisition.report_purchaserequisitions.replace_title.xml b/snippets/purchase_requisition.report_purchaserequisitions.replace_title.xml
index fc444cb1..d2447db6 100644
--- a/snippets/purchase_requisition.report_purchaserequisitions.replace_title.xml
+++ b/snippets/purchase_requisition.report_purchaserequisitions.replace_title.xml
@@ -6,8 +6,8 @@
       <h2>Request for Quotation purchase contract <span t-field="o.name"/></h2>
     </t>
     <t t-else="">
-			<h2>Purchase contract <span t-field="o.name"/></h2>
-		</t>
+            <h2>Purchase contract <span t-field="o.name"/></h2>
+        </t>
   </xpath>  
 
 </data>
\ No newline at end of file
diff --git a/snippets/purchase_requisition.report_purchaserequisitions.round_price.xml b/snippets/purchase_requisition.report_purchaserequisitions.round_price.xml
index fb57b652..0dc72811 100644
--- a/snippets/purchase_requisition.report_purchaserequisitions.round_price.xml
+++ b/snippets/purchase_requisition.report_purchaserequisitions.round_price.xml
@@ -2,9 +2,9 @@
 <data inherit_id="purchase_requisition.report_purchaserequisitions" priority="50">
 
 <xpath expr="//td[@id='price_unit']" position="replace">
-		 <td id="price_unit" class="text-right">
-		 <span t-esc="'%g' % line_ids.price_unit if str(line_ids.price_unit)[::-1].find('.') >= 3 else '%.2f' % line_ids.price_unit"/>
-		 </td>
+         <td id="price_unit" class="text-right">
+         <span t-esc="'%g' % line_ids.price_unit if str(line_ids.price_unit)[::-1].find('.') >= 3 else '%.2f' % line_ids.price_unit"/>
+         </td>
   </xpath>
 
 </data>
\ No newline at end of file
diff --git a/snippets/purchase_requisition.report_purchaserequisitions.set_ids.xml b/snippets/purchase_requisition.report_purchaserequisitions.set_ids.xml
index 15d51040..db54ef7b 100644
--- a/snippets/purchase_requisition.report_purchaserequisitions.set_ids.xml
+++ b/snippets/purchase_requisition.report_purchaserequisitions.set_ids.xml
@@ -1,61 +1,61 @@
 <?xml version="1.0"?>
 <data inherit_id="purchase_requisition.report_purchaserequisitions" priority="50">
 
-	<xpath expr="//span[@t-field='line_ids.product_qty']" position="attributes">
-		<attribute name="id">product_qty</attribute>
-	</xpath>
+    <xpath expr="//span[@t-field='line_ids.product_qty']" position="attributes">
+        <attribute name="id">product_qty</attribute>
+    </xpath>
 
-	<xpath expr="//span[@t-field='o.ordering_date']/../.." position="attributes">
-		<attribute name="id">informations</attribute>
-	</xpath>
-	
-	<xpath expr="//t[1]/table" position="attributes">
-		<attribute name="id">main_table</attribute>
-	</xpath>
-	
-	<xpath expr="//t[2]" position="attributes">
-		<attribute name="id">details</attribute>
-	</xpath>
-	
-	<xpath expr="//t[1]/h3" position="attributes">
-		<attribute name="id">title_product</attribute>
-	</xpath>
-	
-	<xpath expr="//t[1]/table/tbody/tr/td[1]" position="attributes">
-		<attribute name="id">name</attribute>
-	</xpath>
-	
-	<xpath expr="//t[1]/table/tbody/tr" position="attributes">
-		<attribute name="id">first</attribute>
-	</xpath>
-	
-	<xpath expr="//t[1]/table/thead/tr/th[1]" position="attributes">
-		<attribute name="id">name</attribute>
-	</xpath>
-	
-	<xpath expr="//t[1]/table/thead/tr/th[2]" position="attributes">
-		<attribute name="id">product_qty</attribute>
-	</xpath>
-	
-	<xpath expr="//t[1]/table/tbody/tr/td[2]" position="attributes">
-		<attribute name="id">product_qty</attribute>
-	</xpath>
-		
-	<xpath expr="//t[1]/table/thead/tr/th[3]" position="attributes">
-		<attribute name="id">product_uom</attribute>
-	</xpath>
+    <xpath expr="//span[@t-field='o.ordering_date']/../.." position="attributes">
+        <attribute name="id">informations</attribute>
+    </xpath>
+    
+    <xpath expr="//t[1]/table" position="attributes">
+        <attribute name="id">main_table</attribute>
+    </xpath>
+    
+    <xpath expr="//t[2]" position="attributes">
+        <attribute name="id">details</attribute>
+    </xpath>
+    
+    <xpath expr="//t[1]/h3" position="attributes">
+        <attribute name="id">title_product</attribute>
+    </xpath>
+    
+    <xpath expr="//t[1]/table/tbody/tr/td[1]" position="attributes">
+        <attribute name="id">name</attribute>
+    </xpath>
+    
+    <xpath expr="//t[1]/table/tbody/tr" position="attributes">
+        <attribute name="id">first</attribute>
+    </xpath>
+    
+    <xpath expr="//t[1]/table/thead/tr/th[1]" position="attributes">
+        <attribute name="id">name</attribute>
+    </xpath>
+    
+    <xpath expr="//t[1]/table/thead/tr/th[2]" position="attributes">
+        <attribute name="id">product_qty</attribute>
+    </xpath>
+    
+    <xpath expr="//t[1]/table/tbody/tr/td[2]" position="attributes">
+        <attribute name="id">product_qty</attribute>
+    </xpath>
+        
+    <xpath expr="//t[1]/table/thead/tr/th[3]" position="attributes">
+        <attribute name="id">product_uom</attribute>
+    </xpath>
 
-	<xpath expr="//t[1]/table/tbody/tr/t/td" position="attributes">
-		<attribute name="id">product_uom</attribute>
-	</xpath>
-	
-	<xpath expr="//t[1]/table/thead/tr/th[4]" position="attributes">
-		<attribute name="id">schedule_date</attribute>
-	</xpath>
-	
-	<xpath expr="//t[1]/table/tbody/tr/td[3]" position="attributes">
-		<attribute name="id">schedule_date</attribute>
-	</xpath>
+    <xpath expr="//t[1]/table/tbody/tr/t/td" position="attributes">
+        <attribute name="id">product_uom</attribute>
+    </xpath>
+    
+    <xpath expr="//t[1]/table/thead/tr/th[4]" position="attributes">
+        <attribute name="id">schedule_date</attribute>
+    </xpath>
+    
+    <xpath expr="//t[1]/table/tbody/tr/td[3]" position="attributes">
+        <attribute name="id">schedule_date</attribute>
+    </xpath>
 
 </data>
 
@@ -63,21 +63,21 @@
 <?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[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>
+    <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 8e6a136b..eadc0c54 100644
--- a/snippets/purchase_requisition.report_purchaserequisitions.style_gelso.xml
+++ b/snippets/purchase_requisition.report_purchaserequisitions.style_gelso.xml
@@ -1,29 +1,45 @@
 <?xml version="1.0"?>
 <data inherit_id="purchase_requisition.report_purchaserequisitions" priority="60">
 
-	<xpath expr="//div[hasclass('page')]" position="before">
-		<style>
-			.o_company_1_layout {
-				font-family: Roboto;
-				color: #000000;
-			}
-			.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;
-			}
-		</style>
-	</xpath>
+    <xpath expr="//div[hasclass('page')]" position="before">
+        <style>
+            .o_company_1_layout {
+                font-family: Roboto;
+                color: #000000;
+            }
+            .o_report_layout_boxed {
+                color: #495057;
+            }
+            .o_report_layout_boxed h2 {
+                   color: #000000;
+            }
+            .o_report_layout_boxed strong {
+                   color: #000000;
+            }
+            div#info_table {
+                  margin-bottom: 1rem;
+            }
+            div#address {
+                font-size: 16px;
+                margin-bottom: 2rem;
+            }
+        </style>
+    </xpath>
+
+    <xpath expr="//div/span[@t-field='o.partner_ref']/.." position="attributes">
+        <attribute name="class">col-auto</attribute>
+    </xpath>
+
+    <xpath expr="//div/span[@t-field='o.ordering_date']/.." position="attributes">
+        <attribute name="class">col-auto</attribute>
+    </xpath>
+
+    <xpath expr="//div/span[@t-field='o.incoterm_id']/.." position="attributes">
+        <attribute name="class">col-auto</attribute>
+    </xpath>
+
+    <xpath expr="//div/span[@t-field='o.user_id']/.." position="attributes">
+        <attribute name="class">col-auto</attribute>
+    </xpath>
 
 </data>
\ No newline at end of file
diff --git a/snippets/purchase_requisition.report_purchaserequisitions.style_trimada.xml b/snippets/purchase_requisition.report_purchaserequisitions.style_trimada.xml
index 69729aa8..65761766 100644
--- a/snippets/purchase_requisition.report_purchaserequisitions.style_trimada.xml
+++ b/snippets/purchase_requisition.report_purchaserequisitions.style_trimada.xml
@@ -1,63 +1,63 @@
 <?xml version="1.0"?>
 <data inherit_id="purchase_requisition.report_purchaserequisitions" priority="60">
 
-	<xpath expr="//div[hasclass('page')]" position="before">
-		<style>
-			.o_company_1_layout {
-				font-family: Arial;
-				font-size: 9pt;
-			}
-			.address {
-       		padding-bottom:33mm;
-			}
-			h2 {
-       			margin-top:10mm;
-       			margin-bottom:3mm;
-       			font-size: 13pt;
-				font-weight: bold;
-			}
-			.first td {
-				padding-bottom: 0;
-			}
-			.second td {
-				padding-top: 0;
-			}
-			.second {
-				border-bottom: 1px solid rgb(220,220,220);
-			}
-			table.trimada thead tr {
-				border-top:solid 1px;
-				border-bottom: solid 1px;
-				color: black;
-			}
-			table.trimada thead th#description {
-				width: 70mm;
-			}
-			table.trimada tr.first td {
-				padding-bottom: 0;
-			}
-			table.trimada tr.second td {
-				padding-top: 0;
-			}
-			table.trimada tr.second {
-				border-bottom: 1px solid rgb(220,220,220);
-			}
-			table.trimada thead th#default_code {
-			  width: 27mm;
-			  text-align: left;
-			}
-			span#qty {
-			  font-weight: bold;
-			}
-			table#summary td {
-			  padding: 0.3rem;
-			}
-	
-		</style>
-	</xpath>
-	
-	<xpath expr="//table[@id='main_table']" position="attributes">
-		<attribute name="class" separator=" " add="trimada table-borderless"/>
-	</xpath>
+    <xpath expr="//div[hasclass('page')]" position="before">
+        <style>
+            .o_company_1_layout {
+                font-family: Arial;
+                font-size: 9pt;
+            }
+            .address {
+               padding-bottom:33mm;
+            }
+            h2 {
+                   margin-top:10mm;
+                   margin-bottom:3mm;
+                   font-size: 13pt;
+                font-weight: bold;
+            }
+            .first td {
+                padding-bottom: 0;
+            }
+            .second td {
+                padding-top: 0;
+            }
+            .second {
+                border-bottom: 1px solid rgb(220,220,220);
+            }
+            table.trimada thead tr {
+                border-top:solid 1px;
+                border-bottom: solid 1px;
+                color: black;
+            }
+            table.trimada thead th#description {
+                width: 70mm;
+            }
+            table.trimada tr.first td {
+                padding-bottom: 0;
+            }
+            table.trimada tr.second td {
+                padding-top: 0;
+            }
+            table.trimada tr.second {
+                border-bottom: 1px solid rgb(220,220,220);
+            }
+            table.trimada thead th#default_code {
+              width: 27mm;
+              text-align: left;
+            }
+            span#qty {
+              font-weight: bold;
+            }
+            table#summary td {
+              padding: 0.3rem;
+            }
+    
+        </style>
+    </xpath>
+    
+    <xpath expr="//table[@id='main_table']" position="attributes">
+        <attribute name="class" separator=" " add="trimada table-borderless"/>
+    </xpath>
 
 </data>
\ No newline at end of file
diff --git a/snippets/sale.md b/snippets/sale.md
index 21670b3f..6d119d91 100644
--- a/snippets/sale.md
+++ b/snippets/sale.md
@@ -594,9 +594,9 @@ ID: `mint_system.sale.report_blanketorder_document.set_ids`
 <?xml version="1.0"?>
 <data inherit_id="sale.report_blanketorder_document" priority="50">
   
-	<xpath expr="//div[1]/div[4]" position="attributes">
-		<attribute name="id">table_total</attribute>
-	</xpath>	
+    <xpath expr="//div[1]/div[4]" position="attributes">
+        <attribute name="id">table_total</attribute>
+    </xpath>    
 
 </data>
 ```
@@ -825,6 +825,27 @@ ID: `mint_system.sale.report_saleorder_document.add_blanket_order_line`
 ```
 Source: [snippets/sale.report_saleorder_document.add_blanket_order_line.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.report_saleorder_document.add_blanket_order_line.xml)
 
+### Add Commitment Date  
+ID: `mint_system.sale.report_saleorder_document.add_commitment_date`  
+```xml
+<data inherit_id="sale.report_saleorder_document" priority="50">
+
+  <xpath expr="//th[@name='th_description']" position="after">
+    <th id="commitment_date">
+      <span>Geplantes Datum ETD</span>
+    </th>
+  </xpath>
+
+  <xpath expr="//td[@name='td_name']" position="after">
+    <td id="commitment_datet">
+      <span t-out="line.commitment_date"/>
+    </td>
+  </xpath>
+
+</data>
+```
+Source: [snippets/sale.report_saleorder_document.add_commitment_date.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.report_saleorder_document.add_commitment_date.xml)
+
 ### Add Default Code  
 ID: `mint_system.sale.report_saleorder_document.add_default_code`  
 ```xml
@@ -848,6 +869,26 @@ ID: `mint_system.sale.report_saleorder_document.add_default_code`
 ```
 Source: [snippets/sale.report_saleorder_document.add_default_code.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.report_saleorder_document.add_default_code.xml)
 
+### Add Delivery Dates  
+ID: `mint_system.sale.report_saleorder_document.add_delivery_dates`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="sale.report_saleorder_document" priority="50">
+  
+  <xpath expr="//th[@name='th_priceunit']" position="before">
+    <th name="th_delivery_dates" class="text-right">Delivery Date</th>
+  </xpath>
+
+  <xpath expr="//td[@name='td_priceunit']" position="before">
+    <td name="td_delivery_dates" class="text-right">
+       <span t-field="line.delivery_dates" t-options="{&quot;widget&quot;: &quot;date&quot;}"/>
+    </td>
+  </xpath>
+  
+</data>
+```
+Source: [snippets/sale.report_saleorder_document.add_delivery_dates.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.report_saleorder_document.add_delivery_dates.xml)
+
 ### Add Delivery Date  
 ID: `mint_system.sale.report_saleorder_document.add_delivery_date`  
 ```xml
@@ -971,13 +1012,13 @@ ID: `mint_system.sale.report_saleorder_document.add_header_and_footer_note`
 <?xml version="1.0"?>
 <data inherit_id="sale.report_saleorder_document" priority="50">
 
-  <xpath expr="//table[@id='info']" position="after">
+  <xpath expr="//div[@id='informations']" position="after">
     <t t-if="doc.note_header != '&lt;p&gt;&lt;br&gt;&lt;/p&gt;'">
       <span class="note" t-field="doc.note_header"/>
     </t>
   </xpath>
 
-  <xpath expr="//table[2]" position="after">
+  <xpath expr="//div[@name='signature']" position="before">
     <t t-if="doc.note_footer != '&lt;p&gt;&lt;br&gt;&lt;/p&gt;'">
       <span class="note" t-field="doc.note_footer"/>
     </t>
@@ -994,9 +1035,9 @@ ID: `mint_system.sale.report_saleorder_document.add_header_space`
 <?xml version="1.0"?>
 <data inherit_id="sale.report_saleorder_document" priority="50">
 
-	<xpath expr="//h2" position="attributes">
-		 <attribute name="style">padding-top: 5rem</attribute>
-	</xpath>
+    <xpath expr="//h2" position="attributes">
+         <attribute name="style">padding-top: 5rem</attribute>
+    </xpath>
 
 </data>
 
@@ -1009,17 +1050,17 @@ ID: `mint_system.sale.report_saleorder_document.add_incoterm_blanket_order`
 <?xml version="1.0"?>
 <data inherit_id="sale.report_saleorder_document" priority="50">
 
-	<xpath expr="//div[@id='incoterm']" position="replace">
-		<div id='incoterm' class="col-3" t-if="doc.incoterm" groups="sale_stock.group_display_incoterm">
-			<strong>Incoterm:</strong>
-			<t t-if="doc.x_incoterm_blanket_order">
-				<p t-field="doc.x_incoterm_blanket_order.code"/>
-			</t>
-			<t t-else="">
-				<p t-field="doc.incoterm.code"/>
-			</t>
-		</div>
-	</xpath>
+    <xpath expr="//div[@id='incoterm']" position="replace">
+        <div id='incoterm' class="col-3" t-if="doc.incoterm" groups="sale_stock.group_display_incoterm">
+            <strong>Incoterm:</strong>
+            <t t-if="doc.x_incoterm_blanket_order">
+                <p t-field="doc.x_incoterm_blanket_order.code"/>
+            </t>
+            <t t-else="">
+                <p t-field="doc.incoterm.code"/>
+            </t>
+        </div>
+    </xpath>
 
 </data>
 ```
@@ -1031,14 +1072,14 @@ ID: `mint_system.sale.report_saleorder_document.add_informations_space`
 <?xml version="1.0"?>
 <data inherit_id="sale.report_saleorder_document" priority="50">
 
-	<xpath expr="//div[@id='informations']" position="before">
-		<style>
-			div#informations {
-				padding-top: 1rem;
-				padding-bottom: 1rem
-			}
-		</style>
-	</xpath>
+    <xpath expr="//div[@id='informations']" position="before">
+        <style>
+            div#informations {
+                padding-top: 1rem;
+                padding-bottom: 1rem
+            }
+        </style>
+    </xpath>
 
 </data>
 
@@ -1124,6 +1165,26 @@ ID: `mint_system.sale.report_saleorder_document.add_infotable`
 ```
 Source: [snippets/sale.report_saleorder_document.add_infotable.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.report_saleorder_document.add_infotable.xml)
 
+### Add Intrastat Id  
+ID: `mint_system.sale.report_saleorder_document.add_intrastat_id`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="sale.report_saleorder_document" priority="50">
+  
+  <xpath expr="//th[@name='th_quantity']" position="after">
+    <th name="th_hs_code" class="text-right">HS Code</th>
+  </xpath>
+  
+  <xpath expr="//td[@name='td_quantity']" position="after">
+    <td name="td_hs_code" class="text-right">
+       <span t-field="line.product_id.intrastat_id.code"/>
+    </td>
+  </xpath>
+  
+</data>
+```
+Source: [snippets/sale.report_saleorder_document.add_intrastat_id.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.report_saleorder_document.add_intrastat_id.xml)
+
 ### Add Note Space  
 ID: `mint_system.sale.report_saleorder_document.add_note_space`  
 ```xml
@@ -1138,9 +1199,9 @@ ID: `mint_system.sale.report_saleorder_document.add_note_space`
                 padding-right: 75px;
             }
         </style>
-		<div id="note">
-			<p  t-field="doc.note"/>
-		</div>
+        <div id="note">
+            <p  t-field="doc.note"/>
+        </div>
     </p>
 
 </data>
@@ -1215,6 +1276,45 @@ ID: `mint_system.sale.report_saleorder_document.add_percentage_sign`
 ```
 Source: [snippets/sale.report_saleorder_document.add_percentage_sign.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.report_saleorder_document.add_percentage_sign.xml)
 
+### Add Product Uom  
+ID: `mint_system.sale.report_saleorder_document.add_product_uom`  
+```xml
+<data inherit_id="sale.report_saleorder_document" priority="50">
+
+  <xpath expr="//th[@name='th_quantity']" position="after">
+    <th name="th_product_uom" class="text-right">ME</th>
+  </xpath>
+
+  <xpath expr="//td[@name='td_quantity']" position="after">
+    <td name="td_product_uom" class="text-right">
+      <span t-field="line.product_uom"/>
+    </td>
+  </xpath>
+
+</data>
+```
+Source: [snippets/sale.report_saleorder_document.add_product_uom.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.report_saleorder_document.add_product_uom.xml)
+
+### Add Proforma Note  
+ID: `mint_system.sale.report_saleorder_document.add_proforma_note`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="sale.report_saleorder_document" priority="50">
+
+  <xpath expr="//p[@name='order_note']" position="after">
+    <t t-if="is_pro_forma">
+      <span>
+        <p>Der Unterzeichner erklärt, dass die in diesem Dokument aufgeführten Waren und Ursprungserzeugnisse der Schweiz sind und den Ursprungsregeln im Präferenzverkehr mit der EU entsprechen.<br/><br/></p>
+        <p>Unterschrift: _______________________    Datum: _______________________<br/>                        Aersolution Interior AG<br/></p>
+      </span>
+    </t>
+  </xpath>
+  
+</data>
+
+```
+Source: [snippets/sale.report_saleorder_document.add_proforma_note.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.report_saleorder_document.add_proforma_note.xml)
+
 ### Address Block  
 ID: `mint_system.sale.report_saleorder_document.address_block`  
 ```xml
@@ -1296,9 +1396,9 @@ ID: `mint_system.sale.report_saleorder_document.add_shipping_address_space`
 <?xml version="1.0"?>
 <data inherit_id="sale.report_saleorder_document" priority="55">
 
-	<xpath expr="//t[@t-set='information_block']/t/strong" position="attributes">
-		<attribute name="class">mt-3 d-block</attribute>
-	</xpath>
+    <xpath expr="//t[@t-set='information_block']/t/strong" position="attributes">
+        <attribute name="class">mt-3 d-block</attribute>
+    </xpath>
 
 </data>
 
@@ -1312,19 +1412,21 @@ ID: `mint_system.sale.report_saleorder_document.add_signature_note`
 <data inherit_id="sale.report_saleorder_document" priority="50">
 
     <p t-field="doc.note" position="after">
-        <style>
+        <t t-if="doc.state != 'sale'">
+            <style>
             div#signature {
                 padding-top: 50px;
                 padding-left: 75px;
                 padding-right: 75px;
             }
-        </style>
-        <div id="signature">
-            <p> Hiermit bestelle wir die Produkte/Dienstleistungen gemäss diesem Angebot.<br />
-            <br />
-            <br />
+            </style>
+            <div id="signature">
+                <p>Hiermit bestelle wir die Produkte/Dienstleistungen gemäss diesem Angebot.<br />
+                <br />
+                <br />
             Ort/Datum: _________________ Unterschrift Kunde: __________________________________ </p>
-        </div>
+            </div>
+        </t>
     </p>
 
 </data>
@@ -1369,6 +1471,42 @@ ID: `mint_system.sale.report_saleorder_document.add_validity_date`
 ```
 Source: [snippets/sale.report_saleorder_document.add_validity_date.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.report_saleorder_document.add_validity_date.xml)
 
+### Add Weight  
+ID: `mint_system.sale.report_saleorder_document.add_weight`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="sale.report_saleorder_document" priority="50">
+
+  <xpath expr="//th[@name='th_quantity']" position="inside">
+    <br/>
+    <i>Weight</i>
+  </xpath>
+
+  <xpath expr="//th[@name='th_subtotal']" position="inside">
+    <br/>
+    <i>Weight</i>
+  </xpath>
+
+  <xpath expr="//td[@name='td_quantity']" position="inside">
+    <br/>
+    <i>
+      <span t-field="line.x_studio_weight"/>
+      <span t-field="line.product_id.weight_uom_name"/>
+    </i>
+  </xpath>
+
+  <xpath expr="//td[@name='td_subtotal']" position="inside">
+    <br/>
+    <i>
+      <span t-field="line.x_studio_float_field_fBm1P"/>
+      <span t-field="line.product_id.weight_uom_name"/>
+    </i>
+  </xpath>
+
+</data>
+```
+Source: [snippets/sale.report_saleorder_document.add_weight.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.report_saleorder_document.add_weight.xml)
+
 ### Append Payment Terms  
 ID: `mint_system.sale.report_saleorder_document.append_payment_terms`  
 ```xml
@@ -1635,14 +1773,14 @@ ID: `mint_system.sale.report_saleorder_document.format_qty_with_decimal`
 <?xml version="1.0"?>
 <data inherit_id="sale.report_saleorder_document" priority="50">
 
-	<xpath expr="//span[@id='product_uom_qty']" position="replace">
-		<t t-if="line.product_uom.id == 1">
-			<span id="product_uom_qty" t-field="line.product_uom_qty" t-options="{'widget': 'integer'}"/>
-		</t>
-		<t t-else="">
-			<span id="product_uom_qty" t-field="line.product_uom_qty"/>
-		</t>
-	</xpath>
+    <xpath expr="//span[@id='product_uom_qty']" position="replace">
+        <t t-if="line.product_uom.id == 1">
+            <span id="product_uom_qty" t-field="line.product_uom_qty" t-options="{'widget': 'integer'}"/>
+        </t>
+        <t t-else="">
+            <span id="product_uom_qty" t-field="line.product_uom_qty"/>
+        </t>
+    </xpath>
 
 </data>
 ```
@@ -1654,13 +1792,13 @@ ID: `mint_system.sale.report_saleorder_document.format_qty`
 <?xml version="1.0"?>
 <data inherit_id="sale.report_saleorder_document" priority="50">
 
-	<span t-field="line.product_uom_qty" position="attributes">
-		<attribute name="t-options-widget">"integer"</attribute>
-	</span>
+    <span t-field="line.product_uom_qty" position="attributes">
+        <attribute name="t-options-widget">"integer"</attribute>
+    </span>
 
-	<!-- <span t-field="line.product_uom_qty_confirmed" position="attributes">
-		<attribute name="t-options-widget">"integer"</attribute>
-	</span> -->
+    <!-- <span t-field="line.product_uom_qty_confirmed" position="attributes">
+        <attribute name="t-options-widget">"integer"</attribute>
+    </span> -->
 
 </data>
 ```
@@ -1835,6 +1973,18 @@ ID: `mint_system.sale.report_saleorder_document.remove_taxes`
 ```
 Source: [snippets/sale.report_saleorder_document.remove_taxes.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.report_saleorder_document.remove_taxes.xml)
 
+### Remove User Id  
+ID: `mint_system.sale.report_saleorder_document.remove_user_id`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="sale.report_saleorder_document" priority="50">
+
+  <xpath expr="//p[@t-field='doc.user_id']/.." position="replace"/>
+
+</data>
+```
+Source: [snippets/sale.report_saleorder_document.remove_user_id.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.report_saleorder_document.remove_user_id.xml)
+
 ### Remove Vat  
 ID: `mint_system.sale.report_saleorder_document.remove_vat`  
 ```xml
@@ -1910,6 +2060,84 @@ ID: `mint_system.sale.report_saleorder_document.repeat_table_header`
 ```
 Source: [snippets/sale.report_saleorder_document.repeat_table_header.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.report_saleorder_document.repeat_table_header.xml)
 
+### Replace Address And Information Block  
+ID: `mint_system.sale.report_saleorder_document.replace_address_and_information_block`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="sale.report_saleorder_document" priority="50">
+
+  <xpath expr="//t[@t-set='address']" position="replace"/>
+
+  <xpath expr="//t[@t-set='information_block']/.." position="replace">
+
+    <div class="row text-900 o_bold">
+      <div class="col-7">Customer</div>
+      <div class="col-5">Invoice Address</div>
+    </div>
+
+    <div class="row">
+      <div class="col-7">
+        <span t-field="doc.partner_id.commercial_company_name"/>
+      </div>
+      <div class="col-5">
+        <span t-field="doc.partner_invoice_id.commercial_company_name"/>
+      </div>
+    </div>
+
+    <div class="row">
+      <div class="col-7">
+        <span t-field="doc.partner_id" t-options-widget="&quot;contact&quot;" t-options-fields="['address']" t-options-no_marker="True"/>
+      </div>
+      <div class="col-5">
+        <span t-field="doc.partner_invoice_id" t-options-widget="&quot;contact&quot;" t-options-fields="['address']" t-options-no_marker="True"/>
+      </div>
+    </div>
+
+    <div class="row">
+      <div class="col-5 text-900 o_bold offset-7" style="margin-top:25px">Delivery Address</div>
+    </div>
+
+    <div class="row">
+      <div class="col-5 offset-7">
+        <span t-field="doc.partner_shipping_id.commercial_company_name"/>
+      </div>
+    </div>
+
+    <div class="row">
+      <div class="col-5 offset-7">
+        <span t-field="doc.partner_shipping_id" t-options-widget="&quot;contact&quot;" t-options-fields="['address']" t-options-no_marker="True"/>
+      </div>
+    </div>
+
+    <div class="row o_bold text-900" style="margin-top:25px">
+      <div class="col-7">Your Contact</div>
+      <div class="col-5">Our Contact</div>
+    </div>
+
+    <div class="row">
+      <div class="col-7">
+        <span t-field="doc.partner_id.name"/>
+      </div>
+      <div class="col-5">
+        <span t-field="doc.user_id.name"/>
+      </div>
+    </div>
+
+    <div class="row">
+      <div class="col-7" style="margin-bottom:25px">
+        <span t-field="doc.partner_id" t-options-widget="&quot;contact&quot;" t-options-fields="['phone', 'email']" t-options-no_marker="True"/>
+      </div>
+      <div class="col-5">
+        <span t-field="doc.user_id" t-options-widget="&quot;contact&quot;" t-options-fields="['phone', 'email']" t-options-no_marker="True"/>
+      </div>
+    </div>
+
+  </xpath>
+
+</data>
+```
+Source: [snippets/sale.report_saleorder_document.replace_address_and_information_block.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.report_saleorder_document.replace_address_and_information_block.xml)
+
 ### Replace Informations  
 ID: `mint_system.sale.report_saleorder_document.replace_informations`  
 ```xml
@@ -2029,39 +2257,39 @@ ID: `mint_system.sale.report_saleorder_document.replace_summary`
   <xpath expr="//div[@name='so_total_summary']" position="replace">
 
     <style>
-			table.trimada_summary tr {
-				border-top: solid 1px !important;
-				border-bottom: solid 1px;
-			}
-			table.trimada_details tr {
-			  border-top: 0px !important;
-			  border-bottom: 0px;
-			  line-height: 0.7;
-			}
-			table.trimada_summary #amount_untaxed_label {
-				width: 15.5%;
-				text-align: left;
-			}
-			table.trimada_summary #amount_untaxed {
-				width: 23%;
-				text-align: left;
-			}
-			table.trimada_summary #amount_by_group_label {
-				width: 12%;
-				text-align: left;
-			}
-			table.trimada_summary #amount_by_group {
-				width: 17%;
-				text-align: left;
-			}
-			table.trimada_summary #current_subtotal_label {
-				width: 14%;
-				text-align: right;
-			}
-			table.trimada_summary #current_subtotal {
-				width: 18%;
-				text-align: right;
-			}
+            table.trimada_summary tr {
+                border-top: solid 1px !important;
+                border-bottom: solid 1px;
+            }
+            table.trimada_details tr {
+              border-top: 0px !important;
+              border-bottom: 0px;
+              line-height: 0.7;
+            }
+            table.trimada_summary #amount_untaxed_label {
+                width: 15.5%;
+                text-align: left;
+            }
+            table.trimada_summary #amount_untaxed {
+                width: 23%;
+                text-align: left;
+            }
+            table.trimada_summary #amount_by_group_label {
+                width: 12%;
+                text-align: left;
+            }
+            table.trimada_summary #amount_by_group {
+                width: 17%;
+                text-align: left;
+            }
+            table.trimada_summary #current_subtotal_label {
+                width: 14%;
+                text-align: right;
+            }
+            table.trimada_summary #current_subtotal {
+                width: 18%;
+                text-align: right;
+            }
     </style>
 
     <table class="table table-borderless table-sm trimada trimada_summary o_main_table">
@@ -2287,32 +2515,32 @@ ID: `mint_system.sale.report_saleorder_document.set_ids`
 <data inherit_id="sale.report_saleorder_document" priority="50">
   
   <xpath expr="//div[@id='informations']//p[@t-field='doc.incoterm.code']/.." position="attributes">
-		<attribute name="id">incoterm</attribute>
-	</xpath>
-	
-	<xpath expr="//div[@id='informations']//p[@t-field='doc.date_order']" position="attributes">
-		<attribute name="id">date_order</attribute>
-	</xpath>
+        <attribute name="id">incoterm</attribute>
+    </xpath>
+    
+    <xpath expr="//div[@id='informations']//p[@t-field='doc.date_order']" position="attributes">
+        <attribute name="id">date_order</attribute>
+    </xpath>
 
-	<xpath expr="//th[@name='th_description']" position="attributes">
-		<attribute name="id">description</attribute>
-	</xpath>
+    <xpath expr="//th[@name='th_description']" position="attributes">
+        <attribute name="id">description</attribute>
+    </xpath>
 
-	<xpath expr="//th[@name='th_quantity']" position="attributes">
-		<attribute name="id">product_uom_qty</attribute>
-	</xpath>
+    <xpath expr="//th[@name='th_quantity']" position="attributes">
+        <attribute name="id">product_uom_qty</attribute>
+    </xpath>
 
-	<xpath expr="//td[@name='td_quantity']/span[1]" position="attributes">
-		<attribute name="id">product_uom_qty</attribute>
-	</xpath>
-	
-	<xpath expr="//td[@name='td_quantity']/span[2]" position="attributes">
-		<attribute name="id">product_uom</attribute>
-	</xpath>
+    <xpath expr="//td[@name='td_quantity']/span[1]" position="attributes">
+        <attribute name="id">product_uom_qty</attribute>
+    </xpath>
+    
+    <xpath expr="//td[@name='td_quantity']/span[2]" position="attributes">
+        <attribute name="id">product_uom</attribute>
+    </xpath>
 
-	<xpath expr="//td[@name='td_quantity']" position="attributes">
-		<attribute name="id">product_uom_qty</attribute>
-	</xpath>
+    <xpath expr="//td[@name='td_quantity']" position="attributes">
+        <attribute name="id">product_uom_qty</attribute>
+    </xpath>
 
 </data>
 ```
@@ -2375,6 +2603,22 @@ ID: `mint_system.sale.report_saleorder_document.set_title_font_size`
 ```
 Source: [snippets/sale.report_saleorder_document.set_title_font_size.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.report_saleorder_document.set_title_font_size.xml)
 
+### Show Categ Id  
+ID: `mint_system.sale.report_saleorder_document.show_categ_id`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="sale.report_saleorder_document" priority="50">
+  
+  <xpath expr="//span[@t-field='line.name']" position="after">
+    <div>
+      <span t-field="line.product_id.categ_id"/>
+    </div>
+ </xpath>
+
+</data>
+```
+Source: [snippets/sale.report_saleorder_document.show_categ_id.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.report_saleorder_document.show_categ_id.xml)
+
 ### Show Default Code  
 ID: `mint_system.sale.report_saleorder_document.show_default_code`  
 ```xml
@@ -2471,160 +2715,48 @@ ID: `mint_system.sale.report_saleorder_document.show_qty_remaining`
 ```
 Source: [snippets/sale.report_saleorder_document.show_qty_remaining.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.report_saleorder_document.show_qty_remaining.xml)
 
+### Style Carbo Link  
+ID: `mint_system.sale.report_saleorder_document.style_carbo_link`  
+```xml
+<data inherit_id="sale.report_saleorder_document" priority="60">
+
+    <xpath expr="//div[hasclass('page')]" position="before">
+        <style>
+        .o_company_1_layout {
+            font-family: Dobra-Book;
+            font-size: 80%;
+            }
+        </style>
+    </xpath>
+
+    <xpath expr="//div/div/div[2]/p" position="attributes">
+        <attribute name="t-options-widget">"date"</attribute>
+    </xpath>
+
+</data>
+```
+Source: [snippets/sale.report_saleorder_document.style_carbo_link.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.report_saleorder_document.style_carbo_link.xml)
+
 ### Style Gelso  
 ID: `mint_system.sale.report_saleorder_document.style_gelso`  
 ```xml
 <?xml version="1.0"?>
 <data inherit_id="sale.report_saleorder_document" priority="60">
 
-	<xpath expr="//div[@id='incoterm']" position="attributes">
-		<attribute name="class" separator=" " add="col-auto col-3 mw-100 mb-2"/>
-	</xpath>
-	
-	<xpath expr="//p[@id='date_order']" position="attributes">
-		<attribute name="t-options-widget">"date"</attribute>
-	</xpath>
+    <xpath expr="//div[@id='incoterm']" position="attributes">
+        <attribute name="class" separator=" " add="col-auto col-3 mw-100 mb-2"/>
+    </xpath>
+    
+    <xpath expr="//p[@id='date_order']" position="attributes">
+        <attribute name="t-options-widget">"date"</attribute>
+    </xpath>
 
 </data>
 ```
 Source: [snippets/sale.report_saleorder_document.style_gelso.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.report_saleorder_document.style_gelso.xml)
 
-### Style Moser  
-ID: `mint_system.sale.report_saleorder_document.style_moser`  
-```xml
-<data inherit_id="sale.report_saleorder_document" priority="60">
-
-	<xpath expr="//div[hasclass('page')]" position="before">
-		<style>
-		.o_company_1_layout {
-        	font-family: arial;
-     	}
-		.o_company_1_layout.o_report_layout_standard h2 {
-        	color: black;
-       		font-size: 1.4rem;
-			    font-weight: bold;
-     	}
-     	.o_company_1_layout.o_report_layout_standard #total strong {
-        	color: black;
-     	}
-     	div#informations {
-     	 	margin-top: 30px;
-     	 	margin-bottom: 60px;
-     	}
-     	h2.mt-4 {
-     	 	margin-top: 70px !important;
-     	}
-     	td#tax_amount {
-     	 	text-align: right;
-     	}
-		</style>
-	</xpath>
-	
-</data>
-```
-Source: [snippets/sale.report_saleorder_document.style_moser.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.report_saleorder_document.style_moser.xml)
-
-### Style Trimada  
-ID: `mint_system.sale.report_saleorder_document.style_trimada`  
-```xml
-<?xml version="1.0"?>
-<data inherit_id="sale.report_saleorder_document" priority="60">
-
-	<xpath expr="//div[hasclass('page')]" position="before">
-		<style>
-			.o_company_1_layout {
-				font-family: arial;
-			}
-			table.trimada {
-				font-size: 9pt;
-				font-family: arial;
-				color: black;
-			}
-			table.trimada tr.first td {
-				padding-bottom: 0;
-			}
-			table.trimada tr.second td {
-				padding-top: 0;
-			}
-			table.trimada tr.second {
-				border-bottom: 1px solid rgb(220,220,220);
-			}
-			table.trimada thead tr {
-				border-top:solid 1px;
-				border-bottom: solid 1px;
-			}
-			table.trimada thead th#position {
-				width: 5mm;
-			}
-			table.trimada thead th#default_code {
-			  width: 27mm;
-			  text-align: right;
-			}
-			table.trimada thead th#quantity {
-			  width: 25mm;
-			  text-align: right !important;
-			}
-			table.trimada tbody td#position {
-			  text-align: right;
-			}
-			table.trimada tbody td#default_code {
-			  text-align: right;
-			}
-			table.trimada tbody #commitment_date {
-			  text-align: right;
-			}
-			table.trimada tbody td span#product_uom_qty {
-			  font-weight: bold;
-			}
-			table.trimada tbody td span#product_uom_qty_confirmed {
-			  font-weight: bold;
-			}
-			.subtitel {
-				font-size: 11pt;
-				font-family: arial;
-				margin-top: 10mm;
-			}
-			.note {
-				font-size: 9pt;
-				font-family: arial;
-			}
-		</style>
-	</xpath>
-
-	<xpath expr="//table[2]" position="attributes">
-		<attribute name="class" separator=" " add="trimada table-borderless"/>
-	</xpath>
-	
-	<xpath expr="//th[@id='commitment_date']" position="attributes">
-		<attribute name="class">text-right</attribute>
-	</xpath>
-
-</data>
-
-
-```
-Source: [snippets/sale.report_saleorder_document.style_trimada.xml](https://github.com/Mint-System/Odoo-Build/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-if='not line.display_type']" position="attributes">
-		  <attribute name="t-if">not line.display_type and not line.product_id.x_hide_on_sale_order</attribute>
-	  </xpath>
-
-	  <!--<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-Build/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`  
+### Style Mint System  
+ID: `mint_system.sale.report_saleorder_document.style_mint_system`  
 ```xml
 <?xml version="1.0"?>
 <data inherit_id="sale.report_saleorder_document" priority="50">
@@ -2643,18 +2775,6 @@ ID: `mint_system.sale.report_saleorder_document.x_sudio_description`
     <attribute name="class" separator=" " add="o_italic"/>
   </xpath>
 
-  <xpath expr="/t/t/div/div[2]" position="after">
-    <t t-if="doc.x_studio_description">
-      <div class="row">
-        <div class="col">
-          <span t-field="doc.x_studio_description"/>
-          <br/>
-          <br/>
-        </div>
-      </div>
-    </t>
-  </xpath>
-
   <xpath expr="//tbody[hasclass('sale_tbody')]/tr/td[1]/span" position="attributes">
     <attribute name="class" separator=" " add="o_italic"/>
   </xpath>
@@ -2692,7 +2812,220 @@ ID: `mint_system.sale.report_saleorder_document.x_sudio_description`
 </data>
 
 ```
-Source: [snippets/sale.report_saleorder_document.x_sudio_description.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.report_saleorder_document.x_sudio_description.xml)
+Source: [snippets/sale.report_saleorder_document.style_mint_system.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.report_saleorder_document.style_mint_system.xml)
+
+### Style Moser  
+ID: `mint_system.sale.report_saleorder_document.style_moser`  
+```xml
+<data inherit_id="sale.report_saleorder_document" priority="60">
+
+    <xpath expr="//div[hasclass('page')]" position="before">
+        <style>
+        .o_company_1_layout {
+            font-family: arial;
+         }
+        .o_company_1_layout.o_report_layout_standard h2 {
+            color: black;
+               font-size: 1.4rem;
+                font-weight: bold;
+         }
+         .o_company_1_layout.o_report_layout_standard #total strong {
+            color: black;
+         }
+         div#informations {
+              margin-top: 30px;
+              margin-bottom: 60px;
+         }
+         h2.mt-4 {
+              margin-top: 70px !important;
+         }
+         td#tax_amount {
+              text-align: right;
+         }
+        </style>
+    </xpath>
+    
+</data>
+```
+Source: [snippets/sale.report_saleorder_document.style_moser.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.report_saleorder_document.style_moser.xml)
+
+### Style Tissa  
+ID: `mint_system.sale.report_saleorder_document.style_tissa`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="sale.report_saleorder_document" priority="60">
+
+    <xpath expr="//div[hasclass('page')]" position="before">
+        <style>
+            .o_company_1_layout {
+                font-family: arial;
+            }
+            table.trimada {
+                font-size: 9pt;
+                font-family: arial;
+                color: black;
+            }
+            table.trimada tr.first td {
+                padding-bottom: 0;
+            }
+            table.trimada tr.second td {
+                padding-top: 0;
+            }
+            table.trimada tr.second {
+                border-bottom: 1px solid rgb(220,220,220);
+            }
+            table.trimada thead tr {
+                border-top:solid 1px;
+                border-bottom: solid 1px;
+            }
+            table.trimada thead th#position {
+                width: 5mm;
+            }
+            table.trimada thead th#default_code {
+              width: 27mm;
+              text-align: right;
+            }
+            table.trimada thead th#quantity {
+              width: 25mm;
+              text-align: right !important;
+            }
+            table.trimada tbody td#position {
+              text-align: right;
+            }
+            table.trimada tbody td#default_code {
+              text-align: right;
+            }
+            table.trimada tbody #commitment_date {
+              text-align: right;
+            }
+            table.trimada tbody td span#product_uom_qty {
+              font-weight: bold;
+            }
+            table.trimada tbody td span#product_uom_qty_confirmed {
+              font-weight: bold;
+            }
+            .subtitel {
+                font-size: 11pt;
+                font-family: arial;
+                margin-top: 10mm;
+            }
+            .note {
+                font-size: 9pt;
+                font-family: arial;
+            }
+        </style>
+    </xpath>
+
+    <xpath expr="//table[2]" position="attributes">
+        <attribute name="class" separator=" " add="trimada table-borderless"/>
+    </xpath>
+    
+    <xpath expr="//th[@id='commitment_date']" position="attributes">
+        <attribute name="class">text-right</attribute>
+    </xpath>
+
+</data>
+
+```
+Source: [snippets/sale.report_saleorder_document.style_tissa.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.report_saleorder_document.style_tissa.xml)
+
+### Style Trimada  
+ID: `mint_system.sale.report_saleorder_document.style_trimada`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="sale.report_saleorder_document" priority="60">
+
+    <xpath expr="//div[hasclass('page')]" position="before">
+        <style>
+            .o_company_1_layout {
+                font-family: arial;
+            }
+            table.trimada {
+                font-size: 9pt;
+                font-family: arial;
+                color: black;
+            }
+            table.trimada tr.first td {
+                padding-bottom: 0;
+            }
+            table.trimada tr.second td {
+                padding-top: 0;
+            }
+            table.trimada tr.second {
+                border-bottom: 1px solid rgb(220,220,220);
+            }
+            table.trimada thead tr {
+                border-top:solid 1px;
+                border-bottom: solid 1px;
+            }
+            table.trimada thead th#position {
+                width: 5mm;
+            }
+            table.trimada thead th#default_code {
+              width: 27mm;
+              text-align: right;
+            }
+            table.trimada thead th#quantity {
+              width: 25mm;
+              text-align: right !important;
+            }
+            table.trimada tbody td#position {
+              text-align: right;
+            }
+            table.trimada tbody td#default_code {
+              text-align: right;
+            }
+            table.trimada tbody #commitment_date {
+              text-align: right;
+            }
+            table.trimada tbody td span#product_uom_qty {
+              font-weight: bold;
+            }
+            table.trimada tbody td span#product_uom_qty_confirmed {
+              font-weight: bold;
+            }
+            .subtitel {
+                font-size: 11pt;
+                font-family: arial;
+                margin-top: 10mm;
+            }
+            .note {
+                font-size: 9pt;
+                font-family: arial;
+            }
+        </style>
+    </xpath>
+
+    <xpath expr="//table[2]" position="attributes">
+        <attribute name="class" separator=" " add="trimada table-borderless"/>
+    </xpath>
+    
+    <xpath expr="//th[@id='commitment_date']" position="attributes">
+        <attribute name="class">text-right</attribute>
+    </xpath>
+
+</data>
+
+```
+Source: [snippets/sale.report_saleorder_document.style_trimada.xml](https://github.com/Mint-System/Odoo-Build/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-if='not line.display_type']" position="attributes">
+          <attribute name="t-if">not line.display_type and not line.product_id.x_hide_on_sale_order</attribute>
+      </xpath>
+
+      <!--<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-Build/tree/14.0/snippets/sale.report_saleorder_document.x_hide_on_sale_order.xml)
 
 ### X Warranty  
 ID: `mint_system.sale.report_saleorder_document.x_warranty`  
@@ -2738,6 +3071,54 @@ ID: `mint_system.sale.report_saleorder_pro_forma.append_signature`
 Source: [snippets/sale.report_saleorder_pro_forma.append_signature.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.report_saleorder_pro_forma.append_signature.xml)
 
 ## Sale Order Line View Form Readonly  
+### Edit Form  
+ID: `mint_system.sale.sale_order_line_view_form_readonly.edit_form`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="sale.sale_order_line_view_form_readonly" priority="50">
+
+    <form position="replace">
+        <form string="Sales Order Item">
+            <sheet>
+                <div class="oe_title">
+                    <h1>
+                        <field name="display_name" />
+                    </h1>
+                </div>
+                <group>
+                    <group>
+                        <field name="order_id" />
+                        <field name="product_id" />
+                        <field name="name" />
+                        <field name="product_uom_qty" />
+                        <field name="qty_delivered" />
+                        <field name="qty_invoiced" />
+                        <field name="product_uom_category_id" />
+                        <field name="product_uom" />
+                        <field name="company_id" options="{'no_create': True}"
+                            groups="base.group_multi_company" />
+                        <field name="order_partner_id" invisible="1" />
+                        <field name="display_type" invisible="1" />
+                        <field name="product_updatable" invisible="1" />
+                    </group>
+                    <group>
+                        <field name="price_unit" />
+                        <field name="discount" groups="product.group_discount_per_so_line" />
+                        <field name="price_subtotal" widget="monetary" />
+                        <field name="tax_id" widget="many2many_tags" />
+                        <field name="price_tax" widget="monetary" />
+                        <field name="price_total" widget="monetary" />
+                        <field name="currency_id" invisible="1" />
+                    </group>
+                </group>
+            </sheet>
+        </form>
+    </form>
+
+</data>
+```
+Source: [snippets/sale.sale_order_line_view_form_readonly.edit_form.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.sale_order_line_view_form_readonly.edit_form.xml)
+
 ### Edit Price Unit  
 ID: `mint_system.sale.sale_order_line_view_form_readonly.edit_price_unit`  
 ```xml
@@ -2780,6 +3161,20 @@ ID: `mint_system.sale.sale_order_line_view_form_readonly.show_invoice_lines`
 ```
 Source: [snippets/sale.sale_order_line_view_form_readonly.show_invoice_lines.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.sale_order_line_view_form_readonly.show_invoice_lines.xml)
 
+### Show Is Downpayment  
+ID: `mint_system.sale.sale_order_line_view_form_readonly.show_is_downpayment`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="sale.sale_order_line_view_form_readonly" priority="50" >
+
+    <field name="product_id" position="after">
+        <field name="is_downpayment"/>
+    </field>
+
+</data>
+```
+Source: [snippets/sale.sale_order_line_view_form_readonly.show_is_downpayment.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.sale_order_line_view_form_readonly.show_is_downpayment.xml)
+
 ### Show Project Id  
 ID: `mint_system.sale.sale_order_line_view_form_readonly.show_project_id`  
 ```xml
@@ -2794,7 +3189,44 @@ ID: `mint_system.sale.sale_order_line_view_form_readonly.show_project_id`
 ```
 Source: [snippets/sale.sale_order_line_view_form_readonly.show_project_id.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.sale_order_line_view_form_readonly.show_project_id.xml)
 
+### Show Subscription Id  
+ID: `mint_system.sale.sale_order_line_view_form_readonly.show_subscription_id`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="sale.sale_order_line_view_form_readonly" priority="50" >
+
+    <field name="order_id" position="after">
+        <field name="subscription_id"/>
+    </field>
+
+</data>
+```
+Source: [snippets/sale.sale_order_line_view_form_readonly.show_subscription_id.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.sale_order_line_view_form_readonly.show_subscription_id.xml)
+
 ## Sale Order Portal Content  
+### Add Header And Footer Note  
+ID: `mint_system.sale.sale_order_portal_content.add_header_and_footer_note`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="sale.sale_order_portal_content" priority="50">
+
+  <xpath expr="//div[@id='informations']" position="after">
+    <t t-if="sale_order.note_header != '&lt;p&gt;&lt;br&gt;&lt;/p&gt;'">
+      <span class="note" t-field="sale_order.note_header"/>
+    </t>
+  </xpath>
+
+  <xpath expr="//div[@name='signature']" position="before">
+    <t t-if="sale_order.note_footer != '&lt;p&gt;&lt;br&gt;&lt;/p&gt;'">
+      <span class="note" t-field="sale_order.note_footer"/>
+    </t>
+  </xpath>
+
+</data>
+
+```
+Source: [snippets/sale.sale_order_portal_content.add_header_and_footer_note.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.sale_order_portal_content.add_header_and_footer_note.xml)
+
 ### Convert Html Note  
 ID: `mint_system.sale.sale_order_portal_content.convert_html_note`  
 ```xml
@@ -2819,30 +3251,15 @@ ID: `mint_system.sale.sale_order_portal_content.convert_html_note`
 ```
 Source: [snippets/sale.sale_order_portal_content.convert_html_note.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.sale_order_portal_content.convert_html_note.xml)
 
-### Description  
-ID: `mint_system.sale.sale_order_portal_content.description`  
-```xml
-<?xml version="1.0"?>
-<data inherit_id="sale.sale_order_portal_content" priority="50">
-
-  <xpath expr="//div[@id='informations']" position="after">
-    <p t-field="sale_order.x_studio_description" />
-  </xpath>
-
-</data>
-
-```
-Source: [snippets/sale.sale_order_portal_content.description.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.sale_order_portal_content.description.xml)
-
 ### Format Qty  
 ID: `mint_system.sale.sale_order_portal_content.format_qty`  
 ```xml
 <?xml version="1.0"?>
 <data inherit_id="sale.sale_order_portal_content" priority="50">
 
-	<span t-field="line.product_uom_qty" position="attributes">
-		<attribute name="t-options-widget">"integer"</attribute>
-	</span>
+    <span t-field="line.product_uom_qty" position="attributes">
+        <attribute name="t-options-widget">"integer"</attribute>
+    </span>
   
 </data>
 
@@ -2856,11 +3273,11 @@ ID: `mint_system.sale.sale_order_portal_content.get_position`
 <data inherit_id="sale.sale_order_portal_content" priority="50">
 
   <xpath expr="//table[@id='sales_order_table']//tr/th[1]" position="before">
-  	<th class="text-left">Pos</th>
+      <th class="text-left">Pos</th>
   </xpath>
 
   <xpath expr="//td[@id='default_code']" position="before">
-  	<td id="position"><span t-field="line.position"/></td>
+      <td id="position"><span t-field="line.position"/></td>
   </xpath>
  
 </data>
@@ -2876,7 +3293,7 @@ ID: `mint_system.sale.sale_order_portal_content.product_name`
 <data inherit_id="sale.sale_order_portal_content" priority="50">
 
   <xpath expr="//td[@id='product_name']" position="replace">
-  	<td id="product_name"><span t-field="line.product_id.name"/><br/><span class="font-italic" t-field="line.name"/></td>
+      <td id="product_name"><span t-field="line.product_id.name"/><br/><span class="font-italic" t-field="line.name"/></td>
   </xpath>
 
 </data>
@@ -2920,7 +3337,7 @@ ID: `mint_system.sale.sale_order_portal_content.remove_discount_percentage`
 <data inherit_id="sale.sale_order_portal_content" priority="50">
 
   <xpath expr="//th[@t-if='display_discount']/span" position="replace">
-  	<span>Rabatt</span>
+      <span>Rabatt</span>
   </xpath>
  
 </data>
@@ -2948,7 +3365,7 @@ ID: `mint_system.sale.sale_order_portal_content.show_default_code`
 <data inherit_id="sale.sale_order_portal_content" priority="50">
 
   <xpath expr="//table[@id='sales_order_table']//tr/th[1]" position="before">
-  	<th class="text-left">Referenz</th>
+      <th class="text-left">Referenz</th>
   </xpath>
 
   <xpath expr="//td[@id='product_name']" position="before">
@@ -2957,7 +3374,7 @@ ID: `mint_system.sale.sale_order_portal_content.show_default_code`
         white-space: nowrap;
       }
     </style>
-  	<td id="default_code"><span t-field="line.product_id.default_code"/></td>
+      <td id="default_code"><span t-field="line.product_id.default_code"/></td>
   </xpath>
  
 </data>
@@ -2965,6 +3382,21 @@ ID: `mint_system.sale.sale_order_portal_content.show_default_code`
 ```
 Source: [snippets/sale.sale_order_portal_content.show_default_code.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.sale_order_portal_content.show_default_code.xml)
 
+### X Description  
+ID: `mint_system.sale.sale_order_portal_content.x_description`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="sale.sale_order_portal_content" priority="50">
+
+  <xpath expr="//div[@id='informations']" position="after">
+    <p t-field="sale_order.x_studio_description" />
+  </xpath>
+
+</data>
+
+```
+Source: [snippets/sale.sale_order_portal_content.x_description.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.sale_order_portal_content.x_description.xml)
+
 ### X Hide On Sale Order  
 ID: `mint_system.sale.sale_order_portal_content.x_hide_on_sale_order`  
 ```xml
@@ -3023,6 +3455,18 @@ ID: `mint_system.sale.sale_order_view_search_inherit_quotation.add_filter_state_
 ```
 Source: [snippets/sale.sale_order_view_search_inherit_quotation.add_filter_state_draft_or_sent.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.sale_order_view_search_inherit_quotation.add_filter_state_draft_or_sent.xml)
 
+### Remove Filter My Quotation  
+ID: `mint_system.sale.sale_order_view_search_inherit_quotation.remove_filter_my_quotation`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="sale.sale_order_view_search_inherit_quotation" priority="50">
+
+  <xpath expr="//filter[@name='my_quotation']" position="replace" />
+
+</data>
+```
+Source: [snippets/sale.sale_order_view_search_inherit_quotation.remove_filter_my_quotation.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.sale_order_view_search_inherit_quotation.remove_filter_my_quotation.xml)
+
 ## Sale Order View Search Inherit Sale  
 ### Add Invoice Status Invoiced  
 ID: `mint_system.sale.sale_order_view_search_inherit_sale.add_invoice_status_invoiced`  
@@ -3160,6 +3604,21 @@ ID: `mint_system.sale.view_order_form.edit_name`
 ```
 Source: [snippets/sale.view_order_form.edit_name.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.view_order_form.edit_name.xml)
 
+### Edit Tax Id  
+ID: `mint_system.sale.view_order_form.edit_tax_id`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="sale.view_order_form" priority="50">
+
+  <xpath expr="//field[@name='tax_id']" position="attributes">
+    <attribute name="attrs">{}</attribute>
+  </xpath>
+
+</data>
+
+```
+Source: [snippets/sale.view_order_form.edit_tax_id.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.view_order_form.edit_tax_id.xml)
+
 ### Filter Customer Is Company  
 ID: `mint_system.sale.view_order_form.filter_customer_is_company`  
 ```xml
@@ -3225,6 +3684,23 @@ ID: `mint_system.sale.view_order_form.hide_validity_date`
 ```
 Source: [snippets/sale.view_order_form.hide_validity_date.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.view_order_form.hide_validity_date.xml)
 
+### Location In Name  
+ID: `mint_system.sale.view_order_form.location_in_name`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="sale.view_order_form" priority="50">
+
+  <xpath expr="//group[@name='sale_header']/group/field[@name='partner_shipping_id']" position="attributes">
+    <attribute name="context">
+      {'res_partner_search_mode': 'customer', 'show_address': 1, 'show_vat': True, 'show_zip_and_city': True}
+    </attribute>
+  </xpath>
+
+</data>
+
+```
+Source: [snippets/sale.view_order_form.location_in_name.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.view_order_form.location_in_name.xml)
+
 ### Modify Readonly Date Order  
 ID: `mint_system.sale.view_order_form.modify_readonly_date_order`  
 ```xml
@@ -3239,6 +3715,22 @@ ID: `mint_system.sale.view_order_form.modify_readonly_date_order`
 ```
 Source: [snippets/sale.view_order_form.modify_readonly_date_order.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.view_order_form.modify_readonly_date_order.xml)
 
+### Move Client Order Ref  
+ID: `mint_system.sale.view_order_form.move_client_order_ref`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="sale.view_order_form" priority="50">
+
+  <xpath expr="//field[@name='partner_shipping_id']" position="after">
+    <field name="client_order_ref"/>
+  </xpath>
+  
+  <xpath expr="//group[@name='sales_person']/field[@name='client_order_ref']" position="replace"/>
+  
+</data>
+```
+Source: [snippets/sale.view_order_form.move_client_order_ref.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.view_order_form.move_client_order_ref.xml)
+
 ### Move Comment  
 ID: `mint_system.sale.view_order_form.move_comment`  
 ```xml
@@ -3253,6 +3745,27 @@ ID: `mint_system.sale.view_order_form.move_comment`
 ```
 Source: [snippets/sale.view_order_form.move_comment.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.view_order_form.move_comment.xml)
 
+### Move Commitment Date  
+ID: `mint_system.sale.view_order_form.move_commitment_date`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="sale.view_order_form" priority="50">
+
+  <xpath expr="//field[@name='date_order']" position="after">
+    <label for="commitment_date" string="Delivery Date"/>
+    <div name="commitment_date_div" class="o_row">
+      <field name="commitment_date"/>
+      <span name="expected_date_span" class="text-muted">Expected: <field name="expected_date" class="oe_inline" widget="date"/>
+      </span>
+    </div>
+  </xpath>
+
+  <xpath expr="//group/group[@name='sale_shipping']" position="replace"/>
+
+</data>
+```
+Source: [snippets/sale.view_order_form.move_commitment_date.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.view_order_form.move_commitment_date.xml)
+
 ### No Create Edit  
 ID: `mint_system.sale.view_order_form.no_create_edit`  
 ```xml
@@ -3272,6 +3785,21 @@ ID: `mint_system.sale.view_order_form.no_create_edit`
 ```
 Source: [snippets/sale.view_order_form.no_create_edit.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.view_order_form.no_create_edit.xml)
 
+### Product Id No Create  
+ID: `mint_system.sale.view_order_form.product_id_no_create`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="sale.view_order_form" priority="50">
+
+  <xpath expr="//field[@name='order_line']/tree/field[@name='product_id']" position="attributes">
+      <attribute name="options">{'no_open': True, 'no_create': True}</attribute>
+  </xpath>
+
+</data>
+
+```
+Source: [snippets/sale.view_order_form.product_id_no_create.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.view_order_form.product_id_no_create.xml)
+
 ### Project Domain  
 ID: `mint_system.sale.view_order_form.project_domain`  
 ```xml
@@ -3319,6 +3847,21 @@ ID: `mint_system.sale.view_order_form.set_groups_date_order`
 ```
 Source: [snippets/sale.view_order_form.set_groups_date_order.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.view_order_form.set_groups_date_order.xml)
 
+### Set Limit Order Line  
+ID: `mint_system.sale.view_order_form.set_limit_order_line`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="sale.view_order_form" priority="50">
+
+  <xpath expr="//field[@name='order_line']/tree" position="attributes">
+      <attribute name="limit">100</attribute>
+  </xpath>
+
+</data>
+
+```
+Source: [snippets/sale.view_order_form.set_limit_order_line.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.view_order_form.set_limit_order_line.xml)
+
 ### Show Carrier Method  
 ID: `mint_system.sale.view_order_form.show_carrier_method`  
 ```xml
@@ -3334,6 +3877,20 @@ ID: `mint_system.sale.view_order_form.show_carrier_method`
 ```
 Source: [snippets/sale.view_order_form.show_carrier_method.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.view_order_form.show_carrier_method.xml)
 
+### Show Commitment Date  
+ID: `mint_system.sale.view_order_form.show_commitment_date`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="sale.view_order_form" priority="50">
+
+  <xpath expr="//field[@name='date_order']" position="after">
+    <field name="commitment_date" readonly="1"/>
+  </xpath>
+
+</data>
+```
+Source: [snippets/sale.view_order_form.show_commitment_date.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.view_order_form.show_commitment_date.xml)
+
 ### Show Order Line Project Id  
 ID: `mint_system.sale.view_order_form.show_order_line_project_id`  
 ```xml
@@ -3348,6 +3905,20 @@ ID: `mint_system.sale.view_order_form.show_order_line_project_id`
 ```
 Source: [snippets/sale.view_order_form.show_order_line_project_id.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.view_order_form.show_order_line_project_id.xml)
 
+### Show Order Line Subscription Id  
+ID: `mint_system.sale.view_order_form.show_order_line_subscription_id`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="sale.view_order_form" priority="50">
+
+  <xpath expr="//field[@name='order_line']/tree/field[@name='product_id']" position="after">
+    <field name="subscription_id" optional="hide" />
+  </xpath>
+
+</data>
+```
+Source: [snippets/sale.view_order_form.show_order_line_subscription_id.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.view_order_form.show_order_line_subscription_id.xml)
+
 ### Show Product Template Id  
 ID: `mint_system.sale.view_order_form.show_product_template_id`  
 ```xml
@@ -3421,6 +3992,21 @@ ID: `mint_system.sale.view_order_form.show_stock_purchase_line_ids`
 ```
 Source: [snippets/sale.view_order_form.show_stock_purchase_line_ids.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.view_order_form.show_stock_purchase_line_ids.xml)
 
+### X As4import  
+ID: `mint_system.sale.view_order_form.x_as4import`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="sale.view_order_form" priority="50">
+
+    <xpath expr="//field[@name='tag_ids']" position="after">
+        <field name="x_as4import" />
+    </xpath>
+
+</data>
+
+```
+Source: [snippets/sale.view_order_form.x_as4import.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.view_order_form.x_as4import.xml)
+
 ### X Client Project Ref  
 ID: `mint_system.sale.view_order_form.x_client_project_ref`  
 ```xml
@@ -3485,6 +4071,48 @@ ID: `mint_system.sale.view_order_form.x_margin_percent`
 ```
 Source: [snippets/sale.view_order_form.x_margin_percent.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.view_order_form.x_margin_percent.xml)
 
+### X Order Number  
+ID: `mint_system.sale.view_order_form.x_order_number`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="sale.view_order_form" priority="50">
+
+  <xpath expr="//group[@name='order_details']//field[@name='payment_term_id']" position="after">
+    <field name="x_order_number"/>
+  </xpath>
+
+</data>
+```
+Source: [snippets/sale.view_order_form.x_order_number.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.view_order_form.x_order_number.xml)
+
+### X Payment State  
+ID: `mint_system.sale.view_order_form.x_payment_state`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="sale.view_order_form" priority="50">
+
+  <xpath expr="//group[@name='order_details']//field[@name='payment_term_id']" position="after">
+    <field name="x_payment_state"/>
+  </xpath>
+
+</data>
+```
+Source: [snippets/sale.view_order_form.x_payment_state.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.view_order_form.x_payment_state.xml)
+
+### X Payment Term Blanket Order  
+ID: `mint_system.sale.view_order_form.x_payment_term_blanket_order`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="sale.view_order_form" priority="50">
+
+  <xpath expr="//group[@name='order_details']/field[@name='payment_term_id']" position="after">
+    <field name="x_payment_term_blanket_order"/>
+  </xpath>
+
+</data>
+```
+Source: [snippets/sale.view_order_form.x_payment_term_blanket_order.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.view_order_form.x_payment_term_blanket_order.xml)
+
 ### X Sudio Description  
 ID: `mint_system.sale.view_order_form.x_sudio_description`  
 ```xml
@@ -3859,6 +4487,38 @@ ID: `mint_system.sale.view_order_tree.add_comment`
 ```
 Source: [snippets/sale.view_order_tree.add_comment.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.view_order_tree.add_comment.xml)
 
+### Format Delivery Status  
+ID: `mint_system.sale.view_order_tree.format_delivery_status`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="sale.view_order_tree" priority="50">
+
+  <xpath expr="//field[@name='delivery_status']" position="attributes">
+    <attribute name="widget">badge</attribute>
+    <attribute name="decoration-success">delivery_status=='full'</attribute>
+    <attribute name="decoration-danger">delivery_status=='pending'</attribute>
+    <attribute name="decoration-warning">delivery_status=='partial'</attribute>
+  </xpath>
+
+</data>
+```
+Source: [snippets/sale.view_order_tree.format_delivery_status.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.view_order_tree.format_delivery_status.xml)
+
+### Show Client Order Ref  
+ID: `mint_system.sale.view_order_tree.show_client_order_ref`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="sale.view_order_tree" priority="50">
+
+  <field name="partner_id" position="after">
+    <field name="client_order_ref"/>
+  </field>
+
+</data>
+
+```
+Source: [snippets/sale.view_order_tree.show_client_order_ref.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.view_order_tree.show_client_order_ref.xml)
+
 ### Show Partner Shipping  
 ID: `mint_system.sale.view_order_tree.show_partner_shipping`  
 ```xml
@@ -3889,6 +4549,20 @@ ID: `mint_system.sale.view_order_tree.show_state`
 ```
 Source: [snippets/sale.view_order_tree.show_state.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.view_order_tree.show_state.xml)
 
+### X Payment State  
+ID: `mint_system.sale.view_order_tree.x_payment_state`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="sale.view_order_tree" priority="50">
+
+  <xpath expr="//field[@name='invoice_status']" position="before">
+    <field name="x_payment_state" decoration-success="x_payment_state=='paid'" decoration-danger="x_payment_state=='not_paid'" decoration-warning="x_payment_state=='in_payment'" widget="badge"/>
+  </xpath>
+  
+</data>
+```
+Source: [snippets/sale.view_order_tree.x_payment_state.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.view_order_tree.x_payment_state.xml)
+
 ### X Product Uom Qty  
 ID: `mint_system.sale.view_order_tree.x_product_uom_qty`  
 ```xml
@@ -3904,6 +4578,20 @@ ID: `mint_system.sale.view_order_tree.x_product_uom_qty`
 ```
 Source: [snippets/sale.view_order_tree.x_product_uom_qty.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.view_order_tree.x_product_uom_qty.xml)
 
+### X Vst  
+ID: `mint_system.sale.view_order_tree.x_vst`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="sale.view_order_tree" priority="50">
+
+  <field name="partner_id" position="after">
+    <field name="x_vst"/>
+  </field>
+
+</data>
+```
+Source: [snippets/sale.view_order_tree.x_vst.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.view_order_tree.x_vst.xml)
+
 ## View Quotation Tree  
 ### Add Client Order Ref  
 ID: `mint_system.sale.view_quotation_tree.add_client_order_ref`  
@@ -3947,7 +4635,75 @@ ID: `mint_system.sale.view_quotation_tree.replace_create_date`
 ```
 Source: [snippets/sale.view_quotation_tree.replace_create_date.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.view_quotation_tree.replace_create_date.xml)
 
+### Show Delivery Status  
+ID: `mint_system.sale.view_quotation_tree.show_delivery_status`  
+```xml
+<data inherit_id="sale.view_quotation_tree" priority="50">
+
+    <xpath expr="//field[@name='state']" position="before">
+        <field name="delivery_status" decoration-danger="delivery_status == 'pending'" decoration-warning="delivery_status == 'partial'" decoration-success="delivery_status == 'full'" widget="badge" optional="show"/>
+    </xpath>
+
+</data>
+```
+Source: [snippets/sale.view_quotation_tree.show_delivery_status.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.view_quotation_tree.show_delivery_status.xml)
+
+### Show ​Payment Term Id  
+ID: `mint_system.sale.view_quotation_tree.show_​payment_term_id`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="sale.view_quotation_tree" priority="50">
+
+    <xpath expr="//field[@name='state']" position="before">
+        <field name="payment_term_id" optional="show"/>
+    </xpath>
+
+</data>
+```
+Source: [snippets/sale.view_quotation_tree.show_​payment_term_id.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.view_quotation_tree.show_​payment_term_id.xml)
+
+### X Order Number  
+ID: `mint_system.sale.view_quotation_tree.x_order_number`  
+```xml
+<data inherit_id="sale.view_quotation_tree" priority="50">
+
+    <xpath expr="//field[@name='name']" position="after">
+        <field name="x_order_number"/>
+    </xpath>
+
+</data>
+```
+Source: [snippets/sale.view_quotation_tree.x_order_number.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.view_quotation_tree.x_order_number.xml)
+
+### X Payment State  
+ID: `mint_system.sale.view_quotation_tree.x_payment_state`  
+```xml
+<data inherit_id="sale.view_quotation_tree" priority="50">
+
+    <xpath expr="//field[@name='invoice_status']" position="after">
+        <field name="x_payment_state" optional="hide"/>
+    </xpath>
+
+</data>
+```
+Source: [snippets/sale.view_quotation_tree.x_payment_state.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.view_quotation_tree.x_payment_state.xml)
+
 ## View Sales Order Filter  
+### Add Filter Collective Invoice  
+ID: `mint_system.sale.view_sales_order_filter.add_filter_collective_invoice`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="sale.view_sales_order_filter" priority="50">
+
+  <xpath expr="//filter[@name='my_sale_orders_filter']" position="after">
+    <filter string="Kunden mit Sammelrechnung" name="customer_collective_invoice" domain="[('partner_id.category_id.name', 'in', ['Sammelrechnung'])]"/>
+    <filter string="Kunden ohne Sammelrechnung" name="customer_collective_invoice" domain="[('partner_id.category_id.name', 'not in', ['Sammelrechnung'])]"/>
+  </xpath>
+
+</data>
+```
+Source: [snippets/sale.view_sales_order_filter.add_filter_collective_invoice.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale.view_sales_order_filter.add_filter_collective_invoice.xml)
+
 ### Add Invoice Status  
 ID: `mint_system.sale.view_sales_order_filter.add_invoice_status`  
 ```xml
diff --git a/snippets/sale.report_blanketorder_document.set_ids.xml b/snippets/sale.report_blanketorder_document.set_ids.xml
index 03b20e53..73094b75 100644
--- a/snippets/sale.report_blanketorder_document.set_ids.xml
+++ b/snippets/sale.report_blanketorder_document.set_ids.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <data inherit_id="sale.report_blanketorder_document" priority="50">
   
-	<xpath expr="//div[1]/div[4]" position="attributes">
-		<attribute name="id">table_total</attribute>
-	</xpath>	
+    <xpath expr="//div[1]/div[4]" position="attributes">
+        <attribute name="id">table_total</attribute>
+    </xpath>    
 
 </data>
\ No newline at end of file
diff --git a/snippets/sale.report_saleorder_document.add_commitment_date.xml b/snippets/sale.report_saleorder_document.add_commitment_date.xml
new file mode 100644
index 00000000..2e3a01c3
--- /dev/null
+++ b/snippets/sale.report_saleorder_document.add_commitment_date.xml
@@ -0,0 +1,15 @@
+<data inherit_id="sale.report_saleorder_document" priority="50">
+
+  <xpath expr="//th[@name='th_description']" position="after">
+    <th id="commitment_date">
+      <span>Geplantes Datum ETD</span>
+    </th>
+  </xpath>
+
+  <xpath expr="//td[@name='td_name']" position="after">
+    <td id="commitment_datet">
+      <span t-out="line.commitment_date"/>
+    </td>
+  </xpath>
+
+</data>
\ No newline at end of file
diff --git a/snippets/sale.report_saleorder_document.add_delivery_dates.xml b/snippets/sale.report_saleorder_document.add_delivery_dates.xml
new file mode 100644
index 00000000..1d1288a0
--- /dev/null
+++ b/snippets/sale.report_saleorder_document.add_delivery_dates.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<data inherit_id="sale.report_saleorder_document" priority="50">
+  
+  <xpath expr="//th[@name='th_priceunit']" position="before">
+    <th name="th_delivery_dates" class="text-right">Delivery Date</th>
+  </xpath>
+
+  <xpath expr="//td[@name='td_priceunit']" position="before">
+    <td name="td_delivery_dates" class="text-right">
+       <span t-field="line.delivery_dates" t-options="{&quot;widget&quot;: &quot;date&quot;}"/>
+    </td>
+  </xpath>
+  
+</data>
\ No newline at end of file
diff --git a/snippets/sale.report_saleorder_document.add_header_and_footer_note.xml b/snippets/sale.report_saleorder_document.add_header_and_footer_note.xml
index 6d773fa2..8faf4eb4 100644
--- a/snippets/sale.report_saleorder_document.add_header_and_footer_note.xml
+++ b/snippets/sale.report_saleorder_document.add_header_and_footer_note.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0"?>
 <data inherit_id="sale.report_saleorder_document" priority="50">
 
-  <xpath expr="//table[@id='info']" position="after">
+  <xpath expr="//div[@id='informations']" position="after">
     <t t-if="doc.note_header != '&lt;p&gt;&lt;br&gt;&lt;/p&gt;'">
       <span class="note" t-field="doc.note_header"/>
     </t>
   </xpath>
 
-  <xpath expr="//table[2]" position="after">
+  <xpath expr="//div[@name='signature']" position="before">
     <t t-if="doc.note_footer != '&lt;p&gt;&lt;br&gt;&lt;/p&gt;'">
       <span class="note" t-field="doc.note_footer"/>
     </t>
diff --git a/snippets/sale.report_saleorder_document.add_header_space.xml b/snippets/sale.report_saleorder_document.add_header_space.xml
index a0009b3b..e8d2975d 100644
--- a/snippets/sale.report_saleorder_document.add_header_space.xml
+++ b/snippets/sale.report_saleorder_document.add_header_space.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <data inherit_id="sale.report_saleorder_document" priority="50">
 
-	<xpath expr="//h2" position="attributes">
-		 <attribute name="style">padding-top: 5rem</attribute>
-	</xpath>
+    <xpath expr="//h2" position="attributes">
+         <attribute name="style">padding-top: 5rem</attribute>
+    </xpath>
 
 </data>
diff --git a/snippets/sale.report_saleorder_document.add_incoterm_blanket_order.xml b/snippets/sale.report_saleorder_document.add_incoterm_blanket_order.xml
index 424c4865..4280b89d 100644
--- a/snippets/sale.report_saleorder_document.add_incoterm_blanket_order.xml
+++ b/snippets/sale.report_saleorder_document.add_incoterm_blanket_order.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0"?>
 <data inherit_id="sale.report_saleorder_document" priority="50">
 
-	<xpath expr="//div[@id='incoterm']" position="replace">
-		<div id='incoterm' class="col-3" t-if="doc.incoterm" groups="sale_stock.group_display_incoterm">
-			<strong>Incoterm:</strong>
-			<t t-if="doc.x_incoterm_blanket_order">
-				<p t-field="doc.x_incoterm_blanket_order.code"/>
-			</t>
-			<t t-else="">
-				<p t-field="doc.incoterm.code"/>
-			</t>
-		</div>
-	</xpath>
+    <xpath expr="//div[@id='incoterm']" position="replace">
+        <div id='incoterm' class="col-3" t-if="doc.incoterm" groups="sale_stock.group_display_incoterm">
+            <strong>Incoterm:</strong>
+            <t t-if="doc.x_incoterm_blanket_order">
+                <p t-field="doc.x_incoterm_blanket_order.code"/>
+            </t>
+            <t t-else="">
+                <p t-field="doc.incoterm.code"/>
+            </t>
+        </div>
+    </xpath>
 
 </data>
\ No newline at end of file
diff --git a/snippets/sale.report_saleorder_document.add_informations_space.xml b/snippets/sale.report_saleorder_document.add_informations_space.xml
index 7b4b8791..0a698865 100644
--- a/snippets/sale.report_saleorder_document.add_informations_space.xml
+++ b/snippets/sale.report_saleorder_document.add_informations_space.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0"?>
 <data inherit_id="sale.report_saleorder_document" priority="50">
 
-	<xpath expr="//div[@id='informations']" position="before">
-		<style>
-			div#informations {
-				padding-top: 1rem;
-				padding-bottom: 1rem
-			}
-		</style>
-	</xpath>
+    <xpath expr="//div[@id='informations']" position="before">
+        <style>
+            div#informations {
+                padding-top: 1rem;
+                padding-bottom: 1rem
+            }
+        </style>
+    </xpath>
 
 </data>
diff --git a/snippets/sale.report_saleorder_document.add_intrastat_id.xml b/snippets/sale.report_saleorder_document.add_intrastat_id.xml
new file mode 100644
index 00000000..0745cdeb
--- /dev/null
+++ b/snippets/sale.report_saleorder_document.add_intrastat_id.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<data inherit_id="sale.report_saleorder_document" priority="50">
+  
+  <xpath expr="//th[@name='th_quantity']" position="after">
+    <th name="th_hs_code" class="text-right">HS Code</th>
+  </xpath>
+  
+  <xpath expr="//td[@name='td_quantity']" position="after">
+    <td name="td_hs_code" class="text-right">
+       <span t-field="line.product_id.intrastat_id.code"/>
+    </td>
+  </xpath>
+  
+</data>
\ No newline at end of file
diff --git a/snippets/sale.report_saleorder_document.add_note_space.xml b/snippets/sale.report_saleorder_document.add_note_space.xml
index d6640856..a4e3d21f 100644
--- a/snippets/sale.report_saleorder_document.add_note_space.xml
+++ b/snippets/sale.report_saleorder_document.add_note_space.xml
@@ -9,9 +9,9 @@
                 padding-right: 75px;
             }
         </style>
-		<div id="note">
-			<p  t-field="doc.note"/>
-		</div>
+        <div id="note">
+            <p  t-field="doc.note"/>
+        </div>
     </p>
 
 </data>
diff --git a/snippets/sale.report_saleorder_document.add_product_uom.xml b/snippets/sale.report_saleorder_document.add_product_uom.xml
new file mode 100644
index 00000000..1c77fea9
--- /dev/null
+++ b/snippets/sale.report_saleorder_document.add_product_uom.xml
@@ -0,0 +1,13 @@
+<data inherit_id="sale.report_saleorder_document" priority="50">
+
+  <xpath expr="//th[@name='th_quantity']" position="after">
+    <th name="th_product_uom" class="text-right">ME</th>
+  </xpath>
+
+  <xpath expr="//td[@name='td_quantity']" position="after">
+    <td name="td_product_uom" class="text-right">
+      <span t-field="line.product_uom"/>
+    </td>
+  </xpath>
+
+</data>
\ No newline at end of file
diff --git a/snippets/sale.report_saleorder_document.add_proforma_note.xml b/snippets/sale.report_saleorder_document.add_proforma_note.xml
new file mode 100644
index 00000000..2418c13f
--- /dev/null
+++ b/snippets/sale.report_saleorder_document.add_proforma_note.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<data inherit_id="sale.report_saleorder_document" priority="50">
+
+  <xpath expr="//p[@name='order_note']" position="after">
+    <t t-if="is_pro_forma">
+      <span>
+        <p>Der Unterzeichner erklärt, dass die in diesem Dokument aufgeführten Waren und Ursprungserzeugnisse der Schweiz sind und den Ursprungsregeln im Präferenzverkehr mit der EU entsprechen.<br/><br/></p>
+        <p>Unterschrift: _______________________    Datum: _______________________<br/>                        Aersolution Interior AG<br/></p>
+      </span>
+    </t>
+  </xpath>
+  
+</data>
diff --git a/snippets/sale.report_saleorder_document.add_shipping_address_space.xml b/snippets/sale.report_saleorder_document.add_shipping_address_space.xml
index 3ca5b8d7..be8d915b 100644
--- a/snippets/sale.report_saleorder_document.add_shipping_address_space.xml
+++ b/snippets/sale.report_saleorder_document.add_shipping_address_space.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <data inherit_id="sale.report_saleorder_document" priority="55">
 
-	<xpath expr="//t[@t-set='information_block']/t/strong" position="attributes">
-		<attribute name="class">mt-3 d-block</attribute>
-	</xpath>
+    <xpath expr="//t[@t-set='information_block']/t/strong" position="attributes">
+        <attribute name="class">mt-3 d-block</attribute>
+    </xpath>
 
 </data>
diff --git a/snippets/sale.report_saleorder_document.add_signature_note.xml b/snippets/sale.report_saleorder_document.add_signature_note.xml
index 3826e459..94bf4be1 100644
--- a/snippets/sale.report_saleorder_document.add_signature_note.xml
+++ b/snippets/sale.report_saleorder_document.add_signature_note.xml
@@ -2,19 +2,21 @@
 <data inherit_id="sale.report_saleorder_document" priority="50">
 
     <p t-field="doc.note" position="after">
-        <style>
+        <t t-if="doc.state != 'sale'">
+            <style>
             div#signature {
                 padding-top: 50px;
                 padding-left: 75px;
                 padding-right: 75px;
             }
-        </style>
-        <div id="signature">
-            <p> Hiermit bestelle wir die Produkte/Dienstleistungen gemäss diesem Angebot.<br />
-            <br />
-            <br />
+            </style>
+            <div id="signature">
+                <p>Hiermit bestelle wir die Produkte/Dienstleistungen gemäss diesem Angebot.<br />
+                <br />
+                <br />
             Ort/Datum: _________________ Unterschrift Kunde: __________________________________ </p>
-        </div>
+            </div>
+        </t>
     </p>
 
 </data>
\ No newline at end of file
diff --git a/snippets/sale.report_saleorder_document.add_weight.xml b/snippets/sale.report_saleorder_document.add_weight.xml
new file mode 100644
index 00000000..5990ed23
--- /dev/null
+++ b/snippets/sale.report_saleorder_document.add_weight.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0"?>
+<data inherit_id="sale.report_saleorder_document" priority="50">
+
+  <xpath expr="//th[@name='th_quantity']" position="inside">
+    <br/>
+    <i>Weight</i>
+  </xpath>
+
+  <xpath expr="//th[@name='th_subtotal']" position="inside">
+    <br/>
+    <i>Weight</i>
+  </xpath>
+
+  <xpath expr="//td[@name='td_quantity']" position="inside">
+    <br/>
+    <i>
+      <span t-field="line.x_studio_weight"/>
+      <span t-field="line.product_id.weight_uom_name"/>
+    </i>
+  </xpath>
+
+  <xpath expr="//td[@name='td_subtotal']" position="inside">
+    <br/>
+    <i>
+      <span t-field="line.x_studio_float_field_fBm1P"/>
+      <span t-field="line.product_id.weight_uom_name"/>
+    </i>
+  </xpath>
+
+</data>
\ No newline at end of file
diff --git a/snippets/sale.report_saleorder_document.format_qty.xml b/snippets/sale.report_saleorder_document.format_qty.xml
index 1d752f11..ec174dc5 100644
--- a/snippets/sale.report_saleorder_document.format_qty.xml
+++ b/snippets/sale.report_saleorder_document.format_qty.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0"?>
 <data inherit_id="sale.report_saleorder_document" priority="50">
 
-	<span t-field="line.product_uom_qty" position="attributes">
-		<attribute name="t-options-widget">"integer"</attribute>
-	</span>
+    <span t-field="line.product_uom_qty" position="attributes">
+        <attribute name="t-options-widget">"integer"</attribute>
+    </span>
 
-	<!-- <span t-field="line.product_uom_qty_confirmed" position="attributes">
-		<attribute name="t-options-widget">"integer"</attribute>
-	</span> -->
+    <!-- <span t-field="line.product_uom_qty_confirmed" position="attributes">
+        <attribute name="t-options-widget">"integer"</attribute>
+    </span> -->
 
 </data>
\ No newline at end of file
diff --git a/snippets/sale.report_saleorder_document.format_qty_with_decimal.xml b/snippets/sale.report_saleorder_document.format_qty_with_decimal.xml
index 21a35a56..86b0aa6b 100644
--- a/snippets/sale.report_saleorder_document.format_qty_with_decimal.xml
+++ b/snippets/sale.report_saleorder_document.format_qty_with_decimal.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0"?>
 <data inherit_id="sale.report_saleorder_document" priority="50">
 
-	<xpath expr="//span[@id='product_uom_qty']" position="replace">
-		<t t-if="line.product_uom.id == 1">
-			<span id="product_uom_qty" t-field="line.product_uom_qty" t-options="{'widget': 'integer'}"/>
-		</t>
-		<t t-else="">
-			<span id="product_uom_qty" t-field="line.product_uom_qty"/>
-		</t>
-	</xpath>
+    <xpath expr="//span[@id='product_uom_qty']" position="replace">
+        <t t-if="line.product_uom.id == 1">
+            <span id="product_uom_qty" t-field="line.product_uom_qty" t-options="{'widget': 'integer'}"/>
+        </t>
+        <t t-else="">
+            <span id="product_uom_qty" t-field="line.product_uom_qty"/>
+        </t>
+    </xpath>
 
 </data>
\ No newline at end of file
diff --git a/snippets/sale.report_saleorder_document.remove_user_id.xml b/snippets/sale.report_saleorder_document.remove_user_id.xml
new file mode 100644
index 00000000..0137fe60
--- /dev/null
+++ b/snippets/sale.report_saleorder_document.remove_user_id.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<data inherit_id="sale.report_saleorder_document" priority="50">
+
+  <xpath expr="//p[@t-field='doc.user_id']/.." position="replace"/>
+
+</data>
\ No newline at end of file
diff --git a/snippets/sale.report_saleorder_document.replace_address_and_information_block.xml b/snippets/sale.report_saleorder_document.replace_address_and_information_block.xml
new file mode 100644
index 00000000..5640abb3
--- /dev/null
+++ b/snippets/sale.report_saleorder_document.replace_address_and_information_block.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0"?>
+<data inherit_id="sale.report_saleorder_document" priority="50">
+
+  <xpath expr="//t[@t-set='address']" position="replace"/>
+
+  <xpath expr="//t[@t-set='information_block']/.." position="replace">
+
+    <div class="row text-900 o_bold">
+      <div class="col-7">Customer</div>
+      <div class="col-5">Invoice Address</div>
+    </div>
+
+    <div class="row">
+      <div class="col-7">
+        <span t-field="doc.partner_id.commercial_company_name"/>
+      </div>
+      <div class="col-5">
+        <span t-field="doc.partner_invoice_id.commercial_company_name"/>
+      </div>
+    </div>
+
+    <div class="row">
+      <div class="col-7">
+        <span t-field="doc.partner_id" t-options-widget="&quot;contact&quot;" t-options-fields="['address']" t-options-no_marker="True"/>
+      </div>
+      <div class="col-5">
+        <span t-field="doc.partner_invoice_id" t-options-widget="&quot;contact&quot;" t-options-fields="['address']" t-options-no_marker="True"/>
+      </div>
+    </div>
+
+    <div class="row">
+      <div class="col-5 text-900 o_bold offset-7" style="margin-top:25px">Delivery Address</div>
+    </div>
+
+    <div class="row">
+      <div class="col-5 offset-7">
+        <span t-field="doc.partner_shipping_id.commercial_company_name"/>
+      </div>
+    </div>
+
+    <div class="row">
+      <div class="col-5 offset-7">
+        <span t-field="doc.partner_shipping_id" t-options-widget="&quot;contact&quot;" t-options-fields="['address']" t-options-no_marker="True"/>
+      </div>
+    </div>
+
+    <div class="row o_bold text-900" style="margin-top:25px">
+      <div class="col-7">Your Contact</div>
+      <div class="col-5">Our Contact</div>
+    </div>
+
+    <div class="row">
+      <div class="col-7">
+        <span t-field="doc.partner_id.name"/>
+      </div>
+      <div class="col-5">
+        <span t-field="doc.user_id.name"/>
+      </div>
+    </div>
+
+    <div class="row">
+      <div class="col-7" style="margin-bottom:25px">
+        <span t-field="doc.partner_id" t-options-widget="&quot;contact&quot;" t-options-fields="['phone', 'email']" t-options-no_marker="True"/>
+      </div>
+      <div class="col-5">
+        <span t-field="doc.user_id" t-options-widget="&quot;contact&quot;" t-options-fields="['phone', 'email']" t-options-no_marker="True"/>
+      </div>
+    </div>
+
+  </xpath>
+
+</data>
\ No newline at end of file
diff --git a/snippets/sale.report_saleorder_document.replace_summary.xml b/snippets/sale.report_saleorder_document.replace_summary.xml
index f378b20a..a4f60a0a 100644
--- a/snippets/sale.report_saleorder_document.replace_summary.xml
+++ b/snippets/sale.report_saleorder_document.replace_summary.xml
@@ -4,39 +4,39 @@
   <xpath expr="//div[@name='so_total_summary']" position="replace">
 
     <style>
-			table.trimada_summary tr {
-				border-top: solid 1px !important;
-				border-bottom: solid 1px;
-			}
-			table.trimada_details tr {
-			  border-top: 0px !important;
-			  border-bottom: 0px;
-			  line-height: 0.7;
-			}
-			table.trimada_summary #amount_untaxed_label {
-				width: 15.5%;
-				text-align: left;
-			}
-			table.trimada_summary #amount_untaxed {
-				width: 23%;
-				text-align: left;
-			}
-			table.trimada_summary #amount_by_group_label {
-				width: 12%;
-				text-align: left;
-			}
-			table.trimada_summary #amount_by_group {
-				width: 17%;
-				text-align: left;
-			}
-			table.trimada_summary #current_subtotal_label {
-				width: 14%;
-				text-align: right;
-			}
-			table.trimada_summary #current_subtotal {
-				width: 18%;
-				text-align: right;
-			}
+            table.trimada_summary tr {
+                border-top: solid 1px !important;
+                border-bottom: solid 1px;
+            }
+            table.trimada_details tr {
+              border-top: 0px !important;
+              border-bottom: 0px;
+              line-height: 0.7;
+            }
+            table.trimada_summary #amount_untaxed_label {
+                width: 15.5%;
+                text-align: left;
+            }
+            table.trimada_summary #amount_untaxed {
+                width: 23%;
+                text-align: left;
+            }
+            table.trimada_summary #amount_by_group_label {
+                width: 12%;
+                text-align: left;
+            }
+            table.trimada_summary #amount_by_group {
+                width: 17%;
+                text-align: left;
+            }
+            table.trimada_summary #current_subtotal_label {
+                width: 14%;
+                text-align: right;
+            }
+            table.trimada_summary #current_subtotal {
+                width: 18%;
+                text-align: right;
+            }
     </style>
 
     <table class="table table-borderless table-sm trimada trimada_summary o_main_table">
diff --git a/snippets/sale.report_saleorder_document.set_ids.xml b/snippets/sale.report_saleorder_document.set_ids.xml
index 8153d137..6a02580b 100644
--- a/snippets/sale.report_saleorder_document.set_ids.xml
+++ b/snippets/sale.report_saleorder_document.set_ids.xml
@@ -2,31 +2,31 @@
 <data inherit_id="sale.report_saleorder_document" priority="50">
   
   <xpath expr="//div[@id='informations']//p[@t-field='doc.incoterm.code']/.." position="attributes">
-		<attribute name="id">incoterm</attribute>
-	</xpath>
-	
-	<xpath expr="//div[@id='informations']//p[@t-field='doc.date_order']" position="attributes">
-		<attribute name="id">date_order</attribute>
-	</xpath>
+        <attribute name="id">incoterm</attribute>
+    </xpath>
+    
+    <xpath expr="//div[@id='informations']//p[@t-field='doc.date_order']" position="attributes">
+        <attribute name="id">date_order</attribute>
+    </xpath>
 
-	<xpath expr="//th[@name='th_description']" position="attributes">
-		<attribute name="id">description</attribute>
-	</xpath>
+    <xpath expr="//th[@name='th_description']" position="attributes">
+        <attribute name="id">description</attribute>
+    </xpath>
 
-	<xpath expr="//th[@name='th_quantity']" position="attributes">
-		<attribute name="id">product_uom_qty</attribute>
-	</xpath>
+    <xpath expr="//th[@name='th_quantity']" position="attributes">
+        <attribute name="id">product_uom_qty</attribute>
+    </xpath>
 
-	<xpath expr="//td[@name='td_quantity']/span[1]" position="attributes">
-		<attribute name="id">product_uom_qty</attribute>
-	</xpath>
-	
-	<xpath expr="//td[@name='td_quantity']/span[2]" position="attributes">
-		<attribute name="id">product_uom</attribute>
-	</xpath>
+    <xpath expr="//td[@name='td_quantity']/span[1]" position="attributes">
+        <attribute name="id">product_uom_qty</attribute>
+    </xpath>
+    
+    <xpath expr="//td[@name='td_quantity']/span[2]" position="attributes">
+        <attribute name="id">product_uom</attribute>
+    </xpath>
 
-	<xpath expr="//td[@name='td_quantity']" position="attributes">
-		<attribute name="id">product_uom_qty</attribute>
-	</xpath>
+    <xpath expr="//td[@name='td_quantity']" position="attributes">
+        <attribute name="id">product_uom_qty</attribute>
+    </xpath>
 
 </data>
\ No newline at end of file
diff --git a/snippets/sale.report_saleorder_document.show_categ_id.xml b/snippets/sale.report_saleorder_document.show_categ_id.xml
new file mode 100644
index 00000000..b1a9d77a
--- /dev/null
+++ b/snippets/sale.report_saleorder_document.show_categ_id.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<data inherit_id="sale.report_saleorder_document" priority="50">
+  
+  <xpath expr="//span[@t-field='line.name']" position="after">
+    <div>
+      <span t-field="line.product_id.categ_id"/>
+    </div>
+ </xpath>
+
+</data>
\ No newline at end of file
diff --git a/snippets/sale.report_saleorder_document.style_carbo_link.xml b/snippets/sale.report_saleorder_document.style_carbo_link.xml
new file mode 100644
index 00000000..740433e0
--- /dev/null
+++ b/snippets/sale.report_saleorder_document.style_carbo_link.xml
@@ -0,0 +1,16 @@
+<data inherit_id="sale.report_saleorder_document" priority="60">
+
+    <xpath expr="//div[hasclass('page')]" position="before">
+        <style>
+        .o_company_1_layout {
+            font-family: Dobra-Book;
+            font-size: 80%;
+            }
+        </style>
+    </xpath>
+
+    <xpath expr="//div/div/div[2]/p" position="attributes">
+        <attribute name="t-options-widget">"date"</attribute>
+    </xpath>
+
+</data>
\ No newline at end of file
diff --git a/snippets/sale.report_saleorder_document.style_gelso.xml b/snippets/sale.report_saleorder_document.style_gelso.xml
index 551bbd78..6aacc427 100644
--- a/snippets/sale.report_saleorder_document.style_gelso.xml
+++ b/snippets/sale.report_saleorder_document.style_gelso.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0"?>
 <data inherit_id="sale.report_saleorder_document" priority="60">
 
-	<xpath expr="//div[@id='incoterm']" position="attributes">
-		<attribute name="class" separator=" " add="col-auto col-3 mw-100 mb-2"/>
-	</xpath>
-	
-	<xpath expr="//p[@id='date_order']" position="attributes">
-		<attribute name="t-options-widget">"date"</attribute>
-	</xpath>
+    <xpath expr="//div[@id='incoterm']" position="attributes">
+        <attribute name="class" separator=" " add="col-auto col-3 mw-100 mb-2"/>
+    </xpath>
+    
+    <xpath expr="//p[@id='date_order']" position="attributes">
+        <attribute name="t-options-widget">"date"</attribute>
+    </xpath>
 
 </data>
\ No newline at end of file
diff --git a/snippets/sale.report_saleorder_document.x_sudio_description.xml b/snippets/sale.report_saleorder_document.style_mint_system.xml
similarity index 85%
rename from snippets/sale.report_saleorder_document.x_sudio_description.xml
rename to snippets/sale.report_saleorder_document.style_mint_system.xml
index ceb48619..ea82ab5e 100644
--- a/snippets/sale.report_saleorder_document.x_sudio_description.xml
+++ b/snippets/sale.report_saleorder_document.style_mint_system.xml
@@ -15,18 +15,6 @@
     <attribute name="class" separator=" " add="o_italic"/>
   </xpath>
 
-  <xpath expr="/t/t/div/div[2]" position="after">
-    <t t-if="doc.x_studio_description">
-      <div class="row">
-        <div class="col">
-          <span t-field="doc.x_studio_description"/>
-          <br/>
-          <br/>
-        </div>
-      </div>
-    </t>
-  </xpath>
-
   <xpath expr="//tbody[hasclass('sale_tbody')]/tr/td[1]/span" position="attributes">
     <attribute name="class" separator=" " add="o_italic"/>
   </xpath>
diff --git a/snippets/sale.report_saleorder_document.style_moser.xml b/snippets/sale.report_saleorder_document.style_moser.xml
index 6d81c5fa..768d772a 100644
--- a/snippets/sale.report_saleorder_document.style_moser.xml
+++ b/snippets/sale.report_saleorder_document.style_moser.xml
@@ -1,29 +1,29 @@
 <data inherit_id="sale.report_saleorder_document" priority="60">
 
-	<xpath expr="//div[hasclass('page')]" position="before">
-		<style>
-		.o_company_1_layout {
-        	font-family: arial;
-     	}
-		.o_company_1_layout.o_report_layout_standard h2 {
-        	color: black;
-       		font-size: 1.4rem;
-			    font-weight: bold;
-     	}
-     	.o_company_1_layout.o_report_layout_standard #total strong {
-        	color: black;
-     	}
-     	div#informations {
-     	 	margin-top: 30px;
-     	 	margin-bottom: 60px;
-     	}
-     	h2.mt-4 {
-     	 	margin-top: 70px !important;
-     	}
-     	td#tax_amount {
-     	 	text-align: right;
-     	}
-		</style>
-	</xpath>
-	
+    <xpath expr="//div[hasclass('page')]" position="before">
+        <style>
+        .o_company_1_layout {
+            font-family: arial;
+         }
+        .o_company_1_layout.o_report_layout_standard h2 {
+            color: black;
+               font-size: 1.4rem;
+                font-weight: bold;
+         }
+         .o_company_1_layout.o_report_layout_standard #total strong {
+            color: black;
+         }
+         div#informations {
+              margin-top: 30px;
+              margin-bottom: 60px;
+         }
+         h2.mt-4 {
+              margin-top: 70px !important;
+         }
+         td#tax_amount {
+              text-align: right;
+         }
+        </style>
+    </xpath>
+    
 </data>
\ No newline at end of file
diff --git a/snippets/sale.report_saleorder_document.style_tissa.xml b/snippets/sale.report_saleorder_document.style_tissa.xml
new file mode 100644
index 00000000..a4026a5d
--- /dev/null
+++ b/snippets/sale.report_saleorder_document.style_tissa.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0"?>
+<data inherit_id="sale.report_saleorder_document" priority="60">
+
+    <xpath expr="//div[hasclass('page')]" position="before">
+        <style>
+            .o_company_1_layout {
+                font-family: arial;
+            }
+            table.trimada {
+                font-size: 9pt;
+                font-family: arial;
+                color: black;
+            }
+            table.trimada tr.first td {
+                padding-bottom: 0;
+            }
+            table.trimada tr.second td {
+                padding-top: 0;
+            }
+            table.trimada tr.second {
+                border-bottom: 1px solid rgb(220,220,220);
+            }
+            table.trimada thead tr {
+                border-top:solid 1px;
+                border-bottom: solid 1px;
+            }
+            table.trimada thead th#position {
+                width: 5mm;
+            }
+            table.trimada thead th#default_code {
+              width: 27mm;
+              text-align: right;
+            }
+            table.trimada thead th#quantity {
+              width: 25mm;
+              text-align: right !important;
+            }
+            table.trimada tbody td#position {
+              text-align: right;
+            }
+            table.trimada tbody td#default_code {
+              text-align: right;
+            }
+            table.trimada tbody #commitment_date {
+              text-align: right;
+            }
+            table.trimada tbody td span#product_uom_qty {
+              font-weight: bold;
+            }
+            table.trimada tbody td span#product_uom_qty_confirmed {
+              font-weight: bold;
+            }
+            .subtitel {
+                font-size: 11pt;
+                font-family: arial;
+                margin-top: 10mm;
+            }
+            .note {
+                font-size: 9pt;
+                font-family: arial;
+            }
+        </style>
+    </xpath>
+
+    <xpath expr="//table[2]" position="attributes">
+        <attribute name="class" separator=" " add="trimada table-borderless"/>
+    </xpath>
+    
+    <xpath expr="//th[@id='commitment_date']" position="attributes">
+        <attribute name="class">text-right</attribute>
+    </xpath>
+
+</data>
diff --git a/snippets/sale.report_saleorder_document.style_trimada.xml b/snippets/sale.report_saleorder_document.style_trimada.xml
index 8c48fbe1..a4026a5d 100644
--- a/snippets/sale.report_saleorder_document.style_trimada.xml
+++ b/snippets/sale.report_saleorder_document.style_trimada.xml
@@ -1,74 +1,73 @@
 <?xml version="1.0"?>
 <data inherit_id="sale.report_saleorder_document" priority="60">
 
-	<xpath expr="//div[hasclass('page')]" position="before">
-		<style>
-			.o_company_1_layout {
-				font-family: arial;
-			}
-			table.trimada {
-				font-size: 9pt;
-				font-family: arial;
-				color: black;
-			}
-			table.trimada tr.first td {
-				padding-bottom: 0;
-			}
-			table.trimada tr.second td {
-				padding-top: 0;
-			}
-			table.trimada tr.second {
-				border-bottom: 1px solid rgb(220,220,220);
-			}
-			table.trimada thead tr {
-				border-top:solid 1px;
-				border-bottom: solid 1px;
-			}
-			table.trimada thead th#position {
-				width: 5mm;
-			}
-			table.trimada thead th#default_code {
-			  width: 27mm;
-			  text-align: right;
-			}
-			table.trimada thead th#quantity {
-			  width: 25mm;
-			  text-align: right !important;
-			}
-			table.trimada tbody td#position {
-			  text-align: right;
-			}
-			table.trimada tbody td#default_code {
-			  text-align: right;
-			}
-			table.trimada tbody #commitment_date {
-			  text-align: right;
-			}
-			table.trimada tbody td span#product_uom_qty {
-			  font-weight: bold;
-			}
-			table.trimada tbody td span#product_uom_qty_confirmed {
-			  font-weight: bold;
-			}
-			.subtitel {
-				font-size: 11pt;
-				font-family: arial;
-				margin-top: 10mm;
-			}
-			.note {
-				font-size: 9pt;
-				font-family: arial;
-			}
-		</style>
-	</xpath>
+    <xpath expr="//div[hasclass('page')]" position="before">
+        <style>
+            .o_company_1_layout {
+                font-family: arial;
+            }
+            table.trimada {
+                font-size: 9pt;
+                font-family: arial;
+                color: black;
+            }
+            table.trimada tr.first td {
+                padding-bottom: 0;
+            }
+            table.trimada tr.second td {
+                padding-top: 0;
+            }
+            table.trimada tr.second {
+                border-bottom: 1px solid rgb(220,220,220);
+            }
+            table.trimada thead tr {
+                border-top:solid 1px;
+                border-bottom: solid 1px;
+            }
+            table.trimada thead th#position {
+                width: 5mm;
+            }
+            table.trimada thead th#default_code {
+              width: 27mm;
+              text-align: right;
+            }
+            table.trimada thead th#quantity {
+              width: 25mm;
+              text-align: right !important;
+            }
+            table.trimada tbody td#position {
+              text-align: right;
+            }
+            table.trimada tbody td#default_code {
+              text-align: right;
+            }
+            table.trimada tbody #commitment_date {
+              text-align: right;
+            }
+            table.trimada tbody td span#product_uom_qty {
+              font-weight: bold;
+            }
+            table.trimada tbody td span#product_uom_qty_confirmed {
+              font-weight: bold;
+            }
+            .subtitel {
+                font-size: 11pt;
+                font-family: arial;
+                margin-top: 10mm;
+            }
+            .note {
+                font-size: 9pt;
+                font-family: arial;
+            }
+        </style>
+    </xpath>
 
-	<xpath expr="//table[2]" position="attributes">
-		<attribute name="class" separator=" " add="trimada table-borderless"/>
-	</xpath>
-	
-	<xpath expr="//th[@id='commitment_date']" position="attributes">
-		<attribute name="class">text-right</attribute>
-	</xpath>
+    <xpath expr="//table[2]" position="attributes">
+        <attribute name="class" separator=" " add="trimada table-borderless"/>
+    </xpath>
+    
+    <xpath expr="//th[@id='commitment_date']" position="attributes">
+        <attribute name="class">text-right</attribute>
+    </xpath>
 
 </data>
-
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
index a9db7c6b..dbb1bb3d 100644
--- a/snippets/sale.report_saleorder_document.x_hide_on_sale_order.xml
+++ b/snippets/sale.report_saleorder_document.x_hide_on_sale_order.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0"?>
 <data inherit_id="sale.report_saleorder_document" priority="50">
 
-	  <xpath expr="//t[@t-if='not line.display_type']" position="attributes">
-		  <attribute name="t-if">not line.display_type and not line.product_id.x_hide_on_sale_order</attribute>
-	  </xpath>
+      <xpath expr="//t[@t-if='not line.display_type']" position="attributes">
+          <attribute name="t-if">not line.display_type and not line.product_id.x_hide_on_sale_order</attribute>
+      </xpath>
 
-	  <!--<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>-->
+      <!--<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.sale_order_line_view_form_readonly.edit_form.xml b/snippets/sale.sale_order_line_view_form_readonly.edit_form.xml
new file mode 100644
index 00000000..b5c61420
--- /dev/null
+++ b/snippets/sale.sale_order_line_view_form_readonly.edit_form.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0"?>
+<data inherit_id="sale.sale_order_line_view_form_readonly" priority="50">
+
+    <form position="replace">
+        <form string="Sales Order Item">
+            <sheet>
+                <div class="oe_title">
+                    <h1>
+                        <field name="display_name" />
+                    </h1>
+                </div>
+                <group>
+                    <group>
+                        <field name="order_id" />
+                        <field name="product_id" />
+                        <field name="name" />
+                        <field name="product_uom_qty" />
+                        <field name="qty_delivered" />
+                        <field name="qty_invoiced" />
+                        <field name="product_uom_category_id" />
+                        <field name="product_uom" />
+                        <field name="company_id" options="{'no_create': True}"
+                            groups="base.group_multi_company" />
+                        <field name="order_partner_id" invisible="1" />
+                        <field name="display_type" invisible="1" />
+                        <field name="product_updatable" invisible="1" />
+                    </group>
+                    <group>
+                        <field name="price_unit" />
+                        <field name="discount" groups="product.group_discount_per_so_line" />
+                        <field name="price_subtotal" widget="monetary" />
+                        <field name="tax_id" widget="many2many_tags" />
+                        <field name="price_tax" widget="monetary" />
+                        <field name="price_total" widget="monetary" />
+                        <field name="currency_id" invisible="1" />
+                    </group>
+                </group>
+            </sheet>
+        </form>
+    </form>
+
+</data>
\ No newline at end of file
diff --git a/snippets/sale.sale_order_line_view_form_readonly.show_is_downpayment.xml b/snippets/sale.sale_order_line_view_form_readonly.show_is_downpayment.xml
new file mode 100644
index 00000000..f77ed8a0
--- /dev/null
+++ b/snippets/sale.sale_order_line_view_form_readonly.show_is_downpayment.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<data inherit_id="sale.sale_order_line_view_form_readonly" priority="50" >
+
+    <field name="product_id" position="after">
+        <field name="is_downpayment"/>
+    </field>
+
+</data>
\ No newline at end of file
diff --git a/snippets/sale.sale_order_line_view_form_readonly.show_subscription_id.xml b/snippets/sale.sale_order_line_view_form_readonly.show_subscription_id.xml
new file mode 100644
index 00000000..f27f12d4
--- /dev/null
+++ b/snippets/sale.sale_order_line_view_form_readonly.show_subscription_id.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<data inherit_id="sale.sale_order_line_view_form_readonly" priority="50" >
+
+    <field name="order_id" position="after">
+        <field name="subscription_id"/>
+    </field>
+
+</data>
\ No newline at end of file
diff --git a/snippets/sale.sale_order_portal_content.add_header_and_footer_note.xml b/snippets/sale.sale_order_portal_content.add_header_and_footer_note.xml
new file mode 100644
index 00000000..44fbfda0
--- /dev/null
+++ b/snippets/sale.sale_order_portal_content.add_header_and_footer_note.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<data inherit_id="sale.sale_order_portal_content" priority="50">
+
+  <xpath expr="//div[@id='informations']" position="after">
+    <t t-if="sale_order.note_header != '&lt;p&gt;&lt;br&gt;&lt;/p&gt;'">
+      <span class="note" t-field="sale_order.note_header"/>
+    </t>
+  </xpath>
+
+  <xpath expr="//div[@name='signature']" position="before">
+    <t t-if="sale_order.note_footer != '&lt;p&gt;&lt;br&gt;&lt;/p&gt;'">
+      <span class="note" t-field="sale_order.note_footer"/>
+    </t>
+  </xpath>
+
+</data>
diff --git a/snippets/sale.sale_order_portal_content.format_qty.xml b/snippets/sale.sale_order_portal_content.format_qty.xml
index 769c7074..c3e69e5a 100644
--- a/snippets/sale.sale_order_portal_content.format_qty.xml
+++ b/snippets/sale.sale_order_portal_content.format_qty.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <data inherit_id="sale.sale_order_portal_content" priority="50">
 
-	<span t-field="line.product_uom_qty" position="attributes">
-		<attribute name="t-options-widget">"integer"</attribute>
-	</span>
+    <span t-field="line.product_uom_qty" position="attributes">
+        <attribute name="t-options-widget">"integer"</attribute>
+    </span>
   
 </data>
diff --git a/snippets/sale.sale_order_portal_content.get_position.xml b/snippets/sale.sale_order_portal_content.get_position.xml
index bb3047e5..45707e02 100644
--- a/snippets/sale.sale_order_portal_content.get_position.xml
+++ b/snippets/sale.sale_order_portal_content.get_position.xml
@@ -2,11 +2,11 @@
 <data inherit_id="sale.sale_order_portal_content" priority="50">
 
   <xpath expr="//table[@id='sales_order_table']//tr/th[1]" position="before">
-  	<th class="text-left">Pos</th>
+      <th class="text-left">Pos</th>
   </xpath>
 
   <xpath expr="//td[@id='default_code']" position="before">
-  	<td id="position"><span t-field="line.position"/></td>
+      <td id="position"><span t-field="line.position"/></td>
   </xpath>
  
 </data>
diff --git a/snippets/sale.sale_order_portal_content.product_name.xml b/snippets/sale.sale_order_portal_content.product_name.xml
index 5dc34f3a..00edeb3b 100644
--- a/snippets/sale.sale_order_portal_content.product_name.xml
+++ b/snippets/sale.sale_order_portal_content.product_name.xml
@@ -3,7 +3,7 @@
 <data inherit_id="sale.sale_order_portal_content" priority="50">
 
   <xpath expr="//td[@id='product_name']" position="replace">
-  	<td id="product_name"><span t-field="line.product_id.name"/><br/><span class="font-italic" t-field="line.name"/></td>
+      <td id="product_name"><span t-field="line.product_id.name"/><br/><span class="font-italic" t-field="line.name"/></td>
   </xpath>
 
 </data>
diff --git a/snippets/sale.sale_order_portal_content.remove_discount_percentage.xml b/snippets/sale.sale_order_portal_content.remove_discount_percentage.xml
index fd25c5d1..d2db80c9 100644
--- a/snippets/sale.sale_order_portal_content.remove_discount_percentage.xml
+++ b/snippets/sale.sale_order_portal_content.remove_discount_percentage.xml
@@ -2,7 +2,7 @@
 <data inherit_id="sale.sale_order_portal_content" priority="50">
 
   <xpath expr="//th[@t-if='display_discount']/span" position="replace">
-  	<span>Rabatt</span>
+      <span>Rabatt</span>
   </xpath>
  
 </data>
diff --git a/snippets/sale.sale_order_portal_content.show_default_code.xml b/snippets/sale.sale_order_portal_content.show_default_code.xml
index 4ab7c8b5..57b74b7d 100644
--- a/snippets/sale.sale_order_portal_content.show_default_code.xml
+++ b/snippets/sale.sale_order_portal_content.show_default_code.xml
@@ -2,7 +2,7 @@
 <data inherit_id="sale.sale_order_portal_content" priority="50">
 
   <xpath expr="//table[@id='sales_order_table']//tr/th[1]" position="before">
-  	<th class="text-left">Referenz</th>
+      <th class="text-left">Referenz</th>
   </xpath>
 
   <xpath expr="//td[@id='product_name']" position="before">
@@ -11,7 +11,7 @@
         white-space: nowrap;
       }
     </style>
-  	<td id="default_code"><span t-field="line.product_id.default_code"/></td>
+      <td id="default_code"><span t-field="line.product_id.default_code"/></td>
   </xpath>
  
 </data>
diff --git a/snippets/sale.sale_order_portal_content.description.xml b/snippets/sale.sale_order_portal_content.x_description.xml
similarity index 100%
rename from snippets/sale.sale_order_portal_content.description.xml
rename to snippets/sale.sale_order_portal_content.x_description.xml
diff --git a/snippets/sale.sale_order_view_search_inherit_quotation.remove_filter_my_quotation.xml b/snippets/sale.sale_order_view_search_inherit_quotation.remove_filter_my_quotation.xml
new file mode 100644
index 00000000..a2b04a57
--- /dev/null
+++ b/snippets/sale.sale_order_view_search_inherit_quotation.remove_filter_my_quotation.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<data inherit_id="sale.sale_order_view_search_inherit_quotation" priority="50">
+
+  <xpath expr="//filter[@name='my_quotation']" position="replace" />
+
+</data>
\ No newline at end of file
diff --git a/snippets/sale.view_order_form.edit_tax_id.xml b/snippets/sale.view_order_form.edit_tax_id.xml
new file mode 100644
index 00000000..ffff9475
--- /dev/null
+++ b/snippets/sale.view_order_form.edit_tax_id.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<data inherit_id="sale.view_order_form" priority="50">
+
+  <xpath expr="//field[@name='tax_id']" position="attributes">
+    <attribute name="attrs">{}</attribute>
+  </xpath>
+
+</data>
diff --git a/snippets/sale.view_order_form.location_in_name.xml b/snippets/sale.view_order_form.location_in_name.xml
new file mode 100644
index 00000000..206b02c9
--- /dev/null
+++ b/snippets/sale.view_order_form.location_in_name.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<data inherit_id="sale.view_order_form" priority="50">
+
+  <xpath expr="//group[@name='sale_header']/group/field[@name='partner_shipping_id']" position="attributes">
+    <attribute name="context">
+      {'res_partner_search_mode': 'customer', 'show_address': 1, 'show_vat': True, 'show_zip_and_city': True}
+    </attribute>
+  </xpath>
+
+</data>
diff --git a/snippets/sale.view_order_form.move_client_order_ref.xml b/snippets/sale.view_order_form.move_client_order_ref.xml
new file mode 100644
index 00000000..826aa63d
--- /dev/null
+++ b/snippets/sale.view_order_form.move_client_order_ref.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<data inherit_id="sale.view_order_form" priority="50">
+
+  <xpath expr="//field[@name='partner_shipping_id']" position="after">
+    <field name="client_order_ref"/>
+  </xpath>
+  
+  <xpath expr="//group[@name='sales_person']/field[@name='client_order_ref']" position="replace"/>
+  
+</data>
\ No newline at end of file
diff --git a/snippets/sale.view_order_form.move_commitment_date.xml b/snippets/sale.view_order_form.move_commitment_date.xml
new file mode 100644
index 00000000..f16fc532
--- /dev/null
+++ b/snippets/sale.view_order_form.move_commitment_date.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<data inherit_id="sale.view_order_form" priority="50">
+
+  <xpath expr="//field[@name='date_order']" position="after">
+    <label for="commitment_date" string="Delivery Date"/>
+    <div name="commitment_date_div" class="o_row">
+      <field name="commitment_date"/>
+      <span name="expected_date_span" class="text-muted">Expected: <field name="expected_date" class="oe_inline" widget="date"/>
+      </span>
+    </div>
+  </xpath>
+
+  <xpath expr="//group/group[@name='sale_shipping']" position="replace"/>
+
+</data>
\ No newline at end of file
diff --git a/snippets/sale.view_order_form.product_id_no_create.xml b/snippets/sale.view_order_form.product_id_no_create.xml
new file mode 100644
index 00000000..ea086fc8
--- /dev/null
+++ b/snippets/sale.view_order_form.product_id_no_create.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<data inherit_id="sale.view_order_form" priority="50">
+
+  <xpath expr="//field[@name='order_line']/tree/field[@name='product_id']" position="attributes">
+      <attribute name="options">{'no_open': True, 'no_create': True}</attribute>
+  </xpath>
+
+</data>
diff --git a/snippets/sale.view_order_form.set_limit_order_line.xml b/snippets/sale.view_order_form.set_limit_order_line.xml
new file mode 100644
index 00000000..0f177186
--- /dev/null
+++ b/snippets/sale.view_order_form.set_limit_order_line.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<data inherit_id="sale.view_order_form" priority="50">
+
+  <xpath expr="//field[@name='order_line']/tree" position="attributes">
+      <attribute name="limit">100</attribute>
+  </xpath>
+
+</data>
diff --git a/snippets/sale.view_order_form.show_commitment_date.xml b/snippets/sale.view_order_form.show_commitment_date.xml
new file mode 100644
index 00000000..5e728a1d
--- /dev/null
+++ b/snippets/sale.view_order_form.show_commitment_date.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<data inherit_id="sale.view_order_form" priority="50">
+
+  <xpath expr="//field[@name='date_order']" position="after">
+    <field name="commitment_date" readonly="1"/>
+  </xpath>
+
+</data>
\ No newline at end of file
diff --git a/snippets/sale.view_order_form.show_order_line_subscription_id.xml b/snippets/sale.view_order_form.show_order_line_subscription_id.xml
new file mode 100644
index 00000000..63077736
--- /dev/null
+++ b/snippets/sale.view_order_form.show_order_line_subscription_id.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<data inherit_id="sale.view_order_form" priority="50">
+
+  <xpath expr="//field[@name='order_line']/tree/field[@name='product_id']" position="after">
+    <field name="subscription_id" optional="hide" />
+  </xpath>
+
+</data>
\ No newline at end of file
diff --git a/snippets/sale.view_order_form.x_as4import.xml b/snippets/sale.view_order_form.x_as4import.xml
new file mode 100644
index 00000000..0c0f7d15
--- /dev/null
+++ b/snippets/sale.view_order_form.x_as4import.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<data inherit_id="sale.view_order_form" priority="50">
+
+    <xpath expr="//field[@name='tag_ids']" position="after">
+        <field name="x_as4import" />
+    </xpath>
+
+</data>
diff --git a/snippets/sale.view_order_form.x_order_number.xml b/snippets/sale.view_order_form.x_order_number.xml
new file mode 100644
index 00000000..e049af37
--- /dev/null
+++ b/snippets/sale.view_order_form.x_order_number.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<data inherit_id="sale.view_order_form" priority="50">
+
+  <xpath expr="//group[@name='order_details']//field[@name='payment_term_id']" position="after">
+    <field name="x_order_number"/>
+  </xpath>
+
+</data>
\ No newline at end of file
diff --git a/snippets/sale.view_order_form.x_payment_state.xml b/snippets/sale.view_order_form.x_payment_state.xml
new file mode 100644
index 00000000..bd1cd570
--- /dev/null
+++ b/snippets/sale.view_order_form.x_payment_state.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<data inherit_id="sale.view_order_form" priority="50">
+
+  <xpath expr="//group[@name='order_details']//field[@name='payment_term_id']" position="after">
+    <field name="x_payment_state"/>
+  </xpath>
+
+</data>
\ No newline at end of file
diff --git a/snippets/sale.view_order_form.x_payment_term_blanket_order.xml b/snippets/sale.view_order_form.x_payment_term_blanket_order.xml
new file mode 100644
index 00000000..a5f4d556
--- /dev/null
+++ b/snippets/sale.view_order_form.x_payment_term_blanket_order.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<data inherit_id="sale.view_order_form" priority="50">
+
+  <xpath expr="//group[@name='order_details']/field[@name='payment_term_id']" position="after">
+    <field name="x_payment_term_blanket_order"/>
+  </xpath>
+
+</data>
\ No newline at end of file
diff --git a/snippets/sale.view_order_tree.format_delivery_status.xml b/snippets/sale.view_order_tree.format_delivery_status.xml
new file mode 100644
index 00000000..071be569
--- /dev/null
+++ b/snippets/sale.view_order_tree.format_delivery_status.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<data inherit_id="sale.view_order_tree" priority="50">
+
+  <xpath expr="//field[@name='delivery_status']" position="attributes">
+    <attribute name="widget">badge</attribute>
+    <attribute name="decoration-success">delivery_status=='full'</attribute>
+    <attribute name="decoration-danger">delivery_status=='pending'</attribute>
+    <attribute name="decoration-warning">delivery_status=='partial'</attribute>
+  </xpath>
+
+</data>
\ No newline at end of file
diff --git a/snippets/sale.view_order_tree.show_client_order_ref.xml b/snippets/sale.view_order_tree.show_client_order_ref.xml
new file mode 100644
index 00000000..39b5e5b6
--- /dev/null
+++ b/snippets/sale.view_order_tree.show_client_order_ref.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<data inherit_id="sale.view_order_tree" priority="50">
+
+  <field name="partner_id" position="after">
+    <field name="client_order_ref"/>
+  </field>
+
+</data>
diff --git a/snippets/sale.view_order_tree.x_payment_state.xml b/snippets/sale.view_order_tree.x_payment_state.xml
new file mode 100644
index 00000000..cd6d9de1
--- /dev/null
+++ b/snippets/sale.view_order_tree.x_payment_state.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<data inherit_id="sale.view_order_tree" priority="50">
+
+  <xpath expr="//field[@name='invoice_status']" position="before">
+    <field name="x_payment_state" decoration-success="x_payment_state=='paid'" decoration-danger="x_payment_state=='not_paid'" decoration-warning="x_payment_state=='in_payment'" widget="badge"/>
+  </xpath>
+  
+</data>
\ No newline at end of file
diff --git a/snippets/sale.view_order_tree.x_vst.xml b/snippets/sale.view_order_tree.x_vst.xml
new file mode 100644
index 00000000..7e105b14
--- /dev/null
+++ b/snippets/sale.view_order_tree.x_vst.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<data inherit_id="sale.view_order_tree" priority="50">
+
+  <field name="partner_id" position="after">
+    <field name="x_vst"/>
+  </field>
+
+</data>
\ No newline at end of file
diff --git a/snippets/sale.view_quotation_tree.show_delivery_status.xml b/snippets/sale.view_quotation_tree.show_delivery_status.xml
new file mode 100644
index 00000000..d69f1f5d
--- /dev/null
+++ b/snippets/sale.view_quotation_tree.show_delivery_status.xml
@@ -0,0 +1,7 @@
+<data inherit_id="sale.view_quotation_tree" priority="50">
+
+    <xpath expr="//field[@name='state']" position="before">
+        <field name="delivery_status" decoration-danger="delivery_status == 'pending'" decoration-warning="delivery_status == 'partial'" decoration-success="delivery_status == 'full'" widget="badge" optional="show"/>
+    </xpath>
+
+</data>
\ No newline at end of file
diff --git a/snippets/sale.view_quotation_tree.show_​payment_term_id.xml b/snippets/sale.view_quotation_tree.show_​payment_term_id.xml
new file mode 100644
index 00000000..1423584d
--- /dev/null
+++ b/snippets/sale.view_quotation_tree.show_​payment_term_id.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<data inherit_id="sale.view_quotation_tree" priority="50">
+
+    <xpath expr="//field[@name='state']" position="before">
+        <field name="payment_term_id" optional="show"/>
+    </xpath>
+
+</data>
\ No newline at end of file
diff --git a/snippets/sale.view_quotation_tree.x_order_number.xml b/snippets/sale.view_quotation_tree.x_order_number.xml
new file mode 100644
index 00000000..56e4f315
--- /dev/null
+++ b/snippets/sale.view_quotation_tree.x_order_number.xml
@@ -0,0 +1,7 @@
+<data inherit_id="sale.view_quotation_tree" priority="50">
+
+    <xpath expr="//field[@name='name']" position="after">
+        <field name="x_order_number"/>
+    </xpath>
+
+</data>
\ No newline at end of file
diff --git a/snippets/sale.view_quotation_tree.x_payment_state.xml b/snippets/sale.view_quotation_tree.x_payment_state.xml
new file mode 100644
index 00000000..31471ad4
--- /dev/null
+++ b/snippets/sale.view_quotation_tree.x_payment_state.xml
@@ -0,0 +1,7 @@
+<data inherit_id="sale.view_quotation_tree" priority="50">
+
+    <xpath expr="//field[@name='invoice_status']" position="after">
+        <field name="x_payment_state" optional="hide"/>
+    </xpath>
+
+</data>
\ No newline at end of file
diff --git a/snippets/sale.view_sales_order_filter.add_filter_collective_invoice.xml b/snippets/sale.view_sales_order_filter.add_filter_collective_invoice.xml
new file mode 100644
index 00000000..e9790fc9
--- /dev/null
+++ b/snippets/sale.view_sales_order_filter.add_filter_collective_invoice.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<data inherit_id="sale.view_sales_order_filter" priority="50">
+
+  <xpath expr="//filter[@name='my_sale_orders_filter']" position="after">
+    <filter string="Kunden mit Sammelrechnung" name="customer_collective_invoice" domain="[('partner_id.category_id.name', 'in', ['Sammelrechnung'])]"/>
+    <filter string="Kunden ohne Sammelrechnung" name="customer_collective_invoice" domain="[('partner_id.category_id.name', 'not in', ['Sammelrechnung'])]"/>
+  </xpath>
+
+</data>
\ No newline at end of file
diff --git a/snippets/sale_blanket_order.md b/snippets/sale_blanket_order.md
index 67fb3f86..574bb757 100644
--- a/snippets/sale_blanket_order.md
+++ b/snippets/sale_blanket_order.md
@@ -134,9 +134,9 @@ ID: `mint_system.sale_blanket_order.report_blanketorder_document.add_header_spac
 <?xml version="1.0"?>
 <data inherit_id="sale_blanket_order.report_blanketorder_document" priority="50">
 
-	<xpath expr="//h2" position="attributes">
-		 <attribute name="style">padding-top: 5rem</attribute>
-	</xpath>
+    <xpath expr="//h2" position="attributes">
+         <attribute name="style">padding-top: 5rem</attribute>
+    </xpath>
 
 </data>
 ```
@@ -213,6 +213,26 @@ ID: `mint_system.sale_blanket_order.report_blanketorder_document.add_infotable`
 ```
 Source: [snippets/sale_blanket_order.report_blanketorder_document.add_infotable.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale_blanket_order.report_blanketorder_document.add_infotable.xml)
 
+### Add Product Uom  
+ID: `mint_system.sale_blanket_order.report_blanketorder_document.add_product_uom`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="sale_blanket_order.report_blanketorder_document" priority="50">
+
+  <xpath expr="//table/thead//th[3]" position="after">
+    <th name="th_product_uom" class="text-right">ME</th>
+  </xpath>
+
+  <xpath expr="//table/tbody//span[@t-field='l.original_uom_qty']/.." position="after">
+    <td name="td_product_uom" class="text-right">
+      <span t-field="l.product_uom"/>
+    </td>
+  </xpath>
+
+</data>
+```
+Source: [snippets/sale_blanket_order.report_blanketorder_document.add_product_uom.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale_blanket_order.report_blanketorder_document.add_product_uom.xml)
+
 ### Address Block  
 ID: `mint_system.sale_blanket_order.report_blanketorder_document.address_block`  
 ```xml
@@ -261,6 +281,23 @@ ID: `mint_system.sale_blanket_order.report_blanketorder_document.address_block`
 ```
 Source: [snippets/sale_blanket_order.report_blanketorder_document.address_block.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale_blanket_order.report_blanketorder_document.address_block.xml)
 
+### Add Vat  
+ID: `mint_system.sale_blanket_order.report_blanketorder_document.add_vat`  
+```xml
+<data inherit_id="sale_blanket_order.report_blanketorder_document" priority="50">
+
+  <xpath expr="//div[@name='comment']" position="before">
+
+    <p>MwSt.-Nr.: 
+      <span t-field="o.company_id.vat"/>
+    </p>
+
+  </xpath>
+
+</data>
+```
+Source: [snippets/sale_blanket_order.report_blanketorder_document.add_vat.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale_blanket_order.report_blanketorder_document.add_vat.xml)
+
 ### Extend Title  
 ID: `mint_system.sale_blanket_order.report_blanketorder_document.extend_title`  
 ```xml
@@ -305,9 +342,9 @@ ID: `mint_system.sale_blanket_order.report_blanketorder_document.format_qty`
 <?xml version="1.0"?>
 <data inherit_id="sale_blanket_order.report_blanketorder_document" priority="60">
 
-	<span id="qty" position="attributes">
-		<attribute name="t-options-widget">"integer"</attribute>
-	</span>
+    <span id="qty" position="attributes">
+        <attribute name="t-options-widget">"integer"</attribute>
+    </span>
 
 </data>
 
@@ -397,6 +434,21 @@ ID: `mint_system.sale_blanket_order.report_blanketorder_document.relocate_price_
 ```
 Source: [snippets/sale_blanket_order.report_blanketorder_document.relocate_price_unit.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale_blanket_order.report_blanketorder_document.relocate_price_unit.xml)
 
+### Remove Date Schedule  
+ID: `mint_system.sale_blanket_order.report_blanketorder_document.remove_date_schedule`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="sale_blanket_order.report_blanketorder_document" priority="50">
+
+  <xpath expr="//table/thead/tr/th[3]" position="replace"/>
+ 
+  <xpath expr="//span[@t-field='l.date_schedule']/.." position="replace"/>
+    
+</data>
+
+```
+Source: [snippets/sale_blanket_order.report_blanketorder_document.remove_date_schedule.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale_blanket_order.report_blanketorder_document.remove_date_schedule.xml)
+
 ### Remove Informations  
 ID: `mint_system.sale_blanket_order.report_blanketorder_document.remove_informations`  
 ```xml
@@ -423,6 +475,25 @@ ID: `mint_system.sale_blanket_order.report_blanketorder_document.remove_vat`
 ```
 Source: [snippets/sale_blanket_order.report_blanketorder_document.remove_vat.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale_blanket_order.report_blanketorder_document.remove_vat.xml)
 
+### Replace Address Block  
+ID: `mint_system.sale_blanket_order.report_blanketorder_document.replace_address_block`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="sale_blanket_order.report_blanketorder_document" priority="50">>
+
+    <xpath expr="//div[@t-field='doc.partner_id']/../.." position="replace">
+        <div class="row">
+            <div class="col-7"></div>
+            <div class="col-5">
+                <div t-field="doc.partner_id" t-options="{&quot;widget&quot;: &quot;contact&quot;, &quot;fields&quot;: [&quot;address&quot;, &quot;name&quot;, &quot;fax&quot;], &quot;no_marker&quot;: True, &quot;phone_icons&quot;: True}"/>
+            </div>
+        </div>
+    </xpath>
+
+</data>
+```
+Source: [snippets/sale_blanket_order.report_blanketorder_document.replace_address_block.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale_blanket_order.report_blanketorder_document.replace_address_block.xml)
+
 ### Replace Infoblock  
 ID: `mint_system.sale_blanket_order.report_blanketorder_document.replace_infoblock`  
 ```xml
@@ -500,7 +571,7 @@ ID: `mint_system.sale_blanket_order.report_blanketorder_document.replace_product
 
 <xpath expr="//span[@t-field='l.product_id']" position="replace">
   <t t-if="l.product_id.type_description">
-		<span style="font-weight: bold" t-field="l.product_id.type_description"/>
+        <span style="font-weight: bold" t-field="l.product_id.type_description"/>
   </t>
   <t t-if="not l.product_id.type_description">
     <span t-field="l.name"/>
@@ -512,6 +583,21 @@ ID: `mint_system.sale_blanket_order.report_blanketorder_document.replace_product
 ```
 Source: [snippets/sale_blanket_order.report_blanketorder_document.replace_product_description.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale_blanket_order.report_blanketorder_document.replace_product_description.xml)
 
+### Replace Product Id  
+ID: `mint_system.sale_blanket_order.report_blanketorder_document.replace_product_id`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="sale_blanket_order.report_blanketorder_document" priority="50">>
+
+ <xpath expr="//span[@t-field='l.product_id']" position="replace">    
+      <span t-field="l.name"/>
+  </xpath>
+
+</data>
+
+```
+Source: [snippets/sale_blanket_order.report_blanketorder_document.replace_product_id.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale_blanket_order.report_blanketorder_document.replace_product_id.xml)
+
 ### Replace Summary  
 ID: `mint_system.sale_blanket_order.report_blanketorder_document.replace_summary`  
 ```xml
@@ -556,7 +642,7 @@ ID: `mint_system.sale_blanket_order.report_blanketorder_document.round_price`
 <data inherit_id="sale_blanket_order.report_blanketorder_document" priority="50">
 
   <xpath expr="//span[@t-field='l.price_unit']" position="replace">
-		 <span t-esc="'%g' % l.price_unit if str(l.price_unit)[::-1].find('.') >= 3 else '%.2f' % l.price_unit"/>
+         <span t-esc="'%g' % l.price_unit if str(l.price_unit)[::-1].find('.') >= 3 else '%.2f' % l.price_unit"/>
   </xpath>
 
 </data>
@@ -632,14 +718,14 @@ ID: `mint_system.sale_blanket_order.report_blanketorder_document.set_ids_tissa`
 <?xml version="1.0"?>
 <data inherit_id="sale_blanket_order.report_blanketorder_document" priority="50">
 
-	<xpath expr="//div[@class='page']/div[2]" position="attributes">
-		<attribute name="id">address</attribute>
-		<attribute name="class" separator=" " add="trimada"/>
-	</xpath>
+    <xpath expr="//div[@class='page']/div[2]" position="attributes">
+        <attribute name="id">address</attribute>
+        <attribute name="class" separator=" " add="trimada"/>
+    </xpath>
 
-	<xpath expr="//span[@t-field='doc.amount_untaxed']/../../../../.." position="attributes">
-		<attribute name="id">summary</attribute>
-	</xpath>
+    <xpath expr="//span[@t-field='doc.amount_untaxed']/../../../../.." position="attributes">
+        <attribute name="id">summary</attribute>
+    </xpath>
 
 </data>
 ```
@@ -652,55 +738,55 @@ ID: `mint_system.sale_blanket_order.report_blanketorder_document.set_ids`
 <data inherit_id="sale_blanket_order.report_blanketorder_document" priority="50">
 
     <xpath expr="//table//th[4]" position="attributes">
-		<attribute name="id">original_uom_qty</attribute>
-	</xpath>
+        <attribute name="id">original_uom_qty</attribute>
+    </xpath>
 
-	<xpath expr="//span[@t-field='l.original_uom_qty']" position="attributes">
-		<attribute name="id">original_uom_qty</attribute>
-	</xpath>
+    <xpath expr="//span[@t-field='l.original_uom_qty']" position="attributes">
+        <attribute name="id">original_uom_qty</attribute>
+    </xpath>
 
-	<!--
-	<xpath expr="//table[2]//th[1]" position="attributes">
-		<attribute name="id">default_code</attribute>
-	</xpath>
+    <!--
+    <xpath expr="//table[2]//th[1]" position="attributes">
+        <attribute name="id">default_code</attribute>
+    </xpath>
 
-  	<xpath expr="//table[2]//th[2]" position="attributes">
-		<attribute name="id">description</attribute>
-	</xpath>	
+      <xpath expr="//table[2]//th[2]" position="attributes">
+        <attribute name="id">description</attribute>
+    </xpath>    
 
-	<xpath expr="//table[2]//th[3]" position="attributes">
-		<attribute name="id">date_schedule</attribute>
-	</xpath>
-	<xpath expr="//table[2]//td[3]" position="attributes">
-		<attribute name="id">date_schedule</attribute>
-	</xpath>
+    <xpath expr="//table[2]//th[3]" position="attributes">
+        <attribute name="id">date_schedule</attribute>
+    </xpath>
+    <xpath expr="//table[2]//td[3]" position="attributes">
+        <attribute name="id">date_schedule</attribute>
+    </xpath>
 
-	<xpath expr="//table//th[3]" position="attributes">
-		<attribute name="id">date_schedule</attribute>
-	</xpath>
-	<xpath expr="//table//td[3]" position="attributes">
-		<attribute name="id">date_schedule</attribute>
-	</xpath>
+    <xpath expr="//table//th[3]" position="attributes">
+        <attribute name="id">date_schedule</attribute>
+    </xpath>
+    <xpath expr="//table//td[3]" position="attributes">
+        <attribute name="id">date_schedule</attribute>
+    </xpath>
 
-	<xpath expr="//table[2]//th[4]" position="attributes">
-		<attribute name="id">original_uom_qty</attribute>
-	</xpath>
-	<xpath expr="//table[2]//td[4]/span" position="attributes">
-		<attribute name="id">qty</attribute>
-	</xpath>
+    <xpath expr="//table[2]//th[4]" position="attributes">
+        <attribute name="id">original_uom_qty</attribute>
+    </xpath>
+    <xpath expr="//table[2]//td[4]/span" position="attributes">
+        <attribute name="id">qty</attribute>
+    </xpath>
 
-	<xpath expr="//table[2]//th[5]" position="attributes">
-		<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>
-	-->
+    <xpath expr="//table[2]//th[5]" position="attributes">
+        <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>
+    -->
 
 </data>
 ```
@@ -759,15 +845,15 @@ ID: `mint_system.sale_blanket_order.report_blanketorder_document.style_gelso`
 <?xml version="1.0"?>
 <data inherit_id="sale_blanket_order.report_blanketorder_document" priority="60">
 
-	<xpath expr="//div[hasclass('page')]" position="before">
-		<style>
-		    div#informations {			
-				font-size: 16px;
-				margin-bottom: 0rem;
-			}			
-		</style>
-	</xpath>
-	
+    <xpath expr="//div[hasclass('page')]" position="before">
+        <style>
+            div#informations {            
+                font-size: 16px;
+                margin-bottom: 0rem;
+            }            
+        </style>
+    </xpath>
+    
 </data>
 ```
 Source: [snippets/sale_blanket_order.report_blanketorder_document.style_gelso.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale_blanket_order.report_blanketorder_document.style_gelso.xml)
@@ -778,21 +864,38 @@ ID: `mint_system.sale_blanket_order.report_blanketorder_document.style_tissa`
 <?xml version="1.0"?>
 <data inherit_id="sale_blanket_order.report_blanketorder_document" priority="60">
 
-	<xpath expr="//div[hasclass('page')]" position="before">
-		<style>
-			.trimada {
-				margin-bottom: 20px;
-			}
-		</style>
-	</xpath>
+    <xpath expr="//div[hasclass('page')]" position="before">
+        <style>
+            table#info {
+                font-size: 9pt;
+                font-family: arial;
+            }
+            h2 {
+            font-size: 1.2rem;
+            font-weight: bold;
+            margin: 50px 0 30px 0
+            }
+            body {
+                font-size: 11pt;
+                font-family: arial;
+            }
+            .table th {
+              padding: 0.2rem;
+              padding-left: 0.5rem;
+            }
+            .note p {
+                font-family: arial;
+                margin-bottom: 0px;
+            }
+          .note p:last-child {
+        margin-bottom: 30px;
+      }
+        </style>
+    </xpath>
 
-	<xpath expr="//div[@id='address']/div" position="attributes">
-		<attribute name="class">col-4</attribute>
-	</xpath>
-
-	<xpath expr="//div[@id='summary']/div" position="attributes">
-		<attribute name="t-attf-class">#{'col-4' if report_type != 'html' else 'col-sm-7 col-md-5'} ml-auto</attribute>
-	</xpath>
+    <xpath expr="//div[@id='summary']/div" position="attributes">
+        <attribute name="t-attf-class">#{'col-4' if report_type != 'html' else 'col-sm-7 col-md-5'} ml-auto</attribute>
+    </xpath>
 
 </data>
 ```
@@ -805,60 +908,60 @@ ID: `mint_system.sale_blanket_order.report_blanketorder_document.style_trimada`
 <data inherit_id="sale_blanket_order.report_blanketorder_document" priority="60">
 
   <xpath expr="//div[hasclass('page')]" position="before">
-		<style>
-			.o_company_1_layout {
-				font-family: Arial;
-				font-size: 9pt;
-			}
-			.table th {
-				padding: 0.3rem;
-			}
-			.table td {
-				padding: 0.3rem;
-			}
-			h2 {
-				font-size: 13pt;
-				font-weight: bold;
-			}
-			table.trimada thead tr {
-				border-top:solid 1px;
-				border-bottom: solid 1px;
-				color: black;
-			}
-			table.trimada thead th#description {
-				width: 70mm;
-			}
-			table.trimada tr.first td {
-				padding-bottom: 0;
-			}
-			table.trimada tr.second td {
-				padding-top: 0;
-			}
-			table.trimada tr.second {
-				border-bottom: 1px solid rgb(220,220,220);
-			}
-			table.trimada thead th#default_code {
-			  width: 27mm;
-			  text-align: left;
-			}
-			table.trimada thead th#date_schedule {
-				text-align: right !important;
-			}
-			table.trimada tbody td#date_schedule {
-				text-align: right !important;
-			}
-			table.trimada thead th#price_subtotal {
-			  text-align: right !important;
-			}
-			table.trimada tbody td span#qty {
-			  font-weight: bold;
-			}
-		</style>
-	</xpath>
+        <style>
+            .o_company_1_layout {
+                font-family: Arial;
+                font-size: 9pt;
+            }
+            .table th {
+                padding: 0.3rem;
+            }
+            .table td {
+                padding: 0.3rem;
+            }
+            h2 {
+                font-size: 13pt;
+                font-weight: bold;
+            }
+            table.trimada thead tr {
+                border-top:solid 1px;
+                border-bottom: solid 1px;
+                color: black;
+            }
+            table.trimada thead th#description {
+                width: 70mm;
+            }
+            table.trimada tr.first td {
+                padding-bottom: 0;
+            }
+            table.trimada tr.second td {
+                padding-top: 0;
+            }
+            table.trimada tr.second {
+                border-bottom: 1px solid rgb(220,220,220);
+            }
+            table.trimada thead th#default_code {
+              width: 27mm;
+              text-align: left;
+            }
+            table.trimada thead th#date_schedule {
+                text-align: right !important;
+            }
+            table.trimada tbody td#date_schedule {
+                text-align: right !important;
+            }
+            table.trimada thead th#price_subtotal {
+              text-align: right !important;
+            }
+            table.trimada tbody td span#qty {
+              font-weight: bold;
+            }
+        </style>
+    </xpath>
 
-	<xpath expr="//table[2]" position="attributes">
-		<attribute name="class" separator=" " add="trimada table-borderless"/>
-	</xpath>
+    <xpath expr="//table[2]" position="attributes">
+        <attribute name="class" separator=" " add="trimada table-borderless"/>
+    </xpath>
 
 </data>
 
@@ -880,6 +983,20 @@ ID: `mint_system.sale_blanket_order.report_blanketorder_document.title_margin`
 Source: [snippets/sale_blanket_order.report_blanketorder_document.title_margin.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale_blanket_order.report_blanketorder_document.title_margin.xml)
 
 ## View Blanket Order Form  
+### Fiscal Position Id  
+ID: `mint_system.sale_blanket_order.view_blanket_order_form.fiscal_position_id`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="sale_blanket_order.view_blanket_order_form" priority="50">
+
+  <xpath expr="//field[@name='payment_term_id']" position="after">
+    <field name="fiscal_position_id" invisible="1"/>
+  </xpath>
+
+</data>
+```
+Source: [snippets/sale_blanket_order.view_blanket_order_form.fiscal_position_id.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale_blanket_order.view_blanket_order_form.fiscal_position_id.xml)
+
 ### Modify Attributes Date Confirmed  
 ID: `mint_system.sale_blanket_order.view_blanket_order_form.modify_attributes_date_confirmed`  
 ```xml
@@ -912,6 +1029,20 @@ ID: `mint_system.sale_blanket_order.view_blanket_order_form.x_product_uom_catego
 ```
 Source: [snippets/sale_blanket_order.view_blanket_order_form.x_product_uom_category_id.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale_blanket_order.view_blanket_order_form.x_product_uom_category_id.xml)
 
+### X State  
+ID: `mint_system.sale_blanket_order.view_blanket_order_form.x_state`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="sale_blanket_order.view_blanket_order_form" priority="50">
+
+  <xpath expr="//field[@name='user_id']" position="after">
+    <field name="state" readonly="0" />
+  </xpath>
+
+</data>
+```
+Source: [snippets/sale_blanket_order.view_blanket_order_form.x_state.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale_blanket_order.view_blanket_order_form.x_state.xml)
+
 ## View Blanket Order Search  
 ### Replace Filter  
 ID: `mint_system.sale_blanket_order.view_blanket_order_search.replace_filter`  
diff --git a/snippets/sale_blanket_order.report_blanketorder_document.add_header_space.xml b/snippets/sale_blanket_order.report_blanketorder_document.add_header_space.xml
index 423d65e6..2facf9de 100644
--- a/snippets/sale_blanket_order.report_blanketorder_document.add_header_space.xml
+++ b/snippets/sale_blanket_order.report_blanketorder_document.add_header_space.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <data inherit_id="sale_blanket_order.report_blanketorder_document" priority="50">
 
-	<xpath expr="//h2" position="attributes">
-		 <attribute name="style">padding-top: 5rem</attribute>
-	</xpath>
+    <xpath expr="//h2" position="attributes">
+         <attribute name="style">padding-top: 5rem</attribute>
+    </xpath>
 
 </data>
\ No newline at end of file
diff --git a/snippets/sale_blanket_order.report_blanketorder_document.add_product_uom.xml b/snippets/sale_blanket_order.report_blanketorder_document.add_product_uom.xml
new file mode 100644
index 00000000..910d7912
--- /dev/null
+++ b/snippets/sale_blanket_order.report_blanketorder_document.add_product_uom.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<data inherit_id="sale_blanket_order.report_blanketorder_document" priority="50">
+
+  <xpath expr="//table/thead//th[3]" position="after">
+    <th name="th_product_uom" class="text-right">ME</th>
+  </xpath>
+
+  <xpath expr="//table/tbody//span[@t-field='l.original_uom_qty']/.." position="after">
+    <td name="td_product_uom" class="text-right">
+      <span t-field="l.product_uom"/>
+    </td>
+  </xpath>
+
+</data>
\ No newline at end of file
diff --git a/snippets/sale_blanket_order.report_blanketorder_document.add_vat.xml b/snippets/sale_blanket_order.report_blanketorder_document.add_vat.xml
new file mode 100644
index 00000000..c53a50a8
--- /dev/null
+++ b/snippets/sale_blanket_order.report_blanketorder_document.add_vat.xml
@@ -0,0 +1,11 @@
+<data inherit_id="sale_blanket_order.report_blanketorder_document" priority="50">
+
+  <xpath expr="//div[@name='comment']" position="before">
+
+    <p>MwSt.-Nr.: 
+      <span t-field="o.company_id.vat"/>
+    </p>
+
+  </xpath>
+
+</data>
\ No newline at end of file
diff --git a/snippets/sale_blanket_order.report_blanketorder_document.format_qty.xml b/snippets/sale_blanket_order.report_blanketorder_document.format_qty.xml
index c59993e6..9b4e377d 100644
--- a/snippets/sale_blanket_order.report_blanketorder_document.format_qty.xml
+++ b/snippets/sale_blanket_order.report_blanketorder_document.format_qty.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <data inherit_id="sale_blanket_order.report_blanketorder_document" priority="60">
 
-	<span id="qty" position="attributes">
-		<attribute name="t-options-widget">"integer"</attribute>
-	</span>
+    <span id="qty" position="attributes">
+        <attribute name="t-options-widget">"integer"</attribute>
+    </span>
 
 </data>
diff --git a/snippets/sale_blanket_order.report_blanketorder_document.remove_date_schedule.xml b/snippets/sale_blanket_order.report_blanketorder_document.remove_date_schedule.xml
new file mode 100644
index 00000000..691533a8
--- /dev/null
+++ b/snippets/sale_blanket_order.report_blanketorder_document.remove_date_schedule.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<data inherit_id="sale_blanket_order.report_blanketorder_document" priority="50">
+
+  <xpath expr="//table/thead/tr/th[3]" position="replace"/>
+ 
+  <xpath expr="//span[@t-field='l.date_schedule']/.." position="replace"/>
+    
+</data>
diff --git a/snippets/sale_blanket_order.report_blanketorder_document.replace_address_block.xml b/snippets/sale_blanket_order.report_blanketorder_document.replace_address_block.xml
new file mode 100644
index 00000000..1ef9737c
--- /dev/null
+++ b/snippets/sale_blanket_order.report_blanketorder_document.replace_address_block.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<data inherit_id="sale_blanket_order.report_blanketorder_document" priority="50">>
+
+    <xpath expr="//div[@t-field='doc.partner_id']/../.." position="replace">
+        <div class="row">
+            <div class="col-7"></div>
+            <div class="col-5">
+                <div t-field="doc.partner_id" t-options="{&quot;widget&quot;: &quot;contact&quot;, &quot;fields&quot;: [&quot;address&quot;, &quot;name&quot;, &quot;fax&quot;], &quot;no_marker&quot;: True, &quot;phone_icons&quot;: True}"/>
+            </div>
+        </div>
+    </xpath>
+
+</data>
\ No newline at end of file
diff --git a/snippets/sale_blanket_order.report_blanketorder_document.replace_product_description.xml b/snippets/sale_blanket_order.report_blanketorder_document.replace_product_description.xml
index fef06207..7adf59a7 100644
--- a/snippets/sale_blanket_order.report_blanketorder_document.replace_product_description.xml
+++ b/snippets/sale_blanket_order.report_blanketorder_document.replace_product_description.xml
@@ -3,7 +3,7 @@
 
 <xpath expr="//span[@t-field='l.product_id']" position="replace">
   <t t-if="l.product_id.type_description">
-		<span style="font-weight: bold" t-field="l.product_id.type_description"/>
+        <span style="font-weight: bold" t-field="l.product_id.type_description"/>
   </t>
   <t t-if="not l.product_id.type_description">
     <span t-field="l.name"/>
diff --git a/snippets/sale_blanket_order.report_blanketorder_document.replace_product_id.xml b/snippets/sale_blanket_order.report_blanketorder_document.replace_product_id.xml
new file mode 100644
index 00000000..7cb53df4
--- /dev/null
+++ b/snippets/sale_blanket_order.report_blanketorder_document.replace_product_id.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<data inherit_id="sale_blanket_order.report_blanketorder_document" priority="50">>
+
+ <xpath expr="//span[@t-field='l.product_id']" position="replace">    
+      <span t-field="l.name"/>
+  </xpath>
+
+</data>
diff --git a/snippets/sale_blanket_order.report_blanketorder_document.round_price.xml b/snippets/sale_blanket_order.report_blanketorder_document.round_price.xml
index 492ee943..7062dda1 100644
--- a/snippets/sale_blanket_order.report_blanketorder_document.round_price.xml
+++ b/snippets/sale_blanket_order.report_blanketorder_document.round_price.xml
@@ -2,7 +2,7 @@
 <data inherit_id="sale_blanket_order.report_blanketorder_document" priority="50">
 
   <xpath expr="//span[@t-field='l.price_unit']" position="replace">
-		 <span t-esc="'%g' % l.price_unit if str(l.price_unit)[::-1].find('.') >= 3 else '%.2f' % l.price_unit"/>
+         <span t-esc="'%g' % l.price_unit if str(l.price_unit)[::-1].find('.') >= 3 else '%.2f' % l.price_unit"/>
   </xpath>
 
 </data>
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 91aacf98..06c3c16e 100644
--- a/snippets/sale_blanket_order.report_blanketorder_document.set_ids.xml
+++ b/snippets/sale_blanket_order.report_blanketorder_document.set_ids.xml
@@ -2,54 +2,54 @@
 <data inherit_id="sale_blanket_order.report_blanketorder_document" priority="50">
 
     <xpath expr="//table//th[4]" position="attributes">
-		<attribute name="id">original_uom_qty</attribute>
-	</xpath>
+        <attribute name="id">original_uom_qty</attribute>
+    </xpath>
 
-	<xpath expr="//span[@t-field='l.original_uom_qty']" position="attributes">
-		<attribute name="id">original_uom_qty</attribute>
-	</xpath>
+    <xpath expr="//span[@t-field='l.original_uom_qty']" position="attributes">
+        <attribute name="id">original_uom_qty</attribute>
+    </xpath>
 
-	<!--
-	<xpath expr="//table[2]//th[1]" position="attributes">
-		<attribute name="id">default_code</attribute>
-	</xpath>
+    <!--
+    <xpath expr="//table[2]//th[1]" position="attributes">
+        <attribute name="id">default_code</attribute>
+    </xpath>
 
-  	<xpath expr="//table[2]//th[2]" position="attributes">
-		<attribute name="id">description</attribute>
-	</xpath>	
+      <xpath expr="//table[2]//th[2]" position="attributes">
+        <attribute name="id">description</attribute>
+    </xpath>    
 
-	<xpath expr="//table[2]//th[3]" position="attributes">
-		<attribute name="id">date_schedule</attribute>
-	</xpath>
-	<xpath expr="//table[2]//td[3]" position="attributes">
-		<attribute name="id">date_schedule</attribute>
-	</xpath>
+    <xpath expr="//table[2]//th[3]" position="attributes">
+        <attribute name="id">date_schedule</attribute>
+    </xpath>
+    <xpath expr="//table[2]//td[3]" position="attributes">
+        <attribute name="id">date_schedule</attribute>
+    </xpath>
 
-	<xpath expr="//table//th[3]" position="attributes">
-		<attribute name="id">date_schedule</attribute>
-	</xpath>
-	<xpath expr="//table//td[3]" position="attributes">
-		<attribute name="id">date_schedule</attribute>
-	</xpath>
+    <xpath expr="//table//th[3]" position="attributes">
+        <attribute name="id">date_schedule</attribute>
+    </xpath>
+    <xpath expr="//table//td[3]" position="attributes">
+        <attribute name="id">date_schedule</attribute>
+    </xpath>
 
-	<xpath expr="//table[2]//th[4]" position="attributes">
-		<attribute name="id">original_uom_qty</attribute>
-	</xpath>
-	<xpath expr="//table[2]//td[4]/span" position="attributes">
-		<attribute name="id">qty</attribute>
-	</xpath>
+    <xpath expr="//table[2]//th[4]" position="attributes">
+        <attribute name="id">original_uom_qty</attribute>
+    </xpath>
+    <xpath expr="//table[2]//td[4]/span" position="attributes">
+        <attribute name="id">qty</attribute>
+    </xpath>
 
-	<xpath expr="//table[2]//th[5]" position="attributes">
-		<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>
-	-->
+    <xpath expr="//table[2]//th[5]" position="attributes">
+        <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>
+    -->
 
 </data>
\ No newline at end of file
diff --git a/snippets/sale_blanket_order.report_blanketorder_document.set_ids_tissa.xml b/snippets/sale_blanket_order.report_blanketorder_document.set_ids_tissa.xml
index c034ecd8..8a60a7f2 100644
--- a/snippets/sale_blanket_order.report_blanketorder_document.set_ids_tissa.xml
+++ b/snippets/sale_blanket_order.report_blanketorder_document.set_ids_tissa.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0"?>
 <data inherit_id="sale_blanket_order.report_blanketorder_document" priority="50">
 
-	<xpath expr="//div[@class='page']/div[2]" position="attributes">
-		<attribute name="id">address</attribute>
-		<attribute name="class" separator=" " add="trimada"/>
-	</xpath>
+    <xpath expr="//div[@class='page']/div[2]" position="attributes">
+        <attribute name="id">address</attribute>
+        <attribute name="class" separator=" " add="trimada"/>
+    </xpath>
 
-	<xpath expr="//span[@t-field='doc.amount_untaxed']/../../../../.." position="attributes">
-		<attribute name="id">summary</attribute>
-	</xpath>
+    <xpath expr="//span[@t-field='doc.amount_untaxed']/../../../../.." position="attributes">
+        <attribute name="id">summary</attribute>
+    </xpath>
 
 </data>
\ No newline at end of file
diff --git a/snippets/sale_blanket_order.report_blanketorder_document.style_gelso.xml b/snippets/sale_blanket_order.report_blanketorder_document.style_gelso.xml
index da27a50a..418d4bb8 100644
--- a/snippets/sale_blanket_order.report_blanketorder_document.style_gelso.xml
+++ b/snippets/sale_blanket_order.report_blanketorder_document.style_gelso.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0"?>
 <data inherit_id="sale_blanket_order.report_blanketorder_document" priority="60">
 
-	<xpath expr="//div[hasclass('page')]" position="before">
-		<style>
-		    div#informations {			
-				font-size: 16px;
-				margin-bottom: 0rem;
-			}			
-		</style>
-	</xpath>
-	
+    <xpath expr="//div[hasclass('page')]" position="before">
+        <style>
+            div#informations {            
+                font-size: 16px;
+                margin-bottom: 0rem;
+            }            
+        </style>
+    </xpath>
+    
 </data>
\ No newline at end of file
diff --git a/snippets/sale_blanket_order.report_blanketorder_document.style_tissa.xml b/snippets/sale_blanket_order.report_blanketorder_document.style_tissa.xml
index 723577ca..7351dd64 100644
--- a/snippets/sale_blanket_order.report_blanketorder_document.style_tissa.xml
+++ b/snippets/sale_blanket_order.report_blanketorder_document.style_tissa.xml
@@ -1,20 +1,37 @@
 <?xml version="1.0"?>
 <data inherit_id="sale_blanket_order.report_blanketorder_document" priority="60">
 
-	<xpath expr="//div[hasclass('page')]" position="before">
-		<style>
-			.trimada {
-				margin-bottom: 20px;
-			}
-		</style>
-	</xpath>
+    <xpath expr="//div[hasclass('page')]" position="before">
+        <style>
+            table#info {
+                font-size: 9pt;
+                font-family: arial;
+            }
+            h2 {
+            font-size: 1.2rem;
+            font-weight: bold;
+            margin: 50px 0 30px 0
+            }
+            body {
+                font-size: 11pt;
+                font-family: arial;
+            }
+            .table th {
+              padding: 0.2rem;
+              padding-left: 0.5rem;
+            }
+            .note p {
+                font-family: arial;
+                margin-bottom: 0px;
+            }
+          .note p:last-child {
+        margin-bottom: 30px;
+      }
+        </style>
+    </xpath>
 
-	<xpath expr="//div[@id='address']/div" position="attributes">
-		<attribute name="class">col-4</attribute>
-	</xpath>
-
-	<xpath expr="//div[@id='summary']/div" position="attributes">
-		<attribute name="t-attf-class">#{'col-4' if report_type != 'html' else 'col-sm-7 col-md-5'} ml-auto</attribute>
-	</xpath>
+    <xpath expr="//div[@id='summary']/div" position="attributes">
+        <attribute name="t-attf-class">#{'col-4' if report_type != 'html' else 'col-sm-7 col-md-5'} ml-auto</attribute>
+    </xpath>
 
 </data>
\ No newline at end of file
diff --git a/snippets/sale_blanket_order.report_blanketorder_document.style_trimada.xml b/snippets/sale_blanket_order.report_blanketorder_document.style_trimada.xml
index 6baf202e..d061a655 100644
--- a/snippets/sale_blanket_order.report_blanketorder_document.style_trimada.xml
+++ b/snippets/sale_blanket_order.report_blanketorder_document.style_trimada.xml
@@ -2,59 +2,59 @@
 <data inherit_id="sale_blanket_order.report_blanketorder_document" priority="60">
 
   <xpath expr="//div[hasclass('page')]" position="before">
-		<style>
-			.o_company_1_layout {
-				font-family: Arial;
-				font-size: 9pt;
-			}
-			.table th {
-				padding: 0.3rem;
-			}
-			.table td {
-				padding: 0.3rem;
-			}
-			h2 {
-				font-size: 13pt;
-				font-weight: bold;
-			}
-			table.trimada thead tr {
-				border-top:solid 1px;
-				border-bottom: solid 1px;
-				color: black;
-			}
-			table.trimada thead th#description {
-				width: 70mm;
-			}
-			table.trimada tr.first td {
-				padding-bottom: 0;
-			}
-			table.trimada tr.second td {
-				padding-top: 0;
-			}
-			table.trimada tr.second {
-				border-bottom: 1px solid rgb(220,220,220);
-			}
-			table.trimada thead th#default_code {
-			  width: 27mm;
-			  text-align: left;
-			}
-			table.trimada thead th#date_schedule {
-				text-align: right !important;
-			}
-			table.trimada tbody td#date_schedule {
-				text-align: right !important;
-			}
-			table.trimada thead th#price_subtotal {
-			  text-align: right !important;
-			}
-			table.trimada tbody td span#qty {
-			  font-weight: bold;
-			}
-		</style>
-	</xpath>
+        <style>
+            .o_company_1_layout {
+                font-family: Arial;
+                font-size: 9pt;
+            }
+            .table th {
+                padding: 0.3rem;
+            }
+            .table td {
+                padding: 0.3rem;
+            }
+            h2 {
+                font-size: 13pt;
+                font-weight: bold;
+            }
+            table.trimada thead tr {
+                border-top:solid 1px;
+                border-bottom: solid 1px;
+                color: black;
+            }
+            table.trimada thead th#description {
+                width: 70mm;
+            }
+            table.trimada tr.first td {
+                padding-bottom: 0;
+            }
+            table.trimada tr.second td {
+                padding-top: 0;
+            }
+            table.trimada tr.second {
+                border-bottom: 1px solid rgb(220,220,220);
+            }
+            table.trimada thead th#default_code {
+              width: 27mm;
+              text-align: left;
+            }
+            table.trimada thead th#date_schedule {
+                text-align: right !important;
+            }
+            table.trimada tbody td#date_schedule {
+                text-align: right !important;
+            }
+            table.trimada thead th#price_subtotal {
+              text-align: right !important;
+            }
+            table.trimada tbody td span#qty {
+              font-weight: bold;
+            }
+        </style>
+    </xpath>
 
-	<xpath expr="//table[2]" position="attributes">
-		<attribute name="class" separator=" " add="trimada table-borderless"/>
-	</xpath>
+    <xpath expr="//table[2]" position="attributes">
+        <attribute name="class" separator=" " add="trimada table-borderless"/>
+    </xpath>
 
 </data>
diff --git a/snippets/sale_blanket_order.view_blanket_order_form.fiscal_position_id.xml b/snippets/sale_blanket_order.view_blanket_order_form.fiscal_position_id.xml
new file mode 100644
index 00000000..9bbf654e
--- /dev/null
+++ b/snippets/sale_blanket_order.view_blanket_order_form.fiscal_position_id.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<data inherit_id="sale_blanket_order.view_blanket_order_form" priority="50">
+
+  <xpath expr="//field[@name='payment_term_id']" position="after">
+    <field name="fiscal_position_id" invisible="1"/>
+  </xpath>
+
+</data>
\ No newline at end of file
diff --git a/snippets/sale_blanket_order.view_blanket_order_form.x_state.xml b/snippets/sale_blanket_order.view_blanket_order_form.x_state.xml
new file mode 100644
index 00000000..94819d1c
--- /dev/null
+++ b/snippets/sale_blanket_order.view_blanket_order_form.x_state.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<data inherit_id="sale_blanket_order.view_blanket_order_form" priority="50">
+
+  <xpath expr="//field[@name='user_id']" position="after">
+    <field name="state" readonly="0" />
+  </xpath>
+
+</data>
\ No newline at end of file
diff --git a/snippets/sale_product_set.md b/snippets/sale_product_set.md
index e7f89498..2711f6eb 100644
--- a/snippets/sale_product_set.md
+++ b/snippets/sale_product_set.md
@@ -1,4 +1,20 @@
 # Sale Product Set
+## View Order Stock Form  
+### Show Button Always  
+ID: `mint_system.sale_product_set.view_order_stock_form.show_button_always`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="sale_product_set.view_order_stock_form" priority="50">
+
+  <button name="639" position="attributes">
+    <attribute name="attrs"></attribute>
+  </button>
+
+</data>
+
+```
+Source: [snippets/sale_product_set.view_order_stock_form.show_button_always.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/sale_product_set.view_order_stock_form.show_button_always.xml)
+
 ## View Product Set Form  
 ### X Categ Id  
 ID: `mint_system.sale_product_set.view_product_set_form.x_categ_id`  
diff --git a/snippets/sale_product_set.view_order_stock_form.show_button_always.xml b/snippets/sale_product_set.view_order_stock_form.show_button_always.xml
new file mode 100644
index 00000000..e7c48db6
--- /dev/null
+++ b/snippets/sale_product_set.view_order_stock_form.show_button_always.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<data inherit_id="sale_product_set.view_order_stock_form" priority="50">
+
+  <button name="639" position="attributes">
+    <attribute name="attrs"></attribute>
+  </button>
+
+</data>
diff --git a/snippets/stock.label_transfer_template_view.basis57.xml b/snippets/stock.label_transfer_template_view.basis57.xml
index 445882bf..cf99b014 100644
--- a/snippets/stock.label_transfer_template_view.basis57.xml
+++ b/snippets/stock.label_transfer_template_view.basis57.xml
@@ -57,8 +57,6 @@
             <t t-foreach="picking.move_lines.filtered(lambda m: m.quantity_done > 0 and m.product_packaging)" t-as="move">
 
                 <!--Set default values-->
-                <t t-set="count_boxes" t-value="0" />
-                <t t-set="count_labels" t-value="0" />
                 <t t-set="temperature" t-value="2" />
                 <t t-set="today" t-value="context_timestamp(datetime.datetime.now())" />
                 <t t-set="packaging" t-value="move.product_packaging" />
@@ -82,6 +80,9 @@
                 <t t-set="move_lines" t-value="move.move_line_ids.filtered(lambda l: l.qty_done > 0)" />
                 <t t-foreach="move_lines" t-as="move_line">
                   
+                    <!--Set default values-->
+                    <t t-set="count_boxes" t-value="0" />
+                    <t t-set="count_labels" t-value="0" />
                     <t t-set="count_labels" t-value="move_line.qty_done/(packaging.qty or 1.0)" />
                 
                     <t t-if="packaging.name == 'Kiste'">
@@ -90,6 +91,9 @@
                     
                     <!--Compute box count-->
                     <t t-if="count_boxes == 0">
+                        <!--<span>qty_done:</span><span t-esc="move_line.qty_done" />-->
+                        <!--<span>quantity_done:</span><span t-esc="move.quantity_done" />-->
+                        <!--<span>x_count_boxes:</span><span t-esc="move.x_count_boxes" />-->
                         <t t-set="count_boxes" t-value="int(((move_line.qty_done + 0.1) / move.quantity_done) * move.x_count_boxes)" />
                     </t>
                     <t t-if="packaging.x_print_without_parent" t-set="count_boxes" t-value="0" />
@@ -97,12 +101,8 @@
                     <t t-if="packaging.x_print_parent_only" t-set="count_pages" t-value="int(count_boxes)" />
 
                     <!--<span>count_boxes:</span><span t-esc="count_boxes" />-->
-                    <!--<span>qty_done:</span><span t-esc="move_line.qty_done" />-->
-                    <!--<span>quantity_done:</span><span t-esc="move.quantity_done" />-->
-                    <!--<span>x_count_boxes:</span><span t-esc="move.x_count_boxes" />-->
                     <!--<span>count_labels:</span><span t-esc="count_labels" />-->
                     <!--<span>count_pages:</span><span t-esc="count_pages" />-->
-                    <!--<br/>-->
 
                     <!--Print report for each label and box count-->
                     <t t-foreach="range(0, count_pages)" t-as="page">
@@ -186,8 +186,8 @@
                                             <br />
                                             <span class="use-font-opensans-bold box address" t-field="picking.partner_id.name" />
                                             <br />
-                                            <span class="use-font-opensans-bold box address address-space-right" t-field="picking.partner_id.zip" />
-                                            <span class="use-font-opensans-bold box address" t-field="picking.partner_id.city" />
+                                            <!--<span class="use-font-opensans-bold box address address-space-right" t-field="picking.partner_id.zip" />-->
+                                            <!--<span class="use-font-opensans-bold box address" t-field="picking.partner_id.city" />-->
                                             <br />
                                             <br />
                                         </t>
@@ -206,7 +206,7 @@
                                     <span class="use-font-opensans-medium default">Verpackt am: </span>
                                     <span class="use-font-opensans-medium default" t-esc="today.strftime('%d.%m.%Y')" />
                                     <br />
-                                    <span class="use-font-opensans-medium default">Zu verbrauchen bis: </span>
+                                    <span class="use-font-opensans-medium default">Mindestens haltbar bis: </span>
                                     <span class="use-font-opensans-medium default" t-esc="consume_until.strftime('%d.%m.%Y')" />
                                     <br />
                                     <span class="use-font-opensans-medium default">
diff --git a/snippets/stock.md b/snippets/stock.md
index f8da4fb7..7b50a505 100644
--- a/snippets/stock.md
+++ b/snippets/stock.md
@@ -62,8 +62,6 @@ ID: `mint_system.stock.label_transfer_template_view.basis57`
             <t t-foreach="picking.move_lines.filtered(lambda m: m.quantity_done > 0 and m.product_packaging)" t-as="move">
 
                 <!--Set default values-->
-                <t t-set="count_boxes" t-value="0" />
-                <t t-set="count_labels" t-value="0" />
                 <t t-set="temperature" t-value="2" />
                 <t t-set="today" t-value="context_timestamp(datetime.datetime.now())" />
                 <t t-set="packaging" t-value="move.product_packaging" />
@@ -87,6 +85,9 @@ ID: `mint_system.stock.label_transfer_template_view.basis57`
                 <t t-set="move_lines" t-value="move.move_line_ids.filtered(lambda l: l.qty_done > 0)" />
                 <t t-foreach="move_lines" t-as="move_line">
                   
+                    <!--Set default values-->
+                    <t t-set="count_boxes" t-value="0" />
+                    <t t-set="count_labels" t-value="0" />
                     <t t-set="count_labels" t-value="move_line.qty_done/(packaging.qty or 1.0)" />
                 
                     <t t-if="packaging.name == 'Kiste'">
@@ -95,6 +96,9 @@ ID: `mint_system.stock.label_transfer_template_view.basis57`
                     
                     <!--Compute box count-->
                     <t t-if="count_boxes == 0">
+                        <!--<span>qty_done:</span><span t-esc="move_line.qty_done" />-->
+                        <!--<span>quantity_done:</span><span t-esc="move.quantity_done" />-->
+                        <!--<span>x_count_boxes:</span><span t-esc="move.x_count_boxes" />-->
                         <t t-set="count_boxes" t-value="int(((move_line.qty_done + 0.1) / move.quantity_done) * move.x_count_boxes)" />
                     </t>
                     <t t-if="packaging.x_print_without_parent" t-set="count_boxes" t-value="0" />
@@ -102,12 +106,8 @@ ID: `mint_system.stock.label_transfer_template_view.basis57`
                     <t t-if="packaging.x_print_parent_only" t-set="count_pages" t-value="int(count_boxes)" />
 
                     <!--<span>count_boxes:</span><span t-esc="count_boxes" />-->
-                    <!--<span>qty_done:</span><span t-esc="move_line.qty_done" />-->
-                    <!--<span>quantity_done:</span><span t-esc="move.quantity_done" />-->
-                    <!--<span>x_count_boxes:</span><span t-esc="move.x_count_boxes" />-->
                     <!--<span>count_labels:</span><span t-esc="count_labels" />-->
                     <!--<span>count_pages:</span><span t-esc="count_pages" />-->
-                    <!--<br/>-->
 
                     <!--Print report for each label and box count-->
                     <t t-foreach="range(0, count_pages)" t-as="page">
@@ -191,8 +191,8 @@ ID: `mint_system.stock.label_transfer_template_view.basis57`
                                             <br />
                                             <span class="use-font-opensans-bold box address" t-field="picking.partner_id.name" />
                                             <br />
-                                            <span class="use-font-opensans-bold box address address-space-right" t-field="picking.partner_id.zip" />
-                                            <span class="use-font-opensans-bold box address" t-field="picking.partner_id.city" />
+                                            <!--<span class="use-font-opensans-bold box address address-space-right" t-field="picking.partner_id.zip" />-->
+                                            <!--<span class="use-font-opensans-bold box address" t-field="picking.partner_id.city" />-->
                                             <br />
                                             <br />
                                         </t>
@@ -211,7 +211,7 @@ ID: `mint_system.stock.label_transfer_template_view.basis57`
                                     <span class="use-font-opensans-medium default">Verpackt am: </span>
                                     <span class="use-font-opensans-medium default" t-esc="today.strftime('%d.%m.%Y')" />
                                     <br />
-                                    <span class="use-font-opensans-medium default">Zu verbrauchen bis: </span>
+                                    <span class="use-font-opensans-medium default">Mindestens haltbar bis: </span>
                                     <span class="use-font-opensans-medium default" t-esc="consume_until.strftime('%d.%m.%Y')" />
                                     <br />
                                     <span class="use-font-opensans-medium default">
@@ -1397,6 +1397,22 @@ ID: `mint_system.stock.report_delivery_document.add_infotable`
 ```
 Source: [snippets/stock.report_delivery_document.add_infotable.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_delivery_document.add_infotable.xml)
 
+### Add Note  
+ID: `mint_system.stock.report_delivery_document.add_note`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="stock.report_delivery_document" priority="50">  
+
+  <xpath expr="//table[@name='stock_move_line_table']" position="after">
+    <t t-if="o.note != '&lt;p&gt;&lt;br&gt;&lt;/p&gt;'">
+      <span class="note" t-field="o.note"/>
+    </t>
+  </xpath>
+
+</data>
+```
+Source: [snippets/stock.report_delivery_document.add_note.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_delivery_document.add_note.xml)
+
 ### Add Open Quantity In Backorder  
 ID: `mint_system.stock.report_delivery_document.add_open_quantity_in_backorder`  
 ```xml
@@ -1436,31 +1452,76 @@ ID: `mint_system.stock.report_delivery_document.add_table_margin`
 ```
 Source: [snippets/stock.report_delivery_document.add_table_margin.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_delivery_document.add_table_margin.xml)
 
+### Add Weight  
+ID: `mint_system.stock.report_delivery_document.add_weight`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="stock.report_delivery_document" priority="50">
+
+  <xpath expr="//th[@name='th_sm_quantity']" position="before">
+    <th>
+      <span>Weight</span>
+    </th>
+  </xpath>
+
+  <xpath expr="//span[@t-field='move.quantity_done']/.." position="before">
+    <td>
+      <span t-field="move.product_id.weight"/>
+      <span t-field="move.product_id.weight_uom_name"/>
+    </td>
+  </xpath>
+
+</data>
+```
+Source: [snippets/stock.report_delivery_document.add_weight.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_delivery_document.add_weight.xml)
+
 ### Append Signature Text  
 ID: `mint_system.stock.report_delivery_document.append_signature_text`  
 ```xml
 <?xml version="1.0"?>
 <data inherit_id="stock.report_delivery_document" priority="50">
 
+  <xpath expr="//table[@name='stock_move_line_table']" position="after">
+    <style>
+      div#signature {
+      padding-left: 75px;
+      padding-right: 75px;
+      margin-top: 3rem;
+      }
+    </style>
+    <div id="signature">
+      <p>Hiermit bestätigen wir den Erhalt der Ware gemäss Lieferung.</p>
+      <br />
+      <br />
+      <div class="row">
+        <div class="col-6">
+          <p>Ort/Datum: __________________________________</p>
+        </div>
+        <div class="col-6">
+          <p>Unterschrift Kunde: __________________________________</p>
+        </div>
+      </div>
+    </div>
+  </xpath>
+
   <xpath expr="//table[@name='stock_move_line_table']" position="after">
     <div class="row" style="margin-top: 3rem;">
       <div class="col-5">
-       <p>Gebinde geliefert: _____</p>
-       <p>Gebinde zurück: _____</p>
-       <br/>
-       <p>Unterschrift Transport: _______________</p>
+        <p>Gebinde geliefert: _____</p>
+        <p>Gebinde zurück: _____</p>
+        <br />
+        <p>Unterschrift Transport: _______________</p>
       </div>
       <div class="col-2" />
       <div class="col-5">
-       <p>Produkte einwandfrei erhalten.</p>
-       <br/>
-       <p>Unterschrift Kunde: _______________</p>
+        <p>Produkte einwandfrei erhalten.</p>
+        <br />
+        <p>Unterschrift Kunde: _______________</p>
       </div>
     </div>
   </xpath>
 
 </data>
-
 ```
 Source: [snippets/stock.report_delivery_document.append_signature_text.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_delivery_document.append_signature_text.xml)
 
@@ -1472,9 +1533,9 @@ ID: `mint_system.stock.report_delivery_document.backorder_signature_section`
 
   <xpath expr="//table[@name='stock_move_line_table']" position="after">
     <p>Retouren:<br/><br/>
-		KEG:             ___________  Anzahl<br/><br/>
-		Harassen:  ___________  Anzahl<br/><br/>
-		Waren erhalten:   Datum:  ______________________  Unterschrift:  _________________________________
+        KEG:             ___________  Anzahl<br/><br/>
+        Harassen:  ___________  Anzahl<br/><br/>
+        Waren erhalten:   Datum:  ______________________  Unterschrift:  _________________________________
     </p>
   </xpath>
 
@@ -1498,26 +1559,6 @@ ID: `mint_system.stock.report_delivery_document.barcode_customer_reference`
 ```
 Source: [snippets/stock.report_delivery_document.barcode_customer_reference.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_delivery_document.barcode_customer_reference.xml)
 
-### Description Sale  
-ID: `mint_system.stock.report_delivery_document.description_sale`  
-```xml
-<?xml version="1.0"?>
-<data inherit_id="stock.report_delivery_document" priority="55">
-
-  <xpath expr="//span[@t-field='move.product_id']" position="replace">
-    <t t-if="move.product_id.description_sale">
-      <span t-field="move.product_id.description_sale"/>
-    </t>
-    <t t-else="">
-      <span t-field="move.product_id"/>
-    </t>
-  </xpath>
-
-</data>
-
-```
-Source: [snippets/stock.report_delivery_document.description_sale.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_delivery_document.description_sale.xml)
-
 ### Disable Stock Move Line Table  
 ID: `mint_system.stock.report_delivery_document.disable_stock_move_line_table`  
 ```xml
@@ -1566,13 +1607,27 @@ ID: `mint_system.stock.report_delivery_document.format_address_blocks`
 <?xml version="1.0"?>
 <data inherit_id="stock.report_delivery_document" priority="50">
 
-<xpath expr="//t[@t-set='address']/div" position="attributes">
+  <xpath expr="//t[@t-set='address']/div" position="attributes">
     <attribute name="style">font-size:10pt; line-height: 1.2; padding-bottom:33mm</attribute>
     <attribute name="t-options-fields">['address', 'name']</attribute>
   </xpath>
 
 </data>
 
+<!--
+<data inherit_id="stock.report_delivery_document" priority="50">
+
+  <xpath expr="//div[@name='div_outgoing_address']" position="attributes">
+    <attribute name="t-options-fields">['address', 'name']</attribute>
+  </xpath>
+  
+  <xpath expr="//div[@t-field='partner.commercial_partner_id']" position="attributes">
+    <attribute name="t-options-fields">['address', 'name']</attribute>
+  </xpath>
+ 
+</data>
+-->
+
 ```
 Source: [snippets/stock.report_delivery_document.format_address_blocks.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_delivery_document.format_address_blocks.xml)
 
@@ -1647,16 +1702,15 @@ ID: `mint_system.stock.report_delivery_document.format_qty`
 <?xml version="1.0"?>
 <data inherit_id="stock.report_delivery_document" priority="60">
 
-	<span id="open_qty" position="attributes">
-		<attribute name="t-options-widget">"integer"</attribute>
-	</span>
+    <span t-field="move.product_uom_qty" position="attributes">
+        <attribute name="t-options-widget">"integer"</attribute>
+    </span>
 
-	<span id="qty" position="attributes">
-		<attribute name="t-options-widget">"integer"</attribute>
-	</span>
+    <span t-field="move.quantity_done" position="attributes">
+        <attribute name="t-options-widget">"integer"</attribute>
+    </span>
 
 </data>
-
 ```
 Source: [snippets/stock.report_delivery_document.format_qty.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_delivery_document.format_qty.xml)
 
@@ -1776,15 +1830,28 @@ ID: `mint_system.stock.report_delivery_document.get_position`
 ```
 Source: [snippets/stock.report_delivery_document.get_position.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_delivery_document.get_position.xml)
 
+### Hide Address  
+ID: `mint_system.stock.report_delivery_document.hide_address`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="stock.report_delivery_document" priority="50">
+
+    <xpath expr="//div[@name='customer_address']" position="replace"/>
+    <xpath expr="//div[@name='partner_header']" position="replace"/>
+
+</data>
+```
+Source: [snippets/stock.report_delivery_document.hide_address.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_delivery_document.hide_address.xml)
+
 ### Hide Backorder Quantity  
 ID: `mint_system.stock.report_delivery_document.hide_backorder_quantity`  
 ```xml
 <?xml version="1.0"?>
 <data inherit_id="stock.report_delivery_document" priority="50">
 
-	<xpath expr="//table[@name='stock_backorder_table']/thead//th[4]" position="replace">
-		<th></th>
-	</xpath>
+    <xpath expr="//table[@name='stock_backorder_table']/thead//th[4]" position="replace">
+        <th></th>
+    </xpath>
 
 </data>
 ```
@@ -1821,6 +1888,17 @@ ID: `mint_system.stock.report_delivery_document.hide_name`
 ```
 Source: [snippets/stock.report_delivery_document.hide_name.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_delivery_document.hide_name.xml)
 
+### Hide Product Uom Qty  
+ID: `mint_system.stock.report_delivery_document.hide_product_uom_qty`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="stock.report_delivery_document" priority="50">
+  <xpath expr="//span[@t-field='move.product_uom_qty']/..." position="replace">
+  </xpath>
+</data>
+```
+Source: [snippets/stock.report_delivery_document.hide_product_uom_qty.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_delivery_document.hide_product_uom_qty.xml)
+
 ### Hs Code Origin And Weight  
 ID: `mint_system.stock.report_delivery_document.hs_code_origin_and_weight`  
 ```xml
@@ -2088,37 +2166,136 @@ ID: `mint_system.stock.report_delivery_document.remove_informations`
 ```
 Source: [snippets/stock.report_delivery_document.remove_informations.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_delivery_document.remove_informations.xml)
 
+### Replace Address And Information Block  
+ID: `mint_system.stock.report_delivery_document.replace_address_and_information_block`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="stock.report_delivery_document" priority="50">
+
+  <xpath expr="//t[@t-set='address']" position="replace"/>
+
+  <xpath expr="//t[@t-set='information_block']" position="replace">
+
+    <span>Carbo-Link AG | Undermülistrasse 25 | CH 8320 Fehraltorf</span>
+
+    <div class="row text-900 o_bold">
+      <div class="col-7">Delivery Address</div>
+      <div class="col-5">Customer</div>
+    </div>
+
+    <div class="row">
+      <div class="col-7">
+        <span t-field="o.sale_id.partner_shipping_id.commercial_company_name"/>
+      </div>
+      <div class="col-5">
+        <span t-field="o.sale_id.partner_shipping_id.commercial_company_name"/>
+      </div>
+    </div>
+
+    <div class="row">
+      <div class="col-7">
+        <span t-field="o.sale_id.partner_shipping_id" t-options-widget="&quot;contact&quot;" t-options-fields="['address']" t-options-no_marker="True"/>
+      </div>
+      <div class="col-5">
+        <span t-field="o.sale_id.partner_id.name"/>
+      </div>
+    </div>
+
+    <div class="row">
+      <div class="col-5 text-900 o_bold offset-7" style="margin-top:25px">Invoice Address</div>
+    </div>
+
+    <div class="row">
+      <div class="col-5 offset-7">
+        <span t-field="o.sale_id.partner_shipping_id.commercial_company_name"/>
+      </div>
+    </div>
+
+    <div class="row">
+      <div class="col-5 offset-7">
+        <span t-field="o.sale_id.partner_invoice_id" t-options-widget="&quot;contact&quot;" t-options-fields="['address']" t-options-no_marker="True"/>
+      </div>
+    </div>
+
+    <div class="row o_bold text-900" style="margin-top:25px">
+      <div class="col-7">Your Contact</div>
+      <div class="col-5">Our Contact</div>
+    </div>
+
+    <div class="row">
+      <div class="col-7">
+        <span t-field="o.sale_id.partner_id.name"/>
+      </div>
+      <div class="col-5">
+        <span t-field="o.sale_id.user_id.name"/>
+      </div>
+    </div>
+
+    <div class="row">
+      <div class="col-7" style="margin-bottom:25px">
+        <span t-field="o.sale_id.partner_id" t-options-widget="&quot;contact&quot;" t-options-fields="['phone', 'email']" t-options-no_marker="True"/>
+      </div>
+      <div class="col-5">
+        <span t-field="o.sale_id.user_id" t-options-widget="&quot;contact&quot;" t-options-fields="['phone', 'email']" t-options-no_marker="True"/>
+      </div>
+    </div>
+
+  </xpath>
+
+</data>
+```
+Source: [snippets/stock.report_delivery_document.replace_address_and_information_block.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_delivery_document.replace_address_and_information_block.xml)
+
+### Replace Description Sale  
+ID: `mint_system.stock.report_delivery_document.replace_description_sale`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="stock.report_delivery_document" priority="55">
+
+    <xpath expr="//span[@t-field='move.product_id']" position="replace">
+        <t t-if="move.product_id.description_sale">
+            <span t-field="move.product_id.description_sale" />
+        </t>
+        <t t-else="">
+            <span t-field="move.product_id" />
+        </t>
+    </xpath>
+
+</data>
+```
+Source: [snippets/stock.report_delivery_document.replace_description_sale.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_delivery_document.replace_description_sale.xml)
+
 ### Replace Header  
 ID: `mint_system.stock.report_delivery_document.replace_header`  
 ```xml
 <?xml version="1.0"?>
 <data inherit_id="stock.report_delivery_document" priority="50">
-	<xpath expr="//div[@t-if='o.origin']/.." position="before">
-		<style>
-		table#header {
-			width: 100%;
-			border: solid 1px;
-			font-size: 18pt;
-		}
-		table#header td {
-			padding: 5px;
-			padding-left: 10px;
-			vertical-align: middle;
-			font-weight: bold;
-		}
-		</style>
-		<table id='header'>
-		<tr>
-			<td>Lieferschein <span t-field="o.name"/>
-			</td>
-			<td>
-				<span>
-					<img t-att-src="'/report/barcode/?type=%s&amp;value=%s&amp;width=%s&amp;height=%s&amp;quiet=0' % ('Code128', o.name, 600, 100)" style="width:210px;height:60px; float:right;"/>
-				</span>
-			</td>
-		</tr>
-		</table>
-	</xpath>
+    <xpath expr="//div[@t-if='o.origin']/.." position="before">
+        <style>
+        table#header {
+            width: 100%;
+            border: solid 1px;
+            font-size: 18pt;
+        }
+        table#header td {
+            padding: 5px;
+            padding-left: 10px;
+            vertical-align: middle;
+            font-weight: bold;
+        }
+        </style>
+        <table id='header'>
+        <tr>
+            <td>Lieferschein <span t-field="o.name"/>
+            </td>
+            <td>
+                <span>
+                    <img t-att-src="'/report/barcode/?type=%s&amp;value=%s&amp;width=%s&amp;height=%s&amp;quiet=0' % ('Code128', o.name, 600, 100)" style="width:210px;height:60px; float:right;"/>
+                </span>
+            </td>
+        </tr>
+        </table>
+    </xpath>
 </data>
 ```
 Source: [snippets/stock.report_delivery_document.replace_header.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_delivery_document.replace_header.xml)
@@ -2143,25 +2320,31 @@ ID: `mint_system.stock.report_delivery_document.replace_informations`
             <table class="table table-borderless table-sm">
                 <tr>
                     <td>
-                        <strong>Shipping Date:</strong>
+                        <strong>Versanddatum:</strong>
                         <t t-if="o.state == 'done'">
-                            <p t-field="o.date_done" />
+                            <span t-field="o.date_done" t-options='{"widget": "date"}' />
                         </t>
                         <t t-if="o.state != 'done'">
-                            <p t-field="o.scheduled_date" />
+                            <span t-field="o.scheduled_date" t-options='{"widget": "date"}' />
                         </t>
                     </td>
                     <td>
+                        <strong>Unser Kontakt:</strong>
+                        <span t-field="o.sudo().sale_id.user_id" />
                     </td>
                     <td>
-                        <strong>Customer Reference:</strong>
-                        <p t-field="o.sudo().sale_id.client_order_ref" />
+                        <strong>Ihr Kontakt:</strong>
+                        <span t-field="o.sudo().sale_id.partner_sale_id.name" />
                     </td>
                 </tr>
                 <tr>
                     <td colspan="2">
                         <strong>&#160;Unsere Referenz:</strong>
-                        <p t-field="o.origin" />
+                        <span t-field="o.origin" />
+                    </td>
+                    <td t-if="o.sudo().sale_id.client_order_ref">
+                        <strong>Ihre Referenz:</strong>
+                        <span t-field="o.sudo().sale_id.client_order_ref" />
                     </td>
                 </tr>
             </table>
@@ -2329,6 +2512,22 @@ ID: `mint_system.stock.report_delivery_document.replace_infotable`
 ```
 Source: [snippets/stock.report_delivery_document.replace_infotable.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_delivery_document.replace_infotable.xml)
 
+### Replace Name  
+ID: `mint_system.stock.report_delivery_document.replace_name`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="stock.report_delivery_document" priority="50">
+
+    <xpath expr="//span[@t-field='o.name']/.." position="replace">
+        <h2>
+            Delivery slip <span t-field="o.name"/>
+        </h2>
+    </xpath>
+
+</data>
+```
+Source: [snippets/stock.report_delivery_document.replace_name.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_delivery_document.replace_name.xml)
+
 ### Replace Order Definition  
 ID: `mint_system.stock.report_delivery_document.replace_order_definition`  
 ```xml
@@ -2348,7 +2547,7 @@ ID: `mint_system.stock.report_delivery_document.replace_order_definition`
       padding-left: 10px;
       padding-bottom: 5px;
       }
-		</style>
+        </style>
     <table id='titel'>
       <tr>
         <td style="width: 44%;"><strong>Fertigungsauftrag <span t-field="o.origin"/></strong></td>
@@ -2428,15 +2627,34 @@ ID: `mint_system.stock.report_delivery_document.replace_product_uom_qty`
 <?xml version="1.0"?>
 <data inherit_id="stock.report_delivery_document" priority="60">
 
-	<xpath expr="//span[@t-field='move.product_uom_qty']" position="replace">
-		<span t-field="move.quantity_done"/>
-	</xpath>
+    <xpath expr="//span[@t-field='move.product_uom_qty']" position="replace">
+        <span t-field="move.quantity_done"/>
+    </xpath>
 
 </data>
 
 ```
 Source: [snippets/stock.report_delivery_document.replace_product_uom_qty.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_delivery_document.replace_product_uom_qty.xml)
 
+### Replace Sale Line Name  
+ID: `mint_system.stock.report_delivery_document.replace_sale_line_name`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="stock.report_delivery_document" priority="55">
+
+    <xpath expr="//span[@t-field='move.product_id']" position="replace">
+        <t t-if="move.sale_line_id">
+            <span t-field="move.sale_line_id.name" />
+        </t>
+        <t t-else="">
+            <span t-field="move.product_id" />
+        </t>
+    </xpath>
+
+</data>
+```
+Source: [snippets/stock.report_delivery_document.replace_sale_line_name.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_delivery_document.replace_sale_line_name.xml)
+
 ### Replace Table  
 ID: `mint_system.stock.report_delivery_document.replace_table`  
 ```xml
@@ -2616,45 +2834,45 @@ ID: `mint_system.stock.report_delivery_document.set_ids`
 <?xml version="1.0"?>
 <data inherit_id="stock.report_delivery_document" priority="60">
 
-	<xpath expr="//table[@name='stock_move_table']//th[2]" position="attributes">
-		<attribute name="id">description</attribute>
-	</xpath>
+    <xpath expr="//table[@name='stock_move_table']//th[2]" position="attributes">
+        <attribute name="id">description</attribute>
+    </xpath>
 
-	<xpath expr="//table[@name='stock_move_table']//th[3]" position="attributes">
-		<attribute name="id">quantity</attribute>
-	</xpath>
-	<xpath expr="//table[@name='stock_move_table']//td[3]" position="attributes">
-		<attribute name="id">quantity</attribute>
-	</xpath>
-	<xpath expr="//table[@name='stock_move_table']//td[3]/span[1]" position="attributes">
-		<attribute name="id">qty</attribute>
-	</xpath>
+    <xpath expr="//table[@name='stock_move_table']//th[3]" position="attributes">
+        <attribute name="id">quantity</attribute>
+    </xpath>
+    <xpath expr="//table[@name='stock_move_table']//td[3]" position="attributes">
+        <attribute name="id">quantity</attribute>
+    </xpath>
+    <xpath expr="//table[@name='stock_move_table']//td[3]/span[1]" position="attributes">
+        <attribute name="id">qty</attribute>
+    </xpath>
 
-	<xpath expr="//table[@name='stock_backorder_table']//th[2]" position="attributes">
-		<attribute name="id">description</attribute>
-	</xpath>
+    <xpath expr="//table[@name='stock_backorder_table']//th[2]" position="attributes">
+        <attribute name="id">description</attribute>
+    </xpath>
 
-	<xpath expr="//table[@name='stock_backorder_table']//th[3]" position="attributes">
-		<attribute name="id">open_quantity</attribute>
-	</xpath>
-	<xpath expr="//table[@name='stock_backorder_table']//td[3]" position="attributes">
-		<attribute name="id">open_quantity</attribute>
-	</xpath>
+    <xpath expr="//table[@name='stock_backorder_table']//th[3]" position="attributes">
+        <attribute name="id">open_quantity</attribute>
+    </xpath>
+    <xpath expr="//table[@name='stock_backorder_table']//td[3]" position="attributes">
+        <attribute name="id">open_quantity</attribute>
+    </xpath>
 
-	<xpath expr="//table[@name='stock_backorder_table']//th[3]" position="attributes">
-		<attribute name="id">open_quantity</attribute>
-	</xpath>
-	<xpath expr="//table[@name='stock_backorder_table']//td[3]/span[1]" position="attributes">
-		<attribute name="id">open_qty</attribute>
-	</xpath>
+    <xpath expr="//table[@name='stock_backorder_table']//th[3]" position="attributes">
+        <attribute name="id">open_quantity</attribute>
+    </xpath>
+    <xpath expr="//table[@name='stock_backorder_table']//td[3]/span[1]" position="attributes">
+        <attribute name="id">open_qty</attribute>
+    </xpath>
 
-	<xpath expr="//table[@name='stock_backorder_table']//th[4]" position="attributes">
-		<attribute name="id">quantity</attribute>
-	</xpath>
+    <xpath expr="//table[@name='stock_backorder_table']//th[4]" position="attributes">
+        <attribute name="id">quantity</attribute>
+    </xpath>
 
-	<xpath expr="//table[@name='stock_backorder_table']/../p" position="attributes">
-		<attribute name="class">subtitel</attribute>
-	</xpath>
+    <xpath expr="//table[@name='stock_backorder_table']/../p" position="attributes">
+        <attribute name="class">subtitel</attribute>
+    </xpath>
 
 </data>
 ```
@@ -2760,23 +2978,35 @@ ID: `mint_system.stock.report_delivery_document.show_default_code`
 <?xml version="1.0"?>
 <data inherit_id="stock.report_delivery_document" priority="50">
 
-  <xpath expr="//table[@name='stock_move_table']/thead/tr/th[1]" position="before">
+  <xpath expr="//table[@name='stock_move_table']" position="before">
+    <style>
+      th#default_code,
+      td#default_code {
+        white-space: nowrap;
+      }
+    </style>
+  </xpath>
+  
+  <xpath expr="//table[@name='stock_move_table']//th[@name='th_sm_product']" position="before">
+    <th id="default_code" name="th_default_code">
+      <strong>Referenz</strong>
+    </th>
+  </xpath>
+
+  <!-- <xpath expr="//table[@name='stock_backorder_table']/thead/tr/th[1]" position="before">
     <th id="default_code">
       <strong >Nr.</strong>
     </th>
-  </xpath>
-  <xpath expr="//table[@name='stock_backorder_table']/thead/tr/th[1]" position="before">
-    <th id="default_code">
-      <strong >Nr.</strong>
-    </th>
-  </xpath>
-  <xpath expr="//table[@name='stock_move_table']/tbody//tr/td[1]" position="before">
-    <td id="default_code">
+  </xpath> -->
+
+  <xpath expr="//table[@name='stock_move_table']//span[@t-field='move.product_id']/.." position="before">
+    <td id="default_code"  name="td_default_code">
       <span t-field="move.product_id.default_code"/>
     </td>
   </xpath>
 
 </data>
+
 ```
 Source: [snippets/stock.report_delivery_document.show_default_code.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_delivery_document.show_default_code.xml)
 
@@ -2786,18 +3016,28 @@ ID: `mint_system.stock.report_delivery_document.show_lot_ids`
 <?xml version="1.0"?>
 <data inherit_id="stock.report_delivery_document" priority="50">
 
-  <xpath expr="//table[@name='stock_move_table']//th[1]" position="after">
+  <!-- <xpath expr="//table[@name='stock_move_table']//th[@name='th_sm_product']" position="after">
     <th name="th_lot_ids">
       <strong>Seriennummer</strong>
     </th>
-  </xpath>
+  </xpath> -->
+
+  <xpath expr="//table[@name='stock_move_table']//span[@t-field='move.description_picking']/.." position="after">
+    <t t-if="move.lot_ids">
+      <br />
+      <span>Seriennummern:</span>
+      <t t-esc="', '.join(move.lot_ids.mapped('name'))" />
+    </t>
+
+    <!-- <td name="td_lots"> -->
+      <!-- <t t-esc="', '.join(move.lot_ids.mapped('name'))" /> -->
+      <!-- <ul class="list-unstyled">
+        <t t-foreach="move.lot_ids" t-as="lot">
+          <li t-esc="lot.name" />
+        </t>
+      </ul> -->
+    <!-- </td> -->
 
-  <xpath expr="//table[@name='stock_move_table']//td[1]" position="after">
-    <td name="td_lots">
-      <ul>
-      <t t-foreach="move.lot_ids" t-as="lot" ><li t-esc="lot.name" /></t>
-      </ul>
-    </td>
   </xpath>
 
 </data>
@@ -2840,15 +3080,69 @@ ID: `mint_system.stock.report_delivery_document.sort_by_position`
 ```
 Source: [snippets/stock.report_delivery_document.sort_by_position.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_delivery_document.sort_by_position.xml)
 
+### Style Carbo Link  
+ID: `mint_system.stock.report_delivery_document.style_carbo_link`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="stock.report_delivery_document" priority="60">
+
+    <xpath expr="//div[hasclass('page')]" position="before">
+        <style>
+        .o_company_1_layout {
+            font-family: Dobra-Book;
+            font-size: 80%;
+            }
+        </style>
+    </xpath>
+    
+    <xpath expr="//p[@t-field='o.date_done']" position="attributes">
+        <attribute name="t-options-widget">"date"</attribute>
+    </xpath>
+    
+    <xpath expr="//p[@t-field='o.scheduled_date']" position="attributes">
+        <attribute name="t-options-widget">"date"</attribute>
+    </xpath>
+    
+</data>
+```
+Source: [snippets/stock.report_delivery_document.style_carbo_link.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_delivery_document.style_carbo_link.xml)
+
+### Style Swissfragrance  
+ID: `mint_system.stock.report_delivery_document.style_swissfragrance`  
+```xml
+<data inherit_id="stock.report_delivery_document" priority="60">
+
+    <style>
+      .cell_left {
+      text-align: left;
+      }
+    </style>
+
+    <xpath expr="//div[hasclass('page')]" position="before">
+        <style>
+        h2 {
+        margin-top: 50px;
+            }
+        </style>
+    </xpath>
+
+    <xpath expr="//th[@name='th_sml_product']" position="attributes">
+        <attribute name="class" separator=" " add="cell_left"/>
+    </xpath>
+
+</data>
+```
+Source: [snippets/stock.report_delivery_document.style_swissfragrance.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_delivery_document.style_swissfragrance.xml)
+
 ### Style Tissa  
 ID: `mint_system.stock.report_delivery_document.style_tissa`  
 ```xml
 <?xml version="1.0"?>
 <data inherit_id="stock.report_delivery_document" priority="60">
 
-	<xpath expr="//div[hasclass('page')]" position="before">
-	  
-		<style>
+    <xpath expr="//div[hasclass('page')]" position="before">
+      
+        <style>
       table.tissa {
       margin-top: 30px;
       margin-bottom: 30px;
@@ -2859,20 +3153,20 @@ ID: `mint_system.stock.report_delivery_document.style_tissa`
       }
     </style>
     
-	</xpath>
+    </xpath>
 
-	<xpath expr="//th[@name='th_sml_quantity']" position="attributes">
-			 <attribute name="class">cell_right</attribute>
-	</xpath>
-	
-	<xpath expr="//th[@name='th_sm_quantity']" position="attributes">
-			 <attribute name="class" separator=" " add="cell_right"/>
-	</xpath>
-	
-	<xpath expr="//table[@name='stock_move_table']//td[2]" position="attributes">
-			 <attribute name="class" separator=" " add="cell_right"/>
-	</xpath>
-	
+    <xpath expr="//th[@name='th_sml_quantity']" position="attributes">
+             <attribute name="class">cell_right</attribute>
+    </xpath>
+    
+    <xpath expr="//th[@name='th_sm_quantity']" position="attributes">
+             <attribute name="class" separator=" " add="cell_right"/>
+    </xpath>
+    
+    <xpath expr="//table[@name='stock_move_table']//td[2]" position="attributes">
+             <attribute name="class" separator=" " add="cell_right"/>
+    </xpath>
+    
 </data>
 
 ```
@@ -2884,72 +3178,72 @@ ID: `mint_system.stock.report_delivery_document.style_trimada`
 <?xml version="1.0"?>
 <data inherit_id="stock.report_delivery_document" priority="60">
 
-	<xpath expr="//div[hasclass('page')]" position="before">
-		<style>
-			table.trimada {
-				font-size: 9pt;
-				font-family: arial;
-				color: black;
-			}
-			table.trimada thead tr {
-				border-top:solid 1px;
-				border-bottom: solid 1px;
-			}
-			table.trimada thead th#position {
-				width: 5mm;
-			}
-			table.trimada thead th#default_code {
-			  width: 27mm;
-			  text-align: right;
-			}
-			table.trimada thead th#open_quantity {
-			  width: 30mm;
-			  text-align: right;
-			}
-			table.trimada thead th#quantity {
-			  width: 25mm;
-			  text-align: right !important;
-			}
-			table.trimada tbody td#position {
-			  text-align: right;
-			}
-			table.trimada tbody tr {
-				border-bottom: 1px solid rgb(220,220,220)
-			}
-			table.trimada tbody td#default_code {
-			  text-align: right;
-			}
-			table.trimada tbody td#open_quantity {
-			  text-align: right !important;
-			}
-			table.trimada tbody td#quantity {
-			  text-align: right;
-			}			
-			table.trimada tbody span#qty {
-			  font-weight: bold;
-			}
-			table.trimada tbody span#open_qty {
-			  font-weight: bold;
-			}
-			.subtitel {
-				font-size: 11pt;
-				font-family: arial;
-				margin-top: 10mm;
-			}
-			.note {
-				font-size: 9pt;
-				font-family: arial;
-			}
-		</style>
-	</xpath>
+    <xpath expr="//div[hasclass('page')]" position="before">
+        <style>
+            table.trimada {
+                font-size: 9pt;
+                font-family: arial;
+                color: black;
+            }
+            table.trimada thead tr {
+                border-top:solid 1px;
+                border-bottom: solid 1px;
+            }
+            table.trimada thead th#position {
+                width: 5mm;
+            }
+            table.trimada thead th#default_code {
+              width: 27mm;
+              text-align: right;
+            }
+            table.trimada thead th#open_quantity {
+              width: 30mm;
+              text-align: right;
+            }
+            table.trimada thead th#quantity {
+              width: 25mm;
+              text-align: right !important;
+            }
+            table.trimada tbody td#position {
+              text-align: right;
+            }
+            table.trimada tbody tr {
+                border-bottom: 1px solid rgb(220,220,220)
+            }
+            table.trimada tbody td#default_code {
+              text-align: right;
+            }
+            table.trimada tbody td#open_quantity {
+              text-align: right !important;
+            }
+            table.trimada tbody td#quantity {
+              text-align: right;
+            }            
+            table.trimada tbody span#qty {
+              font-weight: bold;
+            }
+            table.trimada tbody span#open_qty {
+              font-weight: bold;
+            }
+            .subtitel {
+                font-size: 11pt;
+                font-family: arial;
+                margin-top: 10mm;
+            }
+            .note {
+                font-size: 9pt;
+                font-family: arial;
+            }
+        </style>
+    </xpath>
 
-	<table name="stock_move_table" position="attributes">
-		<attribute name="class" separator=" " add="trimada table-borderless"/>
-	</table>
+    <table name="stock_move_table" position="attributes">
+        <attribute name="class" separator=" " add="trimada table-borderless"/>
+    </table>
 
-	<table name="stock_backorder_table" position="attributes">
-		<attribute name="class" separator=" " add="trimada table-borderless"/>
-	</table>
+    <table name="stock_backorder_table" position="attributes">
+        <attribute name="class" separator=" " add="trimada table-borderless"/>
+    </table>
 
 </data>
 
@@ -2985,9 +3279,7 @@ ID: `mint_system.stock.report_delivery_document.title_supplement`
 <data inherit_id="stock.report_delivery_document" priority="50">
 
   <xpath expr="//h2" position="replace">
-    <h2>
-      Delivery Slip <span t-field="o.name"/>
-    </h2>
+    <h2>Delivery Slip <span t-field="o.name"/></h2>
   </xpath>
 
 </data>
@@ -3017,6 +3309,63 @@ ID: `mint_system.stock.report_delivery_document.x_hide_on_delivery`
 ```
 Source: [snippets/stock.report_delivery_document.x_hide_on_delivery.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_delivery_document.x_hide_on_delivery.xml)
 
+## Report Label  
+### Aersolution  
+ID: `mint_system.stock.report_label.aersolution`  
+```xml
+<t t-name="stock.report_label.aersolution">
+    <t t-foreach="range(0, label_qty)" t-as="label_qty">
+
+        <div class="row">
+            <div class="col-6">
+               <img t-if="company_id.logo" t-att-src="image_data_uri(company_id.logo)" style="max-width: 180px;" alt="Logo"/>
+            </div>
+            <div class="col-6">
+                <strong><t t-esc="company_id.partner_id.name"/><br/>
+                <t t-esc="company_id.partner_id.country_id.code"/>-<t t-esc="company_id.partner_id.zip"/> <t t-esc="company_id.partner_id.city"/></strong>
+            </div>
+        </div>
+        
+        <br/>
+        
+        <p t-esc="product_id.display_name"/>
+
+        <p><span style="margin-right: 8px;">LS/SN:</span><t t-esc="lot_id.name if lot_id else picking.name"/></p>
+
+        <p t-if="lot_id.expiration_date"><span style="margin-right: 8px;">EXP:</span><span t-field="lot_id.expiration_date" t-options="{'widget': 'date'}"/></p>
+
+         <t t-set="putaway_rule_id" t-value="product_id.putaway_rule_ids[:1]"/>
+        <p><span style="margin-right: 8px;">LOC:</span><span t-esc="putaway_rule_id.location_out_id.display_name if putaway_rule_id else 'WH/Stock'"/></p>
+
+        <p style="page-break-before:always;"/>
+    </t>
+</t>
+```
+Source: [snippets/stock.report_label.aersolution.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_label.aersolution.xml)
+
+## Report Lot Label  
+### Aersolution  
+ID: `mint_system.stock.report_lot_label.aersolution`  
+```xml
+<t t-name="stock.report_lot_label.aersolution">
+    <t t-call="web.basic_layout">
+        <div class="page">
+
+            <t t-foreach="docs" t-as="lot">
+                <t t-set="label_qty" t-value="1"/>
+                <t t-set="company_id" t-value="lot.company_id"/>
+                <t t-set="lot_id" t-value="lot"/>
+                <t t-set="product_id" t-value="lot.product_id"/>
+
+                <t t-call="mint_system.stock.report_label.aersolution"/>
+            </t>
+
+        </div>
+    </t>
+</t>
+```
+Source: [snippets/stock.report_lot_label.aersolution.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_lot_label.aersolution.xml)
+
 ## Report Picking  
 ### Add Address Block  
 ID: `mint_system.stock.report_picking.add_address_block`  
@@ -3108,9 +3457,9 @@ ID: `mint_system.stock.report_picking.format_qty_available`
 <?xml version="1.0"?>
 <data inherit_id="stock.report_picking" priority="60">
 
-	<span id="qty_available" position="attributes">
-		<attribute name="t-options-widget">"integer"</attribute>
-	</span>
+    <span id="qty_available" position="attributes">
+        <attribute name="t-options-widget">"integer"</attribute>
+    </span>
 
 </data>
 ```
@@ -3469,24 +3818,24 @@ ID: `mint_system.stock.report_picking.product_description`
 <?xml version="1.0"?>
 <data inherit_id="stock.report_picking" priority="50">
 
-	<xpath expr="//td[@id='description_picking']" position="replace">
+    <xpath expr="//td[@id='description_picking']" position="replace">
 
-		<td id="description_picking">
-			<strong>
-				<span t-esc="move.product_id.type_description"/>
-			</strong>
-			<br/>
-			<t t-if="move.description_picking">
-			  <span t-esc="move.description_picking"/>
-      	<br/>
-			</t>
-			<t t-if="not move.description_picking">
-				<span t-esc="move.product_id.name"/>
-				<br/>
-			</t>
-			<span id="description_pickingout" t-field="move.product_id.description_pickingout"/>
-		</td>
-	</xpath>
+        <td id="description_picking">
+            <strong>
+                <span t-esc="move.product_id.type_description"/>
+            </strong>
+            <br/>
+            <t t-if="move.description_picking">
+              <span t-esc="move.description_picking"/>
+          <br/>
+            </t>
+            <t t-if="not move.description_picking">
+                <span t-esc="move.product_id.name"/>
+                <br/>
+            </t>
+            <span id="description_pickingout" t-field="move.product_id.description_pickingout"/>
+        </td>
+    </xpath>
 
 </data>
 ```
@@ -3498,36 +3847,36 @@ ID: `mint_system.stock.report_picking.relocate_quantity`
 <?xml version="1.0"?>
 <data inherit_id="stock.report_picking" priority="50">
 
-	<xpath expr="//th[@id='product_uom_qty']" position="replace"/>
+    <xpath expr="//th[@id='product_uom_qty']" position="replace"/>
 
-	<xpath expr="//th[@id='th_to']" position="after">
-		<th id="product_uom_qty">
-			<strong>Quantity</strong>
-		</th>
-	</xpath>
+    <xpath expr="//th[@id='th_to']" position="after">
+        <th id="product_uom_qty">
+            <strong>Quantity</strong>
+        </th>
+    </xpath>
 
   <xpath expr="//td[@id='product_uom_qty']" position="replace"/>
   
   <xpath expr="//td[@id='location_dest_id']" position="after">
-		<td id="product_uom_qty">
-		  
-			<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"/>
-			<span id="qty_available_uom_id" t-field="ml.product_id.uom_id"/>
-		</td>
-	</xpath>
+        <td id="product_uom_qty">
+          
+            <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"/>
+            <span id="qty_available_uom_id" t-field="ml.product_id.uom_id"/>
+        </td>
+    </xpath>
 
 </data>
 ```
@@ -3616,21 +3965,21 @@ ID: `mint_system.stock.report_picking.replace_barcode`
 <?xml version="1.0"?>
 <data inherit_id="stock.report_picking" priority="50">
 
-	<xpath expr="//td[@id='barcode']" position="replace">
+    <xpath expr="//td[@id='barcode']" position="replace">
 
-		<td id="barcode" class="trimada" t-if="has_barcode">
-			<t t-if="product_barcode != move.product_id.barcode">
-				<span t-if="move.product_id and move.product_id.barcode">
-					<img t-if="len(move.product_id.barcode) == 13" t-att-src="'/report/barcode/?type=%s&amp;value=%s&amp;width=%s&amp;height=%s&amp;quiet=%s' % ('EAN13', move.product_id.barcode, 290, 100, 0)" style="height:35px" alt="Barcode"/>
-					<img t-elif="len(move.product_id.barcode) == 8" t-att-src="'/report/barcode/?type=%s&amp;value=%s&amp;width=%s&amp;height=%s&amp;quiet=%s' % ('EAN8', move.product_id.barcode, 290, 100, 0)" style="height:35px" alt="Barcode"/>
-					<img t-else="" t-att-src="'/report/barcode/?type=%s&amp;value=%s&amp;width=%s&amp;height=%s&amp;quiet=%s' % ('Code128', move.product_id.barcode, 290, 100, 0)" style="height:35px" alt="Barcode"/>
+        <td id="barcode" class="trimada" t-if="has_barcode">
+            <t t-if="product_barcode != move.product_id.barcode">
+                <span t-if="move.product_id and move.product_id.barcode">
+                    <img t-if="len(move.product_id.barcode) == 13" t-att-src="'/report/barcode/?type=%s&amp;value=%s&amp;width=%s&amp;height=%s&amp;quiet=%s' % ('EAN13', move.product_id.barcode, 290, 100, 0)" style="height:35px" alt="Barcode"/>
+                    <img t-elif="len(move.product_id.barcode) == 8" t-att-src="'/report/barcode/?type=%s&amp;value=%s&amp;width=%s&amp;height=%s&amp;quiet=%s' % ('EAN8', move.product_id.barcode, 290, 100, 0)" style="height:35px" alt="Barcode"/>
+                    <img t-else="" t-att-src="'/report/barcode/?type=%s&amp;value=%s&amp;width=%s&amp;height=%s&amp;quiet=%s' % ('Code128', move.product_id.barcode, 290, 100, 0)" style="height:35px" alt="Barcode"/>
 
-				</span>
-				<t t-set="product_barcode" t-value="move.product_id.barcode"/>
-			</t>
-		</td>
+                </span>
+                <t t-set="product_barcode" t-value="move.product_id.barcode"/>
+            </t>
+        </td>
 
-	</xpath>
+    </xpath>
 </data>
 ```
 Source: [snippets/stock.report_picking.replace_barcode.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_picking.replace_barcode.xml)
@@ -3641,36 +3990,36 @@ ID: `mint_system.stock.report_picking.replace_header`
 <?xml version="1.0"?>
 <data inherit_id="stock.report_picking" priority="50">
 
-	<xpath expr="//div[@name='right_box']/.." position="replace">
+    <xpath expr="//div[@name='right_box']/.." position="replace">
 
-		<style>
-			table.trimada_header {
-				width: 100%;
-				font-family: arial;
-				font-size: 18pt;
-				font-weight: bold;
-				border:solid 1px;
-			}
-			table.trimada_header td {
-				padding-left: 10px;
-				vertical-align: middle;
-				padding: 5px;
-			}
-		</style>
+        <style>
+            table.trimada_header {
+                width: 100%;
+                font-family: arial;
+                font-size: 18pt;
+                font-weight: bold;
+                border:solid 1px;
+            }
+            table.trimada_header td {
+                padding-left: 10px;
+                vertical-align: middle;
+                padding: 5px;
+            }
+        </style>
 
-		<table class="trimada_header">
-			<tr>
-				<td>Rüstschein <span t-field="o.name"/>
-				</td>
-				<td>
-					<span>
-						<img t-att-src="'/report/barcode/?type=%s&amp;value=%s&amp;width=%s&amp;height=%s&amp;quiet=0' % ('Code128', o.name, 600, 100)" style="width:210px;height:60px; float:right;" alt="Barcode"/>
-					</span>
-				</td>
-			</tr>
-		</table>
+        <table class="trimada_header">
+            <tr>
+                <td>Rüstschein <span t-field="o.name"/>
+                </td>
+                <td>
+                    <span>
+                        <img t-att-src="'/report/barcode/?type=%s&amp;value=%s&amp;width=%s&amp;height=%s&amp;quiet=0' % ('Code128', o.name, 600, 100)" style="width:210px;height:60px; float:right;" alt="Barcode"/>
+                    </span>
+                </td>
+            </tr>
+        </table>
 
-	</xpath>
+    </xpath>
 </data>
 ```
 Source: [snippets/stock.report_picking.replace_header.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_picking.replace_header.xml)
@@ -3684,26 +4033,26 @@ ID: `mint_system.stock.report_picking.replace_order_definition`
   <xpath expr="//div[@name='div_origin']/.." position="replace">
 
     <style>
-			table.trimada_order {
-			  width: 100%;
-				font-size: 11pt;
-				font-family: arial;
-			}
-			table.trimada_order tr {
-			  border-bottom: 1px solid rgb(220,220,220);
-			}
-		 .first_col {
-			  width: 44%;
-			  padding-left: 10px;
-			  padding-top: 5px;
-			  padding-bottom: 5px;
-			}
-			.second_col {
-			  width: 56%;
-			}
-			.last_row {
-			  border-bottom: 0px !important;
-			}
+            table.trimada_order {
+              width: 100%;
+                font-size: 11pt;
+                font-family: arial;
+            }
+            table.trimada_order tr {
+              border-bottom: 1px solid rgb(220,220,220);
+            }
+         .first_col {
+              width: 44%;
+              padding-left: 10px;
+              padding-top: 5px;
+              padding-bottom: 5px;
+            }
+            .second_col {
+              width: 56%;
+            }
+            .last_row {
+              border-bottom: 0px !important;
+            }
     </style>
 
     <table class="trimada_order">
@@ -3919,25 +4268,25 @@ ID: `mint_system.stock.report_picking.set_ids`
 <?xml version="1.0"?>
 <data inherit_id="stock.report_picking" priority="60">
 
-	<xpath expr="//th[@name='th_product']" position="attributes">
-		<attribute name="id">th_product</attribute>
-	</xpath>
+    <xpath expr="//th[@name='th_product']" position="attributes">
+        <attribute name="id">th_product</attribute>
+    </xpath>
 
-	<xpath expr="//th[@name='th_product']/../th[2]" position="attributes">
-		<attribute name="id">product_uom_qty</attribute>
-	</xpath>
+    <xpath expr="//th[@name='th_product']/../th[2]" position="attributes">
+        <attribute name="id">product_uom_qty</attribute>
+    </xpath>
 
-	<xpath expr="//th[@name='th_to']" position="attributes">
-		<attribute name="id">th_to</attribute>
-	</xpath>
+    <xpath expr="//th[@name='th_to']" position="attributes">
+        <attribute name="id">th_to</attribute>
+    </xpath>
 
-	<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>
+    <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>
 ```
@@ -4156,100 +4505,100 @@ ID: `mint_system.stock.report_picking.style_trimada`
 <?xml version="1.0"?>
 <data inherit_id="stock.report_picking" priority="60">
 
-	<xpath expr="//div[hasclass('page')]" position="before">
-		<style>
-		  p {
-		    font-size: 9pt;
-				font-family: arial;
-		  }
-			table.trimada {
-			  width: 100%;
-				font-size: 9pt;
-				font-family: arial;
-				margin-top: 20px;
-			}
-			table.trimada thead tr {
-				border-top: solid 1px;
-				border-bottom: solid 1px;
-			}
-			table.trimada thead th#position {
-				width: 5mm;
-			}
-			table.trimada thead th#default_code {
-			  width: 27mm;
-			  padding-left: 10px;
-			  text-align: left;
-			}
-			table.trimada thead th#quantity {
-			  width: 25mm;
-			  text-align: right !important;
-			}
-			table.trimada thead th#product_uom_qty {
-			  width: 35mm;
-			  text-align: right;
-			}
-			table.trimada tbody td#position {
-			  text-align: right;
-			}
-			table.trimada tbody tr {
-			  vertical-align: top;
-				border-bottom: 1px solid rgb(220,220,220)
-			}
-			table.trimada tbody td#default_code {
-			  padding-left: 10px;
-			  text-align: left;
-			}
-			table.trimada tbody td span#description_pickingout {
-			  font-style: italic;
-			}
-			table.trimada tbody td#product_uom_qty {
-			  text-align: right;
-			}			
-			table.trimada tbody td span#product_uom_qty {
-			  font-weight: bold;
-			}
-			table.trimada tbody td span#product_uom_qty_done {
-			  font-weight: bold;
-			}
-			table.trimada tbody td span#qty_available {
-			  font-size: 7pt;
-			}
-			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;
-			}
-		  div.address_block {
-			  font-size: 10pt;
-				font-family: arial;
-				margin-top: 20px;
-				margin-left: 10px;
-			}
-			.subtitel {
-				font-size: 11pt;
-				font-family: arial;
-				margin-top: 10mm;
-			}
-			.note {
-				font-size: 9pt;
-				font-family: arial;
-			}
-			.mrp_note {
-				font-size: 9pt;
-				font-family: arial;
-				padding-bottom: 3mm;
-			}
-		</style>
-	</xpath>
+    <xpath expr="//div[hasclass('page')]" position="before">
+        <style>
+          p {
+            font-size: 9pt;
+                font-family: arial;
+          }
+            table.trimada {
+              width: 100%;
+                font-size: 9pt;
+                font-family: arial;
+                margin-top: 20px;
+            }
+            table.trimada thead tr {
+                border-top: solid 1px;
+                border-bottom: solid 1px;
+            }
+            table.trimada thead th#position {
+                width: 5mm;
+            }
+            table.trimada thead th#default_code {
+              width: 27mm;
+              padding-left: 10px;
+              text-align: left;
+            }
+            table.trimada thead th#quantity {
+              width: 25mm;
+              text-align: right !important;
+            }
+            table.trimada thead th#product_uom_qty {
+              width: 35mm;
+              text-align: right;
+            }
+            table.trimada tbody td#position {
+              text-align: right;
+            }
+            table.trimada tbody tr {
+              vertical-align: top;
+                border-bottom: 1px solid rgb(220,220,220)
+            }
+            table.trimada tbody td#default_code {
+              padding-left: 10px;
+              text-align: left;
+            }
+            table.trimada tbody td span#description_pickingout {
+              font-style: italic;
+            }
+            table.trimada tbody td#product_uom_qty {
+              text-align: right;
+            }            
+            table.trimada tbody td span#product_uom_qty {
+              font-weight: bold;
+            }
+            table.trimada tbody td span#product_uom_qty_done {
+              font-weight: bold;
+            }
+            table.trimada tbody td span#qty_available {
+              font-size: 7pt;
+            }
+            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;
+            }
+          div.address_block {
+              font-size: 10pt;
+                font-family: arial;
+                margin-top: 20px;
+                margin-left: 10px;
+            }
+            .subtitel {
+                font-size: 11pt;
+                font-family: arial;
+                margin-top: 10mm;
+            }
+            .note {
+                font-size: 9pt;
+                font-family: arial;
+            }
+            .mrp_note {
+                font-size: 9pt;
+                font-family: arial;
+                padding-bottom: 3mm;
+            }
+        </style>
+    </xpath>
 
-.	<xpath expr="//th[@name='th_product']/../../.." position="attributes">
-		<attribute name="class" separator=" " add="trimada table-borderless"/>
-	</xpath>
+.    <xpath expr="//th[@name='th_product']/../../.." position="attributes">
+        <attribute name="class" separator=" " add="trimada table-borderless"/>
+    </xpath>
 
 </data>
 ```
@@ -4294,6 +4643,1455 @@ ID: `mint_system.stock.report_picking.x_packaging_uom_id`
 ```
 Source: [snippets/stock.report_picking.x_packaging_uom_id.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_picking.x_packaging_uom_id.xml)
 
+## Report Picking Document  
+### Tissa  
+ID: `mint_system.stock.report_picking_document.tissa`  
+```xml
+<t t-name="report_picking_document.tissa">
+
+  <style>
+    table#info {
+        width: 100%;
+        margin-top: 60px;
+    }
+    table#info tr {
+        font-size: 72px;
+        font-weight: normal;
+    }
+    tr#info_details {
+        font-size: 18px;
+    }
+    table#info_details {
+        width: 100%;
+        font-size: 30px;
+        border-bottom: solid 1px grey;
+        margin-top: 60px;
+        margin-bottom: 60px;
+    }
+    table#info_details th {
+        font-weight: bold;
+    }
+    table#batch {
+        width: 100%;
+        font-size: 72px;
+        font-weight: bold;
+    }
+    table#batch_details {
+         width: 100%;
+         font-size: 40px;
+    }
+  </style>
+
+  <div class="page" style="font-family: Arial, Helvetica, sans-serif"/>
+
+  <tr t-foreach="doc.move_line_ids" t-as="table_line">
+
+    <div class="row">
+      <div class="col-2">
+        <img class="img-fluid" src="/web/image/9446-7fe212a9/230x115mm_1fbg_black_logo%20tissa%20textiles.jpg"/>
+      </div>
+      <div class="col-10" style="font-family: Arial, Helvetica, sans-serif; font-size: 18px">
+        <strong t-field="res_company.display_name"/>
+        <br/>
+        <span t-field="res_company.country_id.code"/>
+        <span> - </span>
+        <span t-field="res_company.zip"/>
+        <span></span>
+        <span t-field="res_company.city"/>
+      </div>
+    </div>
+
+    <table id="info">
+      <tr>
+        <td>
+          <span t-field="table_line.display_name"/>
+        </td>
+        <td style="text-align: right">
+          <img t-att-src="'/report/barcode/?type=%s&amp;value=%s&amp;width=%s&amp;height=%s&amp;quiet=0' % ('Code128', table_line.product_id.product_tmpl_id.barcode, 250, 85)" alt="Barcode"/>
+        </td>
+      </tr>
+
+      <table id="info_details">
+        <tr>
+          <th style="width:33%">Name</th>
+          <th style="width:33%">Lieferant</th>
+          <th style="width:33%">Beschreibung</th>
+        </tr>
+        <tr>
+          <td>
+            <span t-field="table_line.product_id.product_template_attribute_value_ids"/>
+          </td>
+          <td>
+            <span t-field="table_line.product_id.product_template_attribute_value_ids.product_attribute_value_id.x_studio_lieferant"/>
+          </td>
+          <td>
+            <span t-field="table_line.product_id.product_template_attribute_value_ids.product_attribute_value_id.x_studio_beschreibung"/>
+          </td>
+        </tr>
+      </table>
+
+      <table id="batch">
+        <tr>
+          <td>
+            <strong t-field="table_line.lot_id.display_name"/>
+          </td>
+          <td style="text-align: right">
+            <img t-att-src="'/report/barcode/?type=%s&amp;value=%s&amp;width=%s&amp;height=%s&amp;quiet=0' % ('Code128', table_line.lot_id.display_name, 250, 85)" alt="Barcode"/>
+          </td>
+        </tr>
+      </table>
+
+    </table>
+
+    <table id="batch_details">
+      <tr>
+        <td>
+          <span t-field="table_line.qty_done"/>
+          <span></span>
+          <span t-field="table_line.product_uom_id.display_name"/>
+          <img style="padding-left:25px" t-att-src="'/report/barcode/?type=%s&amp;value=%s&amp;width=%s&amp;height=%s&amp;quiet=0' % ('Code128', table_line.qty_done, 250, 40)" alt="Barcode"/>
+        </td>
+      </tr>
+
+      <tr>
+        <td>
+          <span t-field="table_line.lot_id.unit_on_lot"/>
+          <span> Spulen</span>
+        </td>
+      </tr>
+      <td>
+        <span>Einlagerungsdatum: </span>
+        <span t-field="table_line.create_date" t-options='{"widget": "date"}'/>
+      </td>
+
+    </table>
+
+    <p style="page-break-after: always;"/>
+
+  </tr>
+</t>
+```
+Source: [snippets/stock.report_picking_document.tissa.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_picking_document.tissa.xml)
+
+## Report Picking  
+### Add Address Block  
+ID: `mint_system.stock.report_picking.add_address_block`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="stock.report_picking" priority="50">
+
+  <xpath expr="//table[1]" position="after">
+    <div class="table address_block">
+      <div class="row">
+        <div class="col">
+          <div t-field="o.partner_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>
+    </div>
+  </xpath>
+
+</data>
+```
+Source: [snippets/stock.report_picking.add_address_block.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_picking.add_address_block.xml)
+
+### Add Delivery Note  
+ID: `mint_system.stock.report_picking.add_delivery_note`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="stock.report_picking" priority="50">
+
+    <xpath expr="/t/t/t/t/div/table[1]" position="after">
+        <p t-field="o.delivery_note"/>
+    </xpath>
+
+</data>
+
+```
+Source: [snippets/stock.report_picking.add_delivery_note.xml](https://github.com/Mint-System/Odoo-Build/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-set="production" t-value="o.group_id.mrp_production_ids"/>
+    <t t-foreach="production" t-as="production_line">
+      <t t-if="production_line.x_note != '&lt;br&gt;'">
+        <p class="oe_no_empty" t-field="production_line.x_note"/>
+      </t>
+    </t>
+  </xpath>
+
+</data>
+```
+Source: [snippets/stock.report_picking.add_mrp_production_x_note.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_picking.add_mrp_production_x_note.xml)
+
+### Barcode Label  
+ID: `mint_system.stock.report_picking.barcode_label`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="stock.report_picking" priority="50">
+
+  <xpath expr="//div/div/div/img" position="before">
+    <strong>Rüstschein Code:</strong>
+  </xpath>
+
+</data>
+
+```
+Source: [snippets/stock.report_picking.barcode_label.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_picking.barcode_label.xml)
+
+### Format Delivery Date  
+ID: `mint_system.stock.report_picking.format_delivery_date`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="stock.report_picking" priority="50">
+
+  <xpath expr="//p[@t-field='o.scheduled_date']" position="attributes">
+    <attribute name="t-options-widget">"date"</attribute>
+  </xpath>
+
+</data>
+
+```
+Source: [snippets/stock.report_picking.format_delivery_date.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_picking.format_delivery_date.xml)
+
+### Format Qty Available  
+ID: `mint_system.stock.report_picking.format_qty_available`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="stock.report_picking" priority="60">
+
+    <span id="qty_available" position="attributes">
+        <attribute name="t-options-widget">"integer"</attribute>
+    </span>
+
+</data>
+```
+Source: [snippets/stock.report_picking.format_qty_available.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_picking.format_qty_available.xml)
+
+### Format Qty  
+ID: `mint_system.stock.report_picking.format_qty`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="stock.report_picking" priority="50">
+
+  <xpath expr="//span[@id='product_uom_qty']" position="replace">
+    <t t-if="ml.product_uom_id.id == 1">
+      <span id="product_uom_qty" t-field="ml.product_uom_qty" t-options="{'widget': 'integer'}"/>
+    </t>
+    <t t-else="">
+      <span id="product_uom_qty" t-field="ml.product_uom_qty"/>
+    </t>
+  </xpath>
+
+  <xpath expr="//span[@id='qty_available']" position="replace">
+    <t t-if="ml.product_uom_id.id == 1">
+      <span id="qty_available" t-field="ml.product_id.qty_available" t-options="{'widget': 'integer'}"/>
+    </t>
+    <t t-else="">
+      <span id="qty_available" t-field="ml.product_id.qty_available"/>
+    </t>
+  </xpath>
+
+</data>
+```
+Source: [snippets/stock.report_picking.format_qty.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_picking.format_qty.xml)
+
+### Format Title  
+ID: `mint_system.stock.report_picking.format_title`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="stock.report_picking" priority="50">
+
+  <xpath expr="//h1[@t-field='o.name']" position="replace">
+    <h1 t-esc="'Rüstschein ' + o.name.replace('WH/OUT/', '')"/>
+  </xpath>
+  
+</data>
+
+```
+Source: [snippets/stock.report_picking.format_title.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_picking.format_title.xml)
+
+### Get Position  
+ID: `mint_system.stock.report_picking.get_position`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="stock.report_picking" priority="50">
+
+  <!-- <xpath expr="//th[@name='th_product']" position="before">
+    <t t-if="o.sale_id or o.purchase_id"> -->
+  <xpath expr="//th[@id='default_code']" position="before">
+      <th id="position">
+        <strong>Pos</strong>
+      </th>
+    <!-- </t> -->
+  </xpath>
+  
+ <xpath expr="//td[@id='default_code']" position="before">
+  <!-- <xpath expr="//span[@t-field='ml.product_id.description_picking']/.." position="before"> -->
+    <!-- <t t-if="o.sale_id or o.purchase_id"> -->
+      <td id="position">
+        <span t-esc="move.position"/>
+      </td>
+    <!-- </t> -->
+  </xpath>
+
+</data>
+
+```
+Source: [snippets/stock.report_picking.get_position.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_picking.get_position.xml)
+
+### Group By Date  
+ID: `mint_system.stock.report_picking.group_by_date`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="stock.report_picking" priority="50">
+
+  <xpath expr="//div[hasclass('page')]" position="before">
+    <!-- Get all lines without duplicates -->
+    <t t-set="dates" t-value="list(set([date.date() for date in o.move_ids_without_package.mapped('date')]))" />
+    <!-- Store if has dates -->
+    <t t-set="has_dates" t-value="len(dates) > 0" />
+    <!-- Store if has multiple dates -->
+    <t t-set="has_multiple_dates" t-value="len(dates) > 1" />
+  </xpath>
+
+  <!-- Replace loop -->
+  <xpath expr="//t[@t-foreach='o.move_ids_without_package']" position="replace">
+
+    <!--<p t-esc="dates" />-->
+    <!--<p t-esc="has_dates" />-->
+    <!--<p t-esc="has_multiple_dates" />-->
+
+    <!-- Loop each group item -->
+    <t t-foreach="dates" t-as="date">
+
+      <!-- Insert group item -->
+      <tr t-if="has_dates and date" class="o_line_note">
+        <td colspan="99" style="padding-top: 1rem;">
+          <strong>
+            <span>Lieferdatum: </span>
+            <span t-esc="date" t-options="{'widget': 'date'}" />
+          </strong>
+        </td>
+      </tr>
+
+      <!-- Show only move that are assigned to the group item -->
+      <t t-set="move_ids" t-value="o.move_ids_without_package.filtered(lambda m: m.date.strftime('%Y-%m-%d') == date.strftime('%Y-%m-%d')).sorted(lambda m: m.date)" />
+      <t t-foreach="move_ids" t-as="move">
+        <t t-foreach="move.move_line_ids.sorted(key=lambda ml: ml.location_id.id)" t-as="ml">
+
+          <tr>
+            <td id="description_picking">
+              <span t-field="ml.product_id.display_name" />
+              <br />
+              <span t-field="ml.product_id.description_picking" />
+            </td>
+            <td id="product_uom_qty">
+              <span t-if="o.state != 'done'" t-field="ml.product_uom_qty" />
+              <span t-if="o.state == 'done'" t-field="ml.qty_done" />
+              <span t-field="ml.product_uom_id" groups="uom.group_uom" />
+
+            </td>
+            <td  id="location_id" t-if="o.picking_type_id.code != 'incoming'" groups="stock.group_stock_multi_locations">
+              <span t-esc="ml.location_id.display_name" />
+              <t t-if="ml.package_id">
+                <span t-field="ml.package_id" />
+              </t>
+            </td>
+            <td  id="location_dest_id" t-if="o.picking_type_id.code != 'outgoing'" groups="stock.group_stock_multi_locations">
+              <div>
+                <span t-field="ml.location_dest_id" />
+                <t t-if="ml.result_package_id">
+                  <span t-field="ml.result_package_id" />
+                </t>
+              </div>
+            </td>
+            <td id="has_serial_number" class=" text-center h6" t-if="has_serial_number">
+              <img t-if="has_serial_number and (ml.lot_id or ml.lot_name)" t-att-src="'/report/barcode/?type=%s&amp;value=%s&amp;width=%s&amp;height=%s&amp;humanreadable=1' % ('Code128', ml.lot_id.name or ml.lot_name, 400, 100)" style="width:100%;height:35px;" alt="Barcode" />
+
+            </td>
+            <td id="has_barcode" class="text-center" t-if="has_barcode">
+              <t t-if="product_barcode != move.product_id.barcode">
+                <span t-if="move.product_id and move.product_id.barcode">
+                  <img t-if="len(move.product_id.barcode) == 13" t-att-src="'/report/barcode/?type=%s&amp;value=%s&amp;width=%s&amp;height=%s&amp;quiet=%s' % ('EAN13', move.product_id.barcode, 400, 100, 0)" style="height:35px" alt="Barcode" />
+                  <img t-elif="len(move.product_id.barcode) == 8" t-att-src="'/report/barcode/?type=%s&amp;value=%s&amp;width=%s&amp;height=%s&amp;quiet=%s' % ('EAN8', move.product_id.barcode, 400, 100, 0)" style="height:35px" alt="Barcode" />
+                  <img t-else="" t-att-src="'/report/barcode/?type=%s&amp;value=%s&amp;width=%s&amp;height=%s&amp;quiet=%s' % ('Code128', move.product_id.barcode, 400, 100, 0)" style="height:35px" alt="Barcode" />
+
+                </span>
+                <t t-set="product_barcode" t-value="move.product_id.barcode" />
+              </t>
+            </td>
+          </tr>
+
+        </t>
+      </t>
+    </t>
+
+  </xpath>
+
+</data>
+```
+Source: [snippets/stock.report_picking.group_by_date.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_picking.group_by_date.xml)
+
+### Header Box  
+ID: `mint_system.stock.report_picking.header_box`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="stock.report_picking" priority="50">
+
+  <xpath expr="//h1" position="replace">
+    <div class="header_box">
+      <div class="row align-items-center">
+        <div class="col">
+          <h1 class="trimada">Rüstschein <span t-field="o.name"/>
+          </h1>
+        </div>
+        <div class="col">
+          <img t-att-src="'/report/barcode/?type=%s&amp;value=%s&amp;width=%s&amp;height=%s&amp;quiet=0' % ('Code128', o.name, 600, 100)" style="width:210px;height:60px; float:right;" alt="Barcode"/>
+        </div>
+      </div>
+    </div>
+  </xpath>
+
+</data>
+```
+Source: [snippets/stock.report_picking.header_box.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_picking.header_box.xml)
+
+### Hide Address  
+ID: `mint_system.stock.report_picking.hide_address`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="stock.report_picking" priority="50">
+
+    <xpath expr="//div[@name='div_outgoing_address']/.." position="replace"/>
+
+</data>
+```
+Source: [snippets/stock.report_picking.hide_address.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_picking.hide_address.xml)
+
+### Hide Location Dest  
+ID: `mint_system.stock.report_picking.hide_location_dest`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="stock.report_picking" priority="50">
+
+  <!-- Hide destination location column for outgoing deliveries of operation type Pick Components -->
+  <xpath expr="//th[@name='th_to']" position="replace">
+    <th name="th_to" t-if="o.picking_type_id.code != 'outgoing' and o.picking_type_id.id != 12" groups="stock.group_stock_multi_locations">
+      <strong>To</strong>
+    </th>
+  </xpath>
+
+  <xpath expr="//td[@id='location_dest_id']" position="replace">
+  attribute name="t-if"
+    <td t-if="o.picking_type_id.code != 'outgoing' and o.picking_type_id.id != 12" groups="stock.group_stock_multi_locations">
+      <div>
+        <span t-field="ml.location_dest_id"/>
+        <t t-if="ml.result_package_id">
+          <span t-field="ml.result_package_id"/>
+        </t>
+      </div>
+    </td>
+  </xpath>
+
+</data>
+```
+Source: [snippets/stock.report_picking.hide_location_dest.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_picking.hide_location_dest.xml)
+
+### Hide Name  
+ID: `mint_system.stock.report_picking.hide_name`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="stock.report_picking" priority="50">
+
+    <xpath expr="//h1[@t-field='o.name']" position="replace"/>
+    
+</data>
+```
+Source: [snippets/stock.report_picking.hide_name.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_picking.hide_name.xml)
+
+### Margin Barcode  
+ID: `mint_system.stock.report_picking.margin_barcode`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="stock.report_picking" priority="50">
+
+  <xpath expr="//div/div/div/img" position="attributes">
+    <attribute name="style" separator=";" add="margin-bottom: 1rem"/>
+  </xpath>
+
+</data>
+
+```
+Source: [snippets/stock.report_picking.margin_barcode.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_picking.margin_barcode.xml)
+
+### Margin Before Table  
+ID: `mint_system.stock.report_picking.margin_before_table`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="stock.report_picking" priority="60">
+
+  <xpath expr="//table[1]" position="attributes">
+    <attribute name="style" separator=";" add="margin-top: 1rem"/>
+  </xpath>
+
+</data>
+
+```
+Source: [snippets/stock.report_picking.margin_before_table.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_picking.margin_before_table.xml)
+
+### Modify No Reserved Product  
+ID: `mint_system.stock.report_picking.modify_no_reserved_product`  
+```xml
+<?xml version="1.0"?>
+<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 and x.state!='done')</attribute>
+  </xpath>
+  
+</data>
+```
+Source: [snippets/stock.report_picking.modify_no_reserved_product.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_picking.modify_no_reserved_product.xml)
+
+### Partner Ref  
+ID: `mint_system.stock.report_picking.partner_ref`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="stock.report_picking" priority="50">
+
+  <xpath expr="//div[@name='div_incoming_address']/div[1]" position="before">
+    <div t-if="o.partner_id.ref">
+      <span><strong>Kundennummer: </strong></span>
+      <span t-field="o.partner_id.ref"/>
+    </div>
+  </xpath>
+
+</data>
+
+```
+Source: [snippets/stock.report_picking.partner_ref.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_picking.partner_ref.xml)
+
+### Pos In Table  
+ID: `mint_system.stock.report_picking.pos_in_table`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="stock.report_picking" priority="60">
+
+  <xpath expr="//table[1]/thead/tr/th[1]" position="before">
+    <th>
+      <strong>Pos</strong>
+    </th>
+  </xpath>
+
+  <xpath expr="//t[@t-foreach='o.move_ids_without_package']" position="before">
+    <span t-set="index" t-value="1"/>
+  </xpath>
+
+  <xpath expr="//table[1]/tbody/t//tr/td[1]" position="before">
+    <td>
+      <span t-esc="index"/>
+      <t t-set="index" t-value="index+1"/>
+    </td>
+  </xpath>
+
+</data>
+
+```
+Source: [snippets/stock.report_picking.pos_in_table.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_picking.pos_in_table.xml)
+
+### Pricelist Below Address  
+ID: `mint_system.stock.report_picking.pricelist_below_address`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="stock.report_picking" priority="50">
+
+  <xpath expr="//div[@name='partner_header']/p" position="after">
+    <span t-field="o.sale_id.pricelist_id.display_name"/>
+  </xpath>
+
+</data>
+
+```
+Source: [snippets/stock.report_picking.pricelist_below_address.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_picking.pricelist_below_address.xml)
+
+### Product Description  
+ID: `mint_system.stock.report_picking.product_description`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="stock.report_picking" priority="50">
+
+    <xpath expr="//td[@id='description_picking']" position="replace">
+
+        <td id="description_picking">
+            <strong>
+                <span t-esc="move.product_id.type_description"/>
+            </strong>
+            <br/>
+            <t t-if="move.description_picking">
+              <span t-esc="move.description_picking"/>
+          <br/>
+            </t>
+            <t t-if="not move.description_picking">
+                <span t-esc="move.product_id.name"/>
+                <br/>
+            </t>
+            <span id="description_pickingout" t-field="move.product_id.description_pickingout"/>
+        </td>
+    </xpath>
+
+</data>
+```
+Source: [snippets/stock.report_picking.product_description.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_picking.product_description.xml)
+
+### Relocate Quantity  
+ID: `mint_system.stock.report_picking.relocate_quantity`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="stock.report_picking" priority="50">
+
+    <xpath expr="//th[@id='product_uom_qty']" position="replace"/>
+
+    <xpath expr="//th[@id='th_to']" position="after">
+        <th id="product_uom_qty">
+            <strong>Quantity</strong>
+        </th>
+    </xpath>
+
+  <xpath expr="//td[@id='product_uom_qty']" position="replace"/>
+  
+  <xpath expr="//td[@id='location_dest_id']" position="after">
+        <td id="product_uom_qty">
+          
+            <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"/>
+            <span id="qty_available_uom_id" t-field="ml.product_id.uom_id"/>
+        </td>
+    </xpath>
+
+</data>
+```
+Source: [snippets/stock.report_picking.relocate_quantity.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_picking.relocate_quantity.xml)
+
+### Remove From And To  
+ID: `mint_system.stock.report_picking.remove_from_and_to`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="stock.report_picking" priority="50">
+
+  <xpath expr="//th[@name='th_from']" position="replace">
+  </xpath>
+  
+  <xpath expr="//th[@name='th_to']" position="replace">
+  </xpath>
+
+  <xpath expr="//tbody/t//tr/td[3]" position="replace">
+  </xpath>
+
+</data>
+
+```
+Source: [snippets/stock.report_picking.remove_from_and_to.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_picking.remove_from_and_to.xml)
+
+### Remove Reservation Notice  
+ID: `mint_system.stock.report_picking.remove_reservation_notice`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="stock.report_picking" priority="50">
+
+  <xpath expr="//div[hasclass('page')]/p[1]" position="replace"/>
+
+</data>
+
+```
+Source: [snippets/stock.report_picking.remove_reservation_notice.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_picking.remove_reservation_notice.xml)
+
+### Remove Serial Number  
+ID: `mint_system.stock.report_picking.remove_serial_number`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="stock.report_picking" priority="50">
+
+  <xpath expr="//th[@t-if='has_serial_number']" position="replace">
+  </xpath>
+
+  <xpath expr="//td[@t-if='has_serial_number']" position="replace">
+  </xpath>
+  
+</data>
+
+```
+Source: [snippets/stock.report_picking.remove_serial_number.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_picking.remove_serial_number.xml)
+
+### Remove To  
+ID: `mint_system.stock.report_picking.remove_to`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="stock.report_picking" priority="50">
+
+  <xpath expr="//th[@name='th_to']" position="replace">
+    <th name="th_to" t-if="o.picking_type_id.code != 'outgoing' and o.picking_type_id.id != 12" groups="stock.group_stock_multi_locations">
+      <strong>To</strong>
+    </th>
+  </xpath>
+
+  <xpath expr="//td[@id='location_dest_id']" position="replace">
+    <td t-if="o.picking_type_id.code != 'outgoing' and o.picking_type_id.id != 12" groups="stock.group_stock_multi_locations">
+      <div>
+        <span t-field="ml.location_dest_id"/>
+        <t t-if="ml.result_package_id">
+          <span t-field="ml.result_package_id"/>
+        </t>
+      </div>
+    </td>
+  </xpath>
+
+</data>
+```
+Source: [snippets/stock.report_picking.remove_to.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_picking.remove_to.xml)
+
+### Replace Barcode  
+ID: `mint_system.stock.report_picking.replace_barcode`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="stock.report_picking" priority="50">
+
+    <xpath expr="//td[@id='barcode']" position="replace">
+
+        <td id="barcode" class="trimada" t-if="has_barcode">
+            <t t-if="product_barcode != move.product_id.barcode">
+                <span t-if="move.product_id and move.product_id.barcode">
+                    <img t-if="len(move.product_id.barcode) == 13" t-att-src="'/report/barcode/?type=%s&amp;value=%s&amp;width=%s&amp;height=%s&amp;quiet=%s' % ('EAN13', move.product_id.barcode, 290, 100, 0)" style="height:35px" alt="Barcode"/>
+                    <img t-elif="len(move.product_id.barcode) == 8" t-att-src="'/report/barcode/?type=%s&amp;value=%s&amp;width=%s&amp;height=%s&amp;quiet=%s' % ('EAN8', move.product_id.barcode, 290, 100, 0)" style="height:35px" alt="Barcode"/>
+                    <img t-else="" t-att-src="'/report/barcode/?type=%s&amp;value=%s&amp;width=%s&amp;height=%s&amp;quiet=%s' % ('Code128', move.product_id.barcode, 290, 100, 0)" style="height:35px" alt="Barcode"/>
+
+                </span>
+                <t t-set="product_barcode" t-value="move.product_id.barcode"/>
+            </t>
+        </td>
+
+    </xpath>
+</data>
+```
+Source: [snippets/stock.report_picking.replace_barcode.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_picking.replace_barcode.xml)
+
+### Replace Header  
+ID: `mint_system.stock.report_picking.replace_header`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="stock.report_picking" priority="50">
+
+    <xpath expr="//div[@name='right_box']/.." position="replace">
+
+        <style>
+            table.trimada_header {
+                width: 100%;
+                font-family: arial;
+                font-size: 18pt;
+                font-weight: bold;
+                border:solid 1px;
+            }
+            table.trimada_header td {
+                padding-left: 10px;
+                vertical-align: middle;
+                padding: 5px;
+            }
+        </style>
+
+        <table class="trimada_header">
+            <tr>
+                <td>Rüstschein <span t-field="o.name"/>
+                </td>
+                <td>
+                    <span>
+                        <img t-att-src="'/report/barcode/?type=%s&amp;value=%s&amp;width=%s&amp;height=%s&amp;quiet=0' % ('Code128', o.name, 600, 100)" style="width:210px;height:60px; float:right;" alt="Barcode"/>
+                    </span>
+                </td>
+            </tr>
+        </table>
+
+    </xpath>
+</data>
+```
+Source: [snippets/stock.report_picking.replace_header.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_picking.replace_header.xml)
+
+### Replace Order Definition  
+ID: `mint_system.stock.report_picking.replace_order_definition`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="stock.report_picking" priority="50">
+
+  <xpath expr="//div[@name='div_origin']/.." position="replace">
+
+    <style>
+            table.trimada_order {
+              width: 100%;
+                font-size: 11pt;
+                font-family: arial;
+            }
+            table.trimada_order tr {
+              border-bottom: 1px solid rgb(220,220,220);
+            }
+         .first_col {
+              width: 44%;
+              padding-left: 10px;
+              padding-top: 5px;
+              padding-bottom: 5px;
+            }
+            .second_col {
+              width: 56%;
+            }
+            .last_row {
+              border-bottom: 0px !important;
+            }
+    </style>
+
+    <table class="trimada_order">
+      <tr>
+        <t t-if="o.picking_type_id.id == 12">
+          <td class="first_col">
+            <strong>
+              Fertigungsauftrag
+              <span t-field="o.origin" />
+            </strong>
+          </td>
+          <td class="second_col">
+            <strong>
+              Produkt
+              <span />
+            </strong>
+            <span t-field="o.group_id.mrp_production_ids.product_id" />
+          </td>
+        </t>
+        <t t-if="o.picking_type_id.id != 12">
+          <td class="first_col">
+            <strong>
+              Bestellung
+              <span t-field="o.origin" />
+            </strong>
+          </td>
+          <td></td>
+        </t>
+      </tr>
+      <tr>
+        <td class="first_col">
+          Status:
+          <span t-field="o.state" />
+        </td>
+        <td class="second_col">
+          Datum:
+          <span t-field="o.scheduled_date" t-options='{"widget": "date"}'></span>
+        </td>
+      </tr>
+      <tr class="last_row">
+        <td class="first_col">
+          Typ:
+          <span t-field="o.picking_type_id.code" />
+        </td>
+        <t t-if="o.carrier_id">
+          <td>
+            Auslieferungsmethode:
+            <span t-field="o.carrier_id" />
+          </td>
+        </t>
+      </tr>
+    </table>
+
+  </xpath>
+</data>
+```
+Source: [snippets/stock.report_picking.replace_order_definition.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_picking.replace_order_definition.xml)
+
+### Replace Table  
+ID: `mint_system.stock.report_picking.replace_table`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="stock.report_picking" priority="50">
+
+<xpath expr="//table[@t-if='o.move_line_ids and o.move_ids_without_package']" position="replace">
+  
+<table style="width:100%; font-family: arial; font-size: 9pt; margin-top: 20px" t-if="o.move_line_ids and o.move_ids_without_package">
+  <t t-set="has_barcode" t-value="any(move_line.product_id and move_line.product_id.sudo().barcode or move_line.package_id for move_line in o.move_line_ids)"/>
+  <t t-set="has_serial_number" t-value="any(move_line.lot_id or move_line.lot_name for move_line in o.move_line_ids)" groups="stock.group_production_lot"/>
+
+    <tr style="border-bottom: 1px solid rgb(220,220,220);">
+        <th name="th_product" style="padding-left: 9px; padding-bottom: 10px; width:12%;">
+            <strong>Art. Nr.</strong>
+        </th>
+        <th style="width:40%">
+            <strong>Bezeichnung / Typenbezeichnung</strong>
+        </th>
+        <th style="width:12%" name="th_from" t-if="o.picking_type_id.code != 'incoming'" align="left" groups="stock.group_stock_multi_locations">
+            <strong>Von</strong>
+        </th>
+        <th style="width:12%" name="th_to" t-if="o.picking_type_id.code != 'outgoing'" groups="stock.group_stock_multi_locations">
+            <strong>Nach</strong>
+        </th>
+        <th style="width:18%; text-align:right; padding-right:20px;">
+            <strong>Menge</strong>
+        </th>
+        <th style="width:3%; text-align:right; padding-right:10px;">
+            <strong>Lager</strong>
+        </th>
+        <th name="th_serial_number" class="text-center" t-if="has_serial_number">
+           <strong>Lot/Serial Number</strong>
+        </th>
+        <th style="width:3%" name="th_barcode" class="text-center" t-if="has_barcode">
+            <strong></strong>
+        </th>
+    </tr>
+                            
+      <t t-foreach="o.move_ids_without_package" t-as="move">
+          <!-- In case you come across duplicated lines, ask NIM or LAP -->
+          <t t-foreach="move.move_line_ids.sorted(key=lambda ml: ml.location_id.id)" t-as="ml">
+            
+              <tr style="border-bottom: 1px solid rgb(220,220,220);">
+                  <td style="padding-left: 10px; padding-top:5px; vertical-align:top;">
+                      <span t-field="ml.product_id.default_code"/><br/>
+                  </td>
+                  <td style="padding-top:5px; vertical-align:top; padding-right: 10px">
+                      <span t-field="ml.product_id.name"/><br/>
+                      <span t-field="ml.product_id.type_description"/>
+                  </td>
+                  
+                  <td style="padding-top:5px; vertical-align:top;" t-if="o.picking_type_id.code != 'incoming'" groups="stock.group_stock_multi_locations">
+                      <span t-esc="ml.location_id.display_name"/>
+                          <t t-if="ml.package_id">
+                              <span t-field="ml.package_id"/>
+                          </t>
+                  </td>
+                  <td style="padding-top:5px; vertical-align:top;" t-if="o.picking_type_id.code != 'outgoing'" groups="stock.group_stock_multi_locations">
+                      <div>
+                          <span t-field="ml.location_dest_id"/>
+                          <t t-if="ml.result_package_id">
+                              <span t-field="ml.result_package_id"/>
+                          </t>
+                      </div>
+                  </td>
+                  <td style="padding-top:5px; vertical-align:top; text-align:right; padding-right:20px; font-weight: bold">
+                      <span t-if="o.state != 'done'" t-field="ml.product_uom_qty"/>
+                      <span t-if="o.state == 'done'" t-field="ml.qty_done"/>
+                      <span t-field="ml.product_uom_id" groups="uom.group_uom"/>
+
+                  </td>
+                  
+                  <td style="padding-top:5px; padding-right: 10px; vertical-align:top; text-align:right">
+                        <span t-field="ml.product_id.qty_available"/>
+                  </td>
+                  
+                  <td class=" text-center h6" t-if="has_serial_number">
+                      <img t-if="has_serial_number and (ml.lot_id or ml.lot_name)" t-att-src="'/report/barcode/?type=%s&amp;value=%s&amp;width=%s&amp;height=%s&amp;humanreadable=1' % ('Code128', ml.lot_id.name or ml.lot_name, 400, 100)" style="width:100%;height:35px;" alt="Barcode"/>
+
+                  </td>
+                  <td style="padding-top: 5px; padding-bottom: 5px; vertical-align:middle;" class="text-center" t-if="has_barcode">
+                      <t t-if="product_barcode != move.product_id.barcode">
+                          <span t-if="move.product_id and move.product_id.barcode">
+                              <img t-if="len(move.product_id.barcode) == 13" t-att-src="'/report/barcode/?type=%s&amp;value=%s&amp;width=%s&amp;height=%s&amp;quiet=%s' % ('EAN13', move.product_id.barcode, 290, 100, 0)" style="height:35px" alt="Barcode"/>
+                              <img t-elif="len(move.product_id.barcode) == 8" t-att-src="'/report/barcode/?type=%s&amp;value=%s&amp;width=%s&amp;height=%s&amp;quiet=%s' % ('EAN8', move.product_id.barcode, 290, 100, 0)" style="height:35px" alt="Barcode"/>
+                              <img t-else="" t-att-src="'/report/barcode/?type=%s&amp;value=%s&amp;width=%s&amp;height=%s&amp;quiet=%s' % ('Code128', move.product_id.barcode, 290, 100, 0)" style="height:35px" alt="Barcode"/>
+
+                          </span>
+                          <t t-set="product_barcode" t-value="move.product_id.barcode"/>
+                      </t>
+                  </td>
+              </tr>
+          </t>
+      </t>
+       
+  </table>                     
+  
+  </xpath>
+  </data>
+```
+Source: [snippets/stock.report_picking.replace_table.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_picking.replace_table.xml)
+
+### Round Qty2  
+ID: `mint_system.stock.report_picking.round_qty2`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="stock.report_picking" priority="50">
+
+  <xpath expr="//span[@id='product_uom_qty']" position="replace">
+    <!-- 34.00 -> 34 -->
+    <!-- 34.50 -> 34.5 -->
+    <!-- 34.75 -> 34.75 -->
+    <span id="product_uom_qty" t-esc="'%g' % ml.product_uom_qty" />
+  </xpath>
+
+  <xpath expr="//span[@id='qty_available']" position="replace">
+    <!-- 34.00 -> 34 -->
+    <!-- 34.50 -> 34.5 -->
+    <!-- 34.75 -> 34.75 -->
+    <span id="qty_available" t-esc="'%g' % ml.product_id.qty_available" />
+  </xpath>
+
+</data>
+```
+Source: [snippets/stock.report_picking.round_qty2.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_picking.round_qty2.xml)
+
+### Round Qty  
+ID: `mint_system.stock.report_picking.round_qty`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="stock.report_picking" priority="50">
+
+  <xpath expr="//span[@id='product_uom_qty']" position="replace">
+    <!-- 34.00 -> 34 -->
+    <!-- 34.50 -> 34.50 -->
+    <!-- 34.75 -> 34.75 -->
+    <span id="product_uom_qty" t-esc="'%g' % ml.product_uom_qty if int(ml.product_uom_qty) == ml.product_uom_qty else '%.2f' % ml.product_uom_qty" />
+  </xpath>
+
+  <xpath expr="//span[@id='qty_available']" position="replace">
+    <!-- 34.00 -> 34 -->
+    <!-- 34.50 -> 34.50 -->
+    <!-- 34.75 -> 34.75 -->
+    <span id="qty_available" t-esc="'%g' % ml.product_id.qty_available if int(ml.product_id.qty_available) == ml.product_id.qty_available else '%.2f' % ml.product_id.qty_available" />
+  </xpath>
+
+</data>
+```
+Source: [snippets/stock.report_picking.round_qty.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_picking.round_qty.xml)
+
+### Set Ids  
+ID: `mint_system.stock.report_picking.set_ids`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="stock.report_picking" priority="60">
+
+    <xpath expr="//th[@name='th_product']" position="attributes">
+        <attribute name="id">th_product</attribute>
+    </xpath>
+
+    <xpath expr="//th[@name='th_product']/../th[2]" position="attributes">
+        <attribute name="id">product_uom_qty</attribute>
+    </xpath>
+
+    <xpath expr="//th[@name='th_to']" position="attributes">
+        <attribute name="id">th_to</attribute>
+    </xpath>
+
+    <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>
+```
+Source: [snippets/stock.report_picking.set_ids.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_picking.set_ids.xml)
+
+### Show Default Code  
+ID: `mint_system.stock.report_picking.show_default_code`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="stock.report_picking" priority="50">
+
+  <xpath expr="//th[@id='th_product']" position="before">
+    <th id="default_code">
+      <strong >Part No.</strong>
+    </th>
+  </xpath>
+
+  <xpath expr="//td[@id='description_picking']" position="before">
+    <td id="default_code">
+      <span t-field="ml.product_id.default_code"/>
+    </td>
+  </xpath>
+
+</data>
+```
+Source: [snippets/stock.report_picking.show_default_code.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_picking.show_default_code.xml)
+
+### Show Full Address  
+ID: `mint_system.stock.report_picking.show_full_address`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="stock.report_picking" priority="50">
+
+  <xpath expr="//div[@name='partner_header']/div" position="attributes">
+    <attribute name="t-options-fields">['name', 'phone', 'address']</attribute>
+  </xpath>
+
+</data>
+
+```
+Source: [snippets/stock.report_picking.show_full_address.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_picking.show_full_address.xml)
+
+### Show Lot  
+ID: `mint_system.stock.report_picking.show_lot`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="stock.report_picking" priority="50">
+
+  <xpath expr="//th[@name='th_product']/../th[4]" position="after">
+    <th name="th_lot">
+      <strong>Los</strong>
+    </th>
+  </xpath>
+
+  <xpath expr="//span[@t-field='move.product_uom_qty']/.." position="after">
+    <td>
+      <span t-if="move.lot_ids" t-esc="', '.join(move.lot_ids.mapped('display_name'))"/>
+    </td>
+  </xpath>
+
+</data>
+
+```
+Source: [snippets/stock.report_picking.show_lot.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_picking.show_lot.xml)
+
+### Show Move Not Lines  
+ID: `mint_system.stock.report_picking.show_move_not_lines`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="stock.report_picking" priority="40">
+
+    <xpath expr="//table[@t-if='o.move_line_ids and o.move_ids_without_package']" position="attributes">
+        <attribute name="t-if">o.move_ids_without_package</attribute>
+    </xpath>
+
+    <xpath expr="//tbody/t/t" position="replace">
+        <tr>
+            <td>
+                <span t-field="move.product_id.display_name" />
+                <br />
+                <span t-field="move.product_id.description_picking" />
+            </td>
+            <td>
+                <span t-field="move.product_uom_qty" />
+                <span t-if="not move.product_packaging.x_packaging_uom_id" t-field="move.product_uom" groups="uom.group_uom" />
+                <span t-if="move.product_packaging.x_packaging_uom_id" t-field="move.product_packaging.x_packaging_uom_id" groups="uom.group_uom" />
+            </td>
+            <td t-if="o.picking_type_id.code != 'incoming'" groups="stock.group_stock_multi_locations">
+                <span t-esc="move.location_id.display_name" />
+            </td>
+            <td t-if="o.picking_type_id.code != 'outgoing'" groups="stock.group_stock_multi_locations">
+                <div>
+                    <span t-field="move.location_dest_id" />
+                </div>
+            </td>
+            <td class=" text-center h6" t-if="has_serial_number"></td>
+            <td class="text-center" t-if="has_barcode">
+                <t t-if="product_barcode != move.product_id.barcode">
+                    <span t-if="move.product_id and move.product_id.barcode">
+                        <img t-if="len(move.product_id.barcode) == 13" t-att-src="'/report/barcode/?type=%s&amp;value=%s&amp;width=%s&amp;height=%s&amp;quiet=%s' % ('EAN13', move.product_id.barcode, 400, 100, 0)" style="height:35px" alt="Barcode" />
+                        <img t-elif="len(move.product_id.barcode) == 8" t-att-src="'/report/barcode/?type=%s&amp;value=%s&amp;width=%s&amp;height=%s&amp;quiet=%s' % ('EAN8', move.product_id.barcode, 400, 100, 0)" style="height:35px" alt="Barcode" />
+                        <img t-else="" t-att-src="'/report/barcode/?type=%s&amp;value=%s&amp;width=%s&amp;height=%s&amp;quiet=%s' % ('Code128', move.product_id.barcode, 400, 100, 0)" style="height:35px" alt="Barcode" />
+
+                    </span>
+                    <t t-set="product_barcode" t-value="move.product_id.barcode" />
+                </t>
+            </td>
+        </tr>
+    </xpath>
+
+</data>
+```
+Source: [snippets/stock.report_picking.show_move_not_lines.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_picking.show_move_not_lines.xml)
+
+### Show Move Qty  
+ID: `mint_system.stock.report_picking.show_move_qty`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="stock.report_picking" priority="50">
+
+  <xpath expr="//span[@t-field='ml.product_uom_qty']" position="replace">
+    <span t-if="o.state != 'done'" t-field="move.product_uom_qty"/>
+  </xpath>
+
+</data>
+
+```
+Source: [snippets/stock.report_picking.show_move_qty.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_picking.show_move_qty.xml)
+
+### Show Order Date  
+ID: `mint_system.stock.report_picking.show_order_date`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="stock.report_picking" priority="50">
+
+  <xpath expr="//div[@name='div_origin']" position="after">
+    <div t-if="o.sale_id" class="col-auto" name="div_date_order">
+      <strong>Bestelldatum:</strong>
+      <p t-esc="o.sale_id.date_order" t-options="{'widget': 'date'}"/>
+    </div>
+  </xpath>
+
+</data>
+
+```
+Source: [snippets/stock.report_picking.show_order_date.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_picking.show_order_date.xml)
+
+### Show Packaging  
+ID: `mint_system.stock.report_picking.show_packaging`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="stock.report_picking" priority="50">
+
+ <xpath expr="//table[1]/thead/tr/th[1]" position="after">
+    <th>
+      <strong>Verpackung</strong>
+    </th>
+  </xpath>
+
+  <xpath expr="//table[1]/tbody/t//tr/td[1]" position="after">
+    <td>
+      <span t-if="move.product_packaging" t-esc="move.product_packaging.name"/>
+    </td>
+  </xpath>
+
+</data>
+
+```
+Source: [snippets/stock.report_picking.show_packaging.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_picking.show_packaging.xml)
+
+### Show Qty Available  
+ID: `mint_system.stock.report_picking.show_qty_available`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="stock.report_picking" priority="50">
+ 
+  <xpath expr="//table[4]/thead/tr/th[6]" position="after">
+    <th id="qty_available">
+      <strong >Lager</strong>
+    </th>
+  </xpath>
+
+  <xpath expr="//table[4]/tbody/t/t/tr/td[6]" position="after">
+    <td id="qty_available">
+      <span id="qty_available" t-field="ml.product_id.qty_available"/>
+      <span t-field="ml.product_uom_id"/>
+     </td>
+  </xpath>
+
+</data>
+```
+Source: [snippets/stock.report_picking.show_qty_available.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_picking.show_qty_available.xml)
+
+### Stock Delivery Note  
+ID: `mint_system.stock.report_picking.stock_delivery_note`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="stock.report_picking" priority="50">
+
+  <xpath expr="/t/t/t/t/div/table[1]" position="after">
+    <div class="row">
+      <div class="col">
+        <p t-field="o.note"/>
+      </div>
+    </div>
+  </xpath>
+  
+</data>
+
+```
+Source: [snippets/stock.report_picking.stock_delivery_note.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_picking.stock_delivery_note.xml)
+
+### Style Trimada  
+ID: `mint_system.stock.report_picking.style_trimada`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="stock.report_picking" priority="60">
+
+    <xpath expr="//div[hasclass('page')]" position="before">
+        <style>
+          p {
+            font-size: 9pt;
+                font-family: arial;
+          }
+            table.trimada {
+              width: 100%;
+                font-size: 9pt;
+                font-family: arial;
+                margin-top: 20px;
+            }
+            table.trimada thead tr {
+                border-top: solid 1px;
+                border-bottom: solid 1px;
+            }
+            table.trimada thead th#position {
+                width: 5mm;
+            }
+            table.trimada thead th#default_code {
+              width: 27mm;
+              padding-left: 10px;
+              text-align: left;
+            }
+            table.trimada thead th#quantity {
+              width: 25mm;
+              text-align: right !important;
+            }
+            table.trimada thead th#product_uom_qty {
+              width: 35mm;
+              text-align: right;
+            }
+            table.trimada tbody td#position {
+              text-align: right;
+            }
+            table.trimada tbody tr {
+              vertical-align: top;
+                border-bottom: 1px solid rgb(220,220,220)
+            }
+            table.trimada tbody td#default_code {
+              padding-left: 10px;
+              text-align: left;
+            }
+            table.trimada tbody td span#description_pickingout {
+              font-style: italic;
+            }
+            table.trimada tbody td#product_uom_qty {
+              text-align: right;
+            }            
+            table.trimada tbody td span#product_uom_qty {
+              font-weight: bold;
+            }
+            table.trimada tbody td span#product_uom_qty_done {
+              font-weight: bold;
+            }
+            table.trimada tbody td span#qty_available {
+              font-size: 7pt;
+            }
+            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;
+            }
+          div.address_block {
+              font-size: 10pt;
+                font-family: arial;
+                margin-top: 20px;
+                margin-left: 10px;
+            }
+            .subtitel {
+                font-size: 11pt;
+                font-family: arial;
+                margin-top: 10mm;
+            }
+            .note {
+                font-size: 9pt;
+                font-family: arial;
+            }
+            .mrp_note {
+                font-size: 9pt;
+                font-family: arial;
+                padding-bottom: 3mm;
+            }
+        </style>
+    </xpath>
+
+.    <xpath expr="//th[@name='th_product']/../../.." position="attributes">
+        <attribute name="class" separator=" " add="trimada table-borderless"/>
+    </xpath>
+
+</data>
+```
+Source: [snippets/stock.report_picking.style_trimada.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_picking.style_trimada.xml)
+
+### X Count Packaging  
+ID: `mint_system.stock.report_picking.x_count_packaging`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="stock.report_picking" priority="50">
+
+ <xpath expr="//table[1]/thead/tr/th[2]" position="after">
+    <th>
+      <strong>Anzahl Verp.</strong>
+    </th>
+  </xpath>
+
+  <xpath expr="//table[1]/tbody/t//tr/td[2]" position="after">
+    <td>
+      <span t-if="move.x_count_packaging" t-esc="move.x_count_packaging"/>
+    </td>
+  </xpath>
+
+</data>
+
+```
+Source: [snippets/stock.report_picking.x_count_packaging.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_picking.x_count_packaging.xml)
+
+### X Packaging Uom Id  
+ID: `mint_system.stock.report_picking.x_packaging_uom_id`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="stock.report_picking" priority="50">
+
+  <xpath expr="//span[@t-field='ml.product_uom_id']" position="replace">
+      <span t-if="not move.product_packaging.x_packaging_uom_id" t-field="ml.product_uom_id" groups="uom.group_uom"/>
+      <span t-if="move.product_packaging.x_packaging_uom_id" t-field="move.product_packaging.x_packaging_uom_id" groups="uom.group_uom"/>
+  </xpath>
+
+</data>
+
+```
+Source: [snippets/stock.report_picking.x_packaging_uom_id.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_picking.x_packaging_uom_id.xml)
+
+## Report Reception Report Label  
+### Aersolution  
+ID: `mint_system.stock.report_reception_report_label.aersolution`  
+```xml
+<t t-name="stock.report_reception_report_label.aersolution">
+    <t t-call="web.basic_layout">
+        <div class="page">
+
+            <t t-foreach="docs" t-as="picking">
+                <t t-foreach="picking.move_line_ids.filtered(lambda m: m.qty_done &gt; 0.0)" t-as="move_line">
+
+                    <t t-set="label_qty" t-value="move_line.move_id.x_label_qty"/>
+                    <t t-set="company_id" t-value="picking.company_id"/>
+                    <t t-set="lot_id" t-value="move_line.lot_id"/>
+                    <t t-set="product_id" t-value="move_line.product_id"/>
+
+                    <t t-call="mint_system.stock.report_label.aersolution"/>
+                </t>
+            </t>
+
+        </div>
+    </t>
+</t>
+```
+Source: [snippets/stock.report_reception_report_label.aersolution.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.report_reception_report_label.aersolution.xml)
+
+## Search Product Lot Filter  
+### Filter Active  
+ID: `mint_system.stock.search_product_lot_filter.filter_active`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="stock.search_product_lot_filter" priority="50">
+
+  <field name="product_id" position="after">
+    <filter name="active" string="Archiviert" domain="[('active', '=', False)]"/>
+  </field>
+
+</data>
+
+```
+Source: [snippets/stock.search_product_lot_filter.filter_active.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.search_product_lot_filter.filter_active.xml)
+
 ## Stock Report Delivery Aggregated Move Lines  
 ### Add Country Of Origin And Hs Code  
 ID: `mint_system.stock.stock_report_delivery_aggregated_move_lines.add_country_of_origin_and_hs_code`  
@@ -4450,6 +6248,20 @@ ID: `mint_system.stock.stock_report_delivery_aggregated_move_lines.replace_descr
 
 </data>
 
+<!--
+<data inherit_id="stock.stock_report_delivery_aggregated_move_lines" priority="49">
+
+  <xpath expr="//td[1]/span" position="replace">
+    <span style="font-weight: bold" t-esc="aggregated_lines[line]['product']['name']"/>
+    <br/>
+      Product Code: <span t-esc="aggregated_lines[line]['product']['default_code']"/>
+  <br/>
+  <t t-if="aggregated_lines[line]['hs_code']">HS-Code: <span t-esc="aggregated_lines[line]['hs_code']"/>
+  </t>
+</xpath>
+
+</data>
+-->
 ```
 Source: [snippets/stock.stock_report_delivery_aggregated_move_lines.replace_description.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.stock_report_delivery_aggregated_move_lines.replace_description.xml)
 
@@ -4701,6 +6513,35 @@ ID: `mint_system.stock.stock_report_delivery_package_section_line.set_color`
 ```
 Source: [snippets/stock.stock_report_delivery_package_section_line.set_color.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.stock_report_delivery_package_section_line.set_color.xml)
 
+## View Location Form  
+### Show Barcode  
+ID: `mint_system.stock.view_location_form.show_barcode`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="stock.view_location_form" priority="50">
+
+  <xpath expr="//group[@name='additional_info']//field[@name='replenish_location']" position="after">
+    <field name="barcode"/>
+  </xpath>
+
+</data>
+```
+Source: [snippets/stock.view_location_form.show_barcode.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.view_location_form.show_barcode.xml)
+
+### Show Id  
+ID: `mint_system.stock.view_location_form.show_id`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="stock.view_location_form" priority="50">
+
+  <xpath expr="//group[@name='additional_info']//field[@name='replenish_location']" position="after">
+    <field name="id"/>
+  </xpath>
+
+</data>
+```
+Source: [snippets/stock.view_location_form.show_id.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.view_location_form.show_id.xml)
+
 ## View Move Form  
 ### Enable Edit And Create  
 ID: `mint_system.stock.view_move_form.enable_edit_and_create`  
@@ -5069,8 +6910,8 @@ ID: `mint_system.stock.view_move_tree.show_date`
 <?xml version="1.0"?>
 <data inherit_id="stock.view_move_tree" priority="50">
 
-  <field name="location_dest_id" position="after">
-    <field name="date" optional="hide" />
+  <field name="date" position="attributes">
+    <attribute name="groups"></attribute>
   </field>
 
 </data>
@@ -5301,6 +7142,20 @@ ID: `mint_system.stock.view_picking_form.x_autocomplete`
 ```
 Source: [snippets/stock.view_picking_form.x_autocomplete.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.view_picking_form.x_autocomplete.xml)
 
+### X Client Order Ref  
+ID: `mint_system.stock.view_picking_form.x_client_order_ref`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="stock.view_picking_form" priority="50">
+
+  <field name="origin" position="after">
+    <field name="x_client_order_ref"/>
+  </field>
+
+</data>
+```
+Source: [snippets/stock.view_picking_form.x_client_order_ref.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.view_picking_form.x_client_order_ref.xml)
+
 ### X Count Boxes  
 ID: `mint_system.stock.view_picking_form.x_count_boxes`  
 ```xml
@@ -5316,6 +7171,49 @@ 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-Build/tree/14.0/snippets/stock.view_picking_form.x_count_boxes.xml)
 
+### X Date Order  
+ID: `mint_system.stock.view_picking_form.x_date_order`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="stock.view_picking_form" priority="50">
+
+  <field name="origin" position="after">
+    <field name="x_date_order"/>
+  </field>
+
+</data>
+```
+Source: [snippets/stock.view_picking_form.x_date_order.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.view_picking_form.x_date_order.xml)
+
+### X Label Qty  
+ID: `mint_system.stock.view_picking_form.x_label_qty`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="stock.view_picking_form" priority="50">
+
+  <field name="product_uom" position="after">
+    <field name="x_label_qty" optional="show"/>
+  </field>
+
+</data>
+
+```
+Source: [snippets/stock.view_picking_form.x_label_qty.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.view_picking_form.x_label_qty.xml)
+
+### X Vst  
+ID: `mint_system.stock.view_picking_form.x_vst`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="stock.view_picking_form" priority="50">
+
+  <field name="origin" position="after">
+    <field name="x_vst"/>
+  </field>
+
+</data>
+```
+Source: [snippets/stock.view_picking_form.x_vst.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.view_picking_form.x_vst.xml)
+
 ## View Picking Internal Search  
 ### Filter Groupby Expected Date  
 ID: `mint_system.stock.view_picking_internal_search.filter_groupby_expected_date`  
@@ -5440,6 +7338,21 @@ ID: `mint_system.stock.view_stock_quant_tree_editable.show_reserved_quantity`
 ```
 Source: [snippets/stock.view_stock_quant_tree_editable.show_reserved_quantity.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.view_stock_quant_tree_editable.show_reserved_quantity.xml)
 
+### X Expiration Date  
+ID: `mint_system.stock.view_stock_quant_tree_editable.x_expiration_date`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="stock.view_stock_quant_tree_editable" priority="50">
+
+    <field name="removal_date" position="after">
+      <field name="x_expiration_date" optional="show"/>
+    </field>
+
+</data>
+
+```
+Source: [snippets/stock.view_stock_quant_tree_editable.x_expiration_date.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.view_stock_quant_tree_editable.x_expiration_date.xml)
+
 ## View Stock Quant Tree  
 ### Show Reserved Quantity  
 ID: `mint_system.stock.view_stock_quant_tree.show_reserved_quantity`  
@@ -5503,6 +7416,50 @@ ID: `mint_system.stock.vpicktree.default_order_name`
 ```
 Source: [snippets/stock.vpicktree.default_order_name.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.vpicktree.default_order_name.xml)
 
+### Format Date Deadline  
+ID: `mint_system.stock.vpicktree.format_date_deadline`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="stock.vpicktree" priority="50">
+
+  <xpath expr="//field[@name='date_deadline']" position="attributes">
+    <attribute name="widget">date</attribute>
+  </xpath>
+
+</data>
+
+```
+Source: [snippets/stock.vpicktree.format_date_deadline.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.vpicktree.format_date_deadline.xml)
+
+### Format Scheduled Date  
+ID: `mint_system.stock.vpicktree.format_scheduled_date`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="stock.vpicktree" priority="50">
+
+  <xpath expr="//field[@name='scheduled_date']" position="attributes">
+    <attribute name="widget">date</attribute>
+  </xpath>
+
+</data>
+
+```
+Source: [snippets/stock.vpicktree.format_scheduled_date.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.vpicktree.format_scheduled_date.xml)
+
+### Modify Invisible Scheduled Date  
+ID: `mint_system.stock.vpicktree.modify_invisible_scheduled_date`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="stock.vpicktree" priority="50">
+
+  <xpath expr="//field[@name='scheduled_date']" position="attributes">
+    <attribute name="attrs">{'invisible': [('state', 'in' , 'cancel')]}</attribute>
+  </xpath>
+
+</data>
+```
+Source: [snippets/stock.vpicktree.modify_invisible_scheduled_date.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.vpicktree.modify_invisible_scheduled_date.xml)
+
 ### Show Delivery Note  
 ID: `mint_system.stock.vpicktree.show_delivery_note`  
 ```xml
@@ -5531,3 +7488,27 @@ ID: `mint_system.stock.vpicktree.weight_sum`
 ```
 Source: [snippets/stock.vpicktree.weight_sum.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.vpicktree.weight_sum.xml)
 
+### X Client Order Ref  
+ID: `mint_system.stock.vpicktree.x_client_order_ref`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="stock.vpicktree" priority="50">
+  <xpath expr="//field[@name='origin']" position="after">
+    <field name="client_order_ref" optional="show"/>
+  </xpath>
+</data>
+```
+Source: [snippets/stock.vpicktree.x_client_order_ref.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.vpicktree.x_client_order_ref.xml)
+
+### X Date Order  
+ID: `mint_system.stock.vpicktree.x_date_order`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="stock.vpicktree" priority="50">
+  <xpath expr="//field[@name='origin']" position="after">
+    <field name="x_date_order" optional="show"/>
+  </xpath>
+</data>
+```
+Source: [snippets/stock.vpicktree.x_date_order.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/stock.vpicktree.x_date_order.xml)
+
diff --git a/snippets/stock.report_delivery_document.add_weight.xml b/snippets/stock.report_delivery_document.add_weight.xml
new file mode 100644
index 00000000..42c1068a
--- /dev/null
+++ b/snippets/stock.report_delivery_document.add_weight.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+<data inherit_id="stock.report_delivery_document" priority="50">
+
+  <xpath expr="//th[@name='th_sm_quantity']" position="before">
+    <th>
+      <span>Weight</span>
+    </th>
+  </xpath>
+
+  <xpath expr="//span[@t-field='move.quantity_done']/.." position="before">
+    <td>
+      <span t-field="move.product_id.weight"/>
+      <span t-field="move.product_id.weight_uom_name"/>
+    </td>
+  </xpath>
+
+</data>
\ No newline at end of file
diff --git a/snippets/stock.report_delivery_document.append_signature_text.xml b/snippets/stock.report_delivery_document.append_signature_text.xml
index d3707b77..63a230b5 100644
--- a/snippets/stock.report_delivery_document.append_signature_text.xml
+++ b/snippets/stock.report_delivery_document.append_signature_text.xml
@@ -2,20 +2,43 @@
 <data inherit_id="stock.report_delivery_document" priority="50">
 
   <xpath expr="//table[@name='stock_move_line_table']" position="after">
-    <div class="row" style="margin-top: 3rem;">
-      <div class="col-5">
-       <p>Gebinde geliefert: _____</p>
-       <p>Gebinde zurück: _____</p>
-       <br/>
-       <p>Unterschrift Transport: _______________</p>
-      </div>
-      <div class="col-2" />
-      <div class="col-5">
-       <p>Produkte einwandfrei erhalten.</p>
-       <br/>
-       <p>Unterschrift Kunde: _______________</p>
+    <style>
+      div#signature {
+      padding-left: 75px;
+      padding-right: 75px;
+      margin-top: 3rem;
+      }
+    </style>
+    <div id="signature">
+      <p>Hiermit bestätigen wir den Erhalt der Ware gemäss Lieferung.</p>
+      <br />
+      <br />
+      <div class="row">
+        <div class="col-6">
+          <p>Ort/Datum: __________________________________</p>
+        </div>
+        <div class="col-6">
+          <p>Unterschrift Kunde: __________________________________</p>
+        </div>
       </div>
     </div>
   </xpath>
 
-</data>
+  <xpath expr="//table[@name='stock_move_line_table']" position="after">
+    <div class="row" style="margin-top: 3rem;">
+      <div class="col-5">
+        <p>Gebinde geliefert: _____</p>
+        <p>Gebinde zurück: _____</p>
+        <br />
+        <p>Unterschrift Transport: _______________</p>
+      </div>
+      <div class="col-2" />
+      <div class="col-5">
+        <p>Produkte einwandfrei erhalten.</p>
+        <br />
+        <p>Unterschrift Kunde: _______________</p>
+      </div>
+    </div>
+  </xpath>
+
+</data>
\ No newline at end of file
diff --git a/snippets/stock.report_delivery_document.backorder_signature_section.xml b/snippets/stock.report_delivery_document.backorder_signature_section.xml
index 275aad52..d6ae1f04 100644
--- a/snippets/stock.report_delivery_document.backorder_signature_section.xml
+++ b/snippets/stock.report_delivery_document.backorder_signature_section.xml
@@ -3,9 +3,9 @@
 
   <xpath expr="//table[@name='stock_move_line_table']" position="after">
     <p>Retouren:<br/><br/>
-		KEG:             ___________  Anzahl<br/><br/>
-		Harassen:  ___________  Anzahl<br/><br/>
-		Waren erhalten:   Datum:  ______________________  Unterschrift:  _________________________________
+        KEG:             ___________  Anzahl<br/><br/>
+        Harassen:  ___________  Anzahl<br/><br/>
+        Waren erhalten:   Datum:  ______________________  Unterschrift:  _________________________________
     </p>
   </xpath>
 
diff --git a/snippets/stock.report_delivery_document.description_sale.xml b/snippets/stock.report_delivery_document.description_sale.xml
deleted file mode 100644
index 3b7502a9..00000000
--- a/snippets/stock.report_delivery_document.description_sale.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0"?>
-<data inherit_id="stock.report_delivery_document" priority="55">
-
-  <xpath expr="//span[@t-field='move.product_id']" position="replace">
-    <t t-if="move.product_id.description_sale">
-      <span t-field="move.product_id.description_sale"/>
-    </t>
-    <t t-else="">
-      <span t-field="move.product_id"/>
-    </t>
-  </xpath>
-
-</data>
diff --git a/snippets/stock.report_delivery_document.format_address_blocks.xml b/snippets/stock.report_delivery_document.format_address_blocks.xml
index 0b5477e5..503b764e 100644
--- a/snippets/stock.report_delivery_document.format_address_blocks.xml
+++ b/snippets/stock.report_delivery_document.format_address_blocks.xml
@@ -1,9 +1,23 @@
 <?xml version="1.0"?>
 <data inherit_id="stock.report_delivery_document" priority="50">
 
-<xpath expr="//t[@t-set='address']/div" position="attributes">
+  <xpath expr="//t[@t-set='address']/div" position="attributes">
     <attribute name="style">font-size:10pt; line-height: 1.2; padding-bottom:33mm</attribute>
     <attribute name="t-options-fields">['address', 'name']</attribute>
   </xpath>
 
 </data>
+
+<!--
+<data inherit_id="stock.report_delivery_document" priority="50">
+
+  <xpath expr="//div[@name='div_outgoing_address']" position="attributes">
+    <attribute name="t-options-fields">['address', 'name']</attribute>
+  </xpath>
+  
+  <xpath expr="//div[@t-field='partner.commercial_partner_id']" position="attributes">
+    <attribute name="t-options-fields">['address', 'name']</attribute>
+  </xpath>
+ 
+</data>
+-->
diff --git a/snippets/stock.report_delivery_document.format_qty.xml b/snippets/stock.report_delivery_document.format_qty.xml
index 3c6ebad1..4e42e895 100644
--- a/snippets/stock.report_delivery_document.format_qty.xml
+++ b/snippets/stock.report_delivery_document.format_qty.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0"?>
 <data inherit_id="stock.report_delivery_document" priority="60">
 
-	<span id="open_qty" position="attributes">
-		<attribute name="t-options-widget">"integer"</attribute>
-	</span>
+    <span t-field="move.product_uom_qty" position="attributes">
+        <attribute name="t-options-widget">"integer"</attribute>
+    </span>
 
-	<span id="qty" position="attributes">
-		<attribute name="t-options-widget">"integer"</attribute>
-	</span>
+    <span t-field="move.quantity_done" position="attributes">
+        <attribute name="t-options-widget">"integer"</attribute>
+    </span>
 
-</data>
+</data>
\ No newline at end of file
diff --git a/snippets/stock.report_delivery_document.hide_address.xml b/snippets/stock.report_delivery_document.hide_address.xml
new file mode 100644
index 00000000..b88c8843
--- /dev/null
+++ b/snippets/stock.report_delivery_document.hide_address.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<data inherit_id="stock.report_delivery_document" priority="50">
+
+    <xpath expr="//div[@name='customer_address']" position="replace"/>
+    <xpath expr="//div[@name='partner_header']" position="replace"/>
+
+</data>
\ No newline at end of file
diff --git a/snippets/stock.report_delivery_document.hide_backorder_quantity.xml b/snippets/stock.report_delivery_document.hide_backorder_quantity.xml
index 1e506582..3208d9ed 100644
--- a/snippets/stock.report_delivery_document.hide_backorder_quantity.xml
+++ b/snippets/stock.report_delivery_document.hide_backorder_quantity.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <data inherit_id="stock.report_delivery_document" priority="50">
 
-	<xpath expr="//table[@name='stock_backorder_table']/thead//th[4]" position="replace">
-		<th></th>
-	</xpath>
+    <xpath expr="//table[@name='stock_backorder_table']/thead//th[4]" position="replace">
+        <th></th>
+    </xpath>
 
 </data>
\ No newline at end of file
diff --git a/snippets/stock.report_delivery_document.hide_product_uom_qty.xml b/snippets/stock.report_delivery_document.hide_product_uom_qty.xml
new file mode 100644
index 00000000..8255d155
--- /dev/null
+++ b/snippets/stock.report_delivery_document.hide_product_uom_qty.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0"?>
+<data inherit_id="stock.report_delivery_document" priority="50">
+  <xpath expr="//span[@t-field='move.product_uom_qty']/..." position="replace">
+  </xpath>
+</data>
\ No newline at end of file
diff --git a/snippets/stock.report_delivery_document.replace_address_and_information_block.xml b/snippets/stock.report_delivery_document.replace_address_and_information_block.xml
new file mode 100644
index 00000000..50d83896
--- /dev/null
+++ b/snippets/stock.report_delivery_document.replace_address_and_information_block.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0"?>
+<data inherit_id="stock.report_delivery_document" priority="50">
+
+  <xpath expr="//t[@t-set='address']" position="replace"/>
+
+  <xpath expr="//t[@t-set='information_block']" position="replace">
+
+    <span>Carbo-Link AG | Undermülistrasse 25 | CH 8320 Fehraltorf</span>
+
+    <div class="row text-900 o_bold">
+      <div class="col-7">Delivery Address</div>
+      <div class="col-5">Customer</div>
+    </div>
+
+    <div class="row">
+      <div class="col-7">
+        <span t-field="o.sale_id.partner_shipping_id.commercial_company_name"/>
+      </div>
+      <div class="col-5">
+        <span t-field="o.sale_id.partner_shipping_id.commercial_company_name"/>
+      </div>
+    </div>
+
+    <div class="row">
+      <div class="col-7">
+        <span t-field="o.sale_id.partner_shipping_id" t-options-widget="&quot;contact&quot;" t-options-fields="['address']" t-options-no_marker="True"/>
+      </div>
+      <div class="col-5">
+        <span t-field="o.sale_id.partner_id.name"/>
+      </div>
+    </div>
+
+    <div class="row">
+      <div class="col-5 text-900 o_bold offset-7" style="margin-top:25px">Invoice Address</div>
+    </div>
+
+    <div class="row">
+      <div class="col-5 offset-7">
+        <span t-field="o.sale_id.partner_shipping_id.commercial_company_name"/>
+      </div>
+    </div>
+
+    <div class="row">
+      <div class="col-5 offset-7">
+        <span t-field="o.sale_id.partner_invoice_id" t-options-widget="&quot;contact&quot;" t-options-fields="['address']" t-options-no_marker="True"/>
+      </div>
+    </div>
+
+    <div class="row o_bold text-900" style="margin-top:25px">
+      <div class="col-7">Your Contact</div>
+      <div class="col-5">Our Contact</div>
+    </div>
+
+    <div class="row">
+      <div class="col-7">
+        <span t-field="o.sale_id.partner_id.name"/>
+      </div>
+      <div class="col-5">
+        <span t-field="o.sale_id.user_id.name"/>
+      </div>
+    </div>
+
+    <div class="row">
+      <div class="col-7" style="margin-bottom:25px">
+        <span t-field="o.sale_id.partner_id" t-options-widget="&quot;contact&quot;" t-options-fields="['phone', 'email']" t-options-no_marker="True"/>
+      </div>
+      <div class="col-5">
+        <span t-field="o.sale_id.user_id" t-options-widget="&quot;contact&quot;" t-options-fields="['phone', 'email']" t-options-no_marker="True"/>
+      </div>
+    </div>
+
+  </xpath>
+
+</data>
\ No newline at end of file
diff --git a/snippets/stock.report_delivery_document.replace_description_sale.xml b/snippets/stock.report_delivery_document.replace_description_sale.xml
new file mode 100644
index 00000000..b61ca4f6
--- /dev/null
+++ b/snippets/stock.report_delivery_document.replace_description_sale.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<data inherit_id="stock.report_delivery_document" priority="55">
+
+    <xpath expr="//span[@t-field='move.product_id']" position="replace">
+        <t t-if="move.product_id.description_sale">
+            <span t-field="move.product_id.description_sale" />
+        </t>
+        <t t-else="">
+            <span t-field="move.product_id" />
+        </t>
+    </xpath>
+
+</data>
\ No newline at end of file
diff --git a/snippets/stock.report_delivery_document.replace_header.xml b/snippets/stock.report_delivery_document.replace_header.xml
index 16aa88b6..e943b3e9 100644
--- a/snippets/stock.report_delivery_document.replace_header.xml
+++ b/snippets/stock.report_delivery_document.replace_header.xml
@@ -1,29 +1,29 @@
 <?xml version="1.0"?>
 <data inherit_id="stock.report_delivery_document" priority="50">
-	<xpath expr="//div[@t-if='o.origin']/.." position="before">
-		<style>
-		table#header {
-			width: 100%;
-			border: solid 1px;
-			font-size: 18pt;
-		}
-		table#header td {
-			padding: 5px;
-			padding-left: 10px;
-			vertical-align: middle;
-			font-weight: bold;
-		}
-		</style>
-		<table id='header'>
-		<tr>
-			<td>Lieferschein <span t-field="o.name"/>
-			</td>
-			<td>
-				<span>
-					<img t-att-src="'/report/barcode/?type=%s&amp;value=%s&amp;width=%s&amp;height=%s&amp;quiet=0' % ('Code128', o.name, 600, 100)" style="width:210px;height:60px; float:right;"/>
-				</span>
-			</td>
-		</tr>
-		</table>
-	</xpath>
+    <xpath expr="//div[@t-if='o.origin']/.." position="before">
+        <style>
+        table#header {
+            width: 100%;
+            border: solid 1px;
+            font-size: 18pt;
+        }
+        table#header td {
+            padding: 5px;
+            padding-left: 10px;
+            vertical-align: middle;
+            font-weight: bold;
+        }
+        </style>
+        <table id='header'>
+        <tr>
+            <td>Lieferschein <span t-field="o.name"/>
+            </td>
+            <td>
+                <span>
+                    <img t-att-src="'/report/barcode/?type=%s&amp;value=%s&amp;width=%s&amp;height=%s&amp;quiet=0' % ('Code128', o.name, 600, 100)" style="width:210px;height:60px; float:right;"/>
+                </span>
+            </td>
+        </tr>
+        </table>
+    </xpath>
 </data>
\ No newline at end of file
diff --git a/snippets/stock.report_delivery_document.replace_informations.xml b/snippets/stock.report_delivery_document.replace_informations.xml
index d9b15804..2388eeca 100644
--- a/snippets/stock.report_delivery_document.replace_informations.xml
+++ b/snippets/stock.report_delivery_document.replace_informations.xml
@@ -15,25 +15,31 @@
             <table class="table table-borderless table-sm">
                 <tr>
                     <td>
-                        <strong>Shipping Date:</strong>
+                        <strong>Versanddatum:</strong>
                         <t t-if="o.state == 'done'">
-                            <p t-field="o.date_done" />
+                            <span t-field="o.date_done" t-options='{"widget": "date"}' />
                         </t>
                         <t t-if="o.state != 'done'">
-                            <p t-field="o.scheduled_date" />
+                            <span t-field="o.scheduled_date" t-options='{"widget": "date"}' />
                         </t>
                     </td>
                     <td>
+                        <strong>Unser Kontakt:</strong>
+                        <span t-field="o.sudo().sale_id.user_id" />
                     </td>
                     <td>
-                        <strong>Customer Reference:</strong>
-                        <p t-field="o.sudo().sale_id.client_order_ref" />
+                        <strong>Ihr Kontakt:</strong>
+                        <span t-field="o.sudo().sale_id.partner_sale_id.name" />
                     </td>
                 </tr>
                 <tr>
                     <td colspan="2">
                         <strong>&#160;Unsere Referenz:</strong>
-                        <p t-field="o.origin" />
+                        <span t-field="o.origin" />
+                    </td>
+                    <td t-if="o.sudo().sale_id.client_order_ref">
+                        <strong>Ihre Referenz:</strong>
+                        <span t-field="o.sudo().sale_id.client_order_ref" />
                     </td>
                 </tr>
             </table>
diff --git a/snippets/stock.report_delivery_document.replace_name.xml b/snippets/stock.report_delivery_document.replace_name.xml
new file mode 100644
index 00000000..e6f175b5
--- /dev/null
+++ b/snippets/stock.report_delivery_document.replace_name.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<data inherit_id="stock.report_delivery_document" priority="50">
+
+    <xpath expr="//span[@t-field='o.name']/.." position="replace">
+        <h2>
+            Delivery slip <span t-field="o.name"/>
+        </h2>
+    </xpath>
+
+</data>
\ No newline at end of file
diff --git a/snippets/stock.report_delivery_document.replace_order_definition.xml b/snippets/stock.report_delivery_document.replace_order_definition.xml
index 0f34c5f2..2b5a501b 100644
--- a/snippets/stock.report_delivery_document.replace_order_definition.xml
+++ b/snippets/stock.report_delivery_document.replace_order_definition.xml
@@ -14,7 +14,7 @@
       padding-left: 10px;
       padding-bottom: 5px;
       }
-		</style>
+        </style>
     <table id='titel'>
       <tr>
         <td style="width: 44%;"><strong>Fertigungsauftrag <span t-field="o.origin"/></strong></td>
diff --git a/snippets/stock.report_delivery_document.replace_product_uom_qty.xml b/snippets/stock.report_delivery_document.replace_product_uom_qty.xml
index 0504077d..7c331d64 100644
--- a/snippets/stock.report_delivery_document.replace_product_uom_qty.xml
+++ b/snippets/stock.report_delivery_document.replace_product_uom_qty.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <data inherit_id="stock.report_delivery_document" priority="60">
 
-	<xpath expr="//span[@t-field='move.product_uom_qty']" position="replace">
-		<span t-field="move.quantity_done"/>
-	</xpath>
+    <xpath expr="//span[@t-field='move.product_uom_qty']" position="replace">
+        <span t-field="move.quantity_done"/>
+    </xpath>
 
 </data>
diff --git a/snippets/stock.report_delivery_document.replace_sale_line_name.xml b/snippets/stock.report_delivery_document.replace_sale_line_name.xml
new file mode 100644
index 00000000..4eb490c6
--- /dev/null
+++ b/snippets/stock.report_delivery_document.replace_sale_line_name.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<data inherit_id="stock.report_delivery_document" priority="55">
+
+    <xpath expr="//span[@t-field='move.product_id']" position="replace">
+        <t t-if="move.sale_line_id">
+            <span t-field="move.sale_line_id.name" />
+        </t>
+        <t t-else="">
+            <span t-field="move.product_id" />
+        </t>
+    </xpath>
+
+</data>
\ No newline at end of file
diff --git a/snippets/stock.report_delivery_document.set_ids.xml b/snippets/stock.report_delivery_document.set_ids.xml
index 4c82f155..20cdccb4 100644
--- a/snippets/stock.report_delivery_document.set_ids.xml
+++ b/snippets/stock.report_delivery_document.set_ids.xml
@@ -1,44 +1,44 @@
 <?xml version="1.0"?>
 <data inherit_id="stock.report_delivery_document" priority="60">
 
-	<xpath expr="//table[@name='stock_move_table']//th[2]" position="attributes">
-		<attribute name="id">description</attribute>
-	</xpath>
+    <xpath expr="//table[@name='stock_move_table']//th[2]" position="attributes">
+        <attribute name="id">description</attribute>
+    </xpath>
 
-	<xpath expr="//table[@name='stock_move_table']//th[3]" position="attributes">
-		<attribute name="id">quantity</attribute>
-	</xpath>
-	<xpath expr="//table[@name='stock_move_table']//td[3]" position="attributes">
-		<attribute name="id">quantity</attribute>
-	</xpath>
-	<xpath expr="//table[@name='stock_move_table']//td[3]/span[1]" position="attributes">
-		<attribute name="id">qty</attribute>
-	</xpath>
+    <xpath expr="//table[@name='stock_move_table']//th[3]" position="attributes">
+        <attribute name="id">quantity</attribute>
+    </xpath>
+    <xpath expr="//table[@name='stock_move_table']//td[3]" position="attributes">
+        <attribute name="id">quantity</attribute>
+    </xpath>
+    <xpath expr="//table[@name='stock_move_table']//td[3]/span[1]" position="attributes">
+        <attribute name="id">qty</attribute>
+    </xpath>
 
-	<xpath expr="//table[@name='stock_backorder_table']//th[2]" position="attributes">
-		<attribute name="id">description</attribute>
-	</xpath>
+    <xpath expr="//table[@name='stock_backorder_table']//th[2]" position="attributes">
+        <attribute name="id">description</attribute>
+    </xpath>
 
-	<xpath expr="//table[@name='stock_backorder_table']//th[3]" position="attributes">
-		<attribute name="id">open_quantity</attribute>
-	</xpath>
-	<xpath expr="//table[@name='stock_backorder_table']//td[3]" position="attributes">
-		<attribute name="id">open_quantity</attribute>
-	</xpath>
+    <xpath expr="//table[@name='stock_backorder_table']//th[3]" position="attributes">
+        <attribute name="id">open_quantity</attribute>
+    </xpath>
+    <xpath expr="//table[@name='stock_backorder_table']//td[3]" position="attributes">
+        <attribute name="id">open_quantity</attribute>
+    </xpath>
 
-	<xpath expr="//table[@name='stock_backorder_table']//th[3]" position="attributes">
-		<attribute name="id">open_quantity</attribute>
-	</xpath>
-	<xpath expr="//table[@name='stock_backorder_table']//td[3]/span[1]" position="attributes">
-		<attribute name="id">open_qty</attribute>
-	</xpath>
+    <xpath expr="//table[@name='stock_backorder_table']//th[3]" position="attributes">
+        <attribute name="id">open_quantity</attribute>
+    </xpath>
+    <xpath expr="//table[@name='stock_backorder_table']//td[3]/span[1]" position="attributes">
+        <attribute name="id">open_qty</attribute>
+    </xpath>
 
-	<xpath expr="//table[@name='stock_backorder_table']//th[4]" position="attributes">
-		<attribute name="id">quantity</attribute>
-	</xpath>
+    <xpath expr="//table[@name='stock_backorder_table']//th[4]" position="attributes">
+        <attribute name="id">quantity</attribute>
+    </xpath>
 
-	<xpath expr="//table[@name='stock_backorder_table']/../p" position="attributes">
-		<attribute name="class">subtitel</attribute>
-	</xpath>
+    <xpath expr="//table[@name='stock_backorder_table']/../p" position="attributes">
+        <attribute name="class">subtitel</attribute>
+    </xpath>
 
 </data>
\ No newline at end of file
diff --git a/snippets/stock.report_delivery_document.show_default_code.xml b/snippets/stock.report_delivery_document.show_default_code.xml
index b08d510f..df435dd8 100644
--- a/snippets/stock.report_delivery_document.show_default_code.xml
+++ b/snippets/stock.report_delivery_document.show_default_code.xml
@@ -1,20 +1,31 @@
 <?xml version="1.0"?>
 <data inherit_id="stock.report_delivery_document" priority="50">
 
-  <xpath expr="//table[@name='stock_move_table']/thead/tr/th[1]" position="before">
+  <xpath expr="//table[@name='stock_move_table']" position="before">
+    <style>
+      th#default_code,
+      td#default_code {
+        white-space: nowrap;
+      }
+    </style>
+  </xpath>
+  
+  <xpath expr="//table[@name='stock_move_table']//th[@name='th_sm_product']" position="before">
+    <th id="default_code" name="th_default_code">
+      <strong>Referenz</strong>
+    </th>
+  </xpath>
+
+  <!-- <xpath expr="//table[@name='stock_backorder_table']/thead/tr/th[1]" position="before">
     <th id="default_code">
       <strong >Nr.</strong>
     </th>
-  </xpath>
-  <xpath expr="//table[@name='stock_backorder_table']/thead/tr/th[1]" position="before">
-    <th id="default_code">
-      <strong >Nr.</strong>
-    </th>
-  </xpath>
-  <xpath expr="//table[@name='stock_move_table']/tbody//tr/td[1]" position="before">
-    <td id="default_code">
+  </xpath> -->
+
+  <xpath expr="//table[@name='stock_move_table']//span[@t-field='move.product_id']/.." position="before">
+    <td id="default_code"  name="td_default_code">
       <span t-field="move.product_id.default_code"/>
     </td>
   </xpath>
 
-</data>
\ No newline at end of file
+</data>
diff --git a/snippets/stock.report_delivery_document.show_lot_ids.xml b/snippets/stock.report_delivery_document.show_lot_ids.xml
index 9bde9287..be75cfaa 100644
--- a/snippets/stock.report_delivery_document.show_lot_ids.xml
+++ b/snippets/stock.report_delivery_document.show_lot_ids.xml
@@ -1,18 +1,28 @@
 <?xml version="1.0"?>
 <data inherit_id="stock.report_delivery_document" priority="50">
 
-  <xpath expr="//table[@name='stock_move_table']//th[1]" position="after">
+  <!-- <xpath expr="//table[@name='stock_move_table']//th[@name='th_sm_product']" position="after">
     <th name="th_lot_ids">
       <strong>Seriennummer</strong>
     </th>
-  </xpath>
+  </xpath> -->
+
+  <xpath expr="//table[@name='stock_move_table']//span[@t-field='move.description_picking']/.." position="after">
+    <t t-if="move.lot_ids">
+      <br />
+      <span>Seriennummern:</span>
+      <t t-esc="', '.join(move.lot_ids.mapped('name'))" />
+    </t>
+
+    <!-- <td name="td_lots"> -->
+      <!-- <t t-esc="', '.join(move.lot_ids.mapped('name'))" /> -->
+      <!-- <ul class="list-unstyled">
+        <t t-foreach="move.lot_ids" t-as="lot">
+          <li t-esc="lot.name" />
+        </t>
+      </ul> -->
+    <!-- </td> -->
 
-  <xpath expr="//table[@name='stock_move_table']//td[1]" position="after">
-    <td name="td_lots">
-      <ul>
-      <t t-foreach="move.lot_ids" t-as="lot" ><li t-esc="lot.name" /></t>
-      </ul>
-    </td>
   </xpath>
 
 </data>
\ No newline at end of file
diff --git a/snippets/stock.report_delivery_document.style_carbo_link.xml b/snippets/stock.report_delivery_document.style_carbo_link.xml
new file mode 100644
index 00000000..5de4a3dd
--- /dev/null
+++ b/snippets/stock.report_delivery_document.style_carbo_link.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+<data inherit_id="stock.report_delivery_document" priority="60">
+
+    <xpath expr="//div[hasclass('page')]" position="before">
+        <style>
+        .o_company_1_layout {
+            font-family: Dobra-Book;
+            font-size: 80%;
+            }
+        </style>
+    </xpath>
+    
+    <xpath expr="//p[@t-field='o.date_done']" position="attributes">
+        <attribute name="t-options-widget">"date"</attribute>
+    </xpath>
+    
+    <xpath expr="//p[@t-field='o.scheduled_date']" position="attributes">
+        <attribute name="t-options-widget">"date"</attribute>
+    </xpath>
+    
+</data>
\ No newline at end of file
diff --git a/snippets/stock.report_delivery_document.style_swissfragrance.xml b/snippets/stock.report_delivery_document.style_swissfragrance.xml
new file mode 100644
index 00000000..f899a384
--- /dev/null
+++ b/snippets/stock.report_delivery_document.style_swissfragrance.xml
@@ -0,0 +1,21 @@
+<data inherit_id="stock.report_delivery_document" priority="60">
+
+    <style>
+      .cell_left {
+      text-align: left;
+      }
+    </style>
+
+    <xpath expr="//div[hasclass('page')]" position="before">
+        <style>
+        h2 {
+        margin-top: 50px;
+            }
+        </style>
+    </xpath>
+
+    <xpath expr="//th[@name='th_sml_product']" position="attributes">
+        <attribute name="class" separator=" " add="cell_left"/>
+    </xpath>
+
+</data>
\ No newline at end of file
diff --git a/snippets/stock.report_delivery_document.style_tissa.xml b/snippets/stock.report_delivery_document.style_tissa.xml
index 3124ed16..1d7a0ca8 100644
--- a/snippets/stock.report_delivery_document.style_tissa.xml
+++ b/snippets/stock.report_delivery_document.style_tissa.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0"?>
 <data inherit_id="stock.report_delivery_document" priority="60">
 
-	<xpath expr="//div[hasclass('page')]" position="before">
-	  
-		<style>
+    <xpath expr="//div[hasclass('page')]" position="before">
+      
+        <style>
       table.tissa {
       margin-top: 30px;
       margin-bottom: 30px;
@@ -14,18 +14,18 @@
       }
     </style>
     
-	</xpath>
+    </xpath>
 
-	<xpath expr="//th[@name='th_sml_quantity']" position="attributes">
-			 <attribute name="class">cell_right</attribute>
-	</xpath>
-	
-	<xpath expr="//th[@name='th_sm_quantity']" position="attributes">
-			 <attribute name="class" separator=" " add="cell_right"/>
-	</xpath>
-	
-	<xpath expr="//table[@name='stock_move_table']//td[2]" position="attributes">
-			 <attribute name="class" separator=" " add="cell_right"/>
-	</xpath>
-	
+    <xpath expr="//th[@name='th_sml_quantity']" position="attributes">
+             <attribute name="class">cell_right</attribute>
+    </xpath>
+    
+    <xpath expr="//th[@name='th_sm_quantity']" position="attributes">
+             <attribute name="class" separator=" " add="cell_right"/>
+    </xpath>
+    
+    <xpath expr="//table[@name='stock_move_table']//td[2]" position="attributes">
+             <attribute name="class" separator=" " add="cell_right"/>
+    </xpath>
+    
 </data>
diff --git a/snippets/stock.report_delivery_document.style_trimada.xml b/snippets/stock.report_delivery_document.style_trimada.xml
index 651a45c7..392d0307 100644
--- a/snippets/stock.report_delivery_document.style_trimada.xml
+++ b/snippets/stock.report_delivery_document.style_trimada.xml
@@ -1,71 +1,71 @@
 <?xml version="1.0"?>
 <data inherit_id="stock.report_delivery_document" priority="60">
 
-	<xpath expr="//div[hasclass('page')]" position="before">
-		<style>
-			table.trimada {
-				font-size: 9pt;
-				font-family: arial;
-				color: black;
-			}
-			table.trimada thead tr {
-				border-top:solid 1px;
-				border-bottom: solid 1px;
-			}
-			table.trimada thead th#position {
-				width: 5mm;
-			}
-			table.trimada thead th#default_code {
-			  width: 27mm;
-			  text-align: right;
-			}
-			table.trimada thead th#open_quantity {
-			  width: 30mm;
-			  text-align: right;
-			}
-			table.trimada thead th#quantity {
-			  width: 25mm;
-			  text-align: right !important;
-			}
-			table.trimada tbody td#position {
-			  text-align: right;
-			}
-			table.trimada tbody tr {
-				border-bottom: 1px solid rgb(220,220,220)
-			}
-			table.trimada tbody td#default_code {
-			  text-align: right;
-			}
-			table.trimada tbody td#open_quantity {
-			  text-align: right !important;
-			}
-			table.trimada tbody td#quantity {
-			  text-align: right;
-			}			
-			table.trimada tbody span#qty {
-			  font-weight: bold;
-			}
-			table.trimada tbody span#open_qty {
-			  font-weight: bold;
-			}
-			.subtitel {
-				font-size: 11pt;
-				font-family: arial;
-				margin-top: 10mm;
-			}
-			.note {
-				font-size: 9pt;
-				font-family: arial;
-			}
-		</style>
-	</xpath>
+    <xpath expr="//div[hasclass('page')]" position="before">
+        <style>
+            table.trimada {
+                font-size: 9pt;
+                font-family: arial;
+                color: black;
+            }
+            table.trimada thead tr {
+                border-top:solid 1px;
+                border-bottom: solid 1px;
+            }
+            table.trimada thead th#position {
+                width: 5mm;
+            }
+            table.trimada thead th#default_code {
+              width: 27mm;
+              text-align: right;
+            }
+            table.trimada thead th#open_quantity {
+              width: 30mm;
+              text-align: right;
+            }
+            table.trimada thead th#quantity {
+              width: 25mm;
+              text-align: right !important;
+            }
+            table.trimada tbody td#position {
+              text-align: right;
+            }
+            table.trimada tbody tr {
+                border-bottom: 1px solid rgb(220,220,220)
+            }
+            table.trimada tbody td#default_code {
+              text-align: right;
+            }
+            table.trimada tbody td#open_quantity {
+              text-align: right !important;
+            }
+            table.trimada tbody td#quantity {
+              text-align: right;
+            }            
+            table.trimada tbody span#qty {
+              font-weight: bold;
+            }
+            table.trimada tbody span#open_qty {
+              font-weight: bold;
+            }
+            .subtitel {
+                font-size: 11pt;
+                font-family: arial;
+                margin-top: 10mm;
+            }
+            .note {
+                font-size: 9pt;
+                font-family: arial;
+            }
+        </style>
+    </xpath>
 
-	<table name="stock_move_table" position="attributes">
-		<attribute name="class" separator=" " add="trimada table-borderless"/>
-	</table>
+    <table name="stock_move_table" position="attributes">
+        <attribute name="class" separator=" " add="trimada table-borderless"/>
+    </table>
 
-	<table name="stock_backorder_table" position="attributes">
-		<attribute name="class" separator=" " add="trimada table-borderless"/>
-	</table>
+    <table name="stock_backorder_table" position="attributes">
+        <attribute name="class" separator=" " add="trimada table-borderless"/>
+    </table>
 
 </data>
diff --git a/snippets/stock.report_delivery_document.title_supplement.xml b/snippets/stock.report_delivery_document.title_supplement.xml
index bbd26884..80557a7f 100644
--- a/snippets/stock.report_delivery_document.title_supplement.xml
+++ b/snippets/stock.report_delivery_document.title_supplement.xml
@@ -2,9 +2,7 @@
 <data inherit_id="stock.report_delivery_document" priority="50">
 
   <xpath expr="//h2" position="replace">
-    <h2>
-      Delivery Slip <span t-field="o.name"/>
-    </h2>
+    <h2>Delivery Slip <span t-field="o.name"/></h2>
   </xpath>
 
 </data>
\ No newline at end of file
diff --git a/snippets/stock.report_label.aersolution.xml b/snippets/stock.report_label.aersolution.xml
new file mode 100644
index 00000000..5bc9cace
--- /dev/null
+++ b/snippets/stock.report_label.aersolution.xml
@@ -0,0 +1,27 @@
+<t t-name="stock.report_label.aersolution">
+    <t t-foreach="range(0, label_qty)" t-as="label_qty">
+
+        <div class="row">
+            <div class="col-6">
+               <img t-if="company_id.logo" t-att-src="image_data_uri(company_id.logo)" style="max-width: 180px;" alt="Logo"/>
+            </div>
+            <div class="col-6">
+                <strong><t t-esc="company_id.partner_id.name"/><br/>
+                <t t-esc="company_id.partner_id.country_id.code"/>-<t t-esc="company_id.partner_id.zip"/> <t t-esc="company_id.partner_id.city"/></strong>
+            </div>
+        </div>
+        
+        <br/>
+        
+        <p t-esc="product_id.display_name"/>
+
+        <p><span style="margin-right: 8px;">LS/SN:</span><t t-esc="lot_id.name if lot_id else picking.name"/></p>
+
+        <p t-if="lot_id.expiration_date"><span style="margin-right: 8px;">EXP:</span><span t-field="lot_id.expiration_date" t-options="{'widget': 'date'}"/></p>
+
+         <t t-set="putaway_rule_id" t-value="product_id.putaway_rule_ids[:1]"/>
+        <p><span style="margin-right: 8px;">LOC:</span><span t-esc="putaway_rule_id.location_out_id.display_name if putaway_rule_id else 'WH/Stock'"/></p>
+
+        <p style="page-break-before:always;"/>
+    </t>
+</t>
\ No newline at end of file
diff --git a/snippets/stock.report_lot_label.aersolution.xml b/snippets/stock.report_lot_label.aersolution.xml
new file mode 100644
index 00000000..730ab38b
--- /dev/null
+++ b/snippets/stock.report_lot_label.aersolution.xml
@@ -0,0 +1,16 @@
+<t t-name="stock.report_lot_label.aersolution">
+    <t t-call="web.basic_layout">
+        <div class="page">
+
+            <t t-foreach="docs" t-as="lot">
+                <t t-set="label_qty" t-value="1"/>
+                <t t-set="company_id" t-value="lot.company_id"/>
+                <t t-set="lot_id" t-value="lot"/>
+                <t t-set="product_id" t-value="lot.product_id"/>
+
+                <t t-call="mint_system.stock.report_label.aersolution"/>
+            </t>
+
+        </div>
+    </t>
+</t>
\ No newline at end of file
diff --git a/snippets/stock.report_picking.format_qty_available.xml b/snippets/stock.report_picking.format_qty_available.xml
index fea95207..7892aab5 100644
--- a/snippets/stock.report_picking.format_qty_available.xml
+++ b/snippets/stock.report_picking.format_qty_available.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <data inherit_id="stock.report_picking" priority="60">
 
-	<span id="qty_available" position="attributes">
-		<attribute name="t-options-widget">"integer"</attribute>
-	</span>
+    <span id="qty_available" position="attributes">
+        <attribute name="t-options-widget">"integer"</attribute>
+    </span>
 
 </data>
\ No newline at end of file
diff --git a/snippets/stock.report_picking.product_description.xml b/snippets/stock.report_picking.product_description.xml
index 233fd198..b284ee83 100644
--- a/snippets/stock.report_picking.product_description.xml
+++ b/snippets/stock.report_picking.product_description.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0"?>
 <data inherit_id="stock.report_picking" priority="50">
 
-	<xpath expr="//td[@id='description_picking']" position="replace">
+    <xpath expr="//td[@id='description_picking']" position="replace">
 
-		<td id="description_picking">
-			<strong>
-				<span t-esc="move.product_id.type_description"/>
-			</strong>
-			<br/>
-			<t t-if="move.description_picking">
-			  <span t-esc="move.description_picking"/>
-      	<br/>
-			</t>
-			<t t-if="not move.description_picking">
-				<span t-esc="move.product_id.name"/>
-				<br/>
-			</t>
-			<span id="description_pickingout" t-field="move.product_id.description_pickingout"/>
-		</td>
-	</xpath>
+        <td id="description_picking">
+            <strong>
+                <span t-esc="move.product_id.type_description"/>
+            </strong>
+            <br/>
+            <t t-if="move.description_picking">
+              <span t-esc="move.description_picking"/>
+          <br/>
+            </t>
+            <t t-if="not move.description_picking">
+                <span t-esc="move.product_id.name"/>
+                <br/>
+            </t>
+            <span id="description_pickingout" t-field="move.product_id.description_pickingout"/>
+        </td>
+    </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 4d0926bc..b4033d0d 100644
--- a/snippets/stock.report_picking.relocate_quantity.xml
+++ b/snippets/stock.report_picking.relocate_quantity.xml
@@ -1,35 +1,35 @@
 <?xml version="1.0"?>
 <data inherit_id="stock.report_picking" priority="50">
 
-	<xpath expr="//th[@id='product_uom_qty']" position="replace"/>
+    <xpath expr="//th[@id='product_uom_qty']" position="replace"/>
 
-	<xpath expr="//th[@id='th_to']" position="after">
-		<th id="product_uom_qty">
-			<strong>Quantity</strong>
-		</th>
-	</xpath>
+    <xpath expr="//th[@id='th_to']" position="after">
+        <th id="product_uom_qty">
+            <strong>Quantity</strong>
+        </th>
+    </xpath>
 
   <xpath expr="//td[@id='product_uom_qty']" position="replace"/>
   
   <xpath expr="//td[@id='location_dest_id']" position="after">
-		<td id="product_uom_qty">
-		  
-			<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"/>
-			<span id="qty_available_uom_id" t-field="ml.product_id.uom_id"/>
-		</td>
-	</xpath>
+        <td id="product_uom_qty">
+          
+            <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"/>
+            <span id="qty_available_uom_id" t-field="ml.product_id.uom_id"/>
+        </td>
+    </xpath>
 
 </data>
\ No newline at end of file
diff --git a/snippets/stock.report_picking.replace_barcode.xml b/snippets/stock.report_picking.replace_barcode.xml
index d3738634..25b77ef2 100644
--- a/snippets/stock.report_picking.replace_barcode.xml
+++ b/snippets/stock.report_picking.replace_barcode.xml
@@ -1,19 +1,19 @@
 <?xml version="1.0"?>
 <data inherit_id="stock.report_picking" priority="50">
 
-	<xpath expr="//td[@id='barcode']" position="replace">
+    <xpath expr="//td[@id='barcode']" position="replace">
 
-		<td id="barcode" class="trimada" t-if="has_barcode">
-			<t t-if="product_barcode != move.product_id.barcode">
-				<span t-if="move.product_id and move.product_id.barcode">
-					<img t-if="len(move.product_id.barcode) == 13" t-att-src="'/report/barcode/?type=%s&amp;value=%s&amp;width=%s&amp;height=%s&amp;quiet=%s' % ('EAN13', move.product_id.barcode, 290, 100, 0)" style="height:35px" alt="Barcode"/>
-					<img t-elif="len(move.product_id.barcode) == 8" t-att-src="'/report/barcode/?type=%s&amp;value=%s&amp;width=%s&amp;height=%s&amp;quiet=%s' % ('EAN8', move.product_id.barcode, 290, 100, 0)" style="height:35px" alt="Barcode"/>
-					<img t-else="" t-att-src="'/report/barcode/?type=%s&amp;value=%s&amp;width=%s&amp;height=%s&amp;quiet=%s' % ('Code128', move.product_id.barcode, 290, 100, 0)" style="height:35px" alt="Barcode"/>
+        <td id="barcode" class="trimada" t-if="has_barcode">
+            <t t-if="product_barcode != move.product_id.barcode">
+                <span t-if="move.product_id and move.product_id.barcode">
+                    <img t-if="len(move.product_id.barcode) == 13" t-att-src="'/report/barcode/?type=%s&amp;value=%s&amp;width=%s&amp;height=%s&amp;quiet=%s' % ('EAN13', move.product_id.barcode, 290, 100, 0)" style="height:35px" alt="Barcode"/>
+                    <img t-elif="len(move.product_id.barcode) == 8" t-att-src="'/report/barcode/?type=%s&amp;value=%s&amp;width=%s&amp;height=%s&amp;quiet=%s' % ('EAN8', move.product_id.barcode, 290, 100, 0)" style="height:35px" alt="Barcode"/>
+                    <img t-else="" t-att-src="'/report/barcode/?type=%s&amp;value=%s&amp;width=%s&amp;height=%s&amp;quiet=%s' % ('Code128', move.product_id.barcode, 290, 100, 0)" style="height:35px" alt="Barcode"/>
 
-				</span>
-				<t t-set="product_barcode" t-value="move.product_id.barcode"/>
-			</t>
-		</td>
+                </span>
+                <t t-set="product_barcode" t-value="move.product_id.barcode"/>
+            </t>
+        </td>
 
-	</xpath>
+    </xpath>
 </data>
\ No newline at end of file
diff --git a/snippets/stock.report_picking.replace_header.xml b/snippets/stock.report_picking.replace_header.xml
index 2e122184..ce172b48 100644
--- a/snippets/stock.report_picking.replace_header.xml
+++ b/snippets/stock.report_picking.replace_header.xml
@@ -1,34 +1,34 @@
 <?xml version="1.0"?>
 <data inherit_id="stock.report_picking" priority="50">
 
-	<xpath expr="//div[@name='right_box']/.." position="replace">
+    <xpath expr="//div[@name='right_box']/.." position="replace">
 
-		<style>
-			table.trimada_header {
-				width: 100%;
-				font-family: arial;
-				font-size: 18pt;
-				font-weight: bold;
-				border:solid 1px;
-			}
-			table.trimada_header td {
-				padding-left: 10px;
-				vertical-align: middle;
-				padding: 5px;
-			}
-		</style>
+        <style>
+            table.trimada_header {
+                width: 100%;
+                font-family: arial;
+                font-size: 18pt;
+                font-weight: bold;
+                border:solid 1px;
+            }
+            table.trimada_header td {
+                padding-left: 10px;
+                vertical-align: middle;
+                padding: 5px;
+            }
+        </style>
 
-		<table class="trimada_header">
-			<tr>
-				<td>Rüstschein <span t-field="o.name"/>
-				</td>
-				<td>
-					<span>
-						<img t-att-src="'/report/barcode/?type=%s&amp;value=%s&amp;width=%s&amp;height=%s&amp;quiet=0' % ('Code128', o.name, 600, 100)" style="width:210px;height:60px; float:right;" alt="Barcode"/>
-					</span>
-				</td>
-			</tr>
-		</table>
+        <table class="trimada_header">
+            <tr>
+                <td>Rüstschein <span t-field="o.name"/>
+                </td>
+                <td>
+                    <span>
+                        <img t-att-src="'/report/barcode/?type=%s&amp;value=%s&amp;width=%s&amp;height=%s&amp;quiet=0' % ('Code128', o.name, 600, 100)" style="width:210px;height:60px; float:right;" alt="Barcode"/>
+                    </span>
+                </td>
+            </tr>
+        </table>
 
-	</xpath>
+    </xpath>
 </data>
\ No newline at end of file
diff --git a/snippets/stock.report_picking.replace_order_definition.xml b/snippets/stock.report_picking.replace_order_definition.xml
index ec0c250d..a51a85d7 100644
--- a/snippets/stock.report_picking.replace_order_definition.xml
+++ b/snippets/stock.report_picking.replace_order_definition.xml
@@ -4,26 +4,26 @@
   <xpath expr="//div[@name='div_origin']/.." position="replace">
 
     <style>
-			table.trimada_order {
-			  width: 100%;
-				font-size: 11pt;
-				font-family: arial;
-			}
-			table.trimada_order tr {
-			  border-bottom: 1px solid rgb(220,220,220);
-			}
-		 .first_col {
-			  width: 44%;
-			  padding-left: 10px;
-			  padding-top: 5px;
-			  padding-bottom: 5px;
-			}
-			.second_col {
-			  width: 56%;
-			}
-			.last_row {
-			  border-bottom: 0px !important;
-			}
+            table.trimada_order {
+              width: 100%;
+                font-size: 11pt;
+                font-family: arial;
+            }
+            table.trimada_order tr {
+              border-bottom: 1px solid rgb(220,220,220);
+            }
+         .first_col {
+              width: 44%;
+              padding-left: 10px;
+              padding-top: 5px;
+              padding-bottom: 5px;
+            }
+            .second_col {
+              width: 56%;
+            }
+            .last_row {
+              border-bottom: 0px !important;
+            }
     </style>
 
     <table class="trimada_order">
diff --git a/snippets/stock.report_picking.set_ids.xml b/snippets/stock.report_picking.set_ids.xml
index 67625ae3..968400d5 100644
--- a/snippets/stock.report_picking.set_ids.xml
+++ b/snippets/stock.report_picking.set_ids.xml
@@ -1,24 +1,24 @@
 <?xml version="1.0"?>
 <data inherit_id="stock.report_picking" priority="60">
 
-	<xpath expr="//th[@name='th_product']" position="attributes">
-		<attribute name="id">th_product</attribute>
-	</xpath>
+    <xpath expr="//th[@name='th_product']" position="attributes">
+        <attribute name="id">th_product</attribute>
+    </xpath>
 
-	<xpath expr="//th[@name='th_product']/../th[2]" position="attributes">
-		<attribute name="id">product_uom_qty</attribute>
-	</xpath>
+    <xpath expr="//th[@name='th_product']/../th[2]" position="attributes">
+        <attribute name="id">product_uom_qty</attribute>
+    </xpath>
 
-	<xpath expr="//th[@name='th_to']" position="attributes">
-		<attribute name="id">th_to</attribute>
-	</xpath>
+    <xpath expr="//th[@name='th_to']" position="attributes">
+        <attribute name="id">th_to</attribute>
+    </xpath>
 
-	<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>
+    <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 45398ad7..d3a3e87f 100644
--- a/snippets/stock.report_picking.style_trimada.xml
+++ b/snippets/stock.report_picking.style_trimada.xml
@@ -1,99 +1,99 @@
 <?xml version="1.0"?>
 <data inherit_id="stock.report_picking" priority="60">
 
-	<xpath expr="//div[hasclass('page')]" position="before">
-		<style>
-		  p {
-		    font-size: 9pt;
-				font-family: arial;
-		  }
-			table.trimada {
-			  width: 100%;
-				font-size: 9pt;
-				font-family: arial;
-				margin-top: 20px;
-			}
-			table.trimada thead tr {
-				border-top: solid 1px;
-				border-bottom: solid 1px;
-			}
-			table.trimada thead th#position {
-				width: 5mm;
-			}
-			table.trimada thead th#default_code {
-			  width: 27mm;
-			  padding-left: 10px;
-			  text-align: left;
-			}
-			table.trimada thead th#quantity {
-			  width: 25mm;
-			  text-align: right !important;
-			}
-			table.trimada thead th#product_uom_qty {
-			  width: 35mm;
-			  text-align: right;
-			}
-			table.trimada tbody td#position {
-			  text-align: right;
-			}
-			table.trimada tbody tr {
-			  vertical-align: top;
-				border-bottom: 1px solid rgb(220,220,220)
-			}
-			table.trimada tbody td#default_code {
-			  padding-left: 10px;
-			  text-align: left;
-			}
-			table.trimada tbody td span#description_pickingout {
-			  font-style: italic;
-			}
-			table.trimada tbody td#product_uom_qty {
-			  text-align: right;
-			}			
-			table.trimada tbody td span#product_uom_qty {
-			  font-weight: bold;
-			}
-			table.trimada tbody td span#product_uom_qty_done {
-			  font-weight: bold;
-			}
-			table.trimada tbody td span#qty_available {
-			  font-size: 7pt;
-			}
-			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;
-			}
-		  div.address_block {
-			  font-size: 10pt;
-				font-family: arial;
-				margin-top: 20px;
-				margin-left: 10px;
-			}
-			.subtitel {
-				font-size: 11pt;
-				font-family: arial;
-				margin-top: 10mm;
-			}
-			.note {
-				font-size: 9pt;
-				font-family: arial;
-			}
-			.mrp_note {
-				font-size: 9pt;
-				font-family: arial;
-				padding-bottom: 3mm;
-			}
-		</style>
-	</xpath>
+    <xpath expr="//div[hasclass('page')]" position="before">
+        <style>
+          p {
+            font-size: 9pt;
+                font-family: arial;
+          }
+            table.trimada {
+              width: 100%;
+                font-size: 9pt;
+                font-family: arial;
+                margin-top: 20px;
+            }
+            table.trimada thead tr {
+                border-top: solid 1px;
+                border-bottom: solid 1px;
+            }
+            table.trimada thead th#position {
+                width: 5mm;
+            }
+            table.trimada thead th#default_code {
+              width: 27mm;
+              padding-left: 10px;
+              text-align: left;
+            }
+            table.trimada thead th#quantity {
+              width: 25mm;
+              text-align: right !important;
+            }
+            table.trimada thead th#product_uom_qty {
+              width: 35mm;
+              text-align: right;
+            }
+            table.trimada tbody td#position {
+              text-align: right;
+            }
+            table.trimada tbody tr {
+              vertical-align: top;
+                border-bottom: 1px solid rgb(220,220,220)
+            }
+            table.trimada tbody td#default_code {
+              padding-left: 10px;
+              text-align: left;
+            }
+            table.trimada tbody td span#description_pickingout {
+              font-style: italic;
+            }
+            table.trimada tbody td#product_uom_qty {
+              text-align: right;
+            }            
+            table.trimada tbody td span#product_uom_qty {
+              font-weight: bold;
+            }
+            table.trimada tbody td span#product_uom_qty_done {
+              font-weight: bold;
+            }
+            table.trimada tbody td span#qty_available {
+              font-size: 7pt;
+            }
+            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;
+            }
+          div.address_block {
+              font-size: 10pt;
+                font-family: arial;
+                margin-top: 20px;
+                margin-left: 10px;
+            }
+            .subtitel {
+                font-size: 11pt;
+                font-family: arial;
+                margin-top: 10mm;
+            }
+            .note {
+                font-size: 9pt;
+                font-family: arial;
+            }
+            .mrp_note {
+                font-size: 9pt;
+                font-family: arial;
+                padding-bottom: 3mm;
+            }
+        </style>
+    </xpath>
 
-.	<xpath expr="//th[@name='th_product']/../../.." position="attributes">
-		<attribute name="class" separator=" " add="trimada table-borderless"/>
-	</xpath>
+.    <xpath expr="//th[@name='th_product']/../../.." position="attributes">
+        <attribute name="class" separator=" " add="trimada table-borderless"/>
+    </xpath>
 
 </data>
\ No newline at end of file
diff --git a/snippets/stock.report_picking_document.tissa.xml b/snippets/stock.report_picking_document.tissa.xml
new file mode 100644
index 00000000..579fc427
--- /dev/null
+++ b/snippets/stock.report_picking_document.tissa.xml
@@ -0,0 +1,123 @@
+<t t-name="report_picking_document.tissa">
+
+  <style>
+    table#info {
+        width: 100%;
+        margin-top: 60px;
+    }
+    table#info tr {
+        font-size: 72px;
+        font-weight: normal;
+    }
+    tr#info_details {
+        font-size: 18px;
+    }
+    table#info_details {
+        width: 100%;
+        font-size: 30px;
+        border-bottom: solid 1px grey;
+        margin-top: 60px;
+        margin-bottom: 60px;
+    }
+    table#info_details th {
+        font-weight: bold;
+    }
+    table#batch {
+        width: 100%;
+        font-size: 72px;
+        font-weight: bold;
+    }
+    table#batch_details {
+         width: 100%;
+         font-size: 40px;
+    }
+  </style>
+
+  <div class="page" style="font-family: Arial, Helvetica, sans-serif"/>
+
+  <tr t-foreach="doc.move_line_ids" t-as="table_line">
+
+    <div class="row">
+      <div class="col-2">
+        <img class="img-fluid" src="/web/image/9446-7fe212a9/230x115mm_1fbg_black_logo%20tissa%20textiles.jpg"/>
+      </div>
+      <div class="col-10" style="font-family: Arial, Helvetica, sans-serif; font-size: 18px">
+        <strong t-field="res_company.display_name"/>
+        <br/>
+        <span t-field="res_company.country_id.code"/>
+        <span> - </span>
+        <span t-field="res_company.zip"/>
+        <span></span>
+        <span t-field="res_company.city"/>
+      </div>
+    </div>
+
+    <table id="info">
+      <tr>
+        <td>
+          <span t-field="table_line.display_name"/>
+        </td>
+        <td style="text-align: right">
+          <img t-att-src="'/report/barcode/?type=%s&amp;value=%s&amp;width=%s&amp;height=%s&amp;quiet=0' % ('Code128', table_line.product_id.product_tmpl_id.barcode, 250, 85)" alt="Barcode"/>
+        </td>
+      </tr>
+
+      <table id="info_details">
+        <tr>
+          <th style="width:33%">Name</th>
+          <th style="width:33%">Lieferant</th>
+          <th style="width:33%">Beschreibung</th>
+        </tr>
+        <tr>
+          <td>
+            <span t-field="table_line.product_id.product_template_attribute_value_ids"/>
+          </td>
+          <td>
+            <span t-field="table_line.product_id.product_template_attribute_value_ids.product_attribute_value_id.x_studio_lieferant"/>
+          </td>
+          <td>
+            <span t-field="table_line.product_id.product_template_attribute_value_ids.product_attribute_value_id.x_studio_beschreibung"/>
+          </td>
+        </tr>
+      </table>
+
+      <table id="batch">
+        <tr>
+          <td>
+            <strong t-field="table_line.lot_id.display_name"/>
+          </td>
+          <td style="text-align: right">
+            <img t-att-src="'/report/barcode/?type=%s&amp;value=%s&amp;width=%s&amp;height=%s&amp;quiet=0' % ('Code128', table_line.lot_id.display_name, 250, 85)" alt="Barcode"/>
+          </td>
+        </tr>
+      </table>
+
+    </table>
+
+    <table id="batch_details">
+      <tr>
+        <td>
+          <span t-field="table_line.qty_done"/>
+          <span></span>
+          <span t-field="table_line.product_uom_id.display_name"/>
+          <img style="padding-left:25px" t-att-src="'/report/barcode/?type=%s&amp;value=%s&amp;width=%s&amp;height=%s&amp;quiet=0' % ('Code128', table_line.qty_done, 250, 40)" alt="Barcode"/>
+        </td>
+      </tr>
+
+      <tr>
+        <td>
+          <span t-field="table_line.lot_id.unit_on_lot"/>
+          <span> Spulen</span>
+        </td>
+      </tr>
+      <td>
+        <span>Einlagerungsdatum: </span>
+        <span t-field="table_line.create_date" t-options='{"widget": "date"}'/>
+      </td>
+
+    </table>
+
+    <p style="page-break-after: always;"/>
+
+  </tr>
+</t>
\ No newline at end of file
diff --git a/snippets/stock.report_reception_report_label.aersolution.xml b/snippets/stock.report_reception_report_label.aersolution.xml
new file mode 100644
index 00000000..d8a98bd6
--- /dev/null
+++ b/snippets/stock.report_reception_report_label.aersolution.xml
@@ -0,0 +1,19 @@
+<t t-name="stock.report_reception_report_label.aersolution">
+    <t t-call="web.basic_layout">
+        <div class="page">
+
+            <t t-foreach="docs" t-as="picking">
+                <t t-foreach="picking.move_line_ids.filtered(lambda m: m.qty_done &gt; 0.0)" t-as="move_line">
+
+                    <t t-set="label_qty" t-value="move_line.move_id.x_label_qty"/>
+                    <t t-set="company_id" t-value="picking.company_id"/>
+                    <t t-set="lot_id" t-value="move_line.lot_id"/>
+                    <t t-set="product_id" t-value="move_line.product_id"/>
+
+                    <t t-call="mint_system.stock.report_label.aersolution"/>
+                </t>
+            </t>
+
+        </div>
+    </t>
+</t>
\ No newline at end of file
diff --git a/snippets/stock.search_product_lot_filter.filter_active.xml b/snippets/stock.search_product_lot_filter.filter_active.xml
new file mode 100644
index 00000000..477e354c
--- /dev/null
+++ b/snippets/stock.search_product_lot_filter.filter_active.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<data inherit_id="stock.search_product_lot_filter" priority="50">
+
+  <field name="product_id" position="after">
+    <filter name="active" string="Archiviert" domain="[('active', '=', False)]"/>
+  </field>
+
+</data>
diff --git a/snippets/stock.stock_report_delivery_aggregated_move_lines.replace_description.xml b/snippets/stock.stock_report_delivery_aggregated_move_lines.replace_description.xml
index 128fa133..a1bbb0f9 100644
--- a/snippets/stock.stock_report_delivery_aggregated_move_lines.replace_description.xml
+++ b/snippets/stock.stock_report_delivery_aggregated_move_lines.replace_description.xml
@@ -9,3 +9,18 @@
   </xpath>
 
 </data>
+
+<!--
+<data inherit_id="stock.stock_report_delivery_aggregated_move_lines" priority="49">
+
+  <xpath expr="//td[1]/span" position="replace">
+    <span style="font-weight: bold" t-esc="aggregated_lines[line]['product']['name']"/>
+    <br/>
+      Product Code: <span t-esc="aggregated_lines[line]['product']['default_code']"/>
+  <br/>
+  <t t-if="aggregated_lines[line]['hs_code']">HS-Code: <span t-esc="aggregated_lines[line]['hs_code']"/>
+  </t>
+</xpath>
+
+</data>
+-->
\ No newline at end of file
diff --git a/snippets/stock.view_location_form.show_barcode.xml b/snippets/stock.view_location_form.show_barcode.xml
new file mode 100644
index 00000000..90937bb0
--- /dev/null
+++ b/snippets/stock.view_location_form.show_barcode.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<data inherit_id="stock.view_location_form" priority="50">
+
+  <xpath expr="//group[@name='additional_info']//field[@name='replenish_location']" position="after">
+    <field name="barcode"/>
+  </xpath>
+
+</data>
\ No newline at end of file
diff --git a/snippets/stock.view_location_form.show_id.xml b/snippets/stock.view_location_form.show_id.xml
new file mode 100644
index 00000000..b20dd1f8
--- /dev/null
+++ b/snippets/stock.view_location_form.show_id.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<data inherit_id="stock.view_location_form" priority="50">
+
+  <xpath expr="//group[@name='additional_info']//field[@name='replenish_location']" position="after">
+    <field name="id"/>
+  </xpath>
+
+</data>
\ No newline at end of file
diff --git a/snippets/stock.view_move_tree.show_date.xml b/snippets/stock.view_move_tree.show_date.xml
index ceacce2a..174f2249 100644
--- a/snippets/stock.view_move_tree.show_date.xml
+++ b/snippets/stock.view_move_tree.show_date.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <data inherit_id="stock.view_move_tree" priority="50">
 
-  <field name="location_dest_id" position="after">
-    <field name="date" optional="hide" />
+  <field name="date" position="attributes">
+    <attribute name="groups"></attribute>
   </field>
 
 </data>
diff --git a/snippets/stock.view_picking_form.x_client_order_ref.xml b/snippets/stock.view_picking_form.x_client_order_ref.xml
new file mode 100644
index 00000000..aa1dadac
--- /dev/null
+++ b/snippets/stock.view_picking_form.x_client_order_ref.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<data inherit_id="stock.view_picking_form" priority="50">
+
+  <field name="origin" position="after">
+    <field name="x_client_order_ref"/>
+  </field>
+
+</data>
\ No newline at end of file
diff --git a/snippets/stock.view_picking_form.x_date_order.xml b/snippets/stock.view_picking_form.x_date_order.xml
new file mode 100644
index 00000000..5d62ddb5
--- /dev/null
+++ b/snippets/stock.view_picking_form.x_date_order.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<data inherit_id="stock.view_picking_form" priority="50">
+
+  <field name="origin" position="after">
+    <field name="x_date_order"/>
+  </field>
+
+</data>
\ No newline at end of file
diff --git a/snippets/stock.view_picking_form.x_label_qty.xml b/snippets/stock.view_picking_form.x_label_qty.xml
new file mode 100644
index 00000000..9b11d137
--- /dev/null
+++ b/snippets/stock.view_picking_form.x_label_qty.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<data inherit_id="stock.view_picking_form" priority="50">
+
+  <field name="product_uom" position="after">
+    <field name="x_label_qty" optional="show"/>
+  </field>
+
+</data>
diff --git a/snippets/stock.view_picking_form.x_vst.xml b/snippets/stock.view_picking_form.x_vst.xml
new file mode 100644
index 00000000..aff887f1
--- /dev/null
+++ b/snippets/stock.view_picking_form.x_vst.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<data inherit_id="stock.view_picking_form" priority="50">
+
+  <field name="origin" position="after">
+    <field name="x_vst"/>
+  </field>
+
+</data>
\ No newline at end of file
diff --git a/snippets/stock.view_stock_quant_tree_editable.x_expiration_date.xml b/snippets/stock.view_stock_quant_tree_editable.x_expiration_date.xml
new file mode 100644
index 00000000..1e33f66a
--- /dev/null
+++ b/snippets/stock.view_stock_quant_tree_editable.x_expiration_date.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<data inherit_id="stock.view_stock_quant_tree_editable" priority="50">
+
+    <field name="removal_date" position="after">
+      <field name="x_expiration_date" optional="show"/>
+    </field>
+
+</data>
diff --git a/snippets/stock.vpicktree.format_date_deadline.xml b/snippets/stock.vpicktree.format_date_deadline.xml
new file mode 100644
index 00000000..66c44597
--- /dev/null
+++ b/snippets/stock.vpicktree.format_date_deadline.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<data inherit_id="stock.vpicktree" priority="50">
+
+  <xpath expr="//field[@name='date_deadline']" position="attributes">
+    <attribute name="widget">date</attribute>
+  </xpath>
+
+</data>
diff --git a/snippets/stock.vpicktree.format_scheduled_date.xml b/snippets/stock.vpicktree.format_scheduled_date.xml
new file mode 100644
index 00000000..22229ef6
--- /dev/null
+++ b/snippets/stock.vpicktree.format_scheduled_date.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<data inherit_id="stock.vpicktree" priority="50">
+
+  <xpath expr="//field[@name='scheduled_date']" position="attributes">
+    <attribute name="widget">date</attribute>
+  </xpath>
+
+</data>
diff --git a/snippets/stock.vpicktree.modify_invisible_scheduled_date.xml b/snippets/stock.vpicktree.modify_invisible_scheduled_date.xml
new file mode 100644
index 00000000..7df97ba2
--- /dev/null
+++ b/snippets/stock.vpicktree.modify_invisible_scheduled_date.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<data inherit_id="stock.vpicktree" priority="50">
+
+  <xpath expr="//field[@name='scheduled_date']" position="attributes">
+    <attribute name="attrs">{'invisible': [('state', 'in' , 'cancel')]}</attribute>
+  </xpath>
+
+</data>
\ No newline at end of file
diff --git a/snippets/stock.vpicktree.x_client_order_ref.xml b/snippets/stock.vpicktree.x_client_order_ref.xml
new file mode 100644
index 00000000..06a24dda
--- /dev/null
+++ b/snippets/stock.vpicktree.x_client_order_ref.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<data inherit_id="stock.vpicktree" priority="50">
+  <xpath expr="//field[@name='origin']" position="after">
+    <field name="client_order_ref" optional="show"/>
+  </xpath>
+</data>
\ No newline at end of file
diff --git a/snippets/stock.vpicktree.x_date_order.xml b/snippets/stock.vpicktree.x_date_order.xml
new file mode 100644
index 00000000..66a58f5f
--- /dev/null
+++ b/snippets/stock.vpicktree.x_date_order.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<data inherit_id="stock.vpicktree" priority="50">
+  <xpath expr="//field[@name='origin']" position="after">
+    <field name="x_date_order" optional="show"/>
+  </xpath>
+</data>
\ No newline at end of file
diff --git a/snippets/survey.layout.remove_brand_promotion_message.xml b/snippets/survey.layout.remove_brand_promotion_message.xml
new file mode 100644
index 00000000..a9c44dc3
--- /dev/null
+++ b/snippets/survey.layout.remove_brand_promotion_message.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<data inherit_id="survey.layout" priority="50">
+
+  <div t-call="web.brand_promotion_message" position="replace" />
+
+</data>
diff --git a/snippets/survey.layout.set_head_title.xml b/snippets/survey.layout.set_head_title.xml
new file mode 100644
index 00000000..317f33f2
--- /dev/null
+++ b/snippets/survey.layout.set_head_title.xml
@@ -0,0 +1,10 @@
+<data inherit_id="survey.layout" priority="50">
+
+  <xpath expr="//head" position="before">
+    <t t-if="survey">
+      <t t-set="title" t-value="('Sozialinfo - ' + survey.title) if survey else 'Odoo'"/>
+      <t t-set="x_icon" t-value="'/web/image?model=res.company&amp;id=1&amp;field=favicon'"/>
+    </t>
+  </xpath>
+
+</data>
\ No newline at end of file
diff --git a/snippets/survey.md b/snippets/survey.md
index 446faf14..252c0a31 100644
--- a/snippets/survey.md
+++ b/snippets/survey.md
@@ -1,4 +1,34 @@
 # Survey
+## Layout  
+### Remove Brand Promotion Message  
+ID: `mint_system.survey.layout.remove_brand_promotion_message`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="survey.layout" priority="50">
+
+  <div t-call="web.brand_promotion_message" position="replace" />
+
+</data>
+
+```
+Source: [snippets/survey.layout.remove_brand_promotion_message.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/survey.layout.remove_brand_promotion_message.xml)
+
+### Set Head Title  
+ID: `mint_system.survey.layout.set_head_title`  
+```xml
+<data inherit_id="survey.layout" priority="50">
+
+  <xpath expr="//head" position="before">
+    <t t-if="survey">
+      <t t-set="title" t-value="('Sozialinfo - ' + survey.title) if survey else 'Odoo'"/>
+      <t t-set="x_icon" t-value="'/web/image?model=res.company&amp;id=1&amp;field=favicon'"/>
+    </t>
+  </xpath>
+
+</data>
+```
+Source: [snippets/survey.layout.set_head_title.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/survey.layout.set_head_title.xml)
+
 ## Survey Question Form  
 ### Add Button Start Survey  
 ID: `mint_system.survey.survey_question_form.add_button_start_survey`  
diff --git a/snippets/web.brand_promotion_message.remove.xml b/snippets/web.brand_promotion_message.remove.xml
index 751a9b0e..5855dbcc 100644
--- a/snippets/web.brand_promotion_message.remove.xml
+++ b/snippets/web.brand_promotion_message.remove.xml
@@ -2,7 +2,7 @@
 <data inherit_id="web.brand_promotion_message" priority="50">
 
   <xpath expr="//t[@name='Brand Promotion Message']" position="replace">
-  	<t name="Brand Promotion Message" t-name="web.brand_promotion_message"></t>
+      <t name="Brand Promotion Message" t-name="web.brand_promotion_message"></t>
   </xpath>
 
 </data>
diff --git a/snippets/web.external_layout_boxed.hide_company_details.xml b/snippets/web.external_layout_boxed.hide_company_details.xml
new file mode 100644
index 00000000..0dd9adbb
--- /dev/null
+++ b/snippets/web.external_layout_boxed.hide_company_details.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<data inherit_id="web.external_layout_boxed" priority="50">
+
+  <xpath expr="//div[@name='company_address']/.." position="replace"/>
+  
+</data>
\ No newline at end of file
diff --git a/snippets/web.external_layout_boxed.increase_logo_size.xml b/snippets/web.external_layout_boxed.increase_logo_size.xml
new file mode 100644
index 00000000..de68c078
--- /dev/null
+++ b/snippets/web.external_layout_boxed.increase_logo_size.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<data inherit_id="web.external_layout_boxed" priority="50">
+
+  <xpath expr="//img[@t-if='company.logo']" position="attributes">
+        <attribute name="style">width: 720px; margin-top: 10px</attribute>
+  </xpath>
+
+</data>
\ No newline at end of file
diff --git a/snippets/web.external_layout_standard.header_styles.xml b/snippets/web.external_layout_standard.header_styles.xml
index ac6d7cf4..596df2bf 100644
--- a/snippets/web.external_layout_standard.header_styles.xml
+++ b/snippets/web.external_layout_standard.header_styles.xml
@@ -3,9 +3,9 @@
 
   <xpath expr="/t/div" position="before">
     <style>
-	    h2 {
-	      font-size: 18px;
-	    }	                          
+        h2 {
+          font-size: 18px;
+        }                              
     </style>
 
   </xpath>
diff --git a/snippets/web.external_layout_standard.remove_contact.xml b/snippets/web.external_layout_standard.remove_contact.xml
index a88437e8..f32d29aa 100644
--- a/snippets/web.external_layout_standard.remove_contact.xml
+++ b/snippets/web.external_layout_standard.remove_contact.xml
@@ -3,7 +3,7 @@
 <data inherit_id="web.external_layout_standard" priority="50">
 
   <!-- Works until Odoo 14.0 -->
-	<xpath expr="//li[@t-if='company.phone']" position="replace">
+    <xpath expr="//li[@t-if='company.phone']" position="replace">
   </xpath>
   <xpath expr="//li[@t-if='company.email']" position="replace">
   </xpath>
diff --git a/snippets/web.external_layout_standard.replace_footer.xml b/snippets/web.external_layout_standard.replace_footer.xml
index f141fd34..234429fa 100644
--- a/snippets/web.external_layout_standard.replace_footer.xml
+++ b/snippets/web.external_layout_standard.replace_footer.xml
@@ -5,11 +5,11 @@
     <div t-attf-class="footer o_standard_footer o_company_#{company.id}_layout">
       <div align="right" style="color:black; font-size:9pt">
          Page: <span class="page"/>
- /        <span class="topage"/>
-      </div>
+ /      <span class="topage"/>
     </div>
+  </div>
 
-    <!--
+  <!--
     <div t-attf-class="footer o_standard_footer o_company_#{company.id}_layout">
       <div align="right">
          Seite: <span class="page"/>
@@ -17,7 +17,82 @@
       </div>
     </div>
     -->
-    
+
 </xpath>
 
-</data>
\ No newline at end of file
+</data>
+
+<!--
+<data inherit_id="web.external_layout_standard" priority="50">
+
+<xpath expr="/t/div[3]" position="replace">
+
+  <div t-attf-class="footer o_standard_footer o_company_#{company.id}_layout">
+
+    <style>
+        
+       .footer_table {
+            width: 80%;
+            font-size: 9pt;
+            white-space: nowrap;
+            margin: 0 auto;
+            }
+        .footer_table span {
+            margin-right: 0px;
+            }
+       .footer_table th {
+            font-weight: bold;
+            }
+    </style>
+
+    <table class="footer_table" style="width: 85%;">
+      <tr>
+        <td>
+          <span style="font-weight: bold" t-field="company.partner_id"/>
+        </td>
+        <td>
+          <span t-field="company.street"/>,
+        </td>
+        <td>
+          <span t-field="company.zip"/>
+        </td>
+        <td>
+          <span t-field="company.city"/>
+        </td>
+        <th>Bank: </th>
+        <td>
+          <span t-field="company.partner_id.bank_ids.bank_name"/>
+        </td>
+        <th>Account Owner:</th>
+        <td>
+          <span t-field="company.partner_id.bank_ids.partner_id"/>
+        </td>
+      </tr>
+    </table>
+    <table class="footer_table" style="width: 90%;">
+      <tr>
+        <th>BIC:</th>
+        <td>
+          <span t-field="company.partner_id.bank_ids.bank_id.bic"/>
+        </td>
+        <th>IBAN:</th>
+        <td>
+              CH48 0900 0000 1537 2934 4
+        </td>
+        <th>VAT no.:</th>
+        <td>
+          <span t-field="company.company_registry"/>
+        </td>
+        <th>VAT identification number:</th>
+        <td>
+              DE355924262
+        </td>
+      </tr>
+    </table>
+
+  </div>
+
+</xpath>
+
+</data>
+-->
\ No newline at end of file
diff --git a/snippets/web.external_layout_standard.replace_url.xml b/snippets/web.external_layout_standard.replace_url.xml
index 339ccb71..64e8ff49 100644
--- a/snippets/web.external_layout_standard.replace_url.xml
+++ b/snippets/web.external_layout_standard.replace_url.xml
@@ -4,7 +4,7 @@
 
   <!-- 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>
+      <li t-if="company.website" class="list-inline-item d-inline">www.example.ch</li>
   </xpath>
 
 </data>
diff --git a/snippets/web.external_layout_standard.show_sale_order_in_footer.xml b/snippets/web.external_layout_standard.show_sale_order_in_footer.xml
new file mode 100644
index 00000000..9ad55204
--- /dev/null
+++ b/snippets/web.external_layout_standard.show_sale_order_in_footer.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<data inherit_id="web.external_layout_standard" priority="50">
+
+  <xpath expr="//div[3]/div[1]" position="before">
+    <span t-if="xmlid == 'sale.report_saleorder'" /> 
+  </xpath>
+
+</data>
diff --git a/snippets/web.external_layout_standard.style_header.xml b/snippets/web.external_layout_standard.style_header.xml
new file mode 100644
index 00000000..1323d983
--- /dev/null
+++ b/snippets/web.external_layout_standard.style_header.xml
@@ -0,0 +1,7 @@
+<data inherit_id="web.external_layout_standard" priority="50">
+
+  <xpath expr="//div[@class='col-12'][1]/div[1]" position="attributes">
+      <attribute name="style">border-bottom: 0px ;</attribute>
+  </xpath>
+
+</data>
diff --git a/snippets/web.external_layout_standard.tissa_layout.xml b/snippets/web.external_layout_standard.tissa_layout.xml
new file mode 100644
index 00000000..9aeb5698
--- /dev/null
+++ b/snippets/web.external_layout_standard.tissa_layout.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0"?>
+<t t-name="web.external_layout_standard">
+        <div t-attf-class="header o_company_#{company.id}_layout" t-att-style="report_header_style">
+            <div class="row">
+                <div class="col-3 mb4">
+                    <img t-if="company.logo" t-att-src="image_data_uri(company.logo)" style="max-height: 45px;" alt="Logo"/>
+                </div>
+                <div class="col-9 text-right" style="margin-top:22px;" t-field="company.report_header" name="moto"/>
+            </div>
+            <div t-if="company.logo or company.report_header" class="row zero_min_height">
+                <div class="col-12">
+                    <div style="border-bottom: 1px solid black;"/>
+                </div>
+            </div>
+            <div class="row">
+                <div class="col-6" name="company_address">
+                    <div t-field="company.partner_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>
+        </div>
+
+        <div t-attf-class="article o_report_layout_standard o_company_#{company.id}_layout" t-att-data-oe-model="o and o._name" t-att-data-oe-id="o and o.id" t-att-data-oe-lang="o and o.env.context.get('lang')">
+            <div class="pt-5">
+                <!-- This div ensures that the address is not cropped by the header. -->
+                <t t-call="web.address_layout"/>
+            </div>
+            <t t-raw="0"/>
+        </div>
+
+        <div t-attf-class="footer o_standard_footer o_company_#{company.id}_layout">
+            <div class="text-center" style="border-top: 1px solid black;">
+                <ul class="list-inline mb4">
+                    <!-- using the list-inline-item class from bootstrap causes weird behaviours in pdf report
+                         adding d-inline class fixes the problem-->
+                    <li t-if="company.phone" class="list-inline-item d-inline"><span class="o_force_ltr" t-field="company.phone"/></li>
+                    <li t-if="company.email" class="list-inline-item d-inline"><span t-field="company.email"/></li>
+                    <li t-if="company.website" class="list-inline-item d-inline"><span t-field="company.website"/></li>
+                    <li t-if="company.vat" class="list-inline-item d-inline"><t t-esc="company.country_id.vat_label or 'Tax ID'"/>: <span t-field="company.vat"/></li>
+                </ul>
+
+                <div name="financial_infos">
+                    <span t-field="company.report_footer"/>
+                </div>
+
+                <div t-if="report_type == 'pdf'" class="text-muted">
+                    Page: <span class="page"/> / <span class="topage"/>
+                </div>
+            </div>
+        </div>
+    </t>
+
+    
\ No newline at end of file
diff --git a/snippets/web.internal_layout.header_styles.xml b/snippets/web.internal_layout.header_styles.xml
index 13b14b25..4b1a9027 100644
--- a/snippets/web.internal_layout.header_styles.xml
+++ b/snippets/web.internal_layout.header_styles.xml
@@ -3,9 +3,9 @@
 
   <xpath expr="/t/div" position="before">
     <style>
-	    h2 {
-	      font-size: 18px;
-	    }	                          
+        h2 {
+          font-size: 18px;
+        }                              
     </style>
 
   </xpath>
diff --git a/snippets/web.internal_layout.replace_header.xml b/snippets/web.internal_layout.replace_header.xml
index 8129e9e8..09bfcc78 100644
--- a/snippets/web.internal_layout.replace_header.xml
+++ b/snippets/web.internal_layout.replace_header.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0"?>
 <data inherit_id="web.internal_layout" priority="50">
 
-	<xpath expr="//div[@class='header']" position="replace">
-		<div class="header">
-			<div class="row">
-				<div class="col-4">
-				</div>
-				<div class="col-4 text-center">
-				</div>
-				<div class="col-4 text-right">
-					<img t-if="company.logo" t-att-src="image_data_uri(company.logo)" alt="Logo" style="height:61px; margin-right: 40px;"/>
-				</div>
-			</div>
-		</div>
-	</xpath>
+    <xpath expr="//div[@class='header']" position="replace">
+        <div class="header">
+            <div class="row">
+                <div class="col-4">
+                </div>
+                <div class="col-4 text-center">
+                </div>
+                <div class="col-4 text-right">
+                    <img t-if="company.logo" t-att-src="image_data_uri(company.logo)" alt="Logo" style="height:61px; margin-right: 40px;"/>
+                </div>
+            </div>
+        </div>
+    </xpath>
 
 </data>
\ No newline at end of file
diff --git a/snippets/web.login.remove_login_form.xml b/snippets/web.login.remove_login_form.xml
new file mode 100644
index 00000000..6487c0da
--- /dev/null
+++ b/snippets/web.login.remove_login_form.xml
@@ -0,0 +1,33 @@
+<data inherit_id="web.login" priority="50">
+
+  <xpath expr="//form/div[1]" position="attributes">
+    <attribute name="t-if">'debug=1' in request.httprequest.url</attribute>
+  </xpath>
+
+  <xpath expr="//form/div[2]" position="attributes">
+    <attribute name="t-if">'debug=1' in request.httprequest.url</attribute>
+  </xpath>
+
+  <xpath expr="//form/div[3]" position="attributes">
+    <attribute name="t-if">'debug=1' in request.httprequest.url</attribute>
+  </xpath>
+
+  <xpath expr="//form/div/button[1]" position="attributes">
+    <attribute name="t-if">'debug=1' in request.httprequest.url</attribute>
+  </xpath>
+
+  <xpath expr="//button[@type='submit']/../div[1]" position="attributes">
+    <attribute name="t-if">'debug=1' in request.httprequest.url</attribute>
+  </xpath>
+
+  <xpath expr="//form/div/t/button[1]" position="attributes">
+    <attribute name="t-if">'debug=1' in request.httprequest.url</attribute>
+  </xpath>
+  
+  <xpath expr="//form" position="before">
+    <style>
+      .d-block {display: none !important;}
+    </style>
+  </xpath>
+
+</data>
\ No newline at end of file
diff --git a/snippets/web.md b/snippets/web.md
index 9a48b3a9..7ca91915 100644
--- a/snippets/web.md
+++ b/snippets/web.md
@@ -126,7 +126,7 @@ ID: `mint_system.web.brand_promotion_message.remove`
 <data inherit_id="web.brand_promotion_message" priority="50">
 
   <xpath expr="//t[@name='Brand Promotion Message']" position="replace">
-  	<t name="Brand Promotion Message" t-name="web.brand_promotion_message"></t>
+      <t name="Brand Promotion Message" t-name="web.brand_promotion_message"></t>
   </xpath>
 
 </data>
@@ -192,6 +192,32 @@ ID: `mint_system.web.external_layout_boxed.footer_company_registry`
 ```
 Source: [snippets/web.external_layout_boxed.footer_company_registry.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/web.external_layout_boxed.footer_company_registry.xml)
 
+### Hide Company Details  
+ID: `mint_system.web.external_layout_boxed.hide_company_details`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="web.external_layout_boxed" priority="50">
+
+  <xpath expr="//div[@name='company_address']/.." position="replace"/>
+  
+</data>
+```
+Source: [snippets/web.external_layout_boxed.hide_company_details.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/web.external_layout_boxed.hide_company_details.xml)
+
+### Increase Logo Size  
+ID: `mint_system.web.external_layout_boxed.increase_logo_size`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="web.external_layout_boxed" priority="50">
+
+  <xpath expr="//img[@t-if='company.logo']" position="attributes">
+        <attribute name="style">width: 720px; margin-top: 10px</attribute>
+  </xpath>
+
+</data>
+```
+Source: [snippets/web.external_layout_boxed.increase_logo_size.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/web.external_layout_boxed.increase_logo_size.xml)
+
 ## External Layout Standard  
 ### Eksb Layout  
 ID: `mint_system.web.external_layout_standard.eksb_layout`  
@@ -293,9 +319,9 @@ ID: `mint_system.web.external_layout_standard.header_styles`
 
   <xpath expr="/t/div" position="before">
     <style>
-	    h2 {
-	      font-size: 18px;
-	    }	                          
+        h2 {
+          font-size: 18px;
+        }                              
     </style>
 
   </xpath>
@@ -373,7 +399,7 @@ ID: `mint_system.web.external_layout_standard.remove_contact`
 <data inherit_id="web.external_layout_standard" priority="50">
 
   <!-- Works until Odoo 14.0 -->
-	<xpath expr="//li[@t-if='company.phone']" position="replace">
+    <xpath expr="//li[@t-if='company.phone']" position="replace">
   </xpath>
   <xpath expr="//li[@t-if='company.email']" position="replace">
   </xpath>
@@ -407,11 +433,11 @@ ID: `mint_system.web.external_layout_standard.replace_footer`
     <div t-attf-class="footer o_standard_footer o_company_#{company.id}_layout">
       <div align="right" style="color:black; font-size:9pt">
          Page: <span class="page"/>
- /        <span class="topage"/>
-      </div>
+ /      <span class="topage"/>
     </div>
+  </div>
 
-    <!--
+  <!--
     <div t-attf-class="footer o_standard_footer o_company_#{company.id}_layout">
       <div align="right">
          Seite: <span class="page"/>
@@ -419,10 +445,85 @@ ID: `mint_system.web.external_layout_standard.replace_footer`
       </div>
     </div>
     -->
-    
+
 </xpath>
 
 </data>
+
+<!--
+<data inherit_id="web.external_layout_standard" priority="50">
+
+<xpath expr="/t/div[3]" position="replace">
+
+  <div t-attf-class="footer o_standard_footer o_company_#{company.id}_layout">
+
+    <style>
+        
+       .footer_table {
+            width: 80%;
+            font-size: 9pt;
+            white-space: nowrap;
+            margin: 0 auto;
+            }
+        .footer_table span {
+            margin-right: 0px;
+            }
+       .footer_table th {
+            font-weight: bold;
+            }
+    </style>
+
+    <table class="footer_table" style="width: 85%;">
+      <tr>
+        <td>
+          <span style="font-weight: bold" t-field="company.partner_id"/>
+        </td>
+        <td>
+          <span t-field="company.street"/>,
+        </td>
+        <td>
+          <span t-field="company.zip"/>
+        </td>
+        <td>
+          <span t-field="company.city"/>
+        </td>
+        <th>Bank: </th>
+        <td>
+          <span t-field="company.partner_id.bank_ids.bank_name"/>
+        </td>
+        <th>Account Owner:</th>
+        <td>
+          <span t-field="company.partner_id.bank_ids.partner_id"/>
+        </td>
+      </tr>
+    </table>
+    <table class="footer_table" style="width: 90%;">
+      <tr>
+        <th>BIC:</th>
+        <td>
+          <span t-field="company.partner_id.bank_ids.bank_id.bic"/>
+        </td>
+        <th>IBAN:</th>
+        <td>
+              CH48 0900 0000 1537 2934 4
+        </td>
+        <th>VAT no.:</th>
+        <td>
+          <span t-field="company.company_registry"/>
+        </td>
+        <th>VAT identification number:</th>
+        <td>
+              DE355924262
+        </td>
+      </tr>
+    </table>
+
+  </div>
+
+</xpath>
+
+</data>
+-->
 ```
 Source: [snippets/web.external_layout_standard.replace_footer.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/web.external_layout_standard.replace_footer.xml)
 
@@ -478,7 +579,7 @@ ID: `mint_system.web.external_layout_standard.replace_url`
 
   <!-- 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>
+      <li t-if="company.website" class="list-inline-item d-inline">www.example.ch</li>
   </xpath>
 
 </data>
@@ -520,6 +621,93 @@ ID: `mint_system.web.external_layout_standard.set_header_footer_font_size`
 ```
 Source: [snippets/web.external_layout_standard.set_header_footer_font_size.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/web.external_layout_standard.set_header_footer_font_size.xml)
 
+### Show Sale Order In Footer  
+ID: `mint_system.web.external_layout_standard.show_sale_order_in_footer`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="web.external_layout_standard" priority="50">
+
+  <xpath expr="//div[3]/div[1]" position="before">
+    <span t-if="xmlid == 'sale.report_saleorder'" /> 
+  </xpath>
+
+</data>
+
+```
+Source: [snippets/web.external_layout_standard.show_sale_order_in_footer.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/web.external_layout_standard.show_sale_order_in_footer.xml)
+
+### Style Header  
+ID: `mint_system.web.external_layout_standard.style_header`  
+```xml
+<data inherit_id="web.external_layout_standard" priority="50">
+
+  <xpath expr="//div[@class='col-12'][1]/div[1]" position="attributes">
+      <attribute name="style">border-bottom: 0px ;</attribute>
+  </xpath>
+
+</data>
+
+```
+Source: [snippets/web.external_layout_standard.style_header.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/web.external_layout_standard.style_header.xml)
+
+### Tissa Layout  
+ID: `mint_system.web.external_layout_standard.tissa_layout`  
+```xml
+<?xml version="1.0"?>
+<t t-name="web.external_layout_standard">
+        <div t-attf-class="header o_company_#{company.id}_layout" t-att-style="report_header_style">
+            <div class="row">
+                <div class="col-3 mb4">
+                    <img t-if="company.logo" t-att-src="image_data_uri(company.logo)" style="max-height: 45px;" alt="Logo"/>
+                </div>
+                <div class="col-9 text-right" style="margin-top:22px;" t-field="company.report_header" name="moto"/>
+            </div>
+            <div t-if="company.logo or company.report_header" class="row zero_min_height">
+                <div class="col-12">
+                    <div style="border-bottom: 1px solid black;"/>
+                </div>
+            </div>
+            <div class="row">
+                <div class="col-6" name="company_address">
+                    <div t-field="company.partner_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>
+        </div>
+
+        <div t-attf-class="article o_report_layout_standard o_company_#{company.id}_layout" t-att-data-oe-model="o and o._name" t-att-data-oe-id="o and o.id" t-att-data-oe-lang="o and o.env.context.get('lang')">
+            <div class="pt-5">
+                <!-- This div ensures that the address is not cropped by the header. -->
+                <t t-call="web.address_layout"/>
+            </div>
+            <t t-raw="0"/>
+        </div>
+
+        <div t-attf-class="footer o_standard_footer o_company_#{company.id}_layout">
+            <div class="text-center" style="border-top: 1px solid black;">
+                <ul class="list-inline mb4">
+                    <!-- using the list-inline-item class from bootstrap causes weird behaviours in pdf report
+                         adding d-inline class fixes the problem-->
+                    <li t-if="company.phone" class="list-inline-item d-inline"><span class="o_force_ltr" t-field="company.phone"/></li>
+                    <li t-if="company.email" class="list-inline-item d-inline"><span t-field="company.email"/></li>
+                    <li t-if="company.website" class="list-inline-item d-inline"><span t-field="company.website"/></li>
+                    <li t-if="company.vat" class="list-inline-item d-inline"><t t-esc="company.country_id.vat_label or 'Tax ID'"/>: <span t-field="company.vat"/></li>
+                </ul>
+
+                <div name="financial_infos">
+                    <span t-field="company.report_footer"/>
+                </div>
+
+                <div t-if="report_type == 'pdf'" class="text-muted">
+                    Page: <span class="page"/> / <span class="topage"/>
+                </div>
+            </div>
+        </div>
+    </t>
+
+    
+```
+Source: [snippets/web.external_layout_standard.tissa_layout.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/web.external_layout_standard.tissa_layout.xml)
+
 ## External Layout  
 ### Worksheet  
 ID: `mint_system.web.external_layout.worksheet`  
@@ -569,9 +757,9 @@ ID: `mint_system.web.internal_layout.header_styles`
 
   <xpath expr="/t/div" position="before">
     <style>
-	    h2 {
-	      font-size: 18px;
-	    }	                          
+        h2 {
+          font-size: 18px;
+        }                              
     </style>
 
   </xpath>
@@ -585,19 +773,19 @@ ID: `mint_system.web.internal_layout.replace_header`
 <?xml version="1.0"?>
 <data inherit_id="web.internal_layout" priority="50">
 
-	<xpath expr="//div[@class='header']" position="replace">
-		<div class="header">
-			<div class="row">
-				<div class="col-4">
-				</div>
-				<div class="col-4 text-center">
-				</div>
-				<div class="col-4 text-right">
-					<img t-if="company.logo" t-att-src="image_data_uri(company.logo)" alt="Logo" style="height:61px; margin-right: 40px;"/>
-				</div>
-			</div>
-		</div>
-	</xpath>
+    <xpath expr="//div[@class='header']" position="replace">
+        <div class="header">
+            <div class="row">
+                <div class="col-4">
+                </div>
+                <div class="col-4 text-center">
+                </div>
+                <div class="col-4 text-right">
+                    <img t-if="company.logo" t-att-src="image_data_uri(company.logo)" alt="Logo" style="height:61px; margin-right: 40px;"/>
+                </div>
+            </div>
+        </div>
+    </xpath>
 
 </data>
 ```
@@ -695,6 +883,46 @@ ID: `mint_system.web.login_layout.disable_footer`
 ```
 Source: [snippets/web.login_layout.disable_footer.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/web.login_layout.disable_footer.xml)
 
+## Login  
+### Remove Login Form  
+ID: `mint_system.web.login.remove_login_form`  
+```xml
+<data inherit_id="web.login" priority="50">
+
+  <xpath expr="//form/div[1]" position="attributes">
+    <attribute name="t-if">'debug=1' in request.httprequest.url</attribute>
+  </xpath>
+
+  <xpath expr="//form/div[2]" position="attributes">
+    <attribute name="t-if">'debug=1' in request.httprequest.url</attribute>
+  </xpath>
+
+  <xpath expr="//form/div[3]" position="attributes">
+    <attribute name="t-if">'debug=1' in request.httprequest.url</attribute>
+  </xpath>
+
+  <xpath expr="//form/div/button[1]" position="attributes">
+    <attribute name="t-if">'debug=1' in request.httprequest.url</attribute>
+  </xpath>
+
+  <xpath expr="//button[@type='submit']/../div[1]" position="attributes">
+    <attribute name="t-if">'debug=1' in request.httprequest.url</attribute>
+  </xpath>
+
+  <xpath expr="//form/div/t/button[1]" position="attributes">
+    <attribute name="t-if">'debug=1' in request.httprequest.url</attribute>
+  </xpath>
+  
+  <xpath expr="//form" position="before">
+    <style>
+      .d-block {display: none !important;}
+    </style>
+  </xpath>
+
+</data>
+```
+Source: [snippets/web.login.remove_login_form.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/web.login.remove_login_form.xml)
+
 ## Styles Company Report  
 ### Set Font  
 ID: `mint_system.web.styles_company_report.set_font`  
diff --git a/snippets/website_sale.address.hide_shipping_use_same.xml b/snippets/website_sale.address.hide_shipping_use_same.xml
new file mode 100644
index 00000000..67a9fb94
--- /dev/null
+++ b/snippets/website_sale.address.hide_shipping_use_same.xml
@@ -0,0 +1,7 @@
+<data inherit_id="website_sale.address" priority="50">
+  
+    <xpath expr="//input[@id='shipping_use_same']/.." position="attributes">
+            <attribute name="style">display: none;</attribute>
+        </xpath>
+    
+</data>
\ No newline at end of file
diff --git a/snippets/website_sale.address.overwrite_required.xml b/snippets/website_sale.address.overwrite_required.xml
index 4dad59e4..17885352 100644
--- a/snippets/website_sale.address.overwrite_required.xml
+++ b/snippets/website_sale.address.overwrite_required.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0"?>
-<!-- Set required field and change formatting -->
 <data inherit_id="website_sale.address" priority="50">
 
   <xpath expr="//input[@name='field_required']" position="replace">
diff --git a/snippets/website_sale.address.show_firstname_lastname.xml b/snippets/website_sale.address.show_firstname_lastname.xml
new file mode 100644
index 00000000..3f306eae
--- /dev/null
+++ b/snippets/website_sale.address.show_firstname_lastname.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<data inherit_id="website_sale.address" priority="50">
+
+  <xpath expr="//input[@name='name']/.." position="after">
+    <div t-attf-class="mb-3 #{error.get('firstname') and 'o_has_error' or ''} col-lg-12 div_firstname">
+      <label class="col-form-label" for="firstname">Firstname</label>
+      <input type="text" name="firstname" t-attf-class="form-control #{error.get('firstname') and 'is-invalid' or ''}" t-att-value="'firstname' in checkout and checkout['firstname']"/>
+    </div>
+      <div t-attf-class="mb-3 #{error.get('lastname') and 'o_has_error' or ''} col-lg-12 div_lastname">
+      <label class="col-form-label" for="lastname">Lastname</label>
+      <input type="text" name="lastname" t-attf-class="form-control #{error.get('lastname') and 'is-invalid' or ''}" t-att-value="'lastname' in checkout and checkout['lastname']"/>
+    </div>
+  </xpath>
+
+  <xpath expr="//input[@name='name']/.." position="attributes">
+    <attribute name="style">display: none</attribute>
+  </xpath>
+
+</data>
diff --git a/snippets/website_sale.md b/snippets/website_sale.md
index b4e8f962..af8e4018 100644
--- a/snippets/website_sale.md
+++ b/snippets/website_sale.md
@@ -1,10 +1,22 @@
 # Website Sale
 ## Address  
+### Hide Shipping Use Same  
+ID: `mint_system.website_sale.address.hide_shipping_use_same`  
+```xml
+<data inherit_id="website_sale.address" priority="50">
+  
+    <xpath expr="//input[@id='shipping_use_same']/.." position="attributes">
+            <attribute name="style">display: none;</attribute>
+        </xpath>
+    
+</data>
+```
+Source: [snippets/website_sale.address.hide_shipping_use_same.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/website_sale.address.hide_shipping_use_same.xml)
+
 ### Overwrite Required  
 ID: `mint_system.website_sale.address.overwrite_required`  
 ```xml
 <?xml version="1.0"?>
-<!-- Set required field and change formatting -->
 <data inherit_id="website_sale.address" priority="50">
 
   <xpath expr="//input[@name='field_required']" position="replace">
@@ -36,6 +48,45 @@ ID: `mint_system.website_sale.address.overwrite_required`
 ```
 Source: [snippets/website_sale.address.overwrite_required.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/website_sale.address.overwrite_required.xml)
 
+### Show Firstname Lastname  
+ID: `mint_system.website_sale.address.show_firstname_lastname`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="website_sale.address" priority="50">
+
+  <xpath expr="//input[@name='name']/.." position="after">
+    <div t-attf-class="mb-3 #{error.get('firstname') and 'o_has_error' or ''} col-lg-12 div_firstname">
+      <label class="col-form-label" for="firstname">Firstname</label>
+      <input type="text" name="firstname" t-attf-class="form-control #{error.get('firstname') and 'is-invalid' or ''}" t-att-value="'firstname' in checkout and checkout['firstname']"/>
+    </div>
+      <div t-attf-class="mb-3 #{error.get('lastname') and 'o_has_error' or ''} col-lg-12 div_lastname">
+      <label class="col-form-label" for="lastname">Lastname</label>
+      <input type="text" name="lastname" t-attf-class="form-control #{error.get('lastname') and 'is-invalid' or ''}" t-att-value="'lastname' in checkout and checkout['lastname']"/>
+    </div>
+  </xpath>
+
+  <xpath expr="//input[@name='name']/.." position="attributes">
+    <attribute name="style">display: none</attribute>
+  </xpath>
+
+</data>
+
+```
+Source: [snippets/website_sale.address.show_firstname_lastname.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/website_sale.address.show_firstname_lastname.xml)
+
+## Payment Confirmation Status  
+### Remove Communication  
+ID: `mint_system.website_sale.payment_confirmation_status.remove_communication`  
+```xml
+<?xml version="1.0"?>
+<data inherit_id="website_sale.payment_confirmation_status" priority="50">
+
+  <xpath expr="//div[@t-if='order.reference']" position="replace" />
+
+</data>
+```
+Source: [snippets/website_sale.payment_confirmation_status.remove_communication.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/website_sale.payment_confirmation_status.remove_communication.xml)
+
 ## Products Categories  
 ### Bigger Categories Button  
 ID: `mint_system.website_sale.products_categories.bigger_categories_button`  
@@ -44,15 +95,70 @@ ID: `mint_system.website_sale.products_categories.bigger_categories_button`
 <!-- Add class to categories button -->
 <data inherit_id="website_sale.products_categories" priority="50">
 
-	<xpath expr="//button" position="replace">
-	  <button type="button" class="btn btn-secondary d-lg-none mb-2"
-		  data-target="#wsale_products_categories_collapse" data-toggle="collapse">
-		  Show categories
-	  </button>
-	</xpath>
+    <xpath expr="//button" position="replace">
+      <button type="button" class="btn btn-secondary d-lg-none mb-2"
+          data-target="#wsale_products_categories_collapse" data-toggle="collapse">
+          Show categories
+      </button>
+    </xpath>
 
 </data>
 
 ```
 Source: [snippets/website_sale.products_categories.bigger_categories_button.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/website_sale.products_categories.bigger_categories_button.xml)
 
+## Product  
+### Show Product Dimension  
+ID: `mint_system.website_sale.product.show_product_dimension`  
+```xml
+<?xml version="1.0"?>
+
+<data inherit_id="website_sale.product" priority="50">
+
+    <xpath expr="//div[@id='product_details']" position="inside">
+        <div t-if="product_variant.material_ids" name="material_ids">
+            <strong>Dimensions</strong>: <br />
+            <ul class="un-styled">
+                <t t-foreach="product_variant.dimension_ids" t-as="dimension">
+                    <li>
+                        <span t-field="dimension.name" />
+                        <t t-if="dimension.value">
+                            <span t-field="dimension.value" />
+                        </t>
+                    </li>
+                </t>
+            </ul>
+        </div>
+    </xpath>
+
+</data>
+```
+Source: [snippets/website_sale.product.show_product_dimension.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/website_sale.product.show_product_dimension.xml)
+
+### Show Product Material  
+ID: `mint_system.website_sale.product.show_product_material`  
+```xml
+<?xml version="1.0"?>
+
+<data inherit_id="website_sale.product" priority="50">
+
+    <xpath expr="//div[@id='product_details']" position="inside">
+        <div t-if="product_variant.material_ids" name="material_ids">
+            <strong>Materials</strong>: <br />
+            <ul class="un-styled">
+                <t t-foreach="product_variant.material_ids" t-as="material">
+                    <li>
+                        <span t-field="material.name" />
+                        <t t-if="material.percent">
+                            <span t-field="material.percent" />
+                        </t>
+                    </li>
+                </t>
+            </ul>
+        </div>
+    </xpath>
+
+</data>
+```
+Source: [snippets/website_sale.product.show_product_material.xml](https://github.com/Mint-System/Odoo-Build/tree/14.0/snippets/website_sale.product.show_product_material.xml)
+
diff --git a/snippets/website_sale.payment_confirmation_status.remove_communication.xml b/snippets/website_sale.payment_confirmation_status.remove_communication.xml
new file mode 100644
index 00000000..54838717
--- /dev/null
+++ b/snippets/website_sale.payment_confirmation_status.remove_communication.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<data inherit_id="website_sale.payment_confirmation_status" priority="50">
+
+  <xpath expr="//div[@t-if='order.reference']" position="replace" />
+
+</data>
\ No newline at end of file
diff --git a/snippets/website_sale.product.show_product_dimension.xml b/snippets/website_sale.product.show_product_dimension.xml
new file mode 100644
index 00000000..473ba45e
--- /dev/null
+++ b/snippets/website_sale.product.show_product_dimension.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+
+<data inherit_id="website_sale.product" priority="50">
+
+    <xpath expr="//div[@id='product_details']" position="inside">
+        <div t-if="product_variant.material_ids" name="material_ids">
+            <strong>Dimensions</strong>: <br />
+            <ul class="un-styled">
+                <t t-foreach="product_variant.dimension_ids" t-as="dimension">
+                    <li>
+                        <span t-field="dimension.name" />
+                        <t t-if="dimension.value">
+                            <span t-field="dimension.value" />
+                        </t>
+                    </li>
+                </t>
+            </ul>
+        </div>
+    </xpath>
+
+</data>
\ No newline at end of file
diff --git a/snippets/website_sale.product.show_product_material.xml b/snippets/website_sale.product.show_product_material.xml
new file mode 100644
index 00000000..89c02744
--- /dev/null
+++ b/snippets/website_sale.product.show_product_material.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+
+<data inherit_id="website_sale.product" priority="50">
+
+    <xpath expr="//div[@id='product_details']" position="inside">
+        <div t-if="product_variant.material_ids" name="material_ids">
+            <strong>Materials</strong>: <br />
+            <ul class="un-styled">
+                <t t-foreach="product_variant.material_ids" t-as="material">
+                    <li>
+                        <span t-field="material.name" />
+                        <t t-if="material.percent">
+                            <span t-field="material.percent" />
+                        </t>
+                    </li>
+                </t>
+            </ul>
+        </div>
+    </xpath>
+
+</data>
\ No newline at end of file
diff --git a/snippets/website_sale.products_categories.bigger_categories_button.xml b/snippets/website_sale.products_categories.bigger_categories_button.xml
index 035ca5ec..155b0339 100644
--- a/snippets/website_sale.products_categories.bigger_categories_button.xml
+++ b/snippets/website_sale.products_categories.bigger_categories_button.xml
@@ -2,11 +2,11 @@
 <!-- Add class to categories button -->
 <data inherit_id="website_sale.products_categories" priority="50">
 
-	<xpath expr="//button" position="replace">
-	  <button type="button" class="btn btn-secondary d-lg-none mb-2"
-		  data-target="#wsale_products_categories_collapse" data-toggle="collapse">
-		  Show categories
-	  </button>
-	</xpath>
+    <xpath expr="//button" position="replace">
+      <button type="button" class="btn btn-secondary d-lg-none mb-2"
+          data-target="#wsale_products_categories_collapse" data-toggle="collapse">
+          Show categories
+      </button>
+    </xpath>
 
 </data>
diff --git a/task b/task
index 4ed91cfe..6427df9f 100755
--- a/task
+++ b/task
@@ -1,5 +1,5 @@
 #!/bin/bash
-cd "$(dirname "$0")"
+cd "$(dirname "$0")" || exit
 
 function help() {
 echo
@@ -13,20 +13,48 @@ echo
 
 # Set env vars
 PATH="$PATH:./odoo"
-GIT_TAG=0
 GIT_BRANCH=$(git symbolic-ref --short -q HEAD)
-OS_RELEASE=$(awk -F= '/^NAME/{print $2}' /etc/os-release)
+OS_RELEASE=$(awk -F= '/^NAME/{print "$2"}' /etc/os-release)
 
 export POSTGRES_USER=odoo
 export POSTGRES_PASSWORD=odoo
-export ODOO_REVISION=$GIT_BRANCH
+export ODOO_REVISION="$GIT_BRANCH"
 export ODOO_LANGUAGE=de_CH
 export ODOO_DEVELOPMENT_CONFIG_DIR="$HOME/.config/odoo-build"
+export LC_ALL=en_US.UTF-8
+export LANG=en_US.UTF-8
 
-if [[ -a ".env" ]]; then
+if [[ -a ".env" && "$(cat .env | sed 's/#.*//g')" ]]; then
     export $(cat .env | sed 's/#.*//g' | xargs)
 fi
 
+function set-addons-path() {
+    # Read addons path list
+    ADDONS_PATH="$(git config --file .gitmodules --get-regexp path | awk '{ print $2 }' | tr '\n' ',' |  sed 's/,*$//g')"
+
+    # Append env var
+    ADDONS_PATH="${ADDONS_PATH}${ODOO_ADDONS_PATH}"
+
+    EXCLUDES="addons/theme_mint_system addons/company addons/web"
+    for EXCLUDE in $EXCLUDES; do
+        ADDONS_PATH=$(echo "$ADDONS_PATH" | sed "s|${EXCLUDE},||g")
+    done
+
+    # Check if dir exists
+    for ADDON in $ADDONS_PATH; do
+        if [ -d "$ADDON" ]; then
+            echo "Path does not exist: $ADDON"
+            exit 1
+        fi
+    done
+
+    # Convert to docker paths
+    DOCKER_ADDONS_PATH="$(echo $ADDONS_PATH | sed 's|,|,/mnt/|g' | sed 's|,/mnt/odoo||g')"
+
+    # Replace odoo path
+    ADDONS_PATH="$(echo $ADDONS_PATH | sed 's|,odoo,|,odoo/addons,|g')"
+}
+
 function update-readme() {
     if test -z "$1"; then echo "\$1 is empty."; exit; fi
     FILE_NAME=$(basename "$1")
@@ -38,12 +66,12 @@ function update-readme() {
     # Find marker in readme and clear content after
     echo "Clear modules table for $1."
     MARKER="## Available modules"
-    sed -i "/$MARKER/Q" $1
+    sed -i "/$MARKER/Q" "$1"
 
-    echo "$MARKER" >> $1
-    echo "" >> $1
-    echo "| Module | Summary |" >> $1
-    echo "| --- | --- |" >> $1
+    echo "$MARKER" >> "$1"
+    echo "" >> "$1"
+    echo "| Module | Summary |" >> "$1"
+    echo "| --- | --- |" >> "$1"
 
     # Clear table after a marker
     for MANIFEST_FILE in $MANIFEST_FILES; do
@@ -51,7 +79,7 @@ function update-readme() {
         MODULE_NAME=$(basename "$MODULE_DIR")
         echo "Add summary of $MODULE_NAME to readme file."
         SUMMARY=$(grep 'summary' "$MANIFEST_FILE" -A 1 | tail -1)
-        echo "| [$MODULE_NAME]($MODULE_NAME) | $SUMMARY |" >> $1
+        echo "| [$MODULE_NAME]($MODULE_NAME) | $SUMMARY |" >> "$1"
     done
 }
 
@@ -61,9 +89,8 @@ function get-module-version() {
         echo "\$1 is empty."
     else
         # Get version of module
-        VERSION=$(grep -m 1 version "$1/__manifest__.py" |  sed "s;';\";g"  | sed "s/,//g" )
+        VERSION=$(grep -m 1 version "$1/__manifest__.py" |  sed "s;';\";g"  | sed "s/,//g" | sed  's/#.*//g')
         VERSION=$(echo "{ $VERSION }" | jq .version | sed 's/"//g' | sed 's/null//g')
-
         # Set default version
         [ -z "$VERSION" ] && VERSION=0.0
 
@@ -77,7 +104,7 @@ function get-module-version() {
             VERSION="$GIT_BRANCH.$VERSION"
         fi
 
-        echo $VERSION
+        echo "$VERSION"
     fi
 }
 
@@ -94,11 +121,6 @@ function activate-venv() {
     echo "$(python --version) is active."
 }
 
-function locale() {
-    export LC_ALL=en_US.UTF-8
-    export LANG=en_US.UTF-8
-}
-
 function load-env() {
     ENV_FILE="$ODOO_DEVELOPMENT_CONFIG_DIR/.env.$1"
     echo "Load env file $ENV_FILE"
@@ -108,23 +130,23 @@ function load-env() {
 
 function disable-auto-install() {
     echo "Disable auto install for all enterprise modules."
-    find ./enterprise -type f -name '__manifest__.py' -exec sed -i'' $'s/\'auto_install\': True,/\'auto_install\': False,/g' {} +
+    find . -type f -name '__manifest__.py' -exec sed -i'' $'s/\'auto_install\': True,/\'auto_install\': False,/g' {} +
 }
 
 function install-odoo-scripts() {
-    curl -L https://raw.githubusercontent.com/mint-system/ansible-build/master/roles/odoo_scripts/files/install | sh
+    curl -L https://raw.githubusercontent.com/mint-system/ansible-build/master/roles/odoo_scripts/files/install | bash
 }
 
 function install-native() {    
     init-venv
     activate-venv
     
-    if [[ "Ubuntu|Debian" =~ "$OS_RELEASE" ]]; then
+    if [[ "Ubuntu|Debian" =~ $OS_RELEASE ]]; then
 
         # Source: https://gist.github.com/faniska/37f896d5e9de5fee925925d7caf3cb9e
         echo "Install wkhtmltopdf"
         sudo apt remove wkhtmltopdf
-        cd ~
+        cd ~ || exit
         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
@@ -151,7 +173,7 @@ function install-native() {
     pip install graphene graphql-server-core
 
     echo "Install rest dependencies"
-    pip install cerberus pyquerystring parse-accept-language apispec>=4.0.0 marshmallow marshmallow-objects>=2.0.0 jsondiff
+    pip install cerberus pyquerystring parse-accept-language apispec\>=4.0.0 marshmallow marshmallow-objects\>=2.0.0 jsondiff
 
     echo "Install openupgrade functions"
     pip install git+https://github.com/OCA/openupgradelib.git@master#egg=openupgradelib
@@ -166,12 +188,14 @@ function install-native() {
 function open-url-with-delay(){
     if test -z "$1"; then echo "\$1 is empty."; exit; fi
     sleep 2
-    xdg-open $1
+    xdg-open "$1"
 }
 
 function start() {    
-    DATABASE=$2
+    set-addons-path
+    
     # Use default database if second param is not given
+    DATABASE="$2"
     if test -z "$2"; then
         DATABASE="$GIT_BRANCH"
     fi
@@ -181,17 +205,6 @@ function start() {
         docker-compose up -d
     fi
 
-    if [[ "$1" =~ "dind" ]]; then
-        docker-compose up -d dind
-    fi
-
-    if [[ "$1" =~ "cd" ]]; then
-        docker-compose up -d cd
-        echo "Open http://localhost:8080 url in your browser."
-        INIT_PASSWORD=$(docker exec cd cat /var/jenkins_home/secrets/initialAdminPassword)
-        echo "The initial password is: $INIT_PASSWORD"
-    fi
-
     if [[ "$1" =~ "db" ]]; then
         docker-compose up -d db
         echo "Open http://localhost:8000 url in your browser."
@@ -203,16 +216,16 @@ function start() {
     fi
 
     if [[ "$1" =~ "odoo" ]]; then
+        # share-filestore
         docker-compose up -d odoo
         echo "Open http://localhost:8069 url in your browser."
     fi
 
     if [[ "$1" =~ "native" ]]; then
-        locale
         activate-venv
         echo "Open http://localhost:8069 url in your browser."
         open-url-with-delay "http://localhost:8069/web?db=$DATABASE" & 
-        odoo-bin --config 'config/odoo-native.conf' --dev=all --log-handler odoo.tools.convert:DEBUG
+        odoo-bin --config "config/odoo-native.conf" --addons-path="$ADDONS_PATH" --dev=all --log-handler odoo.tools.convert:DEBUG
     fi
 
     if [[ "$1" =~ "mail" ]]; then
@@ -238,8 +251,8 @@ function restart() {
         docker-compose restart
     fi
 
-    if [[ "db|mail|odoo" =~ "$1" ]]; then
-        docker-compose restart $1
+    if [[ "db|mail|odoo" =~ $1 ]]; then
+        docker-compose restart "$1"
     fi
 }
 
@@ -248,42 +261,40 @@ function stop() {
         docker-compose stop
     fi
 
-    docker-compose stop $1
+    docker-compose stop "$1"
 }
 
 function start-shell() {
-    DATABASE=$1
+    DATABASE="$1"
     DATABASE=${DATABASE:="$GIT_BRANCH"}
 
-    locale
     activate-venv
-    odoo-bin shell -d $DATABASE --config 'config/odoo-native.conf' --no-http
+    odoo-bin shell -d "$DATABASE" --config 'config/odoo-native.conf' --no-http
 }
 
 function start-psql() {
-    DATABASE=$1
+    DATABASE="$1"
     DATABASE=${DATABASE:="$GIT_BRANCH"}
 
-    docker exec -it db psql postgres://odoo:odoo@localhost:5432/$DATABASE
+    docker exec -it db psql "postgres://odoo:odoo@localhost:5432/$DATABASE"
 }
 
 function init-db() {
-    DATABASE=$1
+    DATABASE="$1"
     DATABASE=${DATABASE:="$GIT_BRANCH"}
 
-    locale
     activate-venv
+    set-addons-path
     echo "Make sure only one odoo process is running when initalizing the database."
-    odoo-bin --init base -d $DATABASE --config 'config/odoo-native.conf' --stop-after-init --no-http --load-language $ODOO_LANGUAGE
+    odoo-bin -d "$DATABASE" -i base --config 'config/odoo-native.conf' --addons-path="$ADDONS_PATH" --stop-after-init --no-http --load-language "$ODOO_LANGUAGE"
 }
 
 function odoo-cloc() {
-    DATABASE=$1
+    DATABASE="$1"
     DATABASE=${DATABASE:="$GIT_BRANCH"}
 
-    locale
     activate-venv
-    odoo-bin cloc -d $DATABASE --config 'config/odoo-native.conf' --stop-after-init --no-http
+    odoo-bin cloc -d "$DATABASE" --config 'config/odoo-native.conf' --stop-after-init --no-http
 }
 
 function lint-module() {
@@ -291,112 +302,121 @@ function lint-module() {
 
     activate-venv
     echo "Set file and folder permissions on $1"
-    find $1 -type d -exec chmod u=rwx,go=rx {} \;
-    find $1 -type f -exec chmod u=rw,go=r {} \;
-    echo "Copy default .gignore"
-    cp template/ms_custom_module/.gitignore "$1"/
-    echo "Run pylint in $1"
-    pylint --load-plugins=pylint_odoo -d all -e odoolint $1
-    cd $1
-    echo "Run pre-commit in $1"
-    pre-commit run --files ./*
+    find "$1" -type d -exec chmod u=rwx,go=rx {} \;
+    find "$1" -type f -exec chmod u=rw,go=r {} \;
+
     echo "Update index.html"
+    cd "$1" || exit
     rst2html5 README.rst static/description/index.html
+
     echo "Stage changes"
     git add .
+
+    cd .. || exit
+    echo "Run pre-commit in $PWD"
+    pre-commit run --all-files
 }
 
 function update-module() {
     if test -z "$1"; then echo "\$1 is empty."; exit; fi
-    # if test -z "$2"; then echo "\$2 is empty."; exit; fi
 
-    DATABASE=$1
-    MODULE_NAME=$(basename $2)
+    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)
+        MODULE_NAME=$(basename "$1")
     fi
 
-    locale
     activate-venv
+    set-addons-path
     echo "Updating module $MODULE_NAME on $DATABASE ..."
-    odoo-bin -d $DATABASE -u $MODULE_NAME --config 'config/odoo-native.conf' --stop-after-init --no-http
+    odoo-bin -d "$DATABASE" -u "$MODULE_NAME" --config 'config/odoo-native.conf' --addons-path="$ADDONS_PATH" --stop-after-init --no-http
 }
 
 function generate-module-translation() {
     if test -z "$1"; then echo "\$1 is empty."; exit; fi
-    # if test -z "$2"; then echo "\$2 is empty."; exit; fi
 
-    DATABASE=$1
-    MODULE_PATH=$2
-    MODULE_NAME=$(basename $2)
-    LANGUAGE=$3    
+    DATABASE="$1"
+    MODULE_PATH="$2"
+    MODULE_NAME=$(basename "$2")
+    LANGUAGE="$3"    
 
     if test -z "$2"; then
         DATABASE="$GIT_BRANCH"
-        MODULE_PATH=$1
-        MODULE_NAME=$(basename $1)
+        MODULE_PATH="$1"
+        MODULE_NAME=$(basename "$1")
     fi
 
     if test -z "$3"; then
         LANGUAGE="$ODOO_LANGUAGE"
     fi
 
-    locale
     activate-venv
+    set-addons-path
     echo "Generate $LANGUAGE tranlsation file for $MODULE_NAME on $DATABASE ..."
     mkdir -p "$MODULE_PATH/i18n/"
-    odoo-bin -d $DATABASE --config 'config/odoo-native.conf' --modules $MODULE_NAME -l $LANGUAGE --i18n-export "$MODULE_PATH/i18n/$LANGUAGE.po"
+    odoo-bin -d "$DATABASE" --config 'config/odoo-native.conf' --addons-path="$ADDONS_PATH" --modules "$MODULE_NAME" -l "$LANGUAGE" --i18n-export "$MODULE_PATH/i18n/$LANGUAGE.po"
+}
+
+function list-addons() {
+    activate-venv
+    set-addons-path
+    echo "$ADDONS_PATH"
 }
 
 function install-module() {
     if test -z "$1"; then echo "\$1 is empty."; exit; fi
 
-    DATABASE=$1
-    MODULE_NAME=$(basename $2)
+    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)
+        MODULE_NAME=$(basename "$1")
     fi
 
-    locale
     activate-venv
+    set-addons-path
     echo "Installing module $MODULE_NAME on $DATABASE ..."
-    odoo-bin -d $DATABASE -i $MODULE_NAME --config 'config/odoo-native.conf' --stop-after-init --no-http
+    odoo-bin -d "$DATABASE" -i "$MODULE_NAME" --config 'config/odoo-native.conf' --addons-path="$ADDONS_PATH" --stop-after-init --no-http
 }
 
 function test-module() {
-    if test -z "$1"; then echo "\$1 is empty."; exit; fi
-    if test -z "$2"; then echo "\$2 is empty."; exit; fi
+    DATABASE="$1"
+    MODULE_NAME=$(basename "$2")
 
-    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
 
-    locale
     activate-venv
-    odoo-bin -d $1 -i $MODULE_NAME --config 'config/odoo-native.conf' --stop-after-init --log-level=test --test-enable
+    set-addons-path
+    echo "Testing module $MODULE_NAME on $DATABASE ..."
+    odoo-bin -d "$DATABASE" -i "$MODULE_NAME" --config 'config/odoo-native.conf' --addons-path="$ADDONS_PATH" --stop-after-init --test-tags /"$MODULE_NAME"
 }
 
 function remove-module() {
     if test -z "$1"; then echo "\$1 is empty."; exit; fi
 
-    DATABASE=$1
-    MODULE_NAME=$(basename $2)
+    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)
+        MODULE_NAME=$(basename "$1")
     fi
 
-    locale
     activate-venv
+    set-addons-path
     echo "Remove module $MODULE_NAME"
     echo "self.env['ir.module.module'].search([('name', '=', '$MODULE_NAME')]).button_immediate_uninstall()" |
-    odoo-bin shell -d $DATABASE --config 'config/odoo-native.conf' --no-http
+    odoo-bin shell -d "$DATABASE" --config 'config/odoo-native.conf' --addons-path="$ADDONS_PATH" --no-http
 }
 
 function create-module() {
@@ -405,37 +425,52 @@ function create-module() {
     MODULE_NAME=$(basename "$1")
     PARENT_DIR=$(dirname "$1")
 
-    locale
     activate-venv
     echo "Scaffolding module $MODULE_NAME in $PARENT_DIR ..."
-    odoo-bin scaffold "$MODULE_NAME" "$PARENT_DIR" -t template/ms_custom_module
+    odoo-bin scaffold "$MODULE_NAME" "$PARENT_DIR" -t template/module
 }
 
 function drop-db() {
-    DATABASE=$1
+    DATABASE="$1"
     DATABASE=${DATABASE:="$GIT_BRANCH"}
 
-    docker exec db psql postgres://odoo:odoo@localhost:5432/postgres -c "SELECT pg_terminate_backend(pid) FROM pg_stat_activity WHERE datname = '$DATABASE';"
-    docker exec db psql postgres://odoo:odoo@localhost:5432/postgres -c "DROP DATABASE \"$DATABASE\";"
+    docker exec db psql "postgres://odoo:odoo@localhost:5432/postgres" -c "SELECT pg_terminate_backend(pid) FROM pg_stat_activity WHERE datname = '$DATABASE';"
+    docker exec db psql "postgres://odoo:odoo@localhost:5432/postgres" -c "DROP DATABASE \"$DATABASE\";"
 }
 
 function set-admin() {
-    DATABASE=$1
+    DATABASE="$1"
     DATABASE=${DATABASE:="$GIT_BRANCH"}
 
-    docker exec db psql postgres://odoo:odoo@localhost:5432/$DATABASE -c "UPDATE res_users SET active=true,password='\$pbkdf2-sha512\$25000\$JuScEwIg5JzTGqNUivFeqw\$yWTOcix2Afr3XGP2NPY7w4w49e9vpsu14NRndDYXAkbtMF4zkrmx6inVsoLl0zZY30xI/0GzhwonWsK9TUmjWA' WHERE id=2;"
-    docker exec db psql postgres://odoo:odoo@localhost:5432/$DATABASE -c "SELECT login, password FROM res_users WHERE id=2;"
+    docker exec db psql "postgres://odoo:odoo@localhost:5432/$DATABASE" -c "UPDATE res_users SET active=true,password='\$pbkdf2-sha512\$25000\$JuScEwIg5JzTGqNUivFeqw\$yWTOcix2Afr3XGP2NPY7w4w49e9vpsu14NRndDYXAkbtMF4zkrmx6inVsoLl0zZY30xI/0GzhwonWsK9TUmjWA' WHERE id=2;"
+    docker exec db psql "postgres://odoo:odoo@localhost:5432/$DATABASE" -c "SELECT login, password FROM res_users WHERE id=2;"
 }
 
 function clear-assets() {
-    DATABASE=$1
+    DATABASE="$1"
     DATABASE=${DATABASE:="$GIT_BRANCH"}
 
-    echo "Delete these assets:"
-    docker exec db psql postgres://odoo:odoo@localhost/$DATABASE -c "select id,name from ir_attachment where res_model='ir.ui.view' and name like '%assets_%';"
-    docker exec db psql postgres://odoo:odoo@localhost/$DATABASE -c "delete from ir_attachment where res_model='ir.ui.view' and name like '%assets_%';"
+    echo "Delete these assets for $DATABASE:"
+    docker exec db psql "postgres://odoo:odoo@localhost/$DATABASE" -c "select id,name from ir_attachment where res_model='ir.ui.view' and name like '%assets_%';"
+    docker exec db psql "postgres://odoo:odoo@localhost/$DATABASE" -c "delete from ir_attachment where res_model='ir.ui.view' and name like '%assets_%';"
+}
 
-    echo "Restart your docker service."
+function reset-views() {
+    if test -z "$1"; then echo "\$1 is empty."; exit; fi
+
+    DATABASE="$1"
+    KEY=$(basename "$2")
+
+    # Use default database if second param is not given 
+    if test -z "$2"; then
+        DATABASE="$GIT_BRANCH"
+        KEY=$(basename "$1")
+    fi
+
+    activate-venv
+    echo "Reset views for key $KEY"
+    echo "self.env['ir.ui.view'].search([('key', 'ilike', '$KEY')]).reset_arch(mode='hard')" |
+    odoo-bin shell -d "$DATABASE" --config 'config/odoo-native.conf' --no-http
 }
 
 function convert-database() {
@@ -444,7 +479,7 @@ function convert-database() {
     unzip "tmp/$1.zip" -d "./tmp/$1"
     sed -i'' 's/AS integer//g' "./tmp/$1/dump.sql"
     grep -i 'as integer' "./tmp/$1/dump.sql"
-    cd "tmp/$1" ; zip -r "../${1}2.zip" . ; cd ../..
+    cd "tmp/$1" || exit ; zip -r "../${1}2.zip" . ; cd ../.. || exit
     rm -r "tmp/$1"
     echo "Converted database file $1 to ${1}2"
 }
@@ -453,83 +488,94 @@ function git-update-submodules() {
     echo "Update submodules."
     SUBMODULES=$(git config --file .gitmodules --get-regexp url | sed -e 's/submodule.//g' -e 's/.url.*//g')
     for SUBMODULE in $SUBMODULES; do
-        git submodule update --init $SUBMODULE
+        git submodule update --init "$SUBMODULE"
     done
 }
 
-function switch-branch() {
+function git-switch-branch() {
     if test -z "$1"; then echo "\$1 is empty."; exit; fi
 
     echo "Switch branch on submodules."
     SUBMODULES=$(git config --file .gitmodules --get-regexp url | sed -e 's/submodule.//g' -e 's/.url.*//g')
     for SUBMODULE in $SUBMODULES; do
+        echo "Switch branch to $1 in $SUBMODULE."
         CWD=$(pwd)
-        cd $SUBMODULE
+        cd "$SUBMODULE" || exit
         git stash
-        git switch $1
-        cd $CWD
+        git switch "$1"
+        cd "$CWD" || exit
     done
 }
 
+function checkout-config-files() {
+    if test -z "$1"; then echo "\$1 is empty."; exit; fi
+
+    echo "Checkout config files $1 branch."
+    git checkout "$1" config/checkout_files config/reset_files
+
+    echo "Remove reset files."
+    git rm -r $(tr '\n' ' ' < ./config/reset_files) >/dev/null 2>&1
+
+    echo "Sync checkout files from $1 branch."
+    git checkout "$1" $(tr '\n' ' ' < ./config/checkout_files)
+}
+
 function checkout() {
     if test -z "$1"; then echo "\$1 is empty."; exit; fi
-    : ${GIT_BRANCH:="$2"}
+    if [[ -n "$2" ]]; then
+        GIT_BRANCH="$2"
+    fi
 
     echo "Switch branch."
-    git switch $1
+    git switch "$1"
 
     git-update-submodules
 
-    switch-branch $1
+    git-switch-branch "$1"
 
-    echo "Checkout config files."
-    git checkout $GIT_BRANCH -- config/checkout_files config/reset_files
-    echo "Remove reset files."
-    git rm -r $(tr '\n' ' ' < ./config/reset_files) >/dev/null 2>&1
-    echo "Sync checkout files."
-    git checkout $GIT_BRANCH -- $(tr '\n' ' ' < ./config/checkout_files)
+    checkout-config-files $GIT_BRANCH
 }
 
 function checkout-revision() {
     if test -z "$1"; then echo "\$1 is empty."; exit; fi
  
-    cd odoo
-    git checkout $1
-    cd ..
-    cd enterprise
-    git checkout $1
-    cd ..
-    cd themes
-    git checkout $1
+    cd odoo || exit
+    git checkout "$1"
+    cd .. || exit
+    cd enterprise || exit
+    git checkout "$1"
+    cd .. || exit
+    cd themes || exit
+    git checkout "$1"
 }
 
 function git-pull-submodules() {
     # Pull submodule if update config is not set
     SUBMODULES=$(git config --file .gitmodules --get-regexp url | sed -e 's/submodule.//g' -e 's/.url.*//g')
     for SUBMODULE in $SUBMODULES; do
-        UPDATE=$(git config submodule.$SUBMODULE.update)
+        UPDATE=$(git config submodule."$SUBMODULE".update)
         CWD=$(pwd)
-        cd $SUBMODULE
-        if [ -z $UPDATE ]; then
+        cd "$SUBMODULE" || exit
+        if [ -z "$UPDATE" ]; then
             git pull
         fi;
-        cd $CWD
+        cd "$CWD" || exit
     done
 }
 
 function release-module() {
     if test -z "$1"; then echo "\$1 is empty."; exit; fi
 
-    VERSION=$(get-module-version $1)
-    cd $1
+    VERSION=$(get-module-version "$1")
+    cd "$1" || exit
     LAST_TAG=$(git describe --tags)
-    RELEASE_NOTES=$(git log $LAST_TAG..HEAD --oneline)
+    RELEASE_NOTES=$(git log "$LAST_TAG"..HEAD --oneline)
 
     echo "Tag with v$VERSION ..."
-    git tag -a v$VERSION -m "v$VERSION"
+    git tag -a "v$VERSION" -m "v$VERSION"
 
     echo "Release notes:"
-    echo $RELEASE_NOTES
+    echo "$RELEASE_NOTES"
 
     # echo "Create release $VERSION ..."
     # gh release create "v$VERSION" -t "Release $VERSION"
@@ -539,7 +585,7 @@ function zip-module() {
     if test -z "$1"; then echo "\$1 is empty."; exit; fi
 
     # Get version and module name
-    VERSION=$(get-module-version $1)
+    VERSION=$(get-module-version "$1")
     MODULE=$(basename "$1")
 
     # Copy module to tmp folder
@@ -556,24 +602,24 @@ function zip-module() {
     echo "Remove auto install option"
     sed -i'' -e "s/'auto_install': True,/'auto_install': False,/" "$MODULE_PATH/__manifest__.py"
     echo "Remove pycache and hidden folders"
-    find $MODULE_PATH | grep -E "(\.git|__pycache__|\.pyc|\.pyo$)" | xargs rm -rf
+    find "$MODULE_PATH" | grep -E "(\.git|__pycache__|\.pyc|\.pyo$)" | xargs rm -rf
     echo "Zip module $MODULE"
-    cd tmp
-    rm -f $MODULE_NAME.zip
-    zip -q -r $MODULE_NAME.zip $MODULE_NAME
-    cd ..
+    cd tmp || exit
+    rm -f "$MODULE_NAME".zip
+    zip -q -r "$MODULE_NAME".zip "$MODULE_NAME"
+    cd .. || exit
 }
 
 function clear-filestore() {
     echo "Remove directory ~/.local/share/Odoo/filestore/$1"
-    rm -rf ~/.local/share/Odoo/filestore/$1
+    rm -rf ~/.local/share/Odoo/filestore/"$1"
 }
 
 function disable-mailserver() {
     if test -z "$1"; then echo "\$1 is empty."; exit; fi
 
     activate-venv
-    load-env $1
+    load-env "$1"
     scripts/odooctl --model 'ir.mail_server' --field 'active' --value False
     scripts/odooctl --model 'fetchmail.server' --field 'active' --value False
 }
@@ -582,7 +628,7 @@ function change-uuid() {
     if test -z "$1"; then echo "\$1 is empty."; exit; fi
 
     activate-venv
-    load-env $1
+    load-env "$1"
     UUID=$(uuidgen)
     echo "Set uuid $UUID for $1."
     scripts/odooctl --model 'ir.config_parameter' --domain "['key', '=', 'database.uuid']" --field	'value' --value "'$UUID'"
@@ -590,7 +636,7 @@ function change-uuid() {
 
 function test-jsonrpc() {
     activate-venv
-    [ -n "$1" ] && load-env $1
+    [ -n "$1" ] && load-env "$1"
     scripts/jsonrpc
 }
 
@@ -606,13 +652,13 @@ function update-snippet() {
     if test -z "$2"; then echo "\$2 is empty."; exit; fi
 
     # Generate view name from filename
-    FILE=$(basename $2)
+    FILE=$(basename "$2")
     NAME="mint_system.${FILE%.xml}"
 
     activate-venv
-    load-env $1
+    load-env "$1"
     echo "Update view with name $NAME"
-    scripts/odooctl --model 'ir.ui.view' --domain "['name', '=', '$NAME']" --field 'arch_base' --value "'''$(cat $2)'''"
+    scripts/odooctl --model 'ir.ui.view' --domain "['name', '=', '$NAME']" --field 'arch_base' --value "'''$(cat "$2")'''"
 }
 
 function install-snippet() {
@@ -620,20 +666,20 @@ function install-snippet() {
     if test -z "$2"; then echo "\$2 is empty."; exit; fi
 
     # Generate view name from filename
-    FILE=$(basename $2)
+    FILE=$(basename "$2")
     NAME="mint_system.${FILE%.xml}"
-    INHERIT_ID=$(echo 'cat //data/@inherit_id' | xmllint --shell $2 | awk -F'[="]' '!/>/{print $(NF-1)}')
-    TYPE=$(echo 'cat //data/@type' | xmllint --shell $2 | awk -F'[="]' '!/>/{print $(NF-1)}')
-    MODEL=$(echo 'cat //data/@model' | xmllint --shell $2 | awk -F'[="]' '!/>/{print $(NF-1)}')
-    PRIORITY=$(echo 'cat //data/@priority' | xmllint --shell $2 | awk -F'[="]' '!/>/{print $(NF-1)}')
-    MODULE_NAME=$(echo $INHERIT_ID | cut -d. -f 1 )
-    XML_ID=$(echo $INHERIT_ID | cut -d. -f 2 )
+    INHERIT_ID=$(echo 'cat //data/@inherit_id' | xmllint --shell "$2" | awk -F'[="]' '!/>/{print $(NF-1)}')
+    TYPE=$(echo 'cat //data/@type' | xmllint --shell "$2" | awk -F'[="]' '!/>/{print $(NF-1)}')
+    MODEL=$(echo 'cat //data/@model' | xmllint --shell "$2" | awk -F'[="]' '!/>/{print $(NF-1)}')
+    PRIORITY=$(echo 'cat //data/@priority' | xmllint --shell "$2" | awk -F'[="]' '!/>/{print $(NF-1)}')
+    MODULE_NAME=$(echo "$INHERIT_ID" | cut -d. -f 1 )
+    XML_ID=$(echo "$INHERIT_ID" | cut -d. -f 2 )
 
     # Set default values
     : ${TYPE:='qweb'}
 
     activate-venv
-    load-env $1
+    load-env "$1"
     echo "Search for view with name $MODULE_NAME.$XML_ID"
     INHERIT_ID=$(scripts/odooctl --method 'get_id' --model 'ir.model.data' --value "['$MODULE_NAME','$XML_ID']")
     echo "Found view id $INHERIT_ID"
@@ -645,7 +691,7 @@ function install-snippet() {
         'mode': 'extension',
         'priority': $PRIORITY, 
         'inherit_id': $INHERIT_ID, 
-        'arch_base': '''$(cat $2)'''
+        'arch_base': '''$(cat "$2")'''
     }"
 }
 
@@ -655,20 +701,20 @@ function lint-snippets() {
     for FILE in $FILES; do
 
         # Access various snippet parameters
-        FILENAME=$(basename $FILE)
-        SNIPPET_MODULE=$(echo $FILENAME | cut -d. -f1)
-        REPORT=$(echo $FILENAME | cut -d. -f2)
-        EDIT=$(echo $FILENAME | cut -d. -f3)
-        INHERIT_ID=$(echo 'cat //data/@inherit_id' | xmllint --shell $FILE | awk -F'[="]' '!/>/{print $(NF-1)}')
-        TYPE=$(echo 'cat //data/@type' | xmllint --shell $FILE | awk -F'[="]' '!/>/{print $(NF-1)}')
-        MODEL=$(echo 'cat //data/@model' | xmllint --shell $FILE | awk -F'[="]' '!/>/{print $(NF-1)}')
-        PRIORITY=$(echo 'cat //data/@priority' | xmllint --shell $FILE | awk -F'[="]' '!/>/{print $(NF-1)}')
-        MODULE_NAME=$(echo $INHERIT_ID | cut -d. -f 1 )
-        XML_ID=$(echo $INHERIT_ID | cut -d. -f 2 )
+        FILENAME=$(basename "$FILE")
+        SNIPPET_MODULE=$(echo "$FILENAME" | cut -d. -f1)
+        REPORT=$(echo "$FILENAME" | cut -d. -f2)
+        EDIT=$(echo "$FILENAME" | cut -d. -f3)
+        INHERIT_ID=$(echo 'cat //data/@inherit_id' | xmllint --shell "$FILE" | awk -F'[="]' '!/>/{print $(NF-1)}')
+        TYPE=$(echo 'cat //data/@type' | xmllint --shell "$FILE" | awk -F'[="]' '!/>/{print $(NF-1)}')
+        MODEL=$(echo 'cat //data/@model' | xmllint --shell "$FILE" | awk -F'[="]' '!/>/{print $(NF-1)}')
+        PRIORITY=$(echo 'cat //data/@priority' | xmllint --shell "$FILE" | awk -F'[="]' '!/>/{print $(NF-1)}')
+        MODULE_NAME=$(echo "$INHERIT_ID" | cut -d. -f 1 )
+        XML_ID=$(echo "$INHERIT_ID" | cut -d. -f 2 )
 
         # Check filename 
-        COUNT_DOTS=$(echo $FILENAME | grep -o "\." | wc -l)
-        if [ $COUNT_DOTS -ge 4 ]; then
+        COUNT_DOTS=$(echo "$FILENAME" | grep -o "\." | wc -l)
+        if [ "$COUNT_DOTS" -ge 4 ]; then
             echo "Linting failed for $FILE"
             echo "Dots count: $COUNT_DOTS"
             echo "  Filename: $SNIPPET_MODULE.$REPORT"
@@ -698,9 +744,8 @@ function lint-snippets() {
 function update-app-list() {
     if test -z "$1"; then echo "\$1 is empty."; exit; fi
 
-    locale
     activate-venv
-    echo "env['ir.module.module'].update_list()" | odoo-bin shell -d $1 --config 'config/odoo-native.conf' --no-http
+    echo "env['ir.module.module'].update_list()" | odoo-bin shell -d "$1" --config 'config/odoo-native.conf' --no-http
 }
 
 function init-config-dir() {
@@ -715,10 +760,10 @@ function init-odoo-env() {
     ENV_FILEPATH="$ODOO_DEVELOPMENT_CONFIG_DIR/.env.$1"
 
     echo "Init env file: $ENV_FILEPATH"
-    echo "#ODOO_URL=" > $ENV_FILEPATH
-    echo "ODOO_DATABASE=" >> $ENV_FILEPATH
-    echo "ODOO_USERNAME=" >> $ENV_FILEPATH
-    echo "ODOO_PASSWORD=" >> $ENV_FILEPATH
+    echo "#ODOO_URL=" > "$ENV_FILEPATH"
+    echo "ODOO_DATABASE=" >> "$ENV_FILEPATH"
+    echo "ODOO_USERNAME=" >> "$ENV_FILEPATH"
+    echo "ODOO_PASSWORD=" >> "$ENV_FILEPATH"
 }
 
 function init-next-env() {
@@ -728,15 +773,15 @@ function init-next-env() {
     ENV_FILEPATH="$ODOO_DEVELOPMENT_CONFIG_DIR/.env.$1"
 
     echo "Init env file: $ENV_FILEPATH"
-    echo "NEXTCLOUD_URL=" > $ENV_FILEPATH
-    echo "NEXTCLOUD_USERNAME=" >> $ENV_FILEPATH
-    echo "NEXTCLOUD_PASSWORD=" >> $ENV_FILEPATH
+    echo "NEXTCLOUD_URL=" > "$ENV_FILEPATH"
+    echo "NEXTCLOUD_USERNAME=" >> "$ENV_FILEPATH"
+    echo "NEXTCLOUD_PASSWORD=" >> "$ENV_FILEPATH"
 }
 
 function edit-env() {
     if test -z "$1"; then echo "\$1 is empty."; exit; fi
     ENV_FILEPATH="$ODOO_DEVELOPMENT_CONFIG_DIR/.env.$1"
-    $EDITOR $ENV_FILEPATH
+    "$EDITOR" "$ENV_FILEPATH"
 }
 
 function upload-module() {
@@ -744,7 +789,7 @@ function upload-module() {
     if test -z "$2"; then echo "\$2 is empty."; exit; fi
 
     # Check if path is root folder
-    MODULES=$2
+    MODULES="$2"
     if [ ! -f "$2/__manifest__.py" ]; then
         echo "Identified as root folder"
         MODULES="$MODULES/*"
@@ -755,11 +800,11 @@ function upload-module() {
         if [ -f "$MODULE/__manifest__.py" ]; then
 
             # Create module zip
-            zip-module $MODULE
+            zip-module "$MODULE"
 
             # Get path to zip file and upload url
             FILE_PATH="tmp/$MODULE_NAME.zip"
-            load-env $1
+            load-env "$1"
             NEXTCLOUD_UPLOAD_URL="$NEXTCLOUD_URL/remote.php/dav/files/$NEXTCLOUD_USERNAME/Odoo-Apps/"
 
             # Upload zip file
@@ -778,47 +823,38 @@ function upload-module() {
 function save-config() {
     if test -z "$1"; then echo "\$1 is empty."; exit; fi
 
-    locale
     activate-venv
-    odoo-bin -s -d $1 --config 'config/odoo-native.conf' --stop-after-init --no-http
+    odoo-bin -s -d "$1" --config 'config/odoo-native.conf' --stop-after-init --no-http
 }
 
 function remove-submodule() {
     if test -z "$1"; then echo "\$1 is empty."; exit; fi
 
     echo "Move submodule to tmp folder"
-    mkdir -p tmp/$1
-    mv $1 tmp/$1
+    mkdir -p tmp/"$1"
+    mv "$1" tmp/"$1"
 
     echo "Deinit submodule"
-    git submodule deinit -f $1
+    git submodule deinit -f "$1"
 
     echo "Remove submodule from .git folder"
-    rm -rf .git/modules/$1
+    rm -rf .git/modules/"$1"
 
     echo "Remove submodule from work tree"
-    git rm -f $1
+    git rm -f "$1"
 
     echo "Remove $1 submodule from .gitmodules files manually."
 }
 
 function update-config() {
 
-    # Read addons path list
-    ADDONS="$(git config --file .gitmodules --get-regexp path | awk '{ print $2 }' | tr '\n' ',' |  sed 's/,*$//g')"
+    set-addons-path
 
-    # Check if dir exists
-    for ADDON in $ADDONS; do
-        if [ -d "$ADDON" ]; then
-            echo "Path does not exist: $ADDON"
-            exit 1
-        fi
-    done
     # Update native config
-    sed -i'' -e "s|addons_path.*|addons_path = odoo/addons,$ADDONS|g" "./config/odoo-native.conf"
-    ADDONS="$(echo "$ADDONS" | sed 's|,|,/mnt/|g' | sed 's|,/mnt/odoo||g')"
+    sed -i'' -e "s|addons_path.*|addons_path = $ADDONS_PATH|g" "./config/odoo-native.conf"
+    
     # Update docker config
-    sed -i'' -e "s|addons_path.*|addons_path = /mnt/$ADDONS|g" "./config/odoo.conf"
+    sed -i'' -e "s|addons_path.*|addons_path = /mnt/$DOCKER_ADDONS_PATH|g" "./config/odoo.conf"
 
     echo "Config updated."
 }
@@ -831,11 +867,11 @@ function git-list-submodules() {
 function git-feature-branch(){
     if test -z "$1"; then echo "\$1 is empty."; exit; fi
 
-    MODULE_NAME=$(basename $1)
-    MODULE_PATH=$(dirname $1)
+    MODULE_NAME=$(basename "$1")
+    MODULE_PATH=$(dirname "$1")
 
     echo "Create feature branch for $MODULE_NAME in $MODULE_PATH ..."
-    cd ./$MODULE_PATH
+    cd ./"$MODULE_PATH" || exit
     pwd
     git switch -c "feature-$MODULE_NAME"
 }
@@ -843,11 +879,11 @@ function git-feature-branch(){
 function git-mig-branch(){
     if test -z "$1"; then echo "\$1 is empty."; exit; fi
 
-    MODULE_NAME=$(basename $1)
-    MODULE_PATH=$(dirname $1)
+    MODULE_NAME=$(basename "$1")
+    MODULE_PATH=$(dirname "$1")
 
     echo "Create mig branch for $MODULE_NAME in $MODULE_PATH ..."
-    cd ./$MODULE_PATH
+    cd ./"$MODULE_PATH" || exit
     pwd
     git switch -c "$GIT_BRANCH-mig-$MODULE_NAME"
 }
@@ -855,17 +891,17 @@ function git-mig-branch(){
 function patch-database() {
     if test -z "$1"; then echo "\$1 is empty."; exit; fi
 
-    DATABASE=$1
-    FILENAME=$2
+    DATABASE="$1"
+    FILENAME="$2"
 
     # Use default database if second param is not given 
     if test -z "$2"; then
         DATABASE="$GIT_BRANCH"
-        FILENAME=$1
+        FILENAME="$1"
     fi
 
     echo "Apply patch $FILENAME to Database $DATABASE."
-    cat $FILENAME | docker exec -i db psql postgres://$POSTGRES_USER:$POSTGRES_PASSWORD@localhost/$DATABASE
+    cat "$FILENAME" | docker exec -i db psql "postgres://$POSTGRES_USER:$POSTGRES_PASSWORD@localhost/$DATABASE"
     echo "Patching database succeeded"
 }
 
@@ -887,12 +923,12 @@ function update-docs() {
     for MODULE in $MODULES; do
 
         TITLE="${MODULE^}" # Uppercase first letter
-        TITLE=$(echo $TITLE | sed 's/_/ /g') # Replace underline with space
-        TITLE=$(echo $TITLE | sed -r 's/\<./\U&/g') # Uppercase first letter after space
+        TITLE=$(echo "$TITLE" | sed 's/_/ /g') # Replace underline with space
+        TITLE=$(echo "$TITLE" | sed -r 's/\<./\U&/g') # Uppercase first letter after space
 
         # Create doc file for each module
         DOCFILE="snippets/$MODULE.md"
-        echo -e "# $TITLE" > $DOCFILE
+        echo -e "# $TITLE" > "$DOCFILE"
         echo "## [$TITLE](snippets/$MODULE.md)" >> snippets.md
         SIDEBAR_ENTRIES+="'/snippets/$MODULE.md',"
         
@@ -900,29 +936,29 @@ function update-docs() {
         XML_IDS=$(ls snippets/$MODULE.*.xml | xargs -n 1 basename | cut -d. -f2 | uniq)
         for XML_ID in $XML_IDS; do
         
-            XML_ID_TITLE=$(echo $XML_ID | sed 's/_/ /g') # Replace underline with space
-            XML_ID_TITLE=$(echo $XML_ID_TITLE | sed -r 's/\<./\U&/g') # Uppercase first letter after space
+            XML_ID_TITLE=$(echo "$XML_ID" | sed 's/_/ /g') # Replace underline with space
+            XML_ID_TITLE=$(echo "$XML_ID_TITLE" | sed -r 's/\<./\U&/g') # Uppercase first letter after space
 
-            echo "## $XML_ID_TITLE  " >> $DOCFILE
+            echo "## $XML_ID_TITLE  " >> "$DOCFILE"
 
             # Process each file
             FILES="snippets/$MODULE.$XML_ID.*.xml"
             for FILE in $FILES; do
 
                 # Get snippet params
-                FILENAME=$(basename $FILE)
-                EDIT=$(echo $FILENAME | cut -d. -f3)
+                FILENAME=$(basename "$FILE")
+                EDIT=$(echo "$FILENAME" | cut -d. -f3)
 
-                EDIT_TITLE=$(echo $EDIT | sed 's/_/ /g') # Replace underline with space
-                EDIT_TITLE=$(echo $EDIT_TITLE | sed -r 's/\<./\U&/g') # Uppercase first letter after space
+                EDIT_TITLE=$(echo "$EDIT" | sed 's/_/ /g') # Replace underline with space
+                EDIT_TITLE=$(echo "$EDIT_TITLE" | sed -r 's/\<./\U&/g') # Uppercase first letter after space
 
                 # Group by modules
-                echo "### $EDIT_TITLE  " >> $DOCFILE
-                echo "ID: \`mint_system.$MODULE.$XML_ID.$EDIT\`  " >> $DOCFILE
-                echo -e '```xml' >> $DOCFILE
-                cat "$FILE" >> $DOCFILE
-                echo -e '\n```' >> $DOCFILE
-                echo -e "Source: [$FILE]($PATH_URL/$FILE)\n" >> $DOCFILE
+                echo "### $EDIT_TITLE  " >> "$DOCFILE"
+                echo "ID: \`mint_system.$MODULE.$XML_ID.$EDIT\`  " >> "$DOCFILE"
+                echo -e '```xml' >> "$DOCFILE"
+                cat "$FILE" >> "$DOCFILE"
+                echo -e '\n```' >> "$DOCFILE"
+                echo -e "Source: [$FILE]($PATH_URL/$FILE)\n" >> "$DOCFILE"
             done
         done
     done
@@ -938,13 +974,16 @@ case "$1" in
         disable-auto-install
         ;;
     save-config)
-        save-config $2
+        save-config "$2"
         ;;
     checkout)
-        checkout $2 $3
+        checkout "$2" "$3"
+        ;;
+    checkout-config-files)
+        checkout-config-files "$2"
         ;;
     checkout-revision)
-        checkout-revision $2
+        checkout-revision "$2"
         ;;
     list)
         docker-compose config --services; echo "native"
@@ -953,16 +992,16 @@ case "$1" in
         docker ps --format 'table {{.Names}}\t{{.Image}}\t{{(.Label "description")}}\t{{.Status}}'
         ;;
     start)
-        start $2 $3
+        start "$2" "$3"
         ;;
     restart)
-        restart $2
+        restart "$2"
         ;;
     stop)
-        stop $2
+        stop "$2"
         ;;
     kill)
-        down $2
+        down "$2"
         ;;
     logs)
         docker logs odoo -f
@@ -977,91 +1016,94 @@ case "$1" in
         install-native
         ;;
     init-db)
-        init-db $2
+        init-db "$2"
         ;;
     start-shell)
-        start-shell $2
+        start-shell "$2"
         ;;
     start-psql)
-        start-psql $2
+        start-psql "$2"
         ;;
     update-module)
-        update-module $2 $3
+        update-module "$2" "$3"
         ;;
     test-module)
-        test-module $2 $3
+        test-module "$2" "$3"
         ;;
     create-module)
-        create-module $2
+        create-module "$2"
         ;;
     drop-db)
-        drop-db $2
+        drop-db "$2"
         ;;
     send-support-mail)
         send-support-mail
         ;;
     clear-assets)
-        clear-assets $2
+        clear-assets "$2"
         ;;
     generate-admin-passwd)
-        generate-admin-passwd $2
+        generate-admin-passwd "$2"
         ;;
     odoo-cloc)
-        odoo-cloc $2
+        odoo-cloc "$2"
         ;;
     restore-database)
-        restore-database $2 $3
+        restore-database "$2" "$3"
         ;;
     convert-database)
-        convert-database $2
+        convert-database "$2"
         ;;
     install-module)
-        install-module $2 $3
+        install-module "$2" "$3"
         ;;
     remove-module)
-        remove-module $2 $3
+        remove-module "$2" "$3"
         ;;
     remove-submodule)
-        remove-submodule $2
+        remove-submodule "$2"
         ;;
     git-update-submodules)
         git-update-submodules
         ;;
     release-module)
-        release-module $2
+        release-module "$2"
         ;;
     lint-module)
-        lint-module $2
+        lint-module "$2"
         ;;
     update-readme)
-        update-readme $2
+        update-readme "$2"
         ;;
     zip-module)
-        zip-module $2
+        zip-module "$2"
         ;;
     clear-filestore)
-        clear-filestore $2
+        clear-filestore "$2"
         ;;
     init-odoo-env)
-        init-odoo-env $2
+        init-odoo-env "$2"
         ;;
     list-odoo-env)
         ls -f "$ODOO_DEVELOPMENT_CONFIG_DIR"
         ;;
+    list-addons)
+        list-addons
+        ;;
     edit-env)
-        edit-env $2
+        edit-env "$2"
         ;;
     disable-mailserver)
-        disable-mailserver $2
+        disable-mailserver "$2"
         ;;
     change-uuid)
-        change-uuid $2
+        change-uuid "$2"
         ;;
     set-admin)
-        set-admin $2
+        set-admin "$2"
         ;;
-    switch-branch)
-        switch-branch $2
+    git-switch-branch)
+        git-switch-branch "$2"
         ;;
     update-config)
         update-config
@@ -1070,40 +1112,40 @@ case "$1" in
         git-list-submodules
         ;;
     get-module-version)
-        get-module-version $2
+        get-module-version "$2"
         ;;
     git-feature-branch)
-        git-feature-branch $2
+        git-feature-branch "$2"
         ;;
     git-mig-branch)
-        git-mig-branch $2
+        git-mig-branch "$2"
         ;;
     update-snippet)
-        update-snippet $2 $3
+        update-snippet "$2" "$3"
         ;;
     test-jsonrpc)
-        test-jsonrpc $2
+        test-jsonrpc "$2"
         ;;
     install-snippet)
-        install-snippet $2 $3
+        install-snippet "$2" "$3"
         ;;
     lint-snippets)
         lint-snippets
         ;;
     update-app-list)
-        update-app-list $2
+        update-app-list "$2"
         ;;
     init-next-env)
-        init-next-env $2
+        init-next-env "$2"
         ;;
     upload-module)
-        upload-module $2 $3
+        upload-module "$2" "$3"
         ;;
     generate-module-translation)
-        generate-module-translation $2 $3 $4
+        generate-module-translation "$2" "$3" "$4"
         ;;
     patch-database)
-        patch-database $2 $3
+        patch-database "$2" "$3"
         ;;
     git-pull-submodules)
         git-pull-submodules
@@ -1114,6 +1156,9 @@ case "$1" in
     source)
         activate-venv
         ;;
+    reset-views)
+        reset-views "$2" "$3"
+        ;;
     *)
         help task
         exit 1
diff --git a/task.md b/task.md
index 7307cc91..2d3a1ac1 100644
--- a/task.md
+++ b/task.md
@@ -4,9 +4,11 @@
 | --------------------------- | ----------------- | ----------------------------------------------------------------------------------------- |
 | change-uuid                 | [env]             | Change database uuid via xmlrpc.                                                          |
 | checkout                    | [branch][branch]  | Switch and merge from one branch to another.                                              |
+| checkout-config-files       | [branch]          | Checkout config files from another branch.                                                |
 | checkout-revision           | [revision]        | Switch to a different Odoo revision by tag name.                                          |
+| clear-assets                | [db]              | Clear all assets of Odoo database.                                                        |
 | clear-filestore             | [db]              | Clear local filestore folder. No param will clear all filestores. Default is branch name. |
-| convert-database            | [db]              | Convert database backup file from postgres 9.5 to latest.  Default is branch name.        |
+| convert-database            | [db]              | Convert database backup file from postgres 9.5 to latest. Default is branch name.         |
 | create-module               | [path]            | Create new Odoo module from template.                                                     |
 | disable-auto-install        |                   | Disable auto install for enterprise modules.                                              |
 | disable-mailserver          | [env]             | Disable mail server settings via xmlrpc.                                                  |
@@ -33,6 +35,7 @@
 | lint-snippets               |                   | Run checks for all snippets.                                                              |
 | list                        |                   | List docker services.                                                                     |
 | list-odoo-env               |                   | List odoo env files.                                                                      |
+| list-addons                 |                   | List odoo addons.                                                                         |
 | 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. Default database is branch name.                              |
@@ -40,20 +43,21 @@
 | release-module              | [path]            | Create GitHub release for a module.                                                       |
 | remove-module               | [db][name]        | Remove target Odoo module.                                                                |
 | remove-submodule            | [path]            | Remove git submodule.                                                                     |
+| reset-views                 | [db][key]         | Execute hard reset on views matching keys.                                                |
 | restart                     | [name]            | Restart docker container.                                                                 |
 | 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.               |
+| set-admin                   | [db]              | Sets the password for the first user in database. Default is branch name.                 |
 | source                      |                   | Source the Python virtual env.                                                            |
 | start                       | [name] [db]       | Start docker container. Options: none, db, admin, odoo, native, mail.                     |
-| start-psql                  | [db]              | Start PSQL shell in Docker container.  Default is branch name.                            |
-| start-shell                 | [db]              | Start Odoo shell from source folder.    Default is branch name.                           |
+| start-psql                  | [db]              | Start PSQL shell in Docker container. Default is branch name.                             |
+| start-shell                 | [db]              | Start Odoo shell from source folder. Default is branch name.                              |
 | stop                        | [name]            | Stop docker containers.                                                                   |
-| switch-branch               | [branch]          | Switch submodules to target branch.                                                       |
+| git-switch-branch           | [branch]          | Switch submodules to target branch.                                                       |
 | test-jsonrpc                | [env]             | Test json rpc connection.                                                                 |
 | test-module                 | [db][name,path]   | Test target Odoo module.                                                                  |
 | update-app-list             | [db]              | Update app list.                                                                          |
-| update-config               |                   | Update odoo config.                                                                       |
+| update-config               |                   | Update Odoo native and docker config files.                                               |
 | update-docs                 |                   | Update project docs.                                                                      |
 | update-module               | [db][name,path]   | Update target Odoo module.                                                                |
 | update-readme               | [path]            | Update Readme file of Odoo module collection.                                             |
diff --git a/template/.editorconfig b/template/.editorconfig
new file mode 100644
index 00000000..bfd7ac53
--- /dev/null
+++ b/template/.editorconfig
@@ -0,0 +1,20 @@
+# Configuration for known file extensions
+[*.{css,js,json,less,md,py,rst,sass,scss,xml,yaml,yml}]
+charset = utf-8
+end_of_line = lf
+indent_size = 4
+indent_style = space
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.{json,yml,yaml,rst,md}]
+indent_size = 2
+
+# Do not configure editor for libs and autogenerated content
+[{*/static/{lib,src/lib}/**,*/static/description/index.html,*/readme/../README.rst}]
+charset = unset
+end_of_line = unset
+indent_size = unset
+indent_style = unset
+insert_final_newline = false
+trim_trailing_whitespace = false
diff --git a/template/.flake8 b/template/.flake8
new file mode 100644
index 00000000..e397e8ed
--- /dev/null
+++ b/template/.flake8
@@ -0,0 +1,12 @@
+[flake8]
+max-line-length = 88
+max-complexity = 16
+# B = bugbear
+# B9 = bugbear opinionated (incl line length)
+select = C,E,F,W,B,B9
+# E203: whitespace before ':' (black behaviour)
+# E501: flake8 line length (covered by bugbear B950)
+# W503: line break before binary operator (black behaviour)
+ignore = E203,E501,W503
+per-file-ignores=
+    __init__.py:F401
diff --git a/template/ms_custom_module/.gitignore b/template/.gitignore
similarity index 88%
rename from template/ms_custom_module/.gitignore
rename to template/.gitignore
index 646eb52e..9538ff10 100644
--- a/template/ms_custom_module/.gitignore
+++ b/template/.gitignore
@@ -3,4 +3,4 @@ default.vim
 .DS_Store
 *.swp
 .~lock*
-*.pyc
\ No newline at end of file
+*.pyc
diff --git a/template/.isort.cfg b/template/.isort.cfg
new file mode 100644
index 00000000..0ec187ef
--- /dev/null
+++ b/template/.isort.cfg
@@ -0,0 +1,13 @@
+[settings]
+; see https://github.com/psf/black
+multi_line_output=3
+include_trailing_comma=True
+force_grid_wrap=0
+combine_as_imports=True
+use_parentheses=True
+line_length=88
+known_odoo=odoo
+known_odoo_addons=odoo.addons
+sections=FUTURE,STDLIB,THIRDPARTY,ODOO,ODOO_ADDONS,FIRSTPARTY,LOCALFOLDER
+default_section=THIRDPARTY
+ensure_newline_before_comments = True
diff --git a/template/ms_custom_module/.pre-commit-config.yaml b/template/.pre-commit-config.yaml
similarity index 71%
rename from template/ms_custom_module/.pre-commit-config.yaml
rename to template/.pre-commit-config.yaml
index c5000d30..5e769c21 100644
--- a/template/ms_custom_module/.pre-commit-config.yaml
+++ b/template/.pre-commit-config.yaml
@@ -10,15 +10,12 @@ exclude: |
   ^README\.md$|
   # Library files can have extraneous formatting (even minimized)
   /static/(src/)?lib/|
-  # test_repo is expected to break lints
-  test_repo/|
   # Repos using Sphinx to generate docs don't need prettying
   ^docs/_templates/.*\.html$|
   # You don't usually want a bot to modify your legal texts
   (LICENSE.*|COPYING.*)
 default_language_version:
   python: python3
-  node: "16.17.0"
 repos:
   - repo: local
     hooks:
@@ -29,8 +26,13 @@ repos:
         entry: found forbidden files; remove them
         language: fail
         files: "\\.rej$"
+      - id: en-po-files
+        name: en.po files cannot exist
+        entry: found a en.po file
+        language: fail
+        files: '[a-zA-Z0-9_]*/i18n/en\.po$'
   - repo: https://github.com/myint/autoflake
-    rev: v1.7.6
+    rev: v1.6.1
     hooks:
       - id: autoflake
         args:
@@ -41,14 +43,29 @@ repos:
           - --remove-duplicate-keys
           - --remove-unused-variables
   - repo: https://github.com/psf/black
-    rev: 22.10.0
+    rev: 22.8.0
     hooks:
       - id: black
+  - repo: https://github.com/pre-commit/mirrors-prettier
+    rev: v2.7.1
+    hooks:
+      - id: prettier
+        name: prettier (with plugin-xml)
+        additional_dependencies:
+          - "prettier@2.7.1"
+          - "@prettier/plugin-xml@2.2.0"
+        args:
+          - --plugin=@prettier/plugin-xml
+        files: \.(css|htm|html|js|json|jsx|less|md|scss|toml|ts|xml|yaml|yml)$
   - repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v4.3.0
     hooks:
       - id: trailing-whitespace
+        # exclude autogenerated files
+        exclude: /README\.rst$|\.pot?$
       - id: end-of-file-fixer
+        # exclude autogenerated files
+        exclude: /README\.rst$|\.pot?$
       - id: debug-statements
       - id: fix-encoding-pragma
         args: ["--remove"]
@@ -62,13 +79,8 @@ repos:
       - id: check-xml
       - id: mixed-line-ending
         args: ["--fix=lf"]
-  - repo: https://github.com/asottile/pyupgrade
-    rev: v3.1.0
-    hooks:
-      - id: pyupgrade
-        args: ["--keep-percent-format"]
   - repo: https://github.com/PyCQA/isort
-    rev: 5.11.5
+    rev: 5.12.0
     hooks:
       - id: isort
         name: isort except __init__.py
@@ -81,7 +93,12 @@ repos:
       - id: flake8
         name: flake8
         additional_dependencies: ["flake8-bugbear==21.9.2"]
-  - repo: https://github.com/PyCQA/pylint
-    rev: v2.15.4
+  - repo: https://github.com/OCA/pylint-odoo
+    rev: 7.0.2
     hooks:
-      - id: pylint
\ No newline at end of file
+      - id: pylint_odoo
+        name: pylint with optional checks
+        args:
+          - --rcfile=.pylintrc
+          - --exit-zero
+        verbose: true
diff --git a/template/.prettierrc.yml b/template/.prettierrc.yml
new file mode 100644
index 00000000..5b6d4b36
--- /dev/null
+++ b/template/.prettierrc.yml
@@ -0,0 +1,8 @@
+# Defaults for all prettier-supported languages.
+# Prettier will complete this with settings from .editorconfig file.
+bracketSpacing: false
+printWidth: 88
+proseWrap: always
+semi: true
+trailingComma: "es5"
+xmlWhitespaceSensitivity: "strict"
diff --git a/template/.pylintrc b/template/.pylintrc
new file mode 100644
index 00000000..d9f6c68e
--- /dev/null
+++ b/template/.pylintrc
@@ -0,0 +1,121 @@
+[MASTER]
+load-plugins=pylint_odoo
+score=n
+
+[ODOOLINT]
+readme_template_url="https://github.com/OCA/maintainer-tools/blob/master/template/module/README.rst"
+manifest_required_authors=Mint System GmbH
+manifest_required_keys=license
+manifest_deprecated_keys=description,active
+license_allowed=AGPL-3,GPL-2,GPL-2 or any later version,GPL-3,GPL-3 or any later version,LGPL-3
+valid_odoo_versions=16.0
+
+[MESSAGES CONTROL]
+disable=all
+
+# This .pylintrc contains optional AND mandatory checks and is meant to be
+# loaded in an IDE to have it check everything, in the hope this will make
+# optional checks more visible to contributors who otherwise never look at a
+# green travis to see optional checks that failed.
+# .pylintrc-mandatory containing only mandatory checks is used the pre-commit
+# config as a blocking check.
+
+enable=anomalous-backslash-in-string,
+    api-one-deprecated,
+    api-one-multi-together,
+    assignment-from-none,
+    attribute-deprecated,
+    class-camelcase,
+    dangerous-default-value,
+    dangerous-view-replace-wo-priority,
+    development-status-allowed,
+    duplicate-id-csv,
+    duplicate-key,
+    duplicate-xml-fields,
+    duplicate-xml-record-id,
+    eval-referenced,
+    eval-used,
+    incoherent-interpreter-exec-perm,
+    license-allowed,
+    manifest-author-string,
+    manifest-deprecated-key,
+    manifest-required-author,
+    manifest-required-key,
+    manifest-version-format,
+    method-compute,
+    method-inverse,
+    method-required-super,
+    method-search,
+    openerp-exception-warning,
+    pointless-statement,
+    pointless-string-statement,
+    print-used,
+    redundant-keyword-arg,
+    redundant-modulename-xml,
+    reimported,
+    relative-import,
+    return-in-init,
+    rst-syntax-error,
+    sql-injection,
+    too-few-format-args,
+    translation-field,
+    translation-required,
+    unreachable,
+    use-vim-comment,
+    wrong-tabs-instead-of-spaces,
+    xml-syntax-error,
+    attribute-string-redundant,
+    character-not-valid-in-resource-link,
+    consider-merging-classes-inherited,
+    context-overridden,
+    create-user-wo-reset-password,
+    dangerous-filter-wo-user,
+    dangerous-qweb-replace-wo-priority,
+    deprecated-data-xml-node,
+    deprecated-openerp-xml-node,
+    duplicate-po-message-definition,
+    except-pass,
+    file-not-used,
+    invalid-commit,
+    manifest-maintainers-list,
+    missing-newline-extrafiles,
+    missing-readme,
+    missing-return,
+    odoo-addons-relative-import,
+    old-api7-method-defined,
+    po-msgstr-variables,
+    po-syntax-error,
+    renamed-field-parameter,
+    resource-not-exist,
+    str-format-used,
+    test-folder-imported,
+    translation-contains-variable,
+    translation-positional-used,
+    unnecessary-utf8-coding-comment,
+    website-manifest-key-not-valid-uri,
+    xml-attribute-translatable,
+    xml-deprecated-qweb-directive,
+    xml-deprecated-tree-attribute,
+    external-request-timeout,
+    # messages that do not cause the lint step to fail
+    consider-merging-classes-inherited,
+    create-user-wo-reset-password,
+    dangerous-filter-wo-user,
+    deprecated-module,
+    file-not-used,
+    invalid-commit,
+    missing-manifest-dependency,
+    missing-newline-extrafiles,
+    missing-readme,
+    no-utf8-coding-comment,
+    odoo-addons-relative-import,
+    old-api7-method-defined,
+    redefined-builtin,
+    too-complex,
+    unnecessary-utf8-coding-comment
+
+
+[REPORTS]
+msg-template={path}:{line}: [{msg_id}({symbol}), {obj}] {msg}
+output-format=colorized
+reports=no
diff --git a/template/ms_custom_module/LICENSE b/template/module/LICENSE
similarity index 100%
rename from template/ms_custom_module/LICENSE
rename to template/module/LICENSE
diff --git a/template/ms_custom_module/README.rst b/template/module/README.rst
similarity index 87%
rename from template/ms_custom_module/README.rst
rename to template/module/README.rst
index de2d10d5..5e711fe4 100644
--- a/template/ms_custom_module/README.rst
+++ b/template/module/README.rst
@@ -10,11 +10,6 @@ Module summary.
 
 For a detailed documentation have a look at https://www.odoo-wiki.org/{{ (name|replace('_','-')) }}.html
 
-.. image:: https://raw.githubusercontent.com/Mint-System/Wiki/master/assets/icon-box.png
-  :height: 100
-  :width: 100
-  :alt: Icon
-
 Usage
 ~~~~~
 
diff --git a/template/ms_custom_module/__init__.py b/template/module/__init__.py
similarity index 100%
rename from template/ms_custom_module/__init__.py
rename to template/module/__init__.py
diff --git a/template/ms_custom_module/__manifest__.py b/template/module/__manifest__.py
similarity index 100%
rename from template/ms_custom_module/__manifest__.py
rename to template/module/__manifest__.py
diff --git a/template/ms_custom_module/data/ir_actions.xml b/template/module/data/ir_actions.xml
similarity index 100%
rename from template/ms_custom_module/data/ir_actions.xml
rename to template/module/data/ir_actions.xml
diff --git a/template/ms_custom_module/data/ir_sequence.xml b/template/module/data/ir_sequence.xml
similarity index 100%
rename from template/ms_custom_module/data/ir_sequence.xml
rename to template/module/data/ir_sequence.xml
diff --git a/template/ms_custom_module/demo/demo.xml b/template/module/demo/demo.xml
similarity index 100%
rename from template/ms_custom_module/demo/demo.xml
rename to template/module/demo/demo.xml
diff --git a/template/ms_custom_module/images/screen.png b/template/module/images/screen.png
similarity index 100%
rename from template/ms_custom_module/images/screen.png
rename to template/module/images/screen.png
diff --git a/template/ms_custom_module/models/__init__.py b/template/module/models/__init__.py
similarity index 100%
rename from template/ms_custom_module/models/__init__.py
rename to template/module/models/__init__.py
diff --git a/template/ms_custom_module/models/models.py b/template/module/models/models.py
similarity index 68%
rename from template/ms_custom_module/models/models.py
rename to template/module/models/models.py
index 973f66ed..2fcb9796 100644
--- a/template/ms_custom_module/models/models.py
+++ b/template/module/models/models.py
@@ -1,12 +1,11 @@
-from odoo import _, api, fields, models
 import logging
+from odoo import fields, models, api, _
 _logger = logging.getLogger(__name__)
 
 
-class Document(models.Model):
+class {{ (name|replace('_',' ')).title() }}(models.Model):
     _name = '{{ name }}.document'
     _description = '{{ (name|replace('_',' ')).title() }} Document'
 
-    # fields
     name = fields.Char()
     value = fields.Integer()
diff --git a/template/ms_custom_module/report/invoice_document.xml b/template/module/report/invoice_document.xml
similarity index 100%
rename from template/ms_custom_module/report/invoice_document.xml
rename to template/module/report/invoice_document.xml
diff --git a/template/ms_custom_module/security/ir.model.access.csv b/template/module/security/ir.model.access.csv
similarity index 100%
rename from template/ms_custom_module/security/ir.model.access.csv
rename to template/module/security/ir.model.access.csv
diff --git a/template/ms_custom_module/static/description/icon.png b/template/module/static/description/icon.png
similarity index 100%
rename from template/ms_custom_module/static/description/icon.png
rename to template/module/static/description/icon.png
diff --git a/template/ms_custom_module/static/src/css/style.css b/template/module/static/src/css/style.css
similarity index 100%
rename from template/ms_custom_module/static/src/css/style.css
rename to template/module/static/src/css/style.css
diff --git a/template/ms_custom_module/static/src/js/widget.js b/template/module/static/src/js/widget.js
similarity index 100%
rename from template/ms_custom_module/static/src/js/widget.js
rename to template/module/static/src/js/widget.js
diff --git a/template/ms_custom_module/views/assets.xml b/template/module/views/assets.xml
similarity index 100%
rename from template/ms_custom_module/views/assets.xml
rename to template/module/views/assets.xml
diff --git a/template/ms_custom_module/views/sale_order.xml b/template/module/views/sale_order.xml
similarity index 100%
rename from template/ms_custom_module/views/sale_order.xml
rename to template/module/views/sale_order.xml
diff --git a/themes b/themes
index f4d818e7..5f3599fe 160000
--- a/themes
+++ b/themes
@@ -1 +1 @@
-Subproject commit f4d818e772c50fd557d30221e05a72ac891b7636
+Subproject commit 5f3599fedae4cc0017f7259385b3ad8356376ab5