Merge lp:~scigghia/account-invoicing/adding_account_invoice_shipping_address_7 into lp:~account-core-editors/account-invoicing/7.0

[Andrea Cometa]

This Addon adds a shipping address field to the invoice, also fill it in sale invoicing

[Lorenzo Battistini (elbati)]

If this is a porting of
http://bazaar.launchpad.net/~domsense/domsense-agilebg-addons/6.1/files/head:/account_invoice_shipping_address/
original copyright and authors should be kept

review: Needs Information

[Andrea Cometa (scigghia)]

ok, but sale.py now use the _prepare_invoice instead of _make_invoice

[lp:~scigghia/account-invoicing/adding_account_invoice_shipping_address_7]

21. By Andrea Cometa on 2013-09-04

account_invoice_shipping_address (C)

22. By Andrea Cometa on 2013-09-04

[add] language files

[Andrea Cometa (scigghia)]

review: Approve

[Lorenzo Battistini (elbati)]

line 70: replace 'Andrea Cometa' with 'Andrea Cometa, Agile Business Group'
line 71: description should be ENG only. ITA translation should be done by it.po
line 74: remove init_xml
line 75: replace update_xml with data
line 78: replace demo_xml with demo
line 177 and 238: replace osv.osv with orm.Model
line 182: too long
line 185 and 249: remove
line 199: <field name="type">form</field>

Thanks!

review: Needs Fixing

[lp:~scigghia/account-invoicing/adding_account_invoice_shipping_address_7]

23. By Andrea Cometa on 2013-09-11

[fix] as proposed by eLBati

[Leonardo Pistone (lepistone)]

Andrea,
I would fix refactor a bit to make flake8 pass. I think everything except the first two lines in __init__.py can be fixed (those two are actually correct).

Thanks!

Here is the output:

./__init__.py:23:1: F401 'invoice' imported but unused
./__init__.py:24:1: F401 'sale' imported but unused
./__openerp__.py:30:80: E501 line too long (102 > 79 characters)
./invoice.py:23:1: F401 'osv' imported but unused
./invoice.py:23:23: E231 missing whitespace after ','
./invoice.py:24:1: F401 '_' imported but unused
./invoice.py:26:1: E302 expected 2 blank lines, found 1
./invoice.py:26:1: F821 undefined name 'orm'
./invoice.py:27:1: W191 indentation contains tabs
./invoice.py:29:1: W191 indentation contains tabs
./invoice.py:30:1: W191 indentation contains tabs
./invoice.py:30:3: E126 continuation line over-indented for hanging indent
./invoice.py:30:76: W291 trailing whitespace
./invoice.py:31:1: W191 indentation contains tabs
./invoice.py:31:4: E128 continuation line under-indented for visual indent
./invoice.py:31:80: E501 line too long (89 > 79 characters)
./invoice.py:32:1: W191 indentation contains tabs
./invoice.py:32:4: E126 continuation line over-indented for hanging indent
./invoice.py:33:1: W191 indentation contains tabs
./sale.py:23:1: F401 'fields' imported but unused
./sale.py:23:1: F401 'osv' imported but unused
./sale.py:23:23: E231 missing whitespace after ','
./sale.py:24:1: F401 '_' imported but unused
./sale.py:26:1: E302 expected 2 blank lines, found 1
./sale.py:26:1: F821 undefined name 'orm'
./sale.py:27:1: W191 indentation contains tabs
./sale.py:28:1: E101 indentation contains mixed spaces and tabs
./sale.py:28:1: W293 blank line contains whitespace
./sale.py:29:1: W191 indentation contains tabs
./sale.py:31:1: W191 indentation contains tabs
./sale.py:31:80: E501 line too long (88 > 79 characters)
./sale.py:32:1: W191 indentation contains tabs
./sale.py:33:1: W191 indentation contains tabs
./sale.py:33:6: E126 continuation line over-indented for hanging indent
./sale.py:34:1: W191 indentation contains tabs
./sale.py:34:6: E126 continuation line over-indented for hanging indent
./sale.py:35:1: W191 indentation contains tabs

review: Needs Fixing

[Pedro Manuel Baeza (pedro.baeza)]

Another little change. Where it puts:

from osv import fields,osv
from tools.translate import _

please change it to the new OpenERP standard for v7:

from openerp.osv import fields, orm
from openerp.tools.translate import _

Regards.

review: Needs Fixing

[lp:~scigghia/account-invoicing/adding_account_invoice_shipping_address_7]

24. By Andrea Cometa on 2013-09-11

[fix] pep8 style

25. By Andrea Cometa on 2013-09-11

[fix] pep8 style

[Andrea Cometa (scigghia)]

for me its ok, i've fixed every suggestion

review: Approve

[Pedro Manuel Baeza (pedro.baeza)]

review: Approve (code review and test)

[Lorenzo Battistini (elbati)]

review: Approve (code review)

[Francesco Apruzzese (opencode)]

review: Approve

=== added directory 'account_invoice_shipping_address'
=== added file 'account_invoice_shipping_address/AUTHORS.txt'
--- account_invoice_shipping_address/AUTHORS.txt	1970-01-01 00:00:00 +0000
+++ account_invoice_shipping_address/AUTHORS.txt	2013-09-11 14:16:29 +0000
@@ -0,0 +1,2 @@
+Leonardo Pistone <[e-mail]>
+Andrea Cometa <[e-mail]>

