diff --git a/ext/custom-addons/dp_custom/models/sale.py b/ext/custom-addons/dp_custom/models/sale.py
index 6ae8eaa6..f884f304 100644
--- a/ext/custom-addons/dp_custom/models/sale.py
+++ b/ext/custom-addons/dp_custom/models/sale.py
@@ -44,11 +44,16 @@ class SaleOrder(models.Model):
                        ('delivered',        'Geliefert'),
                        ('completed',        'Abgeschlossen')]
 
+    # ORDER_TYPES = [
+    #     ('M', 'Manuell'),
+    #     ('D', 'DesignBox'),
+    #     ('I', 'Industrie'),
+    #     ('T', 'TZBox')
     ORDER_TYPES = [
-        ('M', 'Manuell'),
-        ('D', 'DesignBox'),
-        ('I', 'Industrie'),
-        ('T', 'TZBox')
+        ('M', 'M'),
+        ('D', 'D'),
+        ('I', 'I'),
+        ('T', 'T')
     ]
 
     assembled = fields.Boolean(string='Zusammengebaut')
diff --git a/ext/custom-addons/dp_custom/views/sale_views.xml b/ext/custom-addons/dp_custom/views/sale_views.xml
index ffb195d3..9ec9ce8e 100644
--- a/ext/custom-addons/dp_custom/views/sale_views.xml
+++ b/ext/custom-addons/dp_custom/views/sale_views.xml
@@ -180,8 +180,9 @@
                 <field name="partner_shipping_id" invisible="1"/>
             </field>
             <field name="name" position="after">
-                <field name="order_type"/>
+                <field name="order_type" string="Art"/>
 <!--                <field name="team_id"/> -->
+                <field name="origin"/>
                 <field name="confirmation_nr"/>
                 <field name="client_order_ref"/>
             </field>
@@ -198,8 +199,9 @@
                 <field name="partner_shipping_id" invisible="1"/>
             </field>
             <field name="name" position="after">
-                <field name="order_type"/>
+                <field name="order_type" string="Art"/>
 <!--                <field name="team_id"/> -->
+                <field name="origin"/>
                 <field name="confirmation_nr"/>
                 <field name="client_order_ref"/>
             </field>
diff --git a/ext/custom-addons/dp_reports/reports/report_templates.xml b/ext/custom-addons/dp_reports/reports/report_templates.xml
index f0a53d9b..94cbc7f5 100644
--- a/ext/custom-addons/dp_reports/reports/report_templates.xml
+++ b/ext/custom-addons/dp_reports/reports/report_templates.xml
@@ -18,6 +18,17 @@
     </template>
 
     <template id="external_layout_custom">
+        <t t-set="DlvLogo" t-value="False"/>
+        <t t-set="OcLogo" t-value="False"/>
+        <t t-foreach="o.partner_id.retail_partner_id.category_id" t-as="cat">
+            <t t-if="cat.name == 'OcLogo'">
+                <t t-set="OcLogo" t-value="True"/>
+            </t>
+            <t t-if="cat.name == 'DlvLogo'">
+                <t t-set="DlvLogo" t-value="True"/>
+            </t>
+        </t>
+
         <t t-call="dp_reports.external_layout_header"/>
 
         <div class="article o_dp_report_layout">
@@ -42,11 +53,10 @@
                         <span t-if="o.type == 'in_refund'">LIEFERANTENSTORNO</span>
                         <span t-if="o.type == 'in_invoice'">EINGANGSRECHNUNG</span>
                         <span t-field="o.number"/>
+                        <span t-field="o.partner_id.retail_partner_id.category_id.name"/>
                     </p>
                     <p t-if="o._name == 'sale.order'">
                         <t t-if="not (env.context.get('proforma', False) or is_pro_forma)">
-<!--
--->
                             <span t-if="not (data or {}).get('tz_report_production', False) and o.state not in ['draft','sent']">Auftragsbestätigung</span>
                             <span t-if="not (data or {}).get('tz_report_production', False) and o.state in ['draft','sent']">Angebot</span>
                             <span t-if="(data or {}).get('tz_report_production',False)">Produktionsschein</span>
@@ -62,8 +72,18 @@
                     </p>
                 </div>
                 <div class="col-xs-4 header-logo">
-                    <img t-if="company.logo" t-att-src="'data:image/png;base64,%s' % company.logo.decode()"
-                         style="max-height: 85px;"/>
+                    <t t-if="DlvLogo and o._name == 'stock.picking' and is_picking">
+                        <img t-if="o.partner_id.retail_partner_id.image" t-att-src="'data:image/png;base64,%s' % o.partner_id.retail_partner_id.image.decode()"
+                             style="max-height: 85px;"/>
+                    </t>
+                    <t t-elif="OcLogo and not (data or {}).get('tz_report_production', False) and o.state not in ['draft','sent']">
+                        <img t-if="o.partner_id.retail_partner_id.image" t-att-src="'data:image/png;base64,%s' % o.partner_id.retail_partner_id.image.decode()"
+                             style="max-height: 85px;"/>
+                    </t>
+                    <t t-else="">
+                        <img t-if="company.logo" t-att-src="'data:image/png;base64,%s' % company.logo.decode()"
+                             style="max-height: 85px;"/>
+                    </t>
                 </div>
             </div>
             <div class="row mt16">
