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

[LIN Yu]

[ADD] Purchase PO Price Control Module
        * Enable/Disable control on PO Price

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

Hi Lin,

Thanks for the contribution ! A got some stuff I'm not sure about in this module.

1) The description only mention "Enable/Disable control on PO Price" it's a bit too short.

2) Lots of other fields (I mean not related to the control of price) is present on PO Line, like qty_received, qty_unreceived,.. Those field do not seems to me related to the purpose of the module.. I don't actually know if it really make sens to have them here. Any pointer ?

3) Field like modify_price do not seems to be used, sequence serve another purpose than the one I see in this module

What I suggest is that you firstly make a better explanation of the purpose and use of the module. Once done, we can discuss further on what to let in there and what not. On my own opinion, this module should only forbid to change the price in PO if not allowed for this supplier.

Best regards,

review: Needs Information (code review, functionnal)

[LIN Yu (lin-yu)]

Dear Joël,
Thanks for your reply.
I will work on it and make it more clear.

BR,
On 09/11/2013 10:57 PM, Joël Grand-Guillaume @ camptocamp wrote:
> Review: Needs Information code review, functionnal
>
> Hi Lin,
>
> Thanks for the contribution ! A got some stuff I'm not sure about in this module.
>
> 1) The description only mention "Enable/Disable control on PO Price" it's a bit too short.
>
> 2) Lots of other fields (I mean not related to the control of price) is present on PO Line, like qty_received, qty_unreceived,.. Those field do not seems to me related to the purpose of the module.. I don't actually know if it really make sens to have them here. Any pointer ?
>
> 3) Field like modify_price do not seems to be used, sequence serve another purpose than the one I see in this module
>
> What I suggest is that you firstly make a better explanation of the purpose and use of the module. Once done, we can discuss further on what to let in there and what not. On my own opinion, this module should only forbid to change the price in PO if not allowed for this supplier.
>
> Best regards,
>
>

--
LIN Yu

LIN Yu
/Project Manager/
--
*Elico Corporation, Shanghai
/OpenERP Premium Certified Training Partner/ *
Cell: + 86 186 1691 1351
Office: + 86 21 6211 8017/27
Skype: llccluf
<email address hidden> <mailto:<email address hidden>>
http://www.elico-corp.com

Elico Corp

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

> Dear Joël,
> Thanks for your reply.
> I will work on it and make it more clear.
>
> BR,

Hi,

So I change your proposal to 'work in progress'. Please set it back to 'Needs review' when you are done.

[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] purchase_po_price

=== 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-19 07:16:14 +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-19 07:16:14 +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-19 07:16:14 +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-19 07:16:14 +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-19 07:16:14 +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