nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-22 14:39:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Rushabh Mehta
2013-11-02 14:47:11 +05:30
parent 771f4a729e
commit ef5845589d
42 changed files with 155 additions and 220 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
buying/doctype/purchase_common/purchase_common.js
View File

@@ -414,11 +414,11 @@ erpnext.buying.BuyingController = erpnext.TransactionController.extend({
setup_field_label_map(["net_total_import", "grand_total_import", "in_words_import",
"other_charges_added_import", "other_charges_deducted_import"], this.frm.doc.currency);
setup_field_label_map(["conversion_rate"], "1 " + this.frm.doc.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
cur_frm.set_df_property("plc_conversion_rate", "description", "1 " + this.frm.doc.price_list_currency
+ " = [?] " + company_currency);
}

11
buying/doctype/purchase_order/purchase_order.txt
View File

@@ -2,7 +2,7 @@
{
"creation": "2013-05-21 16:16:39",
"docstatus": 0,
"modified": "2013-10-02 14:24:49",
"modified": "2013-11-02 14:27:52",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -49,11 +49,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",
@@ -179,7 +178,6 @@
"fieldtype": "Column Break"
},
{
"description": "Supplier's currency",
"doctype": "DocField",
"fieldname": "currency",
"fieldtype": "Link",
@@ -210,7 +208,6 @@
"fieldtype": "Column Break"
},
{
"description": "Consider this Price List for fetching rate. (only which have \"For Buying\" as checked)",
"doctype": "DocField",
"fieldname": "buying_price_list",
"fieldtype": "Link",
@@ -485,7 +482,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 +600,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",

4
buying/doctype/quality_inspection/quality_inspection.txt
View File

@@ -2,7 +2,7 @@
{
"creation": "2013-04-30 13:13:03",
"docstatus": 0,
"modified": "2013-08-08 14:22:07",
"modified": "2013-11-02 14:05:38",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -62,7 +62,7 @@
"doctype": "DocField",
"fieldname": "naming_series",
"fieldtype": "Select",
"label": "Document Numbering Series",
"label": "Series",
"no_copy": 1,
"options": "\nQAI/11-12/",
"reqd": 1

35
buying/doctype/supplier/supplier.txt
View File

@@ -2,7 +2,7 @@
{
"creation": "2013-01-10 16:34:11",
"docstatus": 0,
"modified": "2013-09-10 10:53:50",
"modified": "2013-11-02 14:24:01",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -50,6 +50,16 @@
"oldfieldtype": "Section Break",
"options": "icon-user"
},
{
"doctype": "DocField",
"fieldname": "naming_series",
"fieldtype": "Select",
"label": "Series",
"no_copy": 1,
"oldfieldname": "naming_series",
"oldfieldtype": "Select",
"options": "\nSUPP\nSUPP/10-11/"
},
{
"doctype": "DocField",
"fieldname": "supplier_name",
@@ -61,6 +71,12 @@
"oldfieldtype": "Data",
"reqd": 1
},
{
"doctype": "DocField",
"fieldname": "column_break0",
"fieldtype": "Column Break",
"width": "50%"
},
{
"doctype": "DocField",
"fieldname": "supplier_type",
@@ -72,22 +88,6 @@
"options": "Supplier Type",
"reqd": 1
},
{
"doctype": "DocField",
"fieldname": "column_break0",
"fieldtype": "Column Break",
"width": "50%"
},
{
"doctype": "DocField",
"fieldname": "naming_series",
"fieldtype": "Select",
"label": "Document Numbering Series",
"no_copy": 1,
"oldfieldname": "naming_series",
"oldfieldtype": "Select",
"options": "\nSUPP\nSUPP/10-11/"
},
{
"doctype": "DocField",
"fieldname": "address_contacts",
@@ -169,7 +169,6 @@
"search_index": 0
},
{
"description": "This currency will get fetched in Purchase transactions of this supplier",
"doctype": "DocField",
"fieldname": "default_currency",
"fieldtype": "Link",

11
buying/doctype/supplier_quotation/supplier_quotation.txt
View File

@@ -2,7 +2,7 @@
{
"creation": "2013-05-21 16:16:45",
"docstatus": 0,
"modified": "2013-10-02 14:24:44",
"modified": "2013-11-02 14:27:54",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -49,11 +49,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",
@@ -174,7 +173,6 @@
"options": "icon-tag"
},
{
"description": "Supplier's currency",
"doctype": "DocField",
"fieldname": "currency",
"fieldtype": "Link",
@@ -207,7 +205,6 @@
"width": "50%"
},
{
"description": "Consider this Price List for fetching rate. (only which have \"For Buying\" as checked)",
"doctype": "DocField",
"fieldname": "buying_price_list",
"fieldtype": "Link",
@@ -484,7 +481,7 @@
"doctype": "DocField",
"fieldname": "tc_name",
"fieldtype": "Link",
"label": "Select Terms and Conditions",
"label": "Terms",
"oldfieldname": "tc_name",
"oldfieldtype": "Link",
"options": "Terms and Conditions",
@@ -587,7 +584,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",