Merge lp:~bas-solutions/margin-analysis/6.1-product_cost_incl_costs into lp:~margin-analysis-core-editors/margin-analysis/6.1

[Erwin van der Ploeg (BAS Solutions)]

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

Hello,

Do you have to choose between product_cost_incl_costs_with_bom and product_cost_incl_costs_without_bom?
What happens if you install both?

review: Needs Information

[Erwin van der Ploeg (BAS Solutions) (erwin-bassolutions-deactivatedaccount)]

Haven't tried to install both. Best is to choose. Then you can deside if the extra costs (exaple, delivery costs of supplier) will be added to the product, on top of the BoM calculation, or just a cost, without a BoM (We often don't install this module, due to the extra complexity)

Erwin

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

9+# Copyright 2012 Camptocamp SA
Why is there a copyright attribution to Camptocamp ?

26+# -*- coding: utf-8 -*-
No meaning here

65
'if the is a BoM'?
s/calcyulated/calculated

171,389: 'method=True' is now useless

173: no spaces around the = in method keyword arguments

179,395 +product_product()
The instanciation of the models is now useless

235,451: <!-- FIXME groups setting! -->
groups to fix or comment to remove?

369
from openerp.tools.translate import _

378,379 couldn't this debug logging be removed?

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

175: s/it take also/it also takes/
     s/all standard price/all standard prices/

please use a consistent casing for "BoM" throughout the strings in the code.

164: use +=

217: use '!=' rather than "&lt;&gt;'

294: syntax error. You probably never were able to install this module because of this one.

386: the field should be named "fixed_cost_price" and not "fix_cost_price" (does not mean the same thing in English)

review: Needs Fixing (code review, no test)

[lp:~bas-solutions/margin-analysis/6.1-product_cost_incl_costs]

46. By Erwin van der Ploeg (BAS Solutions) on 2013-02-02

Review changes

[Erwin van der Ploeg (BAS Solutions) (erwin-bassolutions-deactivatedaccount)]

Think I have all the review comments. Thanks

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

I just noticed one more thing:

387 + help=_("The cost price is the standard price unless you install the product_cost_incl_bom module."))

The help message should not be translated using _(). They are automatically translated.

(it also means that you can remove the import of _)

review: Needs Fixing

[lp:~bas-solutions/margin-analysis/6.1-product_cost_incl_costs]

47. By Erwin van der Ploeg (BAS Solutions) on 2013-02-04

Delete translation using _()

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

Thanks, LGTM

review: Approve (code review, no test)

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

review: Approve (code review, no test)

=== added directory 'product_cost_incl_costs_with_bom'
=== added file 'product_cost_incl_costs_with_bom/__init__.py'
--- product_cost_incl_costs_with_bom/__init__.py	1970-01-01 00:00:00 +0000
+++ product_cost_incl_costs_with_bom/__init__.py	2013-02-04 08:46:31 +0000
@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Copyright 2012 Camptocamp SA
+#    Copyright 2012 Endian Solutions BV
+#
+#    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 product
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'product_cost_incl_costs_with_bom/__openerp__.py'
--- product_cost_incl_costs_with_bom/__openerp__.py	1970-01-01 00:00:00 +0000
+++ product_cost_incl_costs_with_bom/__openerp__.py	2013-02-04 08:46:31 +0000
@@ -0,0 +1,41 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Copyright 2012 Camptocamp SA
+#    Copyright 2012 Endian Solutions BV
+#
+#    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' : 'Product Cost field',
+ 'version' : '0.1',
+ 'author' : 'Grishma Shukla',
+ 'maintainer': 'Endian Solutions',
+ 'category': 'Products',
+ 'complexity': "normal",  
+ 'depends' : ['product_cost_incl_bom',
+              ],
+ 'description': """
+ This module adds an Fixed cost field to the product form. So you can calculate a costprice with added costs. 
+ This module depends on the module product_cost_incl_bom. If the is a BoM, the added costs are added to the calculated cost price of the BoM.
+ """, 
+ 'website': 'www.endiansolutions.nl',
+ 'init_xml': [],
+ 'update_xml': ['product_view.xml'],
+ 'demo_xml': [],
+ 'tests': [],
+ 'installable': True,
+ 'license': 'AGPL-3',
+ 'application': False
+ }

