diff --git a/.vuepress/sidebar.js b/.vuepress/sidebar.js
index ccd93562..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/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',]
+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/snippets.md b/snippets.md
index 7dbf7ca0..50c2da28 100644
--- a/snippets.md
+++ b/snippets.md
@@ -41,6 +41,7 @@ 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)
diff --git a/snippets/account.md b/snippets/account.md
index b0cfe216..f2aa2740 100644
--- a/snippets/account.md
+++ b/snippets/account.md
@@ -492,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
@@ -1690,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>
 ```
@@ -3215,6 +3238,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
@@ -4413,19 +4450,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>
 ```
@@ -5469,6 +5515,21 @@ 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 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`  
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/base.md b/snippets/base.md
index faede5fe..0569cfe7 100644
--- a/snippets/base.md
+++ b/snippets/base.md
@@ -304,6 +304,26 @@ ID: `mint_system.base.view_partner_form.move_company_registry`
 ```
 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
@@ -632,6 +652,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
diff --git a/snippets/base.view_partner_tree.property_payment_term_id.xml b/snippets/base.view_partner_tree.property_payment_term_id.xml
new file mode 100644
index 00000000..047b44c3
--- /dev/null
+++ b/snippets/base.view_partner_tree.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="hide"/>
+  </field>
+
+</data>
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/ir_model.md b/snippets/ir_model.md
index b6d5f214..042b2582 100644
--- a/snippets/ir_model.md
+++ b/snippets/ir_model.md
@@ -2838,6 +2838,28 @@ 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)
+
 ## Stock Production Lot  
 ### X Autoremove  
 ID: `mint_system.ir_model.stock_production_lot.x_autoremove`  
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/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..7fce761f
--- /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..ba6fcd4b 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.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/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/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/sale.md b/snippets/sale.md
index 473d2c01..399ff4ac 100644
--- a/snippets/sale.md
+++ b/snippets/sale.md
@@ -3713,10 +3713,11 @@ ID: `mint_system.sale.view_order_form.move_client_order_ref`
 <data inherit_id="sale.view_order_form" priority="50">
 
   <xpath expr="//field[@name='partner_shipping_id']" position="after">
-    <field string="Bestellnummer Kunde" name="client_order_ref"/>
+    <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)
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 4792b656..f6687c82 100644
--- a/snippets/stock.md
+++ b/snippets/stock.md
@@ -7058,6 +7058,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
@@ -7348,3 +7362,15 @@ 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)
+
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.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