From 94deb62263ed48f18772c54a910d29083e97c4a2 Mon Sep 17 00:00:00 2001
From: Andreas Osim <andreas.osim@glaser-co.at>
Date: Thu, 9 Nov 2023 15:40:45 +0100
Subject: [PATCH] d

---
 ext/custom-addons/dp_custom/models/sale.py                | 8 ++++++--
 ext/custom-addons/dp_custom/views/sale_views.xml          | 2 +-
 .../dp_sale_delivery_date/models/sale_order.py            | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/ext/custom-addons/dp_custom/models/sale.py b/ext/custom-addons/dp_custom/models/sale.py
index 92b6f49c..c734f7a1 100644
--- a/ext/custom-addons/dp_custom/models/sale.py
+++ b/ext/custom-addons/dp_custom/models/sale.py
@@ -841,8 +841,12 @@ class SaleOrderLine(models.Model):
     sequence = fields.Integer(string='Sequence', default=9999)
     item_notes = fields.Text(string='Notes', related='lot_id.notes', store=False)
     item_warn = fields.Boolean(string='Notes!!!', compute='_compute_item_warn', store=False)
-    price_change = fields.Boolean(string='R', help='Preis aus Artikelstamm auslesen',default=False, store=False, track_visibility='always')
-    read_price = fields.Boolean(string='R',default=False, store=False, help='Preis aus Artikelstamm auslesen', track_visibility='always')
+
+    # price_change = fields.Boolean(string='R', help='Preis aus Artikelstamm auslesen',default=False, store=False, track_visibility='always')
+    # read_price = fields.Boolean(string='R',default=False, store=False, help='Preis aus Artikelstamm auslesen', track_visibility='always')
+
+    price_change = fields.Boolean(string='R', help='Preis aus Artikelstamm auslesen',default=False, store=False)
+    read_price = fields.Boolean(string='R',default=False, store=False, help='Preis aus Artikelstamm auslesen')
 
     @api.multi
     def _compute_item_warn(self):
diff --git a/ext/custom-addons/dp_custom/views/sale_views.xml b/ext/custom-addons/dp_custom/views/sale_views.xml
index 99cc534a..4fa4b97a 100644
--- a/ext/custom-addons/dp_custom/views/sale_views.xml
+++ b/ext/custom-addons/dp_custom/views/sale_views.xml
@@ -30,7 +30,7 @@
                 <field name="editor_id" options="{'no_create': True, 'no_open': True}"/>
                 <field name="carrier_id" options="{'no_create': True}" attrs="{'readonly':False}"/>
             </field>
-            <field name="delivery_date" position="before">
+            <field name="validity_date" position="after">
                 <field name="delivery_date_warning" position="before" attrs="{'readonly':True, 'invisible':True}"/>
                 <field name="desired_delivery_date" position="before" class="oe_highlight_blink urgent" attrs="{'readonly':True, 'invisible':['|',('desired_delivery_date','=',False),('delivery_date_warning','=',False)]}"/>
                 <field name="desired_delivery_date" position="before" attrs="{'readonly':True, 'invisible':['|',('desired_delivery_date','=',False),('delivery_date_warning','!=',False)]}"/>
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 6e945b35..4531d1cd 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,7 +7,7 @@ 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',store=True,index=True, track_visibility='onchange')
 #    delivery_date = fields.Date('Lieferdatum', compute='_compute_delivery_date', inverse='_inverse_delivery_date')
 
     @api.multi