Merge lp:~jean-lelievre/purchase-wkfl/new_modules_purchase into lp:~purchase-core-editors/purchase-wkfl/7.0

[Jean LELIEVRE ElicoCorp]

Add modules :
- purchase_contacts : Add contact person and delivery person in purchase
- purchase_control_supplier : Enables/Disables the supplier control in Purchase
- purchase_po_price : Enable/Disable control on PO Price
- 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 )
- product_supplier_info : Add a specific View for Supplier

[Stefan Rijnhart (Opener) (stefan-opener)]

Hi Jean,

thank you for your contributions. It would be helpful for the reviewers if you could create separate proposals for each of the added modules. It will make review easier and speed up the reviewing process. Would it be acceptable to resubmit your modules in separate proposals?

review: Needs Information

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

Any update ?

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

Hi Jean, I didn't checked if you have been able to create separate proposals for each module, if yes, can you close this MP?

[Yannick Vaucher @ Camptocamp (yvaucher-c2c)]

Hello Jean,

Please resubmit all modules separately. It will be better to have one MP per module

Thanks

review: Needs Resubmitting (one mp per module)

[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

17. By Jean LELIEVRE ElicoCorp on 2013-08-16

[ADD] purchase_control_supplier, purchase_po_price, purchase_price_list_item

16. By Jean LELIEVRE ElicoCorp on 2013-08-12

Add contact person and delivery person in Purchase

=== added directory 'product_supplier_info'
=== added file 'product_supplier_info/__init__.py'
--- product_supplier_info/__init__.py	1970-01-01 00:00:00 +0000
+++ product_supplier_info/__init__.py	2013-08-16 04:18:41 +0000
@@ -0,0 +1,23 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (c) 2010-2013 Elico Corp. All Rights Reserved.
+#    Author: Yannick Gouin <[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 product
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file

=== added file 'product_supplier_info/__openerp__.py'
--- product_supplier_info/__openerp__.py	1970-01-01 00:00:00 +0000
+++ product_supplier_info/__openerp__.py	2013-08-16 04:18:41 +0000
@@ -0,0 +1,47 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (c) 2010-2013 Elico Corp. All Rights Reserved.
+#    Author: LIN Yu <[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': 'Product Supplier Info',
+    'version': '1.0',
+    'category': 'purchase',
+    'sequence': 19,
+    'summary': 'Product Supplier Info',
+    'description': """
+Add a specific View for Supplier 
+==================================================
+    """,
+    'author': 'Elico Corp',
+    'website': 'http://www.elico-corp.com',
+    'images' : [],
+    'depends': ['product','stock'],#TO REMOVE joomlaconnector for standard
+    'data': [
+        'product_view.xml',
+    ],
+    'test': [],
+    'demo': [],
+    'installable': True,
+    'auto_install': False,
+    'application': False,
+}
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file

