|
@@ -281,8 +281,8 @@ class PosSales(http.Controller):
|
|
|
╠╣ ║║║║║╚═╗╠═╣ ╠═╝╠╦╝║ ║ ║║║ ║║ ║ ╠═╝║║ ╠╩╗║║║║║ ╦
|
|
|
╚ ╩╝╚╝╩╚═╝╩ ╩ ╩ ╩╚═╚═╝═╩╝╚═╝╚═╝ ╩ ╩ ╩╚═╝╩ ╩╩╝╚╝╚═╝
|
|
|
'''
|
|
|
- def finish_process_picking(journal_id, customer_id, cart_items, date_now, payment_term_id, warehouse_id, user_id):
|
|
|
- sale_order_id, _ = finish_budget_pos(journal_id, customer_id, cart_items, date_now, payment_term_id, warehouse_id, user_id)
|
|
|
+ def finish_process_picking(journal_id, customer_id, cart_items, date_now, payment_term_id, warehouse_id, customer_pricelist_id, user_id):
|
|
|
+ sale_order_id, _ = finish_budget_pos(journal_id, customer_id, cart_items, date_now, payment_term_id, warehouse_id, customer_pricelist_id, user_id)
|
|
|
|
|
|
# Imports
|
|
|
from sale_order import confirm_sale_order, force_assign_picking
|
|
@@ -391,7 +391,7 @@ class PosSales(http.Controller):
|
|
|
finish_sale_pos(journal_id, customer_id, cart_items, date_now, payment_term_id, payment, payment_method, bank_payment_data, warehouse_id, customer_pricelist_id, user_id)
|
|
|
|
|
|
if mode == 'product_picking':
|
|
|
- finish_process_picking(journal_id, customer_id, cart_items, date_now, payment_term_id, warehouse_id, user_id)
|
|
|
+ finish_process_picking(journal_id, customer_id, cart_items, date_now, payment_term_id, warehouse_id, customer_pricelist_id, user_id)
|
|
|
|
|
|
if mode == 'payment':
|
|
|
sale_order_id = row.get('saleOrderId', None)
|