diff --git a/accounts/doctype/c_form/c_form.txt b/accounts/doctype/c_form/c_form.txt index c69a6580b7..21d655026a 100644 --- a/accounts/doctype/c_form/c_form.txt +++ b/accounts/doctype/c_form/c_form.txt @@ -2,7 +2,7 @@ { "creation": "2013-03-07 11:55:06", "docstatus": 0, - "modified": "2013-08-08 14:21:55", + "modified": "2013-11-02 14:05:25", "modified_by": "Administrator", "owner": "Administrator" }, @@ -50,7 +50,7 @@ "doctype": "DocField", "fieldname": "naming_series", "fieldtype": "Select", - "label": "Document Numbering Series", + "label": "Series", "options": "\nC-FORM/", "read_only": 0, "reqd": 1 diff --git a/accounts/doctype/journal_voucher/journal_voucher.txt b/accounts/doctype/journal_voucher/journal_voucher.txt index fdc27ead9b..0ce8c4967b 100644 --- a/accounts/doctype/journal_voucher/journal_voucher.txt +++ b/accounts/doctype/journal_voucher/journal_voucher.txt @@ -2,7 +2,7 @@ { "creation": "2013-03-25 10:53:52", "docstatus": 0, - "modified": "2013-09-10 14:59:41", + "modified": "2013-11-02 14:27:46", "modified_by": "Administrator", "owner": "Administrator" }, @@ -55,11 +55,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", @@ -448,7 +447,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", diff --git a/accounts/doctype/pos_setting/pos_setting.txt b/accounts/doctype/pos_setting/pos_setting.txt index 7eda7fd62f..1e0ba9ebe7 100755 --- a/accounts/doctype/pos_setting/pos_setting.txt +++ b/accounts/doctype/pos_setting/pos_setting.txt @@ -2,7 +2,7 @@ { "creation": "2013-05-24 12:15:51", "docstatus": 0, - "modified": "2013-10-15 11:12:02", + "modified": "2013-11-02 14:17:45", "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, "oldfieldname": "naming_series", "oldfieldtype": "Select", @@ -222,7 +222,7 @@ "fieldname": "select_print_heading", "fieldtype": "Select", "in_filter": 0, - "label": "Select Print Heading", + "label": "Print Heading", "oldfieldname": "select_print_heading", "oldfieldtype": "Select", "options": "link:Print Heading", diff --git a/accounts/doctype/purchase_invoice/purchase_invoice.txt b/accounts/doctype/purchase_invoice/purchase_invoice.txt index 8f772272b7..2a90369ee9 100755 --- a/accounts/doctype/purchase_invoice/purchase_invoice.txt +++ b/accounts/doctype/purchase_invoice/purchase_invoice.txt @@ -2,7 +2,7 @@ { "creation": "2013-05-21 16:16:39", "docstatus": 0, - "modified": "2013-10-02 14:24:55", + "modified": "2013-11-02 14:27:47", "modified_by": "Administrator", "owner": "Administrator" }, @@ -56,11 +56,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", @@ -241,7 +240,6 @@ "read_only": 0 }, { - "description": "Consider this Price List for fetching rate. (only which have \"For Buying\" as checked)", "doctype": "DocField", "fieldname": "buying_price_list", "fieldtype": "Link", @@ -607,7 +605,7 @@ "doctype": "DocField", "fieldname": "tc_name", "fieldtype": "Link", - "label": "Select Terms and Conditions", + "label": "Terms", "options": "Terms and Conditions", "print_hide": 1 }, @@ -707,7 +705,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", diff --git a/accounts/doctype/sales_invoice/sales_invoice.txt b/accounts/doctype/sales_invoice/sales_invoice.txt index 34191885ea..b29316ec93 100644 --- a/accounts/doctype/sales_invoice/sales_invoice.txt +++ b/accounts/doctype/sales_invoice/sales_invoice.txt @@ -2,7 +2,7 @@ { "creation": "2013-05-24 19:29:05", "docstatus": 0, - "modified": "2013-10-18 13:12:38", + "modified": "2013-11-02 14:35:31", "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", @@ -230,7 +229,7 @@ "doctype": "DocField", "fieldname": "conversion_rate", "fieldtype": "Float", - "label": "Conversion Rate", + "label": "Exchange Rate", "oldfieldname": "conversion_rate", "oldfieldtype": "Currency", "print_hide": 1, @@ -257,7 +256,6 @@ "reqd": 1 }, { - "description": "Select the currency in which price list is maintained", "doctype": "DocField", "fieldname": "price_list_currency", "fieldtype": "Link", @@ -272,7 +270,7 @@ "doctype": "DocField", "fieldname": "plc_conversion_rate", "fieldtype": "Float", - "label": "Price List Currency Conversion Rate", + "label": "Price List Exchange Rate", "no_copy": 0, "print_hide": 1, "read_only": 0, @@ -379,7 +377,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", @@ -395,7 +393,7 @@ "doctype": "DocField", "fieldname": "shipping_rule", "fieldtype": "Link", - "label": "Apply Shipping Rule", + "label": "Shipping Rule", "oldfieldtype": "Button", "options": "Shipping Rule", "print_hide": 1, @@ -722,7 +720,7 @@ "doctype": "DocField", "fieldname": "tc_name", "fieldtype": "Link", - "label": "Select Terms and Conditions", + "label": "Terms", "oldfieldname": "tc_name", "oldfieldtype": "Link", "options": "Terms and Conditions", @@ -918,7 +916,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", diff --git a/accounts/page/accounts_browser/accounts_browser.js b/accounts/page/accounts_browser/accounts_browser.js index fafe816cd9..b9767eff9d 100644 --- a/accounts/page/accounts_browser/accounts_browser.js +++ b/accounts/page/accounts_browser/accounts_browser.js @@ -18,7 +18,7 @@ pscript['onload_Accounts Browser'] = function(wrapper){ var main = $(wrapper).find(".layout-main"), chart_area = $("
") - .css({"margin-bottom": "15px"}) + .css({"margin-bottom": "15px", "min-height": "200px"}) .appendTo(main), help_area = $('
'+ '

