Merge lp:~openerp-dev/openobject-addons/trunk-mo-disassemble into lp:openobject-addons

[SnippetBucket.com]

Hello,

Task: [MRP] allow disassembling through manufacturing orders

In the Manufacturing Order, allow to use negative quantities in the Product Quantity field so that the selected product is dismantled and individual components are put back into inventory, with all appropriate stock moves.

More details on pad:
http://pad.openerp.com/p/r.Vquhp9c9xsuPRWaX

Thanks,
TTA

[lp:~openerp-dev/openobject-addons/trunk-mo-disassemble]

8782. By Jitendra Prajapati(OpenERP) on 2014-04-29

[MERGE]with main branch

8783. By Jitendra Prajapati(OpenERP) on 2014-04-29

[FIX/IMP]except disassamble coming from procurement.

Unmerged revisions

8783. By Jitendra Prajapati(OpenERP) on 2014-04-29

[FIX/IMP]except disassamble coming from procurement.

8782. By Jitendra Prajapati(OpenERP) on 2014-04-29

[MERGE]with main branch

8781. By Jitendra Prajapati(OpenERP) on 2014-04-25

[MERGE]with main branch

8780. By Jitendra Prajapati(OpenERP) on 2014-04-24

[MERGE]with main branch

8779. By Jitendra Prajapati(OpenERP) on 2014-04-14

[MERGE]with main branch

8778. By Jitendra Prajapati(OpenERP) on 2014-04-11

[MERGE]with main branch

8777. By Jitendra Prajapati(OpenERP) on 2014-04-04

[MERGE]with main branch

8776. By Jitendra Prajapati(OpenERP) on 2014-03-27

[MERGE]with main branch

8775. By Jitendra Prajapati(OpenERP) on 2014-03-19

[MERGE]with main branch

8774. By Jitendra Prajapati(OpenERP) on 2014-02-10

[MERGE]with lp:openobject-addons

=== added directory 'idea'
=== added directory 'idea/static'
=== added directory 'idea/static/src'
=== added directory 'idea/static/src/img'
=== modified file 'mrp/__openerp__.py'
--- mrp/__openerp__.py	2014-05-07 17:12:05 +0000
+++ mrp/__openerp__.py	2014-05-20 10:51:47 +0000
@@ -62,7 +62,11 @@
         'wizard/change_production_qty_view.xml',
         'wizard/mrp_price_view.xml',
         'wizard/mrp_workcenter_load_view.xml',
+<<<<<<< TREE
         'wizard/stock_move_view.xml',
+=======
+        'wizard/disassemble_qty_view.xml',
+>>>>>>> MERGE-SOURCE
         'mrp_view.xml',
         'mrp_report.xml',
         'company_view.xml',
@@ -78,9 +82,11 @@
          'test/order_demo.yml',
          'test/order_process.yml',
          'test/cancel_order.yml',
+         'test/disassemble_process.yml',
     ],
     'installable': True,
     'application': True,
     'auto_install': False,
+    'js': ['static/src/js/mrp.js',],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== modified file 'mrp/mrp.py'
--- mrp/mrp.py	2014-05-08 11:59:17 +0000
+++ mrp/mrp.py	2014-05-20 10:51:47 +0000
@@ -96,6 +96,12 @@
             value = {'costs_hour': cost.standard_price}
         return {'value': value}
 
