Merge lp:~lin-yu/purchase-wkfl/add_purchase_price_list into lp:~purchase-core-editors/purchase-wkfl/7.0

[LIN Yu]

[ADD] purchase_price_list_item

Improve purchase price managment
================================

    * In Purchase List Item, the price is fixed based on price_surchage if base is 'fixed on UOP'
    * If 'fixed on UOP', if product UOP change, the price list price will be change automtically.
    * Add field 'Qty on Hand', and 'Stock Values' for product
    * Add field 'Qty on Hand', 'Stock Values', UOP in product list view

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

Thanks for your contribution Yu.

l163: please use orm.Model instead of osv.osv. Update the import accordingly.
l208, 463: no need to instantiate
l417: 2 lines are enough to comply with PEP8. Run flake8 to check for PEP8 issues

review: Needs Fixing (code review)

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

Hi Lin,

Thanks for this contribs ! Do you really need to override the whole function "price_get_multi" without calling super() ?

This can lead in very unexpected result so for now I marks it as Disapprove for that reason. Other module that may override this method can face trouble due to that...

Thanks for your understanding or explanation if I do missed something !

Regards,

review: Disapprove (code review, no tests)

[Pedro Manuel Baeza (pedro.baeza)]

This project is now hosted on https://github.com/OCA/purchase-workflow. 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

16. By LIN Yu on 2013-08-19

[ADD] module purchase_price_list_item

=== added directory 'purchase_price_list_item'
=== added file 'purchase_price_list_item/__init__.py'
--- purchase_price_list_item/__init__.py	1970-01-01 00:00:00 +0000
+++ purchase_price_list_item/__init__.py	2013-08-19 07:32:33 +0000
@@ -0,0 +1,23 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (c) 2010-2013 Elico Corp. All Rights Reserved.
+#    Author: Jean LELIEVRE <[e-mail]>
+#
+#    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
 \ No newline at end of file
 
=== added file 'purchase_price_list_item/__openerp__.py'
--- purchase_price_list_item/__openerp__.py	1970-01-01 00:00:00 +0000
+++ purchase_price_list_item/__openerp__.py	2013-08-19 07:32:33 +0000
@@ -0,0 +1,52 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (c) 2010-2013 Elico Corp. All Rights Reserved.
+#    Author: Jean LELIEVRE <[e-mail]>
+#            Andy LU<[e-mail]>
+#
+#    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': 'Purchase Price List Item',
+    'version': '1.0',
+    'category': 'Purchase',
+    'sequence': 19,
+    'summary': 'Purchase Price List Item',
+    'description': """ 
+Improve purchase price managment
+================================
+
+    * In Purchase List Item, the price is fixed based on price_surchage if base is 'fixed on UOP'
+    * If 'fixed on UOP', if product UOP change, the price list price will be change automtically.
+    * Add field 'Qty on Hand', and 'Stock Values' for product
+    * Add field 'Qty on Hand', 'Stock Values', UOP in product list view
+
+     """,
+    'author': 'Elico Corp',
+    'website': 'http://www.elico-corp.com',
+    'images' : [],
+    'depends': ['purchase'],
+    'data': [
+             'purchase_view.xml',
+    ],
+    'test': [],
+    'demo': [],
+    'installable': True,
+    'auto_install': False,
+    'application': False,
+}
 \ No newline at end of file
 
=== added directory 'purchase_price_list_item/i18n'
=== added file 'purchase_price_list_item/i18n/purchase_price_list_item.po'
--- purchase_price_list_item/i18n/purchase_price_list_item.po	1970-01-01 00:00:00 +0000
+++ purchase_price_list_item/i18n/purchase_price_list_item.po	2013-08-19 07:32:33 +0000
@@ -0,0 +1,33 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* purchase_price_list_item
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 7.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-08-14 09:03+0000\n"
+"PO-Revision-Date: 2013-08-14 09:03+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: purchase_price_list_item
+#: code:addons/purchase_price_list_item/purchase.py:34
+#, python-format
+msgid "Fix Price based on UoP"
+msgstr ""
+
+#. module: purchase_price_list_item
+#: model:ir.model,name:purchase_price_list_item.model_product_pricelist_item
+msgid "Pricelist item"
+msgstr ""
+
+#. module: purchase_price_list_item
+#: field:product.pricelist.item,uom_id:0
+msgid "UoM for Fix Price"
+msgstr ""
+
 
