diff --git a/snippets/mrp.mrp_production_form_view.replace_workorder_tree_view.xml b/snippets/mrp.mrp_production_form_view.replace_workorder_tree_view.xml
index 2c73876b..4d31dadd 100644
--- a/snippets/mrp.mrp_production_form_view.replace_workorder_tree_view.xml
+++ b/snippets/mrp.mrp_production_form_view.replace_workorder_tree_view.xml
@@ -1,39 +1,49 @@
 <data inherit_id="mrp.mrp_production_form_view" priority="50">
-    <!-- origin_ref: mrp.mrp_production_workorder_tree_editable_view -->
-    <xpath expr="//field[@name='workorder_ids']" position="inside">
-        <tree editable="bottom" js_class="tablet_list_view">
-            <field name="consumption" invisible="1"/>
-            <field name="company_id" invisible="1"/>
-            <field name="is_produced" invisible="1"/>
-            <field name="is_user_working" invisible="1"/>
-            <field name="product_uom_id" invisible="1" readonly="0"/>
-            <field name="production_state" invisible="1"/>
-            <field name="production_bom_id" invisible="1"/>
-            <field name="qty_producing" invisible="1"/>
-            <field name="time_ids" invisible="1"/>
-            <field name="working_state" invisible="1"/>
-            <field name="operation_id" invisible="1" domain="['|', ('bom_id', '=', production_bom_id), ('bom_id', '=', False)]" context="{'default_workcenter_id': workcenter_id, 'default_company_id': company_id}"/>
-            <field name="name" string="Operation"/>
-            <field name="workcenter_id"/>
-            <field name="product_id" optional="hide"/>
-            <field name="lot_id" optional="hide" domain="['|',('company_id','=',False),('company_id','=',company_id)]"/>
-            <field name="date_planned_start" optional="show"/>
-            <field name="date_planned_finished" optional="hide"/>
-            <field name="date_start" optional="hide" readonly="1"/>
-            <field name="date_finished" optional="hide" readonly="1"/>
-            <field name="duration_expected" widget="float_time"/>
-            <field name="duration" widget="mrp_time_counter" attrs="{'invisible': [('production_state','=', 'draft')], 'readonly': [('is_user_working', '=', True)]}"/>
-            <field name="state" widget="badge" decoration-success="state == 'done'" decoration-info="state not in ('done', 'cancel')" attrs="{'invisible': [('production_state', 'in', ('draft', 'done'))]}"/>
-            <field name="production_state" invisible="1"/>
-            <button name="button_start" type="object" string="Start" class="btn-success" attrs="{'invisible': ['|', '|', '|', ('production_state','in', ('draft', 'done', 'cancel')), ('working_state', '=', 'blocked'), ('state', '=', 'done'), ('is_user_working', '!=', False)]}"/>
-            <button name="button_pending" type="object" string="Pause" class="btn-warning" attrs="{'invisible': ['|', '|', ('production_state', 'in', ('draft', 'done', 'cancel')), ('working_state', '=', 'blocked'), ('is_user_working', '=', False)]}"/>
-            <button name="button_finish" type="object" string="Done" class="btn-success" attrs="{'invisible': ['|', '|', ('production_state', 'in', ('draft', 'done', 'cancel')), ('working_state', '=', 'blocked'), ('is_user_working', '=', False)]}"/>
-            <button name="433" type="action" string="Block" context="{'default_workcenter_id': workcenter_id}" class="btn-danger" attrs="{'invisible': ['|', ('production_state', 'in', ('draft', 'done', 'cancel')), ('working_state', '=', 'blocked')]}"/>
-            <button name="button_unblock" type="object" string="Unblock" context="{'default_workcenter_id': workcenter_id}" class="btn-danger" attrs="{'invisible': ['|', ('production_state', 'in', ('draft', 'done', 'cancel')), ('working_state', '!=', 'blocked')]}"/>
-            <button name="action_open_wizard" type="object" icon="fa-external-link" class="oe_edit_only" context="{'default_workcenter_id': workcenter_id}"/>
-            <button name="open_tablet_view" type="object" icon="fa-tablet" context="{'from_production_order': True}" attrs="{'invisible': ['|', ('production_state', 'in', ('draft', 'cancel', 'done')), ('state', '=', 'done')]}"/>
-            <field name="show_json_popover" invisible="1"/>
-            <field name="json_popover" widget="mrp_workorder_popover" string=" " width="0.1" attrs="{'invisible': [('show_json_popover', '=', False)]}"/>
-        </tree>
-    </xpath>
+<!-- origin_ref: mrp.mrp_production_workorder_tree_editable_view -->
+  <xpath expr="//field[@name='workorder_ids']" position="inside">
+    <tree editable="bottom" js_class="tablet_list_view">
+      <field name="consumption" invisible="1"/>
+      <field name="company_id" invisible="1"/>
+      <field name="is_produced" invisible="1"/>
+      <field name="is_user_working" invisible="1"/>
+      <field name="product_uom_id" invisible="1" readonly="0"/>
+      <field name="production_state" invisible="1"/>
+      <field name="production_bom_id" invisible="1"/>
+      <field name="qty_producing" invisible="1"/>
+      <field name="time_ids" invisible="1"/>
+      <field name="working_state" invisible="1"/>
+      <field name="operation_id" invisible="1" domain="['|', ('bom_id', '=', production_bom_id), ('bom_id', '=', False)]" context="{'default_workcenter_id': workcenter_id, 'default_company_id': company_id}"/>
+      <field name="name" string="Operation"/>
+      <field name="workcenter_id"/>
+      <field name="product_id" optional="hide"/>
+      
+      <!-- Upgrade 16
+      <field name="component_id" optional="hide"/>
+      -->
+      
+      <!-- Upgrade 16
+      <field name="lot_id" optional="hide" domain="[('product_id','=', component_id),'|',('company_id','=',False),('company_id','=',company_id)]"/>
+      -->
+      <field name="lot_id" optional="hide" domain="['|',('company_id','=',False),('company_id','=',company_id)]"/>
+      
+      <field name="date_planned_start" optional="show"/>
+      <field name="date_planned_finished" optional="hide"/>
+      <field name="date_start" optional="hide" readonly="1"/>
+      <field name="date_finished" optional="hide" readonly="1"/>
+      <field name="duration_expected" widget="float_time"/>
+      <field name="duration" widget="mrp_time_counter" attrs="{'invisible': [('production_state','=', 'draft')], 'readonly': [('is_user_working', '=', True)]}"/>
+      <field name="state" widget="badge" decoration-success="state == 'done'" decoration-info="state not in ('done', 'cancel')" attrs="{'invisible': [('production_state', 'in', ('draft', 'done'))]}"/>
+      <field name="production_state" invisible="1"/>
+      <button name="button_start" type="object" string="Start" class="btn-success" attrs="{'invisible': ['|', '|', '|', ('production_state','in', ('draft', 'done', 'cancel')), ('working_state', '=', 'blocked'), ('state', '=', 'done'), ('is_user_working', '!=', False)]}"/>
+      <button name="button_pending" type="object" string="Pause" class="btn-warning" attrs="{'invisible': ['|', '|', ('production_state', 'in', ('draft', 'done', 'cancel')), ('working_state', '=', 'blocked'), ('is_user_working', '=', False)]}"/>
+      <button name="button_finish" type="object" string="Done" class="btn-success" attrs="{'invisible': ['|', '|', ('production_state', 'in', ('draft', 'done', 'cancel')), ('working_state', '=', 'blocked'), ('is_user_working', '=', False)]}"/>
+      <button name="433" type="action" string="Block" context="{'default_workcenter_id': workcenter_id}" class="btn-danger" attrs="{'invisible': ['|', ('production_state', 'in', ('draft', 'done', 'cancel')), ('working_state', '=', 'blocked')]}"/>
+      <button name="button_unblock" type="object" string="Unblock" context="{'default_workcenter_id': workcenter_id}" class="btn-danger" attrs="{'invisible': ['|', ('production_state', 'in', ('draft', 'done', 'cancel')), ('working_state', '!=', 'blocked')]}"/>
+      <button name="action_open_wizard" type="object" icon="fa-external-link" class="oe_edit_only" context="{'default_workcenter_id': workcenter_id}"/>
+      <button name="open_tablet_view" type="object" icon="fa-tablet" context="{'from_production_order': True}" attrs="{'invisible': ['|', ('production_state', 'in', ('draft', 'cancel', 'done')), ('state', '=', 'done')]}"/>
+      <field name="show_json_popover" invisible="1"/>
+      <field name="json_popover" widget="mrp_workorder_popover" string=" " width="0.1" attrs="{'invisible': [('show_json_popover', '=', False)]}"/>
+    </tree>
+  </xpath>
+
 </data>