'+wn._('Quick Help')+'

'+ diff --git a/buying/doctype/purchase_common/purchase_common.js b/buying/doctype/purchase_common/purchase_common.js index 023c7f3a63..7e594e3a8e 100644 --- a/buying/doctype/purchase_common/purchase_common.js +++ b/buying/doctype/purchase_common/purchase_common.js @@ -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); } diff --git a/buying/doctype/purchase_order/purchase_order.txt b/buying/doctype/purchase_order/purchase_order.txt index 7169aaf390..f01b6e3492 100644 --- a/buying/doctype/purchase_order/purchase_order.txt +++ b/buying/doctype/purchase_order/purchase_order.txt @@ -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", diff --git a/buying/doctype/quality_inspection/quality_inspection.txt b/buying/doctype/quality_inspection/quality_inspection.txt index 0a921046ba..d4a2d8fd79 100644 --- a/buying/doctype/quality_inspection/quality_inspection.txt +++ b/buying/doctype/quality_inspection/quality_inspection.txt @@ -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 diff --git a/buying/doctype/supplier/supplier.txt b/buying/doctype/supplier/supplier.txt index 56336d4846..6726afd676 100644 --- a/buying/doctype/supplier/supplier.txt +++ b/buying/doctype/supplier/supplier.txt @@ -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", diff --git a/buying/doctype/supplier_quotation/supplier_quotation.txt b/buying/doctype/supplier_quotation/supplier_quotation.txt index ddd17307dc..42d38db8b6 100644 --- a/buying/doctype/supplier_quotation/supplier_quotation.txt +++ b/buying/doctype/supplier_quotation/supplier_quotation.txt @@ -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", diff --git a/hr/doctype/attendance/attendance.txt b/hr/doctype/attendance/attendance.txt index 163baa0abc..5186a8dbe6 100644 --- a/hr/doctype/attendance/attendance.txt +++ b/hr/doctype/attendance/attendance.txt @@ -2,7 +2,7 @@ { "creation": "2013-01-10 16:34:13", "docstatus": 0, - "modified": "2013-08-08 14:22:10", + "modified": "2013-11-02 14:05:42", "modified_by": "Administrator", "owner": "ashwini@webnotestech.com" }, @@ -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", diff --git a/hr/doctype/employee/employee.txt b/hr/doctype/employee/employee.txt index 4ed873275a..b13a46b2e4 100644 --- a/hr/doctype/employee/employee.txt +++ b/hr/doctype/employee/employee.txt @@ -2,7 +2,7 @@ { "creation": "2013-03-07 09:04:18", "docstatus": 0, - "modified": "2013-10-11 10:52:53", + "modified": "2013-11-02 14:27:56", "modified_by": "Administrator", "owner": "Administrator" }, @@ -73,11 +73,10 @@ "report_hide": 1 }, { - "description": "To setup, please go to Setup > Naming Series", "doctype": "DocField", "fieldname": "naming_series", "fieldtype": "Select", - "label": "Document Numbering Series", + "label": "Series", "no_copy": 1, "oldfieldname": "naming_series", "oldfieldtype": "Select", diff --git a/hr/doctype/job_applicant/job_applicant.js b/hr/doctype/job_applicant/job_applicant.js index ccfbbc25b9..eafa40cffd 100644 --- a/hr/doctype/job_applicant/job_applicant.js +++ b/hr/doctype/job_applicant/job_applicant.js @@ -6,8 +6,7 @@ cur_frm.cscript = { onload: function(doc, dt, dn) { if(in_list(user_roles,'System Manager')) { - cur_frm.footer.help_area.innerHTML = '
\ -

