From a2c1d92374c86f9a80a92113e4df1b09c4efe435 Mon Sep 17 00:00:00 2001 From: Maxwell Morais Date: Mon, 27 Aug 2018 03:35:41 -0300 Subject: [PATCH] Revert "Fix shipping_address for DropShipping" (#15218) * Revert "Cleaned up welcome email code (#15175)" This reverts commit 771fbb8f010060f4ab2c8d35ff2125d35da06446. * Revert "[Fix] Raw materials are not showing in the stock entry if skip transfer is enabled and backflush is based on stock entry (#15187)" This reverts commit 2b72d099482992f2a23eb30dd47204388c608549. * Revert "[Enhance] Provision to backflush raw materials from WIP warehouse (#15184)" This reverts commit c5cf428d005278339695a1667eb840a201b73a84. * Revert "[Minor] Create default department on country setup (#15206)" This reverts commit 2b2712bb9ede2879057137e08d1e91c1331c3fe5. * Revert "Permissions issue in BOM tree" This reverts commit 8fe8d1758a7c7859d2a082b8fc5feaf2ee2d7180. * Revert "Fix indentation accounts_receivable.py (#15203)" This reverts commit fbc3df3247f06d28dd92a6155b39ce1ce45a32fa. * Revert "Fix shipping_address for DropShipping (#15202)" This reverts commit 4a394bcbf409c2d3516696f2b3941e3ff5dc666a. --- erpnext/public/js/utils/party.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/erpnext/public/js/utils/party.js b/erpnext/public/js/utils/party.js index fe2a992bc94..3a5a0624e8b 100644 --- a/erpnext/public/js/utils/party.js +++ b/erpnext/public/js/utils/party.js @@ -171,7 +171,7 @@ erpnext.utils.validate_mandatory = function(frm, label, value, trigger_on) { } erpnext.utils.get_shipping_address = function(frm, callback){ - if (frm.doc.company && !frm.doc.shipping_address) { + if (frm.doc.company) { frappe.call({ method: "frappe.contacts.doctype.address.address.get_shipping_address", args: { @@ -192,4 +192,4 @@ erpnext.utils.get_shipping_address = function(frm, callback){ } else { frappe.msgprint(__("Select company first")); } -} +} \ No newline at end of file