← Back to branch summary

~openerp-dev/openobject-addons/trunk-bug-986088-amb

« back to all changes in this revision

Viewing changes to mrp_subproduct/mrp_subproduct.py

[BACKPORT] Stable fixes and refactorings to trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
mrp_subproduct/mrp_subproduct.py
59
59
    _inherit= 'mrp.production'   
60
60
 
61
61
    def action_confirm(self, cr, uid, ids):
62
 
         picking_id=super(mrp_production,self).action_confirm(cr, uid, ids)
63
 
         for production in self.browse(cr, uid, ids):
64
 
             source = production.product_id.product_tmpl_id.property_stock_production.id
65
 
             for sub_product in production.bom_id.sub_products:
66
 
                 qty1 = sub_product.product_qty
67
 
                 qty2 = production.product_uos and production.product_uos_qty or False
68
 
                 if sub_product.subproduct_type=='variable':
 
62
        picking_id=super(mrp_production,self).action_confirm(cr, uid, ids)
 
63
        for production in self.browse(cr, uid, ids):
 
64
            source = production.product_id.product_tmpl_id.property_stock_production.id
 
65
            if not production.bom_id:
 
66
                continue
 
67
            for sub_product in production.bom_id.sub_products:
 
68
                qty1 = sub_product.product_qty
 
69
                qty2 = production.product_uos and production.product_uos_qty or False
 
70
                if sub_product.subproduct_type=='variable':
69
71
                    if production.product_qty:
70
72
                        qty1 *= production.product_qty / (production.bom_id.product_qty or 1.0)
71
73
                    if production.product_uos_qty:
72
74
                        qty2 *= production.product_uos_qty / (production.bom_id.product_uos_qty or 1.0)
73
 
                 data = {
 
75
                data = {
74
76
                    'name':'PROD:'+production.name,
75
77
                    'date_planned': production.date_planned,
76
78
                    'product_id': sub_product.product_id.id,
83
85
                    'move_dest_id': production.move_prod_id.id,
84
86
                    'state': 'waiting',
85
87
                    'production_id':production.id
86
 
                 }
87
 
                 sub_prod_ids=self.pool.get('stock.move').create(cr, uid,data)
88
 
         return picking_id
 
88
                }
 
89
                sub_prod_ids=self.pool.get('stock.move').create(cr, uid,data)
 
90
        return picking_id
89
91
 
90
92
mrp_production()
91
93
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: