diff --git a/ext/custom-addons/dp_custom/models/material_type.py b/ext/custom-addons/dp_custom/models/material_type.py
index 6f95d4bd..7f1ae414 100644
--- a/ext/custom-addons/dp_custom/models/material_type.py
+++ b/ext/custom-addons/dp_custom/models/material_type.py
@@ -28,6 +28,8 @@ class MaterialType(models.Model):
 
     name = fields.Char(string='Bezeichnung', required=True)
     print_default_code = fields.Boolean(string='Drucke Artikelnummer', required=True, help='Definiert, ob die Artikelnummer gedruckt wird')
+    print_sales_pic = fields.Boolean(string='Drucke Artikelbild', default=True, required=False, help='Definiert, ob ein Artikelbild gedruckt wird (Angebot/Auftrag)')
+    print_production_pic = fields.Boolean(string='Drucke Produktionsbild', default=False, required=False, help='Definiert, ob ein Produktionsbild gedruckt wird (Produktionsauftrag)')
 
     _sql_constraints = [
         ('name_uniq', 'unique(name)', 'Die Bezeichnung muss eindeutig sein')
diff --git a/ext/custom-addons/dp_custom/views/material_type_views.xml b/ext/custom-addons/dp_custom/views/material_type_views.xml
index adb1fc84..bf239aea 100644
--- a/ext/custom-addons/dp_custom/views/material_type_views.xml
+++ b/ext/custom-addons/dp_custom/views/material_type_views.xml
@@ -9,6 +9,8 @@
                 <group>
                     <field name="name"/>
                     <field name="print_default_code"/>
+                    <field name="print_sales_pic"/>
+                    <field name="print_production_pic"/>
                 </group>
             </form>
         </field>
@@ -21,6 +23,8 @@
             <tree>
                 <field name="name"/>
                 <field name="print_default_code"/>
+                <field name="print_sales_pic"/>
+                <field name="print_production_pic"/>
             </tree>
         </field>
     </record>
diff --git a/ext/custom-addons/dp_custom/views/sale_views.xml b/ext/custom-addons/dp_custom/views/sale_views.xml
index 695cda71..f1915e35 100644
--- a/ext/custom-addons/dp_custom/views/sale_views.xml
+++ b/ext/custom-addons/dp_custom/views/sale_views.xml
@@ -156,6 +156,7 @@
         <field name="arch" type="xml">
             <field name="partner_id" position="after">
                 <field name="partner_invoice_id"/>
+                <field name="partner_shipping_id" invisible="1"/>
             </field>
             <field name="name" position="after">
                 <field name="order_type"/>
@@ -171,6 +172,7 @@
         <field name="arch" type="xml">
             <field name="partner_id" position="after">
                 <field name="partner_invoice_id"/>
+                <field name="partner_shipping_id" invisible="1"/>
             </field>
             <field name="name" position="after">
                 <field name="order_type"/>
@@ -190,9 +192,19 @@
             <field name="name" position="after">
                 <field name="client_order_ref"/>
                 <field name="origin"/>
-                <field name="assembly_state" string="PG Status"/>
+                <field name="confirmation_nr"/>
+                <field name="assembly_state"/>
                 <field name="order_type"/>
             </field>
+<!--
+            <field name="partner_id" position="after">
+                <field name="partner_shipping_id"/>
+                <field name="partner_invoice_id"/>
+            </field>
+-->
+            <field name="partner_id" position="replace">
+                <field name="partner_id"  string="Kunde" filter_domain="['|','|',('partner_id','ilike',self),('partner_shipping_id','ilike',self),('partner_invoice_id','ilike',self)]"/>
+            </field>
             <filter name="customer" position="after">
                 <filter string="PG Status" domain="[]" context="{'group_by':'assembly_state'}"/>
                 <filter string="Rechnungsadresse" domain="[]" context="{'group_by':'partner_invoice_id'}"/>
diff --git a/ext/custom-addons/tz_reports_production/reports/report_production.xml b/ext/custom-addons/tz_reports_production/reports/report_production.xml
index d6127694..438cd7ea 100644
--- a/ext/custom-addons/tz_reports_production/reports/report_production.xml
+++ b/ext/custom-addons/tz_reports_production/reports/report_production.xml
@@ -172,9 +172,9 @@
                             </tr>
                             <tr>
                                 <td colspan="2" style="border: 0;text-align: center;">
-                                    <img t-if="order_line.lot_id.image_medium"
+                                    <img t-if="order_line.lot_id.image_medium and order_line.product_id.material_type_id.print_production_pic"
                                          t-att-src="'data:image/png;base64,%s' % order_line.lot_id.image_medium.decode()" style="max-width: 128px;"/>
-                                    <img t-if="not order_line.lot_id.image_medium and order_line.product_id.image_medium"
+                                    <img t-if="not order_line.lot_id.image_medium and order_line.product_id.image_medium and order_line.product_id.material_type_id.print_production_pic"
                                          t-att-src="'data:image/png;base64,%s' % order_line.product_id.image_medium.decode()" style="max-width: 128px;"/>
                                 </td>
                             </tr>