=== added file 'product_supplier_info/product.py'
--- product_supplier_info/product.py	1970-01-01 00:00:00 +0000
+++ product_supplier_info/product.py	2013-08-16 04:18:41 +0000
@@ -0,0 +1,54 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (c) 2010-2013 Elico Corp. All Rights Reserved.
+#    Author: Yannick Gouin <[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 wil    l 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 openerp import tools
+from tools.translate import _
+import openerp.addons.decimal_precision as dp
+
+class product_supplierinfo(osv.osv):
+    _inherit = 'product.supplierinfo'
+    
+    def _product_available(self, cr, uid, ids, field_names=None, arg=False, context=None):
+        if not field_names:
+            field_names = []
+        if context is None:
+            context = {}
+        res = {}
+        for id in ids:
+            res[id] = {}.fromkeys(field_names, 0.0)
+            supplier_info = self.browse(cr, uid, id)
+            for f in field_names:
+                if f == 'qty_available':
+                    res[id][f] = supplier_info.product_id.qty_available
+                if f == 'virtual_available':
+                    res[id][f] = supplier_info.product_id.virtual_available
+        return res
+    
+    _columns={
+        'product_id' : fields.many2one('product.product', 'Product', select=1, ondelete='cascade', required=True),
+        'qty_available' : fields.function(_product_available,multi='qty_available',type='float',digits_compute=dp.get_precision('Product Unit of Measure'),string="Quantity On Hand"),
+        'virtual_available' : fields.function(_product_available,multi='qty_available',type='float', digits_compute=dp.get_precision('Product Unit of Measure'),string="Forecasted Quantity"),
+    }
+product_supplierinfo()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'product_supplier_info/product_view.xml'
--- product_supplier_info/product_view.xml	1970-01-01 00:00:00 +0000
+++ product_supplier_info/product_view.xml	2013-08-16 04:18:41 +0000
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openerp>
+    <data>
+
+        <record id="view_product_supplierinfo_search" model="ir.ui.view">
+            <field name="name">product.supplierinfo.search</field>
+            <field name="model">product.supplierinfo</field>
+            <field name="arch" type="xml">
+                <search string="Product Supplier Info">
+                	<field name="name" string="Supplier"/>
+                	<field name="product_code" string="Supplier Product Code"/>
+                    <field name="product_name" string="Supplier Product Code"/>
+                    <field name="product_id" />
+                    <group  expand='1' string='Group by...' groups="base.group_extended">
+                       <filter string='Product Code' name='supplier_code' icon="terp-stock_symbol-selection" domain="[]" context="{'group_by' : 'product_code'}" />
+                       <filter string='Product' name='product' icon="terp-stock_symbol-selection" domain="[]" context="{'group_by' : 'product_id'}" />
+                       <filter string='Supplier' name='supplier' icon="terp-stock_symbol-selection" domain="[]" context="{'group_by' : 'name'}" />
+                    </group>
+                </search>
+            </field>
+        </record>
+        
+        <record id="view_product_supplierinfo_tree1" model="ir.ui.view">
+            <field name="name">product.supplierinfo.tree1</field>
+            <field name="model">product.supplierinfo</field>
+            <field name="arch" type="xml">
+            	<tree string="Supplier Information" editable="top">
+                    <field name="sequence" widget="handle"/>
+                    <field name="product_code" string="Supplier Product Code"/>
+                    <field name="product_id" string="Product Name"/>
+                    <field name="product_name" string="Supplier Product Name"/>
+                    <field name="name"/>
+                    <field name="delay"/>
+                    <field name="qty_available"/>
+                    <field name="virtual_available"/>
+                    <field name="min_qty"/>
+                    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                </tree>
+            </field>
+        </record>
+        <record id="view_product_supplierinfo_from1" model="ir.ui.view">
+            <field name="name">product.supplierinfo.from1</field>
+            <field name="model">product.supplierinfo</field>
+            <field name="inherit_id" ref="product.product_supplierinfo_form_view"/>
+            <field name="arch" type="xml">
+                <xpath expr="//field[@name='sequence']" position="before">
+                    <field name="product_id"/>
+                </xpath>
+            </field>
+        </record>
+        
+
+        <record id="action_product_supplier_info" model="ir.actions.act_window">
+            <field name="name">Product Supplier Info</field>
+            <field name="res_model">product.supplierinfo</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="view_id" ref="view_product_supplierinfo_tree1"/>
+            <field name="search_view_id" ref="view_product_supplierinfo_search"/>
+            <field name="context">{'search_default_supplier':1,'group_by':[]}</field>
+        </record>
+
+	    <menuitem
+	        id="menu_product_supplier_info"
+	        name="Product Suppliers"
+	        sequence="15"
+	        action="action_product_supplier_info"
+	        parent="purchase.menu_procurement_management_product"/>
+    </data>
+</openerp>

=== added directory 'purchase_contacts'
=== added file 'purchase_contacts/__init__.py'
--- purchase_contacts/__init__.py	1970-01-01 00:00:00 +0000
+++ purchase_contacts/__init__.py	2013-08-16 04:18:41 +0000
@@ -0,0 +1,25 @@
+# -*- 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
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file

