Merge lp:~vauxoo/addons-vauxoo/addons-vauxoo-mrp_consume_produce-dev-julio into lp:addons-vauxoo

[Julio Serna-http://www.vauxoo.com]

agrega dos wizard para consumos y productos finalizados

[lp:~vauxoo/addons-vauxoo/addons-vauxoo-mrp_consume_produce-dev-julio]

456. By Julio Serna-http://www.vauxoo.com on 2012-09-17

[REF][mrp_consume_produce] changed position button of finished production

457. By Julio Serna-http://www.vauxoo.com on 2012-09-17

[IMP][mrp_consume_produce] added context with values of uom convert

458. By Julio Serna-http://www.vauxoo.com on 2012-09-17

[ADD][mrp_consume_produce] added patch to action_consume

459. By Julio Serna-http://www.vauxoo.com on 2012-09-17

[REF][mrp_consume_produce] modfied description __openerp__.py

=== added directory 'mrp_consume_produce'
=== added file 'mrp_consume_produce/__init__.py'
--- mrp_consume_produce/__init__.py	1970-01-01 00:00:00 +0000
+++ mrp_consume_produce/__init__.py	2012-09-17 21:54:24 +0000
@@ -0,0 +1,27 @@
+# -*- encoding: utf-8 -*-
+###########################################################################
+#    Module Writen to OpenERP, Open Source Management Solution
+#
+#    Copyright (c) 2012 Vauxoo - http://www.vauxoo.com
+#    All Rights Reserved.
+#    [e-mail]
+############################################################################
+#    Coded by: julio ([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 wizard
+import mrp

=== added file 'mrp_consume_produce/__openerp__.py'
--- mrp_consume_produce/__openerp__.py	1970-01-01 00:00:00 +0000
+++ mrp_consume_produce/__openerp__.py	2012-09-17 21:54:24 +0000
@@ -0,0 +1,48 @@
+# -*- encoding: utf-8 -*-
+###########################################################################
+#    Module Writen to OpenERP, Open Source Management Solution
+#
+#    Copyright (c) 2012 Vauxoo - http://www.vauxoo.com
+#    All Rights Reserved.
+#    [e-mail]
+############################################################################
+#    Coded by: julio ([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": "MRP Consume Produce",
+    "version": "1.1",
+    "author" : "Vauxoo",
+    "category": "Generic Modules/Production",
+    "website" : "http://www.vauxoo.com/",
+    "description": """ Add wizard to consume and produce.It will be necesary to apply the patch 
+        patch/stock.patch located in this module ( useatch -b stock.py  stock.patch )
+    """,
+    'depends': ['mrp'],
+    'init_xml': [],
+    'update_xml': [
+        'wizard/wizard_view.xml',
+        'mrp_consume_produce_view.xml',
+        ],
+    'demo_xml': [],
+    'test': [],
+    'installable': True,
+    'active': False,
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+ 

=== added file 'mrp_consume_produce/mrp.py'
--- mrp_consume_produce/mrp.py	1970-01-01 00:00:00 +0000
+++ mrp_consume_produce/mrp.py	2012-09-17 21:54:24 +0000
@@ -0,0 +1,75 @@
+# -*- encoding: utf-8 -*-
+###########################################################################
+#    Module Writen to OpenERP, Open Source Management Solution
+#
+#    Copyright (c) 2012 Vauxoo - http://www.vauxoo.com
+#    All Rights Reserved.
+#    [e-mail]
+############################################################################
+#    Coded by: julio ([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 netsvc
+
+class mrp_production(osv.osv):
+    _inherit='mrp.production'
+    
+    def _check_boolean(self,cr,uid,ids,field_name,args,context={}):
+        res = {}
+        for production in self.browse(cr,uid,ids,context=context):
+            moves = [move for move in production.move_lines]
+            if len(moves)==0 and production.state<>'draft':
+                res[production.id]=True
+            else:
+                res[production.id]=False
+        return res
+
+    def _check_len_move(self,cr,uid,ids,field_name,args,context={}):
+        res = {}
+        for production in self.browse(cr,uid,ids,context=context):
+            moves = [move for move in production.move_lines2 if move.state=='done']
+            res[production.id]=len(moves)
+        return res
+            
+    _columns = {
+        'consumed' : fields.function(_check_boolean, string='consumed?', type='boolean', help="indicates if product to consume have been consumed or canceled"),
+        'len_move' : fields.function(_check_len_move, string='moves', type='float')
+    }
+    
+    def action_finished_consume(self,cr,uid,ids,context={}):
+        stock_move = self.pool.get('stock.move')
+        for production in self.browse(cr,uid,ids,context=context):
+            for moves in production.move_lines:
+                stock_move.write(cr,uid,[moves.id],{'state':'cancel'})
+        return True
+    
+    def action_finish(self,cr,uid,ids,context={}):
+        stock_move = self.pool.get('stock.move')
+        for production in self.browse(cr,uid,ids,context=context):
+            for moves in production.move_created_ids:
+                stock_move.write(cr,uid,[moves.id],{'state':'cancel'})
+        try:
+            wf_service = netsvc.LocalService("workflow")
+            wf_service.trg_validate(uid, 'mrp.production', production.id, 'button_produce_done', cr)
+        except:
+            pass
+        return True
+
+mrp_production()
+

=== added file 'mrp_consume_produce/mrp_consume_produce_view.xml'
--- mrp_consume_produce/mrp_consume_produce_view.xml	1970-01-01 00:00:00 +0000
+++ mrp_consume_produce/mrp_consume_produce_view.xml	2012-09-17 21:54:24 +0000
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <record model="ir.ui.view" id="view_mrp_production_inherit2">
+            <field name="name">view.mrp.production.inherit2</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='Consumed Products']/group/button[@name='%(mrp.act_mrp_product_produce)d']" position="replace">
+			<button name="%(mrp.act_mrp_product_produce)d" states="in_production" string="Produce" icon="gtk-ok" type="action" invisible="1"/>
+                    </xpath>
+
+                    <xpath expr="/form/notebook/page[@string='Consumed Products']/group/button[@name='%(mrp.act_mrp_product_produce)d']" position="after">
+			<button name="%(create_consume_action)d" states="in_production" string="Consumed" icon="gtk-ok" type="action"  attrs="{'invisible': ['|',('consumed','=',True),('state','!=','in_production')]}"/>
+                    </xpath>
+
+                    <xpath expr="/form/group/field[@name='origin']" position="after">
+			<field name="consumed"/>
+                    </xpath>
+
+                    <xpath expr="/form/notebook/page[@string='Consumed Products']/group/button[@name='%(create_consume_action)d']" position="after">
+			<button name="action_finished_consume" string="Finished Consumed" icon="gtk-convert" type="object" attrs="{'invisible': ['|',('consumed','=',True),('state','!=','in_production')]}"/>
+                    </xpath>
+
+                    <xpath expr="/form/notebook/page[@string='Finished Products']" position="inside">
+			<button name="%(create_produce_action)d" string="Products Produced" icon="gtk-yes" type="action" attrs="{'invisible': ['|',('len_move','=',0),('state','=','done')]}"/>
+                    </xpath>
+
+                    <xpath expr="/form/notebook/page[@string='Finished Products']" position="inside">
+			<button name="action_finish" string="Finish Production" icon="gtk-ok" type="object" attrs="{'invisible': ['|',('consumed','=',False),('state','=','done')]}"/>
+                    </xpath>
+
+                    <xpath expr="/form/group/field[@name='origin']" position="after">
+			<field name="len_move" invisible="1"/>
+                    </xpath>
+	    </field>
+        </record>
+
+
+    </data>
+</openerp>

