diff --git a/ext/custom-addons/dp_custom/i18n/de.po b/ext/custom-addons/dp_custom/i18n/de.po
index 02d69a5d..d7ee421a 100644
--- a/ext/custom-addons/dp_custom/i18n/de.po
+++ b/ext/custom-addons/dp_custom/i18n/de.po
@@ -216,14 +216,14 @@ msgstr "${object.subject}"
 #: model:mail.template,body_html:dp_custom.mail_template_data_confirmation_to_office
 msgid ""
 "<?xml version=\"1.0\"?>\n"
-"<data><p>Shopping Cart XYZ, Delivery Note ${object.name or 'n/a' } has been picked up by ${object.partner_id.name},</p>\n"
+"<data><p>Shopping Cart ${object.shopping_cart_ref or 'n/a' }, Delivery Note ${object.name or 'n/a' } has been picked up by ${object.partner_id.name},</p>\n"
 "<p>\n"
 "<p>Find the delivery order attached for more details.</p>\n"
 "<p>Thank you,</p>\n"
 "      </data>"
 msgstr ""
 "<?xml version=\"1.0\"?>\n"
-"<data><p>Der Warenkorb XYZ, Lieferschein ${object.name or 'n/a' } wurde von ${object.partner_id.name} abgeholt,</p>\n"
+"<data><p>Der Warenkorb ${object.shopping_cart_ref or 'n/a' }, Lieferschein ${object.name or 'n/a' } wurde von ${object.partner_id.name} abgeholt,</p>\n"
 "<p>\n"
 "<p>Weitere Informationen finden Sie im angehängten Lieferschein.</p>\n"
 "<p>Vielen Dank,</p>\n"
diff --git a/ext/custom-addons/dp_custom/models/sale.py b/ext/custom-addons/dp_custom/models/sale.py
index 74bfac79..457511a2 100644
--- a/ext/custom-addons/dp_custom/models/sale.py
+++ b/ext/custom-addons/dp_custom/models/sale.py
@@ -135,7 +135,7 @@ class SaleOrder(models.Model):
 
     assembled = fields.Boolean(string='Zusammengebaut')
     line_id = fields.Many2one(comodel_name='res.line', string='Produktionslinie')
-    assembly_state = fields.Selection(ASSEMBLY_STATES, string="Status PG", track_visibility='onchange', help='Bitte nicht manuell ändern', default='')
+    assembly_state = fields.Selection(ASSEMBLY_STATES, string="Status PG", track_visibility='onchange', help='Bitte nicht manuell ändern', default='', copy=False)
     quote_name = fields.Char(compute='_compute_quote_name')
     internal_notes = fields.Text()
     assembly_notes = fields.Text()
@@ -171,7 +171,7 @@ class SaleOrder(models.Model):
     pg9_call_D = fields.Char(string='PG9-Auftrag_D', compute='_pg9_call', store=False)
     pg9_call_T = fields.Char(string='PG9-Auftrag_T', compute='_pg9_call', store=False)
     partner_flash = fields.Text(compute='_get_partner_flash', store=False)
-    pg9_complete = fields.Boolean(string='PG9-Komplett', compute='_compute_positions', store=False, default=False)
+    pg9_complete = fields.Boolean(string='PG9-Komplett', compute='_compute_positions', store=False, default=False, copy=False)
 #    partner_flash = fields.Char(store=False)
 
     @api.multi