+class stock_move(osv.osv):
+    _inherit = 'stock.move'
+    _columns = {
+        'disassemble': fields.boolean('Disassemble'),
+    }
+
 class mrp_routing(osv.osv):
     """
     For specifying the routings of Work Centers.
@@ -426,14 +432,15 @@
         """ Return product quantity percentage """
         result = dict.fromkeys(ids, 100)
         for mrp_production in self.browse(cr, uid, ids, context=context):
-            if mrp_production.product_qty:
+            if abs(mrp_production.product_qty):
                 done = 0.0
                 for move in mrp_production.move_created_ids2:
                     if not move.scrapped and move.product_id == mrp_production.product_id:
                         done += move.product_qty
-                result[mrp_production.id] = done / mrp_production.product_qty * 100
+                result[mrp_production.id] = done / abs(mrp_production.product_qty) * 100
         return result
 
+<<<<<<< TREE
     def _moves_assigned(self, cr, uid, ids, name, arg, context=None):
         """ Test whether all the consume lines are assigned """
         res = {}
@@ -451,6 +458,13 @@
             res += self.pool.get("mrp.production").search(cr, uid, [('move_lines', 'in', move.id)], context=context)
         return res
 
+=======
+    def create(self, cr, uid, values, context=None):
+        if values['product_qty'] < 0:
+            self._description = _('Disassemble Order')
+        return super(mrp_production, self).create(cr, uid, values, context=context)
+
+>>>>>>> MERGE-SOURCE
     _columns = {
         'name': fields.char('Reference', size=64, required=True, readonly=True, states={'draft': [('readonly', False)]}),
         'origin': fields.char('Source Document', size=64, readonly=True, states={'draft': [('readonly', False)]},
@@ -493,8 +507,13 @@
         'workcenter_lines': fields.one2many('mrp.production.workcenter.line', 'production_id', 'Work Centers Utilisation',
             readonly=True, states={'draft': [('readonly', False)]}),
         'state': fields.selection(
+<<<<<<< TREE
             [('draft', 'New'), ('cancel', 'Cancelled'), ('confirmed', 'Awaiting Raw Materials'),
                 ('ready', 'Ready to Produce'), ('in_production', 'Production Started'), ('done', 'Done')],
+=======
+            [('draft', 'New'), ('cancel', 'Cancelled'), ('picking_except', 'Picking Exception'), ('confirmed', 'Awaiting Raw Materials'),
+                 ('ready', 'Ready to Produce'), ('in_production', 'Production Started'), ('done', 'Done')],
+>>>>>>> MERGE-SOURCE
             string='Status', readonly=True,
             track_visibility='onchange',
             help="When the production order is created the status is set to 'Draft'.\n\
@@ -505,21 +524,35 @@
                 When the production is over, the status is set to 'Done'."),
         'hour_total': fields.function(_production_calc, type='float', string='Total Hours', multi='workorder', store=True),
         'cycle_total': fields.function(_production_calc, type='float', string='Total Cycles', multi='workorder', store=True),
+<<<<<<< TREE
         'user_id': fields.many2one('res.users', 'Responsible'),
         'company_id': fields.many2one('res.company', 'Company', required=True),
         'ready_production': fields.function(_moves_assigned, type='boolean', store={'stock.move': (_mrp_from_move, ['state'], 10)}),
+=======
+        'user_id':fields.many2one('res.users', 'Responsible'),
+        'company_id': fields.many2one('res.company','Company',required=True),
+        'disassemble': fields.boolean('Disassemble'),
+        'disassemble_doc': fields.char('Disassemble Document(s)', size=64, readonly=True, help="Reference of disassembled document(s) for this Manufacturing Order."),
+        'qty_to_disassemble': fields.float('Remaining Quantity to Disassemble', help="Available product quantity to disassemble", digits_compute=dp.get_precision('Product Unit of Measure')),
+>>>>>>> MERGE-SOURCE
     }
 
     _defaults = {
         'priority': lambda *a: '1',
         'state': lambda *a: 'draft',
         'date_planned': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'),
+<<<<<<< TREE
         'product_qty': lambda *a: 1.0,
+=======
+        'product_qty': 1.0,
+>>>>>>> MERGE-SOURCE
         'user_id': lambda self, cr, uid, c: uid,
         'name': lambda x, y, z, c: x.pool.get('ir.sequence').get(y, z, 'mrp.production') or '/',
         'company_id': lambda self, cr, uid, c: self.pool.get('res.company')._company_default_get(cr, uid, 'mrp.production', context=c),
         'location_src_id': _src_id_default,
-        'location_dest_id': _dest_id_default
+        'location_dest_id': _dest_id_default,
+        'disassemble': False,
+        'disassemble_doc': False,
     }
 
     _sql_constraints = [
@@ -528,16 +561,6 @@
 
     _order = 'priority desc, date_planned asc'
 
-    def _check_qty(self, cr, uid, ids, context=None):
-        for order in self.browse(cr, uid, ids, context=context):
-            if order.product_qty <= 0:
-                return False
-        return True
-
-    _constraints = [
-        (_check_qty, 'Order quantity cannot be negative or zero!', ['product_qty']),
-    ]
-
     def unlink(self, cr, uid, ids, context=None):
         for production in self.browse(cr, uid, ids, context=context):
             if production.state not in ('draft', 'cancel'):
@@ -547,17 +570,37 @@
     def copy(self, cr, uid, id, default=None, context=None):
         if default is None:
             default = {}
+        mo = self.browse(cr, uid, id, context=context)
+        origin = False
+        if default.get('disassemble', False):
+            origin = mo.origin + '-' + mo.name if not mo.disassemble and mo.origin else mo.name
         default.update({
             'name': self.pool.get('ir.sequence').get(cr, uid, 'mrp.production'),
-            'move_lines': [],
-            'move_lines2': [],
-            'move_created_ids': [],
-            'move_created_ids2': [],
-            'product_lines': [],
-            'move_prod_id': False,
+<<<<<<< TREE
+            'move_lines': [],
+            'move_lines2': [],
+            'move_created_ids': [],
+            'move_created_ids2': [],
+            'product_lines': [],
+            'move_prod_id': False,
+=======
+            'move_lines': [],
+            'move_lines2': [],
+            'move_created_ids': [],
+            'move_created_ids2': [],
+            'product_lines': [],
+            'move_prod_id': False,
+            'picking_id': False,
+            'origin': origin,
+>>>>>>> MERGE-SOURCE
         })
         return super(mrp_production, self).copy(cr, uid, id, default, context)
 
+    def onchange_product_qty(self, cr, uid, ids, quantity, context=None):
+        if quantity < 0:
+            return {'value': {'disassemble': True, 'qty_to_disassemble': quantity}}
+        return {'value': {'disassemble': False, 'qty_to_disassemble': quantity}}
+
     def location_id_change(self, cr, uid, ids, src, dest, context=None):
         """ Changes destination location if source location is changed.
         @param src: Source location id.
@@ -645,7 +688,7 @@
                 raise osv.except_osv(_('Error!'), _("Cannot find a bill of material for this product."))
 
             # get components and workcenter_lines from BoM structure
-            factor = uom_obj._compute_qty(cr, uid, production.product_uom.id, production.product_qty, bom_point.product_uom.id)
+            factor = uom_obj._compute_qty(cr, uid, production.product_uom.id, abs(production.product_qty), bom_point.product_uom.id)
             res = bom_obj._bom_explode(cr, uid, bom_point, factor / bom_point.product_qty, properties, routing_id=production.routing_id.id)
             results = res[0]  # product_lines
             results2 = res[1]  # workcenter_lines
@@ -667,6 +710,34 @@
         """
         return len(self._action_compute_lines(cr, uid, ids, properties=properties, context=context))
 
+    def action_disassemble(self, cr, uid, id, qty, context=None):
+        """ Disassemble the production order.
+        """
+        mo = self.browse(cr, uid, id, context=context)
+        values = {
+            'disassemble': True,
+            'origin': mo.name,
+            'routing_id': False,
+            'product_qty': qty,
+            'qty_to_disassemble': 0,
+        }
+        mo_id = self.copy(cr, uid, mo.id, values, context=context)
+        if mo_id:
+            source_doc = self.read(cr, uid, mo_id, ['name'], context=context)
+            mo.write({'disassemble_doc': mo.disassemble_doc and mo.disassemble_doc + ", " + source_doc['name'] or source_doc['name']}, context=context)
+        view_ref = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'mrp', 'mrp_production_form_view')
+        view_id = view_ref and view_ref[1] or False,
+        return {
+            'type': 'ir.actions.act_window',
+            'name': _('Disassemble Manufacturing Order'),
+            'res_model': 'mrp.production',
+            'res_id': mo_id,
+            'view_type': 'form',
+            'view_mode': 'form',
+            'view_id': False,
+            'target': 'current',
+        }
+
     def action_cancel(self, cr, uid, ids, context=None):
         """ Cancels the production order and related stock moves.
         @return: True