diff --git a/snippets/sale.report_saleorder_document.replace_infotable_tissa.xml b/snippets/sale.report_saleorder_document.replace_infotable_tissa.xml
new file mode 100644
index 00000000..e7151c1c
--- /dev/null
+++ b/snippets/sale.report_saleorder_document.replace_infotable_tissa.xml
@@ -0,0 +1,106 @@
+<data inherit_id="sale.report_saleorder_document" priority="50">
+
+  <xpath expr="//div[@id='informations']" position="replace">
+    <style>
+    table#info {
+      width: 100%;
+      margin-bottom: 45px;
+      font-size: 11pt;
+    }
+    table#info tr {
+      line-height: 1.2;
+      text-align: left;
+    }
+    .note {
+      font-size: 9pt;
+    }
+    </style>
+    <table id="info">
+
+      <tr>
+        <td width="16%">
+          Contact Number:
+        </td>
+        <td width="44%">
+          <span t-field="doc.partner_id.id"/>
+        </td>
+        <td>
+          Date:
+        </td>
+        <td>
+          <span t-field="doc.date_order" t-options="{&quot;widget&quot;: &quot;date&quot;}"/>
+        </td>
+      </tr>
+
+      <tr>
+        <td>
+          Your Contact:
+        </td>
+        <td>
+          <span t-field="doc.partner_sale_id.name"/>
+        </td>
+        <td>Our Order:</td>
+        <td>
+          <t t-if="doc.origin">
+            <span t-field="doc.origin"/>
+ / 
+          </t>
+          <span t-field="doc.name"/>
+        </td>
+      </tr>
+
+      <tr>
+        <td>
+          VAT-No:
+        </td>
+        <td>
+          <span t-field="doc.partner_id.vat"/>
+        </td>
+        <td>Call-off Order:</td>
+        <td>
+          <span t-field="doc.comment"/>
+          <t t-if="doc.x_studio_kommission">
+             /            <span t-field="doc.x_studio_kommission"/>
+          </t>
+        </td>
+      </tr>
+
+      <tr>
+        <td>EORI-Number:</td>
+        <td>
+          <span t-field="doc.partner_id.x_studio_eori_nummer"/>
+        </td>
+        <td>Our Contact:</td>
+        <td>
+          <span t-field="doc.partner_id.user_id"/>
+        </td>
+      </tr>
+
+      <tr>
+        <td>Ihre Bestellung:</td>
+        <td>         
+          <span t-field="doc.client_order_ref"/>       
+        </td>
+        <td>
+          VAT-No:
+        </td>
+        <td>
+          <span t-field="doc.company_id.vat"/>  
+        </td>
+      </tr>
+      
+      <tr>
+        <td/>
+        <td><span t-field="doc.blanket_order_id.date_confirmed"/>      
+        </td>
+        <td>
+          Delivery date ETD:
+        </td>
+        <td>
+          <span t-field="doc.commitment_date" t-options="{&quot;widget&quot;: &quot;date&quot;}"/>  
+        </td>
+      </tr>
+
+    </table>
+  </xpath>
+</data>
\ No newline at end of file
diff --git a/snippets/sale_blanket_order.report_blanketorder_document.replace_infotable_tissa.xml b/snippets/sale_blanket_order.report_blanketorder_document.replace_infotable_tissa.xml
new file mode 100644
index 00000000..5d49075a
--- /dev/null
+++ b/snippets/sale_blanket_order.report_blanketorder_document.replace_infotable_tissa.xml
@@ -0,0 +1,78 @@
+<?xml version="1.0"?>
+<data inherit_id="sale_blanket_order.report_blanketorder_document" priority="50">
+
+  <xpath expr="//div[@id='informations']" position="replace">
+    <style>
+    table#info {
+      width: 100%;
+      margin-bottom: 45px;
+      font-size: 11pt;
+    }
+    table#info tr {
+      line-height: 1.2;
+      text-align: left;
+    }
+    .note {
+      font-size: 9pt;
+    }
+    </style>
+    <table id='info'>
+
+      <tr>
+        <td width="16%">
+          Kontaktnummer:
+        </td>
+        <td width="44%">
+          <span t-field='doc.partner_id.id'/>
+        </td>
+        <td>
+          Datum:
+        </td>
+        <td>
+          <span t-field='doc.date_confirmed'/>
+        </td>
+      </tr>
+
+      <tr>
+        <td>
+          Kontaktperson:
+        </td>
+        <td>
+          <span t-field='doc.partner_sale_id.name'/>
+        </td>
+        <td>Kundenbetreuer/in:</td>
+        <td>
+          <span t-field='doc.partner_id.user_id'/>
+        </td>
+      </tr>
+
+      <tr>
+        <td>EORI-Nummer:</td>
+        <td>
+          <span t-field="doc.partner_id.x_studio_eori_nummer"/>
+        </td>
+        <td>
+          MwSt-Nr:
+        </td>
+        <td>
+          <span t-field="doc.company_id.vat"/>
+        </td>
+      </tr>
+
+      <tr>
+        <td>Ihre Bestellung:</td>
+        <td>
+          <span t-field='doc.client_order_ref'/>
+        </td>
+      </tr>
+
+      <tr>
+        <td>Gültigkeitsdatum:</td>
+        <td>
+          <span t-field="doc.validity_date"/>
+        </td>
+      </tr>
+
+    </table>
+  </xpath>
+</data>
\ No newline at end of file
diff --git a/snippets/stock.report_delivery_document.package_info_tissa.xml b/snippets/stock.report_delivery_document.package_info_tissa.xml
new file mode 100644
index 00000000..e3233420
--- /dev/null
+++ b/snippets/stock.report_delivery_document.package_info_tissa.xml
@@ -0,0 +1,36 @@
+<data inherit_id="stock.report_delivery_document" priority="60">
+
+	<xpath expr="//table[@name='stock_move_line_table']" position="after">
+
+		<table style="border: white">
+			<tr>
+				<td>
+					net weight:
+					<span t-field="o.x_studio_nettogewicht"/>
+				</td>
+			</tr>
+			<tr>
+				<td>
+					gross weight:
+					<span t-field="o.x_studio_bruttogewicht"/>
+				</td>
+			</tr>
+			<tr>
+				<td>
+					package:
+					<span t-field="o.x_studio_masse"/>
+				</td>
+			</tr>
+		</table>
+		<table style="margin-top: 30px; border: white">
+			<tr>
+				<td>
+					<span>Goods properly received:
+____________________________________________________________</span>
+				</td>
+			</tr>
+		</table>
+
+	</xpath>
+
+</data>
\ No newline at end of file
diff --git a/snippets/stock.report_delivery_document.replace_infotable_tissa.xml b/snippets/stock.report_delivery_document.replace_infotable_tissa.xml
new file mode 100644
index 00000000..fefc6505
--- /dev/null
+++ b/snippets/stock.report_delivery_document.replace_infotable_tissa.xml
@@ -0,0 +1,87 @@
+<data inherit_id="stock.report_delivery_document" priority="50">
+
+  <xpath expr="//div[@class='page']/div[1]" position="replace">
+
+   <style>
+    table#info {
+      width: 100%;
+      margin-bottom: 45px;
+      font-size: 11pt;
+    }
+    table#info tr {
+      line-height: 1.2;
+      text-align: left;
+    }
+    .note {
+      font-size: 9pt;
+    }
+    </style>
+    <table id="info">
+
+      <tr>
+        <td width="16%">Kontaktnummer:</td>
+        <td width="44%">
+          <span t-field="o.partner_id.id"/>
+        </td>
+        <td width="19%">
+          Datum:
+        </td>
+        <td width="21%">
+          <span t-field="o.date_done" t-options="{&quot;widget&quot;: &quot;date&quot;}"/>
+        </td>
+      </tr>
+
+      <tr>
+        <td>Kontaktperson:</td>
+        <td>
+          <span t-field="o.sale_id.partner_sale_id.name"/>
+        </td>
+        <td>Unser Auftrag:</td>
+        <td>
+          <t t-if="o.group_id">
+            <span t-field="o.group_id"/>
+          </t>
+        </td>
+      </tr>
+      
+      <tr>
+        <td>USt-IdNr:</td>
+        <td>
+          <span t-field="o.partner_id.vat"/>
+        </td>
+        <td>Abruf:</td>
+        <td>
+          <span t-field="o.sale_id.comment"/>
+          <t t-if="o.sale_id.x_studio_kommission">
+             /            <span t-field="o.sale_id.x_studio_kommission"/>
+          </t>
+        </td>
+      </tr>
+
+      <tr>
+        <td>EORI-Nummer:</td>
+        <td>
+          <span t-field="o.partner_id.x_studio_eori_nummer"/>
+        </td>
+        <td>Ansprechpartner/in:</td>
+        <td>
+          <span t-field="o.partner_id.user_id"/>
+        </td>
+      </tr>
+
+      <tr>
+        <td>Ihre Bestellung:</td>
+        <td>
+          <span t-field="o.sale_id.client_order_ref"/>
+        </td>
+        <td>
+          MwSt-Nr:
+        </td>
+        <td>
+          CHE-103.327.797 MWST
+        </td>
+      </tr>
+
+    </table>
+  </xpath>
+</data>
\ No newline at end of file
diff --git a/snippets/stock.view_picking_form.x_name.xml b/snippets/stock.view_picking_form.x_name.xml
index a213baf0..1fe5f6f5 100644
--- a/snippets/stock.view_picking_form.x_name.xml
+++ b/snippets/stock.view_picking_form.x_name.xml
@@ -1,5 +1,5 @@
 <data inherit_id="stock.view_picking_form" priority="50">
