From c3e49b89d4c38d534448366f3decd6b2fd29e254 Mon Sep 17 00:00:00 2001
From: janikvonrotz <contact@janikvonrotz.ch>
Date: Thu, 14 Jul 2022 12:18:52 +0200
Subject: [PATCH] sync from 14.0

---
 .gitmodules                                   |   4 +
 .vuepress/config.js                           |   2 +-
 .vuepress/sidebar_snippet.js                  |   2 +-
 addons/vertical_aero                          |   1 +
 snippets.md                                   |   2 +
 snippets/account.md                           |   8 ++
 ...report_invoice_document.replace_footer.xml |   2 +-
 ...count.view_move_form.remove_isr_button.xml |   7 ++
 ...pdesk_ticket_view_form.x_date_deadline.xml |   8 ++
 ...esk_ticket_view_kanban.x_date_deadline.xml |  10 ++
 ...desk_tickets_view_tree.x_date_deadline.xml |   8 ++
 snippets/helpdesk.md                          |  19 ++++
 ..._model.helpdesk_ticket.x_date_deadline.xml |  16 +++
 snippets/ir_model.md                          |  14 +++
 .../ir_model.product_set_line.x_categ_id.xml  |  18 ++++
 ...del.sale_order_line.x_weight_delivered.xml |  19 ++++
 ...isr_invoice_form.disable_print_buttons.xml |   3 +-
 ...notification_borders.reduce_to_content.xml |  27 +++++
 ...l_notification_light.reduce_to_content.xml |  29 +++++
 ..._notification_paynow.reduce_to_content.xml |  31 ++++++
 snippets/mail.md                              |  12 +++
 ...boards_activities.my_activities_filter.xml |   8 ++
 snippets/mrp.md                               |   9 ++
 ...rder_search.add_date_planned_start_set.xml |   8 ++
 ...view_filter.add_date_planned_start_set.xml |   8 ++
 snippets/sale.md                              |   8 +-
 ...e.report_saleorder_document.add_footer.xml |   6 +-
 ...rt_saleorder_document.confirmation_qty.xml |  22 ----
 ...r_document.confirmation_qty_to_deliver.xml |  24 ++++-
 ...e.report_saleorder_document.format_qty.xml |   4 +-
 ...ort_saleorder_document.replace_summary.xml |  22 ++--
 ...t_saleorder_document.round_total_price.xml |   2 +-
 ...sale.report_saleorder_document.set_ids.xml |   9 +-
 ...eport_saleorder_document.style_trimada.xml |   6 +-
 ...iew_order_line_tree.x_weight_delivered.xml |   8 ++
 ...saleorder_document.hide_in_state_draft.xml |   5 +-
 snippets/sale_product_set.md                  |   9 ++
 ...t_set.view_product_set_form.x_categ_id.xml |   8 ++
 snippets/stock.md                             |   8 ++
 ...stock.report_picking.add_address_block.xml |   2 +-
 snippets/stock.report_picking.format_qty.xml  |  16 +++
 .../stock.report_picking.group_by_date.xml    |   2 +-
 .../stock.report_picking.hide_address.xml     |   3 +-
 snippets/stock.report_picking.hide_name.xml   |   3 +-
 ...ock.report_picking.product_description.xml |  16 ++-
 ...stock.report_picking.relocate_quantity.xml |  14 +--
 .../stock.report_picking.replace_barcode.xml  |  19 ++++
 .../stock.report_picking.replace_header.xml   |  41 ++++---
 ...eport_picking.replace_order_definition.xml | 101 +++++++++++++-----
 snippets/stock.report_picking.set_ids.xml     |   8 +-
 .../stock.report_picking.style_trimada.xml    |  40 +++++--
 51 files changed, 558 insertions(+), 123 deletions(-)
 create mode 160000 addons/vertical_aero
 create mode 100644 snippets/account.view_move_form.remove_isr_button.xml
 create mode 100644 snippets/helpdesk.helpdesk_ticket_view_form.x_date_deadline.xml
 create mode 100644 snippets/helpdesk.helpdesk_ticket_view_kanban.x_date_deadline.xml
 create mode 100644 snippets/helpdesk.helpdesk_tickets_view_tree.x_date_deadline.xml
 create mode 100644 snippets/helpdesk.md
 create mode 100644 snippets/ir_model.helpdesk_ticket.x_date_deadline.xml
 create mode 100644 snippets/ir_model.product_set_line.x_categ_id.xml
 create mode 100644 snippets/ir_model.sale_order_line.x_weight_delivered.xml
 create mode 100644 snippets/mail.mail_notification_borders.reduce_to_content.xml
 create mode 100644 snippets/mail.mail_notification_light.reduce_to_content.xml
 create mode 100644 snippets/mail.mail_notification_paynow.reduce_to_content.xml
 create mode 100644 snippets/mail_activity_board.open_boards_activities.my_activities_filter.xml
 create mode 100644 snippets/mrp.view_mrp_production_work_order_search.add_date_planned_start_set.xml
 create mode 100644 snippets/mrp.view_mrp_production_workorder_form_view_filter.add_date_planned_start_set.xml
 delete mode 100644 snippets/sale.report_saleorder_document.confirmation_qty.xml
 create mode 100644 snippets/sale.view_order_line_tree.x_weight_delivered.xml
 create mode 100644 snippets/sale_product_set.md
 create mode 100644 snippets/sale_product_set.view_product_set_form.x_categ_id.xml
 create mode 100644 snippets/stock.report_picking.format_qty.xml
 create mode 100644 snippets/stock.report_picking.replace_barcode.xml

diff --git a/.gitmodules b/.gitmodules
index 85b105c0..2377fecb 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -74,3 +74,7 @@
 	path = oca/server-tools
 	url = git@github.com:OCA/server-tools.git
 	branch = 15.0
