Merge lp:~camptocamp/stock-logistic-flows/6.1-add-mrp_open_lot_attributes-lep into lp:stock-logistic-flows/6.1

[Leonardo Pistone]

This new module allows to edit the Custom Attributes in the production lot from the Manufacturing Order.

[lp:~camptocamp/stock-logistic-flows/6.1-add-mrp_open_lot_attributes-lep]

31. By Leonardo Pistone on 2013-12-02

[add] button to open production lot detail also in the finished products to produce

[Sandy Carter (http://www.savoirfairelinux.com) (sandy-carter)]

l.213 spelling mistake Dinamically -> Dynamically
__openerp__.py is a dictionary, use pep8 style: 4 space indentation and move 'name' to its own line
l.126-137 Would be nicer if these were imported from openerp: openerp.osv, openerp.tools.translate

review: Needs Fixing (code review)

[Leonardo Pistone (lepistone)]

1. fixed

2. Asked the community list

3. 6.1 style, I think

Thanks!

[lp:~camptocamp/stock-logistic-flows/6.1-add-mrp_open_lot_attributes-lep]

32. By Leonardo Pistone on 2013-12-04

[fix] typo

[Sandy Carter (http://www.savoirfairelinux.com) (sandy-carter)]

LGTM, as I said in another MP, 2 and 3 are not a reason to block the MP.

review: Approve (code review, no test)

[camptocamp-business-robot (camptocamp-business-robot)]

Please use:
from openerp.osv import orm, fields

and instanciate the classes with:
class x_y_z(orm.Model):
class a_b_c(orm.TransientModel):

The other form is deprecated.

In osv.py:
"
# deprecated - for backward compatibility.
osv = Model
osv_memory = TransientModel
osv_abstract = AbstractModel # ;-)
"

I'm not found of the extends fields_view_get approach but in this case it is probably less code to maintain than redefining views or doing a function field to be used by attrs so it is OK for me.

Opinion:
Adding sub function in open_lot will make it more readable and easier to override.

review: Needs Fixing (no test, code review)

[Leonardo Pistone (lepistone)]

Thanks for your review.

Do you think that is deprecated also for old-fashioned 6.1?

[Yannick Vaucher @ Camptocamp (yvaucher-c2c)]

@Leonardo

Yes it is already deprecated in old-fashioned 6.1 :)

http://bazaar.launchpad.net/~openerp/openobject-server/6.1/view/head:/openerp/osv/osv.py#L224

[lp:~camptocamp/stock-logistic-flows/6.1-add-mrp_open_lot_attributes-lep]

33. By Leonardo Pistone on 2013-12-05

[imp] new-style models

[Leonardo Pistone (lepistone)]

Thanks Yannick, Nicolas, Sandy,

all should be cool and modern now.

[lp:~camptocamp/stock-logistic-flows/6.1-add-mrp_open_lot_attributes-lep]

34. By Leonardo Pistone on 2013-12-16

[add] i18n

35. By Leonardo Pistone on 2013-12-17

[ref] pep8

[Yannick Vaucher @ Camptocamp (yvaucher-c2c)]

Thanks for the changes

LGTM

review: Approve (code review, no tests)

=== added directory 'mrp_open_lot_attributes'
=== added file 'mrp_open_lot_attributes/__init__.py'
--- mrp_open_lot_attributes/__init__.py	1970-01-01 00:00:00 +0000
+++ mrp_open_lot_attributes/__init__.py	2013-12-17 10:19:04 +0000
@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+###############################################################################
+#                                                                             #
+#   Author: Leonardo Pistone <[e-mail]>                #
+#   Copyright 2013 Camptocamp SA                                              #
+#                                                                             #
+#   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

=== added file 'mrp_open_lot_attributes/__openerp__.py'
--- mrp_open_lot_attributes/__openerp__.py	1970-01-01 00:00:00 +0000
+++ mrp_open_lot_attributes/__openerp__.py	2013-12-17 10:19:04 +0000
@@ -0,0 +1,40 @@
+# -*- coding: utf-8 -*-
+###############################################################################
+#                                                                             #
+#   Author: Leonardo Pistone <[e-mail]>                #
+#   Copyright 2013 Camptocamp SA                                              #
+#                                                                             #
+#   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': 'MRP Open Lot Attributes',
+ 'version': '0.1',
+ 'category': 'Generic Modules/Others',
+ 'license': 'AGPL-3',
+ 'description': """
+This module adds buttons to edit the Production Lot information, including
+custom attributes, from the Finished Products tab in the Manufacturing Order.
+
+""",
+ 'complexity': 'easy',
+ 'author': 'Camptocamp',
+ 'website': 'http://www.camptocamp.com/',
+ 'depends': ['mrp', 'production_lot_custom_attributes'],
+ 'init_xml': [],
+ 'update_xml': ['mrp_view.xml'],
+ 'demo_xml': [],
+ 'installable': True,
+ 'active': False,
+ }

=== added directory 'mrp_open_lot_attributes/i18n'
=== added file 'mrp_open_lot_attributes/i18n/fr_FR.po'
--- mrp_open_lot_attributes/i18n/fr_FR.po	1970-01-01 00:00:00 +0000
+++ mrp_open_lot_attributes/i18n/fr_FR.po	2013-12-17 10:19:04 +0000
@@ -0,0 +1,71 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* mrp_open_lot_attributes
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-12-16 15:40+0000\n"
+"PO-Revision-Date: 2013-12-16 15:40+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: mrp_open_lot_attributes
+#: model:ir.model,name:mrp_open_lot_attributes.model_stock_production_lot
+msgid "Production lot"
+msgstr "Lot de production"
+
+#. module: mrp_open_lot_attributes
+#: view:mrp.production:0
+msgid "Open Lot"
+msgstr "Open Lot"
+
+#. module: mrp_open_lot_attributes
+#: model:ir.model,name:mrp_open_lot_attributes.model_stock_move
+msgid "Stock Move"
+msgstr "Mouvement de stock"
+
+#. module: mrp_open_lot_attributes
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product"
+msgstr "Vous essayez d'affecter un lot qui n'est pas pour ce produit."
+
+#. module: mrp_open_lot_attributes
+#: constraint:stock.move:0
+msgid "You can not move products from or to a location of the type view."
+msgstr "You can not move products from or to a location of the type view."
+
+#. module: mrp_open_lot_attributes
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
+msgstr "Vous devez affecter un lot de fabrication pour ce produit."
+
+#. module: mrp_open_lot_attributes
+#: code:addons/mrp_open_lot_attributes/stock.py:63
+#: code:addons/mrp_open_lot_attributes/stock.py:80
+#, python-format
+msgid "Production Lots"
+msgstr "Production Lots"
+
+#. module: mrp_open_lot_attributes
+#: code:addons/mrp_open_lot_attributes/stock.py:135
+#, python-format
+msgid "Save and Close"
+msgstr "Save and Close"
+
+#. module: mrp_open_lot_attributes
+#: code:addons/mrp_open_lot_attributes/stock.py:127
+#, python-format
+msgid "Cancel"
+msgstr "Cancel"
+
+#. module: mrp_open_lot_attributes
+#: sql_constraint:stock.production.lot:0
+msgid "The combination of serial number and internal reference must be unique !"
+msgstr "La combinaison du numéro de série et de la référence interne doit être unique !"
+

=== added file 'mrp_open_lot_attributes/i18n/mrp_open_lot_attributes.pot'
--- mrp_open_lot_attributes/i18n/mrp_open_lot_attributes.pot	1970-01-01 00:00:00 +0000
+++ mrp_open_lot_attributes/i18n/mrp_open_lot_attributes.pot	2013-12-17 10:19:04 +0000
@@ -0,0 +1,70 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* mrp_open_lot_attributes
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-12-16 14:56+0000\n"
+"PO-Revision-Date: 2013-12-16 14: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: mrp_open_lot_attributes
+#: model:ir.model,name:mrp_open_lot_attributes.model_stock_production_lot
+msgid "Production lot"
+msgstr ""
+
+#. module: mrp_open_lot_attributes
+#: view:mrp.production:0
+msgid "Open Lot"
+msgstr ""
+
+#. module: mrp_open_lot_attributes
+#: model:ir.model,name:mrp_open_lot_attributes.model_stock_move
+msgid "Stock Move"
+msgstr ""
+
+#. module: mrp_open_lot_attributes
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product"
+msgstr ""
+
+#. module: mrp_open_lot_attributes
+#: constraint:stock.move:0
+msgid "You can not move products from or to a location of the type view."
+msgstr ""
+
+#. module: mrp_open_lot_attributes
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
+msgstr ""
+
+#. module: mrp_open_lot_attributes
+#: code:addons/mrp_open_lot_attributes/stock.py:63
+#: code:addons/mrp_open_lot_attributes/stock.py:80
+#, python-format
+msgid "Production Lots"
+msgstr ""
+
+#. module: mrp_open_lot_attributes
+#: code:addons/mrp_open_lot_attributes/stock.py:135
+#, python-format
+msgid "Save and Close"
+msgstr ""
+
+#. module: mrp_open_lot_attributes
+#: code:addons/mrp_open_lot_attributes/stock.py:127
+#, python-format
+msgid "Cancel"
+msgstr ""
+
+#. module: mrp_open_lot_attributes
+#: sql_constraint:stock.production.lot:0
+msgid "The combination of serial number and internal reference must be unique !"
+msgstr ""

=== added file 'mrp_open_lot_attributes/mrp_view.xml'
--- mrp_open_lot_attributes/mrp_view.xml	1970-01-01 00:00:00 +0000
+++ mrp_open_lot_attributes/mrp_view.xml	2013-12-17 10:19:04 +0000
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <record id="mrp_production_form_lot_attribute_view" model="ir.ui.view">
+            <field name="name">mrp.production.lot.attribute.form</field>
+            <field name="model">mrp.production</field>
+            <field name="inherit_id" ref="mrp.mrp_production_form_view"/>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <xpath expr="/form/notebook/page[@string='Finished Products']/field[@name='move_created_ids']/tree/button[@string='Scrap Products']" position="after">
+                    <field name="prodlot_id"/>
+                    <button name="open_lot" string="Open Lot" type="object" icon="gtk-justify-fill"/>
+                </xpath>
+                <xpath expr="/form/notebook/page[@string='Finished Products']/field[@name='move_created_ids2']/tree/button[@string='Scrap Products']" position="after">
+                    <button name="open_lot" string="Open Lot" type="object" icon="gtk-justify-fill"/>
+                </xpath>
+            </field>
+        </record>
+
+    </data>
+</openerp>

=== added file 'mrp_open_lot_attributes/stock.py'
--- mrp_open_lot_attributes/stock.py	1970-01-01 00:00:00 +0000
+++ mrp_open_lot_attributes/stock.py	2013-12-17 10:19:04 +0000
@@ -0,0 +1,140 @@
+# -*- coding: utf-8 -*-
+###############################################################################
+#                                                                             #
+#   Author: Leonardo Pistone <[e-mail]>                #
+#   Copyright 2013 Camptocamp SA                                              #
+#                                                                             #
+#   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 orm
+from tools.translate import _
+from lxml import etree
+
+
+class stock_move(orm.Model):
+    _inherit = 'stock.move'
+
+    def open_lot(self, cr, uid, ids, context=None):
+        """Open Production Lot in a form, with attributes if any
+
+        If the production lot has custom attributes, these are shown in a
+        dynamic view
+
+        """
+
+        if context is None:
+            context = {}
+        for move in self.browse(cr, uid, ids, context=context):
+            # existing lot
+            if move.prodlot_id:
+                ctx = {'add_save_close': True}
+                domain = []
+
+                if move.prodlot_id.attribute_set_id:
+                    ctx['open_lot_by_attribute_set'] = True,
+                    ctx['attribute_group_ids'] = [
+                        group.id
+                        for group in
+                        move.prodlot_id.attribute_set_id.attribute_group_ids
+                    ]
+
+                    domain = (
+                        "[('attribute_set_id', '=', %s)]"
+                        % move.prodlot_id.attribute_set_id.id
+                    )
+
+                return {
+                    'context': ctx,
+                    'domain': domain,
+                    'res_id': move.prodlot_id.id,
+                    'name': _('Production Lots'),
+                    'view_type': 'form',
+                    'view_mode': 'form',
+                    'res_model': 'stock.production.lot',
+                    'type': 'ir.actions.act_window',
+                    'target': 'new',
+                }
+
+            # new lot
+            else:
+                ctx = {
+                    'add_save_close': True,
+                    'default_product_id': move.product_id.id,
+                }
+
+                return {
+                    'context': ctx,
+                    'name': _('Production Lots'),
+                    'view_type': 'form',
+                    'view_mode': 'form',
+                    'res_model': 'stock.production.lot',
+                    'type': 'ir.actions.act_window',
+                    'target': 'new',
+                }
+
+
+class stock_production_lot(orm.Model):
+    _inherit = 'stock.production.lot'
+
+    def save_lot(self, cr, uid, ids, context=None):
+        """If the lot is new, assign it to the original move"""
+
+        assert len(ids) == 1
+        if context['active_model'] == 'stock.move':
+            move_pool = self.pool.get('stock.move')
+            move = move_pool.browse(
+                cr, uid, context['active_id'], context=context
+            )
+            if not move.prodlot_id:
+                move_pool.write(cr, uid, [move.id], {
+                    'prodlot_id': ids[0],
+                })
+        return {'type': 'ir.actions.act_window_close'}
+
+    def fields_view_get(self, cr, uid, view_id=None, view_type='form',
+                        context=None, toolbar=False, submenu=False):
+        """Dynamically adds Save and close, Cancel buttons to the form view
+
+        """
+
+        if context is None:
+            context = {}
+
+        result = super(stock_production_lot, self).fields_view_get(
+            cr, uid, view_id, view_type, context, toolbar=toolbar,
+            submenu=submenu
+        )
+        if view_type == 'form' and context.get('add_save_close'):
+            eview = etree.fromstring(result['arch'])
+            etree.SubElement(
+                eview,
+                'button',
+                icon="gtk-cancel",
+                special="cancel",
+                string=_('Cancel'),
+                colspan="2",
+            )
+            etree.SubElement(
+                eview,
+                'button',
+                icon="gtk-ok",
+                name="save_lot",
+                string=_('Save and Close'),
+                type="object",
+                colspan="2",
+            )
+            result['arch'] = etree.tostring(eview, pretty_print=True)
+        return result