@@ -691,9 +762,11 @@
         @return: True
         """
         move_obj = self.pool.get('stock.move')
-        self.write(cr, uid, ids, {'state': 'ready'})
 
         for production in self.browse(cr, uid, ids, context=context):
+            if production.disassemble:
+                self.action_confirm(cr, uid, [production.id])
+            production.write({'state': 'ready'}, context=context)
             if not production.move_created_ids:
                 self._make_production_produce_line(cr, uid, production, context=context)
 
@@ -841,9 +914,53 @@
             # trigger workflow if not products to consume (eg: services)
             self.signal_button_produce(cr, uid, [production_id])
 
+<<<<<<< TREE
         produced_qty = self._get_produced_qty(cr, uid, production, context=context)
 
         main_production_move = False
+=======
+        produced_qty = 0
+        for produced_product in production.move_created_ids2:
+            if (produced_product.scrapped) or (produced_product.product_id.id != production.product_id.id):
+                continue
+            produced_qty += produced_product.product_qty
+        if production_mode in ['consume','consume_produce']:
+            consumed_data = {}
+
+            # Calculate already consumed qtys
+            for consumed in production.move_lines2:
+                if consumed.scrapped:
+                    continue
+                if not consumed_data.get(consumed.product_id.id, False):
+                    consumed_data[consumed.product_id.id] = 0
+                consumed_data[consumed.product_id.id] += consumed.product_qty
+
+            # Find product qty to be consumed and consume it
+            for scheduled in production.product_lines:
+
+                # total qty of consumed product we need after this consumption
+                total_consume = ((production_qty + produced_qty) * scheduled.product_qty / abs(production.product_qty))
+                # qty available for consume and produce
+                qty_avail = scheduled.product_qty - consumed_data.get(scheduled.product_id.id, 0.0)
+
+                if float_compare(qty_avail, 0, precision_rounding=scheduled.product_id.uom_id.rounding) <= 0:
+                    # there will be nothing to consume for this raw material
+                    continue
+
+                raw_product = [move for move in production.move_lines if move.product_id.id==scheduled.product_id.id]
+                if raw_product:
+                    # qtys we have to consume
+                    qty = total_consume - consumed_data.get(scheduled.product_id.id, 0.0)
+                    if float_compare(qty, qty_avail, precision_rounding=scheduled.product_id.uom_id.rounding) == 1:
+                        # if qtys we have to consume is more than qtys available to consume
+                        prod_name = scheduled.product_id.name_get()[0][1]
+                        raise osv.except_osv(_('Warning!'), _('You are going to consume total %s quantities of "%s".\nBut you can only consume up to total %s quantities.') % (qty, prod_name, qty_avail))
+                    if float_compare(qty, 0, precision_rounding=scheduled.product_id.uom_id.rounding) <= 0:                        
+                        # we already have more qtys consumed than we need
+                        continue
+                    raw_product[0].action_consume(qty, raw_product[0].location_id.id, context=context)
+
+>>>>>>> MERGE-SOURCE
         if production_mode == 'consume_produce':
             # To produce remaining qty of final product
             #vals = {'state':'confirmed'}
@@ -861,8 +978,14 @@
             for produce_product in production.move_created_ids:
                 produced_qty = produced_products.get(produce_product.product_id.id, 0)
                 subproduct_factor = self._get_subproduct_factor(cr, uid, production.id, produce_product.id, context=context)
+<<<<<<< TREE
                 rest_qty = (subproduct_factor * production.product_qty) - produced_qty
                 if float_compare(rest_qty, (subproduct_factor * production_qty), precision_rounding=produce_product.product_id.uom_id.rounding) < 0:
+=======
+                rest_qty = (subproduct_factor * abs(production.product_qty)) - produced_qty
+
+                if rest_qty < (subproduct_factor * production_qty):
+>>>>>>> MERGE-SOURCE
                     prod_name = produce_product.product_id.name_get()[0][1]
                     raise osv.except_osv(_('Warning!'), _('You are going to produce total %s quantities of "%s".\nBut you can only produce up to total %s quantities.') % ((subproduct_factor * production_qty), prod_name, rest_qty))
                 if float_compare(rest_qty, 0, precision_rounding=produce_product.product_id.uom_id.rounding) > 0:
@@ -963,8 +1086,19 @@
     def test_ready(self, cr, uid, ids):
         res = False
         for production in self.browse(cr, uid, ids):
+<<<<<<< TREE
             if production.ready_production:
                 res = True
+=======
+            boms = self._action_compute_lines(cr, uid, [production.id])
+            res = False
+            for bom in boms:
+                product = self.pool.get('product.product').browse(cr, uid, bom['product_id'])
+                if production.disassemble:
+                    res = False
+                elif product.type in ('product', 'consu'):
+                    res = True
+>>>>>>> MERGE-SOURCE
         return res
     
     
@@ -976,13 +1110,21 @@
             'name': production.name,
             'date': production.date_planned,
             'product_id': production.product_id.id,
+<<<<<<< TREE
+=======
+            'product_qty': abs(production.product_qty),
+>>>>>>> MERGE-SOURCE
             'product_uom': production.product_uom.id,
             'product_uom_qty': production.product_qty,
             'product_uos_qty': production.product_uos and production.product_uos_qty or False,
             'product_uos': production.product_uos and production.product_uos.id or False,
-            'location_id': source_location_id,
-            'location_dest_id': destination_location_id,
+            'location_id': production.disassemble and destination_location_id or source_location_id ,
+            'location_dest_id': production.disassemble and source_location_id or destination_location_id,
             'move_dest_id': production.move_prod_id.id,
+<<<<<<< TREE
+=======
+            'state': production.disassemble and 'assigned' or 'waiting', # for products to produce
+>>>>>>> MERGE-SOURCE
             'company_id': production.company_id.id,
             'production_id': production.id,
             'origin': production.name,
@@ -1019,6 +1161,7 @@
         move_id = stock_move.create(cr, uid, {
             'name': production.name,
             'date': production.date_planned,
+<<<<<<< TREE
             'product_id': product.id,
             'product_uom_qty': qty,
             'product_uom': uom_id,
@@ -1026,12 +1169,27 @@
             'product_uos': uos_id or False,
             'location_id': source_location_id,
             'location_dest_id': destination_location_id,
+=======
+            'product_id': production_line.product_id.id,
+            'product_qty': production_line.product_qty,
+            'product_uom': production_line.product_uom.id,
+            'product_uos_qty': production_line.product_uos and production_line.product_uos_qty or False,
+            'product_uos': production_line.product_uos and production_line.product_uos.id or False,
+            'location_id': production.disassemble and destination_location_id or source_location_id,
+            'location_dest_id': production.disassemble and source_location_id or destination_location_id,
+            'move_dest_id': parent_move_id,
+            'state': production.disassemble and 'assigned' or 'waiting', # for products to consume
+>>>>>>> MERGE-SOURCE
             'company_id': production.company_id.id,
+<<<<<<< TREE
             'procure_method': self._get_raw_material_procure_method(cr, uid, product, context=context),
             'raw_material_production_id': production.id,
             #this saves us a browse in create()
             'price_unit': product.standard_price,
             'origin': production.name,
+=======
+            'disassemble': production.disassemble
+>>>>>>> MERGE-SOURCE
         })
         return move_id
 
@@ -1045,9 +1203,20 @@
         uncompute_ids = filter(lambda x: x, [not x.product_lines and x.id or False for x in self.browse(cr, uid, ids, context=context)])
         self.action_compute(cr, uid, uncompute_ids, context=context)
         for production in self.browse(cr, uid, ids, context=context):
+<<<<<<< TREE
             self._make_production_produce_line(cr, uid, production, context=context)
 
             stock_moves = []
+=======
+            if not production.disassemble:
+                shipment_id = self._make_production_internal_shipment(cr, uid, production, context=context)
+            produce_move_id = self._make_production_produce_line(cr, uid, production, context=context)
+
+            # Take routing location as a Source Location.
+            source_location_id = production.location_src_id.id
+            if production.bom_id.routing_id and production.bom_id.routing_id.location_id:
+                source_location_id = production.bom_id.routing_id.location_id.id
+>>>>>>> MERGE-SOURCE
             for line in production.product_lines:
                 stock_move_id = self._make_production_consume_line(cr, uid, line, context=context)
                 if stock_move_id:
 
=== modified file 'mrp/mrp_demo.xml'
--- mrp/mrp_demo.xml	2014-01-20 14:42:43 +0000
+++ mrp/mrp_demo.xml	2014-05-20 10:51:47 +0000
@@ -38,7 +38,6 @@
 
         <record id="mrp_workcenter_0" model="mrp.workcenter">
             <field name="name">Assembly workshop</field>
-            <field name="calendar_id" ref="resource.timesheet_group1"/>
             <field name="capacity_per_cycle">5</field>
             <field name="time_cycle">1</field>
             <field name="time_start">0.1</field>
@@ -661,6 +660,7 @@
     <record id="mrp_production_2" model="mrp.production">
         <field name="product_id" ref="product.product_product_27"/>
         <field name="product_uom" ref="product.product_uom_unit"/>
+        <field name="product_qty">5</field>
         <field name="location_src_id" ref="stock.stock_location_stock"/>
         <field name="location_dest_id" ref="stock.stock_location_output"/>
         <field name="bom_id" ref="mrp.mrp_bom_7"/>
 
=== modified file 'mrp/mrp_view.xml'
--- mrp/mrp_view.xml	2014-05-07 18:29:17 +0000
+++ mrp/mrp_view.xml	2014-05-20 10:51:47 +0000
@@ -671,32 +671,57 @@
             <field name="arch" type="xml">
                 <form string="Manufacturing Orders" version="7.0">
                 <header>
+<<<<<<< TREE
                     <button name="button_confirm" states="draft" string="Confirm Production" class="oe_highlight"/>
                     <button name="%(act_mrp_product_produce)d" states="ready,in_production" string="Produce" type="action" class="oe_highlight"/>
                     <button name="action_assign" states="confirmed,picking_except" string="Check Availability" type="object" class="oe_highlight"/>
                     <button name="force_production" states="confirmed" string="Force Reservation" type="object"/>
+=======
+                    <button name="button_confirm" string="Confirm Production" class="oe_highlight" attrs="{'invisible':['|',('disassemble', '=', True),('state','!=','draft')]}"/>
+                    <button name="button_confirm" string="Confirm Dismantling" class="oe_highlight" attrs="{'invisible':['|',('disassemble', '=', False),('state','!=','draft')]}"/>
+                    <button name="%(act_mrp_product_produce)d" string="Produce" type="action" class="oe_highlight" attrs="{'invisible':['|',('disassemble', '=', True),('state','not in',('ready', 'in_production'))]}"/>
+                    <button name="%(act_mrp_disassemble_product)d" string="Disassemble" type="action" class="oe_highlight" attrs="{'invisible':['|',('disassemble', '=', False),('state','not in',('confirmed', 'ready', 'in_production'))]}"/>
+                    <button name="force_production" states="confirmed" string="Force Reservation" type="object" class="oe_highlight"/>
+                    <button name="force_production" states="picking_except" string="Force Reservation" type="object"/>
+>>>>>>> MERGE-SOURCE
                     <button name="button_produce" states="ready" string="Mark as Started"/>
+<<<<<<< TREE
                     <button name="button_cancel" states="draft,ready,in_production" string="Cancel Production"/>
                     <button name="action_cancel" type="object" states="confirmed" string="Cancel Production"/>
                     <field name="state" widget="statusbar" statusbar_visible="draft,ready,in_production,done" statusbar_colors='{"confirmed":"blue"}'/>
+=======
+                    <button name="button_recreate" states="picking_except" string="Recreate Picking"/>
+                    <button name="button_cancel" string="Cancel Production" attrs="{'invisible':['|',('disassemble', '=', True),('state','not in',('draft','ready','in_production','picking_except'))]}"/>
+                    <button name="button_cancel" string="Cancel Dismantling" attrs="{'invisible':['|',('disassemble', '=', False),('state','not in',('draft','ready','in_production','picking_except'))]}"/>
+                    <button name="action_cancel" type="object" string="Cancel Production" attrs="{'invisible':['|',('disassemble', '=', True),('state','!=','confirmed')]}"/>
+                    <button name="action_cancel" type="object" string="Cancel Dismantling" attrs="{'invisible':['|',('disassemble', '=', False), ('state','!=','confirmed')]}"/>
+                    <button name="%(action_change_disassemble_qty)d" type="action" string="Disassemble" attrs="{'invisible':['|','|', ('state','!=','done'), ('qty_to_disassemble','=',0)]}"/>
+                    <field name="state" widget="statusbar" statusbar_visible="draft,ready,in_production,done" statusbar_colors='{"picking_except":"red","confirmed":"blue"}'/>
+>>>>>>> MERGE-SOURCE
                 </header>
                 <sheet>
                     <div class="oe_title">
-                        <h1>Manufacturing Order <field name="name" class="oe_inline"/></h1>
+                        <h1><label string="Disassemble" attrs="{'invisible':[('disassemble','=',False)]}" class="oe_inline"/>
+                        Manufacturing Order <field name="name" class="oe_inline"/></h1>
                     </div>
                     <group>
                         <group>
+<<<<<<< TREE
                             <field name="product_id" on_change="product_id_change(product_id, product_qty)" domain="[('bom_ids','!=',False),('bom_ids.bom_id','=',False),('bom_ids.type','!=','phantom')]" class="oe_inline" context='{"default_type": "product"}'/>
+=======
+                            <field name="product_id" on_change="product_id_change(product_id, product_qty)" domain="[('bom_ids','!=',False),('bom_ids.bom_id','=',False)]" class="oe_inline" context='{"default_supply_method":"produce", "default_type": "product"}'/>
+			    <field name="qty_to_disassemble" invisible="1"/>
+>>>>>>> MERGE-SOURCE
                             <label for="product_qty"/>
                             <div>
-                                <field name="product_qty" class="oe_inline" on_change="product_id_change(product_id, product_qty)"/>
+                                <field name="product_qty" widget="mrp_product_qty" class="oe_inline" on_change="onchange_product_qty(product_qty)"/>
                                 <field name="product_uom" groups="product.group_uom" class="oe_inline"/>
                                 <button type="action"
                                     name="%(mrp.action_change_production_qty)d"
                                     string="Update" states="confirmed" class="oe_edit_only oe_link"/>
                             </div>
-                            <label for="product_uos_qty" groups="product.group_uos"/>
-                            <div groups="product.group_uos">
+                            <label for="product_uos_qty" attrs="{'invisible':[('disassemble', '=', True)]}" groups="product.group_uos"/>
+                            <div attrs="{'invisible':[('disassemble', '=', True)]}" groups="product.group_uos">
                                 <field name="product_uos_qty" class="oe_inline"/>
                                 <label string="-" attrs="{'invisible':[('product_uos','=',False)]}" class="oe_inline"/>
                                 <field name="product_uos" class="oe_inline"/>
@@ -715,16 +740,21 @@
                         </group>
                     </group>
                     <notebook>
-                        <page string="Consumed Products">
+                        <page string="Consumed Products" name="consumed_products">
                             <group>
-                                <group string="Products to Consume">
+                                <group string="Products to Consume" name="group_to_consume">
                                     <field name="move_lines" nolabel="1" options="{'reload_on_button': true}">
                                         <tree colors="blue:state == 'draft';black:state in ('ready','assigned','in_production');gray:state in ('cancel','done');red:state in ('confirmed','waiting')" string="Products to Consume">
                                             <field name="product_id"/>
                                             <field name="product_qty"  string="Quantity"/>
                                             <field name="product_uom" string="Unit of Measure" groups="product.group_uom"/>
                                             <field name="state" invisible="1"/>
+<<<<<<< TREE
                                             <button name="%(mrp.move_consume)d"
+=======
+                                            <field name="disassemble" invisible="1"/>
+                                            <button name="%(stock.move_consume)d"
+>>>>>>> MERGE-SOURCE
                                                 string="Consume Products" type="action"
                                                 icon="gtk-go-forward" context="{'consume': True}"
                                                 states="assigned"
@@ -732,11 +762,11 @@
                                             <button name="%(stock.move_scrap)d"
                                                 string="Scrap Products" type="action"
                                                 icon="terp-gtk-jump-to-ltr" context="{'scrap': True}"
-                                                states="draft,waiting,confirmed,assigned"/>
+                                                attrs="{'invisible':['|',('disassemble', '=', True),('state', '=', 'cancel')]}"/>
                                         </tree>
                                     </field>
                                 </group>
-                                <group string="Consumed Products">
+                                <group string="Consumed Products" name="group_consumed">
                                     <field name="move_lines2" nolabel="1" options="{'reload_on_button': true}">
                                        <tree colors="red:scrapped==True;blue:state == 'draft';black:state in ('confirmed','ready','in_production');gray:state == 'cancel' " string="Consumed Products" editable="bottom">
                                            <field name="product_id" readonly="1"/>
@@ -745,12 +775,17 @@
                                            <field name="product_uom" readonly="1" string="Unit of Measure" groups="product.group_uom"/>
                                            <field name="state" invisible="1"/>
                                            <field name="scrapped" invisible="1"/>
+                                           <field name="disassemble" invisible="1"/>
+                                           <button name="%(stock.move_scrap)d"
+                                                string="Scrap Products" type="action"
+                                                icon="terp-gtk-jump-to-ltr" context="{'scrap': True}"
+                                                attrs="{'invisible':['|',('disassemble', '=', False),('state', '=', 'cancel')]}"/>
                                        </tree>
                                     </field>
                                 </group>
                             </group>
                         </page>
-                        <page string="Finished Products">
+                        <page string="Finished Products" attrs="{'invisible':[('disassemble', '=', True)]}">
                             <group>
                                 <group string="Products to Produce">
                                     <field name="move_created_ids" nolabel="1" options="{'reload_on_button': true}">
@@ -804,7 +839,7 @@
                                 </tree>
                             </field>
                         </page>
-                        <page string="Scheduled Products">
+                        <page string="Scheduled Products" attrs="{'invisible':[('disassemble', '=', True)]}">
                             <button name="action_compute" states="draft"
                                 string="Compute Data" type="object"
                                 icon="terp-stock_format-scientific"/>
@@ -816,10 +851,18 @@
                                     <field name="priority"/>
                                     <field name="date_start" invisible="1"/>
                                     <field name="date_finished" invisible="1"/>
+                                    <field name="disassemble" invisible="1"/>
+                                    <field name="disassemble_doc" attrs="{'invisible':[('disassemble_doc', '=', False)]}"/>
                                 </group>
                                 <group>
+<<<<<<< TREE
                                     <field name="company_id" groups="base.group_multi_company" widget="selection" />                                     
                                     <field name="move_prod_id" groups="stock.group_locations"/>
+=======
+                                    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                                    <field name="picking_id" attrs="{'invisible':[('disassemble', '=', True)]}"/>
+                                    <field name="move_prod_id" attrs="{'invisible':[('disassemble', '=', True)]}" groups="stock.group_locations"/>
+>>>>>>> MERGE-SOURCE
                                 </group>
                             </group>
                         </page>
@@ -845,6 +888,10 @@
                         help="Manufacturing Orders which are ready to start production."/>
                     <filter icon="terp-check" string="In Production" name="inprogress" domain="[('state','=','in_production')]"
                         help="Manufacturing Orders which are currently in production."/>
+                    <filter string="Manufacturing" name="manufacturing" domain="[('disassemble', '=', False)]"
+                        help="Manufacturing Orders."/>
+                    <filter string="Disassemble" name="disassemble" domain="[('product_qty', '&lt;', 0)]"
+                        help="Disassemble Orders."/>
                     <separator/>
                     <filter icon="terp-gnome-cpu-frequency-applet+" string="Late" domain="['&amp;', ('date_planned','&lt;', current_date), ('state', 'in', ('draft', 'confirmed', 'ready'))]"
                         help="Production started late"/>
 
=== modified file 'mrp/procurement.py'
--- mrp/procurement.py	2014-05-07 17:14:31 +0000
+++ mrp/procurement.py	2014-05-20 10:51:47 +0000
@@ -77,6 +77,7 @@
         bom_obj = self.pool.get('mrp.bom')
         procurement_obj = self.pool.get('procurement.order')
         for procurement in procurement_obj.browse(cr, uid, ids, context=context):
+<<<<<<< TREE
             if self.check_bom_exists(cr, uid, [procurement.id], context=context):
                 if procurement.bom_id:
                     bom_id = procurement.bom_id.id
@@ -116,6 +117,33 @@
             else:
                 res[procurement.id] = False
                 self.message_post(cr, uid, [procurement.id], body=_("No BoM exists for this product!"), context=context)
+=======
+            res_id = procurement.move_id.id
+            newdate = datetime.strptime(procurement.date_planned, '%Y-%m-%d %H:%M:%S') - relativedelta(days=procurement.product_id.produce_delay or 0.0)
+            newdate = newdate - relativedelta(days=company.manufacturing_lead)
+            produce_id = production_obj.create(cr, uid, {
+                'origin': procurement.origin,
+                'product_id': procurement.product_id.id,
+                'product_qty': procurement.product_qty,
+                'qty_to_disassemble': procurement.product_qty,
+                'product_uom': procurement.product_uom.id,
+                'product_uos_qty': procurement.product_uos and procurement.product_uos_qty or False,
+                'product_uos': procurement.product_uos and procurement.product_uos.id or False,
+                'location_src_id': procurement.location_id.id,
+                'location_dest_id': procurement.location_id.id,
+                'bom_id': procurement.bom_id and procurement.bom_id.id or False,
+                'date_planned': newdate.strftime('%Y-%m-%d %H:%M:%S'),
+                'move_prod_id': res_id,
+                'company_id': procurement.company_id.id,
+            })
+            
+            res[procurement.id] = produce_id
+            self.write(cr, uid, [procurement.id], {'state': 'running', 'production_id': produce_id})   
+            bom_result = production_obj.action_compute(cr, uid,
+                    [produce_id], properties=[x.id for x in procurement.property_ids])
+            production_obj.signal_button_confirm(cr, uid, [produce_id])
+        self.production_order_create_note(cr, uid, ids, context=context)
+>>>>>>> MERGE-SOURCE
         return res
 
     def production_order_create_note(self, cr, uid, procurement, context=None):
 
=== added directory 'mrp/static/src/js'
=== added file 'mrp/static/src/js/mrp.js'
--- mrp/static/src/js/mrp.js	1970-01-01 00:00:00 +0000
+++ mrp/static/src/js/mrp.js	2014-05-20 10:51:47 +0000
@@ -0,0 +1,38 @@
+openerp.mrp = function(instance) {
+var _t = instance.web._t;
+
+instance.web.form.mrp_product_qty =  instance.web.form.FieldFloat.extend({
+    init: function(field_manager, node) {
+        var self = this;
+        this._super(field_manager, node);
+        this.on("change:value", this, function() {
+            self.update_label(this.get('value'));
+        });
+        var $page = this.view.$el.find("a[name='consumed_products']");
+        var $label_product = this.view.$el.find("div[name='group_to_consume']");
+        var $label_consumed = this.view.$el.find("div[name='group_consumed']");
+        this.label_list = [$page, $label_product, $label_consumed];
+        this.label_value = [[_t("Consumed Products"),_t("Disassembled Products")],
+                            [_t("Products to Consume"),_t("Products to Disassemble")],
+                            [_t("Consumed Products"),_t("Disassembled Products")]];
+    },
+    update_label:function(value){
+        var self = this
+        _.map(self.label_list, function(ele, i){ 
+            value > 0 ? ele.text(self.label_value[i][0]) : ele.text(self.label_value[i][1])
+        });
+    },			
+    parse_value: function(val, def) {
+        if (this.widget) this.widget='float'
+        return instance.web.parse_value(val, this, def);
+    },
+    format_value: function(val, def) {
+        if (this.widget) this.widget='float'
+        return instance.web.format_value(val, this, def);
+    },
+
+});
+instance.web.form.widgets = instance.web.form.widgets.extend({
+'mrp_product_qty': 'instance.web.form.mrp_product_qty',
+});
+}
 
=== added file 'mrp/test/disassemble_process.yml'
--- mrp/test/disassemble_process.yml	1970-01-01 00:00:00 +0000
+++ mrp/test/disassemble_process.yml	2014-05-20 10:51:47 +0000
@@ -0,0 +1,96 @@
+-
+    MRP user can doing all process related to Production Order, so let's check data with giving the access rights of user.
+-
+  !context
+    uid: 'res_users_mrp_user'
+- 
+  In order to test Disassemble feature in OpenERP we will create a Production order with negative quantity for PC Assemble SC349
+-
+  !record {model: mrp.production, id: mrp_production_test2}:
+    product_id: product.product_product_4
+    product_qty: -5.0
+    location_src_id: stock.stock_location_14
+    location_dest_id: stock.stock_location_output
+    bom_id: mrp_bom_24
+    routing_id: mrp.mrp_routing_1
+-
+  I compute the production order.
+-
+  !python {model: mrp.production}: |
+    order = self.browse(cr, uid, ref("mrp_production_test2"), context=context)
+    order.action_compute(context=context)
+-
+  I check production lines after compute.
+-
+  !python {model: mrp.production}: |
+    order = self.browse(cr, uid, ref("mrp_production_test2"), context=context)
+    assert len(order.product_lines) == 5, "Production lines are not generated proper."
+-
+  Now I check workcenter lines.
+-
+  !python {model: mrp.production}: |
+    from openerp.tools import float_compare
+    def assert_equals(value1, value2, msg, float_compare=float_compare):
+        assert float_compare(value1, value2, precision_digits=2) == 0, msg
+    order = self.browse(cr, uid, ref("mrp_production_test2"), context=context)
+    assert len(order.workcenter_lines), "Workcenter lines are not generated proper."
+-
+  I confirm the Production Order.
+-
+  !workflow {model: mrp.production, action: button_confirm, ref: mrp_production_test2}
+-
+  I check details of Produce Move of Production Order to trace Final Product.
+-
+  !python {model: mrp.production}: |
+    order = self.browse(cr, uid, ref("mrp_production_test2"))
+    assert order.state == 'ready', "Production order should be ready."
+    assert order.move_created_ids, "Trace Record is not created for Final Product."
+    move = order.move_created_ids[0]
+    source_location_id = order.product_id.property_stock_production.id
+    assert move.date == order.date_planned, "Planned date is not correspond."
+    assert move.product_id.id == order.product_id.id, "Product is not correspond."
+    assert move.product_uom.id == order.product_uom.id, "UOM is not correspond."
+    assert move.product_qty == abs(order.product_qty), "Qty is not correspond."
+    assert move.product_uos_qty == order.product_uos and order.product_uos_qty or abs(order.product_qty), "UOS qty is not correspond."
+    if order.product_uos:
+        assert move.product_uos.id == order.product_uos.id, "UOS is not correspond."
+    assert move.location_id.id == order.location_dest_id.id, "Source Location is not correspond."
+    assert move.location_dest_id.id == source_location_id, "Destination Location is not correspond."
+    routing_loc = None
+    if order.bom_id.routing_id and order.bom_id.routing_id.location_id:
+        routing_loc = order.bom_id.routing_id.location_id.id
+    date_planned = order.date_planned
+    for move_line in order.move_lines:
+        for order_line in order.product_lines:
+            if move_line.product_id.type not in ('product', 'consu'):
+                continue
+            if move_line.product_id.id == order_line.product_id.id:
+                assert move_line.date == date_planned, "Planned date is not correspond in 'To consume line'."
+                assert move_line.product_qty == order_line.product_qty, "Qty is not correspond in 'To consume line'."
+                assert move_line.product_uom.id == order_line.product_uom.id, "UOM is not correspond in 'To consume line'."
+                assert move_line.product_uos_qty == order_line.product_uos and order_line.product_uos_qty or order_line.product_qty, "UOS qty is not correspond in 'To consume line'."
+                if order_line.product_uos:
+                    assert move_line.product_uos.id == order_line.product_uos.id, "UOS is not correspond in 'To consume line'."
+                assert move_line.location_id.id == source_location_id, "Source location is not correspond in 'To consume line'."
+                assert move_line.location_dest_id.id == routing_loc or order.location_src_id.id, "Destination Location is not correspond in 'To consume line'."
+-
+  I check that production order in ready state.
+-
+  !python {model: mrp.production}: |
+    order = self.browse(cr, uid, ref("mrp_production_test2"))
+    assert order.state == 'ready', 'Production order should be in Ready State.'
+
+-
+  I check that production order in production state after start production.
+-
+  !python {model: mrp.production}: |
+    order = self.browse(cr, uid, ref("mrp_production_test2"))
+    context.update({'active_id': ref('mrp_production_test2')})
+    assert self.action_produce(cr, uid, order.id , 5.0, 'consume_produce'), 'Can not do action produce.'
+
+-
+  I check that production order in Done state.
+-
+  !python {model: mrp.production}: |
+    order = self.browse(cr, uid, ref("mrp_production_test2"))
+    assert order.state == 'done', 'Production order should be in Done State.'
 
=== modified file 'mrp/test/order_demo.yml'
--- mrp/test/order_demo.yml	2014-04-04 16:17:13 +0000
+++ mrp/test/order_demo.yml	2014-05-20 10:51:47 +0000
@@ -13,5 +13,3 @@
     location_dest_id: stock.stock_location_output
     bom_id: mrp_bom_24
     routing_id: mrp.mrp_routing_1
-    
-    
 
=== modified file 'mrp/wizard/__init__.py'
--- mrp/wizard/__init__.py	2014-01-28 15:18:34 +0000
+++ mrp/wizard/__init__.py	2014-05-20 10:51:47 +0000
@@ -23,7 +23,11 @@
 import mrp_price
 import mrp_workcenter_load
 import change_production_qty
+<<<<<<< TREE
 import stock_move
+=======
+import disassemble_qty
+>>>>>>> MERGE-SOURCE
 #import mrp_change_standard_price
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== modified file 'mrp/wizard/change_production_qty.py'
--- mrp/wizard/change_production_qty.py	2013-11-29 16:56:44 +0000
+++ mrp/wizard/change_production_qty.py	2014-05-20 10:51:47 +0000
@@ -71,7 +71,7 @@
         move_obj = self.pool.get('stock.move')
         for wiz_qty in self.browse(cr, uid, ids, context=context):
             prod = prod_obj.browse(cr, uid, record_id, context=context)
-            prod_obj.write(cr, uid, [prod.id], {'product_qty': wiz_qty.product_qty})
+            prod_obj.write(cr, uid, [prod.id], {'product_qty': wiz_qty.product_qty, 'qty_to_disassemble': wiz_qty.product_qty, 'disassemble': wiz_qty.product_qty < 0 and True or False}, context=context)
             prod_obj.action_compute(cr, uid, [prod.id])
 
             for move in prod.move_lines:
 
=== added file 'mrp/wizard/disassemble_qty.py'
--- mrp/wizard/disassemble_qty.py	1970-01-01 00:00:00 +0000
+++ mrp/wizard/disassemble_qty.py	2014-05-20 10:51:47 +0000
@@ -0,0 +1,64 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    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, osv
+from openerp.tools.translate import _
+import openerp.addons.decimal_precision as dp
+
+class change_disassemble_qty(osv.osv_memory):
+    _name = 'change.disassemble.qty'
+    _description = 'Change Quantity for Disassemble Products'
+
+    _columns = {
+        'product_qty': fields.float('Quantity', digits_compute=dp.get_precision('Product Unit of Measure'), required=True),
+    }
+
+    def default_get(self, cr, uid, fields, context=None):
+        """ To get default values for the object.
+        @param self: The object pointer.
+        @param cr: A database cursor
+        @param uid: ID of the user currently logged in
+        @param fields: List of fields for which we want default values
+        @param context: A standard dictionary
+        @return: A dictionary which of fields with values.
+        """
+        if context is None:
+            context = {}
+        res = super(change_disassemble_qty, self).default_get(cr, uid, fields, context=context)
+        prod = self.pool.get('mrp.production').browse(cr, uid, context.get('active_id'), context=context)
+        if 'product_qty' in fields:
+            res.update({'product_qty': prod.qty_to_disassemble * -1 })
+        return res
+
+    def change_disassemble_qty(self, cr, uid, ids, context=None):
+        mrp_production_obj = self.pool.get('mrp.production')
+        mrp_id = context.get('active_id', False)
+        qty = self.browse(cr, uid, ids[0], context=context).product_qty
+        if qty >= 0:
+            raise osv.except_osv(_('Warning!'), _('Quantity must be negative to disassemble.'))
+        mrp_record = mrp_production_obj.browse(cr, uid, mrp_id, context=context)
+        mrp_record.write({'qty_to_disassemble': mrp_record.qty_to_disassemble - abs(qty)}, context=context)
+        if mrp_record.qty_to_disassemble < abs(qty) :
+            raise osv.except_osv(_('Warning!'), _('You are going to disassemble total %s quantities of "%s".\nBut you can only disassemble up to total %s quantities.') % (abs(qty), mrp_record.product_id.name, mrp_record.qty_to_disassemble))
+        return mrp_production_obj.action_disassemble(cr, uid, mrp_id, qty, context=context)
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
 
=== added file 'mrp/wizard/disassemble_qty_view.xml'
--- mrp/wizard/disassemble_qty_view.xml	1970-01-01 00:00:00 +0000
+++ mrp/wizard/disassemble_qty_view.xml	2014-05-20 10:51:47 +0000
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <!--  Change Product Quantity for Disassemble Order-->
+
+        <record id="view_change_disassemble_qty_wizard" model="ir.ui.view">
+            <field name="name">Change Disassemble Order Qty</field>
+            <field name="model">change.disassemble.qty</field>
+            <field name="arch" type="xml">
+                <form string="Change Disassemble Order Quantity in Negative" version="7.0">
+                    <newline/>
+                    <group col="7">
+                        <field name="product_qty" />
+                        <label string="Use negative quantity for disassemble order" colspan="5" class="oe_left oe_grey" style="margin-top: 5px;"/>
+                    </group>
+                    <footer>
+                        <button name="change_disassemble_qty" string="Create"
+                            colspan="1" type="object" class="oe_highlight"  />
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />    
+                    </footer>
+                </form>
+            </field>
+        </record>
+
+        <record id="action_change_disassemble_qty" model="ir.actions.act_window">
+            <field name="name">Select Quantity to Disassemble</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">change.disassemble.qty</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
+
+    </data>
+</openerp>
 
=== modified file 'mrp/wizard/mrp_product_produce.py'
--- mrp/wizard/mrp_product_produce.py	2014-05-07 16:59:51 +0000
+++ mrp/wizard/mrp_product_produce.py	2014-05-20 10:51:47 +0000
@@ -20,7 +20,9 @@
 ##############################################################################
 
 from openerp.osv import fields, osv
+from lxml import etree
 import openerp.addons.decimal_precision as dp
+from openerp.tools.translate import _
 
 
 class mrp_product_produce_line(osv.osv_memory):
@@ -52,6 +54,7 @@
         'track_production': fields.boolean('Track production'),
     }
 
+<<<<<<< TREE
     def on_change_qty(self, cr, uid, ids, product_qty, consume_lines, context=None):
         """ 
             When changing the quantity of products to be produced it will 
