[cleanup] [minor] finishing styles, labels, descriptions

2026-05-23 15:09:20 +00:00 · 2013-11-02 14:47:11 +05:30
parent 771f4a729e
commit ef5845589d
42 changed files with 155 additions and 220 deletions
--- a/selling/doctype/customer/customer.txt
+++ b/selling/doctype/customer/customer.txt
@@ -2,7 +2,7 @@
 {
  "creation": "2013-06-11 14:26:44", 
  "docstatus": 0, 
-  "modified": "2013-10-18 16:49:20", 
+  "modified": "2013-11-02 14:24:03", 
  "modified_by": "Administrator", 
  "owner": "Administrator"
 }, 
@@ -52,7 +52,7 @@
  "doctype": "DocField", 
  "fieldname": "naming_series", 
  "fieldtype": "Select", 
-  "label": "Document Numbering Series", 
+  "label": "Series", 
  "no_copy": 1, 
  "options": "\nCUST\nCUSTMUM", 
  "permlevel": 0, 
@@ -126,7 +126,6 @@
  "search_index": 1
 }, 
 {
-  "description": "<a href=\"#!Sales Browser/Territory\">To manage Territory, click here</a>", 
  "doctype": "DocField", 
  "fieldname": "territory", 
  "fieldtype": "Link", 
@@ -245,7 +244,6 @@
  "permlevel": 0
 }, 
 {
-  "description": "This currency will get fetched in Sales transactions of this customer", 
  "doctype": "DocField", 
  "fieldname": "default_currency", 
  "fieldtype": "Link", 
--- a/selling/doctype/installation_note/installation_note.txt
+++ b/selling/doctype/installation_note/installation_note.txt
@@ -2,7 +2,7 @@
 {
  "creation": "2013-04-30 13:13:06", 
  "docstatus": 0, 
-  "modified": "2013-08-08 14:22:13", 
+  "modified": "2013-11-02 14:05:46", 
  "modified_by": "Administrator", 
  "owner": "Administrator"
 }, 
@@ -54,7 +54,7 @@
  "doctype": "DocField", 
  "fieldname": "naming_series", 
  "fieldtype": "Select", 
-  "label": "Document Numbering Series", 
+  "label": "Series", 
  "no_copy": 1, 
  "oldfieldname": "naming_series", 
  "oldfieldtype": "Select", 
--- a/selling/doctype/lead/lead.txt
+++ b/selling/doctype/lead/lead.txt
@@ -2,7 +2,7 @@
 {
  "creation": "2013-04-10 11:45:37", 
  "docstatus": 0, 
-  "modified": "2013-10-09 15:27:54", 
+  "modified": "2013-11-02 14:39:56", 
  "modified_by": "Administrator", 
  "owner": "Administrator"
 }, 
@@ -50,11 +50,10 @@
  "options": "icon-user"
 }, 
 {
-  "description": "To manage multiple series please go to Setup > Manage Series", 
  "doctype": "DocField", 
  "fieldname": "naming_series", 
  "fieldtype": "Select", 
-  "label": "Document Numbering Series", 
+  "label": "Series", 
  "no_copy": 1, 
  "oldfieldname": "naming_series", 
  "oldfieldtype": "Select", 
@@ -133,7 +132,6 @@
 }, 
 {
  "depends_on": "eval:doc.source == 'Customer'", 
-  "description": "Source of th", 
  "doctype": "DocField", 
  "fieldname": "customer", 
  "fieldtype": "Link", 
@@ -300,7 +298,6 @@
  "oldfieldtype": "Data"
 }, 
 {
-  "description": "<a href=\"#!Sales Browser/Territory\">To manage Territory, click here</a>", 
  "doctype": "DocField", 
  "fieldname": "territory", 
  "fieldtype": "Link", 
--- a/selling/doctype/opportunity/opportunity.txt
+++ b/selling/doctype/opportunity/opportunity.txt
@@ -2,7 +2,7 @@
 {
  "creation": "2013-03-07 18:50:30", 
  "docstatus": 0, 
-  "modified": "2013-10-09 15:26:29", 
+  "modified": "2013-11-02 14:27:57", 
  "modified_by": "Administrator", 
  "owner": "Administrator"
 }, 
@@ -53,11 +53,10 @@
  "options": "icon-user"
 }, 
 {
-  "description": "To manage multiple series please go to Setup > Manage Series", 
  "doctype": "DocField", 
  "fieldname": "naming_series", 
  "fieldtype": "Select", 
-  "label": "Document Numbering Series", 
+  "label": "Series", 
  "no_copy": 1, 
  "oldfieldname": "naming_series", 
  "oldfieldtype": "Select", 
@@ -210,7 +209,6 @@
  "read_only": 1
 }, 
 {
-  "description": "<a href=\"#Sales Browser/Territory\">To manage Territory, click here</a>", 
  "doctype": "DocField", 
  "fieldname": "territory", 
  "fieldtype": "Link", 
--- a/selling/doctype/quotation/quotation.txt
+++ b/selling/doctype/quotation/quotation.txt
@@ -2,7 +2,7 @@
 {
  "creation": "2013-05-24 19:29:08", 
  "docstatus": 0, 
-  "modified": "2013-10-11 13:21:07", 
+  "modified": "2013-11-02 14:36:45", 
  "modified_by": "Administrator", 
  "owner": "Administrator"
 }, 
@@ -59,11 +59,10 @@
  "width": "50%"
 }, 
 {
-  "description": "To manage multiple series please go to Setup > Manage Series", 
  "doctype": "DocField", 
  "fieldname": "naming_series", 
  "fieldtype": "Select", 
-  "label": "Document Numbering Series", 
+  "label": "Series", 
  "no_copy": 1, 
  "oldfieldname": "naming_series", 
  "oldfieldtype": "Select", 
@@ -242,7 +241,6 @@
  "read_only": 0
 }, 
 {
-  "description": "Customer's currency - If you want to select a currency that is not the default currency, then you must also specify the Currency Conversion Rate.", 
  "doctype": "DocField", 
  "fieldname": "currency", 
  "fieldtype": "Link", 
@@ -262,7 +260,7 @@
  "doctype": "DocField", 
  "fieldname": "conversion_rate", 
  "fieldtype": "Float", 
-  "label": "Conversion Rate", 
+  "label": "Exchange Rate", 
  "oldfieldname": "conversion_rate", 
  "oldfieldtype": "Currency", 
  "print_hide": 1, 
@@ -278,7 +276,6 @@
  "width": "50%"
 }, 
 {
-  "description": "Select the price list as entered in \"Price List\" master. This will pull the reference rates of items against this price list as specified in \"Item\" master.", 
  "doctype": "DocField", 
  "fieldname": "selling_price_list", 
  "fieldtype": "Link", 
@@ -294,7 +291,6 @@
  "width": "100px"
 }, 
 {
-  "description": "Select the currency in which price list is maintained", 
  "doctype": "DocField", 
  "fieldname": "price_list_currency", 
  "fieldtype": "Link", 
@@ -309,7 +305,7 @@
  "doctype": "DocField", 
  "fieldname": "plc_conversion_rate", 
  "fieldtype": "Float", 
-  "label": "Price List Currency Conversion Rate", 
+  "label": "Price List Exchange Rate", 
  "print_hide": 1, 
  "read_only": 0, 
  "reqd": 1
@@ -385,7 +381,7 @@
  "fieldname": "charge", 
  "fieldtype": "Link", 
  "hidden": 0, 
-  "label": "Apply Taxes and Charges Master", 
+  "label": "Tax Master", 
  "oldfieldname": "charge", 
  "oldfieldtype": "Link", 
  "options": "Sales Taxes and Charges Master", 
@@ -402,7 +398,7 @@
  "fieldname": "shipping_rule", 
  "fieldtype": "Link", 
  "hidden": 0, 
-  "label": "Apply Shipping Rule", 
+  "label": "Shipping Rule", 
  "oldfieldtype": "Button", 
  "options": "Shipping Rule", 
  "print_hide": 1, 
@@ -577,7 +573,7 @@
  "doctype": "DocField", 
  "fieldname": "tc_name", 
  "fieldtype": "Link", 
-  "label": "Select Terms and Conditions", 
+  "label": "Terms", 
  "oldfieldname": "tc_name", 
  "oldfieldtype": "Link", 
  "options": "Terms and Conditions", 
@@ -603,7 +599,6 @@
  "read_only": 0
 }, 
 {
-  "description": "Will be fetched from Customer", 
  "doctype": "DocField", 
  "fieldname": "territory", 
  "fieldtype": "Link", 
@@ -636,7 +631,7 @@
  "fieldname": "shipping_address_name", 
  "fieldtype": "Link", 
  "hidden": 0, 
-  "label": "Shipping Address Name", 
+  "label": "Shipping Address", 
  "options": "Address", 
  "print_hide": 1
 }, 
