From 6d06ef4c29b242cf6cf6460b1479630ff554984d Mon Sep 17 00:00:00 2001
From: Ahmed Aly <ahmed.aly@datenpol.at>
Date: Wed, 13 Dec 2017 14:51:31 +0100
Subject: [PATCH] Fall 4421, 4435 und Feedbackpunkt 1211

---
 ext/custom-addons/dp_custom/models/product.py |  2 ++
 .../dp_custom/models/res_partner.py           |  1 -
 .../dp_custom/views/product_views.xml         | 24 ++++++++++---------
 .../dp_custom/views/sale_views.xml            | 22 +++++++++++++++++
 .../models/account.py                         |  2 +-
 setup/lib/config.py                           |  3 ++-
 6 files changed, 40 insertions(+), 14 deletions(-)

diff --git a/ext/custom-addons/dp_custom/models/product.py b/ext/custom-addons/dp_custom/models/product.py
index 8945ad25..d75839d2 100644
--- a/ext/custom-addons/dp_custom/models/product.py
+++ b/ext/custom-addons/dp_custom/models/product.py
@@ -56,6 +56,8 @@ class ProductTemplate(models.Model):
     assembly_line_ids = fields.Many2many(comodel_name='res.line', string='Produktionslinien')
     notes = fields.Text(string='Notizen')
     can_be_sold_unconfigured = fields.Boolean(string='Darf unkonfiguriert verkauft werden')
+    manufacturing_number = fields.Char(string='Herstellnummer')
+    product_color = fields.Char(string='Farbe')
 
     @api.model
     def create_product(self, vals):
diff --git a/ext/custom-addons/dp_custom/models/res_partner.py b/ext/custom-addons/dp_custom/models/res_partner.py
index 9fe17d87..d0544165 100644
--- a/ext/custom-addons/dp_custom/models/res_partner.py
+++ b/ext/custom-addons/dp_custom/models/res_partner.py
@@ -53,7 +53,6 @@ class Partner(models.Model):
     line_ids = fields.Many2many(comodel_name='res.line', string='Produktionslinien')
     portal_id = fields.Char(string='Portal-ID')
     partner_sector_id = fields.Many2one(comodel_name='res.partner.sector', string='Branche')
-    dat_vat_check = fields.Date(string='Datum letzte UID-Prüfung')
     active = fields.Boolean(track_visibility='onchange')
     portal_export_pending = fields.Boolean(string='Portal Export ausständig')
     date_vat_check = fields.Date(string='Datum der letzten UID-Prüfung')
diff --git a/ext/custom-addons/dp_custom/views/product_views.xml b/ext/custom-addons/dp_custom/views/product_views.xml
index 65e31e7e..d9b2fe68 100644
--- a/ext/custom-addons/dp_custom/views/product_views.xml
+++ b/ext/custom-addons/dp_custom/views/product_views.xml
@@ -17,6 +17,8 @@
                 <field name="xcat_id"/>
                 <field name="material_type_id"/>
                 <field name="assembly_line_ids" widget="many2many_tags" options="{'no_create': True}"/>
+                <field name="manufacturing_number"/>
+                <field name="product_color"/>
             </field>
             <xpath expr="//page[@name='general_information']/group" position="inside">
                 <group name="note" string="Notizen">
@@ -37,17 +39,6 @@
         </field>
     </record>
 
-    <record id="product_category_form_view" model="ir.ui.view">
-        <field name="name">product_category_form_view</field>
-        <field name="model">product.category</field>
-        <field name="inherit_id" ref="product.product_category_form_view"/>
-        <field name="arch" type="xml">
-            <field name="parent_id" position="after">
-                <field name="code" class="oe_inline"/>
-            </field>
-        </field>
-    </record>
-
     <record id="product_product_form_view" model="ir.ui.view">
         <field name="name">product_product_form_view</field>
         <field name="model">product.product</field>
@@ -59,6 +50,17 @@
         </field>
     </record>
 
+    <record id="product_category_form_view" model="ir.ui.view">
+        <field name="name">product_category_form_view</field>
+        <field name="model">product.category</field>
+        <field name="inherit_id" ref="product.product_category_form_view"/>
+        <field name="arch" type="xml">
+            <field name="parent_id" position="after">
+                <field name="code" class="oe_inline"/>
+            </field>
+        </field>
+    </record>
+
     <record id="product_xcategory_form_view" model="ir.ui.view">
         <field name="name">product_xcategory_form_view</field>
         <field name="model">product.xcategory</field>
diff --git a/ext/custom-addons/dp_custom/views/sale_views.xml b/ext/custom-addons/dp_custom/views/sale_views.xml
index 6975da91..416cbf1d 100644
--- a/ext/custom-addons/dp_custom/views/sale_views.xml
+++ b/ext/custom-addons/dp_custom/views/sale_views.xml
@@ -36,4 +36,26 @@
         </field>
     </record>
 
+    <record id="sale_order_quotation_tree_view" model="ir.ui.view">
+        <field name="name">sale_order_tree_view</field>
+        <field name="model">sale.order</field>
+        <field name="inherit_id" ref="sale.view_quotation_tree"/>
+        <field name="arch" type="xml">
+            <field name="partner_id" position="after">
+                <field name="partner_invoice_id"/>
+            </field>
+        </field>
+    </record>
+
+    <record id="sale_order_order_tree_view" model="ir.ui.view">
+        <field name="name">sale_order_tree_view</field>
+        <field name="model">sale.order</field>
+        <field name="inherit_id" ref="sale.view_order_tree"/>
+        <field name="arch" type="xml">
+            <field name="partner_id" position="after">
+                <field name="partner_invoice_id"/>
+            </field>
+        </field>
+    </record>
+
 </odoo>
diff --git a/ext/custom-addons/dp_intercompany_invoicing/models/account.py b/ext/custom-addons/dp_intercompany_invoicing/models/account.py
index a84fccb5..b90d0dd4 100644
--- a/ext/custom-addons/dp_intercompany_invoicing/models/account.py
+++ b/ext/custom-addons/dp_intercompany_invoicing/models/account.py
@@ -68,7 +68,7 @@ class AccountInvoice(models.Model):
         for record in self:
             if not record.charge_further:
                 raise ValidationError(_('Sie müssen mindestens eine Position mit WV markieren.'))
-            if record.charge_further and not record.reimburse_invoice_id:
+            if record.charge_further and not record.reimburse_invoice_id and record.state not in ['draft']:
                 intercompany_admin_id = record.company_id.admin_user_id
                 in_invoice_vals = record._prepare_er_invoice_data()
                 invoice_id = self.env['account.invoice'].sudo(intercompany_admin_id).create(
diff --git a/setup/lib/config.py b/setup/lib/config.py
index deb183aa..8f2aa6eb 100644
--- a/setup/lib/config.py
+++ b/setup/lib/config.py
@@ -134,7 +134,8 @@ class Config(object):
             'product_tax_multicompany_default',
             'contract',
             'dp_intercompany_invoicing',
-            'dp_retail_invoice'
+            'dp_retail_invoice',
+            'website_sale'
 
         ]