=== added file 'purchase_contacts/__openerp__.py'
--- purchase_contacts/__openerp__.py	1970-01-01 00:00:00 +0000
+++ purchase_contacts/__openerp__.py	2013-08-16 04:18:41 +0000
@@ -0,0 +1,51 @@
+# -*- 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/>.
+#
+##############################################################################
+
+{
+    'name': 'Purchase Contacts',
+    'version': '1.0',
+    'category': 'Purchase',
+    'sequence': 19,
+    'summary': 'Enables the Supplier Contact and Delivery Contact fields in the Purchase module',
+    'description': """
+FieldsChina purchase
+==================================================
+Fine tune Purchase addon
+
+* Add several contact for purchase order of own company, delivery, contact.
+* Add sequence for partner ref.
+    """,
+    '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,
+}
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file

=== added directory 'purchase_contacts/i18n'
=== added file 'purchase_contacts/i18n/zh_CN.po'
--- purchase_contacts/i18n/zh_CN.po	1970-01-01 00:00:00 +0000
+++ purchase_contacts/i18n/zh_CN.po	2013-08-16 04:18:41 +0000
@@ -0,0 +1,42 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* purchase_contacts
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 7.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-08-14 08:56+0000\n"
+"PO-Revision-Date: 2013-08-14 08:56+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_contacts
+#: field:purchase.order,delivery_id:0
+msgid "Delivery"
+msgstr "收货"
+
+#. module: purchase_contacts
+#: model:ir.model,name:purchase_contacts.model_res_partner
+msgid "Partner"
+msgstr "业务伙伴"
+
+#. module: purchase_contacts
+#: field:purchase.order,contact_partner_id:0
+msgid "Supplier Contact"
+msgstr "供应商联系人"
+
+#. module: purchase_contacts
+#: field:purchase.order,contact_delivery_id:0
+msgid "Delivery Contact"
+msgstr "收货联系"
+
+#. module: purchase_contacts
+#: model:ir.model,name:purchase_contacts.model_purchase_order
+msgid "Purchase Order"
+msgstr "采购订单"
+

=== added file 'purchase_contacts/purchase.py'
--- purchase_contacts/purchase.py	1970-01-01 00:00:00 +0000
+++ purchase_contacts/purchase.py	2013-08-16 04:18:41 +0000
@@ -0,0 +1,90 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (c) 2010-2013 Elico Corp. All Rights Reserved.
+#    Author: Yannick Gouin <[e-mail]>
+#    Author: 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/>.
+#
+##############################################################################
+
+import time
+from product._common import rounding
+
+from osv import osv, fields
+from tools.translate import _
+import openerp.addons.decimal_precision as dp
+import netsvc
+from openerp.osv.orm import browse_record, browse_null
+from dateutil.relativedelta import relativedelta
+import pytz
+from datetime import datetime
+import pooler
+
+class purchase_order(osv.osv):
+    _inherit = 'purchase.order'
+
+    _columns = {
+        'delivery_id':fields.many2one('res.partner', 'Delivery', states={'done':[('readonly', True)]},),
+        'contact_delivery_id':fields.many2one('res.partner', 'Delivery Contact', states={'done':[('readonly', True)]}),
+        'contact_partner_id':fields.many2one('res.partner', 'Supplier Contact', states={'done':[('readonly', True)]}),
+    }
+
+    def onchange_delivery_id(self, cr, uid, ids, partner_id):
+        if not partner_id:
+            return {'value': {
+                'contact_delivery_id': False }}
+            
+        partner = self.pool.get('res.partner')
+        supplier_address = partner.contact_get(cr, uid, [partner_id], ['default'])
+        #supplier = partner.browse(cr, uid, partner_id)
+        return {'value': {            
+            'contact_delivery_id': supplier_address and supplier_address['default'] or False
+            }}
+
+purchase_order()
+
+class res_partner(osv.osv):
+    _name = "res.partner"
+    _inherit = "res.partner"
+
+    #_sql_constraints = [
+    #    ('ref_uniq', 'unique(ref, company_id)', 'Supplier Reference must be unique per Company!'),
+    #]
+
+    _defaults = {
+        'ref': lambda obj, cr, uid, context: '/',
+        }
+
+    def create(self, cr, uid, vals, context=None):
+        if vals.get('ref', '/') == '/' and vals.get('supplier', False):
+            # SHOULD USE ir_sequence.next_by_code() or ir_sequence.next_by_id()
+            vals['ref'] = self.pool.get('ir.sequence').get(cr, uid, 'fake.supplier') or '/'
+        doc = super(res_partner, self).create(cr, uid, vals, context=context)
+        return doc 
+
+    def copy(self, cr, uid, id, default=None, context=None):
+        if not default:
+            default = {}
+        if default.get('supplier', False):
+            # SHOULD USE ir_sequence.next_by_code() or ir_sequence.next_by_id()
+            default.update({
+                'ref': self.pool.get('ir.sequence').get(cr, uid, 'fake.supplier'),
+                'name': default.get('name', '/') + "(copy)",
+            })
+        return super(res_partner, self).copy(cr, uid, id, default, context)
+
+res_partner()
\ No newline at end of file

