Merge lp:~camptocamp/account-invoice-report/account-invoice-report-fix-supplier-view into lp:~account-core-editors/account-invoice-report/7.0

[Nicolas Bessi - Camptocamp]

Add form view in supplier invoice line

[Alexandre Fayolle - camptocamp (alexandre-fayolle-c2c)]

There seem to be 2 changes in the patch : one adding the form and the other one adding the purchase_ok field (workaround for a bug). Is this intended?

review: Needs Information (code review, no test)

[Nicolas Bessi - Camptocamp (nbessi-c2c-deactivatedaccount)]

Hello,

It is explicitly written in class doc string.

Regards

Nicolas

[Alexandre Fayolle - camptocamp (alexandre-fayolle-c2c)]

review: Approve (code review, no test)

=== modified file 'invoice_webkit/__init__.py'
--- invoice_webkit/__init__.py	2013-01-24 15:28:47 +0000
+++ invoice_webkit/__init__.py	2013-01-31 13:12:32 +0000
@@ -19,4 +19,5 @@
 #
 ##############################################################################
 from . import invoice
-from . import report
 \ No newline at end of file
+from . import report
+from . import product
 
=== added file 'invoice_webkit/product.py'
--- invoice_webkit/product.py	1970-01-01 00:00:00 +0000
+++ invoice_webkit/product.py	2013-01-31 13:12:32 +0000
@@ -0,0 +1,30 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#   Copyright (c) 2011 Camptocamp SA (http://www.camptocamp.com)
+#   @author Guewen Baconnier, Bessi Nicolas, Vincent Renaville
+#
+#    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, fields
+
+
+class ProductTemplate(orm.Model):
+    """TMP fix of bug 1111430"""
+    _inherit = 'product.template'
+
+    _columns = {'purchase_ok': fields.boolean('Can be Purchased',
+                                              help=("Specify if the product can be selected"
+                                                    " in a purchase order line."))}
 
=== modified file 'invoice_webkit/view/invoice_view.xml'
--- invoice_webkit/view/invoice_view.xml	2013-01-18 11:56:01 +0000
+++ invoice_webkit/view/invoice_view.xml	2013-01-31 13:12:32 +0000
@@ -75,6 +75,17 @@
       </field>
     </record>
 
+    <record model="ir.ui.view" id="invoice_form_add_notes_in_invoice_line_1b">
+      <field name="name">account.invoice.form.add.supplier.notes</field>
+      <field name="model">account.invoice</field>
+      <field name="inherit_id" ref="account.invoice_supplier_form"/>
+      <field name="arch" type="xml">
+        <xpath expr="//field[@name='invoice_line']/tree" position="attributes" >
+          <attribute name="editable" eval="False"/>
+        </xpath>
+      </field>
+    </record>
+
     <record model="ir.ui.view" id="invoice_form_add_notes_in_invoice_line_2">
       <field name="name">account.invoice.form.add.notes</field>
       <field name="model">account.invoice.line</field>