odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[WIP]barcode interface: when setting picking to done from barcode interface, write qty_done onto product_qty field for pack_operations 

bzr revid: csn@openerp.com-20140311093105-tqoh1cenmd3rx4sm
This commit is contained in:
Cedric Snauwaert 2014-03-11 10:31:05 +01:00
parent ca880533ee
commit a95e5bb8ce
2 changed files with 33 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
addons/stock/static/src/js/widgets.js
View File

@ -64,6 +64,9 @@ function openerp_picking_widgets(instance){
renderElement: function(){ renderElement: function(){
var self = this; var self = this;
this._super(); this._super();
//we need this disconnect here in case we click with the mouse on scan
//because the page will reload, removing the focus on line but numpad will
//still be active
this.disconnect_numpad(); this.disconnect_numpad();
this.$('.js_pack_scan').click(function(){ this.$('.js_pack_scan').click(function(){
var id = parseInt($(this).attr('op-id')); var id = parseInt($(this).attr('op-id'));
@ -83,6 +86,7 @@ function openerp_picking_widgets(instance){
}, },
check_change_quantity: function(){ check_change_quantity: function(){
var self = this; var self = this;
//if we only have one line selected, connect numpad and allow to change qty
if (this.$('.js_pack_op_line.warning:not(.hidden)').length === 1){ if (this.$('.js_pack_op_line.warning:not(.hidden)').length === 1){
cur_id = this.$('.js_pack_op_line.warning:not(.hidden)')[0].attributes.getNamedItem('data-id').value; cur_id = this.$('.js_pack_op_line.warning:not(.hidden)')[0].attributes.getNamedItem('data-id').value;
op_id = parseInt(cur_id); op_id = parseInt(cur_id);
@ -188,6 +192,9 @@ function openerp_picking_widgets(instance){
$('body').on('keydown', this.numpad_handler); $('body').on('keydown', this.numpad_handler);
}, },
disconnect_numpad: function(){ disconnect_numpad: function(){
//we need to similate that the escape button was pressed when disconnecting numpad to insure
//that if we had written some value and not saved them we refresh the view to show the correct
//value.
jQuery.event.trigger({ type : 'keydown', which : 27 }); jQuery.event.trigger({ type : 'keydown', which : 27 });
$('body').off('keydown', this.numpad_handler); $('body').off('keydown', this.numpad_handler);
}, },
@ -785,28 +792,28 @@ function openerp_picking_widgets(instance){
// return current_package; // return current_package;
// }, // },
get_current_operations: function(){ // get_current_operations: function(){
var current_package_id = instance.session.user_context.current_package_id; // var current_package_id = instance.session.user_context.current_package_id;
var ops = []; // var ops = [];
_.each( this.operations, function(op){ // _.each( this.operations, function(op){
if(!current_package_id){ // if(!current_package_id){
if(op.result_package_id !== false){ // if(op.result_package_id !== false){
return; // return;
} // }
}else if(op.result_package_id[0] !== current_package_id){ // }else if(op.result_package_id[0] !== current_package_id){
return; // return;
} // }
ops.push(op); // ops.push(op);
}); // });
return ops; // return ops;
}, // },
get_selected_operation: function(){ // get_selected_operation: function(){
if( this.selected_operation.picking_id === this.picking.id && this.selected_operation.id ){ // if( this.selected_operation.picking_id === this.picking.id && this.selected_operation.id ){
return this.selected_operation.id; // return this.selected_operation.id;
}else{ // }else{
return null; // return null;
} // }
}, // },
set_operation_quantity: function(quantity, op_id){ set_operation_quantity: function(quantity, op_id){
var self = this; var self = this;
if(quantity >= 0){ if(quantity >= 0){

4
addons/stock/stock.py
View File

@ -1219,6 +1219,10 @@ class stock_picking(osv.osv):
def action_done_from_ui(self, cr, uid, picking_id, context=None): def action_done_from_ui(self, cr, uid, picking_id, context=None):
""" called when button 'done' is pushed in the barcode scanner UI """ """ called when button 'done' is pushed in the barcode scanner UI """
#write qty_done into field product_qty for every package_operation before doing the transfer
pack_op_obj = self.pool.get('stock.pack.operation')
for operation in self.browse(cr, uid, picking_id, context=context).pack_operation_ids:
pack_op_obj.write(cr, uid, operation.id, {'product_qty': operation.qty_done}, context=context)
self.do_transfer(cr, uid, [picking_id], context=context) self.do_transfer(cr, uid, [picking_id], context=context)
#return id of next picking to work on #return id of next picking to work on
return self.get_next_picking_for_ui(cr, uid, context=context) return self.get_next_picking_for_ui(cr, uid, context=context)