diff --git a/account_invoice_line_default_account/__init__.py b/account_invoice_line_default_account/__init__.py
index d453e0c23e0..c7f2ca6f957 100644
--- a/account_invoice_line_default_account/__init__.py
+++ b/account_invoice_line_default_account/__init__.py
@@ -6,5 +6,7 @@
 
 rportier@therp.nl
 http://www.therp.nl
+
+Ported to 7.0 on Sept. 17, 2013 by Jacques-Etienne Baudoux, BCIM (www.bcim.be)
 '''
-import model
+from . import model
diff --git a/account_invoice_line_default_account/__openerp__.py b/account_invoice_line_default_account/__openerp__.py
index b78051fc063..e585e66fb4d 100644
--- a/account_invoice_line_default_account/__openerp__.py
+++ b/account_invoice_line_default_account/__openerp__.py
@@ -20,7 +20,7 @@
 ##############################################################################
 {
     'name': 'Account Invoice Line Default Account',
-    'version': '6.1.r005',
+    'version': '7.0.r001',
     'depends': [
         'base',
         'account'
diff --git a/account_invoice_line_default_account/model/res_partner.py b/account_invoice_line_default_account/model/res_partner.py
index 00b9bcce076..7072ae98e67 100644
--- a/account_invoice_line_default_account/model/res_partner.py
+++ b/account_invoice_line_default_account/model/res_partner.py
@@ -19,14 +19,14 @@ class res_partner(orm.Model):
             'account.account',
             type='many2one',
             relation='account.account',
-            string='Default expense account',
+            string='Default Expense Account',
             view_load=True,
             domain='''[('user_type.report_type', '=', 'expense')]''',
-            help='Default counterpart account for purchases',
+            help='Default counterpart account for purchases on invoice lines',
             required=False),
         'auto_update_account_expense': fields.boolean(
-            'Save account selected on invoice',
-            help='When account selected on invoice, automatically save it'),
+            'Autosave account selected on invoice line',
+            help='When an account is selected on an invoice line, automatically assign it as default expense account'),
     }
     
     _defaults = {
diff --git a/account_invoice_line_default_account/view/res_partner_view.xml b/account_invoice_line_default_account/view/res_partner_view.xml
index 362982d84a7..139213f15b9 100644
--- a/account_invoice_line_default_account/view/res_partner_view.xml
+++ b/account_invoice_line_default_account/view/res_partner_view.xml
@@ -14,20 +14,16 @@
             <field
                 name="arch"
                 type="xml">
+                <field
+                    name="property_account_payable"
+                    position="after">
                     <field
-                        name="property_account_payable"
-                        position="after">
-                        <group
-                            colspan="2"
-                            col="4">
-                            <field
-                                name="property_account_expense"
-                                groups="account.group_account_invoice" />
-                            <field
-                                name="auto_update_account_expense"
-                                groups="account.group_account_invoice" />
-                        </group>
-                    </field>
+                        name="property_account_expense"
+                        groups="account.group_account_invoice" />
+                    <field
+                        name="auto_update_account_expense"
+                        groups="account.group_account_invoice" />
+                </field>
             </field>
         </record>
     </data>