diff --git a/ext/custom-addons/dp_custom/views/sale_views.xml b/ext/custom-addons/dp_custom/views/sale_views.xml
index 34accc42..f11ac5f3 100644
--- a/ext/custom-addons/dp_custom/views/sale_views.xml
+++ b/ext/custom-addons/dp_custom/views/sale_views.xml
@@ -43,16 +43,7 @@
                 <field name="origin" attrs="{'readonly':[('order_type','=', 'D')]}" groups="!dp_custom.group_allow_change_shopping_cart"/>
                 <field name="confirmation_nr"/>
                 <field name="order_type"/>
-                <field name="assembly_state" groups="dp_custom.group_allow_change_pg_status"/>
-                <field name="assembly_state" attrs="{'readonly': True}" groups="!dp_custom.group_allow_change_pg_status"/>
-                <field name="pg_id" groups="dp_custom.group_allow_change_pg_status"/>
-                <field name="pg_id" attrs="{'readonly': True}" groups="!dp_custom.group_allow_change_pg_status"/>
                 <field name="pg9_complete" groups="dp_custom.group_allow_change_pg_status"/>
-
-                <!--
-                <field name="pg9_call" widget="url" text="...gehe zu Auftrag in PG9"
-                       attrs="{'invisible': [('order_type','not in',['T','D']),('assembly_state','in',['','created','failed'])]}"/>
--->
                 <field name="pg9_call_D" widget="url" text="...gehe zu Auftrag in PG9"
                        attrs="{'invisible': ['|','|','|','|',('order_type','!=', 'D'),('origin','=', False),('origin','=', ''),('assembly_state','not in',['wait','started','done','packed','delivered','completed'])]}"/>
                 <field name="pg9_call_T" widget="url" text="...gehe zu Auftrag in PG9"
@@ -82,6 +73,18 @@
                 <field name="product_id" options="{'no_create': True}"/>
             </xpath>
 -->
+            <xpath expr="//field[@name='order_type']" position="after">
+                <label for="assembly_state"/>
+                <div class="o_row" name="pg9_group">
+                    <field name="assembly_state" groups="dp_custom.group_allow_change_pg_status"/>
+                    <field name="assembly_state" attrs="{'readonly': True}" groups="!dp_custom.group_allow_change_pg_status"/>
+                    <span>[</span>
+                    <field name="pg_id" groups="dp_custom.group_allow_change_pg_status"/>
+                    <field name="pg_id" attrs="{'readonly': True}" groups="!dp_custom.group_allow_change_pg_status"/>
+                    <span>]</span>
+                </div>
+            </xpath>
+
             <xpath expr="//field[@name='order_line']/tree" position="attributes">
                 <attribute name="decoration-danger">price_change == True</attribute>
                 <attribute name="decoration-bf">price_change == True</attribute>
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 d1285aef..9ddf2f7f 100644
--- a/ext/custom-addons/tz_reports_production/reports/report_production.xml
+++ b/ext/custom-addons/tz_reports_production/reports/report_production.xml
@@ -92,6 +92,8 @@
                             <span class="col-xs-2">Shopping-Basket:</span>
                         </strong>
                         <span class="col-xs-2" t-field="o.origin"/>
+                        <span> / </span>
+                        <span t-field="o.sale_id.pg_id"/>
                     </p>
                 </div>
                 <div class="row">