=== added file 'purchase_contacts/purchase_view.xml'
--- purchase_contacts/purchase_view.xml	1970-01-01 00:00:00 +0000
+++ purchase_contacts/purchase_view.xml	2013-08-16 04:18:41 +0000
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openerp>    
+
+    <data noupdate="1">
+        <record id="seq_type_supplier" model="ir.sequence.type">
+            <field name="name">Supplier</field>
+            <field name="code">fake.supplier</field>
+        </record>
+
+        <!--Sequences for Delivery Route-->
+
+        <record id="seq_delivery_route" model="ir.sequence">
+            <field name="name">Supplier</field>
+            <field name="code">fake.supplier</field>
+            <field name="prefix">C</field>
+            <field name="padding">5</field>
+            <field name="company_id" eval="False"/>
+        </record>
+    </data>
+    
+    <data>
+        
+        <!-- Purchase order -->
+        <record id="purchase_order_form_fc" model="ir.ui.view">
+
+            <field name="name">purchase.order.form_contact</field>
+            <field name="model">purchase.order</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="purchase.purchase_order_form"/>
+
+            <field name="arch" type="xml">
+
+                <xpath expr="/form/sheet/group/group/field[@name='warehouse_id']" position="after">
+                    <field name="delivery_id" on_change="onchange_delivery_id(delivery_id)" attrs="{'required': 1}"/>
+                </xpath> 
+
+                <xpath expr="/form/sheet/group/group/field[@name='partner_ref']" position="after">
+
+                    <field name="contact_delivery_id" domain="[('parent_id','=', delivery_id)]" context="{'show_mobile': 1}" options="{&quot;always_reload&quot;: True}"/>
+                </xpath>
+
+                <xpath expr="/form/sheet/group/group/field[@name='partner_id']" position="replace">
+                    
+                    <field name="partner_id" on_change="onchange_partner_id(partner_id)" context="{'search_default_supplier':1,'default_supplier':1,'default_customer':0,'show_address': 1}" options="{&quot;always_reload&quot;: True}" domain="[('supplier','=',True)]"/> 
+
+                    <field name="contact_partner_id" domain="[('parent_id','=', partner_id)]" context="{'show_mobile': 1}" options="{&quot;always_reload&quot;: True}"/>
+                    
+                </xpath>    
+
+            </field>
+        </record>
+        
+    </data>
+</openerp>

=== added directory 'purchase_control_supplier'
=== added file 'purchase_control_supplier/__init__.py'
--- purchase_control_supplier/__init__.py	1970-01-01 00:00:00 +0000
+++ purchase_control_supplier/__init__.py	2013-08-16 04:18:41 +0000
@@ -0,0 +1,25 @@
+# -*- 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
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file

=== added file 'purchase_control_supplier/__openerp__.py'
--- purchase_control_supplier/__openerp__.py	1970-01-01 00:00:00 +0000
+++ purchase_control_supplier/__openerp__.py	2013-08-16 04:18:41 +0000
@@ -0,0 +1,46 @@
+# -*- 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/>.
+#
+##############################################################################
+
+{
+    'name': 'Purchase Control Supplier',
+    'version': '1.0',
+    'category': 'Purchase',
+    'sequence': 19,
+    'summary': 'Purchase Control Supplier',
+    'description': """
+Enables/Disables the supplier control in Purchase.
+    """,
+    '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,
+}
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file

