diff --git a/config/addons_path b/config/addons_path
index 8d5e66a2..5db293fd 100644
--- a/config/addons_path
+++ b/config/addons_path
@@ -1,8 +1,48 @@
-addons
+addons/account_invoicing
+addons/company
+addons/delegations
+addons/demand_planner
+addons/demodata
+addons/hr
 addons/manufacture
+addons/odoo_apps_partner
+addons/partner_contact
+addons/product_attribute
+addons/project
+addons/purchase_workflow
+addons/sale_workflow
+addons/server_tools
+addons/social
+addons/stock_logistics_workflow
 addons/swiss_payroll
+addons/web
+addons/website
 enterprise
-oca/parnter-contact
+oca/account-invoicing
+oca/bank-statement-import
+oca/business-requirement
+oca/contract
+oca/dms
+oca/hr-attendance
+oca/hr-holidays
+oca/knowledge
+oca/l10n-switzerland
+oca/partner-contact
+oca/product-attribute
+oca/project
+oca/purchase-workflow
+oca/reporting-engine
+oca/rest-framework
+oca/sale-workflow
+oca/server-auth
+oca/server-backend
+oca/server-env
+oca/server-tools
+oca/server-ux
+oca/social
+oca/stock-logistics-warehouse
 oca/stock-logistics-workflow
+oca/timesheet
 oca/web
+oca/website
 themes
\ No newline at end of file
diff --git a/snippets.md b/snippets.md
index f15462de..cddd5985 100644
--- a/snippets.md
+++ b/snippets.md
@@ -45,6 +45,16 @@ Report: report_invoice_document
 ID: `mint_system.account.report_invoice_document.font_size`  
 Link: [snippets/account.report_invoice_document.font_size.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/account.report_invoice_document.font_size.xml)
 
+### format address blocks  
+Report: report_invoice_document  
+ID: `mint_system.account.report_invoice_document.format_address_blocks`  
+Link: [snippets/account.report_invoice_document.format_address_blocks.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/account.report_invoice_document.format_address_blocks.xml)
+
+### format title  
+Report: report_invoice_document  
+ID: `mint_system.account.report_invoice_document.format_title`  
+Link: [snippets/account.report_invoice_document.format_title.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/account.report_invoice_document.format_title.xml)
+
 ### get position  
 Report: report_invoice_document  
 ID: `mint_system.account.report_invoice_document.get_position`  
@@ -75,6 +85,11 @@ Report: report_invoice_document
 ID: `mint_system.account.report_invoice_document.margin_before_title`  
 Link: [snippets/account.report_invoice_document.margin_before_title.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/account.report_invoice_document.margin_before_title.xml)
 
+### modify main table  
+Report: report_invoice_document  
+ID: `mint_system.account.report_invoice_document.modify_main_table`  
+Link: [snippets/account.report_invoice_document.modify_main_table.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/account.report_invoice_document.modify_main_table.xml)
+
 ### product hs code and origin  
 Report: report_invoice_document  
 ID: `mint_system.account.report_invoice_document.product_hs_code_and_origin`  
@@ -100,6 +115,11 @@ Report: report_invoice_document
 ID: `mint_system.account.report_invoice_document.remove_payment_term`  
 Link: [snippets/account.report_invoice_document.remove_payment_term.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/account.report_invoice_document.remove_payment_term.xml)
 
+### remove summary table  
+Report: report_invoice_document  
+ID: `mint_system.account.report_invoice_document.remove_summary_table`  
+Link: [snippets/account.report_invoice_document.remove_summary_table.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/account.report_invoice_document.remove_summary_table.xml)
+
 ### remove taxes  
 Report: report_invoice_document  
 ID: `mint_system.account.report_invoice_document.remove_taxes`  
@@ -115,6 +135,11 @@ Report: report_invoice_document
 ID: `mint_system.account.report_invoice_document.replace_information_table`  
 Link: [snippets/account.report_invoice_document.replace_information_table.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/account.report_invoice_document.replace_information_table.xml)
 
+### replace info table  
+Report: report_invoice_document  
+ID: `mint_system.account.report_invoice_document.replace_info_table`  
+Link: [snippets/account.report_invoice_document.replace_info_table.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/account.report_invoice_document.replace_info_table.xml)
+
 ### round quantity  
 Report: report_invoice_document  
 ID: `mint_system.account.report_invoice_document.round_quantity`  
@@ -180,6 +205,11 @@ Report: view_move_line_tax_audit_tree
 ID: `mint_system.account.view_move_line_tax_audit_tree.sum_currency`  
 Link: [snippets/account.view_move_line_tax_audit_tree.sum_currency.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/account.view_move_line_tax_audit_tree.sum_currency.xml)
 
+### amount currency optional  
+Report: view_move_line_tree_grouped_general  
+ID: `mint_system.account.view_move_line_tree_grouped_general.amount_currency_optional`  
+Link: [snippets/account.view_move_line_tree_grouped_general.amount_currency_optional.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/account.view_move_line_tree_grouped_general.amount_currency_optional.xml)
+
 ### show partner shipping  
 Report: view_out_invoice_tree  
 ID: `mint_system.account.view_out_invoice_tree.show_partner_shipping`  
@@ -247,6 +277,11 @@ Report: view_partner_tree
 ID: `mint_system.base.view_partner_tree.optional_zip`  
 Link: [snippets/base.view_partner_tree.optional_zip.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/base.view_partner_tree.optional_zip.xml)
 
+### show type  
+Report: view_partner_tree  
+ID: `mint_system.base.view_partner_tree.show_type`  
+Link: [snippets/base.view_partner_tree.show_type.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/base.view_partner_tree.show_type.xml)
+
 ### add zip  
 Report: view_res_bank_tree  
 ID: `mint_system.base.view_res_bank_tree.add_zip`  
@@ -278,6 +313,26 @@ ID: `mint_system.base.view_translation_tree.show_comments`
 Link: [snippets/base.view_translation_tree.show_comments.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/base.view_translation_tree.show_comments.xml)
 
 ## Business Requirement
+### clickable state  
+Report: view_business_requirement_form  
+ID: `mint_system.business_requirement.view_business_requirement_form.clickable_state`  
+Link: [snippets/business_requirement.view_business_requirement_form.clickable_state.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/business_requirement.view_business_requirement_form.clickable_state.xml)
+
+### hide scenario  
+Report: view_business_requirement_form  
+ID: `mint_system.business_requirement.view_business_requirement_form.hide_scenario`  
+Link: [snippets/business_requirement.view_business_requirement_form.hide_scenario.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/business_requirement.view_business_requirement_form.hide_scenario.xml)
+
+### hide terms and conditions  
+Report: view_business_requirement_form  
+ID: `mint_system.business_requirement.view_business_requirement_form.hide_terms_and_conditions`  
+Link: [snippets/business_requirement.view_business_requirement_form.hide_terms_and_conditions.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/business_requirement.view_business_requirement_form.hide_terms_and_conditions.xml)
+
+### hide test case  
+Report: view_business_requirement_form  
+ID: `mint_system.business_requirement.view_business_requirement_form.hide_test_case`  
+Link: [snippets/business_requirement.view_business_requirement_form.hide_test_case.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/business_requirement.view_business_requirement_form.hide_test_case.xml)
+
 ### x planned hours x estimated cost  
 Report: view_business_requirement_form  
 ID: `mint_system.business_requirement.view_business_requirement_form.x_planned_hours_x_estimated_cost`  