=== added file 'account_invoice_shipping_address/__init__.py'
--- account_invoice_shipping_address/__init__.py	1970-01-01 00:00:00 +0000
+++ account_invoice_shipping_address/__init__.py	2013-09-11 14:16:29 +0000
@@ -0,0 +1,24 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2011 Domsense s.r.l. (<http://www.domsense.com>).
+#    Copyright (C) 2013 Andrea Cometa Perito Informatico (www.andreacometa.it)
+#
+#    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/>.
+#
+##############################################################################
+
+import invoice
+import sale

=== added file 'account_invoice_shipping_address/__openerp__.py'
--- account_invoice_shipping_address/__openerp__.py	1970-01-01 00:00:00 +0000
+++ account_invoice_shipping_address/__openerp__.py	2013-09-11 14:16:29 +0000
@@ -0,0 +1,39 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2011 Domsense s.r.l. (<http://www.domsense.com>).
+#    Copyright (C) 2013 Andrea Cometa Perito Informatico (www.andreacometa.it)
+#
+#    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": "Invoice Shipping Address",
+    "version": "0.1",
+    'category': 'Generic Modules/Accounting',
+    "depends": ["account", "sale"],
+    "author": "Andrea Cometa, Agile Business Group",
+    "description": """Adds a shipping address field to the invoice, also fill
+it in sale invoicing""",
+    'website': 'http://www.andreacometa.it',
+    'data': [
+        'invoice_view.xml',
+        ],
+    'demo': [],
+    'installable': True,
+    'active': False,
+}

=== added directory 'account_invoice_shipping_address/i18n'
=== added file 'account_invoice_shipping_address/i18n/account_invoice_shipping_address.pot'
--- account_invoice_shipping_address/i18n/account_invoice_shipping_address.pot	1970-01-01 00:00:00 +0000
+++ account_invoice_shipping_address/i18n/account_invoice_shipping_address.pot	2013-09-11 14:16:29 +0000
@@ -0,0 +1,27 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* account_invoice_shipping_address
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 7.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-09-04 14:39+0000\n"
+"PO-Revision-Date: 2013-09-04 14:39+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_shipping_address
+#: field:account.invoice,address_shipping_id:0
+msgid "Shipping Address"
+msgstr ""
+
+#. module: account_invoice_shipping_address
+#: help:account.invoice,address_shipping_id:0
+msgid "Delivery address for current invoice."
+msgstr ""
+

=== added file 'account_invoice_shipping_address/i18n/it.po'
--- account_invoice_shipping_address/i18n/it.po	1970-01-01 00:00:00 +0000
+++ account_invoice_shipping_address/i18n/it.po	2013-09-11 14:16:29 +0000
@@ -0,0 +1,27 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* account_invoice_shipping_address
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 7.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-09-04 14:39+0000\n"
+"PO-Revision-Date: 2013-09-04 14:39+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_shipping_address
+#: field:account.invoice,address_shipping_id:0
+msgid "Shipping Address"
+msgstr "Indirizzo di consegna"
+
+#. module: account_invoice_shipping_address
+#: help:account.invoice,address_shipping_id:0
+msgid "Delivery address for current invoice."
+msgstr "Indirizzo di consegna per la presente fattura"
+

=== added file 'account_invoice_shipping_address/invoice.py'
--- account_invoice_shipping_address/invoice.py	1970-01-01 00:00:00 +0000
+++ account_invoice_shipping_address/invoice.py	2013-09-11 14:16:29 +0000
@@ -0,0 +1,39 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2011 Domsense s.r.l. (<http://www.domsense.com>).
+#    Copyright (C) 2013 Andrea Cometa Perito Informatico (www.andreacometa.it)
+#
+#    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/>.
+#
+##############################################################################
+
+from openerp.osv import fields, orm
+
+
+class account_invoice(orm.Model):
+    _inherit = "account.invoice"
+
+    _columns = {
+        'address_shipping_id': fields.many2one(
+            'res.partner',
+            'Shipping Address',
+            readonly=True,
+            states={
+                'draft': [('readonly', False)],
+                'sent': [('readonly', False)]
+            },
+            help="Delivery address for current invoice."),
+    }

=== added file 'account_invoice_shipping_address/invoice_view.xml'
--- account_invoice_shipping_address/invoice_view.xml	1970-01-01 00:00:00 +0000
+++ account_invoice_shipping_address/invoice_view.xml	2013-09-11 14:16:29 +0000
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openerp>
+    <data>
+        <record model="ir.ui.view" id="invoice_form_shipping_address">
+            <field name="name">account.invoice.form.shipping.address</field>
+            <field name="model">account.invoice</field>
+            <field name="inherit_id" ref="account.invoice_form"/>
+            <field name="arch" type="xml">
+                <field name="fiscal_position" position="before">
+                    <field name="address_shipping_id" />
+                </field>
+            </field>
+        </record>
+    </data>
+</openerp>

=== added file 'account_invoice_shipping_address/sale.py'
--- account_invoice_shipping_address/sale.py	1970-01-01 00:00:00 +0000
+++ account_invoice_shipping_address/sale.py	2013-09-11 14:16:29 +0000
@@ -0,0 +1,36 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2011 Domsense s.r.l. (<http://www.domsense.com>).
+#    Copyright (C) 2013 Andrea Cometa Perito Informatico (www.andreacometa.it)
+#
+#    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/>.
+#
+##############################################################################
+
+from openerp.osv import orm
+
+
+class sale_order(orm.Model):
+    _inherit = 'sale.order'
+
+    def _prepare_invoice(self, cr, uid, order, lines, context=None):
+
+        res = super(sale_order, self)._prepare_invoice(
+            cr, uid, order, lines, context=context
+        )
+        res.update({
+            'address_shipping_id': order.partner_shipping_id.id, })
+        return res