=== added directory 'purchase_control_supplier/i18n'
=== added file 'purchase_control_supplier/i18n/zh_CN.po'
--- purchase_control_supplier/i18n/zh_CN.po	1970-01-01 00:00:00 +0000
+++ purchase_control_supplier/i18n/zh_CN.po	2013-08-16 04:18:41 +0000
@@ -0,0 +1,37 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* purchase_control_supplier
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 7.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-08-14 09:01+0000\n"
+"PO-Revision-Date: 2013-08-14 09:01+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_control_supplier
+#: field:res.partner,supplier_product_limit:0
+msgid "Control Supplier Search"
+msgstr "Control Supplier Search"
+
+#. module: purchase_control_supplier
+#: model:ir.model,name:purchase_control_supplier.model_res_partner
+msgid "Partner"
+msgstr "业务伙伴"
+
+#. module: purchase_control_supplier
+#: model:ir.model,name:purchase_control_supplier.model_product_product
+msgid "Product"
+msgstr "产品"
+
+#. module: purchase_control_supplier
+#: help:res.partner,supplier_product_limit:0
+msgid "If checked, allows you to search only the product in this supplier )"
+msgstr "If checked, allows you to search only the product in this supplier )"
+

=== added file 'purchase_control_supplier/purchase.py'
--- purchase_control_supplier/purchase.py	1970-01-01 00:00:00 +0000
+++ purchase_control_supplier/purchase.py	2013-08-16 04:18:41 +0000
@@ -0,0 +1,53 @@
+# -*- 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
+
+class product_product(osv.osv):
+    _name = "product.product"
+    _inherit = "product.product"
+    
+    def search(self, cr, uid, args, offset=0, limit=None, order=None, context=None, count=False):
+
+        if context and context.get('supplier_id', False):
+            product_limit = self.pool.get('res.partner').read(cr,uid,context['supplier_id'],['supplier_product_limit'])['supplier_product_limit']
+            if product_limit:
+                #    ids = []
+                cr.execute("SELECT distinct(product_id) FROM product_supplierinfo where name = %s" % (context.get('supplier_id')))
+                ids = [x[0] for x in cr.fetchall()]
+                args.append(('id', 'in', ids))
+                order = 'default_code'
+        return super(product_product, self).search(cr, uid, args, offset=offset, limit=limit, order=order, context=context, count=count)
+
+product_product()
+
+class res_partner(osv.osv):
+    _name = 'res.partner'
+    _inherit = 'res.partner'
+
+    _columns = {
+        'supplier_product_limit':fields.boolean("Control Supplier Search", help="""If checked, allows you to search only the product in this supplier )"""),
+    }
+
+    _defaults = {
+        'supplier_product_limit': True,
+    }
\ No newline at end of file

=== added file 'purchase_control_supplier/purchase_view.xml'
--- purchase_control_supplier/purchase_view.xml	1970-01-01 00:00:00 +0000
+++ purchase_control_supplier/purchase_view.xml	2013-08-16 04:18:41 +0000
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openerp>
+    <data>
+    	
+        <record id="view_partner_form_joomla1" model="ir.ui.view">
+            <field name="name">res.partner.form.FC</field>
+            <field name="model">res.partner</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="base.view_partner_form" />
+            <field name="arch" type="xml">
+                <xpath expr="//field[@name='customer']" position="after">
+                    <field name="supplier_product_limit" attrs="{'invisible':[('supplier','!=',True)]}"/>
+                </xpath>
+            </field>
+        </record>
+
+
+
+        <!-- Purchase Order -->
+        <record id="purchase_order_form_fc" model="ir.ui.view">
+            <field name="name">purchase.order.form_FC</field>
+            <field name="model">purchase.order</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="purchase.purchase_order_form"/>
+            <field name="arch" type="xml">
+                <xpath expr="//field[@name='order_line']/tree/field['product_id']" position="replace">
+                    
+                            <field name="product_id" on_change="onchange_product_id(parent.pricelist_id,product_id,0,product_uom,parent.partner_id, parent.date_order,parent.fiscal_position,date_planned,name,price_unit,context)" context="{'supplier_id': parent.partner_id}"/>
+
+                </xpath>
+            </field>
+        </record>
+    </data>
+</openerp>