@@ -72,6 +75,20 @@
         return {'value': {'consume_lines': new_consume_lines}}
 
 
+=======
+    def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
+        if context is None:
+            context = {}
+        res = super(mrp_product_produce,self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar, submenu=submenu)
+        doc = etree.XML(res['arch'])
+        mrp_production = self.pool.get('mrp.production').browse(cr, uid, context.get('active_id'), context=context)
+        if view_type == 'form' and mrp_production.disassemble == True:
+            for node in doc.xpath("//group[@name='produce']"):
+                node.set('string',_('Product to Disassemble'))
+            res['arch'] = etree.tostring(doc)
+        return res
+
+>>>>>>> MERGE-SOURCE
     def _get_product_qty(self, cr, uid, context=None):
         """ To obtain product quantity
         @param self: The object pointer.
@@ -89,7 +106,7 @@
             if move.product_id == prod.product_id:
                 if not move.scrapped:
                     done += move.product_qty
-        return (prod.product_qty - done) or prod.product_qty
+        return (abs(prod.product_qty) - done) or abs(prod.product_qty)
 
     def _get_product_id(self, cr, uid, context=None):
         """ To obtain product id
 
=== modified file 'mrp/wizard/mrp_product_produce_view.xml'
--- mrp/wizard/mrp_product_produce_view.xml	2014-02-05 10:43:24 +0000
+++ mrp/wizard/mrp_product_produce_view.xml	2014-05-20 10:51:47 +0000
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-    
-        
+
         <!--  Produce -->