=== added file 'purchase_price_list_item/purchase.py'
--- purchase_price_list_item/purchase.py	1970-01-01 00:00:00 +0000
+++ purchase_price_list_item/purchase.py	2013-08-19 07:32:33 +0000
@@ -0,0 +1,332 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (c) 2010-2013 Elico Corp. All Rights Reserved.
+#    Author: Jean LELIEVRE <[e-mail]>
+#
+#    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 osv import osv, fields
+from tools.translate import _
+
+import openerp.addons.decimal_precision as dp
+
+import time
+from product._common import rounding
+
+
+class product_pricelist_item(osv.osv):
+    _inherit = "product.pricelist.item"
+
+    def _price_field_get(self, cr, uid, context=None):
+        result = super(product_pricelist_item, self)._price_field_get(cr, uid, context=context)
+
+        result.append((-3, _('Fix Price based on UoP')))
+        return result
+
+    _columns = {
+        'base': fields.selection(_price_field_get, 'Based on',required=True, size=-1, help="Base price for computation."),
+        'uom_id': fields.many2one('product.uom','UoM for Fix Price',store=True),
+    }
+    _defaults = {
+        'price_discount': lambda *a: -1,
+        'base': lambda *a: -3,
+    }
+
+    def product_id_change(self,cr,uid,ids,product_id,context=None):
+        if not product_id:
+            return{}
+        prod = self.pool.get('product.product').browse(cr,uid,product_id,context=context)
+
+        if prod.default_code:
+            return {'value': {'name': prod.default_code,'uom_id': prod.uom_po_id.id}}
+        return{}     
+
+    def create(self,cr,uid,vals,context=None):
+        if not vals.get('uom_id',False) and vals.get('product_id', False) and vals.get('base',False) == -3:
+            prod = self.pool.get('product.product').browse(cr,uid,vals.get('product_id',False),context=context)
+            vals['uom_id'] = prod.uom_po_id.id
+
+        return super(product_pricelist_item,self).create(cr,uid,vals,context=context) 
+
+    def write(self, cr, uid, ids, vals, context=None):
+        if type(ids) != type([]):
+            ids = [ids]
+        if not vals.get('uom_id', False) and ids:            
+            pl_item_obj = self.pool.get('product.pricelist.item')
+            for id in ids:
+                item = pl_item_obj.browse(cr, uid, id, context=context)
+                if item.base == -3 and item.product_id:
+                    vals['uom_id'] = item.product_id.uom_po_id.id
+        return super(product_pricelist_item, self).write(cr, uid, ids, vals, context=context) 
+
+product_pricelist_item()
+
+
+class product_pricelist(osv.osv):
+    _inherit = "product.pricelist"
+
+    #def price_get_multi(self, cr, uid, product_ids, context=None):
+    def price_get_multi(self, cr, uid, pricelist_ids, products_by_qty_by_partner, context=None):
+        """multi products 'price_get'.
+           @param pricelist_ids:
+           @param products_by_qty:
+           @param partner:
+           @param context: {
+             'date': Date of the pricelist (%Y-%m-%d),}
+           @return: a dict of dict with product_id as key and a dict 'price by pricelist' as value
+        """
+
+        def _create_parent_category_list(id, lst):
+            if not id:
+                return []
+            parent = product_category_tree.get(id)
+            if parent:
+                lst.append(parent)
+                return _create_parent_category_list(parent, lst)
+            else:
+                return lst
+        # _create_parent_category_list
+
+        if context is None:
+            context = {}
+
+        date = time.strftime('%Y-%m-%d')
+        if 'date' in context:
+            date = context['date']
+
+        currency_obj = self.pool.get('res.currency')
+        product_obj = self.pool.get('product.product')
+        product_category_obj = self.pool.get('product.category')
+        product_uom_obj = self.pool.get('product.uom')
+        supplierinfo_obj = self.pool.get('product.supplierinfo')
+        price_type_obj = self.pool.get('product.price.type')
+
+        # product.pricelist.version:
+        if not pricelist_ids:
+            pricelist_ids = self.pool.get('product.pricelist').search(cr, uid, [], context=context)
+
+        pricelist_version_ids = self.pool.get('product.pricelist.version').search(cr, uid, [
+                                                        ('pricelist_id', 'in', pricelist_ids),
+                                                        '|',
+                                                        ('date_start', '=', False),
+                                                        ('date_start', '<=', date),
+                                                        '|',
+                                                        ('date_end', '=', False),
+                                                        ('date_end', '>=', date),
+                                                    ])
+        if len(pricelist_ids) != len(pricelist_version_ids):
+            raise osv.except_osv(_('Warning!'), _("At least one pricelist has no active version !\nPlease create or activate one."))
+
+        # product.product:
+        product_ids = [i[0] for i in products_by_qty_by_partner]
+        #products = dict([(item['id'], item) for item in product_obj.read(cr, uid, product_ids, ['categ_id', 'product_tmpl_id', 'uos_id', 'uom_id'])])
+        products = product_obj.browse(cr, uid, product_ids, context=context)
+        products_dict = dict([(item.id, item) for item in products])
+
+        # product.category:
+        product_category_ids = product_category_obj.search(cr, uid, [])
+        product_categories = product_category_obj.read(cr, uid, product_category_ids, ['parent_id'])
+        product_category_tree = dict([(item['id'], item['parent_id'][0]) for item in product_categories if item['parent_id']])
+
+        results = {}
+        for product_id, qty, partner in products_by_qty_by_partner:
+            for pricelist_id in pricelist_ids:
+                price = False
+
+                tmpl_id = products_dict[product_id].product_tmpl_id and products_dict[product_id].product_tmpl_id.id or False
+
+                categ_id = products_dict[product_id].categ_id and products_dict[product_id].categ_id.id or False
+                categ_ids = _create_parent_category_list(categ_id, [categ_id])
+                if categ_ids:
+                    categ_where = '(categ_id IN (' + ','.join(map(str, categ_ids)) + '))'
+                else:
+                    categ_where = '(categ_id IS NULL)'
+
+                if partner:
+                    partner_where = 'base <> -2 OR %s IN (SELECT name FROM product_supplierinfo WHERE product_id = %s) '
+                    partner_args = (partner, tmpl_id)
+                else:
+                    partner_where = 'base <> -2 '
+                    partner_args = ()
+
+                #And
+                pl = self.pool.get('product.pricelist').browse(cr, uid, pricelist_id, context=context) 
+                if pl.type == "purchase":
+                    product = products_dict[product_id]
+                    if 'uom' in context:
+                        uom = product.uom_po_id
+                        if uom.id != context['uom']:
+                            qty = qty * product.uom_po_id.factor / product.uom_id.factor
+
+                cr.execute(
+                    'SELECT i.*, pl.currency_id '
+                    'FROM product_pricelist_item AS i, '
+                        'product_pricelist_version AS v, product_pricelist AS pl '
+                    'WHERE (product_tmpl_id IS NULL OR product_tmpl_id = %s) '
+                        'AND (product_id IS NULL OR product_id = %s) '
+                        'AND (' + categ_where + ' OR (categ_id IS NULL)) '
+                        'AND (' + partner_where + ') '
+                        'AND price_version_id = %s '
+                        'AND (min_quantity IS NULL OR min_quantity <= %s) '
+                        'AND i.price_version_id = v.id AND v.pricelist_id = pl.id '
+                    'ORDER BY sequence',
+                    (tmpl_id, product_id) + partner_args + (pricelist_version_ids[0], qty))
+                res1 = cr.dictfetchall()
+                uom_price_already_computed = False
+                for res in res1:
+                    if res:
+                        if res['base'] == -1:
+                            if not res['base_pricelist_id']:
+                                price = 0.0
+                            else:
+                                price_tmp = self.price_get(cr, uid,
+                                        [res['base_pricelist_id']], product_id,
+                                        qty, context=context)[res['base_pricelist_id']]
+                                ptype_src = self.browse(cr, uid, res['base_pricelist_id']).currency_id.id
+                                uom_price_already_computed = True
+                                price = currency_obj.compute(cr, uid, ptype_src, res['currency_id'], price_tmp, round=False)
+                        elif res['base'] == -2:
+                            # this section could be improved by moving the queries outside the loop:
+                            where = []
+                            if partner:
+                                where = [('name', '=', partner) ]
+                            sinfo = supplierinfo_obj.search(cr, uid,
+                                    [('product_id', '=', tmpl_id)] + where)
+                            price = 0.0
+                            if sinfo:
+                                qty_in_product_uom = qty
+                                product_default_uom = product_obj.read(cr, uid, [product_id], ['uom_id'])[0]['uom_id'][0]
+                                supplier = supplierinfo_obj.browse(cr, uid, sinfo, context=context)[0]
+                                seller_uom = supplier.product_uom and supplier.product_uom.id or False
+                                if seller_uom and product_default_uom and product_default_uom != seller_uom:
+                                    uom_price_already_computed = True
+                                    qty_in_product_uom = product_uom_obj._compute_qty(cr, uid, product_default_uom, qty, to_uom_id=seller_uom)
+                                cr.execute('SELECT * ' \
+                                        'FROM pricelist_partnerinfo ' \
+                                        'WHERE suppinfo_id IN %s' \
+                                            'AND min_quantity <= %s ' \
+                                        'ORDER BY min_quantity DESC LIMIT 1', (tuple(sinfo), qty_in_product_uom,))
+                                res2 = cr.dictfetchone()
+                                if res2:
+                                    price = res2['price']
+                        #Add by Andy
+                        elif res['base'] == -3:
+                            price = False
+                        else:
+                            price_type = price_type_obj.browse(cr, uid, int(res['base']))
+                            uom_price_already_computed = True
+                            price = currency_obj.compute(cr, uid,
+                                    price_type.currency_id.id, res['currency_id'],
+                                    product_obj.price_get(cr, uid, [product_id],
+                                    price_type.field, context=context)[product_id], round=False, context=context)
+
+                        if price is not False:
+                            price_limit = price
+                            price = price * (1.0 + (res['price_discount'] or 0.0))
+                            price = rounding(price, res['price_round']) #TOFIX: rounding with tools.float_rouding
+                            price += (res['price_surcharge'] or 0.0)
+                            if res['price_min_margin']:
+                                price = max(price, price_limit + res['price_min_margin'])
+                            if res['price_max_margin']:
+                                price = min(price, price_limit + res['price_max_margin'])
+                            break
+                        #Add by Andy
+                        else:        
+                            if res['base'] == -3:
+                                price = res['price_surcharge'] or 0.0                                    
+                                product = products_dict[product_id]
+                                if 'uom' in context:
+                                    uom = product.uom_po_id
+                                    if uom.id != context['uom']:
+                                        price = product_uom_obj._compute_price(cr, uid, uom.id, price, context['uom'])
+                                uom_price_already_computed = True
+                                #Todo: # Use company currency?
+                                if 'currency_id' in context:                                    
+                                    price = currency_obj.compute(cr, uid, 1,
+                                        context['currency_id'], price, context=context)
+                                if price:
+                                    break
+                    else:
+                        # False means no valid line found ! But we may not raise an
+                        # exception here because it breaks the search
+                        price = False
+
+                if price:
+                    results['item_id'] = res['id']
+                    if 'uom' in context and not uom_price_already_computed:
+                        product = products_dict[product_id]
+                        uom = product.uos_id or product.uom_id
+                        price = product_uom_obj._compute_price(cr, uid, uom.id, price, context['uom'])
+
+                if results.get(product_id):
+                    results[product_id][pricelist_id] = price
+                else:
+                    results[product_id] = {pricelist_id: price}
+
+        return results
+
+product_pricelist()
+
+
+
+class product_product(osv.osv):
+    _name = "product.product"
+    _inherit = "product.product"
+    
+    def _qty_uop(self, cr, uid, ids, name, arg, context=None):
+        res = {}
+        
+        uom_obj = self.pool.get('product.uom')     
+        for id in ids:
+            res.setdefault(id, 0.0)
+        for product in self.browse(cr, uid, ids):
+            res[product.id] = uom_obj._compute_qty(cr, uid, product.uom_id.id, product.qty_available, product.uom_po_id.id)
+        return res
+
+    def _amount_uom(self, cr, uid, ids, name, arg, context=None):
+        res = {}
+
+        for id in ids:
+            res.setdefault(id, 0.0)
+        for product in self.browse(cr, uid, ids):
+            res[product.id] = product.qty_available * product.standard_price
+        return res
+
+    _columns = {
+        #'price_uop': fields.float('Purchase Price(UoP)', digits_compute=dp.get_precision('Product Price')),
+        'qty_uop': fields.function(_qty_uop, type='float', string='Qty on Hand (UoP)', digits_compute=dp.get_precision('Product Unit of Measure')),
+        'amount_uom': fields.function(_amount_uom, type='float', string='Stock Values', digits_compute=dp.get_precision('Account')),
+    }
+    
+    def write(self, cr, uid, ids, vals, context=None):
+        if type(ids) != type([]):
+            ids = [ids]
+        if vals.get('uom_po_id', False) and ids:
+            uom_obj = self.pool.get('product.uom')
+            uop = uom_obj.browse(cr, uid, vals.get('uom_po_id', False), context=context)
+            pl_item_obj = self.pool.get('product.pricelist.item')
+            pl_ids = pl_item_obj.search(cr, uid, [('product_id', '=', ids[0]), ('base', '=', -3)], context=context)
+            for item in pl_item_obj.browse(cr, uid, pl_ids, context=context):
+                if item.uom_id and uop.id == item.uom_id.id:
+                    continue
+                new_price = item.price_surcharge / uop.factor * item.uom_id.factor
+                pl_item_obj.write(cr, uid, [item.id], {'uom_id': vals.get('uom_po_id', False), 'price_surcharge': new_price})
+        
+        return super(product_product, self).write(cr, uid, ids, vals, context=context)    
+
+product_product()
 \ No newline at end of file
 
