diff --git a/ext/custom-addons/dp_custom/models/account.py b/ext/custom-addons/dp_custom/models/account.py
index d207044d..bc6bb375 100644
--- a/ext/custom-addons/dp_custom/models/account.py
+++ b/ext/custom-addons/dp_custom/models/account.py
@@ -83,6 +83,11 @@ class AccountInvoice(models.Model):
 
     layout_category_id = fields.Many2one('sale.layout_category', related='invoice_line_ids.layout_category_id', string='Section')
 
+    editor_id = fields.Many2one('res.users', string='Rechnungsbearbeiter',
+                                default=lambda self: self.env.user if self.env.user.editor_name else '',
+                                domain=[('editor_name', '!=', '')],track_visibility='onchange')
+
+
     @api.multi
     @api.onchange('partner_shipping_id')
     def onchange_partner_shipping_id(self):
diff --git a/ext/custom-addons/dp_custom/views/account_views.xml b/ext/custom-addons/dp_custom/views/account_views.xml
index 43511d3d..990bca1a 100644
--- a/ext/custom-addons/dp_custom/views/account_views.xml
+++ b/ext/custom-addons/dp_custom/views/account_views.xml
@@ -14,6 +14,10 @@
                 <button name="%(action_wizard_confirm_null_invoice)d" type="action" string="Validate" states="draft" class="oe_highlight o_invoice_validate" groups="account.group_account_invoice"/>
             </xpath>
 -->
+            <field name="payment_term_id" position="before">
+                <field name="editor_id" options="{'no_create':True}"/>
+            </field>
+
             <field name="layout_category_id"/>
             <xpath expr="//field[@name='invoice_line_ids']/tree//field[@name='name']" position="after">
                 <field name="intrastat_id" options="{'no_create':True}"/>
diff --git a/ext/custom-addons/dp_reports_account/reports/invoice.xml b/ext/custom-addons/dp_reports_account/reports/invoice.xml
index 613ae0d3..3a905619 100644
--- a/ext/custom-addons/dp_reports_account/reports/invoice.xml
+++ b/ext/custom-addons/dp_reports_account/reports/invoice.xml
@@ -59,7 +59,7 @@
                     <strong>
                         <span class="col-xs-2">Contact Person:</span>
                     </strong>
-                    <span class="col-xs-3" t-field="o.user_id"/>
+                    <span class="col-xs-3" t-field="o.editor_id"/>
                     <strong>
                         <span class="col-xs-2">Positions:</span>
                     </strong>
@@ -82,7 +82,7 @@
                     <strong>
                         <span class="col-xs-2">Phone:</span>
                     </strong>
-                    <span class="col-xs-3" t-field="o.user_id.phone"/>
+                    <span class="col-xs-3" t-field="o.editor_id.phone"/>
                     <strong>
                         <span class="col-xs-2">Description:</span>
                     </strong>