-        
+
         <record id="view_mrp_product_produce_wizard" model="ir.ui.view">
             <field name="name">MRP Product Produce</field>
             <field name="model">mrp.product.produce</field>
             <field name="arch" type="xml">
                 <form string="Produce" version="7.0">
-                    <group string="Produce">
+                    <group name="produce" string="Produce">
                         <field name="mode"/>
+<<<<<<< TREE
                         <field name="product_qty" colspan="2" on_change="on_change_qty(product_qty, consume_lines, context)"/>
                         <field name="product_id" invisible="1"/>
                         <field name="track_production" invisible="1"/>
@@ -31,6 +31,10 @@
                             </tree>
                         </field>
                     </group>
+=======
+                        <field name="product_qty" colspan="2"/>
+                    </group>
+>>>>>>> MERGE-SOURCE
                     <footer>
                         <button name="do_produce" type="object" string="Confirm" class="oe_highlight"/>
                         or
@@ -47,8 +51,16 @@
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
             <field name="target">new</field>
-        </record>    
-        
-        
+        </record>
+
+        <record id="act_mrp_disassemble_product" model="ir.actions.act_window">
+            <field name="name">Disassemble</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">mrp.product.produce</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
+
     </data>
-</openerp>    
+</openerp>
 
=== modified file 'mrp_byproduct/mrp_byproduct.py'
--- mrp_byproduct/mrp_byproduct.py	2014-04-22 12:16:25 +0000
+++ mrp_byproduct/mrp_byproduct.py	2014-05-20 10:51:47 +0000
@@ -102,6 +102,8 @@
                         qty1 *= product_uom_factor / (production.bom_id.product_qty or 1.0)
                     if production.product_uos_qty:
                         qty2 *= product_uos_factor / (production.bom_id.product_uos_qty or 1.0)
