diff --git a/dev/pylint/pylintrc b/dev/pylint/pylintrc
deleted file mode 100644
index 815832d6..00000000
--- a/dev/pylint/pylintrc
+++ /dev/null
@@ -1,3 +0,0 @@
-[MASTER]
-# Specify a configuration file.
-rcfile=/home/aaly/gitrepos/dp-int/pylintrc
diff --git a/ext/custom-addons/dp_custom/__manifest__.py b/ext/custom-addons/dp_custom/__manifest__.py
index 8cbe5ebb..e3b580ca 100644
--- a/ext/custom-addons/dp_custom/__manifest__.py
+++ b/ext/custom-addons/dp_custom/__manifest__.py
@@ -33,7 +33,8 @@
         'partner_second_lastname',
         'account',
         'sale_stock',
-        'report_intrastat'
+        'report_intrastat',
+        'dp_intercompany_invoicing',
     ],
     'data': [
         'data/dp_custom_data.xml',
diff --git a/ext/custom-addons/dp_custom/data/glaser_company_data.xml b/ext/custom-addons/dp_custom/data/glaser_company_data.xml
index dd427ae2..a29c13c1 100644
--- a/ext/custom-addons/dp_custom/data/glaser_company_data.xml
+++ b/ext/custom-addons/dp_custom/data/glaser_company_data.xml
@@ -40,6 +40,10 @@
                (4,ref('queue_job.group_queue_job_manager'))]"/>
     </record>
 
+    <record id="glaser_and_co_company" model="res.company">
+        <field name="admin_user_id" eval="ref('glaser_admin_user')"/>
+    </record>
+
     <!--<function-->
     <!--id="set_company_favicon"-->
     <!--model="res.company"-->
diff --git a/ext/custom-addons/dp_custom/data/tz_austria_company_data.xml b/ext/custom-addons/dp_custom/data/tz_austria_company_data.xml
index a6c8a93f..a6d7b76a 100644
--- a/ext/custom-addons/dp_custom/data/tz_austria_company_data.xml
+++ b/ext/custom-addons/dp_custom/data/tz_austria_company_data.xml
@@ -16,6 +16,12 @@
                (4,ref('queue_job.group_queue_job_manager'))]"/>
     </record>
 
+    <record id="base.main_company" model="res.company">
+        <field name="admin_user_id" eval="ref('tz_admin_user')"/>
+        <field name="inter_company_supplier_id" eval="ref('dp_custom.glaser_and_co_company')"/>
+        <field name="percentage_billing">70.00</field>
+    </record>
+
     <function id="set_company_customer" model="res.company" name="set_company_customer">
         <value eval="[ref('base.main_company')]"/>
     </function>
diff --git a/ext/custom-addons/dp_custom/models/res_partner.py b/ext/custom-addons/dp_custom/models/res_partner.py
index f7193201..9fe17d87 100644
--- a/ext/custom-addons/dp_custom/models/res_partner.py
+++ b/ext/custom-addons/dp_custom/models/res_partner.py
@@ -81,7 +81,7 @@ class Partner(models.Model):
             if not partner.is_company:
                 raise ValidationError(
                     _("Der Partner mit der Internen Referenz '%s' ist kein Unternehmen" % vals['ref']))
-            self.write(vals)
+            partner.write(vals)
         else:
             if not vals.get('is_company', False):
                 vals['is_company'] = True
@@ -210,7 +210,7 @@ class PartnerSector(models.Model):
     _description = 'Branche'
     _order = 'id,name'
 
-    name = fields.Char(string='Beteichnung', required=True)
+    name = fields.Char(string='Bezeichnung', required=True)
     sequence = fields.Integer(string='Sequenz')
 
     _sql_constraints = [
diff --git a/ext/custom-addons/dp_custom/models/sale.py b/ext/custom-addons/dp_custom/models/sale.py
index 256e4884..a0734926 100644
--- a/ext/custom-addons/dp_custom/models/sale.py
+++ b/ext/custom-addons/dp_custom/models/sale.py
@@ -38,9 +38,18 @@ class SaleOrder(models.Model):
     assembled = fields.Boolean(string='Zusammengebaut')
     line_id = fields.Many2one(comodel_name='res.line', string='Produktionslinie')
     assembly_state = fields.Selection(ASSEMBLY_STATES, string="Status PG")
+    quote_name = fields.Char(compute='_compute_quote_name')
     internal_notes = fields.Text()
     assembly_notes = fields.Text()
 
+    @api.multi
+    def _compute_quote_name(self):
+        for record in self:
+            if record.state in ['draft', 'sent']:
+                record.quote_name = record.name.replace('ATOC', 'ATOF')
+            else:
+                record.quote_name = record.name
+
     @api.model
     def pg_get_orders(self, line, state, limit):
         line_id = self.env['res.line'].search([('name', '=', line)])
diff --git a/ext/custom-addons/dp_retail_invoice/models/sale.py b/ext/custom-addons/dp_retail_invoice/models/sale.py
index 5545cf96..aa0bcbe4 100644
--- a/ext/custom-addons/dp_retail_invoice/models/sale.py
+++ b/ext/custom-addons/dp_retail_invoice/models/sale.py
@@ -41,5 +41,5 @@ class SaleOrderLine(models.Model):
                 'order_id': self.order_id.id,
                 'name': self.order_id.name
             })
-            res.update({'layout_category_id': layout_category_id.id})
+        res.update({'layout_category_id': layout_category_id.id})
         return res