Merge lp:~bcim/account-invoicing/7.0-account_invoice_line_default_account into lp:~account-core-editors/account-invoicing/7.0

[Jacques-Etienne Baudoux]

Extracted account_invoice_line_default_account module version 6.1 from account-financial-tools project
and ported to 7.0
I'm pushing this migrated module to this account-invoicing project as this module is for invoicing and is not a financial tool

[Joël Grand-Guillaume @ camptocamp (jgrandguillaume-c2c)]

Thanks for this port ! I'm also in favor of having this module in that project instead of financial-tools.

LGTM.

review: Approve (code review, no tests)

[Pedro Manuel Baeza (pedro.baeza)]

Hi, Jacques,

Thank you very much for your contribution. Let me make some suggestions:

- In depends section, please put only top-level dependencies (account), instead of base and account.
- In version number, 7.0 it's not needed because it's added automatically by core, so please use notation x.y where x is for major revisions (db layout changes and great refactorizations), and y for minor revisions (bug fixing and so on). If there is no clear version number, let's start with 1.0.
- You can put your name in a new 'contributors' key in __openerp__.py according agreement on community.
- 'demo_xml' key is still accepted on v7, but it's better to put only 'demo'.
- Please put pot file for making translations to other languages.

On functional side, all works as expected, except one little thing:

- Fields in partner screen are not hidden when partner is not supplier.

Regards.

review: Needs Fixing (code review and test)

[Ronald Portier (Therp) (rportier1962)]

Just on the version numbering.

It is needed the way it is. As it is the ONLY way of knowing that this module was adapted to and tested on the specified version.

The core action of automatically adding a version number is a completely futile exercise, as it will be 7.0 on for all modules on an 7.0 installation and all 6.1 on a 6.1 installation etc.

For the rest I think Pedro made good suggestions.

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

On 09/18/2013 02:28 PM, Ronald Portier (Therp) wrote:
> Just on the version numbering.
>
> It is needed the way it is. As it is the ONLY way of knowing that this module was adapted to and tested on the specified version.
>
If a module is in a 7.0 branch and has the 'installable' flag to True,
it means that it is adapted and tested on the branch's version.

> The core action of automatically adding a version number is a completely futile exercise, as it will be 7.0 on for all modules on an 7.0 installation and all 6.1 on a 6.1 installation etc.
>

I don't agree with that. "Bumping" the version has a - not futile ̣-
meaning. It, obviously, means that a new version is available, and when
a major version is upgraded, it warns about possible issues like the
need to upgrade the schema of the database. That's even used by the new
OpenERP Apps to inform the users that a new version of their module is
available.

An example in the official addons: the version of the stock module
displayed in OpenERP is: 7.0.1.1.1. In the manifest, the version is 1.1.1.

--
Guewen Baconnier
Business Solutions Software Developer

Camptocamp SA
PSE A, CH-1015 Lausanne
Phone: [phone]
Office: [phone]
http://www.camptocamp.com/

[Stefan Rijnhart (Opener) (stefan-opener)]

My two cents on the version number: OpenERP internally disregards the major release in the version number. See adapt_version() in openerp-server/openerp/modules/module.py.

So having 7.0.1.1 in the manifest should be completely equivalent to having 1.1. AS it does not harm, I think it is informative for the version in the manifest to contain the major release version.

[Stefan Rijnhart (Opener) (stefan-opener)]

Having that said, I think 7.0.r001 does not conform to the standard which has been proposed here: https://code.launchpad.net/~openerp-community/openobject-doc/7.0-community-review/+merge/186295, instead it should be something like 7.0.1.0.

[lp:~bcim/account-invoicing/7.0-account_invoice_line_default_account]

25. By Jacques-Etienne Baudoux on 2013-09-18

[FIX] __openerp__ file

26. By Jacques-Etienne Baudoux on 2013-09-18

[ADD] translations fr/nl

[Jacques-Etienne Baudoux (jbaudoux)]

Thanks for all your comments

