From a00852ce1981760679c8c6adcbcef74d4c9c75c3 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Mon, 7 May 2012 16:59:28 +0530 Subject: [PATCH] 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',