Merge lp:~savoirfairelinux-openerp/account-invoicing/account_invoice_purchase_origin into lp:~account-core-editors/account-invoicing/7.0

[David Cormier]

Adds a module to display origin document in all supplier invoice lines and populate the invoice line origin document when purchases are confirmed

[lp:~savoirfairelinux-openerp/account-invoicing/account_invoice_purchase_origin]

25. By David Cormier on 2013-12-09

[FIX] After account_analytic_id rather than replace

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

review: Approve (code review)

[Pedro Manuel Baeza (pedro.baeza)]

Hi, David, thanks for the contribution. Could you please follow community conventions for the code (http://pad.openerp.com/p/community-review):

- orm.Model instead of osv.osv.
- from . import xxx on __init__.py.
- 'from openerp.osv import orm, fields' instead of 'from osv import osv, fields'
- etc

Regards.

review: Needs Fixing (code review)

[lp:~savoirfairelinux-openerp/account-invoicing/account_invoice_purchase_origin]

26. By David Cormier on 2013-12-12

[FIX] Apply community conventions

[David Cormier (david-cormier-j)]

Thanks for the input Pedro. I have read the convention and made the following changes:

* Changed from osv import osv to from openerp.osv import orm
* Relative inputs in __init__.py
* Fixed pep8 error in purchase.py

[Pedro Manuel Baeza (pedro.baeza)]

Hi, David,

Seeing the code, I think you can follow better coding conventions to allow minimal changes on future versions:

- On _prepare_inv_line method, you should call super method, and extend returned dictionary instead of overriding full method.
- On the view definition, it's better to use <field name="xxx" position="yyy"> instead of xpath expression.

Regards.

review: Needs Fixing

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

I set this MP as Work in progress as it is in "Needs Fixing" since weeks. Please set it back to "Need Review" once you think you are done.

[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

26. By David Cormier on 2013-12-12

[FIX] Apply community conventions

25. By David Cormier on 2013-12-09

[FIX] After account_analytic_id rather than replace

24. By David Cormier on 2013-12-09

[NEW] Add account_invoice_purchase_origin module

=== added directory 'account_invoice_purchase_origin'
=== added file 'account_invoice_purchase_origin/__init__.py'
--- account_invoice_purchase_origin/__init__.py	1970-01-01 00:00:00 +0000
+++ account_invoice_purchase_origin/__init__.py	2013-12-12 22:36:17 +0000
@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (c) 2010-2013 Savoir-faire Linux. All Rights Reserved.
+#
+#    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 purchase
 
=== added file 'account_invoice_purchase_origin/__openerp__.py'
--- account_invoice_purchase_origin/__openerp__.py	1970-01-01 00:00:00 +0000
+++ account_invoice_purchase_origin/__openerp__.py	2013-12-12 22:36:17 +0000
@@ -0,0 +1,42 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (c) 2010-2013 Savoir-faire Linux. All Rights Reserved.
+#
+#    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 Purchase Origin',
+    'version': '1.1',
+    'category': 'Finance',
+    'description': """
+    This module displays the origin field of account invoice lines and populate
+    them when an invoice is created from a purchase order
+    """,
+    'author': 'Savoir-faire Linux',
+    'website': 'http://www.savoirfairelinux.com/',
+    'depends': ['account', 'purchase'],
+    'data': [
+        'account_invoice_view.xml',
+    ],
+    'test': [
+    ],
+    'demo': [],
+    'installable': True,
+    'active': False,
+    'certificate': False,
+}
 
=== added file 'account_invoice_purchase_origin/account_invoice_view.xml'
--- account_invoice_purchase_origin/account_invoice_view.xml	1970-01-01 00:00:00 +0000
+++ account_invoice_purchase_origin/account_invoice_view.xml	2013-12-12 22:36:17 +0000
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+  <data>
+    <record id="view_invoice_line_tree" model="ir.ui.view">
+      <field name="model">account.invoice</field>
+      <field name="inherit_id" ref="account.invoice_supplier_form" />
+      <field name="arch" type="xml">
+        <xpath expr="//tree//field[@name='account_analytic_id']" position="after">
+          <field name="origin" readonly="1" />
+        </xpath>
+      </field>
+    </record>
+  </data>
+</openerp>
 
=== added file 'account_invoice_purchase_origin/purchase.py'
--- account_invoice_purchase_origin/purchase.py	1970-01-01 00:00:00 +0000
+++ account_invoice_purchase_origin/purchase.py	2013-12-12 22:36:17 +0000
@@ -0,0 +1,42 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (c) 2010-2013 Savoir-faire Linux. All Rights Reserved.
+#
+#    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 purchase_order(orm.Model):
+
+    _inherit = 'purchase.order'
+
+    def _prepare_inv_line(self, cr, uid, account_id, order_line, context=None):
+
+        return {
+            'name': order_line.name,
+            'account_id': account_id,
+            'price_unit': order_line.price_unit or 0.0,
+            'origin': order_line.order_id.name,
+            'quantity': order_line.product_qty,
+            'product_id': order_line.product_id.id or False,
+            'uos_id': order_line.product_uom.id or False,
+            'invoice_line_tax_id': [(6, 0, [x.id\
+                                            for x in order_line.taxes_id])],
+            'account_analytic_id': order_line.account_analytic_id.id or False,
+        }