CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-19 10:14:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #40356 from frappe/mergify/bp/version-15-hotfix/pr-40355

Browse Source 
fix: Blanket order rate getting changed on converting to order (#40355)
This commit is contained in:
Deepesh Garg
2024-03-10 19:26:24 +05:30
committed by GitHub
parent df1a51e291 d8c6eb0bf2
commit 8b5afbbaca
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/public/js/controllers/transaction.js
View File

@@ -17,7 +17,7 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
frappe.model.round_floats_in(item, ["rate", "price_list_rate"]);
if(item.price_list_rate) {
if(item.price_list_rate && !item.blanket_order_rate) {
if(item.rate > item.price_list_rate && has_margin_field) {
// if rate is greater than price_list_rate, set margin
// or set discount