pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MERGE] stock : Merged Valencia's branch for prodlot warning. (Case:6001)

Browse Source 
bzr revid: ach@tinyerp.com-20110617063736-0o23i5wvye3umju5
This commit is contained in:
Anup (OpenERP)
2011-06-17 12:07:36 +05:30
parent 8785275cfd 46d7d78ec1
commit 96d14345f3
2 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/stock/wizard/stock_move.py
+8 -1
View File
@@ -185,7 +185,6 @@ class split_in_production_lot(osv.osv_memory):
"""
if context is None:
context = {}
res = super(split_in_production_lot, self).default_get(cr, uid, fields, context=context)
if context.get('active_id'):
move = self.pool.get('stock.move').browse(cr, uid, context['active_id'], context=context)
@@ -197,6 +196,8 @@ class split_in_production_lot(osv.osv_memory):
res.update({'qty': move.product_qty})
if 'use_exist' in fields:
res.update({'use_exist': (move.picking_id and move.picking_id.type=='out' and True) or False})
if 'location_id' in fields:
res.update({'location_id': move.location_id.id})
return res
_columns = {
@@ -206,6 +207,7 @@ class split_in_production_lot(osv.osv_memory):
'line_ids': fields.one2many('stock.move.split.lines', 'lot_id', 'Production Lots'),
'line_exist_ids': fields.one2many('stock.move.split.lines.exist', 'lot_id', 'Production Lots'),
'use_exist' : fields.boolean('Existing Lots', help="Check this option to select existing lots in the list below, otherwise you should enter new ones line by line."),
'location_id': fields.many2one('stock.location', 'Source Location')
}
def split_lot(self, cr, uid, ids, context=None):
@@ -307,6 +309,11 @@ class stock_move_split_lines_exist(osv.osv_memory):
'quantity': lambda *x: 1.00,
}
def onchange_lot_id(self, cr, uid, ids, prodlot_id=False, product_qty=False,
loc_id=False, product_id=False, uom_id=False):
return self.pool.get('stock.move').onchange_lot_id(cr, uid, [], prodlot_id, product_qty,
loc_id, product_id, uom_id)
stock_move_split_lines_exist()
class stock_move_split_lines(osv.osv_memory):
addons/stock/wizard/stock_move_view.xml
+5 -4
View File
@@ -118,6 +118,7 @@
<field name="product_uom" readonly="1"/>
</group>
</group>
<field name="location_id" invisible="1"/>
<group colspan="4" attrs="{'invisible':[('use_exist','=',True)]}">
<field name="line_ids" colspan="4" nolabel="1">
@@ -134,12 +135,12 @@
<group colspan="4" attrs="{'invisible':[('use_exist','!=',True)]}">
<field name="line_exist_ids" colspan="4" nolabel="1">
<tree string="Production Lot Numbers" editable="bottom">
<field name="prodlot_id" string="Lot number" domain="[('product_id','=',parent.product_id)]"/>
<field name="quantity" />
<field name="prodlot_id" string="Lot number" domain="[('product_id','=',parent.product_id)]" on_change="onchange_lot_id(prodlot_id, quantity, parent.location_id, parent.product_id, parent.product_uom)"/>
<field name="quantity" on_change="onchange_lot_id(prodlot_id, quantity, parent.location_id, parent.product_id, parent.product_uom)" />
</tree>
<form string="Production Lot Number">
<field name="prodlot_id" string="Lot number" domain="[('product_id','=',parent.product_id)]"/>
<field name="quantity" />
<field name="prodlot_id" string="Lot number" domain="[('product_id','=',parent.product_id)]" on_change="onchange_lot_id(prodlot_id, quantity, parent.location_id, parent.product_id, parent.product_uom)"/>
<field name="quantity" on_change="onchange_lot_id(prodlot_id, quantity, parent.location_id, parent.product_id, parent.product_uom)" />
</form>
</field>
</group>