diff --git a/ext/custom-addons/dp_sale_delivery_date/models/sale_order.py b/ext/custom-addons/dp_sale_delivery_date/models/sale_order.py
index ba767ae2..450288ee 100644
--- a/ext/custom-addons/dp_sale_delivery_date/models/sale_order.py
+++ b/ext/custom-addons/dp_sale_delivery_date/models/sale_order.py
@@ -7,12 +7,11 @@ from odoo import api, fields, models
 class SaleOrder(models.Model):
     _inherit = 'sale.order'
 
-#    delivery_date = fields.Date('Lieferdatum', compute='_compute_delivery_date', inverse='_inverse_delivery_date',store=True,index=True, track_visibility='onchange')
-    delivery_date = fields.Date('Lieferdatum', compute='_compute_delivery_date', inverse='_inverse_delivery_date',index=True)
+    delivery_date = fields.Date('Lieferdatum', compute='_compute_delivery_date', inverse='_inverse_delivery_date',store=False,index=True, track_visibility='onchange')
+#    delivery_date = fields.Date('Lieferdatum', compute='_compute_delivery_date', inverse='_inverse_delivery_date')
 
     @api.multi
-#    @api.depends('state','write_date','order_line.delivery_date','order_line.write_date')
-    @api.depends('state')
+    @api.depends('state','write_date','order_line.delivery_date','order_line.write_date')
     def _compute_delivery_date(self):
         for order in self:
             lines = order.order_line.filtered(lambda d: d.delivery_date)
@@ -21,8 +20,7 @@ class SaleOrder(models.Model):
                 order.delivery_date = lines[0].delivery_date
 
     @api.multi
-#    @api.depends('state','write_date','order_line.delivery_date','order_line.write_date')
-    @api.depends('state')
+    @api.depends('state','write_date','order_line.delivery_date','order_line.write_date')
     def _inverse_delivery_date(self):
         for order in self:
             for line in order.order_line: