From dcff321ec59d5734de5b12875f28dbb8288512cf Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Mon, 7 May 2012 15:36:36 +0530 Subject: [PATCH 1/2] fix in form email --- js/all-app.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/js/all-app.js b/js/all-app.js index 65ca12478c..cb5235fa49 100644 --- a/js/all-app.js +++ b/js/all-app.js @@ -2098,7 +2098,11 @@ this.prepare_col_heads(this.flist);var table=me.make_print_table(this.flist);thi _e.email_as_field='email_id';_e.email_as_dt='Contact';_e.email_as_in='email_id,contact_name';sendmail=function(emailto,emailfrom,cc,subject,message,fmt,with_attachments){var fn=function(html){$c('webnotes.utils.email_lib.send_form',{'sendto':emailto,'sendfrom':emailfrom?emailfrom:'','cc':cc?cc:'','subject':subject,'message':replace_newlines(message),'body':html,'full_domain':wn.urllib.get_base_url(),'with_attachments':with_attachments?1:0,'dt':cur_frm.doctype,'dn':cur_frm.docname},function(r,rtxt){});} _p.build(fmt,fn);} _e.make=function(){var d=new Dialog(440,440,"Send Email");var email_go=function(){var emailfrom=d.widgets['From'].value;var emailto=d.widgets['To'].value;if(!emailfrom) -emailfrom=user_email;var email_list=emailto.split(/[,|;]/);var valid=1;for(var i=0;i Date: Mon, 7 May 2012 16:59:28 +0530 Subject: [PATCH 2/2] fix in purchase receipt - show challan no for indian customers --- .../purchase_receipt/purchase_receipt.js | 4 + .../purchase_receipt/purchase_receipt.txt | 166 +++++++++--------- 2 files changed, 88 insertions(+), 82 deletions(-) diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js index fc606a6057..59c69f6628 100644 --- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js @@ -58,6 +58,10 @@ cur_frm.cscript.refresh = function(doc, cdt, cdn) { if (doc.per_billed < 100) cur_frm.add_custom_button('Make Purchase Invoice', cur_frm.cscript['Make Purchase Invoice']); cur_frm.add_custom_button('Send SMS', cur_frm.cscript['Send SMS']); } + + if(wn.boot.control_panel.country == 'India') { + unhide_field(['challan_no', 'challan_date']); + } } diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.txt b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.txt index d6874b62af..913380c772 100755 --- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.txt +++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.txt @@ -3,9 +3,9 @@ # These values are common in all dictionaries { - 'creation': '2012-04-13 11:56:36', + 'creation': '2012-05-07 16:44:47', 'docstatus': 0, - 'modified': '2012-05-01 14:34:43', + 'modified': '2012-05-07 16:54:34', 'modified_by': u'Administrator', 'owner': u'Administrator' }, @@ -56,54 +56,6 @@ 'name': u'Purchase Receipt' }, - # DocPerm - { - 'amend': 0, - 'cancel': 0, - 'create': 0, - 'doctype': u'DocPerm', - 'permlevel': 1, - 'role': u'Material Manager', - 'submit': 0, - 'write': 0 - }, - - # DocPerm - { - 'amend': 1, - 'cancel': 1, - 'create': 1, - 'doctype': u'DocPerm', - 'permlevel': 0, - 'role': u'Material Manager', - 'submit': 1, - 'write': 1 - }, - - # DocPerm - { - 'amend': 0, - 'cancel': 0, - 'create': 0, - 'doctype': u'DocPerm', - 'permlevel': 1, - 'role': u'Material User', - 'submit': 0, - 'write': 0 - }, - - # DocPerm - { - 'amend': 1, - 'cancel': 1, - 'create': 1, - 'doctype': u'DocPerm', - 'permlevel': 0, - 'role': u'Material User', - 'submit': 1, - 'write': 1 - }, - # DocPerm { 'amend': 1, @@ -139,6 +91,54 @@ 'write': 1 }, + # DocPerm + { + 'amend': 0, + 'cancel': 0, + 'create': 0, + 'doctype': u'DocPerm', + 'permlevel': 1, + 'role': u'Material Manager', + 'submit': 0, + 'write': 0 + }, + + # DocPerm + { + 'amend': 1, + 'cancel': 1, + 'create': 1, + 'doctype': u'DocPerm', + 'permlevel': 0, + 'role': u'Material Manager', + 'submit': 1, + 'write': 1 + }, + + # DocPerm + { + 'amend': 0, + 'cancel': 0, + 'create': 0, + 'doctype': u'DocPerm', + 'permlevel': 1, + 'role': u'Material User', + 'submit': 0, + 'write': 0 + }, + + # DocPerm + { + 'amend': 1, + 'cancel': 1, + 'create': 1, + 'doctype': u'DocPerm', + 'permlevel': 0, + 'role': u'Material User', + 'submit': 1, + 'write': 1 + }, + # DocField { 'colour': u'White:FFF', @@ -296,6 +296,40 @@ 'width': u'100px' }, + # DocField + { + 'colour': u'White:FFF', + 'doctype': u'DocField', + 'fieldname': u'challan_no', + 'fieldtype': u'Data', + 'hidden': 1, + 'label': u'Challan No', + 'no_copy': 1, + 'oldfieldname': u'challan_no', + 'oldfieldtype': u'Data', + 'permlevel': 0, + 'print_hide': 0, + 'reqd': 0, + 'width': u'100px' + }, + + # DocField + { + 'colour': u'White:FFF', + 'doctype': u'DocField', + 'fieldname': u'challan_date', + 'fieldtype': u'Date', + 'hidden': 1, + 'label': u'Challan Date', + 'no_copy': 1, + 'oldfieldname': u'challan_date', + 'oldfieldtype': u'Date', + 'permlevel': 0, + 'print_hide': 0, + 'reqd': 0, + 'width': u'100px' + }, + # DocField { 'colour': u'White:FFF', @@ -1112,38 +1146,6 @@ 'width': u'50%' }, - # DocField - { - 'colour': u'White:FFF', - 'doctype': u'DocField', - 'fieldname': u'challan_no', - 'fieldtype': u'Data', - 'label': u'Challan No', - 'no_copy': 1, - 'oldfieldname': u'challan_no', - 'oldfieldtype': u'Data', - 'permlevel': 0, - 'print_hide': 0, - 'reqd': 0, - 'width': u'100px' - }, - - # DocField - { - 'colour': u'White:FFF', - 'doctype': u'DocField', - 'fieldname': u'challan_date', - 'fieldtype': u'Date', - 'label': u'Challan Date', - 'no_copy': 1, - 'oldfieldname': u'challan_date', - 'oldfieldtype': u'Date', - 'permlevel': 0, - 'print_hide': 0, - 'reqd': 0, - 'width': u'100px' - }, - # DocField { 'colour': u'White:FFF',