@@ -777,7 +772,7 @@
  "doctype": "DocField", 
  "fieldname": "select_print_heading", 
  "fieldtype": "Link", 
-  "label": "Select Print Heading", 
+  "label": "Print Heading", 
  "no_copy": 1, 
  "oldfieldname": "select_print_heading", 
  "oldfieldtype": "Link", 
--- a/selling/doctype/sales_order/sales_order.txt
+++ b/selling/doctype/sales_order/sales_order.txt
@@ -2,7 +2,7 @@
 {
  "creation": "2013-06-18 12:39:59", 
  "docstatus": 0, 
-  "modified": "2013-10-11 13:18:47", 
+  "modified": "2013-11-02 14:40:29", 
  "modified_by": "Administrator", 
  "owner": "Administrator"
 }, 
@@ -58,11 +58,10 @@
  "width": "50%"
 }, 
 {
-  "description": "To manage multiple series please go to Setup > Manage Series", 
  "doctype": "DocField", 
  "fieldname": "naming_series", 
  "fieldtype": "Select", 
-  "label": "Document Numbering Series", 
+  "label": "Series", 
  "no_copy": 1, 
  "oldfieldname": "naming_series", 
  "oldfieldtype": "Select", 
@@ -71,7 +70,6 @@
  "reqd": 1
 }, 
 {
-  "description": "Select Customer", 
  "doctype": "DocField", 
  "fieldname": "customer", 
  "fieldtype": "Link", 
@@ -237,7 +235,7 @@
  "fieldtype": "Link", 
  "hidden": 1, 
  "in_filter": 1, 
-  "label": "Shipping Address Name", 
+  "label": "Shipping Address", 
  "options": "Address", 
  "print_hide": 1, 
  "read_only": 0
@@ -260,7 +258,6 @@
  "options": "icon-tag"
 }, 
 {
-  "description": "Customer's currency", 
  "doctype": "DocField", 
  "fieldname": "currency", 
  "fieldtype": "Link", 
@@ -277,7 +274,7 @@
  "doctype": "DocField", 
  "fieldname": "conversion_rate", 
  "fieldtype": "Float", 
-  "label": "Conversion Rate", 
+  "label": "Exchange Rate", 
  "oldfieldname": "conversion_rate", 
  "oldfieldtype": "Currency", 
  "print_hide": 1, 
@@ -291,7 +288,6 @@
  "width": "50%"
 }, 
 {
-  "description": "Select the price list as entered in \"Price List\" master. This will pull the reference rates of items against this price list as specified in \"Item\" master.", 
  "doctype": "DocField", 
  "fieldname": "selling_price_list", 
  "fieldtype": "Link", 
@@ -304,7 +300,6 @@
  "width": "100px"
 }, 
 {
-  "description": "Select the currency in which price list is maintained", 
  "doctype": "DocField", 
  "fieldname": "price_list_currency", 
  "fieldtype": "Link", 
@@ -319,7 +314,7 @@
  "doctype": "DocField", 
  "fieldname": "plc_conversion_rate", 
  "fieldtype": "Float", 
-  "label": "Price List Currency Conversion Rate", 
+  "label": "Price List Exchange Rate", 
  "print_hide": 1, 
  "reqd": 1
 }, 
