diff --git a/ext/custom-addons/dp_custom/models/sale.py b/ext/custom-addons/dp_custom/models/sale.py
index 4b9660e8..99ede5a9 100644
--- a/ext/custom-addons/dp_custom/models/sale.py
+++ b/ext/custom-addons/dp_custom/models/sale.py
@@ -337,6 +337,9 @@ class SaleOrder(models.Model):
         if vals.get('assembly_state', False) and vals.get('assembly_state', False) == 'done':
             self.message_post(body='Produktion fertig')
 
+        if vals.get('message_post',False):
+            self.message_post(body=vals.get('message_post'))
+
         return res
 
     @api.multi
@@ -558,6 +561,7 @@ class SaleOrderLine(models.Model):
         res = super(SaleOrderLine, self)._prepare_invoice_line(qty)
 
         res['lot_id'] = self.lot_id.id
+        res['intrastat_id'] = self.intrastat_id.id
         return res
 
     @api.multi