Merge lp:~schampagne/openerp-manufacturing/mrp_bom_product_details into lp:openerp-manufacturing

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

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

review: Approve

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

As this is for version 7.0, it would be better to:

Inherit from orm.Model instead of osv.osv, because osv.osv is deprecated
    from openerp.osv import fields, orm
    from openerp.tools.translate import _

    class mrp_bom(orm.Model):

And you no longer need to instantiate your model at line 107

The lines 103, 104 are very long...

So it would be great if you can change that.

Expect that, that looks good to me

review: Approve (no test, review)

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

LGTM

review: Approve

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

> LGTM

Sorry, the comment went out too soon.

Please change the base class to Model and remove the class instanciation, as pointed out by guewen

[lp:~schampagne/openerp-manufacturing/mrp_bom_product_details]

4. By root <root@prog01> on 2013-01-18

removed deprecated code, fixed typo, improved code readability

[samuel champagne (schampagne)]

Requestion modifications have been made.

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

I tried to do the merge but the target branch is empty (no revisions) and I got:

bzr: ERROR: Merging into empty branches not currently supported, https://bugs.launchpad.net/bzr/+bug/308562

Is it intended that lp:openerp-manufacturing is empty?

=== added directory 'mrp_bom_product_details'
=== added file 'mrp_bom_product_details/__init__.py'
--- mrp_bom_product_details/__init__.py	1970-01-01 00:00:00 +0000
+++ mrp_bom_product_details/__init__.py	2013-01-18 15:15:27 +0000
@@ -0,0 +1,23 @@
+# -*- coding: utf-8 -*-
+
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2013 Solutions Libergia inc. (<http://www.libergia.com>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU 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 General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import mrp_bom_product_details

=== added file 'mrp_bom_product_details/__openerp__.py'
--- mrp_bom_product_details/__openerp__.py	1970-01-01 00:00:00 +0000
+++ mrp_bom_product_details/__openerp__.py	2013-01-18 15:15:27 +0000
@@ -0,0 +1,35 @@
+# -*- coding: utf-8 -*-
+
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2013 Solutions Libergia inc. (<http://www.libergia.com>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU 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 General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+{
+    'name': 'Bom product details',
+    'version': '0.1',
+    'author': 'Solutions Libergia inc.',
+    'category': 'Manufacturing',
+    'description': """
+    This module adds product price and stock to bom views
+    """,
+    'depends': ["base","mrp"],
+    'demo': [],
+    'data': ['mrp_bom_product_details.xml'],
+    'auto_install': False,
+    'installable': True,
+}

=== added file 'mrp_bom_product_details/mrp_bom_product_details.py'
--- mrp_bom_product_details/mrp_bom_product_details.py	1970-01-01 00:00:00 +0000
+++ mrp_bom_product_details/mrp_bom_product_details.py	2013-01-18 15:15:27 +0000
@@ -0,0 +1,34 @@
+# -*- coding: utf-8 -*-
+
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2013 Solutions Libergia inc. (<http://www.libergia.com>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU 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 General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from openerp.osv import fields, orm
+from openerp.tools.translate import _
+
+class mrp_bom(orm.Model):
+    _inherit = 'mrp.bom'
+
+    _columns ={
+        'product_standard_price': fields.related('product_id', 'standard_price',
+            type='float', string='Cost Price', readonly=True),
+        'product_qty_available': fields.related('product_id', 'qty_available',
+            type='float', string='Quantity On Hand', readonly=True),
+    }

=== added file 'mrp_bom_product_details/mrp_bom_product_details.xml'
--- mrp_bom_product_details/mrp_bom_product_details.xml	1970-01-01 00:00:00 +0000
+++ mrp_bom_product_details/mrp_bom_product_details.xml	2013-01-18 15:15:27 +0000
@@ -0,0 +1,42 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+    
+        <record id="mrp_bom_tree_view" model="ir.ui.view">
+            <field name="name">mrp.bom.tree</field>
+            <field name="model">mrp.bom</field>
+            <field name="inherit_id" ref="mrp.mrp_bom_tree_view"/>
+            <field name="arch" type="xml">
+                <field name="product_uom" position="after">
+                    <field name="product_standard_price" />
+                    <field name="product_qty_available" />
+                </field>
+            </field>
+        </record>
+        
+        <record id="mrp_bom_component_tree_view" model="ir.ui.view">
+            <field name="name">mrp.bom.component.tree</field>
+            <field name="model">mrp.bom</field>
+            <field name="inherit_id" ref="mrp.mrp_bom_component_tree_view"/>
+            <field name="arch" type="xml">
+                <field name="product_uom" position="after">
+                    <field name="product_standard_price" />
+                    <field name="product_qty_available" />
+                </field>
+            </field>
+        </record>
+        
+        <record id="mrp_bom_form_view" model="ir.ui.view">
+            <field name="name">mrp.bom.form</field>
+            <field name="model">mrp.bom</field>
+            <field name="inherit_id" ref="mrp.mrp_bom_form_view"/>    
+            <field name="arch" type="xml">
+                <xpath expr="//field[@name='bom_lines']/tree" position="inside" >
+                    <field name="product_standard_price" />
+                    <field name="product_qty_available" />
+                </xpath>
+            </field>
+        </record>
+        
+    </data>
+</openerp>