@@ -409,7 +404,7 @@
  "doctype": "DocField", 
  "fieldname": "charge", 
  "fieldtype": "Link", 
-  "label": "Apply Taxes and Charges Master", 
+  "label": "Tax Master", 
  "oldfieldname": "charge", 
  "oldfieldtype": "Link", 
  "options": "Sales Taxes and Charges Master", 
@@ -424,7 +419,7 @@
  "doctype": "DocField", 
  "fieldname": "shipping_rule", 
  "fieldtype": "Link", 
-  "label": "Apply Shipping Rule", 
+  "label": "Shipping Rule", 
  "oldfieldtype": "Button", 
  "options": "Shipping Rule", 
  "print_hide": 1
@@ -585,7 +580,7 @@
  "doctype": "DocField", 
  "fieldname": "tc_name", 
  "fieldtype": "Link", 
-  "label": "Select Terms and Conditions", 
+  "label": "Terms", 
  "oldfieldname": "tc_name", 
  "oldfieldtype": "Link", 
  "options": "Terms and Conditions", 
@@ -730,7 +725,7 @@
  "doctype": "DocField", 
  "fieldname": "select_print_heading", 
  "fieldtype": "Link", 
-  "label": "Select Print Heading", 
+  "label": "Print Heading", 
  "no_copy": 1, 
  "oldfieldname": "select_print_heading", 
  "oldfieldtype": "Link", 