+[submodule "addons/vertical_aero"]
+	path = addons/vertical_aero
+	url = git@github.com:Mint-System/Odoo-Apps-Vertical-Forestry.git
+	branch = 15.0
diff --git a/.vuepress/config.js b/.vuepress/config.js
index 687d373a..f814dcc0 100644
--- a/.vuepress/config.js
+++ b/.vuepress/config.js
@@ -16,7 +16,7 @@ module.exports = {
             { text: 'Home', link: '/' },
             { text: 'Help', link: '/task' },
             { text: 'Snippets', link: '/snippets' },
-            { text: 'Mint System', link: 'https://www.mint-system.ch' }
+            { text: 'Mint System', link: 'https://www.mint-system.ch/odoo' }
         ],
         sidebar: {
             '/': [
diff --git a/.vuepress/sidebar_snippet.js b/.vuepress/sidebar_snippet.js
index 90bd1811..db2265d2 100644
--- a/.vuepress/sidebar_snippet.js
+++ b/.vuepress/sidebar_snippet.js
@@ -1 +1 @@
-module.exports = ['/snippets/account.md','/snippets/agreement.md','/snippets/agreement_legal.md','/snippets/base.md','/snippets/business_requirement.md','/snippets/calendar.md','/snippets/certificate_planer.md','/snippets/crm.md','/snippets/crm_iap_lead_enrich.md','/snippets/delivery.md','/snippets/digest.md','/snippets/gio_payroll_custom.md','/snippets/hr.md','/snippets/hr_attendance.md','/snippets/hr_contract.md','/snippets/hr_holidays.md','/snippets/hr_holidays_delegations.md','/snippets/hr_payroll.md','/snippets/hr_recruitment.md','/snippets/hr_timesheet.md','/snippets/ir_model.md','/snippets/ir_ui_view.md','/snippets/l10n_ch.md','/snippets/mail.md','/snippets/mail_activity_board.md','/snippets/mrp.md','/snippets/mrp_workorder.md','/snippets/printnode_base.md','/snippets/product.md','/snippets/project.md','/snippets/purchase.md','/snippets/purchase_requisition.md','/snippets/res_groups.md','/snippets/sale.md','/snippets/sale_blanket_order.md','/snippets/sale_management.md','/snippets/sale_order_contact_person.md','/snippets/sale_order_line_date.md','/snippets/sale_order_picking_note.md','/snippets/sale_partner_incoterm.md','/snippets/stock.md','/snippets/stock_delivery_note.md','/snippets/timesheet_grid.md','/snippets/web.md','/snippets/website_discount_voucher.md','/snippets/website_sale.md',]
+module.exports = ['/snippets/account.md','/snippets/agreement.md','/snippets/agreement_legal.md','/snippets/base.md','/snippets/business_requirement.md','/snippets/calendar.md','/snippets/certificate_planer.md','/snippets/crm.md','/snippets/crm_iap_lead_enrich.md','/snippets/delivery.md','/snippets/digest.md','/snippets/gio_payroll_custom.md','/snippets/helpdesk.md','/snippets/hr.md','/snippets/hr_attendance.md','/snippets/hr_contract.md','/snippets/hr_holidays.md','/snippets/hr_holidays_delegations.md','/snippets/hr_payroll.md','/snippets/hr_recruitment.md','/snippets/hr_timesheet.md','/snippets/ir_model.md','/snippets/ir_ui_view.md','/snippets/l10n_ch.md','/snippets/mail.md','/snippets/mail_activity_board.md','/snippets/mrp.md','/snippets/mrp_workorder.md','/snippets/printnode_base.md','/snippets/product.md','/snippets/project.md','/snippets/purchase.md','/snippets/purchase_requisition.md','/snippets/res_groups.md','/snippets/sale.md','/snippets/sale_blanket_order.md','/snippets/sale_management.md','/snippets/sale_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/stock.md','/snippets/stock_delivery_note.md','/snippets/timesheet_grid.md','/snippets/web.md','/snippets/website_discount_voucher.md','/snippets/website_sale.md',]
diff --git a/addons/vertical_aero b/addons/vertical_aero
new file mode 160000
index 00000000..cda779f5
--- /dev/null
+++ b/addons/vertical_aero
@@ -0,0 +1 @@
+Subproject commit cda779f5815ffc006f4b4f3b6a2c315a875c1b90
diff --git a/snippets.md b/snippets.md
index cbabb64d..e2943381 100644
--- a/snippets.md
+++ b/snippets.md
@@ -11,6 +11,7 @@
 ## [Delivery](snippets/delivery.md)
 ## [Digest](snippets/digest.md)
 ## [Gio Payroll Custom](snippets/gio_payroll_custom.md)
+## [Helpdesk](snippets/helpdesk.md)
 ## [Hr](snippets/hr.md)
 ## [Hr Attendance](snippets/hr_attendance.md)
 ## [Hr Contract](snippets/hr_contract.md)
@@ -39,6 +40,7 @@
 ## [Sale Order Line Date](snippets/sale_order_line_date.md)
 ## [Sale Order Picking Note](snippets/sale_order_picking_note.md)
 ## [Sale Partner Incoterm](snippets/sale_partner_incoterm.md)
+## [Sale Product Set](snippets/sale_product_set.md)
 ## [Stock](snippets/stock.md)
 ## [Stock Delivery Note](snippets/stock_delivery_note.md)
 ## [Timesheet Grid](snippets/timesheet_grid.md)
diff --git a/snippets/account.md b/snippets/account.md
index c52dc225..50b0733b 100644
--- a/snippets/account.md
+++ b/snippets/account.md
@@ -207,6 +207,10 @@ ID: `mint_system.account.view_in_invoice_tree.add_discount_date`
 Link: [snippets/account.view_in_invoice_tree.add_discount_date.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/account.view_in_invoice_tree.add_discount_date.xml)
 
 ## View Invoice Tree  
+### Show Date  
+ID: `mint_system.account.view_invoice_tree.show_date`  
+Link: [snippets/account.view_invoice_tree.show_date.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/account.view_invoice_tree.show_date.xml)
+
 ### X Account Codes  
 ID: `mint_system.account.view_invoice_tree.x_account_codes`  
 Link: [snippets/account.view_invoice_tree.x_account_codes.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/account.view_invoice_tree.x_account_codes.xml)
@@ -220,6 +224,10 @@ Link: [snippets/account.view_move_form.hide_payment_reference.xml](https://githu
 ID: `mint_system.account.view_move_form.payment_reference_readonly`  
 Link: [snippets/account.view_move_form.payment_reference_readonly.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/account.view_move_form.payment_reference_readonly.xml)
 
+### Remove Isr Button  
+ID: `mint_system.account.view_move_form.remove_isr_button`  
+Link: [snippets/account.view_move_form.remove_isr_button.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/account.view_move_form.remove_isr_button.xml)
+
 ### Show Posted Before  
 ID: `mint_system.account.view_move_form.show_posted_before`  
 Link: [snippets/account.view_move_form.show_posted_before.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/account.view_move_form.show_posted_before.xml)
diff --git a/snippets/account.report_invoice_document.replace_footer.xml b/snippets/account.report_invoice_document.replace_footer.xml
index cbfb378e..5982a96d 100644
--- a/snippets/account.report_invoice_document.replace_footer.xml
+++ b/snippets/account.report_invoice_document.replace_footer.xml
@@ -23,7 +23,7 @@
         <td t-if="o.invoice_payment_term_id" name="payment_term">
           Zahlungsbedingungen: <span t-field="o.invoice_payment_term_id.note"/>
         </td>
-        <td width="60%">
+        <td width="50%">
           Lieferung gemäss unseren allgemeinen Lieferbedingungen
         </td>
       </tr>
diff --git a/snippets/account.view_move_form.remove_isr_button.xml b/snippets/account.view_move_form.remove_isr_button.xml
new file mode 100644
index 00000000..f89e73f6
--- /dev/null
+++ b/snippets/account.view_move_form.remove_isr_button.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<data inherit_id="account.view_move_form" priority="50" >
+
+    <button id="l10n_ch_btn_isr_print_highlight" position="replace"/>
+    <button id="btn_isr_print_normal" position="replace"/>
+
+</data>
\ No newline at end of file
diff --git a/snippets/helpdesk.helpdesk_ticket_view_form.x_date_deadline.xml b/snippets/helpdesk.helpdesk_ticket_view_form.x_date_deadline.xml
new file mode 100644
index 00000000..c8496dbe
--- /dev/null
+++ b/snippets/helpdesk.helpdesk_ticket_view_form.x_date_deadline.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<data inherit_id="helpdesk.helpdesk_ticket_view_form" priority="50">
+
+  <field name="domain_user_ids"  position="after">
+    <field name="x_date_deadline" widget="date"/>
+  </field>
+
+</data>
diff --git a/snippets/helpdesk.helpdesk_ticket_view_kanban.x_date_deadline.xml b/snippets/helpdesk.helpdesk_ticket_view_kanban.x_date_deadline.xml
new file mode 100644
index 00000000..f771e4df
--- /dev/null
+++ b/snippets/helpdesk.helpdesk_ticket_view_kanban.x_date_deadline.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<data inherit_id="helpdesk.helpdesk_ticket_view_kanban" priority="50">
+
+  <xpath expr="//field[@name='commercial_partner_id']/.." position="after">
+    <div>
+      <field name="x_date_deadline" widget="date"/>
+    </div>
+  </xpath>
+
+</data>
\ No newline at end of file
diff --git a/snippets/helpdesk.helpdesk_tickets_view_tree.x_date_deadline.xml b/snippets/helpdesk.helpdesk_tickets_view_tree.x_date_deadline.xml
new file mode 100644
index 00000000..7ae88789
--- /dev/null
+++ b/snippets/helpdesk.helpdesk_tickets_view_tree.x_date_deadline.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<data inherit_id="helpdesk.helpdesk_tickets_view_tree" priority="50">
+
+  <xpath expr="//field[@name='user_id']" position="after">
+    <field name="x_date_deadline" widget="date" />
+  </xpath>
+
+</data>
\ No newline at end of file
diff --git a/snippets/helpdesk.md b/snippets/helpdesk.md
new file mode 100644
index 00000000..fa3ef6f9
--- /dev/null
+++ b/snippets/helpdesk.md
@@ -0,0 +1,19 @@
+---
+prev: ./snippets.md
+---
+# Helpdesk
+## Helpdesk Tickets View Tree  
+### X Date Deadline  
+ID: `mint_system.helpdesk.helpdesk_tickets_view_tree.x_date_deadline`  
+Link: [snippets/helpdesk.helpdesk_tickets_view_tree.x_date_deadline.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/helpdesk.helpdesk_tickets_view_tree.x_date_deadline.xml)
+
+## Helpdesk Ticket View Form  
+### X Date Deadline  
+ID: `mint_system.helpdesk.helpdesk_ticket_view_form.x_date_deadline`  
+Link: [snippets/helpdesk.helpdesk_ticket_view_form.x_date_deadline.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/helpdesk.helpdesk_ticket_view_form.x_date_deadline.xml)
+
+## Helpdesk Ticket View Kanban  
+### X Date Deadline  
+ID: `mint_system.helpdesk.helpdesk_ticket_view_kanban.x_date_deadline`  
+Link: [snippets/helpdesk.helpdesk_ticket_view_kanban.x_date_deadline.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/helpdesk.helpdesk_ticket_view_kanban.x_date_deadline.xml)
+
diff --git a/snippets/ir_model.helpdesk_ticket.x_date_deadline.xml b/snippets/ir_model.helpdesk_ticket.x_date_deadline.xml
new file mode 100644
index 00000000..d9c41df2
--- /dev/null
+++ b/snippets/ir_model.helpdesk_ticket.x_date_deadline.xml
@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+<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"/>
+    <field name="name">x_date_deadline</field>
+    <field name="store" eval="True"/>
+    <field name="readonly" eval="False"/>
+    <field name="copied" eval="False"/>
+    <field name="ttype">datetime</field>    
+  </record>
+
+</odoo>
diff --git a/snippets/ir_model.md b/snippets/ir_model.md
index b7e82b03..ed3c6e41 100644
--- a/snippets/ir_model.md
+++ b/snippets/ir_model.md
@@ -64,6 +64,11 @@ Link: [snippets/ir_model.crm_lead.x_date_stop.xml](https://github.com/Mint-Syste
 ID: `mint_system.ir_model.crm_lead.x_mobile`  
 Link: [snippets/ir_model.crm_lead.x_mobile.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/ir_model.crm_lead.x_mobile.xml)
 
+## Helpdesk Ticket  
+### X Date Deadline  
+ID: `mint_system.ir_model.helpdesk_ticket.x_date_deadline`  
+Link: [snippets/ir_model.helpdesk_ticket.x_date_deadline.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/ir_model.helpdesk_ticket.x_date_deadline.xml)
+
 ## Hr Applicant  
 ### X Gdpr  
 ID: `mint_system.ir_model.hr_applicant.x_gdpr`  
@@ -92,6 +97,11 @@ Link: [snippets/ir_model.mrp_production.x_note.xml](https://github.com/Mint-Syst
 ID: `mint_system.ir_model.mrp_workorder.x_reservation_state`  
 Link: [snippets/ir_model.mrp_workorder.x_reservation_state.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/ir_model.mrp_workorder.x_reservation_state.xml)
 
+## Product Set Line  
+### X Categ Id  
+ID: `mint_system.ir_model.product_set_line.x_categ_id`  
+Link: [snippets/ir_model.product_set_line.x_categ_id.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/ir_model.product_set_line.x_categ_id.xml)
+
 ## Product Template  
 ### X Hide On Delivery  
 ID: `mint_system.ir_model.product_template.x_hide_on_delivery`  
@@ -162,6 +172,10 @@ Link: [snippets/ir_model.sale_order_line.x_industry_id.xml](https://github.com/M
 ID: `mint_system.ir_model.sale_order_line.x_state`  
 Link: [snippets/ir_model.sale_order_line.x_state.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/ir_model.sale_order_line.x_state.xml)
 
+### X Weight Delivered  
+ID: `mint_system.ir_model.sale_order_line.x_weight_delivered`  
+Link: [snippets/ir_model.sale_order_line.x_weight_delivered.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/ir_model.sale_order_line.x_weight_delivered.xml)
+
 ## Sale Order  
 ### X Studio Description  
 ID: `mint_system.ir_model.sale_order.x_studio_description`  
diff --git a/snippets/ir_model.product_set_line.x_categ_id.xml b/snippets/ir_model.product_set_line.x_categ_id.xml
new file mode 100644
index 00000000..e02a8246
--- /dev/null
+++ b/snippets/ir_model.product_set_line.x_categ_id.xml
@@ -0,0 +1,18 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+<odoo>
+
+  <record id="x_categ_id" model="ir.model.fields">
+    <field name="domain">[]</field>
+    <field name="field_description">Kategorei</field>
+    <field name="model">product.set.line</field>
+    <field name="model_id" ref="product.model_product_set_line"/>
+    <field name="name">x_categ_id</field>
+    <field name="store" eval="True"/>
+    <field name="readonly" eval="True"/>
+    <field name="copied" eval="False"/>
+    <field name="ttype">many2one</field>
+    <field name="relation">product.category</field>
+    <field name="related">product_id.categ_id</field>
+  </record>
+
+</odoo>
diff --git a/snippets/ir_model.sale_order_line.x_weight_delivered.xml b/snippets/ir_model.sale_order_line.x_weight_delivered.xml
new file mode 100644
index 00000000..4b93df58
--- /dev/null
+++ b/snippets/ir_model.sale_order_line.x_weight_delivered.xml
@@ -0,0 +1,19 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<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" />
+    <field name="name">x_weight_delivered</field>
+    <field name="store" eval="True" />
+    <field name="readonly" eval="True" />
+    <field name="copied" eval="False" />
+    <field name="ttype">float</field>
+    <field name="depends">qty_delivered</field>
+    <field name="compute">for rec in self:
+      rec['x_weight_delivered'] = rec.product_id.weight * rec.qty_delivered</field>
+  </record>
+
+</odoo>
\ No newline at end of file
diff --git a/snippets/l10n_ch.isr_invoice_form.disable_print_buttons.xml b/snippets/l10n_ch.isr_invoice_form.disable_print_buttons.xml
index 6e350a46..a3486b4e 100644
--- a/snippets/l10n_ch.isr_invoice_form.disable_print_buttons.xml
+++ b/snippets/l10n_ch.isr_invoice_form.disable_print_buttons.xml
@@ -2,6 +2,7 @@
 <data inherit_id="l10n_ch.isr_invoice_form" priority="50">
 
     <button name="print_ch_qr_bill" position="replace" />
-    <button name="isr_print" position="replace" />
+    <button id="l10n_ch_btn_isr_print_highlight" position="replace"/>
+    <button id="btn_isr_print_normal" position="replace"/>
 
 </data>
\ No newline at end of file
diff --git a/snippets/mail.mail_notification_borders.reduce_to_content.xml b/snippets/mail.mail_notification_borders.reduce_to_content.xml
new file mode 100644
index 00000000..6bfe542c
--- /dev/null
+++ b/snippets/mail.mail_notification_borders.reduce_to_content.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0"?>
+<data inherit_id="mail.mail_notification_borders" priority="50">
+
+    <xpath expr="//tbody" position="replace">
+        <tbody>
+
+            <!-- CONTENT -->
+            <tr>
+                <td align="center" style="min-width: 590px;">
+                    <table width="590" border="0" cellpadding="0" bgcolor="#ffffff" style="min-width: 590px; background-color: rgb(255, 255, 255); padding: 20px; border-collapse:separate;">
+                        <tbody>
+                            <td valign="top" style="font-family:Arial,Helvetica,sans-serif; color: #555; font-size: 14px;">
+                                <t t-raw="message.body"/>
+                            </td>
+                        </tbody>
+                    </table>
+                </td>
+            </tr>
+            <tr>
+                <td align="center" style="padding: 8px; font-size:11px;">
+                    <a></a>
+                </td>
+            </tr>
+        </tbody>
+    </xpath>
+
+</data>
diff --git a/snippets/mail.mail_notification_light.reduce_to_content.xml b/snippets/mail.mail_notification_light.reduce_to_content.xml
new file mode 100644
index 00000000..c5f3efbc
--- /dev/null
+++ b/snippets/mail.mail_notification_light.reduce_to_content.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0"?>
+<data inherit_id="mail.mail_notification_light" priority="50">
+
+  <xpath expr="//t/table" position="replace">
+    <table border="0" cellpadding="0" cellspacing="0" style="padding-top: 16px; background-color: #F1F1F1; font-family:Verdana, Arial,sans-serif; color: #454748; width: 100%; border-collapse:separate;">
+      <tr>
+        <td align="center">
+          <table border="0" cellpadding="0" cellspacing="0" width="590" style="padding: 24px; background-color: white; color: #454748; border-collapse:separate;">
+            <tbody>
+              <!-- CONTENT -->
+              <tr>
+                <td style="min-width: 590px;">
+                  <t t-raw="message.body"/>
+                </td>
+              </tr>
+
+            </tbody>
+          </table>
+        </td>
+      </tr>
+      <!-- POWERED BY -->
+      <tr>
+        <td align="center" style="min-width: 590px;">
+          <a></a>
+        </td>
+      </tr>
+    </table>
+  </xpath>
+</data>
diff --git a/snippets/mail.mail_notification_paynow.reduce_to_content.xml b/snippets/mail.mail_notification_paynow.reduce_to_content.xml
new file mode 100644
index 00000000..ce5f3b10
--- /dev/null
+++ b/snippets/mail.mail_notification_paynow.reduce_to_content.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0"?>
+<data inherit_id="mail.mail_notification_paynow" priority="50">
+
+  <xpath expr="//t/table" position="replace">
+
+    <table border="0" cellpadding="0" cellspacing="0" style="padding-top: 16px; background-color: #F1F1F1; font-family:Verdana, Arial,sans-serif; color: #454748; width: 100%; border-collapse:separate;">
+      <tr>
+        <td align="center">
+          <table border="0" cellpadding="0" cellspacing="0" width="590" style="padding: 24px; background-color: white; color: #454748; border-collapse:separate;">
+            <tbody>
+              <!-- CONTENT -->
+              <tr>
+                <td style="padding: 0">
+                  <t t-raw="message.body"/>
+                </td>
+              </tr>
+            </tbody>
+
+          </table>
+        </td>
+      </tr>
+      <!-- POWERED BY -->
+      <tr>
+        <td align="center" style="min-width: 590px; padding: 8px; font-size:11px;">
+          <a></a>
+        </td>
+      </tr>
+    </table>
+
+  </xpath>
+</data>
diff --git a/snippets/mail.md b/snippets/mail.md
index 5a24d7d7..9fa90cda 100644
--- a/snippets/mail.md
+++ b/snippets/mail.md
@@ -13,6 +13,10 @@ ID: `mint_system.mail.mail_activity_view_form_popup.x_reference`
 Link: [snippets/mail.mail_activity_view_form_popup.x_reference.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/mail.mail_activity_view_form_popup.x_reference.xml)
 
 ## Mail Notification Borders  
+### Reduce To Content  
+ID: `mint_system.mail.mail_notification_borders.reduce_to_content`  
+Link: [snippets/mail.mail_notification_borders.reduce_to_content.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/mail.mail_notification_borders.reduce_to_content.xml)
+
 ### Remove Logo  
 ID: `mint_system.mail.mail_notification_borders.remove_logo`  
 Link: [snippets/mail.mail_notification_borders.remove_logo.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/mail.mail_notification_borders.remove_logo.xml)
@@ -23,6 +27,10 @@ ID: `mint_system.mail.mail_notification_email.remove_logo`
 Link: [snippets/mail.mail_notification_email.remove_logo.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/mail.mail_notification_email.remove_logo.xml)
 
 ## Mail Notification Light  
+### Reduce To Content  
+ID: `mint_system.mail.mail_notification_light.reduce_to_content`  
+Link: [snippets/mail.mail_notification_light.reduce_to_content.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/mail.mail_notification_light.reduce_to_content.xml)
+
 ### Remove Logo  
 ID: `mint_system.mail.mail_notification_light.remove_logo`  
 Link: [snippets/mail.mail_notification_light.remove_logo.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/mail.mail_notification_light.remove_logo.xml)
@@ -32,6 +40,10 @@ ID: `mint_system.mail.mail_notification_light.replace_footer`
 Link: [snippets/mail.mail_notification_light.replace_footer.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/mail.mail_notification_light.replace_footer.xml)
 
 ## Mail Notification Paynow  
+### Reduce To Content  
+ID: `mint_system.mail.mail_notification_paynow.reduce_to_content`  
+Link: [snippets/mail.mail_notification_paynow.reduce_to_content.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/mail.mail_notification_paynow.reduce_to_content.xml)
+
 ### Remove Logo  
 ID: `mint_system.mail.mail_notification_paynow.remove_logo`  
 Link: [snippets/mail.mail_notification_paynow.remove_logo.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/mail.mail_notification_paynow.remove_logo.xml)
diff --git a/snippets/mail_activity_board.open_boards_activities.my_activities_filter.xml b/snippets/mail_activity_board.open_boards_activities.my_activities_filter.xml
new file mode 100644
index 00000000..decb8c17
--- /dev/null
+++ b/snippets/mail_activity_board.open_boards_activities.my_activities_filter.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<odoo>
+
+  <record model="ir.actions.act_window" id="open_boards_activities">
+    <field name="context">{'search_default_my_activities': 1}</field>
+  </record>
+
+</odoo>
\ No newline at end of file
diff --git a/snippets/mrp.md b/snippets/mrp.md
index ef1a9ebf..4233364a 100644
--- a/snippets/mrp.md
+++ b/snippets/mrp.md
@@ -163,6 +163,10 @@ ID: `mint_system.mrp.view_mrp_production_filter.add_not_planned`
 Link: [snippets/mrp.view_mrp_production_filter.add_not_planned.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/mrp.view_mrp_production_filter.add_not_planned.xml)
 
 ## View Mrp Production Workorder Form View Filter  
+### Add Date Planned Start Set  
+ID: `mint_system.mrp.view_mrp_production_workorder_form_view_filter.add_date_planned_start_set`  
+Link: [snippets/mrp.view_mrp_production_workorder_form_view_filter.add_date_planned_start_set.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/mrp.view_mrp_production_workorder_form_view_filter.add_date_planned_start_set.xml)
+
 ### Add Planned  
 ID: `mint_system.mrp.view_mrp_production_workorder_form_view_filter.add_planned`  
 Link: [snippets/mrp.view_mrp_production_workorder_form_view_filter.add_planned.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/mrp.view_mrp_production_workorder_form_view_filter.add_planned.xml)
@@ -171,6 +175,11 @@ Link: [snippets/mrp.view_mrp_production_workorder_form_view_filter.add_planned.x
 ID: `mint_system.mrp.view_mrp_production_workorder_form_view_filter.add_product_id`  
 Link: [snippets/mrp.view_mrp_production_workorder_form_view_filter.add_product_id.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/mrp.view_mrp_production_workorder_form_view_filter.add_product_id.xml)
 
+## View Mrp Production Work Order Search  
+### Add Date Planned Start Set  
+ID: `mint_system.mrp.view_mrp_production_work_order_search.add_date_planned_start_set`  
+Link: [snippets/mrp.view_mrp_production_work_order_search.add_date_planned_start_set.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/mrp.view_mrp_production_work_order_search.add_date_planned_start_set.xml)
+
 ## Workcenter Line Kanban  
 ### Add Date Planned Start  
 ID: `mint_system.mrp.workcenter_line_kanban.add_date_planned_start`  
diff --git a/snippets/mrp.view_mrp_production_work_order_search.add_date_planned_start_set.xml b/snippets/mrp.view_mrp_production_work_order_search.add_date_planned_start_set.xml
new file mode 100644
index 00000000..ccb4ed2c
--- /dev/null
+++ b/snippets/mrp.view_mrp_production_work_order_search.add_date_planned_start_set.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<data inherit_id="mrp.view_mrp_production_work_order_search" priority="50">
+
+<xpath expr="//filter[@name='date_start_filter']" position="after">
+   <filter string="Start Date Set" name="start_date_set" domain="[('date_planned_start', '!=', False)]"/>
+</xpath>
+
+</data>
\ No newline at end of file
diff --git a/snippets/mrp.view_mrp_production_workorder_form_view_filter.add_date_planned_start_set.xml b/snippets/mrp.view_mrp_production_workorder_form_view_filter.add_date_planned_start_set.xml
new file mode 100644
index 00000000..14bae564
--- /dev/null
+++ b/snippets/mrp.view_mrp_production_workorder_form_view_filter.add_date_planned_start_set.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<data inherit_id="mrp.view_mrp_production_workorder_form_view_filter" priority="50">
+
+<xpath expr="//filter[@name='late']" position="after">
+   <filter string="Start Date Set" name="start_date_set" domain="[('date_planned_start', '!=', False)]"/>
+</xpath>
+
+</data>
\ No newline at end of file
diff --git a/snippets/sale.md b/snippets/sale.md
index d2d9e75f..78bf5a81 100644
--- a/snippets/sale.md
+++ b/snippets/sale.md
@@ -154,10 +154,6 @@ Link: [snippets/sale.report_saleorder_document.confirmation_header_quantity.xml]
 ID: `mint_system.sale.report_saleorder_document.confirmation_qty_to_deliver`  
 Link: [snippets/sale.report_saleorder_document.confirmation_qty_to_deliver.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/sale.report_saleorder_document.confirmation_qty_to_deliver.xml)
 
-### Confirmation Qty  
-ID: `mint_system.sale.report_saleorder_document.confirmation_qty`  
-Link: [snippets/sale.report_saleorder_document.confirmation_qty.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/sale.report_saleorder_document.confirmation_qty.xml)
-
 ### Confirmation Title  
 ID: `mint_system.sale.report_saleorder_document.confirmation_title`  
 Link: [snippets/sale.report_saleorder_document.confirmation_title.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/sale.report_saleorder_document.confirmation_title.xml)
@@ -368,6 +364,10 @@ Link: [snippets/sale.view_order_line_tree.reset_view.xml](https://github.com/Min
 ID: `mint_system.sale.view_order_line_tree.show_state`  
 Link: [snippets/sale.view_order_line_tree.show_state.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/sale.view_order_line_tree.show_state.xml)
 
+### X Weight Delivered  
+ID: `mint_system.sale.view_order_line_tree.x_weight_delivered`  
+Link: [snippets/sale.view_order_line_tree.x_weight_delivered.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/sale.view_order_line_tree.x_weight_delivered.xml)
+
 ## View Order Tree  
 ### Add Carrier  
 ID: `mint_system.sale.view_order_tree.add_carrier`  
diff --git a/snippets/sale.report_saleorder_document.add_footer.xml b/snippets/sale.report_saleorder_document.add_footer.xml
index 71ee46bf..465ce137 100644
--- a/snippets/sale.report_saleorder_document.add_footer.xml
+++ b/snippets/sale.report_saleorder_document.add_footer.xml
@@ -13,13 +13,13 @@
     </style>
     <table id='footer'>
       <tr>
-        <td width="40%" t-if="doc.payment_term_id.note">Zahlungsbedingungen 
+        <td width="50%" t-if="doc.payment_term_id.note">Zahlungsbedingungen 
           <span t-field="doc.payment_term_id.note"/>
         </td>
-         <td width="40%" t-if="not doc.payment_term_id.note">
+         <td width="50%" t-if="not doc.payment_term_id.note">
         </td>
         
-        <td width="60%">
+        <td width="50%">
           Lieferung gemäss unseren allgemeinen Lieferbedingungen
         </td>
       </tr>
diff --git a/snippets/sale.report_saleorder_document.confirmation_qty.xml b/snippets/sale.report_saleorder_document.confirmation_qty.xml
deleted file mode 100644
index 488d45ca..00000000
--- a/snippets/sale.report_saleorder_document.confirmation_qty.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0"?>
-<data inherit_id="sale.report_saleorder_document" priority="60">
-    
-    <th id="qty" position="replace">
-        <t t-if="is_confirmation">
-            <span t-field="line.product_uom_qty" />
-        </t>
-        <t t-else="">
-            <span t-field="line.product_uom_qty" />
-        </t>
-    </th>
-
-    <span id="product_uom_qty" position="replace">
-        <t t-if="is_confirmation">
-            <span id="product_uom_qty_is_confirmation" t-field="line.product_uom_qty" />
-        </t>
-        <t t-else="">
-            <span id="product_uom_qty_is_not_confirmation" t-field="line.product_uom_qty" />
-        </t>
-    </span>
-
-</data>
\ No newline at end of file
diff --git a/snippets/sale.report_saleorder_document.confirmation_qty_to_deliver.xml b/snippets/sale.report_saleorder_document.confirmation_qty_to_deliver.xml
index 2d1efde5..cdd620f5 100644
--- a/snippets/sale.report_saleorder_document.confirmation_qty_to_deliver.xml
+++ b/snippets/sale.report_saleorder_document.confirmation_qty_to_deliver.xml
@@ -1,8 +1,28 @@
 <?xml version="1.0"?>
 <data inherit_id="sale.report_saleorder_document" priority="50">
 
-  <xpath expr="//td[@name='td_quantity']/span[1]" position="attributes">
-    <attribute t-if="is_confirmation" name="t-field">line.qty_to_deliver</attribute>
+  <xpath expr="//td[@name='td_quantity']/span[1]" position="replace">
+    <t t-if="is_confirmation">
+      <span id="product_uom_qty_confirmed" t-esc="line.qty_to_deliver"/>
+    </t>
+    <t t-else="">
+      <span id="product_uom_qty" t-esc="line.product_uom_qty"/>
+    </t>
+  </xpath>
+
+  <xpath expr="//td[@name='td_subtotal']" position="replace">
+    <t t-if="is_confirmation">
+      <td name="td_subtotal" class="text-right o_price_total">
+        <span t-esc="'%.2f' % (line.price_unit * line.qty_to_deliver * ((line.discount or 100.0) / 100.0))" groups="account.group_show_line_subtotals_tax_excluded"/>
+        <span t-esc="'%.2f' % (line.price_unit * line.qty_to_deliver * ((line.discount or 100.0) / 100.0))" groups="account.group_show_line_subtotals_tax_included"/>
+      </td>
+    </t>
+    <t t-else="">
+      <td name="td_subtotal" class="text-right o_price_total">
+        <span t-field="line.price_subtotal" groups="account.group_show_line_subtotals_tax_excluded"/>
+        <span t-field="line.price_total" groups="account.group_show_line_subtotals_tax_included"/>
+      </td>
+    </t>
   </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 af2a4707..29c8d359 100644
--- a/snippets/sale.report_saleorder_document.format_qty.xml
+++ b/snippets/sale.report_saleorder_document.format_qty.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0"?>
 <data inherit_id="sale.report_saleorder_document" priority="50">
 
-	<xpath expr="//span[@id='product_uom_qty_is_confirmation']" position="attributes">
+	<xpath expr="//span[@id='product_uom_qty']" position="attributes">
 		<attribute name="t-options-widget">"integer"</attribute>
 	</xpath>
 	
-	<xpath expr="//span[@id='product_uom_qty_is_not_confirmation']" position="attributes">
+	<xpath expr="//span[@id='product_uom_qty_confirmed']" position="attributes">
 		<attribute name="t-options-widget">"integer"</attribute>
 	</xpath>
 
diff --git a/snippets/sale.report_saleorder_document.replace_summary.xml b/snippets/sale.report_saleorder_document.replace_summary.xml
index 628bfbaa..d3242cc3 100644
--- a/snippets/sale.report_saleorder_document.replace_summary.xml
+++ b/snippets/sale.report_saleorder_document.replace_summary.xml
@@ -1,32 +1,32 @@
 <?xml version="1.0"?>
 <data inherit_id="sale.report_saleorder_document" priority="50">
 
-<xpath expr="//div[@name='so_total_summary']" position="replace">
-  
-    <table class="table table-borderless table-sm" style="margin-top:20px; width:100%; color:black; font-family: arial; font-size:9pt; border-top-style:solid; border-bottom-style:solid; border-width:1px; border-color:black">
+  <xpath expr="//div[@name='so_total_summary']" position="replace">
+
+    <table class="table table-borderless table-sm">
       <t t-foreach="doc.amount_by_group" t-as="amount_by_group">
         <tr >
-          <td style="width:15.5%; text-align:left">
+          <td id="amount_untaxed_label">
             <Strong>Warenwert</Strong>
           </td>
-          <td style="width:23%; text-align:left">
+          <td id="amount_untaxed">
             <span t-field="doc.amount_untaxed"/>
           </td>
-          <td style="width:12%; text-align:left">
+          <td id="amount_by_group_label">
             <span t-esc="amount_by_group[0]"/>
           </td>
-          <td style="width:17%; text-align:left">
+          <td id="amount_by_group">
             <span t-esc="amount_by_group[1]" t-options="{&quot;widget&quot;: &quot;monetary&quot;, &quot;display_currency&quot;: doc.pricelist_id.currency_id}"/>
           </td>
-          <td style="width:14%; text-align:right">
+          <td id="current_subtotal_label">
             <Strong>Rechnungsbetrag</Strong>
           </td>
-          <td style="width:18%; text-align:right">
-            <span t-field="doc.amount_total"/>
+          <td id="current_subtotal">
+            <span t-esc="doc.amount_total"/>
           </td>
         </tr>
       </t>
     </table>
-    
+
   </xpath>
 </data>
\ No newline at end of file
diff --git a/snippets/sale.report_saleorder_document.round_total_price.xml b/snippets/sale.report_saleorder_document.round_total_price.xml
index 77464e83..1301e2bb 100644
--- a/snippets/sale.report_saleorder_document.round_total_price.xml
+++ b/snippets/sale.report_saleorder_document.round_total_price.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<data inherit_id="sale.report_saleorder_document" priority="50">
+<data inherit_id="sale.report_saleorder_document" priority="60">
 
   <xpath expr="//span[@t-field='line.price_subtotal']" position="replace">
     <span t-esc="'{0:,.2f}'.format(float(line.price_subtotal)).replace(',','\'')"/>
diff --git a/snippets/sale.report_saleorder_document.set_ids.xml b/snippets/sale.report_saleorder_document.set_ids.xml
index 19691d3c..e8f5769a 100644
--- a/snippets/sale.report_saleorder_document.set_ids.xml
+++ b/snippets/sale.report_saleorder_document.set_ids.xml
@@ -4,20 +4,15 @@
 	<xpath expr="//th[@name='th_description']" position="attributes">
 		<attribute name="id">description</attribute>
 	</xpath>
-	
-	<xpath expr="//table/thead//tr[1]//th[4]" position="attributes">
-		<attribute name="id">commitment_date</attribute>
-	</xpath>
-	<xpath expr="//table/tbody[hasclass('sale_tbody')]//tr[1]//td[4]" position="attributes">
-		<attribute name="id">commitment_date</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>
diff --git a/snippets/sale.report_saleorder_document.style_trimada.xml b/snippets/sale.report_saleorder_document.style_trimada.xml
index 35289728..8c48fbe1 100644
--- a/snippets/sale.report_saleorder_document.style_trimada.xml
+++ b/snippets/sale.report_saleorder_document.style_trimada.xml
@@ -41,13 +41,13 @@
 			table.trimada tbody td#default_code {
 			  text-align: right;
 			}
-			table.trimada tbody td#commitment_date {
+			table.trimada tbody #commitment_date {
 			  text-align: right;
 			}
-			table.trimada tbody td span#product_uom_qty_is_confirmation {
+			table.trimada tbody td span#product_uom_qty {
 			  font-weight: bold;
 			}
-			table.trimada tbody td span#product_uom_qty_is_not_confirmation {
+			table.trimada tbody td span#product_uom_qty_confirmed {
 			  font-weight: bold;
 			}
 			.subtitel {
diff --git a/snippets/sale.view_order_line_tree.x_weight_delivered.xml b/snippets/sale.view_order_line_tree.x_weight_delivered.xml
new file mode 100644
index 00000000..fdb8c090
--- /dev/null
+++ b/snippets/sale.view_order_line_tree.x_weight_delivered.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<data inherit_id="sale.view_order_line_tree" priority="50">
+
+    <field name="qty_to_invoice" position="after">
+        <field name="x_weight_delivered" />
+    </field>
+
+</data>
diff --git a/snippets/sale_order_line_date.report_saleorder_document.hide_in_state_draft.xml b/snippets/sale_order_line_date.report_saleorder_document.hide_in_state_draft.xml
index 012f6efd..3df46048 100644
--- a/snippets/sale_order_line_date.report_saleorder_document.hide_in_state_draft.xml
+++ b/snippets/sale_order_line_date.report_saleorder_document.hide_in_state_draft.xml
@@ -4,9 +4,10 @@
   <xpath expr="//table/thead//tr[1]//th[2]" position="replace">
     <th t-if="doc.state not in ['draft']" id="commitment_date" class="text-left">Commitment Date</th>
   </xpath>
+  
   <xpath expr="//table/tbody[hasclass('sale_tbody')]//tr[1]//td[2]" position="replace">
-    <td t-if="doc.state not in ['draft']">
-      <span t-field="line.commitment_date" id="commitment_date" t-options="{'widget': 'date'}"/>
+    <td t-if="doc.state not in ['draft']" id="commitment_date">
+      <span t-field="line.commitment_date" t-options="{'widget': 'date'}"/>
     </td>
   </xpath>
   
diff --git a/snippets/sale_product_set.md b/snippets/sale_product_set.md
new file mode 100644
index 00000000..6fd351d1
--- /dev/null
+++ b/snippets/sale_product_set.md
@@ -0,0 +1,9 @@
+---
+prev: ./snippets.md
+---
+# Sale Product Set
+## View Product Set Form  
+### X Categ Id  
+ID: `mint_system.sale_product_set.view_product_set_form.x_categ_id`  
+Link: [snippets/sale_product_set.view_product_set_form.x_categ_id.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/sale_product_set.view_product_set_form.x_categ_id.xml)
+
diff --git a/snippets/sale_product_set.view_product_set_form.x_categ_id.xml b/snippets/sale_product_set.view_product_set_form.x_categ_id.xml
new file mode 100644
index 00000000..fbcf803d
--- /dev/null
+++ b/snippets/sale_product_set.view_product_set_form.x_categ_id.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<data inherit_id="sale_product_set.view_product_set_form" priority="50">
+
+  <field name="product_id" position="after">
+    <field name="x_categ_id"/>
+  </field>
+
+</data>
diff --git a/snippets/stock.md b/snippets/stock.md
index 61fbb02c..8ddac729 100644
--- a/snippets/stock.md
+++ b/snippets/stock.md
@@ -234,6 +234,10 @@ Link: [snippets/stock.report_picking.format_delivery_date.xml](https://github.co
 ID: `mint_system.stock.report_picking.format_qty_available`  
 Link: [snippets/stock.report_picking.format_qty_available.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/stock.report_picking.format_qty_available.xml)
 
+### Format Qty  
+ID: `mint_system.stock.report_picking.format_qty`  
+Link: [snippets/stock.report_picking.format_qty.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/stock.report_picking.format_qty.xml)
+
 ### Format Title  
 ID: `mint_system.stock.report_picking.format_title`  
 Link: [snippets/stock.report_picking.format_title.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/stock.report_picking.format_title.xml)
@@ -298,6 +302,10 @@ Link: [snippets/stock.report_picking.remove_reservation_notice.xml](https://gith
 ID: `mint_system.stock.report_picking.remove_serial_number`  
 Link: [snippets/stock.report_picking.remove_serial_number.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/stock.report_picking.remove_serial_number.xml)
 
+### Replace Barcode  
+ID: `mint_system.stock.report_picking.replace_barcode`  
+Link: [snippets/stock.report_picking.replace_barcode.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/stock.report_picking.replace_barcode.xml)
+
 ### Replace Header  
 ID: `mint_system.stock.report_picking.replace_header`  
 Link: [snippets/stock.report_picking.replace_header.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/stock.report_picking.replace_header.xml)
diff --git a/snippets/stock.report_picking.add_address_block.xml b/snippets/stock.report_picking.add_address_block.xml
index 9740b79a..d2d48157 100644
--- a/snippets/stock.report_picking.add_address_block.xml
+++ b/snippets/stock.report_picking.add_address_block.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <data inherit_id="stock.report_picking" priority="50">
 
-  <xpath expr="//div[@id='info']" position="before">
+  <xpath expr="//table[1]" position="after">
     <div class="table address_block">
       <div class="row">
         <div class="col">
diff --git a/snippets/stock.report_picking.format_qty.xml b/snippets/stock.report_picking.format_qty.xml
new file mode 100644
index 00000000..b097288c
--- /dev/null
+++ b/snippets/stock.report_picking.format_qty.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<data inherit_id="stock.report_picking" priority="50">
+
+  <xpath expr="//span[@id='product_uom_qty']" position="attributes">
+    <attribute name="t-options-widget">"integer"</attribute>
+  </xpath>
+  
+  <xpath expr="//span[@id='product_uom_qty_done']" position="attributes">
+    <attribute name="t-options-widget">"integer"</attribute>
+  </xpath>
+
+  <xpath expr="//span[@id='qty_available']" position="attributes">
+    <attribute name="t-options-widget">"integer"</attribute>
+  </xpath>
+
+</data>
diff --git a/snippets/stock.report_picking.group_by_date.xml b/snippets/stock.report_picking.group_by_date.xml
index fae2984b..ddea6586 100644
--- a/snippets/stock.report_picking.group_by_date.xml
+++ b/snippets/stock.report_picking.group_by_date.xml
@@ -31,7 +31,7 @@
       </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'))" />
+      <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">
 
diff --git a/snippets/stock.report_picking.hide_address.xml b/snippets/stock.report_picking.hide_address.xml
index 9bb83279..0c636fd5 100644
--- a/snippets/stock.report_picking.hide_address.xml
+++ b/snippets/stock.report_picking.hide_address.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0"?>
 <data inherit_id="stock.report_picking" priority="50">
 
-    <xpath expr="//div[@name='div_outgoing_address']/.." position="replace">
-    </xpath>
+    <xpath expr="//div[@name='div_outgoing_address']/.." position="replace"/>
 
 </data>
\ No newline at end of file
diff --git a/snippets/stock.report_picking.hide_name.xml b/snippets/stock.report_picking.hide_name.xml
index e7d727ab..5bfb6a5e 100644
--- a/snippets/stock.report_picking.hide_name.xml
+++ b/snippets/stock.report_picking.hide_name.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0"?>
 <data inherit_id="stock.report_picking" priority="50">
 
-    <xpath expr="//h1[@t-field='o.name']" position="replace">
-    </xpath>
+    <xpath expr="//h1[@t-field='o.name']" position="replace"/>
     
 </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 36df77e1..6fc9ec9c 100644
--- a/snippets/stock.report_picking.product_description.xml
+++ b/snippets/stock.report_picking.product_description.xml
@@ -2,10 +2,20 @@
 <data inherit_id="stock.report_picking" priority="50">
 
 	<xpath expr="//td[@id='description_picking']" position="replace">
+
 		<td id="description_picking">
-			<span t-field="ml.product_id.name"/><br/>
-      <span t-field="ml.product_id.type_description"/>
-    </td>
+			<strong>
+				<span t-esc="move.product_id.type_description"/>
+			</strong>
+			<br/>
+			<span t-esc="move.description_picking"/>
+			<br/>
+			<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 538eafb0..512b6577 100644
--- a/snippets/stock.report_picking.relocate_quantity.xml
+++ b/snippets/stock.report_picking.relocate_quantity.xml
@@ -1,22 +1,24 @@
 <?xml version="1.0"?>
 <data inherit_id="stock.report_picking" priority="50">
 
-	<xpath expr="//th[@id='product_uom_qty']" position="replace">
-	</xpath>
+	<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>
+	<xpath expr="//td[@id='product_uom_qty']" position="replace"/>
 
 	<xpath expr="//td[@id='location_dest_id']" position="after">
 		<td id="product_uom_qty">
 			<span id="product_uom_qty" t-if="o.state != 'done'" t-field="ml.product_uom_qty"/>
-			<span id="product_uom_qty" t-if="o.state == 'done'" t-field="ml.qty_done"/>
-			<span id="product_uom_qty" t-field="ml.product_uom_id" groups="uom.group_uom"/>
+			<span id="product_uom_qty_done" t-if="o.state == 'done'" t-field="ml.qty_done"/>
+			<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_uom_id"/>
 		</td>
 	</xpath>
 
diff --git a/snippets/stock.report_picking.replace_barcode.xml b/snippets/stock.report_picking.replace_barcode.xml
new file mode 100644
index 00000000..d3738634
--- /dev/null
+++ b/snippets/stock.report_picking.replace_barcode.xml
@@ -0,0 +1,19 @@
+<?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>
\ 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 d4343076..2e122184 100644
--- a/snippets/stock.report_picking.replace_header.xml
+++ b/snippets/stock.report_picking.replace_header.xml
@@ -1,19 +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">
 
-	<table style="width:100%; border:solid 1px; font-family: arial; font-size: 18pt; font-weight: bold;">
-	<tr>
-		<td style="padding-left: 10px; vertical-align: middle">Rüstschein   <span t-field="o.name"/>
-		</td>
-			<td style="padding: 5px">
-			<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>	  
+		<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>
 
-</xpath>
+		<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>
\ 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 9c01f274..ec0c250d 100644
--- a/snippets/stock.report_picking.replace_order_definition.xml
+++ b/snippets/stock.report_picking.replace_order_definition.xml
@@ -1,28 +1,81 @@
 <?xml version="1.0"?>
 <data inherit_id="stock.report_picking" priority="50">
 
-<xpath expr="//div[@t-if='o.origin']/.." position="replace">
-  <table style="font-family:arial;font-size: 11pt; width:100%;">
-    <tr style="border-bottom: 1px solid rgb(220,220,220);">
-      <t t-if="o.picking_type_id.id == 12">
-      <td style="width:44%; padding-left: 10px; padding-bottom: 5px"><strong>Fertigungsauftrag   <span t-field="o.origin"/></strong></td>
-      <td style="width:56%"><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 style="width:44%; padding-left: 10px; padding-bottom: 5px"><strong>Bestellung   <span t-field="o.origin"/></strong></td>
-      </t>
-    </tr>
-    <tr style="border-bottom: 1px solid rgb(220,220,220);">
-      <td style="padding-left: 10px; padding-top: 5px; padding-bottom: 5px">Status: <span t-field="o.state"/></td>
-      <td>Datum: <span t-field="o.scheduled_date" t-options='{"widget": "date"}'></span></td>
-    </tr>
-    <tr>
-      <td style="padding-left: 10px; padding-top: 10px; padding-bottom: 15px">
-          Typ: <span t-field="o.picking_type_id.code"/> (<span t-field="o.picking_type_id.id"/>)
-      </td>
-    </tr>    
-  </table>
-  
-    
-</xpath>
+  <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>
\ No newline at end of file
diff --git a/snippets/stock.report_picking.set_ids.xml b/snippets/stock.report_picking.set_ids.xml
index 040c7a01..d0092e33 100644
--- a/snippets/stock.report_picking.set_ids.xml
+++ b/snippets/stock.report_picking.set_ids.xml
@@ -8,9 +8,13 @@
 	<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>
+
 </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 39cbd79a..fd8c1b5b 100644
--- a/snippets/stock.report_picking.style_trimada.xml
+++ b/snippets/stock.report_picking.style_trimada.xml
@@ -3,12 +3,15 @@
 
 	<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;
-				padding: 10px;
 			}
 			table.trimada thead tr {
 				border-top: solid 1px;
@@ -19,12 +22,17 @@
 			}
 			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: 25mm;
+			  text-align: right;
+			}
 			table.trimada tbody td#position {
 			  text-align: right;
 			}
@@ -33,20 +41,36 @@
 				border-bottom: 1px solid rgb(220,220,220)
 			}
 			table.trimada tbody td#default_code {
+			  padding-left: 10px;
 			  text-align: left;
 			}
-			table.trimada tbody td#open_quantity {
-			  text-align: right !important;
+			table.trimada tbody td span#description_pickingout {
+			  font-style: italic;
 			}
-			table.trimada tbody td#quantity {
+			table.trimada tbody td#product_uom_qty {
 			  text-align: right;
 			}			
-			table.trimada tbody span#qty {
+			table.trimada tbody td span#product_uom_qty {
 			  font-weight: bold;
 			}
-			table.trimada tbody span#open_qty {
+			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 #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;
@@ -60,7 +84,7 @@
 	</xpath>
 
 .	<xpath expr="//th[@name='th_product']/../../.." position="attributes">
-		<attribute name="class">trimada</attribute>
+		<attribute name="class" separator=" " add="trimada table-borderless"/>
 	</xpath>
 
-</data>
+</data>
\ No newline at end of file