Merge lp:~agilebg/stock-logistic-flows/adding_product_customer_code_picking into lp:stock-logistic-flows

[Nicola Malcontenti - Agile BG]

Based on product_customer_code,this module loads in every stock picking the customer code defined in the product.
This module depends on https://code.launchpad.net/~akretion-team/openerp-product-attributes/7.0-product-customer-code-extraction/+merge/198296.

[Lorenzo Battistini (elbati)]

review: Approve (code review)

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

Do not merge until other MP is ready

review: Needs Fixing (depends on an mp work in progress)

[Raphaël Valyi - http://www.akretion.com (rvalyi)]

LGTM, pending merges have been processed now

review: Approve

[Pedro Manuel Baeza (pedro.baeza)]

I have made some comments inline, and I wonder if the module name wouldn't be better as stock_picking_product_customer_code to follow current core conventions (more or less, you know that there is no written rules).

Regards.

review: Needs Fixing (code review)

[lp:~agilebg/stock-logistic-flows/adding_product_customer_code_picking]

58. By Alex Comba - Agile BG on 2014-06-20

[FIX] how to get partner inside of _get_product_customer_code method

59. By Alex Comba - Agile BG on 2014-06-20

[FIX] Removed context assignement because not needed

60. By Alex Comba - Agile BG on 2014-06-20

[IMP] Better practices

61. By Alex Comba - Agile BG on 2014-06-20

[IMP] better readibility

62. By Alex Comba - Agile BG on 2014-06-20

[IMP] Replaced browse by read to improve performance

63. By Alex Comba - Agile BG on 2014-06-20

[FIX] keys in manifest file

64. By Alex Comba - Agile BG on 2014-06-20

[FIX] Applies some PEP8 cleanup

65. By Alex Comba - Agile BG on 2014-06-20

[ADD] contributors section

[Alex Comba - Agile BG (tafaru)]

Hi Pedro,

thank you for your review and for your precious hints!

I made the changes as you suggested us. In addition I fixed a bug in rev.58.

Cheers.

[Lorenzo Battistini (elbati)]

Including 1 diff comment

About the module name: in general I agree with Pedro.
In this case, the other modules follow the same naming as this: see
http://bazaar.launchpad.net/~account-core-editors/account-invoicing/7.0/files/47/product_customer_code_invoice/
So, for now, I would keep the current name

review: Needs Fixing

[lp:~agilebg/stock-logistic-flows/adding_product_customer_code_picking]

66. By Alex Comba - Agile BG on 2014-06-22

[FIX] Added retrieve of parentd_id

[Alex Comba - Agile BG (tafaru)]

Lorenzo,

please have a look at my last commit, now it should be ok.

Cheers.

[Lorenzo Battistini (elbati)]

2014-06-22 23:10 GMT+02:00 Alex Comba - Agile BG <email address hidden>:

> Lorenzo,
>
> please have a look at my last commit, now it should be ok.
>
>
Thanks Alex,

maybe we could handle even more particular cases by using the address_get
method to retrieve the company?

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

The source code management for this project has been moved to https://github.com/OCA/stock-logistics-workflow

Could you resubmit this MP on the new site?

review: Needs Resubmitting

[Alex Comba - Agile BG (tafaru)]

Alexandre, I'll do it asap.

Cheers.

[Alex Comba - Agile BG (tafaru)]

Alexandre,

you can find the related PR on github here: https://github.com/OCA/stock-logistics-workflow/pull/2

Unmerged revisions

66. By Alex Comba - Agile BG on 2014-06-22

[FIX] Added retrieve of parentd_id

65. By Alex Comba - Agile BG on 2014-06-20

[ADD] contributors section

64. By Alex Comba - Agile BG on 2014-06-20

[FIX] Applies some PEP8 cleanup

63. By Alex Comba - Agile BG on 2014-06-20

[FIX] keys in manifest file

62. By Alex Comba - Agile BG on 2014-06-20

[IMP] Replaced browse by read to improve performance

61. By Alex Comba - Agile BG on 2014-06-20

[IMP] better readibility

60. By Alex Comba - Agile BG on 2014-06-20

[IMP] Better practices

59. By Alex Comba - Agile BG on 2014-06-20

[FIX] Removed context assignement because not needed

58. By Alex Comba - Agile BG on 2014-06-20

[FIX] how to get partner inside of _get_product_customer_code method

57. By Nicola Malcontenti - Agile BG on 2014-01-20

[FIX] added pot

=== added directory 'product_customer_code_picking'
=== added file 'product_customer_code_picking/__init__.py'
--- product_customer_code_picking/__init__.py	1970-01-01 00:00:00 +0000
+++ product_customer_code_picking/__init__.py	2014-06-22 21:01:44 +0000
@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Copyright (C) 2013 Agile Business Group sagl (<http://www.agilebg.com>)
+#    Author: Nicola Malcontenti <[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 . import stock_picking

=== added file 'product_customer_code_picking/__openerp__.py'
--- product_customer_code_picking/__openerp__.py	1970-01-01 00:00:00 +0000
+++ product_customer_code_picking/__openerp__.py	2014-06-22 21:01:44 +0000
@@ -0,0 +1,48 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Copyright (C) 2013 Agile Business Group sagl (<http://www.agilebg.com>)
+#    Author: Nicola Malcontenti <[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 Customer code for stock picking",
+    "version": "1.0",
+    "author": "Agile Business Group",
+    "website": "http://www.agilebg.com",
+    "license": 'AGPL-3',
+    "category": "Stock",
+    "depends": [
+        'base',
+        'product',
+        'stock',
+        'product_customer_code'
+    ],
+    "description": """
+Based on product_customer_code, this module loads in every stock picking
+the customer code defined in the product.
+
+Contributors
+------------
+* Nicola Malcontenti <[e-mail]> 
+* Alex Comba <[e-mail]>
+""",
+    "demo": [],
+    "data": [
+        'stock_picking_view.xml',
+    ],
+    "installable": True,
+}

=== added directory 'product_customer_code_picking/i18n'
=== added file 'product_customer_code_picking/i18n/it.po'
--- product_customer_code_picking/i18n/it.po	1970-01-01 00:00:00 +0000
+++ product_customer_code_picking/i18n/it.po	2014-06-22 21:01:44 +0000
@@ -0,0 +1,33 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+# 	* product_customer_code_picking
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 7.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-01-15 14:28+0000\n"
+"PO-Revision-Date: 2014-01-15 15:29+0100\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: \n"
+"Language: it\n"
+"X-Generator: Poedit 1.6.2\n"
+
+#. module: product_customer_code_picking
+#: field:stock.move,product_customer_code:0
+msgid "Product Customer Code"
+msgstr "Codice Prodotto Cliente"
+
+#. module: product_customer_code_picking
+#: model:ir.model,name:product_customer_code_picking.model_stock_move
+msgid "Stock Move"
+msgstr "Movimento di magazzino"
+
+#. module: product_customer_code_picking
+#: model:ir.model,name:product_customer_code_picking.model_stock_picking
+msgid "Picking List"
+msgstr "Documento di trasporto"

=== added file 'product_customer_code_picking/i18n/product_customer_code_picking.pot'
--- product_customer_code_picking/i18n/product_customer_code_picking.pot	1970-01-01 00:00:00 +0000
+++ product_customer_code_picking/i18n/product_customer_code_picking.pot	2014-06-22 21:01:44 +0000
@@ -0,0 +1,32 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* product_customer_code_picking
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 7.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-01-15 14:28+0000\n"
+"PO-Revision-Date: 2014-01-15 14:28+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: product_customer_code_picking
+#: field:stock.move,product_customer_code:0
+msgid "Product Customer Code"
+msgstr ""
+
+#. module: product_customer_code_picking
+#: model:ir.model,name:product_customer_code_picking.model_stock_move
+msgid "Stock Move"
+msgstr ""
+
+#. module: product_customer_code_picking
+#: model:ir.model,name:product_customer_code_picking.model_stock_picking
+msgid "Picking List"
+msgstr ""
+

=== added file 'product_customer_code_picking/stock_picking.py'
--- product_customer_code_picking/stock_picking.py	1970-01-01 00:00:00 +0000
+++ product_customer_code_picking/stock_picking.py	2014-06-22 21:01:44 +0000
@@ -0,0 +1,59 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Copyright (C) 2013 Agile Business Group sagl (<http://www.agilebg.com>)
+#    Author: Nicola Malcontenti <[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 openerp.osv import fields, orm
+
+
+class stock_move(orm.Model):
+    _inherit = 'stock.move'
+
+    def _get_product_customer_code(
+            self, cr, uid, ids, name, args, context=None
+    ):
+        res = {}
+        product_customer_code_obj = self.pool['product.customer.code']
+        for move in self.browse(cr, uid, ids, context=context):
+            res[move.id] = ''
+            partner = move.picking_id.partner_id
+            if move.picking_id.partner_id.parent_id:
+                partner = move.picking_id.partner_id.parent_id
+            product = move.product_id
+            if product and partner:
+                code_ids = product_customer_code_obj.search(cr, uid, [
+                    ('product_id', '=', product.id),
+                    ('partner_id', '=', partner.id),
+                    ], limit=1, context=context)
+                if code_ids:
+                    data = product_customer_code_obj.read(
+                        cr, uid, code_ids[0],
+                        ['product_code'], context=context
+                    )
+                    res[move.id] = (
+                        'product_code' in data
+                        and data['product_code']
+                        or ''
+                    )
+        return res
+
+    _columns = {
+        'product_customer_code': fields.function(
+            _get_product_customer_code,
+            string='Product Customer Code', type='char', size=64),
+    }

=== added file 'product_customer_code_picking/stock_picking_view.xml'
--- product_customer_code_picking/stock_picking_view.xml	1970-01-01 00:00:00 +0000
+++ product_customer_code_picking/stock_picking_view.xml	2014-06-22 21:01:44 +0000
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  product customer code picking for OpenERP
+  Copyright (C) 2013 Agile Business Group sagl (<http://www.agilebg.com>).
+    Authors, Nicola Malcontenti, [e-mail]
+  The licence is in the file __openerp__.py
+-->
+<openerp>
+    <data>
+
+        <record id="view_move_picking_tree" model="ir.ui.view">
+            <field name="name">stock.move.product.code.tree</field>
+            <field name="model">stock.move</field>
+            <field name="inherit_id" ref="stock.view_move_picking_tree"/>
+            <field eval="16" name="priority"/>
+            <field name="arch" type="xml">
+                <field name="product_id" position="after">
+                    <field name="product_customer_code" />
+                </field>
+            </field>
+        </record>
+
+        <record id="view_move_picking_form" model="ir.ui.view">
+            <field name="name">stock.move.product.code.form</field>
+            <field name="model">stock.move</field>
+            <field name="inherit_id" ref="stock.view_move_picking_form"/>
+            <field eval="16" name="priority"/>
+            <field name="arch" type="xml">
+                <field name="product_id" position="after">
+                    <field name="product_customer_code" />
+                </field>
+            </field>
+        </record>
+
+    </data>
+</openerp>