From 21b0f6253ddde275d6ff19bc0cb089bbcc763f58 Mon Sep 17 00:00:00 2001
From: Andreas Osim <andreas.osim@glaser-co.at>
Date: Tue, 9 Aug 2022 09:33:07 +0200
Subject: [PATCH] Allow change of carrier even an order is already committed
 Log Change of WV-Flag

---
 ext/custom-addons/dp_custom/views/product_views.xml         | 1 +
 ext/custom-addons/dp_custom/views/sale_views.xml            | 4 ++--
 .../dp_intercompany_invoicing/models/account.py             | 6 ++++--
 ext/custom-addons/tz_dealer_discount/views/invoice_view.xml | 6 +++---
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/ext/custom-addons/dp_custom/views/product_views.xml b/ext/custom-addons/dp_custom/views/product_views.xml
index 19ea48c1..87c37689 100644
--- a/ext/custom-addons/dp_custom/views/product_views.xml
+++ b/ext/custom-addons/dp_custom/views/product_views.xml
@@ -111,6 +111,7 @@
         <field name="inherit_id" ref="product.product_template_search_view"/>
         <field name="arch" type="xml">
             <xpath expr="//field[@name='categ_id']" position="after">
+                <field name="default_code" string="Interne Referenz" filter_domain="[('default_code','ilike',self)]"/>
                 <field name="manufacturing_number" string="Herstellnummer" filter_domain="[('manufacturing_number','ilike',self)]"/>
                 <field name="suppl_ids" string="Lieferanten-Bestellnummer"
                                 filter_domain="[('suppl_ids.product_name','ilike',self)]"/>
diff --git a/ext/custom-addons/dp_custom/views/sale_views.xml b/ext/custom-addons/dp_custom/views/sale_views.xml
index fd54bbd5..cc264c68 100644
--- a/ext/custom-addons/dp_custom/views/sale_views.xml
+++ b/ext/custom-addons/dp_custom/views/sale_views.xml
@@ -28,7 +28,7 @@
                 <div style="height:5px;">
                 </div>
                 <field name="editor_id" options="{'no_create': True, 'no_open': True}"/>
-                <field name="carrier_id" options="{'no_create': True}"/>
+                <field name="carrier_id" options="{'no_create': True}" attrs="{'readonly':False}"/>
             </field>
             <field name="delivery_date" position="before">
                 <field name="delivery_date_warning" position="before" attrs="{'readonly':True, 'invisible':True}"/>
@@ -164,7 +164,7 @@
                     <div>
                         <field name="carrier_id" context="{'order_id': id}" class="oe_inline"
                                options="{'no_create': True, 'no_open': True}"
-                               attrs="{'readonly':[('state','not in',('draft','sent'))]}"/>
+                               attrs="{'readonly':False}"/>
                         <i class="fa fa-check text-success" aria-hidden="true"
                            attrs="{'invisible':['|','|',('carrier_id','=',False),('state','not in',('draft','sent')),('delivery_rating_success','=',False)]}"/>
                     </div>
diff --git a/ext/custom-addons/dp_intercompany_invoicing/models/account.py b/ext/custom-addons/dp_intercompany_invoicing/models/account.py
index 0f788d6c..c849289c 100644
--- a/ext/custom-addons/dp_intercompany_invoicing/models/account.py
+++ b/ext/custom-addons/dp_intercompany_invoicing/models/account.py
@@ -34,10 +34,10 @@ class AccountInvoice(models.Model):
 
     reimburse_invoice_id = fields.Many2one(comodel_name='account.invoice', string='Weiterverrechnung')
     charge_further = fields.Boolean(string='Weiterverrechnen', compute='_compute_charge_further', store=True,
-                                    help='Ist gesetzt, wenn das WV-Flag von mindestens einer Zeile gesetzt ist')
+                                    help='Ist gesetzt, wenn das WV-Flag von mindestens einer Zeile gesetzt ist',track_visibility='onchange')
 
     pg_ic_num = fields.Char('PG_IC_Nummer')
-    pg_ic_flag = fields.Boolean(string='IC', help='Rechnung nach PG exportiert')
+    pg_ic_flag = fields.Boolean(string='IC', help='Rechnung nach PG exportiert',track_visibility='onchange')
     pg_admin = fields.Boolean(compute='_is_pg_admin', default=False, store=False)
 
     @api.multi
@@ -63,12 +63,14 @@ class AccountInvoice(models.Model):
     @api.multi
     def action_set_all_wv_flag(self):
         for record in self:
+            record.charge_further = True
             for line in record.invoice_line_ids:
                 line.reimbursement = True
 
     @api.multi
     def action_unset_all_wv_flag(self):
         for record in self:
+            record.charge_further = False
             for line in record.invoice_line_ids:
                 line.reimbursement = False
 
diff --git a/ext/custom-addons/tz_dealer_discount/views/invoice_view.xml b/ext/custom-addons/tz_dealer_discount/views/invoice_view.xml
index c692bab2..25d2307c 100644
--- a/ext/custom-addons/tz_dealer_discount/views/invoice_view.xml
+++ b/ext/custom-addons/tz_dealer_discount/views/invoice_view.xml
@@ -2,7 +2,7 @@
 <odoo>
 
     <!-- Invoice View -->
-    <record id="invoice_form" model="ir.ui.view">
+    <record id="invoice_form_dd" model="ir.ui.view">
         <field name="name">account.invoice.form.dealer_discount</field>
         <field name="model">account.invoice</field>
         <field name="inherit_id" ref="account.invoice_form"/>
@@ -35,8 +35,8 @@
     </record>
 
     <!-- Bill View -->
-    <record id="invoice_supplier_form" model="ir.ui.view">
-        <field name="name">account.invoice.form.dealer_discount</field>
+    <record id="invoice_supplier_form_dd" model="ir.ui.view">
+        <field name="name">account.invoice.supplier.form.dealer_discount</field>
         <field name="model">account.invoice</field>
         <field name="inherit_id" ref="account.invoice_supplier_form"/>
         <field name="arch" type="xml">