Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
142 changes: 74 additions & 68 deletions stock_json_api/controllers/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -239,11 +239,21 @@ def _save_outgoing_order(self, venda, user):
'number': venda['payment_custom_field']['1'],
'street2': venda['payment_custom_field']['2'],
}

shipping_number = ''
shipping_street2 = ''

if '1' in venda['shipping_custom_field'].keys():
shipping_number = venda['shipping_custom_field']['1']

if '2' in venda['shipping_custom_field'].keys():
shipping_street2 = venda['shipping_custom_field']['2']

partner.write({
'street': venda['shipping_address_1'],
'district': venda['shipping_address_2'],
'number': venda['shipping_custom_field']['1'],
'street2': venda['shipping_custom_field']['2'],
'number': shipping_number,
'street2': shipping_street2,
'child_ids': [(0, 0, payment_adress)],
})

Expand Down Expand Up @@ -291,80 +301,76 @@ def _save_outgoing_order(self, venda, user):
pick_order_type_id = int(params.get_param(
'json_api.pick_type_order_id', default=False))
picking_type_ref = pick_type_env.browse(pick_order_type_id)
if not picking_type_ref:
raise Exception("Configure os tipos de picking.")

src_id, dest_id = self._get_locations(user, partner, picking_type_ref)
picking = request.env['stock.picking'].sudo(
user).with_context(planned_picking=True).create({
'name': picking_type_ref.sequence_id.next_by_id(),
'scheduled_date': schedule,
'partner_id': partner[0].id,
'picking_type_id': picking_type_ref.id,
'move_lines': picking_items,
'location_id': src_id,
'location_dest_id': dest_id,
'origin': venda['order_id'],
'amount_total': self._calc_amount_total(picking_items),
})
move = request.env['stock.move'].sudo().search([
('picking_id', '=', picking.id)])
move.write({'picking_type_id': picking_type_ref.id})

ids.append(picking.id)
if picking_type_ref:
src_id, dest_id = self._get_locations(
user, partner, picking_type_ref)
picking = request.env['stock.picking'].sudo(
user).with_context(planned_picking=True).create({
'name': picking_type_ref.sequence_id.next_by_id(),
'scheduled_date': schedule,
'partner_id': partner[0].id,
'picking_type_id': picking_type_ref.id,
'move_lines': picking_items,
'location_id': src_id,
'location_dest_id': dest_id,
'origin': venda['order_id'],
'amount_total': self._calc_amount_total(picking_items),
})
move = request.env['stock.move'].sudo().search([
('picking_id', '=', picking.id)])
move.write({'picking_type_id': picking_type_ref.id})

ids.append(picking.id)

pack_type_id = int(params.get_param(
'json_api.pick_type_pack_id', default=False))
packing_type_ref = pick_type_env.browse(pack_type_id)
if not packing_type_ref:
raise Exception("Configure os tipos de picking.")

src_id, dest_id = self._get_locations(user, partner, packing_type_ref)

packing = request.env['stock.picking'].sudo(
user).with_context(planned_picking=True).create({
'name': packing_type_ref.sequence_id.next_by_id(),
'scheduled_date': schedule,
'partner_id': partner[0].id,
'picking_type_id': packing_type_ref.id,
'move_lines': picking_items,
'location_id': src_id,
'location_dest_id': dest_id,
'origin': venda['order_id'],
'amount_total': self._calc_amount_total(picking_items),
})
move = request.env['stock.move'].sudo().search([
('picking_id', '=', packing.id)])
move.write({'picking_type_id': packing_type_ref.id})

ids.append(packing.id)
if packing_type_ref:
src_id, dest_id = self._get_locations(
user, partner, packing_type_ref)

packing = request.env['stock.picking'].sudo(
user).with_context(planned_picking=True).create({
'name': packing_type_ref.sequence_id.next_by_id(),
'scheduled_date': schedule,
'partner_id': partner[0].id,
'picking_type_id': packing_type_ref.id,
'move_lines': picking_items,
'location_id': src_id,
'location_dest_id': dest_id,
'origin': venda['order_id'],
'amount_total': self._calc_amount_total(picking_items),
})
move = request.env['stock.move'].sudo().search([
('picking_id', '=', packing.id)])
move.write({'picking_type_id': packing_type_ref.id})

ids.append(packing.id)

outgoing_type_id = int(params.get_param(
'json_api.pick_type_outgoing_id', default=False))
requested_order_ref = pick_type_env.browse(outgoing_type_id)
if not requested_order_ref:
raise Exception("Configure os tipos de picking.")

src_id, dest_id = self._get_locations(
user, partner, requested_order_ref)

requested_order = request.env['stock.picking'].sudo(
user).with_context(planned_picking=True).create({
'name': requested_order_ref.sequence_id.next_by_id(),
'scheduled_date': schedule,
'partner_id': partner[0].id,
'picking_type_id': requested_order_ref.id,
'move_lines': picking_items,
'location_id': src_id,
'location_dest_id': dest_id,
'origin': venda['order_id'],
'amount_total': self._calc_amount_total(picking_items),
})
move = request.env['stock.move'].sudo().search([
('picking_id', '=', requested_order.id)])
move.write({'picking_type_id': requested_order_ref.id})

ids.append(requested_order.id)
if requested_order_ref:
src_id, dest_id = self._get_locations(
user, partner, requested_order_ref)

requested_order = request.env['stock.picking'].sudo(
user).with_context(planned_picking=True).create({
'name': requested_order_ref.sequence_id.next_by_id(),
'scheduled_date': schedule,
'partner_id': partner[0].id,
'picking_type_id': requested_order_ref.id,
'move_lines': picking_items,
'location_id': src_id,
'location_dest_id': dest_id,
'origin': venda['order_id'],
'amount_total': self._calc_amount_total(picking_items),
})
move = request.env['stock.move'].sudo().search([
('picking_id', '=', requested_order.id)])
move.write({'picking_type_id': requested_order_ref.id})

ids.append(requested_order.id)

return ids

Expand Down