@@ -845,7 +840,6 @@
  "print_hide": 1
 }, 
 {
-  "description": "Name as entered in Sales Partner master", 
  "doctype": "DocField", 
  "fieldname": "sales_partner", 
  "fieldtype": "Link", 
--- a/selling/doctype/selling_settings/selling_settings.txt
+++ b/selling/doctype/selling_settings/selling_settings.txt
@@ -2,7 +2,7 @@
 {
  "creation": "2013-06-25 10:25:16", 
  "docstatus": 0, 
-  "modified": "2013-08-09 14:46:24", 
+  "modified": "2013-11-02 14:22:36", 
  "modified_by": "Administrator", 
  "owner": "Administrator"
 }, 
@@ -55,7 +55,6 @@
  "options": "Customer Group"
 }, 
 {
-  "description": "<a href=\"#Sales Browser/Territory\">Territory</a>", 
  "doctype": "DocField", 
  "fieldname": "territory", 
  "fieldtype": "Link", 
--- a/selling/sales_common.js
+++ b/selling/sales_common.js
@@ -524,12 +524,12 @@ erpnext.selling.SellingController = erpnext.TransactionController.extend({
 		setup_field_label_map(["net_total_export", "other_charges_total_export", "grand_total_export", 
 			"rounded_total_export", "in_words_export"], this.frm.doc.currency);
 		
-		setup_field_label_map(["conversion_rate"], 	"1 " + this.frm.doc.currency 
-			+ " = [?] " + company_currency);
+		cur_frm.set_df_property("conversion_rate", "description", "1 " + this.frm.doc.currency 
+			+ " = [?] " + company_currency)
 		
 		if(this.frm.doc.price_list_currency && this.frm.doc.price_list_currency!=company_currency) {
-			setup_field_label_map(["plc_conversion_rate"], 	"1 " + this.frm.doc.price_list_currency 
-				+ " = [?] " + company_currency);
+			cur_frm.set_df_property("plc_conversion_rate", "description", "1 " + this.frm.doc.price_list_currency 
+				+ " = [?] " + company_currency)
 		}
 		
 		// toggle fields