-    <field name="partner_id" position="before">
+    <xpath expr="//label[@for='partner_id']/.." position="before">
         <field name="x_name"/>
-    </field>
-</data>
\ No newline at end of file
+    </xpath>
+</data>
diff --git a/snippets/stock.view_production_lot_form.x_units_on_lot.xml b/snippets/stock.view_production_lot_form.x_units_on_lot.xml
new file mode 100644
index 00000000..bd4402df
--- /dev/null
+++ b/snippets/stock.view_production_lot_form.x_units_on_lot.xml
@@ -0,0 +1,7 @@
+<data inherit_id="stock.view_production_lot_form" priority="50">
+
+    <xpath expr="//group[@name='main_group']/group/div" position="after">
+        <field name="x_units_on_lot" readonly="1"/>
+    </xpath>
+
+</data>
diff --git a/snippets/stock.vpicktree.x_date_done.xml b/snippets/stock.vpicktree.x_date_done.xml
new file mode 100644
index 00000000..2b65e41f
--- /dev/null
+++ b/snippets/stock.vpicktree.x_date_done.xml
@@ -0,0 +1,5 @@
+<data inherit_id="stock.vpicktree" priority="50">
+    <xpath expr="//field[@name='scheduled_date']" position="after">
+        <field name="x_date_done"/>
+    </xpath>
+</data>
diff --git a/snippets/web.external_layout_standard.footer_Kunststoffsammelsack.xml b/snippets/web.external_layout_standard.footer_Kunststoffsammelsack.xml
index adc34342..f4cc25f6 100644
--- a/snippets/web.external_layout_standard.footer_Kunststoffsammelsack.xml
+++ b/snippets/web.external_layout_standard.footer_Kunststoffsammelsack.xml
@@ -1,21 +1,24 @@
 <data inherit_id="web.external_layout_standard" priority="50">
   <xpath expr="//div[@t-attf-class='footer o_standard_footer o_company_#{company.id}_layout']" position="replace">
 
