Merge lp:~agilebg/account-invoicing/imp_account_invoice_force_number_7 into lp:~account-core-editors/account-invoicing/7.0

[Alex Comba - Agile BG]

This branch contains some improvements/fixings concerning the module account_invoice_force_number, in particular:

# got module installable
# fixed wrong xpath values

[Leonardo Pistone (lepistone)]

Thanks Alex.

Could you please pep8 a couple things, like the space before the colon and the long line?

review: Needs Fixing

[lp:~agilebg/account-invoicing/imp_account_invoice_force_number_7]

23. By Alex Comba - Agile BG on 2013-08-28

[FIX] PEP8 style

24. By Alex Comba - Agile BG on 2013-08-28

[FIX] PEP8 style: lines too long

[Alex Comba - Agile BG (tafaru)]

Thanks Leonardo,

now it should be more PEP8 compliant ;)

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

LGTM

review: Approve (code review, no test)

[Lorenzo Battistini (elbati)]

review: Approve

=== removed file 'account_invoice_force_number/AUTHORS.txt'
--- account_invoice_force_number/AUTHORS.txt	2012-11-16 23:29:22 +0000
+++ account_invoice_force_number/AUTHORS.txt	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-Lorenzo Battistini <[e-mail]>

=== modified file 'account_invoice_force_number/__init__.py'
--- account_invoice_force_number/__init__.py	2012-11-16 23:34:54 +0000
+++ account_invoice_force_number/__init__.py	2013-08-28 14:17:58 +0000
@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
-#    Copyright (C) 2011 Agile Business Group sagl (<http://www.agilebg.com>)
+#
 #    Copyright (C) 2011 Domsense srl (<http://www.domsense.com>)
-#    All Rights Reserved
+#    Copyright (C) 2011-2013 Agile Business Group sagl
+#	 (<http://www.agilebg.com>)
 #
 #    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

=== modified file 'account_invoice_force_number/__openerp__.py'
--- account_invoice_force_number/__openerp__.py	2013-04-03 14:37:57 +0000
+++ account_invoice_force_number/__openerp__.py	2013-08-28 14:17:58 +0000
@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
-#    Copyright (C) 2011 Agile Business Group sagl (<http://www.agilebg.com>)
+#
 #    Copyright (C) 2011 Domsense srl (<http://www.domsense.com>)
-#    All Rights Reserved
+#    Copyright (C) 2011-2013 Agile Business Group sagl
+#    (<http://www.agilebg.com>)
 #
 #    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
@@ -24,17 +24,22 @@
     'version': '0.1',
     'category': 'Generic Modules/Accounting',
     'description': """
-    This module allows to force the invoice numbering.
-    It displays the internal_number field. If user fills that field, the typed value will be used as invoice (and move) number. Otherwise, the next sequence number will be retrieved and saved.
-    So, the new field has to be used when user doesn't want to use the default invoice numbering for a specific invoice.
+This module allows to force the invoice numbering.
+It displays the internal_number field. If user fills that field, the typed
+value will be used as invoice (and move) number.
+Otherwise, the next sequence number will be retrieved and saved.
+So, the new field has to be used when user doesn't want to use the default
+invoice numbering for a specific invoice.
     """,
     'author': 'Agile Business Group',
     'website': 'http://www.agilebg.com',
     'license': 'AGPL-3',
-    "depends" : ['account'],
-    "init_xml" : [],
-    "update_xml" : ['invoice_view.xml'],
-    "demo_xml" : [],
+    "depends": [
+        'account'
+    ],
+    "data": [
+        'invoice_view.xml'
+    ],
     "active": False,
-    "installable": False
+    "installable": True
 }

=== modified file 'account_invoice_force_number/invoice.py'
--- account_invoice_force_number/invoice.py	2012-11-16 23:34:54 +0000
+++ account_invoice_force_number/invoice.py	2013-08-28 14:17:58 +0000
@@ -1,9 +1,11 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
-#    Copyright (C) 2011 Agile Business Group sagl (<http://www.agilebg.com>)
+#
 #    Copyright (C) 2011 Domsense srl (<http://www.domsense.com>)
-#    All Rights Reserved
+#    Copyright (C) 2011-2013 Agile Business Group sagl
+#    (<http://www.agilebg.com>)
+#    @author Lorenzo Battistini <[e-mail]>
+#    Ported to OpenERP 7.0 by Alex Comba <[e-mail]>
 #
 #    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
@@ -20,11 +22,13 @@
 #
 ##############################################################################
 
-from osv import fields, osv
-
-class account_invoice(osv.osv):
+from openerp.osv import fields, orm
+
+
+class account_invoice(orm.Model):
     _inherit = "account.invoice"
     _columns = {
-        'internal_number': fields.char('Invoice Number', size=32, readonly=True, states={'draft':[('readonly',False)]}),
-        }
-account_invoice()
+        'internal_number': fields.char(
+            'Invoice Number', size=32, readonly=True,
+            states={'draft': [('readonly', False)]}),
+    }

=== modified file 'account_invoice_force_number/invoice_view.xml'
--- account_invoice_force_number/invoice_view.xml	2013-02-21 18:25:56 +0000
+++ account_invoice_force_number/invoice_view.xml	2013-08-28 14:17:58 +0000
@@ -6,9 +6,8 @@
             <field name="name">account.invoice.form.int_number</field>
             <field name="model">account.invoice</field>
             <field name="inherit_id" ref="account.invoice_form"/>
-            <field name="type">form</field>
             <field name="arch" type="xml">
-                <xpath expr="/form/group/field[@name='fiscal_position']" position="after">
+                <xpath expr="//sheet/group/group/field[@name='fiscal_position']" position="after">
                     <field name="internal_number" attrs="{'invisible':[('state','!=','draft')]}" string="Force Number" help="Force invoice number. Use this field if you don't want to use the default numbering"/>
                 </xpath>
             </field>
@@ -18,9 +17,8 @@
             <field name="name">account.invoice.supplier.form.int_number</field>
             <field name="model">account.invoice</field>
             <field name="inherit_id" ref="account.invoice_supplier_form"/>
-            <field name="type">form</field>
             <field name="arch" type="xml">
-                <xpath expr="/form/group/field[@name='fiscal_position']" position="after">
+                <xpath expr="//sheet/group/group/field[@name='fiscal_position']" position="after">
                     <field name="internal_number" attrs="{'invisible':[('state','!=','draft')]}" string="Force Number" help="Force invoice number. Use this field if you don't want to use the default numbering"/>
                 </xpath>
             </field>