=== added directory 'product_cost_incl_costs_with_bom/i18n'
=== added file 'product_cost_incl_costs_with_bom/i18n/nl.po'
--- product_cost_incl_costs_with_bom/i18n/nl.po	1970-01-01 00:00:00 +0000
+++ product_cost_incl_costs_with_bom/i18n/nl.po	2013-02-04 08:46:31 +0000
@@ -0,0 +1,41 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+# 	* product_cost_incl_costs
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-12-23 12:21+0000\n"
+"PO-Revision-Date: 2012-12-23 13:21+0100\n"
+"Last-Translator: Erwin van der Ploeg | Endian Solutions "
+"<[e-mail]>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: \n"
+"X-Generator: Poedit 1.5.4\n"
+
+#. module: product_cost_incl_costs
+#: model:ir.model,name:product_cost_incl_costs.model_product_product
+msgid "Product"
+msgstr "Product"
+
+#. module: product_cost_incl_costs
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr "Fout: ongeldige ean code"
+
+#. module: product_cost_incl_costs
+#: field:product.product,fix_cost_price:0
+msgid "Fix Cost Price"
+msgstr "Vaste kosten"
+
+#. module: product_get_cost_field
+#: help:product.product,cost_price:0
+msgid ""
+"The cost price is the standard price or, if the product has a bom, the sum "
+"of all standard price of its components. it take also care of the bom "
+"costing like cost per cylce."
+msgstr "Dit is de kostrpijs inclusief eventuele kosten."

=== added file 'product_cost_incl_costs_with_bom/product.py'
--- product_cost_incl_costs_with_bom/product.py	1970-01-01 00:00:00 +0000
+++ product_cost_incl_costs_with_bom/product.py	2013-02-04 08:46:31 +0000
@@ -0,0 +1,51 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Copyright 2012 Camptocamp SA
+#    Copyright 2012 Endian Solutions BV
+#
+#    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.orm import Model
+from openerp.osv import fields
+import decimal_precision as dp
+
+class product_product(Model):
+    _inherit = 'product.product'
+
+    def _cost_price(self, cr, uid, ids, field_name, arg, context=None):
+        if context is None:
+            context = {}
+        product_uom = context.get('product_uom')
+        bom_properties = context.get('properties')
+        res = self._compute_purchase_price(cr, uid, ids, product_uom,
+                                           bom_properties)
+        for self_obj in self.browse(cr, uid, ids, context=context):
+            res[self_obj.id] = res[self_obj.id] + self_obj.fixed_cost_price
+        return res
+
+    _columns = {
+        'fixed_cost_price': fields.float(
+            'Fixed Cost Price', digits_compute = dp.get_precision('Sale Price')),
+        'cost_price': fields.function(_cost_price,
+                                      string='Cost Price (incl. BoM)',
+                                      digits_compute=dp.get_precision('Sale Price'),
+                                      help="The cost price is the standard price or, if the product has a BoM, "
+                                      "the sum of all standard prices of its components. It also takes care of the "
+                                      "BoM costing like cost per cylce.")
+        }
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'product_cost_incl_costs_with_bom/product_view.xml'
--- product_cost_incl_costs_with_bom/product_view.xml	1970-01-01 00:00:00 +0000
+++ product_cost_incl_costs_with_bom/product_view.xml	2013-02-04 08:46:31 +0000
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+  <data>
+    <record model="ir.ui.view" id="product_cost_incl_costs_form">
+      <field name="name">product.product_cost_incl_costs.view.form</field>
+      <field name="type">form</field>
+      <field name="model">product.product</field>
+      <field name="priority" eval="800"/>
+      <field name="inherit_id" ref="product.product_normal_form_view" />
+      <field name="arch" type="xml">
+        <field name="cost_price" position="replace">
+        </field>
+        <field name="list_price" position="replace"/>
+        <label string="Cost Price :" align="1.0" position="replace"/>
+        <field name="standard_price"
+            attrs="{'readonly':[('cost_method','=','average')]}"
+            groups="base.group_extended"
+            position="replace"/>
+        <button name="%(stock.action_view_change_standard_price)d" string="Update"
+                    type="action" icon="gtk-execute"
+                    attrs="{'invisible':[('cost_method','&lt;&gt;','average')]}"
+                    position="replace"/>
+        <field name="cost_method" groups="base.group_extended" position="replace">
+            <group col="2" colspan="2">
+            <field name="list_price"/>
+            <field name="cost_method" groups="base.group_extended" />
+            <label string="Cost Price :" align="1.0"/>
+            <group col="2" colspan="1">
+                <field name="standard_price" attrs="{'readonly':[('cost_method','=','average')]}" nolabel="1"/>
+                <button name="%(stock.action_view_change_standard_price)d" string="Update"
+                    type="action" icon="gtk-execute" attrs="{'invisible':[('cost_method','!=','average')]}"/>
+            </group>
+          <field name="fixed_cost_price" />
+          <field name="cost_price"/>
+          </group>
+        </field>
+
+      </field>
+    </record>
+
+    <record model="ir.ui.view" id="product_cost_incl_costs_tree">
+      <field name="name">product.product_cost_incl_costs.view.tree</field>
+      <field name="type">tree</field>
+      <field name="model">product.product</field>
+      <field name="priority" eval="80"/>
+      <field name="inherit_id" ref="product.product_product_tree_view" />
+      <field name="arch" type="xml">
+        <field name="cost_price" position="before">
+          <field name="fixed_cost_price"/>
+        </field>
+      </field>
+    </record>
+  </data>
+</openerp>