=== added file 'purchase_price_list_item/purchase_view.xml'
--- purchase_price_list_item/purchase_view.xml	1970-01-01 00:00:00 +0000
+++ purchase_price_list_item/purchase_view.xml	2013-08-19 07:32:33 +0000
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<openerp>
+	<data>
+
+		<record id="product_pricelist_item_list_view_FC" model="ir.ui.view">
+            <field name="name">product.pricelist.item.list.FC</field>
+            <field name="model">product.pricelist.item</field>
+            <field name="inherit_id" ref="product.product_pricelist_item_tree_view" />
+            <field name="arch" type="xml">
+                <xpath expr="//field[@name='categ_id']" position="before">
+                    <field name="price_surcharge" attrs="{'invisible':[('base', '!=', -3)]}"/>
+                    <field name="uom_id" attrs="{'invisible':[('base', '!=', -3)],'readonly':1}"/>
+                </xpath>
+            </field>
+        </record>
+
+        <record id="product_pricelist_item_form_view_FC" model="ir.ui.view">
+            <field name="name">product.pricelist.item.form.FC</field>
+            <field name="model">product.pricelist.item</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="product.product_pricelist_item_form_view" />
+            <field name="arch" type="xml">
+                <xpath expr="//field[@name='product_id']" position="replace">
+                    <field name="product_id" on_change="product_id_change(product_id)" attrs="{'required': [('base','=', -3)]}"/>
+                    <field name="uom_id" attrs="{'invisible':[('base', '!=', -3)],'readonly':1}"/>
+                </xpath>
+            </field>
+        </record>
+
+        <record id="product_product_tree_view_uop" model="ir.ui.view">
+            <field name="name">product.product.tree.uop</field>
+            <field name="model">product.product</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="product.product_product_tree_view" />
+            <field name="arch" type="xml">
+                <xpath expr="//field[@name='state']" position="before">
+                    <field name="qty_uop"/>
+                    <field name="uom_po_id"/>
+                </xpath>
+                <xpath expr="//field[@name='standard_price']" position="replace">
+                    <field name="standard_price"/>
+                    <field name="amount_uom"/>
+                </xpath>
+            </field>
+        </record>
+
+	</data>
+</openerp>
 \ No newline at end of file