From a73b2965aa5949731a09fe42fed38aec96a70f9b Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Fri, 13 Apr 2012 11:02:26 +0530 Subject: [PATCH 1/3] cleanup and fixes --- .../purchase_invoice/purchase_invoice.js | 4 +- .../purchase_invoice/purchase_invoice.txt | 105 ++++++------- .../doctype/purchase_order/purchase_order.js | 4 +- .../doctype/purchase_order/purchase_order.txt | 116 +++++++------- .../purchase_receipt/purchase_receipt.js | 3 - .../purchase_receipt/purchase_receipt.txt | 141 +++++++++--------- 6 files changed, 176 insertions(+), 197 deletions(-) diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js index ddccab27b1..11239d595d 100644 --- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js @@ -69,10 +69,8 @@ cur_frm.cscript.refresh = function(doc, dt, dn) { cur_frm.add_custom_button('Make Payment Entry', cur_frm.cscript.make_bank_voucher); if(doc.docstatus==1) { - unhide_field(['repair_outstanding_amt']); cur_frm.add_custom_button('View Ledger', cur_frm.cscript.view_ledger_entry); - } else hide_field(['repair_outstanding_amt']); - + } cur_frm.cscript.is_opening(doc, dt, dn); } diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.txt b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.txt index bc59d22edb..524fa0706e 100755 --- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.txt +++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.txt @@ -3,9 +3,9 @@ # These values are common in all dictionaries { - 'creation': '2012-03-27 14:35:45', + 'creation': '2012-04-11 13:17:19', 'docstatus': 0, - 'modified': '2012-03-27 14:45:49', + 'modified': '2012-04-12 18:09:05', 'modified_by': u'Administrator', 'owner': u'Administrator' }, @@ -13,6 +13,7 @@ # These values are common for all DocType { '_last_update': u'1330345793', + 'allow_attach': 1, 'colour': u'White:FFF', 'default_print_format': u'Standard', 'doctype': 'DocType', @@ -25,7 +26,7 @@ 'server_code_error': u' ', 'show_in_menu': 0, 'subject': u'From %(supplier_name)s worth %(grand_total)s due on %(due_date)s | %(outstanding_amount)s outstanding', - 'version': 521 + 'version': 522 }, # These values are common for all DocField @@ -53,6 +54,18 @@ 'name': u'Purchase Invoice' }, + # DocPerm + { + 'amend': 0, + 'cancel': 0, + 'create': 0, + 'doctype': u'DocPerm', + 'permlevel': 1, + 'role': u'Accounts Manager', + 'submit': 0, + 'write': 0 + }, + # DocPerm { 'amend': 1, @@ -60,11 +73,23 @@ 'create': 1, 'doctype': u'DocPerm', 'permlevel': 0, - 'role': u'Accounts User', + 'role': u'Accounts Manager', 'submit': 1, 'write': 1 }, + # DocPerm + { + 'amend': 0, + 'cancel': 0, + 'create': 0, + 'doctype': u'DocPerm', + 'permlevel': 1, + 'role': u'Accounts User', + 'submit': 0, + 'write': 0 + }, + # DocPerm { 'doctype': u'DocPerm', @@ -84,26 +109,6 @@ 'write': 1 }, - # DocPerm - { - 'doctype': u'DocPerm', - 'match': u'supplier', - 'permlevel': 0, - 'role': u'Supplier' - }, - - # DocPerm - { - 'amend': 0, - 'cancel': 0, - 'create': 0, - 'doctype': u'DocPerm', - 'permlevel': 1, - 'role': u'Accounts Manager', - 'submit': 0, - 'write': 0 - }, - # DocPerm { 'amend': 1, @@ -111,21 +116,17 @@ 'create': 1, 'doctype': u'DocPerm', 'permlevel': 0, - 'role': u'Accounts Manager', + 'role': u'Accounts User', 'submit': 1, 'write': 1 }, # DocPerm { - 'amend': 0, - 'cancel': 0, - 'create': 0, 'doctype': u'DocPerm', - 'permlevel': 1, - 'role': u'Accounts User', - 'submit': 0, - 'write': 0 + 'match': u'supplier', + 'permlevel': 0, + 'role': u'Supplier' }, # DocField @@ -1101,32 +1102,6 @@ 'print_hide': 1 }, - # DocField - { - 'colour': u'White:FFF', - 'depends_on': u'eval:!doc.__islocal', - 'doctype': u'DocField', - 'fieldname': u'actions', - 'fieldtype': u'Section Break', - 'label': u'Actions', - 'oldfieldtype': u'Section Break', - 'permlevel': 0, - 'print_hide': 1 - }, - - # DocField - { - 'allow_on_submit': 1, - 'doctype': u'DocField', - 'fieldname': u'repair_outstanding_amt', - 'fieldtype': u'Button', - 'label': u'Repair Outstanding Amt', - 'oldfieldtype': u'Button', - 'options': u'repair_pv_outstanding', - 'permlevel': 0, - 'print_hide': 1 - }, - # DocField { 'doctype': u'DocField', @@ -1140,5 +1115,17 @@ 'permlevel': 0, 'print_hide': 1, 'report_hide': 0 + }, + + # DocField + { + 'doctype': u'DocField', + 'fieldname': u'file_list', + 'fieldtype': u'Text', + 'hidden': 1, + 'label': u'File List', + 'no_copy': 1, + 'permlevel': 0, + 'print_hide': 1 } -] +] \ No newline at end of file diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.js b/erpnext/buying/doctype/purchase_order/purchase_order.js index 22b386cca2..33dc481776 100644 --- a/erpnext/buying/doctype/purchase_order/purchase_order.js +++ b/erpnext/buying/doctype/purchase_order/purchase_order.js @@ -33,6 +33,7 @@ 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.is_subcontracted) set_multiple(cdt, cdn, {is_subcontracted:'No'}); if(doc.__islocal){ hide_field(['supplier_name','supplier_address','contact_person','address_display','contact_display','contact_mobile','contact_email']); @@ -79,9 +80,6 @@ cur_frm.cscript.refresh = function(doc, cdt, cdn) { if(doc.docstatus == 1 && doc.status == 'Stopped') cur_frm.add_custom_button('Unstop Purchase Order', cur_frm.cscript['Unstop Purchase Order']); - - if(doc.docstatus == 1) unhide_field(['repair_purchase_order']); - else hide_field(['repair_purchase_order']); } diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.txt b/erpnext/buying/doctype/purchase_order/purchase_order.txt index 6c10db8cf2..ec6e776823 100644 --- a/erpnext/buying/doctype/purchase_order/purchase_order.txt +++ b/erpnext/buying/doctype/purchase_order/purchase_order.txt @@ -3,9 +3,9 @@ # These values are common in all dictionaries { - 'creation': '2012-03-27 14:35:51', + 'creation': '2012-04-11 13:17:34', 'docstatus': 0, - 'modified': '2012-03-27 18:46:29', + 'modified': '2012-04-12 18:11:33', 'modified_by': u'Administrator', 'owner': u'Administrator' }, @@ -13,6 +13,7 @@ # These values are common for all DocType { '_last_update': u'1330339817', + 'allow_attach': 1, 'colour': u'White:FFF', 'default_print_format': u'Standard', 'doctype': 'DocType', @@ -27,7 +28,7 @@ 'server_code_error': u' ', 'show_in_menu': 0, 'subject': u'To %(supplier_name)s on %(transaction_date)s | %(per_received)s% delivered', - 'version': 502 + 'version': 503 }, # These values are common for all DocField @@ -55,6 +56,54 @@ 'name': u'Purchase Order' }, + # DocPerm + { + 'amend': 0, + 'cancel': 0, + 'create': 0, + 'doctype': u'DocPerm', + 'permlevel': 1, + 'role': u'Material User', + 'submit': 0, + 'write': 0 + }, + + # DocPerm + { + 'amend': 0, + 'cancel': 0, + 'create': 0, + 'doctype': u'DocPerm', + 'permlevel': 0, + 'role': u'Material User', + 'submit': 0, + 'write': 0 + }, + + # DocPerm + { + 'amend': 0, + 'cancel': 0, + 'create': 0, + 'doctype': u'DocPerm', + 'permlevel': 1, + 'role': u'Purchase Manager', + 'submit': 0, + 'write': 0 + }, + + # DocPerm + { + 'amend': 1, + 'cancel': 1, + 'create': 1, + 'doctype': u'DocPerm', + 'permlevel': 0, + 'role': u'Purchase Manager', + 'submit': 1, + 'write': 1 + }, + # DocPerm { 'amend': 1, @@ -90,54 +139,6 @@ 'write': 1 }, - # DocPerm - { - 'amend': 0, - 'cancel': 0, - 'create': 0, - 'doctype': u'DocPerm', - 'permlevel': 1, - 'role': u'Purchase Manager', - 'submit': 0, - 'write': 0 - }, - - # DocPerm - { - 'amend': 1, - 'cancel': 1, - 'create': 1, - 'doctype': u'DocPerm', - 'permlevel': 0, - 'role': u'Purchase 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': 0, - 'cancel': 0, - 'create': 0, - 'doctype': u'DocPerm', - 'permlevel': 0, - 'role': u'Material User', - 'submit': 0, - 'write': 0 - }, - # DocField { 'colour': u'White:FFF', @@ -1044,14 +1045,13 @@ # DocField { - 'allow_on_submit': 1, 'doctype': u'DocField', - 'fieldname': u'repair_purchase_order', - 'fieldtype': u'Button', - 'label': u'Repair Purchase Order', - 'oldfieldtype': u'Button', - 'options': u'repair_purchase_order', + 'fieldname': u'file_list', + 'fieldtype': u'Text', + 'hidden': 1, + 'label': u'File List', + 'no_copy': 1, 'permlevel': 0, 'print_hide': 1 } -] +] \ No newline at end of file diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js index 7e81b88838..8761881b67 100644 --- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js @@ -71,9 +71,6 @@ cur_frm.cscript.refresh = function(doc, cdt, cdn) { 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); } - else{ - hide_field(['Repair Purchase Receipt']); - } } diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.txt b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.txt index cb66d6f36d..7b5c82cc69 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-03-27 14:36:34', + 'creation': '2012-04-11 13:18:46', 'docstatus': 0, - 'modified': '2012-03-27 18:51:48', + 'modified': '2012-04-12 17:50:10', 'modified_by': u'Administrator', 'owner': u'Administrator' }, @@ -13,6 +13,7 @@ # These values are common for all DocType { '_last_update': u'1330593645', + 'allow_attach': 1, 'colour': u'White:FFF', 'default_print_format': u'Standard', 'doctype': 'DocType', @@ -27,7 +28,7 @@ 'server_code_error': u' ', 'show_in_menu': 0, 'subject': u'From %(supplier_name)s against %(purchase_order)s on %(posting_date)s', - 'version': 326 + 'version': 327 }, # These values are common for all DocField @@ -55,6 +56,54 @@ '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, @@ -90,54 +139,6 @@ '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', @@ -591,6 +592,18 @@ 'width': u'150px' }, + # DocField + { + 'doctype': u'DocField', + 'fieldname': u'get_current_stock', + 'fieldtype': u'Button', + 'label': u'Get Current Stock', + 'oldfieldtype': u'Button', + 'options': u'get_current_stock', + 'permlevel': 0, + 'print_hide': 1 + }, + # DocField { 'doctype': u'DocField', @@ -1130,18 +1143,6 @@ 'print_hide': 1 }, - # DocField - { - 'doctype': u'DocField', - 'fieldname': u'get_current_stock', - 'fieldtype': u'Button', - 'label': u'Get Current Stock', - 'oldfieldtype': u'Button', - 'options': u'get_current_stock', - 'permlevel': 0, - 'print_hide': 1 - }, - # DocField { 'doctype': u'DocField', @@ -1158,15 +1159,13 @@ # DocField { - 'allow_on_submit': 1, - 'colour': u'White:FFF', 'doctype': u'DocField', - 'fieldname': u'repair_purchase_receipt', - 'fieldtype': u'Button', - 'label': u'Repair Purchase Receipt', - 'oldfieldtype': u'Button', - 'options': u'repair_purchase_receipt', + 'fieldname': u'file_list', + 'fieldtype': u'Text', + 'hidden': 1, + 'label': u'File List', + 'no_copy': 1, 'permlevel': 0, 'print_hide': 1 } -] +] \ No newline at end of file From f31fc22ef0b8692bf0c390ef0041ce2e67178dd3 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Fri, 13 Apr 2012 11:37:19 +0530 Subject: [PATCH 2/3] fixes in doctype --- .../doctype/sales_invoice/sales_invoice.txt | 76 ++++---- .../doctype/sales_order/sales_order.txt | 133 ++++++-------- .../doctype/delivery_note/delivery_note.txt | 164 +++++++++--------- erpnext/stock/doctype/warehouse/warehouse.txt | 160 ++++++++--------- 4 files changed, 255 insertions(+), 278 deletions(-) diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.txt b/erpnext/accounts/doctype/sales_invoice/sales_invoice.txt index 7466d4e794..c851e75952 100644 --- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.txt +++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.txt @@ -3,9 +3,9 @@ # These values are common in all dictionaries { - 'creation': '2012-03-27 14:35:47', + 'creation': '2012-04-11 13:17:25', 'docstatus': 0, - 'modified': '2012-03-27 18:44:28', + 'modified': '2012-04-13 11:26:44', 'modified_by': u'Administrator', 'owner': u'Administrator' }, @@ -13,6 +13,7 @@ # These values are common for all DocType { '_last_update': u'1330671142', + 'allow_attach': 1, 'change_log': u'1. Change in pull_details method dt.-26-06-2009', 'colour': u'White:FFF', 'default_print_format': u'Standard', @@ -26,7 +27,7 @@ 'server_code_error': u' ', 'show_in_menu': 0, 'subject': u'To %(customer_name)s worth %(currency)s %(grand_total_export)s due on %(due_date)s | %(outstanding_amount)s outstanding', - 'version': 417 + 'version': 418 }, # These values are common for all DocField @@ -54,6 +55,30 @@ 'name': u'Sales Invoice' }, + # DocPerm + { + 'amend': 0, + 'cancel': 0, + 'create': 0, + 'doctype': u'DocPerm', + 'permlevel': 1, + 'role': u'Accounts Manager', + 'submit': 0, + 'write': 0 + }, + + # DocPerm + { + 'amend': 1, + 'cancel': 1, + 'create': 1, + 'doctype': u'DocPerm', + 'permlevel': 0, + 'role': u'Accounts Manager', + 'submit': 1, + 'write': 1 + }, + # DocPerm { 'amend': 1, @@ -80,38 +105,10 @@ # DocPerm { - 'amend': 0, - 'cancel': 0, - 'create': 0, 'doctype': u'DocPerm', + 'match': u'customer', 'permlevel': 0, - 'role': u'Customer', - 'submit': 0, - 'write': 0 - }, - - # DocPerm - { - 'amend': 0, - 'cancel': 0, - 'create': 0, - 'doctype': u'DocPerm', - 'permlevel': 1, - 'role': u'Accounts Manager', - 'submit': 0, - 'write': 0 - }, - - # DocPerm - { - 'amend': 1, - 'cancel': 1, - 'create': 1, - 'doctype': u'DocPerm', - 'permlevel': 0, - 'role': u'Accounts Manager', - 'submit': 1, - 'write': 1 + 'role': u'Customer' }, # DocField @@ -1503,14 +1500,13 @@ # DocField { - 'allow_on_submit': 1, 'doctype': u'DocField', - 'fieldname': u'repair_outstanding_amt', - 'fieldtype': u'Button', - 'label': u'Repair Outstanding Amt', - 'oldfieldtype': u'Button', - 'options': u'repair_rv_outstanding', + 'fieldname': u'file_list', + 'fieldtype': u'Text', + 'hidden': 1, + 'label': u'File List', + 'no_copy': 1, 'permlevel': 0, 'print_hide': 1 } -] +] \ No newline at end of file diff --git a/erpnext/selling/doctype/sales_order/sales_order.txt b/erpnext/selling/doctype/sales_order/sales_order.txt index eb17cffbe9..af3d9b5585 100644 --- a/erpnext/selling/doctype/sales_order/sales_order.txt +++ b/erpnext/selling/doctype/sales_order/sales_order.txt @@ -3,9 +3,9 @@ # These values are common in all dictionaries { - 'creation': '2012-03-27 14:36:14', + 'creation': '2012-04-11 13:18:19', 'docstatus': 0, - 'modified': '2012-03-27 18:49:05', + 'modified': '2012-04-13 11:32:08', 'modified_by': u'Administrator', 'owner': u'Administrator' }, @@ -13,7 +13,7 @@ # These values are common for all DocType { '_last_update': u'1330670942', - 'allow_attach': 0, + 'allow_attach': 1, 'colour': u'White:FFF', 'default_print_format': u'Standard', 'doctype': 'DocType', @@ -30,7 +30,7 @@ 'show_in_menu': 0, 'subject': u'From %(customer_name)s on %(transaction_date)s worth %(currency)s %(grand_total_export)s | %(per_delivered)s% delivered | %(per_billed)s% billed', 'tag_fields': u'delivery_status,billing_status', - 'version': 632 + 'version': 633 }, # These values are common for all DocField @@ -58,6 +58,30 @@ 'name': u'Sales Order' }, + # DocPerm + { + 'amend': 0, + 'cancel': 0, + 'create': 0, + 'doctype': u'DocPerm', + 'permlevel': 1, + 'role': u'Sales Manager', + 'submit': 0, + 'write': 0 + }, + + # DocPerm + { + 'amend': 1, + 'cancel': 1, + 'create': 1, + 'doctype': u'DocPerm', + 'permlevel': 0, + 'role': u'Sales Manager', + 'submit': 1, + 'write': 1 + }, + # DocPerm { 'amend': 1, @@ -70,18 +94,6 @@ 'write': 1 }, - # DocPerm - { - 'amend': 1, - 'cancel': 1, - 'create': 1, - 'doctype': u'DocPerm', - 'permlevel': 0, - 'role': u'Maintenance User', - 'submit': 1, - 'write': 1 - }, - # DocPerm { 'amend': 0, @@ -89,93 +101,63 @@ 'create': 0, 'doctype': u'DocPerm', 'permlevel': 1, - 'role': u'Maintenance Manager', + 'role': u'Sales User', 'submit': 0, 'write': 0 }, # DocPerm { - 'amend': 1, - 'cancel': 1, - 'create': 1, 'doctype': u'DocPerm', + 'match': u'customer_name', 'permlevel': 0, - 'role': u'Maintenance Manager', - 'submit': 1, - 'write': 1 + 'role': u'Customer' }, # DocPerm { - 'amend': 1, - 'cancel': 1, - 'create': 1, - 'doctype': u'DocPerm', - 'permlevel': 0, - 'role': u'Sales Manager', - 'submit': 1, - 'write': 1 - }, - - # DocPerm - { - 'amend': 0, - 'cancel': 0, - 'create': 0, - 'doctype': u'DocPerm', - 'permlevel': 1, - 'role': u'Sales Manager', - 'submit': 0, - 'write': 0 - }, - - # DocPerm - { - 'amend': 0, - 'cancel': 0, - 'create': 0, 'doctype': u'DocPerm', 'permlevel': 2, 'role': u'Accounts User', - 'submit': 0, 'write': 1 }, # DocPerm { - 'amend': 0, - 'cancel': 0, - 'create': 0, + 'amend': 1, + 'cancel': 1, + 'create': 1, 'doctype': u'DocPerm', 'permlevel': 0, - 'role': u'Customer', - 'submit': 0, - 'write': 0 + 'role': u'Maintenance Manager', + 'submit': 1, + 'write': 1 }, # DocPerm { - 'amend': 0, - 'cancel': 0, - 'create': 0, 'doctype': u'DocPerm', 'permlevel': 1, - 'role': u'Sales User', - 'submit': 0, - 'write': 0 + 'role': u'Maintenance Manager' }, # DocPerm { - 'amend': 0, - 'cancel': 0, - 'create': 0, + 'amend': 1, + 'cancel': 1, + 'create': 1, 'doctype': u'DocPerm', - 'permlevel': 1, + 'permlevel': 0, 'role': u'Maintenance User', - 'submit': 0, - 'write': 0 + 'submit': 1, + 'write': 1 + }, + + # DocPerm + { + 'doctype': u'DocPerm', + 'permlevel': 1, + 'role': u'Maintenance User' }, # DocField @@ -1335,14 +1317,13 @@ # DocField { - 'allow_on_submit': 1, 'doctype': u'DocField', - 'fieldname': u'repair_sales_order', - 'fieldtype': u'Button', - 'label': u'Repair Sales Order', - 'oldfieldtype': u'Button', - 'options': u'repair_sales_order', + 'fieldname': u'file_list', + 'fieldtype': u'Text', + 'hidden': 1, + 'label': u'File List', + 'no_copy': 1, 'permlevel': 0, 'print_hide': 1 } -] +] \ No newline at end of file diff --git a/erpnext/stock/doctype/delivery_note/delivery_note.txt b/erpnext/stock/doctype/delivery_note/delivery_note.txt index 9c536cc0f2..d29acf5442 100644 --- a/erpnext/stock/doctype/delivery_note/delivery_note.txt +++ b/erpnext/stock/doctype/delivery_note/delivery_note.txt @@ -3,9 +3,9 @@ # These values are common in all dictionaries { - 'creation': '2012-03-27 14:36:28', + 'creation': '2012-04-11 13:18:36', 'docstatus': 0, - 'modified': '2012-03-27 18:50:57', + 'modified': '2012-04-13 11:02:43', 'modified_by': u'Administrator', 'owner': u'Administrator' }, @@ -13,6 +13,7 @@ # These values are common for all DocType { '_last_update': u'1330593645', + 'allow_attach': 1, 'colour': u'White:FFF', 'default_print_format': u'Standard', 'doctype': 'DocType', @@ -29,7 +30,7 @@ 'show_in_menu': 0, 'subject': u'To %(customer_name)s on %(posting_date)s | %(per_billed)s% billed', 'tag_fields': u'billing_status', - 'version': 476 + 'version': 477 }, # These values are common for all DocField @@ -57,6 +58,78 @@ 'name': u'Delivery Note' }, + # DocPerm + { + 'amend': 1, + 'cancel': 1, + 'create': 1, + 'doctype': u'DocPerm', + 'permlevel': 0, + 'role': u'Material User', + '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 Manager', + 'submit': 1, + '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'Sales User', + 'submit': 1, + 'write': 1 + }, + + # DocPerm + { + 'amend': 0, + 'cancel': 0, + 'create': 0, + 'doctype': u'DocPerm', + 'permlevel': 1, + 'role': u'Sales User', + 'submit': 0, + 'write': 0 + }, + # DocPerm { 'cancel': 0, @@ -75,30 +148,6 @@ 'role': u'Accounts User' }, - # DocPerm - { - 'amend': 1, - 'cancel': 1, - 'create': 1, - 'doctype': u'DocPerm', - 'permlevel': 0, - 'role': u'Sales User', - 'submit': 1, - 'write': 1 - }, - - # DocPerm - { - 'amend': 0, - 'cancel': 0, - 'create': 0, - 'doctype': u'DocPerm', - 'permlevel': 1, - 'role': u'Sales User', - 'submit': 0, - 'write': 0 - }, - # DocPerm { 'doctype': u'DocPerm', @@ -115,54 +164,6 @@ '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', @@ -1368,14 +1369,13 @@ # DocField { - 'allow_on_submit': 1, 'doctype': u'DocField', - 'fieldname': u'repair_delivery_note', - 'fieldtype': u'Button', - 'label': u'Repair Delivery Note', - 'oldfieldtype': u'Button', - 'options': u'repair_delivery_note', + 'fieldname': u'file_list', + 'fieldtype': u'Text', + 'hidden': 1, + 'label': u'File List', + 'no_copy': 1, 'permlevel': 0, 'print_hide': 1 } -] +] \ No newline at end of file diff --git a/erpnext/stock/doctype/warehouse/warehouse.txt b/erpnext/stock/doctype/warehouse/warehouse.txt index 2af4eacb0e..2deacf0f61 100644 --- a/erpnext/stock/doctype/warehouse/warehouse.txt +++ b/erpnext/stock/doctype/warehouse/warehouse.txt @@ -3,9 +3,9 @@ # These values are common in all dictionaries { - 'creation': '2012-03-27 14:36:40', + 'creation': '2012-04-11 13:18:57', 'docstatus': 0, - 'modified': '2012-03-27 14:36:40', + 'modified': '2012-04-11 17:47:35', 'modified_by': u'Administrator', 'owner': u'Administrator' }, @@ -25,7 +25,7 @@ 'section_style': u'Tabbed', 'server_code_error': u' ', 'show_in_menu': 0, - 'version': 58 + 'version': 59 }, # These values are common for all DocField @@ -53,6 +53,78 @@ 'name': u'Warehouse' }, + # DocPerm + { + 'amend': 0, + 'cancel': 0, + 'create': 0, + 'doctype': u'DocPerm', + 'permlevel': 2, + 'role': u'Material User', + 'submit': 0, + 'write': 0 + }, + + # DocPerm + { + 'amend': 0, + 'cancel': 0, + 'create': 0, + 'doctype': u'DocPerm', + 'permlevel': 0, + 'role': u'Material User', + 'submit': 0, + 'write': 0 + }, + + # DocPerm + { + 'amend': 0, + 'cancel': 0, + 'create': 0, + 'doctype': u'DocPerm', + 'permlevel': 1, + 'role': u'Material User', + 'submit': 0, + 'write': 0 + }, + + # DocPerm + { + 'amend': 0, + 'cancel': 0, + 'create': 0, + 'doctype': u'DocPerm', + 'permlevel': 2, + 'role': u'Material Manager', + 'submit': 0, + 'write': 0 + }, + + # DocPerm + { + 'amend': 0, + 'cancel': 0, + 'create': 0, + 'doctype': u'DocPerm', + 'permlevel': 0, + 'role': u'Material Manager', + 'submit': 0, + 'write': 0 + }, + + # DocPerm + { + 'amend': 0, + 'cancel': 0, + 'create': 0, + 'doctype': u'DocPerm', + 'permlevel': 1, + 'role': u'Material Manager', + 'submit': 0, + 'write': 0 + }, + # DocPerm { 'doctype': u'DocPerm', @@ -81,91 +153,19 @@ # DocPerm { - 'create': 0, + 'cancel': 1, + 'create': 1, 'doctype': u'DocPerm', - 'permlevel': 2, + 'permlevel': 0, 'role': u'System Manager', 'write': 1 }, # DocPerm { - 'amend': 0, - 'cancel': 0, - 'create': 0, - 'doctype': u'DocPerm', - 'permlevel': 1, - 'role': u'Material Manager', - 'submit': 0, - 'write': 0 - }, - - # DocPerm - { - 'amend': 0, - 'cancel': 0, - 'create': 0, - 'doctype': u'DocPerm', - 'permlevel': 0, - 'role': u'Material Manager', - 'submit': 0, - 'write': 0 - }, - - # DocPerm - { - 'amend': 0, - 'cancel': 0, 'create': 0, 'doctype': u'DocPerm', 'permlevel': 2, - 'role': u'Material Manager', - 'submit': 0, - 'write': 0 - }, - - # DocPerm - { - 'amend': 0, - 'cancel': 0, - 'create': 0, - 'doctype': u'DocPerm', - 'permlevel': 1, - 'role': u'Material User', - 'submit': 0, - 'write': 0 - }, - - # DocPerm - { - 'amend': 0, - 'cancel': 0, - 'create': 0, - 'doctype': u'DocPerm', - 'permlevel': 0, - 'role': u'Material User', - 'submit': 0, - 'write': 0 - }, - - # DocPerm - { - 'amend': 0, - 'cancel': 0, - 'create': 0, - 'doctype': u'DocPerm', - 'permlevel': 2, - 'role': u'Material User', - 'submit': 0, - 'write': 0 - }, - - # DocPerm - { - 'cancel': 1, - 'create': 1, - 'doctype': u'DocPerm', - 'permlevel': 0, 'role': u'System Manager', 'write': 1 }, @@ -268,7 +268,7 @@ { 'doctype': u'DocField', 'fieldname': u'phone_no', - 'fieldtype': u'Int', + 'fieldtype': u'Data', 'label': u'Phone No', 'oldfieldname': u'phone_no', 'oldfieldtype': u'Int', @@ -280,7 +280,7 @@ { 'doctype': u'DocField', 'fieldname': u'mobile_no', - 'fieldtype': u'Int', + 'fieldtype': u'Data', 'label': u'Mobile No', 'oldfieldname': u'mobile_no', 'oldfieldtype': u'Int', From 1c2ac00a8294552f3434ef07e13ca71d0baaf7af Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Fri, 13 Apr 2012 11:38:01 +0530 Subject: [PATCH 3/3] fixes in sales cycle --- .../accounts/doctype/gl_control/gl_control.py | 37 ------------------- .../purchase_invoice/purchase_invoice.py | 5 --- .../doctype/sales_invoice/sales_invoice.js | 5 +-- .../doctype/sales_invoice/sales_invoice.py | 7 ---- .../doctype/sales_order/sales_order.js | 4 +- .../doctype/sales_order/sales_order.py | 4 -- .../doctype/delivery_note/delivery_note.js | 4 +- .../doctype/delivery_note/delivery_note.py | 4 -- .../stock/doctype/stock_entry/stock_entry.js | 6 +-- .../stock_reconciliation.js | 2 +- .../doctype/customer_issue/customer_issue.js | 4 +- js/all-app.js | 4 +- version.num | 2 +- 13 files changed, 14 insertions(+), 74 deletions(-) diff --git a/erpnext/accounts/doctype/gl_control/gl_control.py b/erpnext/accounts/doctype/gl_control/gl_control.py index 2ff5a1fa43..5be3809ee3 100644 --- a/erpnext/accounts/doctype/gl_control/gl_control.py +++ b/erpnext/accounts/doctype/gl_control/gl_control.py @@ -450,43 +450,6 @@ class DocType: if not ret: msgprint("Payment Entry has been modified after you pulled it. Please pull it again.", raise_exception=1) -###################################################################################################################### - - - - # Repair Outstanding Amount - #--------------------------------- - def repair_voucher_outstanding(self, voucher_obj): - msg = [] - - # Get Balance from GL Entries - bal = webnotes.conn.sql("select sum(debit)-sum(credit) from `tabGL Entry` where against_voucher=%s and against_voucher_type=%s", (voucher_obj.doc.name , voucher_obj.doc.doctype)) - bal = bal and flt(bal[0][0]) or 0.0 - if cstr(voucher_obj.doc.doctype) == 'Purchase Invoice': - bal = -bal - - # Check outstanding Amount - if flt(voucher_obj.doc.outstanding_amount) != flt(bal): - msgprint('
Difference found in Outstanding Amount of %s : %s (Before : %s; After : %s)
' % (voucher_obj.doc.doctype, voucher_obj.doc.name, voucher_obj.doc.outstanding_amount, bal)) - msg.append('
Difference found in Outstanding Amount of %s : %s (Before : %s; After : %s)
' % (voucher_obj.doc.doctype, voucher_obj.doc.name, voucher_obj.doc.outstanding_amount, bal)) - - # set voucher balance - #webnotes.conn.sql("update `tab%s` set outstanding_amount=%s where name='%s'" % (voucher_obj.doc.doctype, bal, voucher_obj.doc.name)) - webnotes.conn.set(voucher_obj.doc, 'outstanding_amount', flt(bal)) - - # Send Mail - if msg: - email_msg = """ Dear Administrator, - -In Account := %s User := %s has Repaired Outstanding Amount For %s : %s and following was found:- - -%s - -""" % (webnotes.conn.get_value('Control Panel', None,'account_id'), session['user'], voucher_obj.doc.doctype, voucher_obj.doc.name, '\n'.join(msg)) - - sendmail(['support@iwebnotes.com'], subject='Repair Outstanding Amount', parts = [('text/plain', email_msg)]) - # Acknowledge User - msgprint(cstr(voucher_obj.doc.doctype) + " : " + cstr(voucher_obj.doc.name) + " has been checked" + cstr(msg and " and repaired successfully." or ". No changes Found.")) def repost_illegal_cancelled(self, after_date='2011-01-01'): """ diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py index 9b3968da2a..be62c93b24 100644 --- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py @@ -558,8 +558,3 @@ class DocType(TransactionBase): def on_update(self): pass -######################################################################## -# Repair Outstanding -####################################################################### - def repair_pv_outstanding(self): - get_obj(dt = 'GL Control').repair_voucher_outstanding(self) diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.js b/erpnext/accounts/doctype/sales_invoice/sales_invoice.js index 0a25feb104..a2d9f6a753 100644 --- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.js @@ -79,7 +79,7 @@ cur_frm.cscript.hide_fields = function(doc, cdt, cdn) { 'source', 'cancel_reason', 'total_advance', 'gross_profit', 'gross_profit_percent', 'get_advances_received', 'advance_adjustment_details', 'sales_partner', 'commission_rate', - 'total_commission', 'repair_outstanding_amt']; + 'total_commission']; item_flds_normal = ['sales_order', 'delivery_note'] item_flds_pos = ['warehouse', 'serial_no', 'batch_no', 'actual_qty', 'delivered_qty'] @@ -115,7 +115,6 @@ cur_frm.cscript.refresh = function(doc, dt, dn) { if(doc.docstatus==1) { cur_frm.add_custom_button('View Ledger', cur_frm.cscript.view_ledger_entry); cur_frm.add_custom_button('Send SMS', cur_frm.cscript.send_sms); - unhide_field('repair_outstanding_amt'); if(doc.is_pos==1 && doc.update_stock!=1) cur_frm.add_custom_button('Make Delivery', cur_frm.cscript['Make Delivery Note']); @@ -123,8 +122,6 @@ cur_frm.cscript.refresh = function(doc, dt, dn) { if(doc.outstanding_amount!=0) cur_frm.add_custom_button('Make Payment Entry', cur_frm.cscript.make_bank_voucher); } - else - hide_field('repair_outstanding_amt'); } //fetch retail transaction related fields diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py index d89ff042d1..6c956a0dae 100644 --- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py @@ -679,13 +679,6 @@ class DocType(TransactionBase): webnotes.conn.set(self.doc,'outstanding_amount',flt(self.doc.grand_total) - flt(self.doc.total_advance) - flt(self.doc.paid_amount) - flt(self.doc.write_off_amount)) -######################################################################## -# Repair Outstanding - - def repair_rv_outstanding(self): - get_obj(dt = 'GL Control').repair_voucher_outstanding(self) - - #------------------------------------------------------------------------------------- def on_update_after_submit(self): self.convert_into_recurring() diff --git a/erpnext/selling/doctype/sales_order/sales_order.js b/erpnext/selling/doctype/sales_order/sales_order.js index dbfd3916fb..43f53b0316 100644 --- a/erpnext/selling/doctype/sales_order/sales_order.js +++ b/erpnext/selling/doctype/sales_order/sales_order.js @@ -92,9 +92,9 @@ cur_frm.cscript.refresh = function(doc, cdt, cdn) { cur_frm.add_custom_button('Unstop', cur_frm.cscript['Unstop Sales Order']); } - unhide_field(['repair_sales_order', 'Send SMS', 'message', 'customer_mobile_no']) + unhide_field(['Send SMS', 'message', 'customer_mobile_no']) } else { - hide_field(['repair_sales_order', 'Send SMS', 'message', 'customer_mobile_no']) + hide_field(['Send SMS', 'message', 'customer_mobile_no']) } } diff --git a/erpnext/selling/doctype/sales_order/sales_order.py b/erpnext/selling/doctype/sales_order/sales_order.py index 3270f988ce..6fa737c58f 100644 --- a/erpnext/selling/doctype/sales_order/sales_order.py +++ b/erpnext/selling/doctype/sales_order/sales_order.py @@ -509,7 +509,3 @@ class DocType(TransactionBase): def on_update(self): pass - # Repair Sales Order - # =========================================== - def repair_sales_order(self): - get_obj('Sales Common', 'Sales Common').repair_curr_doctype_details(self) diff --git a/erpnext/stock/doctype/delivery_note/delivery_note.js b/erpnext/stock/doctype/delivery_note/delivery_note.js index 8e158979e6..99c0a73dbb 100644 --- a/erpnext/stock/doctype/delivery_note/delivery_note.js +++ b/erpnext/stock/doctype/delivery_note/delivery_note.js @@ -64,10 +64,10 @@ cur_frm.cscript.refresh = function(doc, cdt, cdn) { if(doc.per_installed < 100 && doc.docstatus==1) cur_frm.add_custom_button('Make Installation Note', cur_frm.cscript['Make Installation Note']); if (doc.docstatus!=1) { - hide_field(['SMS', 'Send SMS', 'message', 'customer_mobile_no', 'Repair Delivery Note']); + hide_field(['Send SMS', 'message', 'customer_mobile_no'); } else { cur_frm.add_custom_button('Send SMS', cur_frm.cscript.send_sms); - unhide_field(['SMS','Send SMS', 'message', 'customer_mobile_no', 'Repair Delivery Note']); + unhide_field(['Send SMS', 'message', 'customer_mobile_no'); } if(doc.docstatus==0 && !doc.__islocal) { diff --git a/erpnext/stock/doctype/delivery_note/delivery_note.py b/erpnext/stock/doctype/delivery_note/delivery_note.py index 49d70325b4..ffa656231f 100644 --- a/erpnext/stock/doctype/delivery_note/delivery_note.py +++ b/erpnext/stock/doctype/delivery_note/delivery_note.py @@ -487,8 +487,4 @@ class DocType(TransactionBase): self.set_actual_qty() get_obj('Stock Ledger').scrub_serial_nos(self) - # Repair Delivery Note - # =========================================== - def repair_delivery_note(self): - get_obj('Sales Common', 'Sales Common').repair_curr_doctype_details(self) diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.js b/erpnext/stock/doctype/stock_entry/stock_entry.js index 07e83edc14..3f371738b0 100644 --- a/erpnext/stock/doctype/stock_entry/stock_entry.js +++ b/erpnext/stock/doctype/stock_entry/stock_entry.js @@ -26,8 +26,8 @@ var cfn_set_fields = function(doc, cdt, cdn) { hide_field(lst); if (doc.purpose == 'Production Order' || doc.purpose == 'Other'){ - unhide_field('Get Items'); - hide_field(['from_warehouse', 'to_warehouse','purchase_receipt_no','delivery_note_no', 'sales_invoice_no','Warehouse HTML', 'transporter', 'is_excisable_goods', 'excisable_goods']); + unhide_field('get_items'); + hide_field(['from_warehouse', 'to_warehouse','purchase_receipt_no','delivery_note_no', 'sales_invoice_no','warehouse_html', 'transporter', 'is_excisable_goods', 'excisable_goods']); if (doc.purpose=='Production Order') unhide_field(['production_order', 'process']); doc.from_warehouse = ''; @@ -42,7 +42,7 @@ var cfn_set_fields = function(doc, cdt, cdn) { } else{ unhide_field(['from_warehouse', 'to_warehouse']); - hide_field(['production_order', 'process', 'Get Items', 'fg_completed_qty','purchase_receipt_no','delivery_note_no', 'sales_invoice_no']); + hide_field(['production_order', 'process', 'get_items', 'fg_completed_qty','purchase_receipt_no','delivery_note_no', 'sales_invoice_no']); doc.production_order = ''; doc.process = ''; doc.fg_completed_qty = 0; diff --git a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.js b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.js index a297e0badb..941b863cfd 100644 --- a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.js +++ b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.js @@ -15,7 +15,7 @@ // along with this program. If not, see . cur_frm.cscript.refresh = function(doc) { - if (doc.docstatus) hide_field('Steps'); + if (doc.docstatus) hide_field('steps'); } cur_frm.cscript.download_template = function(doc, cdt, cdn) { diff --git a/erpnext/support/doctype/customer_issue/customer_issue.js b/erpnext/support/doctype/customer_issue/customer_issue.js index cb909ac4ac..699c97f637 100644 --- a/erpnext/support/doctype/customer_issue/customer_issue.js +++ b/erpnext/support/doctype/customer_issue/customer_issue.js @@ -22,8 +22,8 @@ cur_frm.cscript.onload = function(doc,cdt,cdn){ } cur_frm.cscript.refresh = function(doc,ct,cdn){ - if(!doc.docstatus) hide_field('Make Maintenance Visit'); - else if(doc.docstatus && (doc.status == 'Open' || doc.status == 'Work In Progress')) unhide_field('Make Maintenance Visit'); + if(!doc.docstatus) hide_field('make_maintenance_visit'); + else if(doc.docstatus && (doc.status == 'Open' || doc.status == 'Work In Progress')) unhide_field('make_maintenance_visit'); } diff --git a/js/all-app.js b/js/all-app.js index 6db411f8c5..ba2dbf5a44 100644 --- a/js/all-app.js +++ b/js/all-app.js @@ -2031,9 +2031,9 @@ _f.frm_dialog.cur_frm.fields_dict[n].refresh();}else{var g=_f.cur_grid_cell;if(g cur_frm.fields_dict[n].refresh();}} set_field_options=function(n,txt){var df=get_field(cur_frm.doctype,n,cur_frm.docname);if(df)df.options=txt;refresh_field(n);} set_field_permlevel=function(n,level){var df=get_field(cur_frm.doctype,n,cur_frm.docname);if(df)df.permlevel=level;refresh_field(n);} -hide_field=function(n){function _hide_field(n,hidden){var df=get_field(cur_frm.doctype,n,cur_frm.docname);if(df)df.hidden=hidden;refresh_field(n);} +hide_field=function(n){function _hide_field(n,hidden){var df=get_field(cur_frm.doctype,n,cur_frm.docname);if(df)df.hidden=hidden;refresh_field(n);else console.log("hide_field cannot find field "+n);} if(cur_frm){if(n.substr)_hide_field(n,1);else{for(var i in n)_hide_field(n[i],1)}}} -unhide_field=function(n){function _hide_field(n,hidden){var df=get_field(cur_frm.doctype,n,cur_frm.docname);if(df)df.hidden=hidden;refresh_field(n);} +unhide_field=function(n){function _hide_field(n,hidden){var df=get_field(cur_frm.doctype,n,cur_frm.docname);if(df)df.hidden=hidden;refresh_field(n);else console.log("unhide_field cannot find field "+n);} if(cur_frm){if(n.substr)_hide_field(n,0);else{for(var i in n)_hide_field(n[i],0)}}} get_field_obj=function(fn){return cur_frm.fields_dict[fn];} /* diff --git a/version.num b/version.num index 3641460c4b..1a1e4a6ece 100644 --- a/version.num +++ b/version.num @@ -1 +1 @@ -1671 \ No newline at end of file +1672 \ No newline at end of file