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

[LIN Yu]

[ADD] module purchase_supplier_control
* Enables/Disables the supplier control in Purchase.

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

Hi Lin,

Thanks for the proposal ! A few remarks here:

 * Line 163,170, 179 : please split the lines, too long. You can achieve that using intermediate variable name
  e.g.

product_limit = self.pool.get('res.partner').read(cr,uid,context['supplier_id'],['supplier_product_limit'])['supplier_product_limit']

Can be:

part_obj = self.pool.get('res.partner')
supplier_id = context['supplier_id']
product_limit = part_obj.read(cr,uid,supplier_id,['supplier_product_limit'])

 * Line 166: Any reason not to use the ORM here ? I think you should.

 * Line 179: The help tool tip is confusing for me. Took me a while to get the purpose of the field.. I suggest something more like :

Check that box if you want to only search in products catalog of this supplier when fulfilling a purchase order for him. Otherwise, all products catalog will be available as normal.

 " Line 66: The description of the module should be a bit more precise I think. Refer to the point above to better explaine what "Enables/Disables the supplier control in Purchase" means.

Have a nice day,

Joël

review: Needs Fixing (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] purchase_control_supplier

=== 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-19 07:28:38 +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-19 07:28:38 +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-19 07:28:38 +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-19 07:28:38 +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-19 07:28:38 +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>