> Fields in partner screen are not hidden when partner is not supplier.
I disagree with that as no fields in the accounting tab are displayed/hidden based on the customer/supplier.

For the version, I'll put "7.0.1.0"

> You can put your name in a new 'contributors' key in __openerp__.py according agreement on community.
Can you point me out where is this documented? I didn't found any example nor any mention in the contribute documentation.

[Pedro Manuel Baeza (pedro.baeza)]

Hi, Jacques,

>I disagree with that as no fields in the accounting tab are displayed/hidden based on the customer/supplier.

This is why I told you that, because it would be desirable to hide "property_account_expense" and "auto_update_account_expense" fields when partner is not a supplier, because that fields don't apply. This can be done with attributes property testing "customer" field.

>Can you point me out where is this documented? I didn't found any example nor any mention in the contribute documentation.

Indeed, this is not documented yet (I mentioned about the necessity of contribution/author documentation in the draft pad, but no work has been done in this way). However, there are some comments in MPs that points to this and it's also mentioned in new apps website thread on the community list. The goal for this kind of representation is to get visibility of contributions on the app website in the future, but it's not mandatory.

Regards

[lp:~bcim/account-invoicing/7.0-account_invoice_line_default_account]

27. By Jacques-Etienne Baudoux on 2013-09-27

[ADD]account_invoice_line_default_account: default income account on partner similar to default expense account

28. By Jacques-Etienne Baudoux on 2013-11-20

[FIX] account_invoice_line_default_account: Adding the partner in the context of invoice line of customer invoice. It's there in standard in supplier invoices but not in customer invoices and it's required by this module