@@ -293,6 +348,11 @@ Report: view_business_requirement_form
 ID: `mint_system.business_requirement.view_business_requirement_form.x_task_id`  
 Link: [snippets/business_requirement.view_business_requirement_form.x_task_id.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/business_requirement.view_business_requirement_form.x_task_id.xml)
 
+### hide category ids  
+Report: view_business_requirement_tree  
+ID: `mint_system.business_requirement.view_business_requirement_tree.hide_category_ids`  
+Link: [snippets/business_requirement.view_business_requirement_tree.hide_category_ids.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/business_requirement.view_business_requirement_tree.hide_category_ids.xml)
+
 ### x project id  
 Report: view_business_requirement_tree  
 ID: `mint_system.business_requirement.view_business_requirement_tree.x_project_id`  
@@ -490,11 +550,21 @@ ID: `mint_system.hr.view_employee_tree.add_mobile_phone`
 Link: [snippets/hr.view_employee_tree.add_mobile_phone.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/hr.view_employee_tree.add_mobile_phone.xml)
 
 ## Hr Payroll
+### view pivot  
+Report: hr_payslip_line  
+ID: `mint_system.hr_payroll.hr_payslip_line.view_pivot`  
+Link: [snippets/hr_payroll.hr_payslip_line.view_pivot.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/hr_payroll.hr_payslip_line.view_pivot.xml)
+
 ### switch account  
 Report: hr_salary_rule_form  
 ID: `mint_system.hr_payroll.hr_salary_rule_form.switch_account`  
 Link: [snippets/hr_payroll.hr_salary_rule_form.switch_account.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/hr_payroll.hr_salary_rule_form.switch_account.xml)
 
+### show gio amount  
+Report: view_hr_payslip_form  
+ID: `mint_system.hr_payroll.view_hr_payslip_form.show_gio_amount`  
+Link: [snippets/hr_payroll.view_hr_payslip_form.show_gio_amount.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/hr_payroll.view_hr_payslip_form.show_gio_amount.xml)
+
 ### slip show optional  
 Report: view_hr_payslip_line_tree  
 ID: `mint_system.hr_payroll.view_hr_payslip_line_tree.slip_show_optional`  
@@ -762,6 +832,11 @@ ID: `mint_system.mail.mail_notification_paynow.replace_footer`
 Link: [snippets/mail.mail_notification_paynow.replace_footer.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/mail.mail_notification_paynow.replace_footer.xml)
 
 ## Mrp
+### trimada  
+Report: label_production_view_pdf  
+ID: `mint_system.mrp.label_production_view_pdf.trimada`  
+Link: [snippets/mrp.label_production_view_pdf.trimada.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/mrp.label_production_view_pdf.trimada.xml)
+
 ### add note  
 Report: mrp_bom_form_view  
 ID: `mint_system.mrp.mrp_bom_form_view.add_note`  
@@ -842,11 +917,6 @@ Report: report_mrporder
 ID: `mint_system.mrp.report_mrporder.replace_title_section_to_consume_products`  
 Link: [snippets/mrp.report_mrporder.replace_title_section_to_consume_products.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/mrp.report_mrporder.replace_title_section_to_consume_products.xml)
 
-### replace title  
-Report: report_mrporder  
-ID: `mint_system.mrp.report_mrporder.replace_title`  
-Link: [snippets/mrp.report_mrporder.replace_title.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/mrp.report_mrporder.replace_title.xml)
-
 ### show expected  
 Report: report_mrporder  
 ID: `mint_system.mrp.report_mrporder.show_expected`  
@@ -1001,6 +1071,16 @@ ID: `mint_system.project.view_task_tree2.sale_line_optional`
 Link: [snippets/project.view_task_tree2.sale_line_optional.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/project.view_task_tree2.sale_line_optional.xml)
 
 ## Purchase
+### remove buttons  
+Report: mail_notification_confirm  
+ID: `mint_system.purchase.mail_notification_confirm.remove_buttons`  
+Link: [snippets/purchase.mail_notification_confirm.remove_buttons.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/purchase.mail_notification_confirm.remove_buttons.xml)
+
+### add x comment  
+Report: purchase_order_form  
+ID: `mint_system.purchase.purchase_order_form.add_x_comment`  
+Link: [snippets/purchase.purchase_order_form.add_x_comment.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/purchase.purchase_order_form.add_x_comment.xml)
+
 ### date planned readonly  
 Report: purchase_order_form  
 ID: `mint_system.purchase.purchase_order_form.date_planned_readonly`  
@@ -1021,6 +1101,11 @@ Report: purchase_order_kpis_tree
 ID: `mint_system.purchase.purchase_order_kpis_tree.add_mail_reception_confirmed`  
 Link: [snippets/purchase.purchase_order_kpis_tree.add_mail_reception_confirmed.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/purchase.purchase_order_kpis_tree.add_mail_reception_confirmed.xml)
 
+### add x comment  
+Report: purchase_order_kpis_tree  
+ID: `mint_system.purchase.purchase_order_kpis_tree.add_x_comment`  
+Link: [snippets/purchase.purchase_order_kpis_tree.add_x_comment.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/purchase.purchase_order_kpis_tree.add_x_comment.xml)
+
 ### reset view  
 Report: purchase_order_line_tree  
 ID: `mint_system.purchase.purchase_order_line_tree.reset_view`  
@@ -1226,6 +1311,11 @@ Report: report_purchasequotation_document
 ID: `mint_system.purchase.report_purchasequotation_document.modify_main_table`  
 Link: [snippets/purchase.report_purchasequotation_document.modify_main_table.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/purchase.report_purchasequotation_document.modify_main_table.xml)
 
+### remove date planned  
+Report: report_purchasequotation_document  
+ID: `mint_system.purchase.report_purchasequotation_document.remove_date_planned`  
+Link: [snippets/purchase.report_purchasequotation_document.remove_date_planned.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/purchase.report_purchasequotation_document.remove_date_planned.xml)
+
 ### remove incoterms  
 Report: report_purchasequotation_document  
 ID: `mint_system.purchase.report_purchasequotation_document.remove_incoterms`  
