Skip to content

Commit

Permalink
[IMP] API consistency
Browse files Browse the repository at this point in the history
  • Loading branch information
StefanRijnhart authored and legalsylvain committed Aug 21, 2017
1 parent 8040208 commit b577ca4
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 12 deletions.
18 changes: 7 additions & 11 deletions pos_picking_load/models/stock_picking.py
Expand Up @@ -43,10 +43,11 @@ def search_pickings_for_pos(self, query, pos_session_id):
fields = self._prepare_fields_for_pos_list()
return self.search_read(condition, fields, limit=10)

@api.model
def _prepare_pos_order(self, picking):
@api.multi
def load_picking_for_pos(self):
self.ensure_one()
pickinglines = []
for line in picking.move_lines.filtered(lambda x: x.state != 'cancel'):
for line in self.move_lines.filtered(lambda x: x.state != 'cancel'):
picking_line = {
'name': line.name,
'product_id': line.product_id.id,
Expand All @@ -60,17 +61,12 @@ def _prepare_pos_order(self, picking):
picking_line['discount'] = sale_order_line.discount
pickinglines.append(picking_line)
return {
'id': picking.id,
'name': picking.name,
'partner_id': picking.partner_id.id,
'id': self.id,
'name': self.name,
'partner_id': self.partner_id.id,
'line_ids': pickinglines,
}

@api.model
def load_picking_for_pos(self, picking_id):
picking = self.browse(picking_id)
return self._prepare_pos_order(picking)

@api.multi
def update_from_origin_picking(self, origin_picking):
if origin_picking.group_id:
Expand Down
2 changes: 1 addition & 1 deletion pos_picking_load/static/src/js/pos_picking_load.js
Expand Up @@ -195,7 +195,7 @@ openerp.pos_picking_load = function(instance, local) {
load_picking: function(origin_picking_id) {
var self = this;
var pickingModel = new instance.web.Model(this.model);
return pickingModel.call('load_picking_for_pos', [origin_picking_id])
return pickingModel.call('load_picking_for_pos', [[origin_picking_id]])
.then(function (picking) {
self.current_picking_id = origin_picking_id;
self.current_picking_name = picking.name;
Expand Down

0 comments on commit b577ca4

Please sign in to comment.