@@ -77,64 +97,88 @@
             <div class="row">
                 <hr class="red-line-1"/>
             </div>
-            <div class="row" style="padding-left:0;">
-                <div class="col-xs-12 text-center">
-                    <strong>
-                        <span t-esc="company.name"/>
-                        &#183;
-                        <span t-esc="company.street"/>
-                        &#183;
-                        <span t-esc="company.zip"/>
-                        <span t-esc="company.city"/>
-                        &#183;
-                        <span t-esc="company.phone"/>
-                        &#183;
-                        <span t-esc="company.email"/>
-                        &#183;
-                        <span t-esc="company.website.replace('http://', '').replace('https://', '')"/>
-                    </strong>
+            <t t-if="(DlvLogo and o._name == 'stock.picking' and is_picking) or (OcLogo and not (data or {}).get('tz_report_production', False) and o.state not in ['draft','sent'])">
+                <div class="row" style="padding-left:0;">
+                    <div class="col-xs-12 text-center">
+                        <strong>
+                            <span t-esc="o.partner_id.retail_partner_id.name"/>
+                            &#183;
+                            <span t-esc="o.partner_id.retail_partner_id.street"/>
+                            &#183;
+                            <span t-esc="o.partner_id.retail_partner_id.zip"/>
+                            <span t-esc="o.partner_id.retail_partner_id.city"/>
+                            &#183;
+                            <span t-esc="o.partner_id.retail_partner_id.phone"/>
+                            &#183;
+                            <span t-esc="o.partner_id.retail_partner_id.email"/>
+                            <t t-if ="o.partner_id.retail_partner_id.website">
+                                &#183;
+                                <span t-esc="o.partner_id.retail_partner_id.website.replace('http://', '').replace('https://', '')"/>
+                            </t>
+                        </strong>
+                    </div>
                 </div>
-            </div>
-            <div class="row">
-                <div class="col-xs-12 text-center">
-                        <!-- <span>AT 46 3250 1000 0200 9306</span> -->
-                        <!-- <span>RLN WAT WW MIB</span> -->
-                        <!-- <span>Raiffeisenbank Spannberg</span> -->
-                    <strong>
-                        IBAN:
-                        <span t-if="company.partner_id.bank_ids" t-esc="company.partner_id.bank_ids[0].acc_number"/>
-                        &#183;
-                        BIC:
-                        <span t-if="company.partner_id.bank_ids" t-esc="company.partner_id.bank_ids[0].bank_id.bic"/>
-                        &#183;
-                        <span t-if="company.partner_id.bank_ids" t-esc="company.partner_id.bank_ids[0].bank_id.name"/>
-                    </strong>
+            </t>
+            <t t-else="">
+                <div class="row" style="padding-left:0;">
+                    <div class="col-xs-12 text-center">
+                        <strong>
+                            <span t-esc="company.name"/>
+                            &#183;
+                            <span t-esc="company.street"/>
+                            &#183;
+                            <span t-esc="company.zip"/>
+                            <span t-esc="company.city"/>
+                            &#183;
+                            <span t-esc="company.phone"/>
+                            &#183;
+                            <span t-esc="company.email"/>
+                            &#183;
+                            <span t-esc="company.website.replace('http://', '').replace('https://', '')"/>
+                        </strong>
+                    </div>
                 </div>
-            </div>
-            <div class="row">
-                <div class="col-xs-12 text-center">
-                        <!-- <span>AT 46 3250 1000 0200 9306</span> -->
-                        <!-- <span>RLN WAT WW MIB</span> -->
-                        <!-- <span>Raiffeisenbank Spannberg</span> -->
-                    <strong>
-                        UID-Nr.:
-                        <span t-esc="company.vat"/>
-                        &#183;
-                        EORI-Nr.
-                        <span t-esc="company.eori_nr"/>
-                        &#183;
-                        Firmenbuch Nr.:
-                        <span t-esc="company.company_registry"/>
-                    </strong>
+                <div class="row">
+                    <div class="col-xs-12 text-center">
+                            <!-- <span>AT 46 3250 1000 0200 9306</span> -->
+                            <!-- <span>RLN WAT WW MIB</span> -->
+                            <!-- <span>Raiffeisenbank Spannberg</span> -->
+                        <strong>
+                            IBAN:
+                            <span t-if="company.partner_id.bank_ids" t-esc="company.partner_id.bank_ids[0].acc_number"/>
+                            &#183;
+                            BIC:
+                            <span t-if="company.partner_id.bank_ids" t-esc="company.partner_id.bank_ids[0].bank_id.bic"/>
+                            &#183;
+                            <span t-if="company.partner_id.bank_ids" t-esc="company.partner_id.bank_ids[0].bank_id.name"/>
+                        </strong>
+                    </div>
                 </div>