=== added directory 'product_cost_incl_costs_without_bom'
=== added file 'product_cost_incl_costs_without_bom/__init__.py'
--- product_cost_incl_costs_without_bom/__init__.py	1970-01-01 00:00:00 +0000
+++ product_cost_incl_costs_without_bom/__init__.py	2013-02-04 08:46:31 +0000
@@ -0,0 +1,23 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Copyright 2012 Camptocamp SA
+#    Copyright 2012 Endian Solutions BV
+#
+#    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 product
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'product_cost_incl_costs_without_bom/__openerp__.py'
--- product_cost_incl_costs_without_bom/__openerp__.py	1970-01-01 00:00:00 +0000
+++ product_cost_incl_costs_without_bom/__openerp__.py	2013-02-04 08:46:31 +0000
@@ -0,0 +1,39 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Copyright 2012 Camptocamp SA
+#    Copyright 2012 Endian Solutions BV
+#
+#    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' : 'Product Cost field',
+ 'version' : '0.1',
+ 'author' : 'Grishma Shukla',
+ 'maintainer': 'Endian Solutions',
+ 'category': 'Products',
+ 'complexity': "normal",  
+ 'depends' : ['product_get_cost_field',
+              ],
+ 'description': """
+ This module adds an Fixed cost field to the product form. So you can calculate a costprice with added costs, without the use of a BoM.
+ """,
+ 'website': 'www.endiansolutions.nl',
+ 'init_xml': [],
+ 'update_xml': ['product_view.xml'],
+ 'demo_xml': [],
+ 'tests': [],
+ 'installable': True,
+ 'application': False
+ }

=== added directory 'product_cost_incl_costs_without_bom/i18n'
=== added file 'product_cost_incl_costs_without_bom/i18n/nl.po'
--- product_cost_incl_costs_without_bom/i18n/nl.po	1970-01-01 00:00:00 +0000
+++ product_cost_incl_costs_without_bom/i18n/nl.po	2013-02-04 08:46:31 +0000
@@ -0,0 +1,41 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+# 	* product_cost_incl_costs
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-12-23 12:21+0000\n"
+"PO-Revision-Date: 2012-12-23 14:20+0100\n"
+"Last-Translator: Erwin van der Ploeg | Endian Solutions "
+"<[e-mail]>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: \n"
+"X-Generator: Poedit 1.5.4\n"
+
+#. module: product_cost_incl_costs
+#: model:ir.model,name:product_cost_incl_costs.model_product_product
+msgid "Product"
+msgstr "Product"
+
+#. module: product_cost_incl_costs
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr "Fout: ongeldige ean code"
+
+#. module: product_cost_incl_costs
+#: field:product.product,fix_cost_price:0
+msgid "Fix Cost Price"
+msgstr "Vaste kosten"
+
+#. module: product_get_cost_field
+#: help:product.product,cost_price:0
+msgid ""
+"The cost price is the standard price or, if the product has a bom, the sum "
+"of all standard price of its components. it take also care of the bom "
+"costing like cost per cylce."
+msgstr "Dit is de kostprijs inclusief eventuele kosten."

