Merge pull request #40758 from ashish-greycube/patch-12
fix: payment_order_status should be no_copy
diff --git a/erpnext/accounts/doctype/journal_entry/journal_entry.js b/erpnext/accounts/doctype/journal_entry/journal_entry.js
index ed134ba..668cd3e 100644
--- a/erpnext/accounts/doctype/journal_entry/journal_entry.js
+++ b/erpnext/accounts/doctype/journal_entry/journal_entry.js
@@ -453,7 +453,10 @@
}
},
cost_center: function (frm, dt, dn) {
- erpnext.journal_entry.set_account_details(frm, dt, dn);
+ // Don't reset for Gain/Loss type journals, as it will make Debit and Credit values '0'
+ if (frm.doc.voucher_type != "Exchange Gain Or Loss") {
+ erpnext.journal_entry.set_account_details(frm, dt, dn);
+ }
},
account: function (frm, dt, dn) {
diff --git a/erpnext/public/js/utils/serial_no_batch_selector.js b/erpnext/public/js/utils/serial_no_batch_selector.js
index 42d37bf4..1edeca9 100644
--- a/erpnext/public/js/utils/serial_no_batch_selector.js
+++ b/erpnext/public/js/utils/serial_no_batch_selector.js
@@ -421,7 +421,7 @@
let { qty, based_on } = this.dialog.get_values();
if (this.item.serial_and_batch_bundle || this.item.rejected_serial_and_batch_bundle) {
- if (qty === this.qty) {
+ if (this.qty && qty === Math.abs(this.qty)) {
return;
}
}
diff --git a/erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py b/erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py
index 7503531..19aad3f 100644
--- a/erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py
+++ b/erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py
@@ -268,7 +268,8 @@
def validate_negative_batch(self, batch_no, available_qty):
if available_qty < 0:
- msg = f"""Batch No {bold(batch_no)} has negative stock
+ msg = f"""Batch No {bold(batch_no)} of an Item {bold(self.item_code)}
+ has negative stock
of quantity {bold(available_qty)} in the
warehouse {self.warehouse}"""