From 1d15c557a9ee482bd1cc353a1a123899255879e0 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Fri, 24 Jun 2011 09:51:58 +0530 Subject: [PATCH] added onload_post_render --- crm/doctype/enquiry/enquiry.js | 9 +++++---- .../doctype/purchase_receipt/purchase_receipt.js | 10 ++++++---- srm/doctype/indent/indent.js | 5 ++++- srm/doctype/purchase_order/purchase_order.js | 10 ++++++---- 4 files changed, 21 insertions(+), 13 deletions(-) diff --git a/crm/doctype/enquiry/enquiry.js b/crm/doctype/enquiry/enquiry.js index a8c8ea2585..2eddafa4cd 100644 --- a/crm/doctype/enquiry/enquiry.js +++ b/crm/doctype/enquiry/enquiry.js @@ -42,15 +42,16 @@ cur_frm.cscript.onload = function(doc, cdt, cdn) { hide_field(['customer', 'customer_address', 'contact_person', 'customer_name', 'contact_display', 'customer_group']); } } - - if(doc.enquiry_from == 'Lead' && doc.lead) { - cur_frm.cscript.lead(doc,cdt,cdn); - } // setup fetch cur_frm.cscript.set_fetch(); } +cur_frm.cscript.onload_post_render = function(doc, cdt, cdn) { + if(doc.enquiry_from == 'Lead' && doc.lead) { + cur_frm.cscript.lead(doc,cdt,cdn); + } +} // fetch // =============================================================== diff --git a/material_management/doctype/purchase_receipt/purchase_receipt.js b/material_management/doctype/purchase_receipt/purchase_receipt.js index da06321ea9..e060e3c564 100644 --- a/material_management/doctype/purchase_receipt/purchase_receipt.js +++ b/material_management/doctype/purchase_receipt/purchase_receipt.js @@ -13,10 +13,6 @@ cur_frm.cscript.onload = function(doc, cdt, cdn) { if (!doc.posting_date) doc.posting_date = dateutil.obj_to_str(new Date()); if (!doc.transaction_date) doc.transaction_date = dateutil.obj_to_str(new Date()); if (!doc.status) doc.status = 'Draft'; - - if(doc.__islocal){ - cur_frm.cscript.get_default_schedule_date(doc); - } if(doc.__islocal){ hide_field(['supplier_name','supplier_address','contact_person','address_display','contact_display','contact_mobile','contact_email']); @@ -26,6 +22,12 @@ cur_frm.cscript.onload = function(doc, cdt, cdn) { } +cur_frm.cscript.onload_post_render = function(doc, dt, dn) { + if(doc.__islocal){ + cur_frm.cscript.get_default_schedule_date(doc); + } +} + //========================== Refresh =============================================================== cur_frm.cscript.refresh = function(doc, cdt, cdn) { diff --git a/srm/doctype/indent/indent.js b/srm/doctype/indent/indent.js index a2e1614cb6..8d7ffb150c 100644 --- a/srm/doctype/indent/indent.js +++ b/srm/doctype/indent/indent.js @@ -9,10 +9,13 @@ cur_frm.cscript.onload = function(doc, cdt, cdn) { if (!doc.transaction_date) doc.transaction_date = dateutil.obj_to_str(new Date()) if (!doc.status) doc.status = 'Draft'; +} + +cur_frm.cscript.onload_post_render = function(doc, cdt, cdn) { // second call if(doc.__islocal){ cur_frm.cscript.get_item_defaults(doc); - } + } } cur_frm.cscript.get_item_defaults = function(doc) { diff --git a/srm/doctype/purchase_order/purchase_order.js b/srm/doctype/purchase_order/purchase_order.js index cbc0d3a1fd..57141269ec 100644 --- a/srm/doctype/purchase_order/purchase_order.js +++ b/srm/doctype/purchase_order/purchase_order.js @@ -15,16 +15,18 @@ cur_frm.cscript.onload = function(doc, cdt, cdn) { if(!doc.currency) doc.currency = sys_defaults.currency; if(!doc.status) set_multiple(cdt,cdn,{status:'Draft'}); if(!doc.transaction_date) set_multiple(cdt,cdn,{transaction_date:get_today()}); - - if(doc.__islocal){ - cur_frm.cscript.get_default_schedule_date(doc); - } if(doc.__islocal){ hide_field(['supplier_name','supplier_address','contact_person','address_display','contact_display','contact_mobile','contact_email']); } } +cur_frm.cscript.onload_post_render = function(doc, cdt, cdn) { + if(doc.__islocal){ + cur_frm.cscript.get_default_schedule_date(doc); + } +} + // ================================== Refresh ========================================== cur_frm.cscript.refresh = function(doc, cdt, cdn) {