=== added directory 'mrp_consume_produce/patch'
=== added file 'mrp_consume_produce/patch/stock.patch'
--- mrp_consume_produce/patch/stock.patch	1970-01-01 00:00:00 +0000
+++ mrp_consume_produce/patch/stock.patch	2012-09-17 21:54:24 +0000
@@ -0,0 +1,31 @@
+=== modified file 'stock/stock.py'
+--- stock/stock.py	2012-03-29 15:29:29 +0000
++++ stock/stock.py	2012-09-17 21:30:39 +0000
+@@ -2445,6 +2445,9 @@
+         #quantity should in MOVE UOM
+         if context is None:
+             context = {}
++            
++        quantity=self.pool.get('product.uom')._compute_qty(cr, uid, context.get('product_uom',False), quantity, to_uom_id=context.get('product_uom_move',False))
++        
+         if quantity <= 0:
+             raise osv.except_osv(_('Warning!'), _('Please provide Proper Quantity !'))
+         res = []
+@@ -2458,13 +2461,14 @@
+             if quantity_rest <= 0:
+                 quantity_rest = 0
+                 uos_qty_rest = 0
+-                quantity = move.product_qty
++                quantity = quantity
+ 
+             uos_qty = quantity / move_qty * move.product_uos_qty
+             if quantity_rest > 0:
+                 default_val = {
+-                    'product_qty': quantity,
++                    'product_qty': context.get('quantity',quantity),
+                     'product_uos_qty': uos_qty,
++                    'product_uom' : context.get('product_uom',move.product_uom.id),
+                     'state': move.state,
+                     'location_id': location_id or move.location_id.id,
+                 }
+