-            </div>
-            <div class="row" style="padding-left:0;">
-                <div class="col-xs-12 text-center">
-                    <strong>
-                        Die AGBs finden Sie auf unserer Website.
-                    </strong>
+                <div class="row">
+                    <div class="col-xs-12 text-center">
+                            <!-- <span>AT 46 3250 1000 0200 9306</span> -->
+                            <!-- <span>RLN WAT WW MIB</span> -->
+                            <!-- <span>Raiffeisenbank Spannberg</span> -->
+                        <strong>
+                            UID-Nr.:
+                            <span t-esc="company.vat"/>
+                            &#183;
+                            EORI-Nr.
+                            <span t-esc="company.eori_nr"/>
+                            &#183;
+                            Firmenbuch Nr.:
+                            <span t-esc="company.company_registry"/>
+                        </strong>
+                    </div>
                 </div>
-            </div>
+                <div class="row" style="padding-left:0;">
+                    <div class="col-xs-12 text-center">
+                        <strong>
+                            Die AGBs finden Sie auf unserer Website.
+                        </strong>
+                    </div>
+                </div>
+            </t>
             <div class="row">
                 <div class="col-xs-12 text-right">
                     <ul class="list-inline">
@@ -153,36 +197,81 @@
     </template>
 
     <template id="company_data">
-        <t t-set="company" t-value="res_company"/>
-        <strong>
-            <span t-esc="company.partner_id.name"/>
-        </strong>
-        <div class="company-data">
-            <span t-esc="company.partner_id.street"/>
-            <br/>
-            <span t-esc="company.partner_id.zip"/>
-            <span t-esc="company.partner_id.city"/>
-            <br/>
-            <span t-esc="company.partner_id.country_id.name"/>
-            <br/>
-            <br/>
-            Phone:
-            <span t-esc="company.partner_id.phone"/>
-            <t t-if="company.partner_id.fax">
-                <br/>
-                Fax:
-                <span t-esc="company.partner_id.fax"/>
+        <t t-set="DlvLogo" t-value="False"/>
+        <t t-set="OcLogo" t-value="False"/>
+        <t t-foreach="o.partner_id.retail_partner_id.category_id" t-as="cat">
+            <t t-if="cat.name == 'OcLogo'">
+                <t t-set="OcLogo" t-value="True"/>
             </t>
-            <br/>
-            E-Mail:
-            <span t-esc="company.partner_id.email"/>
-            <br/>
-        </div>
-        <div>
+            <t t-if="cat.name == 'DlvLogo'">
+                <t t-set="DlvLogo" t-value="True"/>
+            </t>
+        </t>
+        <t t-if="(DlvLogo and o._name == 'stock.picking' and is_picking) or (OcLogo and not (data or {}).get('tz_report_production', False) and o.state not in ['draft','sent'])">
             <strong>
-                <span t-esc="company.partner_id.website.replace('http://', '').replace('https://', '')"/>
+                <span t-esc="o.partner_id.retail_partner_id.name"/>
             </strong>
-        </div>
+            <div class="company-data">
+                <span t-esc="o.partner_id.retail_partner_id.street"/>
+                <br/>
+                <span t-esc="o.partner_id.retail_partner_id.zip"/>
+                <span t-esc="o.partner_id.retail_partner_id.city"/>
+                <br/>
+                <span t-esc="o.partner_id.retail_partner_id.country_id.name"/>
+                <br/>
+                <br/>
+                Phone:
+                <span t-esc="o.partner_id.retail_partner_id.phone"/>
+                <t t-if="o.partner_id.retail_partner_id.fax">
+                    <br/>
+                    Fax:
+                    <span t-esc="o.partner_id.retail_partner_id.fax"/>
+                </t>
+                <br/>
+                E-Mail:
+                <span t-esc="o.partner_id.retail_partner_id.email"/>
+                <br/>
+            </div>
+            <div>
+                <strong>
+                    <t t-if ="o.partner_id.retail_partner_id.website">
+                        <span t-esc="o.partner_id.retail_partner_id.website.replace('http://', '').replace('https://', '')"/>
+                    </t>
+                </strong>
+            </div>
+        </t>
+        <t t-else="">
+            <t t-set="company" t-value="res_company"/>
+            <strong>
+                <span t-esc="company.partner_id.name"/>
+            </strong>
+            <div class="company-data">
+                <span t-esc="company.partner_id.street"/>
+                <br/>
+                <span t-esc="company.partner_id.zip"/>
+                <span t-esc="company.partner_id.city"/>
+                <br/>
+                <span t-esc="company.partner_id.country_id.name"/>
+                <br/>
+                <br/>
+                Phone:
+                <span t-esc="company.partner_id.phone"/>
+                <t t-if="company.partner_id.fax">
+                    <br/>
+                    Fax:
+                    <span t-esc="company.partner_id.fax"/>
+                </t>
+                <br/>
+                E-Mail:
+                <span t-esc="company.partner_id.email"/>
+                <br/>
+            </div>
+            <div>
+                <strong>
+                    <span t-esc="company.partner_id.website.replace('http://', '').replace('https://', '')"/>
+                </strong>
+            </div>
+        </t>
     </template>
 
     <template id="partner_data">