[Maxime Chambreuil (http://www.savoirfairelinux.com) (max3903)]

l282,283: can you add "from . import..." ?

review: Needs Fixing (code review)

[lp:~bcim/account-invoicing/7.0-account_invoice_line_default_account]

29. By Jacques-Etienne Baudoux on 2014-02-14

[FIX] from . import + contributors

[Pedro Manuel Baeza (pedro.baeza)]

This project is now hosted on https://github.com/OCA/account-invoicing. Please move your proposal there. This guide may help you https://github.com/OCA/maintainers-tools/wiki/How-to-move-a-Merge-Proposal-to-GitHub

review: Needs Resubmitting

Unmerged revisions

29. By Jacques-Etienne Baudoux on 2014-02-14

[FIX] from . import + contributors

28. By Jacques-Etienne Baudoux on 2013-11-20

[FIX] account_invoice_line_default_account: Adding the partner in the context of invoice line of customer invoice. It's there in standard in supplier invoices but not in customer invoices and it's required by this module

27. By Jacques-Etienne Baudoux on 2013-09-27

[ADD]account_invoice_line_default_account: default income account on partner similar to default expense account

26. By Jacques-Etienne Baudoux on 2013-09-18

[ADD] translations fr/nl

25. By Jacques-Etienne Baudoux on 2013-09-18

[FIX] __openerp__ file

24. By Jacques-Etienne Baudoux on 2013-09-17

[IMP] look and feel

23. By Jacques-Etienne Baudoux on 2013-09-17

[FIX] pep8

22. By Jacques-Etienne Baudoux on 2013-09-17

[MIG] ported module account_invoice_line_default_account to 7.0

21. By Jacques-Etienne Baudoux on 2013-09-17

[MRG] Extracted account_invoice_line_default_account module version 6.1 from account-financial-tools project

=== added directory 'account_invoice_line_default_account'
=== added file 'account_invoice_line_default_account/__init__.py'
--- account_invoice_line_default_account/__init__.py	1970-01-01 00:00:00 +0000
+++ account_invoice_line_default_account/__init__.py	2014-02-14 09:13:42 +0000
@@ -0,0 +1,12 @@
+# -*- coding: UTF-8 -*-
+'''
+Created on 30 jan. 2013
+
+@author: Ronald Portier, Therp
+
[e-mail]
+http://www.therp.nl
+
+Ported to 7.0 on Sept. 17, 2013 by Jacques-Etienne Baudoux, BCIM (www.bcim.be)
+'''
+from . import model

=== added file 'account_invoice_line_default_account/__openerp__.py'
--- account_invoice_line_default_account/__openerp__.py	1970-01-01 00:00:00 +0000
+++ account_invoice_line_default_account/__openerp__.py	2014-02-14 09:13:42 +0000
@@ -0,0 +1,51 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    This module copyright (C) 2012 Therp BV (<http://therp.nl>).
+#    This module copyright (C) 2013 BCIM SPRL (<http://www.bcim.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+{
+    'name': 'Account Invoice Line Default Account',
+    'version': '7.0.1.0',
+    'depends': [
+        'account'
+    ],
+    'author': 'Therp BV',
+    'contributors': ['Jacques-Etienne Baudoux <[e-mail]>'],
+    'category': 'Accounting',
+    'description': '''When entering sales or purchase invoices directly, the
+user has to select an account which will be used as a counterpart in the
+generated move lines. Each supplier will mostly be linked to one account. For
+instance when ordering paper from a supplier that deals in paper, the
+counterpart account will mostly be something like 'office expenses'.  The sme
+principle has been applied for customers. This module will add a default
+counterpart expense and income account to a partner, comparable to the similiar
+field in product. When an invoice is entered, withouth a product, the field
+from partner will be used as default. Also when an account is entered on an
+invoice line (not automatically selected for a product), the account will be
+automatically linked to the partner as default expense or income account, unless
+explicitly disabled in the partner record.''',
+    'data': [
+        'view/res_partner.xml',
+        'view/account_invoice.xml',
+    ],
+    'demo': [],
+    'test': [],
+    'installable': True,
+    'active': False,
+}

=== added directory 'account_invoice_line_default_account/i18n'
=== added file 'account_invoice_line_default_account/i18n/account_invoice_line_default_account.pot'
--- account_invoice_line_default_account/i18n/account_invoice_line_default_account.pot	1970-01-01 00:00:00 +0000
+++ account_invoice_line_default_account/i18n/account_invoice_line_default_account.pot	2014-02-14 09:13:42 +0000
@@ -0,0 +1,59 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* account_invoice_line_default_account
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 7.saas~1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-09-18 16:01+0000\n"
+"PO-Revision-Date: 2013-09-18 16:01+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: account_invoice_line_default_account
+#: field:res.partner,property_account_expense:0
+msgid "Default Expense Account"
+msgstr ""
+
+#. module: account_invoice_line_default_account
+#: help:res.partner,property_account_expense:0
+msgid "Default counterpart account for purchases on invoice lines"
+msgstr ""
+
+#. module: account_invoice_line_default_account
+#: help:res.partner,auto_update_account_expense:0
+msgid "When an account is selected on an invoice line, automatically assign it as default expense account"
+msgstr ""
+
+#. module: account_invoice_line_default_account
+#: code:addons/account_invoice_line_default_account/model/account_invoice_line.py:27
+#: code:addons/account_invoice_line_default_account/model/account_invoice_line.py:47
+#, python-format
+msgid "No object created for partner %d"
+msgstr ""
+
+#. module: account_invoice_line_default_account
+#: model:ir.model,name:account_invoice_line_default_account.model_account_invoice_line
+msgid "Invoice Line"
+msgstr ""
+
+#. module: account_invoice_line_default_account
+#: view:res.partner:0
+msgid "autosave from invoice line"
+msgstr ""
+
+#. module: account_invoice_line_default_account
+#: field:res.partner,auto_update_account_expense:0
+msgid "Autosave Selection on Invoice Line"
+msgstr ""
+
+#. module: account_invoice_line_default_account
+#: model:ir.model,name:account_invoice_line_default_account.model_res_partner
+msgid "Partner"
+msgstr ""
+

=== added file 'account_invoice_line_default_account/i18n/fr.po'
--- account_invoice_line_default_account/i18n/fr.po	1970-01-01 00:00:00 +0000
+++ account_invoice_line_default_account/i18n/fr.po	2014-02-14 09:13:42 +0000
@@ -0,0 +1,59 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* account_invoice_line_default_account
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 7.saas~1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-09-18 16:01+0000\n"
+"PO-Revision-Date: 2013-09-18 16:01+0000\n"
+"Last-Translator: Jacques-Etienne Baudoux <[e-mail]>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: account_invoice_line_default_account
+#: field:res.partner,property_account_expense:0
+msgid "Default Expense Account"
+msgstr "Compte de charge par défaut"
+
+#. module: account_invoice_line_default_account
+#: help:res.partner,property_account_expense:0
+msgid "Default counterpart account for purchases on invoice lines"
+msgstr "Compte de contrepartie par défaut pour les lignes de factures d'achat"
+
+#. module: account_invoice_line_default_account
+#: help:res.partner,auto_update_account_expense:0
+msgid "When an account is selected on an invoice line, automatically assign it as default expense account"
+msgstr "Lorsqu'un compte est sélectionné sur une ligne de facture, l'assigner automatiquement comme compte de charge par défaut"
+
+#. module: account_invoice_line_default_account
+#: code:addons/account_invoice_line_default_account/model/account_invoice_line.py:27
+#: code:addons/account_invoice_line_default_account/model/account_invoice_line.py:47
+#, python-format
+msgid "No object created for partner %d"
+msgstr ""
+
+#. module: account_invoice_line_default_account
+#: model:ir.model,name:account_invoice_line_default_account.model_account_invoice_line
+msgid "Invoice Line"
+msgstr ""
+
+#. module: account_invoice_line_default_account
+#: view:res.partner:0
+msgid "autosave from invoice line"
+msgstr "sauvegarde automatique"
+
+#. module: account_invoice_line_default_account
+#: field:res.partner,auto_update_account_expense:0
+msgid "Autosave Selection on Invoice Line"
+msgstr ""
+
+#. module: account_invoice_line_default_account
+#: model:ir.model,name:account_invoice_line_default_account.model_res_partner
+msgid "Partner"
+msgstr ""
+

=== added file 'account_invoice_line_default_account/i18n/nl.po'
--- account_invoice_line_default_account/i18n/nl.po	1970-01-01 00:00:00 +0000
+++ account_invoice_line_default_account/i18n/nl.po	2014-02-14 09:13:42 +0000
@@ -0,0 +1,59 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* account_invoice_line_default_account
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 7.saas~1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-09-18 16:01+0000\n"
+"PO-Revision-Date: 2013-09-18 16:01+0000\n"
+"Last-Translator: Jacques-Etienne Baudoux <[e-mail]>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: account_invoice_line_default_account
+#: field:res.partner,property_account_expense:0
+msgid "Default Expense Account"
+msgstr "Standaard kostenrekening"
+
+#. module: account_invoice_line_default_account
+#: help:res.partner,property_account_expense:0
+msgid "Default counterpart account for purchases on invoice lines"
+msgstr "Standaard tegenrekening voor inkoop factuur lijnen"
+
+#. module: account_invoice_line_default_account
+#: help:res.partner,auto_update_account_expense:0
+msgid "When an account is selected on an invoice line, automatically assign it as default expense account"
+msgstr "Wanneer een rekening op een factuur lijn is geselecteerd, automatisch toewijzen als standaard kostenrekening"
+
+#. module: account_invoice_line_default_account
+#: code:addons/account_invoice_line_default_account/model/account_invoice_line.py:27
+#: code:addons/account_invoice_line_default_account/model/account_invoice_line.py:47
+#, python-format
+msgid "No object created for partner %d"
+msgstr ""
+
+#. module: account_invoice_line_default_account
+#: model:ir.model,name:account_invoice_line_default_account.model_account_invoice_line
+msgid "Invoice Line"
+msgstr ""
+
+#. module: account_invoice_line_default_account
+#: view:res.partner:0
+msgid "autosave from invoice line"
+msgstr "automatisch bewaren"
+
+#. module: account_invoice_line_default_account
+#: field:res.partner,auto_update_account_expense:0
+msgid "Autosave Selection on Invoice Line"
+msgstr ""
+
+#. module: account_invoice_line_default_account
+#: model:ir.model,name:account_invoice_line_default_account.model_res_partner
+msgid "Partner"
+msgstr ""
+

=== added directory 'account_invoice_line_default_account/model'
=== added file 'account_invoice_line_default_account/model/__init__.py'
--- account_invoice_line_default_account/model/__init__.py	1970-01-01 00:00:00 +0000
+++ account_invoice_line_default_account/model/__init__.py	2014-02-14 09:13:42 +0000
@@ -0,0 +1,4 @@
+# -*- coding: UTF-8 -*-
+
+from . import res_partner
+from . import account_invoice_line

=== added file 'account_invoice_line_default_account/model/account_invoice_line.py'
--- account_invoice_line_default_account/model/account_invoice_line.py	1970-01-01 00:00:00 +0000
+++ account_invoice_line_default_account/model/account_invoice_line.py	2014-02-14 09:13:42 +0000
@@ -0,0 +1,67 @@
+# -*- coding: UTF-8 -*-
+'''
+Created on 30 jan. 2013
+
+@author: Ronald Portier, Therp
+@contributor: Jacques-Etienne Baudoux, BCIM
+'''
+
+from openerp.osv import orm
+from openerp.tools.translate import _
+
+
+class account_invoice_line(orm.Model):
+    _inherit = 'account.invoice.line'
+
+    def _account_id_default(self, cr, uid, context=None):
+        if context is None:
+            context = {}
+        partner_id = context.get('partner_id')
+        if not partner_id:
+            return False
+        assert isinstance(partner_id, (int, long)), (
+            _('No valid id for context partner_id %d') % partner_id)
+        invoice_type = context.get('type')
+        partner_model = self.pool.get('res.partner')
+        if invoice_type in ['in_invoice', 'in_refund']:
+            partner = partner_model.read(cr, uid, partner_id,
+                ['property_account_expense'], context=context)
+            return partner['property_account_expense']
+        elif invoice_type in ['out_invoice', 'out_refund']:
+            partner = partner_model.read(cr, uid, partner_id,
+                ['property_account_income'], context=context)
+            return partner['property_account_income']
+        return False
+
+    _defaults = {
+        'account_id': _account_id_default,
+    }
+
+    def onchange_account_id(
+            self, cr, uid, ids, product_id, partner_id, inv_type,
+            fposition_id, account_id, context=None):
+        if account_id and partner_id and not product_id:
+            # We have a manually entered account_id (no product_id, so the
+            # account_id is not the result of a product selection).
+            # Store this account_id as future default in res_partner.
+            partner_model = self.pool.get('res.partner')
+            partner = partner_model.read(cr, uid, partner_id,
+                ['auto_update_account_expense', 'property_account_expense',
+                 'auto_update_account_income', 'property_account_income'],
+                context=context)
+            vals = {}
+            if (inv_type in ['in_invoice', 'in_refund'] and
+              partner['auto_update_account_expense']):
+                if account_id != partner['property_account_expense']:
+                    # only write when something really changed
+                    vals.update({'property_account_expense': account_id})
+            elif (inv_type in ['out_invoice', 'out_refund'] and
+              partner['auto_update_account_income']):
+                if account_id != partner['property_account_income']:
+                    # only write when something really changed
+                    vals.update({'property_account_income': account_id})
+            if vals:
+                partner_model.write(cr, uid, partner_id, vals, context=context)
+        return super(account_invoice_line, self).onchange_account_id(
+                cr, uid, ids, product_id, partner_id, inv_type,
+                fposition_id, account_id)

=== added file 'account_invoice_line_default_account/model/res_partner.py'
--- account_invoice_line_default_account/model/res_partner.py	1970-01-01 00:00:00 +0000
+++ account_invoice_line_default_account/model/res_partner.py	2014-02-14 09:13:42 +0000
@@ -0,0 +1,48 @@
+# -*- coding: UTF-8 -*-
+'''
+Created on 30 jan. 2013
+
+@author: Ronald Portier, Therp
+@contributor: Jacques-Etienne Baudoux, BCIM
+'''
+
+from openerp.osv import orm
+from openerp.osv import fields
+
+
+class res_partner(orm.Model):
+    _inherit = 'res.partner'
+
+    _columns = {
+        'property_account_income': fields.property(
+            'account.account',
+            type='many2one',
+            relation='account.account',
+            string='Default Income Account',
+            view_load=True,
+            domain='''[('user_type.report_type', '=', 'income')]''',
+            help='Default counterpart account for sales on invoice lines',
+            required=False),
+        'auto_update_account_income': fields.boolean(
+            'Autosave Selection on Invoice Line',
+            help='When an account is selected on an invoice line, '
+                 'automatically assign it as default income account'),
+        'property_account_expense': fields.property(
+            'account.account',
+            type='many2one',
+            relation='account.account',
+            string='Default Expense Account',
+            view_load=True,
+            domain='''[('user_type.report_type', '=', 'expense')]''',
+            help='Default counterpart account for purchases on invoice lines',
+            required=False),
+        'auto_update_account_expense': fields.boolean(
+            'Autosave Selection on Invoice Line',
+            help='When an account is selected on an invoice line, '
+                 'automatically assign it as default expense account'),
+    }
+
+    _defaults = {
+        'auto_update_account_income': True,
+        'auto_update_account_expense': True,
+    }

=== added directory 'account_invoice_line_default_account/view'
=== added file 'account_invoice_line_default_account/view/account_invoice.xml'
--- account_invoice_line_default_account/view/account_invoice.xml	1970-01-01 00:00:00 +0000
+++ account_invoice_line_default_account/view/account_invoice.xml	2014-02-14 09:13:42 +0000
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+<data>
+    <record id="invoice_form" model="ir.ui.view">
+        <field name="name">account.invoice.form.inherit</field>
+        <field name="model">account.invoice</field>
+        <field name="type">form</field>
+        <field name="inherit_id" ref="account.invoice_form" />
+        <field name="arch" type="xml">
+            <field name="invoice_line" position="attributes">
+                <attribute name="context">{'partner_id': partner_id, 'type': type}</attribute>
+            </field>
+        </field>
+    </record>
+</data>
+</openerp>

=== added file 'account_invoice_line_default_account/view/res_partner.xml'
--- account_invoice_line_default_account/view/res_partner.xml	1970-01-01 00:00:00 +0000
+++ account_invoice_line_default_account/view/res_partner.xml	2014-02-14 09:13:42 +0000
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <record
+            id="view_partner_expense_property_form"
+            model="ir.ui.view">
+            <field name="name">res.partner.property.form.inherit</field>
+            <field name="model">res.partner</field>
+            <field name="type">form</field>
+            <field name="priority">2</field>
+            <field
+                name="inherit_id"
+                ref="account.view_partner_property_form" />
+            <field
+                name="arch"
+                type="xml">
+                <field
+                    name="property_account_receivable"
+                    position="after">
+                    <label for="property_account_income" />
+                    <div>
+                        <field
+                            name="property_account_income"
+                            groups="account.group_account_invoice" />
+                        <div style=" white-space: nowrap; ">
+                            <field
+                                name="auto_update_account_income"
+                                nolabel="1"
+                                groups="account.group_account_invoice" />
+                            <label for="auto_update_account_income" string="autosave from invoice line"/>
+                        </div>
+                    </div>
+                </field>
+                <field
+                    name="property_account_payable"
+                    position="after">
+                    <label for="property_account_expense" />
+                    <div>
+                        <field
+                            name="property_account_expense"
+                            groups="account.group_account_invoice" />
+                        <div style=" white-space: nowrap; ">
+                            <field
+                                name="auto_update_account_expense"
+                                nolabel="1"
+                                groups="account.group_account_invoice" />
+                            <label for="auto_update_account_expense" string="autosave from invoice line"/>
+                        </div>
+                    </div>
+                </field>
+            </field>
+        </record>
+    </data>
+</openerp>