Merge branch 'develop' into scan-batch

2021-09-30 14:07:54 +05:30
parent abf450dc70 9df5df4d94
commit c75c709114
44 changed files with 746 additions and 468 deletions
--- a/erpnext/public/js/controllers/transaction.js
+++ b/erpnext/public/js/controllers/transaction.js
@@ -652,6 +652,7 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
 											me.frm.script_manager.trigger('qty', item.doctype, item.name);
 											if (!me.frm.doc.set_warehouse)
 												me.frm.script_manager.trigger('warehouse', item.doctype, item.name);
+											me.apply_price_list(item, true);
 										}, undefined, !frappe.flags.hide_serial_batch_dialog);
 									}
 								},