=== added directory 'purchase_po_price'
=== added file 'purchase_po_price/__init__.py'
--- purchase_po_price/__init__.py	1970-01-01 00:00:00 +0000
+++ purchase_po_price/__init__.py	2013-08-16 04:18:41 +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_po_price/__openerp__.py'
--- purchase_po_price/__openerp__.py	1970-01-01 00:00:00 +0000
+++ purchase_po_price/__openerp__.py	2013-08-16 04:18:41 +0000
@@ -0,0 +1,42 @@
+# -*- 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/>.
+#
+##############################################################################
+
+{
+    'name': 'Purchase PO Price',
+    'version': '1.0',
+    'category': 'Purchase',
+    'sequence': 19,
+    'summary': 'Purchase PO Price',
+    'description': """ Enable/Disable control on PO Price """,
+    '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_po_price/i18n'
=== added file 'purchase_po_price/i18n/zh_CN.po'
--- purchase_po_price/i18n/zh_CN.po	1970-01-01 00:00:00 +0000
+++ purchase_po_price/i18n/zh_CN.po	2013-08-16 04:18:41 +0000
@@ -0,0 +1,89 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* purchase_po_price
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 7.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-08-14 09:02+0000\n"
+"PO-Revision-Date: 2013-08-14 09:02+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_po_price
+#: code:addons/purchase_po_price/purchase.py:105
+#, python-format
+msgid "You can not modify the price of this product sold by this supplier !"
+msgstr "You can not modify the price of this product sold by this supplier !"
+
+#. module: purchase_po_price
+#: model:ir.model,name:purchase_po_price.model_purchase_order_line
+msgid "Purchase Order Line"
+msgstr "采购订单明细"
+
+#. module: purchase_po_price
+#: field:purchase.order.line,amount_subtotal:0
+msgid "Subtotal(Inc. Tax)"
+msgstr "小计(含税)"
+
+#. module: purchase_po_price
+#: field:purchase.order.line,modify_price:0
+msgid "Modify Price"
+msgstr "修改价格"
+
+#. module: purchase_po_price
+#: field:purchase.order.line,qty_received:0
+msgid "Reception Qty"
+msgstr "已收货数量"
+
+#. module: purchase_po_price
+#: field:purchase.order.line,sequence:0
+msgid "Sequence"
+msgstr "序号"
+
+#. module: purchase_po_price
+#: code:addons/purchase_po_price/purchase.py:105
+#, python-format
+msgid "PO Price"
+msgstr "PO Price"
+
+#. module: purchase_po_price
+#: field:purchase.order.line,qty_unreceived:0
+msgid "Waiting Qty"
+msgstr "待收货数量"
+
+#. module: purchase_po_price
+#: view:purchase.order:0
+msgid "Purchase Order Lines"
+msgstr "采购订单明细"
+
+#. module: purchase_po_price
+#: field:purchase.order.line,price_unit_original:0
+msgid "Original Unit Price"
+msgstr "原始单价"
+
+#. module: purchase_po_price
+#: model:ir.model,name:purchase_po_price.model_res_partner
+msgid "Partner"
+msgstr "业务伙伴"
+
+#. module: purchase_po_price
+#: help:res.partner,po_price_modification_limit:0
+msgid "If checked, allows you to change the price in PO (only when either the Supplier or Product allow it)"
+msgstr "若选择, 允许你在采购上修改单价(在供应商或者产品上设置一个即可)"
+
+#. module: purchase_po_price
+#: help:purchase.order.line,sequence:0
+msgid "Sequence for order in view and print report"
+msgstr "用于视图和报表中的序号"
+
+#. module: purchase_po_price
+#: field:res.partner,po_price_modification_limit:0
+msgid "No control on PO price"
+msgstr "不控采购单价"
+

=== added file 'purchase_po_price/purchase.py'
--- purchase_po_price/purchase.py	1970-01-01 00:00:00 +0000
+++ purchase_po_price/purchase.py	2013-08-16 04:18:41 +0000
@@ -0,0 +1,113 @@
+# -*- 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
+
+class res_partner(osv.osv):
+    _name = 'res.partner'
+    _inherit = 'res.partner'
+
+    _columns = {
+        'po_price_modification_limit':fields.boolean("No control on PO price", help="""If checked, allows you to change the price in PO (only when either the Supplier or Product allow it)"""),
+    }
+
+    _defaults = {
+        'po_price_modification_limit': True,
+    }
+res_partner()
+
+class purchase_order_line(osv.osv):
+    _inherit = 'purchase.order.line'
+    
+    _order = 'order_id desc, sequence'
+
+    def _amount_line_with_tax(self, cr, uid, ids, prop, arg, context=None):
+        res = {}
+        cur_obj = self.pool.get('res.currency')
+        tax_obj = self.pool.get('account.tax')
+        for line in self.browse(cr, uid, ids, context=context):
+            taxes = tax_obj.compute_all(cr, uid, line.taxes_id, line.price_unit, line.product_qty, line.product_id, line.order_id.partner_id, force_excluded=True)
+            cur = line.order_id.pricelist_id.currency_id
+            res[line.id] = cur_obj.round(cr, uid, cur, taxes['total'])
+        return res
+    
+    def _qty_received(self, cr, uid, ids, prop, arg, context=None):
+        res = {}
+        for line in self.browse(cr, uid, ids, context=context):
+            qty = 0.0
+            for move in line.move_ids:
+                if move.state == 'done':
+                    qty += move.product_qty
+            res[line.id] = qty
+        return res
+    
+    def _qty_unreceived(self, cr, uid, ids, prop, arg, context=None):
+        res = {}
+        for line in self.browse(cr, uid, ids, context=context):
+            qty = 0.0
+            for move in line.move_ids:
+                if move.state not in ('done', 'cancel'):
+                    qty += move.product_qty
+            res[line.id] = qty
+        return res
+
+    _columns = {
+        'modify_price': fields.boolean('Modify Price'),
+        'sequence': fields.integer('Sequence', help="Sequence for order in view and print report"),
+        'amount_subtotal': fields.function(_amount_line_with_tax, string='Subtotal(Inc. Tax)', type='float', digits_compute=dp.get_precision('Account')),
+        'qty_received': fields.function(_qty_received, string='Reception Qty', type='float', digits_compute=dp.get_precision('Product Unit of Measure')),
+        'qty_unreceived': fields.function(_qty_unreceived, string='Waiting Qty', type='float', digits_compute=dp.get_precision('Product Unit of Measure')),
+        'price_unit_original': fields.float('Original Unit Price', digits_compute=dp.get_precision('Product Price')),
+        #'price_unit_exclude_tax': fields.function(_price_unit_line_without_tax, string='Unit Price(Exc. Tax)', type='float', digits_compute=dp.get_precision('Product Price')),
+    }
+    _defaults = {
+        'sequence': 1,
+        'modify_price': False,
+    }    
+
+    
+    def onchange_price_unit(self, cr, uid, ids, partner_id, product_id, price_unit_original, price_unit, context=None):
+        #Not use at the moment! add a readonly attribute in view definition!
+        context = context or {}
+        res = {}
+        
+        if not partner_id and not product_id:
+            return res
+        product = self.pool.get('product.product').browse(cr, uid, product_id, context=context)
+        partner = self.pool.get('res.partner').browse(cr, uid, partner_id, context=context)
+        
+        #if purchase_config_settings.po_price_modification_limit:
+        #if not product.po_price_modification_limit and not partner.po_price_modification_limit and price_unit_original != price_unit:
+        if not partner.po_price_modification_limit:
+
+            res['value'] = {'price_unit': price_unit_original}
+            res['warning'] = {'title' : _('PO Price'), 'message' : _('You can not modify the price of this product sold by this supplier !')}
+            #raise osv.except_osv(_('Error!'), _('You can not modify the price of this product sold by this supplier !'))
+        else:
+            res['value'] = {'price_unit_original':price_unit}
+        #ENDIF
+
+        return res
+
+purchase_order_line()

=== added file 'purchase_po_price/purchase_view.xml'
--- purchase_po_price/purchase_view.xml	1970-01-01 00:00:00 +0000
+++ purchase_po_price/purchase_view.xml	2013-08-16 04:18:41 +0000
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openerp>
+    <data>
+
+        <record id="view_partner_form_joomla" model="ir.ui.view">
+            <field name="name">res.partner.form.FC</field>
+            <field name="model">res.partner</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="base.view_partner_form" />
+            <field name="arch" type="xml">
+                <xpath expr="//field[@name='customer']" position="after">
+
+                    <field name="po_price_modification_limit" attrs="{'invisible':[('supplier','!=',True)]}"/>
+
+                    <!-- <field name="supplier_product_limit" attrs="{'invisible':[('supplier','!=',True)]}"/> -->
+
+                </xpath>
+            </field>
+        </record>
+
+        <!-- <record id="product_normal_form_view_FC" model="ir.ui.view">
+            <field name="name">product.normal.form.FC</field>
+            <field name="model">product.product</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="product.product_normal_form_view" />
+            <field name="arch" type="xml">
+                <xpath expr="//field[@name='uom_po_id']" position="after">
+                    <field name="po_price_modification_limit"/>
+                </xpath>
+            </field>
+        </record> -->
+
+        <!-- Purchase Order -->
+        <record id="purchase_order_form_fc" model="ir.ui.view">
+            <field name="name">purchase.order.form_FC</field>
+            <field name="model">purchase.order</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="purchase.purchase_order_form"/>
+            <field name="arch" type="xml">
+                <xpath expr="//field[@name='order_line']" position="replace">
+                    <field name="order_line">
+                        <tree string="Purchase Order Lines" editable="bottom">
+
+                            <!-- field name="sequence"/>< by Andy-->
+                            <field name="modify_price" invisible="1"/>
+                            <!-- <field name="product_id" on_change="onchange_product_id(parent.pricelist_id,product_id,0,product_uom,parent.partner_id, parent.date_order,parent.fiscal_position,date_planned,name,price_unit,context)" context="{'supplier_id': parent.partner_id}"/> -->
+                            <field name="name"/>
+                            <field name="date_planned"/>
+                            <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                            <field name="account_analytic_id" groups="purchase.group_analytic_accounting" domain="[('parent_id','!=',False)]"/>
+                            <field name="product_qty" on_change="onchange_product_id(parent.pricelist_id,product_id,product_qty,product_uom,parent.partner_id,parent.date_order,parent.fiscal_position,date_planned,name,price_unit,context)"/>
+                            <field name="product_uom" groups="product.group_uom" on_change="onchange_product_uom(parent.pricelist_id,product_id,product_qty,product_uom,parent.partner_id, parent.date_order,parent.fiscal_position,date_planned,name,price_unit,context)"/>
+                            <!--field name="price_unit" attrs="{'readonly':[('modify_price','=',True)]}"/-->
+                            <field name="price_unit_original" invisible="1"/>
+                            <field name="price_unit" on_change="onchange_price_unit(parent.partner_id,product_id,price_unit_original,price_unit,context)"/>
+                            <field name="taxes_id" widget="many2many_tags" domain="[('parent_id','=',False),('type_tax_use','!=','sale')]"/>
+                            <!-- <field name="price_unit_exclude_tax"/> -->
+                            <field name="price_subtotal" invisible="1"/>
+                            <field name="amount_subtotal"/><!-- by Andy-->
+
+                        </tree>
+                    </field>
+                </xpath>
+            </field>
+        </record>
+
+    </data>
+</openerp>
\ No newline at end of file

=== 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-16 04:18:41 +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-16 04:18:41 +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-16 04:18:41 +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-16 04:18:41 +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-16 04:18:41 +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