=== added file 'product_cost_incl_costs_without_bom/product.py'
--- product_cost_incl_costs_without_bom/product.py	1970-01-01 00:00:00 +0000
+++ product_cost_incl_costs_without_bom/product.py	2013-02-04 08:46:31 +0000
@@ -0,0 +1,27 @@
+# -*- coding: utf-8 -*-
+from openerp.osv.orm import Model
+from openerp.osv import fields
+import decimal_precision as dp
+import logging
+
+class product_product(Model):
+    _inherit = 'product.product'
+
+    def _cost_price(self, cr, uid, ids, field_name, arg, context=None):
+        if context is None:
+            context = {}
+        res = {}
+        for product in self.browse(cr, uid, ids):
+            res[product.id] = product.standard_price + product.fixed_cost_price
+        return res
+
+    _columns = {
+        'fixed_cost_price': fields.float(
+            'Fixed Cost Price', digits_compute = dp.get_precision('Sale Price')),
+        'cost_price': fields.function(_cost_price,
+                                      string='Cost Price',
+                                      digits_compute=dp.get_precision('Sale Price'),
+                                      help="The cost price is the standard price unless you install the product_cost_incl_bom module.")
+        }
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'product_cost_incl_costs_without_bom/product_view.xml'
--- product_cost_incl_costs_without_bom/product_view.xml	1970-01-01 00:00:00 +0000
+++ product_cost_incl_costs_without_bom/product_view.xml	2013-02-04 08:46:31 +0000
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+  <data>
+    <record model="ir.ui.view" id="product_cost_incl_costs_form">
+      <field name="name">product.product_cost_incl_costs.view.form</field>
+      <field name="type">form</field>
+      <field name="model">product.product</field>
+      <field name="priority" eval="800"/>
+      <field name="inherit_id" ref="product.product_normal_form_view" />
+      <field name="arch" type="xml">
+        <field name="cost_price" position="replace">
+        </field>
+        <field name="list_price" position="replace"/>
+        <label string="Cost Price :" align="1.0" position="replace"/>
+        <field name="standard_price"
+            attrs="{'readonly':[('cost_method','=','average')]}"
+            groups="base.group_extended"
+            position="replace"/>
+        <button name="%(stock.action_view_change_standard_price)d" string="Update"
+                    type="action" icon="gtk-execute"
+                    attrs="{'invisible':[('cost_method','&lt;&gt;','average')]}"
+                    position="replace"/>
+        <field name="cost_method" groups="base.group_extended" position="replace">
+            <group col="2" colspan="2">
+            <field name="list_price"/>
+            <field name="cost_method" groups="base.group_extended" />
+            <label string="Cost Price :" align="1.0"/>
+            <group col="2" colspan="1">
+                <field name="standard_price" attrs="{'readonly':[('cost_method','=','average')]}" nolabel="1"/>
+                <button name="%(stock.action_view_change_standard_price)d" string="Update"
+                    type="action" icon="gtk-execute" attrs="{'invisible':[('cost_method','&lt;&gt;','average')]}"/>
+            </group>
+          <field name="fixed_cost_price" />
+          <field name="cost_price"/>
+          </group>
+        </field>
+
+      </field>
+    </record>
+
+    <record model="ir.ui.view" id="product_cost_incl_costs_tree">
+      <field name="name">product.product_cost_incl_costs.view.tree</field>
+      <field name="type">tree</field>
+      <field name="model">product.product</field>
+      <field name="priority" eval="80"/>
+      <field name="inherit_id" ref="product.product_product_tree_view" />
+      <field name="arch" type="xml">
+        <field name="cost_price" position="before">
+          <field name="fixed_cost_price"/><!-- FIXME groups setting! -->
+        </field>
+      </field>
+    </record>
+  </data>
+</openerp>