=== added directory 'mrp_consume_produce/wizard'
=== added file 'mrp_consume_produce/wizard/__init__.py'
--- mrp_consume_produce/wizard/__init__.py	1970-01-01 00:00:00 +0000
+++ mrp_consume_produce/wizard/__init__.py	2012-09-17 21:54:24 +0000
@@ -0,0 +1,26 @@
+# -*- encoding: utf-8 -*-
+###########################################################################
+#    Module Writen to OpenERP, Open Source Management Solution
+#
+#    Copyright (c) 2012 Vauxoo - http://www.vauxoo.com
+#    All Rights Reserved.
+#    [e-mail]
+############################################################################
+#    Coded by: julio ([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 mrp_consume_produce

=== added file 'mrp_consume_produce/wizard/mrp_consume_produce.py'
--- mrp_consume_produce/wizard/mrp_consume_produce.py	1970-01-01 00:00:00 +0000
+++ mrp_consume_produce/wizard/mrp_consume_produce.py	2012-09-17 21:54:24 +0000
@@ -0,0 +1,115 @@
+# -*- encoding: utf-8 -*-
+###########################################################################
+#    Module Writen to OpenERP, Open Source Management Solution
+#
+#    Copyright (c) 2012 Vauxoo - http://www.vauxoo.com
+#    All Rights Reserved.
+#    [e-mail]
+############################################################################
+#    Coded by: julio ([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 osv import osv, fields
+import decimal_precision as dp
+
+class mrp_consume(osv.osv_memory):
+    _name='mrp.consume'
+    _columns={
+        'consume_line_ids' : fields.one2many('mrp.consume.line','wizard_id','Consume')
+    }
+    def action_consume(self,cr,uid,ids,context={}):
+        for production in self.browse(cr,uid,ids,context=context):
+            for raw_product in production.consume_line_ids:
+                context.update({'product_uom':raw_product.product_uom.id,
+                    'product_uom_move':raw_product.move_id.product_uom.id,
+                    'quantity':raw_product.quantity})
+                raw_product.move_id.action_consume(raw_product.quantity, raw_product.location_id.id, context=context)
+        return {}
+    
+    def default_get(self, cr, uid, fields, context=None):
+        if context is None: context = {}
+        res = super(mrp_consume, self).default_get(cr, uid, fields, context=context)
+        mrp_ids = context.get('active_ids', [])
+        if not mrp_ids or (not context.get('active_model') == 'mrp.production') \
+            or len(mrp_ids) != 1:
+            return res
+        mrp_id, = mrp_ids
+        if 'consume_line_ids' in fields:
+            mrp = self.pool.get('mrp.production').browse(cr, uid, mrp_id, context=context)
+            moves = [self._partial_move_for(cr, uid, m) for m in mrp.move_lines if m.state not in ('done','cancel')]
+            res.update(consume_line_ids=moves)
+        return res
+
+    def _partial_move_for(self, cr, uid, move):
+        partial_move = {
+            'product_id' : move.product_id.id,
+            'quantity' : move.product_qty,
+            'product_uom' : move.product_uom.id,
+            'prodlot_id' : move.prodlot_id.id,
+            'move_id' : move.id,
+            'location_id' : move.location_id.id,
+            'location_dest_id' : move.location_dest_id.id,
+        }
+        return partial_move
+mrp_consume()
+
+class mrp_produce(osv.osv_memory):
+    _name='mrp.produce'
+    _columns={
+        'produce_line_ids' : fields.one2many('mrp.consume.line','wizard2_id','Consume')
+    }
+    
+    def default_get(self, cr, uid, fields, context=None):
+        if context is None: context = {}
+        res = super(mrp_produce, self).default_get(cr, uid, fields, context=context)
+        mrp_ids = context.get('active_ids', [])
+        if not mrp_ids or (not context.get('active_model') == 'mrp.production') \
+            or len(mrp_ids) != 1:
+            return res
+        mrp_id, = mrp_ids
+        if 'produce_line_ids' in fields:
+            mrp = self.pool.get('mrp.production').browse(cr, uid, mrp_id, context=context)
+            moves = [self.pool.get('mrp.consume')._partial_move_for(cr, uid, m) for m in mrp.move_created_ids if m.state not in ('done','cancel')]
+            res.update(produce_line_ids=moves)
+        return res
+
+    def action_produce(self,cr,uid,ids,context={}):
+        for production in self.browse(cr,uid,ids,context=context):
+            for raw_product in production.produce_line_ids:
+                context.update({'product_uom':raw_product.product_uom.id,
+                    'product_uom_move':raw_product.move_id.product_uom.id,
+                    'quantity':raw_product.quantity})
+                raw_product.move_id.action_consume(raw_product.quantity, raw_product.location_id.id, context=context)
+        return {}
+mrp_produce()
+
+class mrp_consume_line(osv.osv_memory):
+    _name='mrp.consume.line'
+    _rec_name = 'product_id'
+    _columns = {
+        'product_id' : fields.many2one('product.product', string="Product", required=True),
+        'quantity' : fields.float("Quantity", digits_compute=dp.get_precision('Product UoM'), required=True),
+        'product_uom': fields.many2one('product.uom', 'Unit of Measure', required=True,),
+        'location_id': fields.many2one('stock.location', 'Location', required=True),
+        'location_dest_id': fields.many2one('stock.location', 'Dest. Location', required=True),
+        'move_id' : fields.many2one('stock.move', "Move"),
+        'wizard_id' : fields.many2one('mrp.consume', string="Wizard"),
+        'wizard2_id' : fields.many2one('mrp.produce', string="Wizard"),
+    }
+
+mrp_consume_line()