'+wn._("Jobs Email Settings")+'
\ + cur_frm.footer.help_area.innerHTML = '

'+wn._("Jobs Email Settings")+'
\ '+wn._('Automatically extract Job Applicants from a mail box ')+'e.g. "jobs@example.com"

'; } }, diff --git a/manufacturing/doctype/bom/bom.txt b/manufacturing/doctype/bom/bom.txt index 425e9ac86f..9f69cb0a41 100644 --- a/manufacturing/doctype/bom/bom.txt +++ b/manufacturing/doctype/bom/bom.txt @@ -2,7 +2,7 @@ { "creation": "2013-01-22 15:11:38", "docstatus": 0, - "modified": "2013-08-09 14:47:25", + "modified": "2013-11-02 14:23:28", "modified_by": "Administrator", "owner": "Administrator" }, @@ -113,7 +113,6 @@ }, { "depends_on": "eval:doc.rm_cost_as_per===\"Price List\"", - "description": "Price List for Costing", "doctype": "DocField", "fieldname": "buying_price_list", "fieldtype": "Link", diff --git a/manufacturing/doctype/production_order/production_order.txt b/manufacturing/doctype/production_order/production_order.txt index 81821f6c45..85c7c83881 100644 --- a/manufacturing/doctype/production_order/production_order.txt +++ b/manufacturing/doctype/production_order/production_order.txt @@ -2,7 +2,7 @@ { "creation": "2013-01-10 16:34:16", "docstatus": 0, - "modified": "2013-10-02 14:25:03", + "modified": "2013-11-02 14:05:44", "modified_by": "Administrator", "owner": "Administrator" }, @@ -56,7 +56,7 @@ "doctype": "DocField", "fieldname": "naming_series", "fieldtype": "Select", - "label": "Document Numbering Series", + "label": "Series", "options": "\nPRO", "reqd": 1 }, diff --git a/projects/doctype/project/project.txt b/projects/doctype/project/project.txt index 33e5fde235..dc2e3068f9 100644 --- a/projects/doctype/project/project.txt +++ b/projects/doctype/project/project.txt @@ -2,7 +2,7 @@ { "creation": "2013-03-07 11:55:07", "docstatus": 0, - "modified": "2013-10-28 17:17:17", + "modified": "2013-11-02 14:39:55", "modified_by": "Administrator", "owner": "Administrator" }, @@ -276,7 +276,6 @@ "options": "icon-user" }, { - "description": "Select name of Customer to whom project belongs", "doctype": "DocField", "fieldname": "customer", "fieldtype": "Link", diff --git a/projects/doctype/time_log/time_log.txt b/projects/doctype/time_log/time_log.txt index 89ca45396e..1c8e00f4f2 100644 --- a/projects/doctype/time_log/time_log.txt +++ b/projects/doctype/time_log/time_log.txt @@ -2,7 +2,7 @@ { "creation": "2013-04-03 16:38:41", "docstatus": 0, - "modified": "2013-08-08 14:22:12", + "modified": "2013-11-02 14:05:45", "modified_by": "Administrator", "owner": "Administrator" }, @@ -46,7 +46,7 @@ "doctype": "DocField", "fieldname": "naming_series", "fieldtype": "Select", - "label": "Document Numbering Series", + "label": "Series", "options": "TL-", "permlevel": 0, "read_only": 0, diff --git a/projects/doctype/time_log_batch/time_log_batch.txt b/projects/doctype/time_log_batch/time_log_batch.txt index c12355db49..74bcc4dc8a 100644 --- a/projects/doctype/time_log_batch/time_log_batch.txt +++ b/projects/doctype/time_log_batch/time_log_batch.txt @@ -2,7 +2,7 @@ { "creation": "2013-02-28 17:57:33", "docstatus": 0, - "modified": "2013-08-08 14:22:12", + "modified": "2013-11-02 14:05:45", "modified_by": "Administrator", "owner": "Administrator" }, @@ -48,7 +48,7 @@ "doctype": "DocField", "fieldname": "naming_series", "fieldtype": "Select", - "label": "Document Numbering Series", + "label": "Series", "options": "TLB-", "reqd": 1 }, diff --git a/selling/doctype/customer/customer.txt b/selling/doctype/customer/customer.txt index 5d3a508d4e..0cd6c8e9d4 100644 --- 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": "To manage Territory, click here", "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", diff --git a/selling/doctype/installation_note/installation_note.txt b/selling/doctype/installation_note/installation_note.txt index ec42455644..b319e33dcb 100644 --- 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", diff --git a/selling/doctype/lead/lead.txt b/selling/doctype/lead/lead.txt index b700a2e146..fdd7fa5c7c 100644 --- 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": "To manage Territory, click here", "doctype": "DocField", "fieldname": "territory", "fieldtype": "Link", diff --git a/selling/doctype/opportunity/opportunity.txt b/selling/doctype/opportunity/opportunity.txt index 3c860ade84..773ea59b92 100644 --- 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": "To manage Territory, click here", "doctype": "DocField", "fieldname": "territory", "fieldtype": "Link", diff --git a/selling/doctype/quotation/quotation.txt b/selling/doctype/quotation/quotation.txt index 1620d915e9..c08449ef41 100644 --- 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", diff --git a/selling/doctype/sales_order/sales_order.txt b/selling/doctype/sales_order/sales_order.txt index bfbcd94460..efff1fce42 100644 --- 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", diff --git a/selling/doctype/selling_settings/selling_settings.txt b/selling/doctype/selling_settings/selling_settings.txt index fed3627f0f..2e8c91ff70 100644 --- 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": "Territory", "doctype": "DocField", "fieldname": "territory", "fieldtype": "Link", diff --git a/selling/sales_common.js b/selling/sales_common.js index 89b60b72db..3af6c955be 100644 --- 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 diff --git a/setup/doctype/company/company.txt b/setup/doctype/company/company.txt index eb6b9ad35f..8c3860ab2d 100644 --- a/setup/doctype/company/company.txt +++ b/setup/doctype/company/company.txt @@ -2,7 +2,7 @@ { "creation": "2013-04-10 08:35:39", "docstatus": 0, - "modified": "2013-10-08 15:18:34", + "modified": "2013-11-02 14:24:11", "modified_by": "Administrator", "owner": "Administrator" }, @@ -157,7 +157,6 @@ "width": "50%" }, { - "description": "To enable more currencies go to Setup > Currency", "doctype": "DocField", "fieldname": "default_currency", "fieldtype": "Link", diff --git a/setup/doctype/customer_group/customer_group.txt b/setup/doctype/customer_group/customer_group.txt index 4f9acc6432..abd6896f68 100644 --- a/setup/doctype/customer_group/customer_group.txt +++ b/setup/doctype/customer_group/customer_group.txt @@ -2,7 +2,7 @@ { "creation": "2013-01-10 16:34:23", "docstatus": 0, - "modified": "2013-08-05 18:12:57", + "modified": "2013-11-02 14:23:33", "modified_by": "Administrator", "owner": "Administrator" }, @@ -88,7 +88,6 @@ "fieldtype": "Column Break" }, { - "description": "This Price List will be selected as default for all Customers under this Group.", "doctype": "DocField", "fieldname": "default_price_list", "fieldtype": "Link", diff --git a/setup/page/setup_wizard/setup_wizard.css b/setup/page/setup_wizard/setup_wizard.css index ad49ef0c04..386715f9ce 100644 --- a/setup/page/setup_wizard/setup_wizard.css +++ b/setup/page/setup_wizard/setup_wizard.css @@ -1,6 +1,10 @@ #page-setup-wizard .panel { - -webkit-box-shadow: 0px 1px 8px rgba(0,0,0,0.6); - box-shadow: 0px 1px 8px rgba(0,0,0,0.6); + background-color: #fff; + position: fixed; top:0; left: 0; width:100%; height:100%; + overflow: auto; +} + +#page-setup-wizard .panel-body { } #page-setup-wizard .col-md-6 .control-input .btn { diff --git a/setup/page/setup_wizard/setup_wizard.js b/setup/page/setup_wizard/setup_wizard.js index bec2828b1e..da6ea6bfa1 100644 --- a/setup/page/setup_wizard/setup_wizard.js +++ b/setup/page/setup_wizard/setup_wizard.js @@ -192,7 +192,6 @@ wn.pages['setup-wizard'].onload = function(wrapper) { {fieldtype:"Attach", fieldname:"item_img_1", label:"Attach Image..."}, {fieldtype:"Section Break"}, {fieldtype:"Column Break"}, - {fieldtype:"Column Break"}, {fieldtype:"Select", fieldname:"item_group_1", options:["Products", "Services", "Raw Material", "Sub Assemblies"]}, {fieldtype:"Column Break"}, {fieldtype:"Select", fieldname:"item_uom_1", options:["Unit", "Nos", "Box", "Pair", "Kg", "Set", "Hour", "Minute"]}, @@ -202,7 +201,6 @@ wn.pages['setup-wizard'].onload = function(wrapper) { {fieldtype:"Attach", fieldname:"item_img_2", label:"Attach Image..."}, {fieldtype:"Section Break"}, {fieldtype:"Column Break"}, - {fieldtype:"Column Break"}, {fieldtype:"Select", fieldname:"item_group_2", options:["Products", "Services", "Raw Material", "Sub Assemblies"]}, {fieldtype:"Column Break"}, {fieldtype:"Select", fieldname:"item_uom_2", options:["Unit", "Nos", "Box", "Pair", "Kg", "Set", "Hour", "Minute"]}, @@ -212,7 +210,6 @@ wn.pages['setup-wizard'].onload = function(wrapper) { {fieldtype:"Attach", fieldname:"item_img_3", label:"Attach Image..."}, {fieldtype:"Section Break"}, {fieldtype:"Column Break"}, - {fieldtype:"Column Break"}, {fieldtype:"Select", fieldname:"item_group_3", options:["Products", "Services", "Raw Material", "Sub Assemblies"]}, {fieldtype:"Column Break"}, {fieldtype:"Select", fieldname:"item_uom_3", options:["Unit", "Nos", "Box", "Pair", "Kg", "Set", "Hour", "Minute"]}, @@ -222,7 +219,6 @@ wn.pages['setup-wizard'].onload = function(wrapper) { {fieldtype:"Attach", fieldname:"item_img_4", label:"Attach Image..."}, {fieldtype:"Section Break"}, {fieldtype:"Column Break"}, - {fieldtype:"Column Break"}, {fieldtype:"Select", fieldname:"item_group_4", options:["Products", "Services", "Raw Material", "Sub Assemblies"]}, {fieldtype:"Column Break"}, {fieldtype:"Select", fieldname:"item_uom_4", options:["Unit", "Nos", "Box", "Pair", "Kg", "Set", "Hour", "Minute"]}, @@ -232,7 +228,6 @@ wn.pages['setup-wizard'].onload = function(wrapper) { {fieldtype:"Attach", fieldname:"item_img_5", label:"Attach Image..."}, {fieldtype:"Section Break"}, {fieldtype:"Column Break"}, - {fieldtype:"Column Break"}, {fieldtype:"Select", fieldname:"item_group_5", options:["Products", "Services", "Raw Material", "Sub Assemblies"]}, {fieldtype:"Column Break"}, {fieldtype:"Select", fieldname:"item_uom_5", options:["Unit", "Nos", "Box", "Pair", "Kg", "Set", "Hour", "Minute"]}, @@ -248,7 +243,6 @@ wn.pages['setup-wizard'].onload = function(wrapper) { {fieldtype:"Data", fieldname:"item_buy_1", label:"Item 1", placeholder:"A Product or Service"}, {fieldtype:"Section Break"}, {fieldtype:"Column Break"}, - {fieldtype:"Column Break"}, {fieldtype:"Select", fieldname:"item_buy_group_1", options:["Raw Material", "Consumable", "Sub Assemblies", "Services", "Products"]}, {fieldtype:"Column Break"}, {fieldtype:"Select", fieldname:"item_buy_uom_1", options:["Unit", "Nos", "Box", "Pair", "Kg", "Set", "Hour", "Minute"]}, @@ -256,7 +250,6 @@ wn.pages['setup-wizard'].onload = function(wrapper) { {fieldtype:"Data", fieldname:"item_buy_2", label:"Item 2", placeholder:"A Product or Service"}, {fieldtype:"Section Break"}, {fieldtype:"Column Break"}, - {fieldtype:"Column Break"}, {fieldtype:"Select", fieldname:"item_buy_group_2", options:["Raw Material", "Consumable", "Sub Assemblies", "Services", "Products"]}, {fieldtype:"Column Break"}, {fieldtype:"Select", fieldname:"item_buy_uom_2", options:["Unit", "Nos", "Box", "Pair", "Kg", "Set", "Hour", "Minute"]}, @@ -264,7 +257,6 @@ wn.pages['setup-wizard'].onload = function(wrapper) { {fieldtype:"Data", fieldname:"item_buy_3", label:"Item 3", placeholder:"A Product or Service"}, {fieldtype:"Section Break"}, {fieldtype:"Column Break"}, - {fieldtype:"Column Break"}, {fieldtype:"Select", fieldname:"item_buy_group_3", options:["Raw Material", "Consumable", "Sub Assemblies", "Services", "Products"]}, {fieldtype:"Column Break"}, {fieldtype:"Select", fieldname:"item_buy_uom_3", options:["Unit", "Nos", "Box", "Pair", "Kg", "Set", "Hour", "Minute"]}, @@ -272,7 +264,6 @@ wn.pages['setup-wizard'].onload = function(wrapper) { {fieldtype:"Data", fieldname:"item_buy_4", label:"Item 4", placeholder:"A Product or Service"}, {fieldtype:"Section Break"}, {fieldtype:"Column Break"}, - {fieldtype:"Column Break"}, {fieldtype:"Select", fieldname:"item_buy_group_4", options:["Raw Material", "Consumable", "Sub Assemblies", "Services", "Products"]}, {fieldtype:"Column Break"}, {fieldtype:"Select", fieldname:"item_buy_uom_4", options:["Unit", "Nos", "Box", "Pair", "Kg", "Set", "Hour", "Minute"]}, @@ -280,7 +271,6 @@ wn.pages['setup-wizard'].onload = function(wrapper) { {fieldtype:"Data", fieldname:"item_buy_5", label:"Item 5", placeholder:"A Product or Service"}, {fieldtype:"Section Break"}, {fieldtype:"Column Break"}, - {fieldtype:"Column Break"}, {fieldtype:"Select", fieldname:"item_buy_group_5", options:["Raw Material", "Consumable", "Sub Assemblies", "Services", "Products"]}, {fieldtype:"Column Break"}, {fieldtype:"Select", fieldname:"item_buy_uom_5", options:["Unit", "Nos", "Box", "Pair", "Kg", "Set", "Hour", "Minute"]}, @@ -363,7 +353,7 @@ wn.wiz.Wizard = Class.extend({ this.show_welcome(); }, get_message: function(html) { - return $(repl('
\ + return $(repl('
\
%(html)s
\
', {html:html})) }, @@ -431,16 +421,17 @@ wn.wiz.WizardSlide = Class.extend({ }, make: function() { var me = this; - this.$wrapper = $(repl('
\ + this.$wrapper = $(repl('
\
%(main_title)s: Step %(step)s
\
\
\
\
\ +
\
\ -
\ -
\ -

%(title)s


\ +
\ +
\ +

%(title)s


\

%(help)s

\
\
\ diff --git a/stock/doctype/delivery_note/delivery_note.txt b/stock/doctype/delivery_note/delivery_note.txt index 037b4fb83e..7f2e181504 100644 --- a/stock/doctype/delivery_note/delivery_note.txt +++ b/stock/doctype/delivery_note/delivery_note.txt @@ -2,7 +2,7 @@ { "creation": "2013-05-24 19:29:09", "docstatus": 0, - "modified": "2013-10-11 13:19:40", + "modified": "2013-11-02 14:36:48", "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", @@ -119,7 +118,7 @@ "doctype": "DocField", "fieldname": "shipping_address_name", "fieldtype": "Link", - "label": "Shipping Address Name", + "label": "Shipping Address", "options": "Address", "print_hide": 1 }, @@ -250,7 +249,6 @@ "read_only": 0 }, { - "description": "Customer's Currency", "doctype": "DocField", "fieldname": "currency", "fieldtype": "Link", @@ -267,7 +265,7 @@ "doctype": "DocField", "fieldname": "conversion_rate", "fieldtype": "Float", - "label": "Conversion Rate", + "label": "Exchange Rate", "no_copy": 0, "oldfieldname": "conversion_rate", "oldfieldtype": "Currency", @@ -282,7 +280,6 @@ "read_only": 0 }, { - "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", @@ -295,7 +292,6 @@ "reqd": 1 }, { - "description": "Select the currency in which price list is maintained", "doctype": "DocField", "fieldname": "price_list_currency", "fieldtype": "Link", @@ -310,7 +306,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 @@ -414,7 +410,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", @@ -430,7 +426,7 @@ "doctype": "DocField", "fieldname": "shipping_rule", "fieldtype": "Link", - "label": "Apply Shipping Rule", + "label": "Shipping Rule", "oldfieldtype": "Button", "options": "Shipping Rule", "print_hide": 1, @@ -608,7 +604,7 @@ "doctype": "DocField", "fieldname": "tc_name", "fieldtype": "Link", - "label": "Select Terms and Conditions", + "label": "Terms", "oldfieldname": "tc_name", "oldfieldtype": "Link", "options": "Terms and Conditions", @@ -842,7 +838,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", diff --git a/stock/doctype/item/item.txt b/stock/doctype/item/item.txt index c70b9911db..d6541fc4b1 100644 --- a/stock/doctype/item/item.txt +++ b/stock/doctype/item/item.txt @@ -2,7 +2,7 @@ { "creation": "2013-05-03 10:45:46", "docstatus": 0, - "modified": "2013-09-11 11:50:10", + "modified": "2013-11-02 14:05:57", "modified_by": "Administrator", "owner": "Administrator" }, @@ -57,7 +57,7 @@ "doctype": "DocField", "fieldname": "naming_series", "fieldtype": "Select", - "label": "Document Numbering Series", + "label": "Series", "options": "\nITEM", "read_only": 0 }, diff --git a/stock/doctype/material_request/material_request.txt b/stock/doctype/material_request/material_request.txt index 5fd576aab6..29aaeeacc2 100644 --- a/stock/doctype/material_request/material_request.txt +++ b/stock/doctype/material_request/material_request.txt @@ -2,7 +2,7 @@ { "creation": "2013-03-07 14:48:38", "docstatus": 0, - "modified": "2013-10-02 14:24:42", + "modified": "2013-11-02 14:28:03", "modified_by": "Administrator", "owner": "Administrator" }, @@ -68,11 +68,10 @@ "fieldtype": "Column Break" }, { - "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", @@ -264,7 +263,7 @@ "doctype": "DocField", "fieldname": "tc_name", "fieldtype": "Link", - "label": "Select Terms and Conditions", + "label": "Terms", "oldfieldname": "tc_name", "oldfieldtype": "Link", "options": "Terms and Conditions", @@ -284,7 +283,7 @@ "doctype": "DocField", "fieldname": "select_print_heading", "fieldtype": "Link", - "label": "Select Print Heading", + "label": "Print Heading", "options": "Print Heading", "print_hide": 1 }, diff --git a/stock/doctype/packing_slip/packing_slip.txt b/stock/doctype/packing_slip/packing_slip.txt index 08e71ec067..c86e90faa3 100644 --- a/stock/doctype/packing_slip/packing_slip.txt +++ b/stock/doctype/packing_slip/packing_slip.txt @@ -2,7 +2,7 @@ { "creation": "2013-04-11 15:32:24", "docstatus": 0, - "modified": "2013-08-08 14:22:28", + "modified": "2013-11-02 14:05:59", "modified_by": "Administrator", "owner": "Administrator" }, @@ -78,7 +78,7 @@ "doctype": "DocField", "fieldname": "naming_series", "fieldtype": "Select", - "label": "Document Numbering Series", + "label": "Series", "no_copy": 0, "options": "PS", "print_hide": 1, diff --git a/stock/doctype/purchase_receipt/purchase_receipt.txt b/stock/doctype/purchase_receipt/purchase_receipt.txt index f228a147c3..10a504c7f4 100755 --- a/stock/doctype/purchase_receipt/purchase_receipt.txt +++ b/stock/doctype/purchase_receipt/purchase_receipt.txt @@ -2,7 +2,7 @@ { "creation": "2013-05-21 16:16:39", "docstatus": 0, - "modified": "2013-10-11 13:20:13", + "modified": "2013-11-02 14:28:03", "modified_by": "Administrator", "owner": "Administrator" }, @@ -56,11 +56,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", @@ -203,7 +202,6 @@ "options": "icon-tag" }, { - "description": "Supplier's currency", "doctype": "DocField", "fieldname": "currency", "fieldtype": "Link", @@ -234,7 +232,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", @@ -501,7 +498,7 @@ "doctype": "DocField", "fieldname": "tc_name", "fieldtype": "Link", - "label": "Select Terms and Conditions", + "label": "Terms", "oldfieldname": "tc_name", "oldfieldtype": "Link", "options": "Terms and Conditions", @@ -632,7 +629,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", diff --git a/stock/doctype/stock_entry/stock_entry.txt b/stock/doctype/stock_entry/stock_entry.txt index 204ebfa4d4..7ef13bfe26 100644 --- a/stock/doctype/stock_entry/stock_entry.txt +++ b/stock/doctype/stock_entry/stock_entry.txt @@ -2,7 +2,7 @@ { "creation": "2013-04-09 11:43:55", "docstatus": 0, - "modified": "2013-08-24 15:16:34", + "modified": "2013-11-02 14:28:05", "modified_by": "Administrator", "owner": "Administrator" }, @@ -66,13 +66,12 @@ }, { "allow_on_submit": 0, - "description": "To manage multiple series please go to Setup > Manage Series", "doctype": "DocField", "fieldname": "naming_series", "fieldtype": "Select", "hidden": 0, "in_filter": 0, - "label": "Document Numbering Series", + "label": "Series", "no_copy": 1, "oldfieldname": "naming_series", "oldfieldtype": "Select", @@ -535,7 +534,7 @@ "fieldtype": "Link", "hidden": 0, "in_filter": 0, - "label": "Select Print Heading", + "label": "Print Heading", "no_copy": 0, "oldfieldname": "select_print_heading", "oldfieldtype": "Link", diff --git a/support/doctype/customer_issue/customer_issue.txt b/support/doctype/customer_issue/customer_issue.txt index faff298eff..9f27b7b133 100644 --- a/support/doctype/customer_issue/customer_issue.txt +++ b/support/doctype/customer_issue/customer_issue.txt @@ -2,7 +2,7 @@ { "creation": "2013-01-10 16:34:30", "docstatus": 0, - "modified": "2013-08-08 14:22:33", + "modified": "2013-11-02 14:06:02", "modified_by": "Administrator", "owner": "harshada@webnotestech.com" }, @@ -55,7 +55,7 @@ "fieldname": "naming_series", "fieldtype": "Select", "in_filter": 0, - "label": "Document Numbering Series", + "label": "Series", "no_copy": 1, "oldfieldname": "naming_series", "oldfieldtype": "Select", diff --git a/support/doctype/newsletter/newsletter.txt b/support/doctype/newsletter/newsletter.txt index 45f075e3ba..123eeedeff 100644 --- a/support/doctype/newsletter/newsletter.txt +++ b/support/doctype/newsletter/newsletter.txt @@ -2,7 +2,7 @@ { "creation": "2013-01-10 16:34:31", "docstatus": 0, - "modified": "2013-08-08 14:22:34", + "modified": "2013-11-02 14:06:04", "modified_by": "Administrator", "owner": "Administrator" }, @@ -53,7 +53,7 @@ "doctype": "DocField", "fieldname": "naming_series", "fieldtype": "Select", - "label": "Document Numbering Series", + "label": "Series", "options": "NL-", "reqd": 1 }, diff --git a/support/doctype/support_ticket/support_ticket.css b/support/doctype/support_ticket/support_ticket.css deleted file mode 100644 index dbfff3c65c..0000000000 --- a/support/doctype/support_ticket/support_ticket.css +++ /dev/null @@ -1,15 +0,0 @@ - -.comm-content { - border-top: 1px solid #ddd; - padding: 10px; - display: none; -} - -.support-ticket-wrapper { - margin-top: 10px; -} - -.support-ticket-title { - padding: 5px; - border-bottom: 1px solid black; -} diff --git a/support/doctype/support_ticket/support_ticket.js b/support/doctype/support_ticket/support_ticket.js index bcd36581f3..e7776243f7 100644 --- a/support/doctype/support_ticket/support_ticket.js +++ b/support/doctype/support_ticket/support_ticket.js @@ -52,6 +52,7 @@ $.extend(cur_frm.cscript, { comm_list.push({ "sender": doc.raised_by, "creation": doc.creation, + "subject": doc.subject, "content": doc.description}); } diff --git a/support/doctype/support_ticket/support_ticket.txt b/support/doctype/support_ticket/support_ticket.txt index 76d9dcfb1e..684c809a90 100644 --- a/support/doctype/support_ticket/support_ticket.txt +++ b/support/doctype/support_ticket/support_ticket.txt @@ -2,7 +2,7 @@ { "creation": "2013-02-01 10:36:25", "docstatus": 0, - "modified": "2013-10-03 16:45:41", + "modified": "2013-11-02 14:06:26", "modified_by": "Administrator", "owner": "Administrator" }, @@ -53,29 +53,13 @@ "fieldname": "naming_series", "fieldtype": "Select", "hidden": 0, - "label": "Document Numbering Series", + "label": "Series", "no_copy": 1, "options": "SUP", "print_hide": 1, "reqd": 0, "search_index": 0 }, - { - "default": "Open", - "doctype": "DocField", - "fieldname": "status", - "fieldtype": "Select", - "in_filter": 0, - "in_list_view": 1, - "label": "Status", - "no_copy": 1, - "oldfieldname": "status", - "oldfieldtype": "Select", - "options": "Open\nReplied\nHold\nClosed", - "read_only": 0, - "reqd": 0, - "search_index": 1 - }, { "doctype": "DocField", "fieldname": "subject", @@ -92,6 +76,22 @@ "fieldname": "cb00", "fieldtype": "Column Break" }, + { + "default": "Open", + "doctype": "DocField", + "fieldname": "status", + "fieldtype": "Select", + "in_filter": 0, + "in_list_view": 1, + "label": "Status", + "no_copy": 1, + "oldfieldname": "status", + "oldfieldtype": "Select", + "options": "Open\nReplied\nHold\nClosed", + "read_only": 0, + "reqd": 0, + "search_index": 1 + }, { "depends_on": "eval:doc.__islocal", "doctype": "DocField",