nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-31 18:59:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: addresses not being carried forward

Browse Source
This commit is contained in:
Mihir Kandoi
2025-11-25 12:58:52 +05:30
parent c93dba2895
commit 5a17dd8d6d
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
erpnext/public/js/controllers/buying.js
View File

@@ -176,9 +176,14 @@ erpnext.buying = {
callback: (r) => { callback: (r) => {
if (!r.message) return; if (!r.message) return;
this.frm.set_value("billing_address", r.message.primary_address || ""); if (!this.frm.doc.billing_address) {
this.frm.set_value("billing_address", r.message.primary_address || "");
}
if (frappe.meta.has_field(this.frm.doc.doctype, "shipping_address")) { if (
frappe.meta.has_field(this.frm.doc.doctype, "shipping_address") &&
!this.frm.doc.shipping_address
) {
this.frm.set_value("shipping_address", r.message.shipping_address || ""); this.frm.set_value("shipping_address", r.message.shipping_address || "");
} }
}, },

3
erpnext/selling/doctype/sales_order/sales_order.js
View File

@@ -1588,6 +1588,8 @@ erpnext.selling.SalesOrderController = class SalesOrderController extends erpnex
fieldname: "items_for_po", fieldname: "items_for_po",
fieldtype: "Table", fieldtype: "Table",
label: __("Select Items"), label: __("Select Items"),
cannot_add_rows: true,
cannot_delete_rows: true,
fields: [ fields: [
{ {
fieldtype: "Data", fieldtype: "Data",
@@ -1698,7 +1700,6 @@ erpnext.selling.SalesOrderController = class SalesOrderController extends erpnex
} }
set_po_items_data(dialog); set_po_items_data(dialog);
dialog.get_field("items_for_po").grid.only_sortable();
dialog.get_field("items_for_po").refresh(); dialog.get_field("items_for_po").refresh();
dialog.wrapper.find(".grid-heading-row .grid-row-check").click(); dialog.wrapper.find(".grid-heading-row .grid-row-check").click();
dialog.show(); dialog.show();