=== added file 'mrp_consume_produce/wizard/wizard_view.xml'
--- mrp_consume_produce/wizard/wizard_view.xml	1970-01-01 00:00:00 +0000
+++ mrp_consume_produce/wizard/wizard_view.xml	2012-09-17 21:54:24 +0000
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+<!--
+	View to wizard Consume
+-->
+        <record id="mrp_consume_produce_form" model="ir.ui.view">
+            <field name="name">mrp.consume.produce.form</field>
+            <field name="model">mrp.consume</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Consume">
+			<field name="consume_line_ids" mode="tree" nolabel="1">
+				<tree string="Consume" editable="bottom">
+					<field name="product_id"/>
+					<field name="quantity"/>
+					<field name="product_uom"/>
+				</tree>
+				<form string="Consume">
+					<field name="product_id"/>
+					<field name="quantity"/>
+					<field name="product_uom"/>
+				</form>
+			</field>
+			<group colspan="4">
+				<button string="Cancel" icon="gtk-cancel" type="object" special="cancel"/>
+				<button string="Consume" icon="gtk-ok" name="action_consume" type="object"/>
+			</group>
+                </form>
+            </field>
+        </record>
+
+	<act_window id="consume_wizard"
+		name="Consume"
+		src_model="mrp.production"
+		res_model="mrp.consume"
+		view_mode="form"
+		target="new"
+		key2="client_action_multi"
+		multi="True"
+		/>
+
+
+       <record id="create_consume_action" model="ir.actions.act_window">
+            <field name="name">Consume</field>
+            <field name="res_model">mrp.consume</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
+
+
+<!--
+	View to wizard Produce
+-->
+
+        <record id="mrp_consume_produce2_form" model="ir.ui.view">
+            <field name="name">mrp.consume.produce.form</field>
+            <field name="model">mrp.produce</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Produce">
+			<field name="produce_line_ids" mode="tree" nolabel="1">
+				<tree string="Produce" editable="bottom">
+					<field name="product_id"/>
+					<field name="quantity"/>
+					<field name="product_uom"/>
+				</tree>
+				<form string="Produce">
+					<field name="product_id"/>
+					<field name="quantity"/>
+					<field name="product_uom"/>
+				</form>
+			</field>
+			<group colspan="4">
+				<button string="Cancel" icon="gtk-cancel" type="object" special="cancel"/>
+				<button string="Produced Products" icon="gtk-ok" name="action_produce" type="object"/>
+			</group>
+                </form>
+            </field>
+        </record>
+
+	<act_window id="produce_wizard"
+		name="Produce"
+		src_model="mrp.production"
+		res_model="mrp.produce"
+		view_mode="form"
+		target="new"
+		key2="client_action_multi"
+		multi="True"
+		/>
+
+       <record id="create_produce_action" model="ir.actions.act_window">
+            <field name="name">Produce</field>
+            <field name="res_model">mrp.produce</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
+    </data>
+</openerp>
+