+                if production.disassemble:
+                    continue
                 data = {
                     'name': 'PROD:'+production.name,
                     'date': production.date_planned,
@@ -110,8 +112,8 @@
                     'product_uom': sub_product.product_uom.id,
                     'product_uos_qty': qty2,
                     'product_uos': production.product_uos and production.product_uos.id or False,
-                    'location_id': source,
-                    'location_dest_id': production.location_dest_id.id,
+                    'location_id': source if not production.disassemble else production.location_dest_id.id,
+                    'location_dest_id': production.location_dest_id.id if not production.disassemble else source,
                     'move_dest_id': production.move_prod_id.id,
                     'state': 'waiting',
                     'production_id': production.id
 
=== modified file 'mrp_operations/mrp_operations.py'
--- mrp_operations/mrp_operations.py	2014-04-23 09:48:07 +0000
+++ mrp_operations/mrp_operations.py	2014-05-20 10:51:47 +0000
@@ -139,7 +139,8 @@
             if flag:
                 for production in prod_obj_pool.browse(cr, uid, [prod_obj.id], context= None):
                     if production.move_lines or production.move_created_ids:
-                        prod_obj_pool.action_produce(cr,uid, production.id, production.product_qty, 'consume_produce', context = None)
+                        product_qty = production.disassemble and abs(production.product_qty) or production.product_qty
+                        prod_obj_pool.action_produce(cr,uid, production.id, product_qty, 'consume_produce', context = None)
                 prod_obj_pool.signal_button_produce_done(cr, uid, [oper_obj.production_id.id])
         return