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

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

[ADD] account_invoice_purchase_origin module

[ADD] account_invoice_purchase_origin module

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

Hi,

Thanks for the contrib. It seems to me that you have a strange diff here, like if files or folder have been here more than once ? Can you check and clean the MP ?

Otherwise, the code is looking good to me.

Regards,

Joël

review: Needs Fixing (code review, no tests)

[Holger Brunn (Therp) (hbrunn)]

I think the problem Joël means is that the sale_origin addon simply contains the code for purchase_origin.

Then for #344ff: I think it's a bad idea to copy the original function and break inheritance. Better call super and set the origin field in the dictionary you get back.

review: Needs Fixing

[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

27. By David Cormier on 2014-01-22

[NEW] Add account invoice sale origin

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	2014-04-17 13:55:12 +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	2014-04-17 13:55:12 +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	2014-04-17 13:55:12 +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	2014-04-17 13:55:12 +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,
+        }

=== added directory 'account_invoice_sale_origin'
=== added file 'account_invoice_sale_origin/__init__.py'
--- account_invoice_sale_origin/__init__.py	1970-01-01 00:00:00 +0000
+++ account_invoice_sale_origin/__init__.py	2014-04-17 13:55:12 +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 sale

=== added file 'account_invoice_sale_origin/__openerp__.py'
--- account_invoice_sale_origin/__openerp__.py	1970-01-01 00:00:00 +0000
+++ account_invoice_sale_origin/__openerp__.py	2014-04-17 13:55:12 +0000
@@ -0,0 +1,43 @@
+# -*- 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 Sale Origin',
+    'version': '1.1',
+    'category': 'Finance',
+    'description': """
+    
+    This module displays the origin field of account invoice lines and populate
+    them when a customer invoice is create from a delivery order
+    """,
+    'author': 'Savoir-faire Linux',
+    'website': 'http://www.savoirfairelinux.com/',
+    'depends': ['account', 'sale'],
+    'data': [
+        'account_invoice_view.xml',
+    ],
+    'test': [
+    ],
+    'demo': [],
+    'installable': True,
+    'active': False,
+    'certificate': False,
+}

=== added directory 'account_invoice_sale_origin/account_invoice_purchase_origin'
=== added file 'account_invoice_sale_origin/account_invoice_purchase_origin/__init__.py'
--- account_invoice_sale_origin/account_invoice_purchase_origin/__init__.py	1970-01-01 00:00:00 +0000
+++ account_invoice_sale_origin/account_invoice_purchase_origin/__init__.py	2014-04-17 13:55:12 +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_sale_origin/account_invoice_purchase_origin/__openerp__.py'
--- account_invoice_sale_origin/account_invoice_purchase_origin/__openerp__.py	1970-01-01 00:00:00 +0000
+++ account_invoice_sale_origin/account_invoice_purchase_origin/__openerp__.py	2014-04-17 13:55:12 +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_sale_origin/account_invoice_purchase_origin/account_invoice_view.xml'
--- account_invoice_sale_origin/account_invoice_purchase_origin/account_invoice_view.xml	1970-01-01 00:00:00 +0000
+++ account_invoice_sale_origin/account_invoice_purchase_origin/account_invoice_view.xml	2014-04-17 13:55:12 +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_sale_origin/account_invoice_purchase_origin/purchase.py'
--- account_invoice_sale_origin/account_invoice_purchase_origin/purchase.py	1970-01-01 00:00:00 +0000
+++ account_invoice_sale_origin/account_invoice_purchase_origin/purchase.py	2014-04-17 13:55:12 +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,
+        }

=== added file 'account_invoice_sale_origin/account_invoice_view.xml'
--- account_invoice_sale_origin/account_invoice_view.xml	1970-01-01 00:00:00 +0000
+++ account_invoice_sale_origin/account_invoice_view.xml	2014-04-17 13:55:12 +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_sale_origin/purchase.py'
--- account_invoice_sale_origin/purchase.py	1970-01-01 00:00:00 +0000
+++ account_invoice_sale_origin/purchase.py	2014-04-17 13:55:12 +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,
+        }