@@ -1303,6 +1393,16 @@ ID: `mint_system.purchase_requisition.view_purchase_requisition_form.show_schedu
 Link: [snippets/purchase_requisition.view_purchase_requisition_form.show_schedule_date_in_notebook.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/purchase_requisition.view_purchase_requisition_form.show_schedule_date_in_notebook.xml)
 
 ## Purchase
+### remove buttons  
+Report: mail_notification_confirm  
+ID: `mint_system.purchase.mail_notification_confirm.remove_buttons`  
+Link: [snippets/purchase.mail_notification_confirm.remove_buttons.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/purchase.mail_notification_confirm.remove_buttons.xml)
+
+### add x comment  
+Report: purchase_order_form  
+ID: `mint_system.purchase.purchase_order_form.add_x_comment`  
+Link: [snippets/purchase.purchase_order_form.add_x_comment.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/purchase.purchase_order_form.add_x_comment.xml)
+
 ### date planned readonly  
 Report: purchase_order_form  
 ID: `mint_system.purchase.purchase_order_form.date_planned_readonly`  
@@ -1323,6 +1423,11 @@ Report: purchase_order_kpis_tree
 ID: `mint_system.purchase.purchase_order_kpis_tree.add_mail_reception_confirmed`  
 Link: [snippets/purchase.purchase_order_kpis_tree.add_mail_reception_confirmed.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/purchase.purchase_order_kpis_tree.add_mail_reception_confirmed.xml)
 
+### add x comment  
+Report: purchase_order_kpis_tree  
+ID: `mint_system.purchase.purchase_order_kpis_tree.add_x_comment`  
+Link: [snippets/purchase.purchase_order_kpis_tree.add_x_comment.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/purchase.purchase_order_kpis_tree.add_x_comment.xml)
+
 ### reset view  
 Report: purchase_order_line_tree  
 ID: `mint_system.purchase.purchase_order_line_tree.reset_view`  
@@ -1528,6 +1633,11 @@ Report: report_purchasequotation_document
 ID: `mint_system.purchase.report_purchasequotation_document.modify_main_table`  
 Link: [snippets/purchase.report_purchasequotation_document.modify_main_table.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/purchase.report_purchasequotation_document.modify_main_table.xml)
 
+### remove date planned  
+Report: report_purchasequotation_document  
+ID: `mint_system.purchase.report_purchasequotation_document.remove_date_planned`  
+Link: [snippets/purchase.report_purchasequotation_document.remove_date_planned.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/purchase.report_purchasequotation_document.remove_date_planned.xml)
+
 ### remove incoterms  
 Report: report_purchasequotation_document  
 ID: `mint_system.purchase.report_purchasequotation_document.remove_incoterms`  
@@ -1575,11 +1685,6 @@ ID: `mint_system.res_groups.hr_holidays.holidays_self_responsible`
 Link: [snippets/res_groups.hr_holidays.holidays_self_responsible.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/res_groups.hr_holidays.holidays_self_responsible.xml)
 
 ## Sale Blanket Order
-### filter customer is company  
-Report: view_blanket_order_form  
-ID: `mint_system.sale_blanket_order.view_blanket_order_form.filter_customer_is_company`  
-Link: [snippets/sale_blanket_order.view_blanket_order_form.filter_customer_is_company.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/sale_blanket_order.view_blanket_order_form.filter_customer_is_company.xml)
-
 ### replace filter  
 Report: view_blanket_order_search  
 ID: `mint_system.sale_blanket_order.view_blanket_order_search.replace_filter`  
@@ -1596,6 +1701,18 @@ Report: sale_order_form_quote
 ID: `mint_system.sale_management.sale_order_form_quote.hide_optional_products`  
 Link: [snippets/sale_management.sale_order_form_quote.hide_optional_products.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/sale_management.sale_order_form_quote.hide_optional_products.xml)
 
+## Sale Order Contact Person
+### modify readonly partner contact id  
+Report: view_sale_order_form_contact_person  
+ID: `mint_system.sale_order_contact_person.view_sale_order_form_contact_person.modify_readonly_partner_contact_id`  
+Link: [snippets/sale_order_contact_person.view_sale_order_form_contact_person.modify_readonly_partner_contact_id.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/sale_order_contact_person.view_sale_order_form_contact_person.modify_readonly_partner_contact_id.xml)
+
+## Sale Order Line Date
+### hide in state draft  
+Report: report_saleorder_document  
+ID: `mint_system.sale_order_line_date.report_saleorder_document.hide_in_state_draft`  
+Link: [snippets/sale_order_line_date.report_saleorder_document.hide_in_state_draft.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/sale_order_line_date.report_saleorder_document.hide_in_state_draft.xml)
+
 ## Sale Order Picking Note
 ### move note fields  
 Report: view_order_form_inherit_sale_stock  
@@ -1729,6 +1846,11 @@ Report: report_saleorder_document
 ID: `mint_system.sale.report_saleorder_document.format_as_date`  
 Link: [snippets/sale.report_saleorder_document.format_as_date.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/sale.report_saleorder_document.format_as_date.xml)
 
+### format note  
+Report: report_saleorder_document  
+ID: `mint_system.sale.report_saleorder_document.format_note`  
+Link: [snippets/sale.report_saleorder_document.format_note.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/sale.report_saleorder_document.format_note.xml)
+
 ### format title  
 Report: report_saleorder_document  
 ID: `mint_system.sale.report_saleorder_document.format_title`  
@@ -1739,6 +1861,11 @@ Report: report_saleorder_document
 ID: `mint_system.sale.report_saleorder_document.get_position`  
 Link: [snippets/sale.report_saleorder_document.get_position.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/sale.report_saleorder_document.get_position.xml)
 
+### modify information block  
+Report: report_saleorder_document  
+ID: `mint_system.sale.report_saleorder_document.modify_information_block`  
+Link: [snippets/sale.report_saleorder_document.modify_information_block.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/sale.report_saleorder_document.modify_information_block.xml)
+
 ### modify main table  
 Report: report_saleorder_document  
 ID: `mint_system.sale.report_saleorder_document.modify_main_table`  
@@ -1809,11 +1936,6 @@ Report: sale_order_portal_content
 ID: `mint_system.sale.sale_order_portal_content.remove_calculation`  
 Link: [snippets/sale.sale_order_portal_content.remove_calculation.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/sale.sale_order_portal_content.remove_calculation.xml)
 
-### add filter cancel or sent  
-Report: sale_order_view_search_inherit_quotation  
-ID: `mint_system.sale.sale_order_view_search_inherit_quotation.add_filter_cancel_or_sent`  
-Link: [snippets/sale.sale_order_view_search_inherit_quotation.add_filter_cancel_or_sent.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/sale.sale_order_view_search_inherit_quotation.add_filter_cancel_or_sent.xml)
-
 ### add filter cancel  
 Report: sale_order_view_search_inherit_quotation  
 ID: `mint_system.sale.sale_order_view_search_inherit_quotation.add_filter_cancel`  
@@ -1829,11 +1951,6 @@ Report: sale_order_view_search_inherit_quotation
 ID: `mint_system.sale.sale_order_view_search_inherit_quotation.add_filter_state_draft_or_sent`  
 Link: [snippets/sale.sale_order_view_search_inherit_quotation.add_filter_state_draft_or_sent.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/sale.sale_order_view_search_inherit_quotation.add_filter_state_draft_or_sent.xml)
 
-### replace filter sales  
-Report: sale_order_view_search_inherit_quotation  
-ID: `mint_system.sale.sale_order_view_search_inherit_quotation.replace_filter_sales`  
-Link: [snippets/sale.sale_order_view_search_inherit_quotation.replace_filter_sales.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/sale.sale_order_view_search_inherit_quotation.replace_filter_sales.xml)
-
 ### add invoice status invoiced  
 Report: sale_order_view_search_inherit_sale  
 ID: `mint_system.sale.sale_order_view_search_inherit_sale.add_invoice_status_invoiced`  
@@ -1849,6 +1966,11 @@ Report: sale_order_view_search_inherit_sale
 ID: `mint_system.sale.sale_order_view_search_inherit_sale.add_invoice_status_to_invoice_or_no`  
 Link: [snippets/sale.sale_order_view_search_inherit_sale.add_invoice_status_to_invoice_or_no.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/sale.sale_order_view_search_inherit_sale.add_invoice_status_to_invoice_or_no.xml)
 
+### button recompute add shipping  
+Report: view_order_form  
+ID: `mint_system.sale.view_order_form.button_recompute_add_shipping`  
+Link: [snippets/sale.view_order_form.button_recompute_add_shipping.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/sale.view_order_form.button_recompute_add_shipping.xml)
+
 ### filter customer is company  
 Report: view_order_form  
 ID: `mint_system.sale.view_order_form.filter_customer_is_company`  
@@ -1869,6 +1991,11 @@ Report: view_order_form
 ID: `mint_system.sale.view_order_form.hide_validity_date`  
 Link: [snippets/sale.view_order_form.hide_validity_date.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/sale.view_order_form.hide_validity_date.xml)
 
+### modify readonly date order  
+Report: view_order_form  
+ID: `mint_system.sale.view_order_form.modify_readonly_date_order`  
+Link: [snippets/sale.view_order_form.modify_readonly_date_order.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/sale.view_order_form.modify_readonly_date_order.xml)
+
 ### no create edit  
 Report: view_order_form  
 ID: `mint_system.sale.view_order_form.no_create_edit`  
@@ -1981,6 +2108,11 @@ Report: report_delivery_document
 ID: `mint_system.stock.report_delivery_document.add_incoterms`  
 Link: [snippets/stock.report_delivery_document.add_incoterms.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/stock.report_delivery_document.add_incoterms.xml)
 
+### add infotable  
+Report: report_delivery_document  
+ID: `mint_system.stock.report_delivery_document.add_infotable`  
+Link: [snippets/stock.report_delivery_document.add_infotable.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/stock.report_delivery_document.add_infotable.xml)
+
 ### append signature text  
 Report: report_delivery_document  
 ID: `mint_system.stock.report_delivery_document.append_signature_text`  
@@ -2006,11 +2138,21 @@ Report: report_delivery_document
 ID: `mint_system.stock.report_delivery_document.filter_qty_done`  
 Link: [snippets/stock.report_delivery_document.filter_qty_done.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/stock.report_delivery_document.filter_qty_done.xml)
 
+### format address blocks  
+Report: report_delivery_document  
+ID: `mint_system.stock.report_delivery_document.format_address_blocks`  
+Link: [snippets/stock.report_delivery_document.format_address_blocks.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/stock.report_delivery_document.format_address_blocks.xml)
+
 ### format date short  
 Report: report_delivery_document  
 ID: `mint_system.stock.report_delivery_document.format_date_short`  
 Link: [snippets/stock.report_delivery_document.format_date_short.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/stock.report_delivery_document.format_date_short.xml)
 
+### format title2  
+Report: report_delivery_document  
+ID: `mint_system.stock.report_delivery_document.format_title2`  
+Link: [snippets/stock.report_delivery_document.format_title2.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/stock.report_delivery_document.format_title2.xml)
+
 ### format title  
 Report: report_delivery_document  
 ID: `mint_system.stock.report_delivery_document.format_title`  
@@ -2046,11 +2188,21 @@ Report: report_delivery_document
 ID: `mint_system.stock.report_delivery_document.margin_before_title`  
 Link: [snippets/stock.report_delivery_document.margin_before_title.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/stock.report_delivery_document.margin_before_title.xml)
 
+### modify main table  
+Report: report_delivery_document  
+ID: `mint_system.stock.report_delivery_document.modify_main_table`  
+Link: [snippets/stock.report_delivery_document.modify_main_table.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/stock.report_delivery_document.modify_main_table.xml)
+
 ### pos in table  
 Report: report_delivery_document  
 ID: `mint_system.stock.report_delivery_document.pos_in_table`  
 Link: [snippets/stock.report_delivery_document.pos_in_table.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/stock.report_delivery_document.pos_in_table.xml)
 
+### remove informations  
+Report: report_delivery_document  
+ID: `mint_system.stock.report_delivery_document.remove_informations`  
+Link: [snippets/stock.report_delivery_document.remove_informations.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/stock.report_delivery_document.remove_informations.xml)
+
 ### replace header  
 Report: report_delivery_document  
 ID: `mint_system.stock.report_delivery_document.replace_header`  
@@ -2066,6 +2218,16 @@ Report: report_delivery_document
 ID: `mint_system.stock.report_delivery_document.replace_order_definition`  
 Link: [snippets/stock.report_delivery_document.replace_order_definition.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/stock.report_delivery_document.replace_order_definition.xml)
 
+### replace product description2  
+Report: report_delivery_document  
+ID: `mint_system.stock.report_delivery_document.replace_product_description2`  
+Link: [snippets/stock.report_delivery_document.replace_product_description2.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/stock.report_delivery_document.replace_product_description2.xml)
+
+### replace product description  
+Report: report_delivery_document  
+ID: `mint_system.stock.report_delivery_document.replace_product_description`  
+Link: [snippets/stock.report_delivery_document.replace_product_description.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/stock.report_delivery_document.replace_product_description.xml)
+
 ### replace table  
 Report: report_delivery_document  
 ID: `mint_system.stock.report_delivery_document.replace_table`  
@@ -2106,6 +2268,11 @@ Report: report_delivery_document
 ID: `mint_system.stock.report_delivery_document.switch_address_block`  
 Link: [snippets/stock.report_delivery_document.switch_address_block.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/stock.report_delivery_document.switch_address_block.xml)
 
+### title supplement  
+Report: report_delivery_document  
+ID: `mint_system.stock.report_delivery_document.title_supplement`  
+Link: [snippets/stock.report_delivery_document.title_supplement.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/stock.report_delivery_document.title_supplement.xml)
+
 ### x hide on delivery  
 Report: report_delivery_document  
 ID: `mint_system.stock.report_delivery_document.x_hide_on_delivery`  
@@ -2236,21 +2403,31 @@ Report: report_picking
 ID: `mint_system.stock.report_picking.x_packaging_uom_id`  
 Link: [snippets/stock.report_picking.x_packaging_uom_id.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/stock.report_picking.x_packaging_uom_id.xml)
 
+### add default code  
+Report: stock_report_delivery_aggregated_move_lines  
+ID: `mint_system.stock.stock_report_delivery_aggregated_move_lines.add_default_code`  
+Link: [snippets/stock.stock_report_delivery_aggregated_move_lines.add_default_code.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/stock.stock_report_delivery_aggregated_move_lines.add_default_code.xml)
+
+### format table  
+Report: stock_report_delivery_aggregated_move_lines  
+ID: `mint_system.stock.stock_report_delivery_aggregated_move_lines.format_table`  
+Link: [snippets/stock.stock_report_delivery_aggregated_move_lines.format_table.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/stock.stock_report_delivery_aggregated_move_lines.format_table.xml)
+
 ### get position  
 Report: stock_report_delivery_aggregated_move_lines  
 ID: `mint_system.stock.stock_report_delivery_aggregated_move_lines.get_position`  
 Link: [snippets/stock.stock_report_delivery_aggregated_move_lines.get_position.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/stock.stock_report_delivery_aggregated_move_lines.get_position.xml)
 
-### hs code origin and weight  
-Report: stock_report_delivery_aggregated_move_lines  
-ID: `mint_system.stock.stock_report_delivery_aggregated_move_lines.hs_code_origin_and_weight`  
-Link: [snippets/stock.stock_report_delivery_aggregated_move_lines.hs_code_origin_and_weight.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/stock.stock_report_delivery_aggregated_move_lines.hs_code_origin_and_weight.xml)
-
 ### pos in table  
 Report: stock_report_delivery_aggregated_move_lines  
 ID: `mint_system.stock.stock_report_delivery_aggregated_move_lines.pos_in_table`  
 Link: [snippets/stock.stock_report_delivery_aggregated_move_lines.pos_in_table.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/stock.stock_report_delivery_aggregated_move_lines.pos_in_table.xml)
 
+### replace description  
+Report: stock_report_delivery_aggregated_move_lines  
+ID: `mint_system.stock.stock_report_delivery_aggregated_move_lines.replace_description`  
+Link: [snippets/stock.stock_report_delivery_aggregated_move_lines.replace_description.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/stock.stock_report_delivery_aggregated_move_lines.replace_description.xml)
+
 ### description sale  
 Report: stock_report_delivery_has_serial_move_line  
 ID: `mint_system.stock.stock_report_delivery_has_serial_move_line.description_sale`  
@@ -2376,6 +2553,11 @@ Report: view_picking_form
 ID: `mint_system.stock.view_picking_form.show_scheduled_date_editable`  
 Link: [snippets/stock.view_picking_form.show_scheduled_date_editable.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/stock.view_picking_form.show_scheduled_date_editable.xml)
 
+### show weight  
+Report: view_picking_form  
+ID: `mint_system.stock.view_picking_form.show_weight`  
+Link: [snippets/stock.view_picking_form.show_weight.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/stock.view_picking_form.show_weight.xml)
+
 ### x count boxes  
 Report: view_picking_form  
 ID: `mint_system.stock.view_picking_form.x_count_boxes`  
@@ -2428,6 +2610,11 @@ Report: external_layout_standard
 ID: `mint_system.web.external_layout_standard.format_header_slogan`  
 Link: [snippets/web.external_layout_standard.format_header_slogan.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/web.external_layout_standard.format_header_slogan.xml)
 
+### header styles  
+Report: external_layout_standard  
+ID: `mint_system.web.external_layout_standard.header_styles`  
+Link: [snippets/web.external_layout_standard.header_styles.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/web.external_layout_standard.header_styles.xml)
+
 ### increase logo size  
 Report: external_layout_standard  
 ID: `mint_system.web.external_layout_standard.increase_logo_size`  
@@ -2463,6 +2650,11 @@ Report: external_layout_standard
 ID: `mint_system.web.external_layout_standard.replace_url`  
 Link: [snippets/web.external_layout_standard.replace_url.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/web.external_layout_standard.replace_url.xml)
 
+### header styles  
+Report: internal_layout  
+ID: `mint_system.web.internal_layout.header_styles`  
+Link: [snippets/web.internal_layout.header_styles.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/web.internal_layout.header_styles.xml)
+
 ### replace header  
 Report: internal_layout  
 ID: `mint_system.web.internal_layout.replace_header`  
@@ -2515,6 +2707,11 @@ Report: external_layout_standard
 ID: `mint_system.web.external_layout_standard.format_header_slogan`  
 Link: [snippets/web.external_layout_standard.format_header_slogan.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/web.external_layout_standard.format_header_slogan.xml)
 
+### header styles  
+Report: external_layout_standard  
+ID: `mint_system.web.external_layout_standard.header_styles`  
+Link: [snippets/web.external_layout_standard.header_styles.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/web.external_layout_standard.header_styles.xml)
+
 ### increase logo size  
 Report: external_layout_standard  
 ID: `mint_system.web.external_layout_standard.increase_logo_size`  
@@ -2550,6 +2747,11 @@ Report: external_layout_standard
 ID: `mint_system.web.external_layout_standard.replace_url`  
 Link: [snippets/web.external_layout_standard.replace_url.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/web.external_layout_standard.replace_url.xml)
 
+### header styles  
+Report: internal_layout  
+ID: `mint_system.web.internal_layout.header_styles`  
+Link: [snippets/web.internal_layout.header_styles.xml](https://github.com/Mint-System/Odoo-Development/tree/14.0/snippets/web.internal_layout.header_styles.xml)
+
 ### replace header  
 Report: internal_layout  
 ID: `mint_system.web.internal_layout.replace_header`  
diff --git a/snippets/account.report_invoice_document.group_by_pickings.xml b/snippets/account.report_invoice_document.group_by_pickings.xml
index 26ee00cc..c9514803 100644
--- a/snippets/account.report_invoice_document.group_by_pickings.xml
+++ b/snippets/account.report_invoice_document.group_by_pickings.xml
@@ -3,7 +3,9 @@
 
   <xpath expr="//h2" position="before">
     <!-- Get all pickings without duplicates -->
-    <t t-set="pickings" t-value="[line.picking_ids[0] for line in o.invoice_line_ids if line.picking_ids]"/>
+    <t t-set="pickings" t-value="set([line.picking_ids[0] for line in o.invoice_line_ids if line.picking_ids])"/>
+    <!-- Filter pickings that are canclled  -->
+    <t t-set="pickings" t-value="[picking for picking in pickings if picking.state != 'cancel']"/>
     <!-- Store if has pickings -->
     <t t-set="has_pickings" t-value="len(pickings) > 0"/>
     <!-- Store if has multiple pickings -->
@@ -24,7 +26,7 @@
       <t t-set="null" t-value="pickings.append(False)"/>
     </t>
 
-    <!-- <p t-esc="pickings"/> -->
+     <!--<p t-esc="pickings"/> -->
     <!-- <p t-esc="has_pickings"/> -->
     <!-- <p t-esc="has_multiple_pickings"/> -->
     <!-- <p t-esc="has_lines_without_pickings"/> -->
diff --git a/snippets/account.report_invoice_document.round_quantity.xml b/snippets/account.report_invoice_document.round_quantity.xml
index 4aefae57..ba5e7cb6 100644
--- a/snippets/account.report_invoice_document.round_quantity.xml
+++ b/snippets/account.report_invoice_document.round_quantity.xml
@@ -2,7 +2,7 @@
 <data inherit_id="account.report_invoice_document" priority="50">
 
   <xpath expr="//span[@t-field='line.quantity']" position="replace">
-    <span t-esc="'%.1f' % line.quantity"/>
+    <span t-esc="'%.2f' % line.quantity"/>
   </xpath>
 
 </data>
diff --git a/snippets/ir_model.business_requirement.x_task_id.xml b/snippets/ir_model.business_requirement.x_task_id.xml
index 20536205..8aa304b8 100644
--- a/snippets/ir_model.business_requirement.x_task_id.xml
+++ b/snippets/ir_model.business_requirement.x_task_id.xml
@@ -16,7 +16,7 @@
     <!-- <field name="depends">x_project_id</field>
     <field name="compute">for record in self:
   record['x_task_id'] = self.env['project.task'].search([('x_business_requirement_id', '=', record.id)], limit=1) -->
-    </field>
+    <!-- </field> -->
   </record>
 
 </odoo>
diff --git a/snippets/mrp.report_mrporder.replace_title.xml b/snippets/mrp.report_mrporder.replace_title.xml
deleted file mode 100644
index 4a1d44dd..00000000
--- a/snippets/mrp.report_mrporder.replace_title.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0"?>
-<data inherit_id="mrp.report_mrporder" priority="50">
-
-  <xpath expr="//h2/../.." position="replace">
-
-    <style>
-	    .title {
-	      width: 99%;
-	      margin: 5px;
-	      border: solid 1px;
-	      font-size: 18pt;
-	      font-weight: bold;
-	      line-height: 70px;
-	    }
-       .col-7 {
-        padding: 0 0 0 10px;
-      }
-	    .col-5 {
-          padding: 0 5px 0 0;
-          text-align: right;
-          line-height: 65px;
-      }
-    </style>
-
-    <div class="row title">
-      <div class="col-7">
-            Fertigungsauftrag <span t-field="o.name"/>
-      </div>
-      <div class="col-5">
-        <span class="text-right">
-          <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;" alt="Barcode"/>
-        </span>
-      </div>
-    </div>
-  </xpath>
-
-</data>
\ No newline at end of file
diff --git a/snippets/product.report_producttemplatelabel.trimada.xml b/snippets/product.report_producttemplatelabel.trimada.xml
index 98ec1629..6cd9494a 100644
--- a/snippets/product.report_producttemplatelabel.trimada.xml
+++ b/snippets/product.report_producttemplatelabel.trimada.xml
@@ -24,9 +24,22 @@
             font-size: 9mm;
             margin: 0 3mm 0 3mm;
             text-align: center;
+            height: 23mm;
+            line-height: 10mm;
+            display: table;
+            width: 98%;
+            line-height: 10mm;
+        }
+        .sub1 {
+            display: table-cell ;
+            vertical-align: middle;
+            text-align: center;
+        }
+        .sub2 {
+            display: table-cell ;
+            vertical-align: middle;
+            text-align: center;
             border-bottom: solid 1px;
-            height: 46mm;
-            line-height: 20mm;
         }
         .delivery {
             font-size: 7mm;
@@ -34,7 +47,7 @@
             text-align: left;
             border-bottom: solid 1px;
             line-height: 1;
-            height: 36mm;
+            height: 34mm;
         }
         .comment {
             font-size: 5mm;
@@ -58,27 +71,29 @@
               </div>
             </div>
             <div class="description">
-              <span t-esc="product.name"/>
-              <br/>
-              <span t-esc="product.type_description"/>
+                <span class="sub1" t-esc="product.name"/>
+            </div>
+             <div class="description">
+                <span class="sub2" t-esc="product.type_description"/>
             </div>
             <div class="row delivery">
               <div class="col-12 box text-center">
-                <div t-if="product.feeder_id">
-                  <img t-att-src="'/report/barcode/?type=%s&amp;value=%s&amp;width=%s&amp;height=%s&amp;quiet=0' % ('Code128', product.feeder_id, 250, 80)" alt="Barcode"/>
-                  <br/>
-                </div>
-                <div class="text-center">
-                  <span class="text-center" t-esc="product.feeder_id"></span>
-                </div>
+                  <div t-if="product.feeder_id">
+                      <img t-att-src="'/report/barcode/?type=%s&amp;value=%s&amp;width=%s&amp;height=%s&amp;quiet=0' % ('Code128', product.feeder_id, 250, 80)" alt="Barcode"/>
+                      <br/>
+                  </div>
+                  <div class="text-center">
+                      <span class="text-center" t-esc="product.feeder_id"></span>
+                  </div>
               </div>
             </div>
             <div class="comment">
               <span>Trimada AG, CH-5610 Wohlen – www.trimada.ch</span>
             </div>
           </div>
-        </div>
+          </div>
+        </t>
       </t>
-    </t>
+    
   </t>
 </t>
\ No newline at end of file
diff --git a/snippets/purchase.report_purchaseorder_document.add_footer.xml b/snippets/purchase.report_purchaseorder_document.add_footer.xml
index 4ded97d4..3a3e97bf 100644
--- a/snippets/purchase.report_purchaseorder_document.add_footer.xml
+++ b/snippets/purchase.report_purchaseorder_document.add_footer.xml
@@ -13,43 +13,8 @@
     </style>
     <table id='footer'>
       <tr>
-        <td width="40%" t-if="o.payment_term_id.note">Zahlungsbedingungen 
-          <span t-field="o.payment_term_id.note"/>
-        </td>
         <td width="60%">
-          Lieferung gemäss unseren allgemeinen Lieferbedingungen
-        </td>
-      </tr>
-      <tr>
-        <td >MWST-Nr: 
-           <span t-field="o.company_id.vat"/>
-        </td>
-        <td>
-          <table width="100%">
-          <tr>
-            <td width="35%">
-               Bankverbindungen:
-            </td>
-              <td width="65%">
-              UBS AG, 6301 Zug, BLZ 273, SWIFT UBSWCHZH80A
-             </td>
-          </tr> 
-          <tr> 
-             <td>
-            </td>
-            <td>
-            (CHF) IBAN CH63 0027 3273 Q978 6962 0
-            </td>
-          </tr>
-       
-          <tr>
-            <td>
-            </td>
-            <td>
-            (EUR) IBAN CH59 0027 3273 HN10 3698 0
-            </td>
-          </tr>
-          </table> 
+          Lieferung gemäss unseren allgemeinen Einkaufsbedingungen
         </td>
       </tr>
     </table>
diff --git a/snippets/sale.report_saleorder_document.add_info_table.xml b/snippets/sale.report_saleorder_document.add_info_table.xml
index f5c065eb..63836064 100644
--- a/snippets/sale.report_saleorder_document.add_info_table.xml
+++ b/snippets/sale.report_saleorder_document.add_info_table.xml
@@ -18,7 +18,7 @@
     </style>
     <table id='info'>
       <tr>
-        <td width="17%">Bestelldatum</td>
+        <td width="17%">Datum Angebot</td>
         <td width="44%">
           <span t-field='doc.date_order' t-options='{ "widget": "date" }'/>
         </td>
@@ -52,7 +52,7 @@
         </td>
         <td>Lieferkondition</td>
         <td>
-          <span t-field='doc.incoterm.code'/>
+          <span t-field='doc.incoterm'/>
         </td>
       </tr>
     </table>
diff --git a/snippets/sale.report_saleorder_document.modify_main_table.xml b/snippets/sale.report_saleorder_document.modify_main_table.xml
index 7694821c..48279049 100644
--- a/snippets/sale.report_saleorder_document.modify_main_table.xml
+++ b/snippets/sale.report_saleorder_document.modify_main_table.xml
@@ -94,13 +94,13 @@
   </xpath>
 
   <!-- price -->
-  <xpath expr="//table[@class='table table-borderless table-sm']/tbody/t[2]/tr/t[1]/td[6]/span" position="replace">
+  <xpath expr="//table[@class='table table-borderless table-sm']/tbody/t[2]/tr/t[1]/td[7]/span" position="replace">
     <span t-esc="'%g' % line.price_unit if str(line.price_unit)[::-1].find('.') >= 3 else '%.2f' % line.price_unit"/>
   </xpath>
 
   <!-- remove taxes -->
-  <xpath expr="//thead/tr[1]/th[8]" position="replace"/>
-  <xpath expr="//tbody/t[2]/tr[1]/t[1]/td[8]" position="replace"/>
+  <xpath expr="//thead/tr[1]/th[9]" position="replace"/>
+  <xpath expr="//tbody/t[2]/tr[1]/t[1]/td[9]" position="replace"/>
 
   <!-- margin -->
   <xpath expr="//table[@class='table table-borderless table-sm']/tbody/t[2]/tr/t[1]/td[8]/span" position="replace">
@@ -108,8 +108,8 @@
   </xpath>
 
   <!-- total price -->
-  <xpath expr="//table[@class='table table-borderless table-sm']/tbody[1]/t[2]/tr[1]/t[1]/td[8]/span" position="replace">
-    <span t-esc="'%g' % line.price_subtotal if str(line.price_subtotal)[::-1].find('.') >= 3 else '%.2f' % line.price_subtotal"/>
+  <xpath expr="//table[@class='table table-borderless table-sm']/tbody[1]/t[2]/tr[1]/t[1]/td[9]/span" position="replace">
+    <span t-esc="'{0:,.2f}'.format(int(line.price_subtotal)).replace(',','\'')"/>
   </xpath>
 
   <xpath expr="//table[@class='table table-borderless table-sm']" position="after">
diff --git a/snippets/sale.sale_order_view_search_inherit_quotation.add_filter_cancel_or_sent.xml b/snippets/sale.sale_order_view_search_inherit_quotation.add_filter_cancel_or_sent.xml
deleted file mode 100644
index e8528874..00000000
--- a/snippets/sale.sale_order_view_search_inherit_quotation.add_filter_cancel_or_sent.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0"?>
-<data inherit_id="sale.sale_order_view_search_inherit_quotation" priority="50">
-
-  <xpath expr="//filter[@name='sales']" position="after">
-    <filter string="Abgebrochen oder Gesendet" name="state_cancel_or_sent" domain="[('state','in',('cancel', 'sent'))]"/>
-  </xpath>
-
-</data>
\ No newline at end of file
diff --git a/snippets/sale.sale_order_view_search_inherit_quotation.replace_filter_sales.xml b/snippets/sale.sale_order_view_search_inherit_quotation.replace_filter_sales.xml
deleted file mode 100644
index 0eff1047..00000000
--- a/snippets/sale.sale_order_view_search_inherit_quotation.replace_filter_sales.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0"?>
-<data inherit_id="sale.sale_order_view_search_inherit_quotation" priority="50">
-
-  <xpath expr="//filter[@name='sales']" position="replace">
-     <filter string="Sales Orders" name="state_sale_done_or_cancel" domain="[('state','in',('sale','done','cancel'))]"/>
-  </xpath>
-
-</data>
\ No newline at end of file
diff --git a/snippets/sale_blanket_order.view_blanket_order_form.filter_customer_is_company.xml b/snippets/sale_blanket_order.view_blanket_order_form.filter_customer_is_company.xml
deleted file mode 100644
index fa94edbc..00000000
--- a/snippets/sale_blanket_order.view_blanket_order_form.filter_customer_is_company.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0"?>
-<data inherit_id="sale_blanket_order.view_blanket_order_form" priority="50">
-
-  <xpath expr="//field[@name='partner_id']" position="replace">
-     <field name="partner_id" domain="[('is_company', '=', True)]" context="{'res_partner_search_mode': 'customer', 'show_address': 1, 'default_is_company': 'True'}" attrs="{'required': [('state', '=', 'draft')]}" options="{&quot;always_reload&quot;: True}"/>
-  </xpath>
-
-</data>
\ No newline at end of file
diff --git a/snippets/sale_blanket_order.view_blanket_order_search.replace_filter.xml b/snippets/sale_blanket_order.view_blanket_order_search.replace_filter.xml
index bd6fdeb4..82363060 100644
--- a/snippets/sale_blanket_order.view_blanket_order_search.replace_filter.xml
+++ b/snippets/sale_blanket_order.view_blanket_order_search.replace_filter.xml
@@ -3,10 +3,10 @@
 
   <xpath expr="/search" position="replace">
     <search>
-      
+
       <!-- Filter -->
       <filter name="my_orders" string="Meine Aufträge" domain="[('user_id', '=', uid)]"/>
-      <filter string="In Arbeit" name="in_progress" domain="[('state', 'in', ('draft','sent', 'open', 'expired'))]"/>
+      <filter string="Meine Aufträge in Arbeit" name="in_progress" domain="['&amp;',('user_id', '=', uid),('state', 'in', ('draft','sent', 'open', 'expired'))]"/>
       <separator/>
       <filter string="Entwurf" name="filter_state_draft" domain="[('state', '=', 'draft')]"/>
       <filter string="Gesendet" name="filter_state_sent" domain="[('state', '=', 'sent')]"/>
@@ -16,7 +16,7 @@
       <filter string="Abgebrochen" name="filter_state_cancel" domain="[('state', '=', 'cancel')]"/>
       <separator/>
       <filter string="Auftragsdatum" name="filter_date_confirmed" date="date_confirmed"/>
-      
+
       <!-- Gruppierung -->
       <filter string="Verkäufer" name="user_id" domain="[]" context="{'group_by': 'user_id'}"/>
       <filter string="Kunde" name="partner_id" domain="[]" context="{'group_by': 'partner_id'}"/>
@@ -29,11 +29,11 @@
         <field name="partner_id"/>
         <field name="user_id"/>
         <field name="team_id"/>
-        <field name="product_id"/>
+        <field name="product_id" filter_domain="['|','|',('line_ids.product_id', 'ilike', self),('line_ids.product_id.type_description', 'ilike', self),('line_ids.product_id.type_description2', 'ilike', self)]"/>
         <field name="analytic_account_id" string="Kostenstelle"/>
       </group>
-      
+
     </search>
   </xpath>
-  
+
 </data>
\ No newline at end of file
diff --git a/snippets/stock.label_transfer_template_view.trimada.xml b/snippets/stock.label_transfer_template_view.trimada.xml
index 3f9ab70e..9f212645 100644
--- a/snippets/stock.label_transfer_template_view.trimada.xml
+++ b/snippets/stock.label_transfer_template_view.trimada.xml
@@ -6,6 +6,7 @@
                 <style>
                     .label {
                         font-family: arial;
+                        
                     }
                     .box {
                         margin: 0 0 2mm 0;
@@ -25,9 +26,21 @@
                         font-size: 9mm;
                         margin: 0 3mm 0 3mm;
                         text-align: center;
+                        height: 23mm;
+                        display: table;
+                        width: 98%;
+                        line-height: 10mm;
+                    }
+                    .sub1 {
+                        display: table-cell ;
+                        vertical-align: middle;
+                        text-align: center;
+                    }
+                    .sub2 {
+                        display: table-cell ;
+                        vertical-align: middle;
+                        text-align: center;
                         border-bottom: solid 1px;
-                        height: 46mm;
-                        line-height: 20mm;
                     }
                     .delivery {
                         font-size: 7mm;
@@ -35,7 +48,7 @@
                         text-align: left;
                         border-bottom: solid 1px;
                         line-height: 1;
-                        height: 36mm;
+                        height: 35mm;
                     }
                     .comment {
                         font-size: 5mm;
@@ -59,9 +72,10 @@
                             </div>
                         </div>
                         <div class="description">
-                            <span t-esc="move.product_id.name"/>
-                            <br/>
-                            <span t-esc="move.product_id.type_description"/>
+                            <span class="sub1" t-esc="move.product_id.name"/>
+                        </div>
+                         <div class="description">
+                            <span class="sub2" t-esc="move.product_id.type_description"/>
                         </div>
                         <div class="row delivery">
                             <div class="col-6 box">
@@ -72,7 +86,7 @@
                                     <span t-esc="move.origin"/>
                                 </div>
                                 <div>
-                                    <span t-esc="picking.partner_id.name"/>
+                                    <span t-esc="picking.partner_id.display_name"/>
                                 </div>
                             </div>
                             <div class="col-6 box">
diff --git a/snippets/stock.stock_report_delivery_aggregated_move_lines.hs_code_origin_and_weight.xml b/snippets/stock.stock_report_delivery_aggregated_move_lines.hs_code_origin_and_weight.xml
deleted file mode 100644
index ffa8391d..00000000
--- a/snippets/stock.stock_report_delivery_aggregated_move_lines.hs_code_origin_and_weight.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0"?>
-<data inherit_id="stock.stock_report_delivery_aggregated_move_lines" priority="50">
-
-  <xpath expr="/t/tr/td[2]/span" position="after">
-
-<!-- aggregated_lines[line]['product']['default_code] -->
-
-  <t t-if="o.product_id.hs_code">
-    <br/>
-    HS Code: <span t-field="o.product_id.hs_code"/>
-  </t>
-  <t t-if="o.product_id.x_country_of_origin.code">
-    <br/>
-    Country of Origin: <span t-field="o.product_id.x_country_of_origin.code"/>
-  </t>
-  <t t-if="o.product_id.weight">
-    <br/>
-    Weight: <span t-field="o.product_id.weight"/>
-    <span t-field="o.product_id.weight_uom_id.display_name"/>
-  </t>
-  </xpath>
-
-</data>
diff --git a/snippets/web.external_layout_standard.replace_header.xml b/snippets/web.external_layout_standard.replace_header.xml
index 191dae50..a21f98c6 100644
--- a/snippets/web.external_layout_standard.replace_header.xml
+++ b/snippets/web.external_layout_standard.replace_header.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<data inherit_id="web.external_layout_standard" priority="50">>
+<data inherit_id="web.external_layout_standard" priority="50">
 
 <xpath expr="/t/div" position="replace">    
   <div t-attf-class="header o_company_#{company.id}_layout">
diff --git a/task b/task
index 4805ddae..42b2160c 100755
--- a/task
+++ b/task
@@ -89,7 +89,7 @@ function install-native() {
     pip install setuptools wheel watchdog phonenumbers
     pip install -r odoo/requirements.txt
     echo "Install oca dev tools"
-    pip install pre-commit pyyaml
+    pip install pre-commit pyyaml rst2html5
     echo "Install graphql dependencies"
     pip install graphene graphql-server-core
     echo "Install openupgrade functions"
@@ -185,6 +185,8 @@ function lint-module() {
     cd $1
     echo "Run pre-commit in $1"
     pre-commit run --files ./*
+    echo "Update index.html"
+    rst2html5 README.rst static/description/index.html
 
 }
 
@@ -338,7 +340,7 @@ function checkout() {
     echo "Switch branch"
     git switch $1
 
-    # echo "Init submodules"
+    echo "Init submodules"
     git submodule update --init
 
     echo "Checkout branch on submodules"
@@ -357,6 +359,16 @@ function checkout() {
     git checkout $GIT_BRANCH $(tr '\n' ' ' < ./config/checkout_files)
 }
 
+function git-pull-submodules() {
+    # Pull submodule if update config is not set
+    git submodule foreach '
+        update=$(git config -f $toplevel/.gitmodules submodule.$name.update)
+        if [ -z $update ]; then
+            git pull
+        fi;
+    ' | tee git-pull-submodules.log
+}
+
 function release-module() {
     if test -z "$1"; then echo "\$1 is empty"; exit; fi
 
@@ -617,21 +629,11 @@ function update-config() {
     echo "Config updated."
 }
 
-function git-list-submodule() {
+function git-list-submodules() {
 
     git config --file .gitmodules --get-regexp url | sed -e 's/submodule.//g' -e 's/.url//g' | awk '{ print $1 "," $2}'
 }
 
-function git-pull-submodules() {
-    # Pull submodule if update config is not set
-    git submodule foreach '
-        update=$(git config -f $toplevel/.gitmodules submodule.$name.update)
-        if [ -z $update ]; then
-            git pull
-        fi;
-    ' | tee git-pull-submodules.log
-}
-
 function git-feature-branch(){
     if test -z "$1"; then echo "\$1 is empty"; exit; fi
 
@@ -793,6 +795,9 @@ case "$1" in
     init-odoo-env)
         init-odoo-env $2
         ;;
+    list-odoo-env)
+        ls -f "$ODOO_DEVELOPMENT_CONFIG_DIR"
+        ;;
     edit-env)
         edit-env $2
         ;;
diff --git a/task.md b/task.md
index 04c65153..4815bee5 100644
--- a/task.md
+++ b/task.md
@@ -7,7 +7,7 @@
 | disable-auto-install        |                  | Disable auto install for enterprise modules.                      |
 | disable-mailserver          | [env]            | Disable mail server settings via xmlrpc.                          |
 | change-uuid                 | [env]            | Change database uuid via xmlrpc.                                  |
-| edit-envv                   | [env]            | Open env file in default editor.                                  |
+| edit-env                    | [env]            | Open env file in default editor.                                  |
 | drop-db                     | [db]             | Drop target Odoo database. Default is odoo.                       |
 | git-list-submodules         |                  | List path and url of submodules.                                  |
 | git-pull-submodules         |                  | Pull alls submodules.                                             |
@@ -15,6 +15,7 @@
 | init-db                     | [db]             | Initialize the Odoo database. Default is odoo                     |
 | init-next-env               | [env]            | Create env file for Nextcloud instance.                           |
 | init-odoo-env               | [env]            | Create env file for Odoo Instance.                                |
+| list-odoo-env               |                  | List odoo env files.                                              |
 | init-venv                   |                  | Initialize python virtual env.                                    |
 | install-module              | [db][name,path]  | Install target Odoo module.                                       |
 | install-odoo-scripts        |                  | Install Odoo scripts.                                             |