From ed6b489715f7fdf09a6ca1c12a5bcee975496877 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Wed, 23 Nov 2011 13:17:54 +0530 Subject: [PATCH] filter property changed in address --- erpnext/setup/page/setup/setup.js | 2 +- erpnext/utilities/doctype/address/address.txt | 49 ++++++------------- 2 files changed, 16 insertions(+), 35 deletions(-) diff --git a/erpnext/setup/page/setup/setup.js b/erpnext/setup/page/setup/setup.js index 150543f1bf..db2c4a9cd9 100644 --- a/erpnext/setup/page/setup/setup.js +++ b/erpnext/setup/page/setup/setup.js @@ -181,7 +181,7 @@ SetupData = function(cnty){ ['Print Heading',1,'Print Heading','','Manage headings for printing transactions'], ['Term',1,'Term','','Manage template of standard Terms for order / invoices etc'], ['Currency',1,'Currency','','Manage list of currencies'], - ['Address',1,'Address','','Manage Address of customers, suplliers'], + ['Address',1,'Address','','Manage Address of customers, suppliers'], ['Country',1,'Country','','Country master'], ['State',1,'State','','State master'], ['Rename Tool',3,'Rename Tool','','Rename a record'], diff --git a/erpnext/utilities/doctype/address/address.txt b/erpnext/utilities/doctype/address/address.txt index 4f44806cf5..4b633ec17e 100644 --- a/erpnext/utilities/doctype/address/address.txt +++ b/erpnext/utilities/doctype/address/address.txt @@ -3,23 +3,25 @@ # These values are common in all dictionaries { - 'creation': '2011-05-24 10:14:48', + 'creation': '2011-05-24 14:57:59', 'docstatus': 0, - 'modified': '2011-06-09 12:28:53', + 'modified': '2011-11-23 13:17:20', 'modified_by': 'Administrator', 'owner': 'Administrator' }, # These values are common for all DocType { - '_last_update': '1307602735', + '_last_update': '1319016431', 'allow_trash': 1, 'colour': 'White:FFF', + 'default_print_format': 'Standard', 'doctype': 'DocType', 'document_type': 'Master', 'in_dialog': 1, 'module': 'Utilities', 'name': '__common__', + 'search_fields': 'customer, supplier, sales_partner', 'section_style': 'Simple', 'show_in_menu': 0, 'version': 42 @@ -39,7 +41,6 @@ 'cancel': 1, 'create': 1, 'doctype': 'DocPerm', - 'idx': 1, 'name': '__common__', 'parent': 'Address', 'parentfield': 'permissions', @@ -66,7 +67,6 @@ 'colour': 'White:FFF', 'doctype': 'DocField', 'fieldtype': 'Section Break', - 'idx': 1, 'label': 'Address Details', 'permlevel': 0 }, @@ -78,7 +78,6 @@ 'doctype': 'DocField', 'fieldname': 'address_type', 'fieldtype': 'Data', - 'idx': 2, 'label': 'Address Type', 'permlevel': 0, 'reqd': 1 @@ -90,7 +89,6 @@ 'doctype': 'DocField', 'fieldname': 'address_line1', 'fieldtype': 'Data', - 'idx': 3, 'label': 'Address Line1', 'permlevel': 0, 'reqd': 1 @@ -101,7 +99,6 @@ 'doctype': 'DocField', 'fieldname': 'address_line2', 'fieldtype': 'Data', - 'idx': 4, 'label': 'Address Line2', 'permlevel': 0 }, @@ -112,12 +109,11 @@ 'doctype': 'DocField', 'fieldname': 'city', 'fieldtype': 'Data', - 'idx': 5, 'in_filter': 1, 'label': 'City/Town', 'permlevel': 0, 'reqd': 1, - 'search_index': 0 + 'search_index': 1 }, # DocField @@ -125,11 +121,10 @@ 'doctype': 'DocField', 'fieldname': 'pincode', 'fieldtype': 'Data', - 'idx': 6, 'in_filter': 1, 'label': 'Pincode', 'permlevel': 0, - 'search_index': 0 + 'search_index': 1 }, # DocField @@ -138,13 +133,12 @@ 'doctype': 'DocField', 'fieldname': 'country', 'fieldtype': 'Select', - 'idx': 7, 'in_filter': 1, 'label': 'Country', 'options': 'link:Country', 'permlevel': 0, 'reqd': 1, - 'search_index': 0, + 'search_index': 1, 'trigger': 'Client' }, @@ -154,7 +148,6 @@ 'doctype': 'DocField', 'fieldname': 'state', 'fieldtype': 'Data', - 'idx': 8, 'in_filter': 1, 'label': 'State', 'options': 'Suggest', @@ -166,7 +159,6 @@ { 'doctype': 'DocField', 'fieldtype': 'Column Break', - 'idx': 9, 'permlevel': 0, 'print_hide': 0, 'width': '50%' @@ -177,7 +169,6 @@ 'doctype': 'DocField', 'fieldname': 'phone', 'fieldtype': 'Data', - 'idx': 10, 'label': 'Phone', 'permlevel': 0, 'reqd': 1 @@ -188,7 +179,6 @@ 'doctype': 'DocField', 'fieldname': 'email_id', 'fieldtype': 'Data', - 'idx': 11, 'label': 'Email Id', 'permlevel': 0 }, @@ -198,7 +188,7 @@ 'doctype': 'DocField', 'fieldname': 'fax', 'fieldtype': 'Data', - 'idx': 12, + 'in_filter': 1, 'label': 'Fax', 'permlevel': 0 }, @@ -210,12 +200,9 @@ 'doctype': 'DocField', 'fieldname': 'customer', 'fieldtype': 'Link', - 'idx': 13, 'label': 'Customer', 'options': 'Customer', - 'permlevel': 0, - 'search_index': 1, - 'trigger': 'Client' + 'permlevel': 0 }, # DocField @@ -225,7 +212,7 @@ 'doctype': 'DocField', 'fieldname': 'customer_name', 'fieldtype': 'Data', - 'idx': 14, + 'in_filter': 1, 'label': 'Customer Name', 'permlevel': 1 }, @@ -237,12 +224,9 @@ 'doctype': 'DocField', 'fieldname': 'supplier', 'fieldtype': 'Link', - 'idx': 15, 'label': 'Supplier', 'options': 'Supplier', - 'permlevel': 0, - 'search_index': 1, - 'trigger': 'Client' + 'permlevel': 0 }, # DocField @@ -252,9 +236,10 @@ 'doctype': 'DocField', 'fieldname': 'supplier_name', 'fieldtype': 'Data', - 'idx': 16, + 'in_filter': 1, 'label': 'Supplier Name', - 'permlevel': 1 + 'permlevel': 1, + 'search_index': 0 }, # DocField @@ -264,7 +249,6 @@ 'doctype': 'DocField', 'fieldname': 'sales_partner', 'fieldtype': 'Link', - 'idx': 17, 'label': 'Sales Partner', 'options': 'Sales Partner', 'permlevel': 0 @@ -278,7 +262,6 @@ 'doctype': 'DocField', 'fieldname': 'is_primary_address', 'fieldtype': 'Check', - 'idx': 18, 'label': 'Is Primary Address', 'permlevel': 0 }, @@ -291,7 +274,6 @@ 'doctype': 'DocField', 'fieldname': 'is_shipping_address', 'fieldtype': 'Check', - 'idx': 19, 'label': 'Is Shipping Address', 'permlevel': 0 }, @@ -301,7 +283,6 @@ 'doctype': 'DocField', 'fieldname': 'trash_reason', 'fieldtype': 'Small Text', - 'idx': 20, 'label': 'Trash Reason', 'permlevel': 0 }