-    <div t-attf-class="footer o_standard_footer o_company_#{company.id}_layout">
-      <div style="border-top: 1px solid black;">
-        <table style="width: 100%; border: transparent">
-          <tr style="line-height: 1.2; ">
-            <td style="padding-top:7px; width: 33%; text-align: left; ">info@kunststoffsammelsack.ch</td>
-            <td style="width: 33%; text-align: center">wwww.kunststoffsammelsack.ch</td>
-            <td style="width: 33%; text-align: right">+41 41 760 33 36</td>
-          </tr>
-          <tr style="line-height: 1.2;">
-            <td>CHE-411.930.537 MWST</td>
-            
-          </tr>          
-        </table>
+    <t t-if="report_type == 'pdf'">
+
+      <div t-attf-class="footer o_standard_footer o_company_#{company.id}_layout">
+        <div style="border-top: 1px solid black;">
+          <table style="width: 100%; border: transparent">
+            <tr style="line-height: 1.2; ">
+              <td style="padding-top:7px; width: 33%; text-align: left; ">info@kunststoffsammelsack.ch</td>
+              <td style="width: 33%; text-align: center">wwww.kunststoffsammelsack.ch</td>
+              <td style="width: 33%; text-align: right">+41 41 760 33 36</td>
+            </tr>
+            <tr style="line-height: 1.2;">
+              <td>CHE-411.930.537 MWST</td>
+            </tr>
+          </table>
+        </div>
       </div>
-    </div>
-    
+
+    </t>
+
   </xpath>
-</data>
\ No newline at end of file
+</data>