diff --git a/erpnext/accounts/doctype/pos_setting/pos_setting.js b/erpnext/accounts/doctype/pos_setting/pos_setting.js
index 8c5f254a521..a1ebb596024 100755
--- a/erpnext/accounts/doctype/pos_setting/pos_setting.js
+++ b/erpnext/accounts/doctype/pos_setting/pos_setting.js
@@ -74,5 +74,5 @@ cur_frm.fields_dict['select_print_heading'].get_query = function(doc, cdt, cdn)
cur_frm.fields_dict.user.get_query = function(doc,cdt,cdn) {
- return{ query:"core.doctype.profile.profile.profile_query"}
+ return{ query:"webnotes.core.doctype.profile.profile.profile_query"}
}
diff --git a/erpnext/accounts/doctype/sales_invoice_advance/sales_invoice_advance.txt b/erpnext/accounts/doctype/sales_invoice_advance/sales_invoice_advance.txt
index ad1a9eb8fb7..9ae37cfab39 100644
--- a/erpnext/accounts/doctype/sales_invoice_advance/sales_invoice_advance.txt
+++ b/erpnext/accounts/doctype/sales_invoice_advance/sales_invoice_advance.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-02-22 01:27:41",
"docstatus": 0,
- "modified": "2013-12-20 19:21:40",
+ "modified": "2013-12-31 18:29:19",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -15,7 +15,6 @@
{
"doctype": "DocField",
"name": "__common__",
- "no_copy": 1,
"parent": "Sales Invoice Advance",
"parentfield": "fields",
"parenttype": "DocType",
@@ -31,6 +30,7 @@
"fieldtype": "Link",
"in_list_view": 1,
"label": "Journal Voucher",
+ "no_copy": 1,
"oldfieldname": "journal_voucher",
"oldfieldtype": "Link",
"options": "Journal Voucher",
@@ -38,26 +38,13 @@
"read_only": 1,
"width": "250px"
},
- {
- "doctype": "DocField",
- "fieldname": "jv_detail_no",
- "fieldtype": "Data",
- "hidden": 1,
- "in_list_view": 0,
- "label": "Journal Voucher Detail No",
- "oldfieldname": "jv_detail_no",
- "oldfieldtype": "Data",
- "print_hide": 1,
- "print_width": "120px",
- "read_only": 1,
- "width": "120px"
- },
{
"doctype": "DocField",
"fieldname": "advance_amount",
"fieldtype": "Currency",
"in_list_view": 1,
"label": "Advance amount",
+ "no_copy": 1,
"oldfieldname": "advance_amount",
"oldfieldtype": "Currency",
"options": "Company:company:default_currency",
@@ -71,22 +58,44 @@
"fieldtype": "Currency",
"in_list_view": 1,
"label": "Allocated amount",
+ "no_copy": 1,
"oldfieldname": "allocated_amount",
"oldfieldtype": "Currency",
"options": "Company:company:default_currency",
"print_width": "120px",
"width": "120px"
},
+ {
+ "doctype": "DocField",
+ "fieldname": "col_break1",
+ "fieldtype": "Column Break"
+ },
{
"doctype": "DocField",
"fieldname": "remarks",
"fieldtype": "Small Text",
"in_list_view": 1,
"label": "Remarks",
+ "no_copy": 1,
"oldfieldname": "remarks",
"oldfieldtype": "Small Text",
"print_width": "150px",
"read_only": 1,
"width": "150px"
+ },
+ {
+ "doctype": "DocField",
+ "fieldname": "jv_detail_no",
+ "fieldtype": "Data",
+ "hidden": 1,
+ "in_list_view": 0,
+ "label": "Journal Voucher Detail No",
+ "no_copy": 1,
+ "oldfieldname": "jv_detail_no",
+ "oldfieldtype": "Data",
+ "print_hide": 1,
+ "print_width": "120px",
+ "read_only": 1,
+ "width": "120px"
}
]
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.txt b/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.txt
index 339115d25e7..4d7ae0ca825 100644
--- a/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.txt
+++ b/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-06-04 11:02:19",
"docstatus": 0,
- "modified": "2013-12-20 19:21:40",
+ "modified": "2013-12-31 18:27:41",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -49,16 +49,6 @@
"reqd": 0,
"search_index": 1
},
- {
- "doctype": "DocField",
- "fieldname": "customer_item_code",
- "fieldtype": "Data",
- "hidden": 1,
- "in_list_view": 0,
- "label": "Customer's Item Code",
- "print_hide": 1,
- "read_only": 1
- },
{
"doctype": "DocField",
"fieldname": "item_name",
@@ -73,6 +63,21 @@
"reqd": 1,
"search_index": 0
},
+ {
+ "doctype": "DocField",
+ "fieldname": "col_break1",
+ "fieldtype": "Column Break"
+ },
+ {
+ "doctype": "DocField",
+ "fieldname": "customer_item_code",
+ "fieldtype": "Data",
+ "hidden": 1,
+ "in_list_view": 0,
+ "label": "Customer's Item Code",
+ "print_hide": 1,
+ "read_only": 1
+ },
{
"doctype": "DocField",
"fieldname": "description",
@@ -104,15 +109,6 @@
"read_only": 0,
"reqd": 0
},
- {
- "doctype": "DocField",
- "fieldname": "stock_uom",
- "fieldtype": "Link",
- "in_list_view": 0,
- "label": "UOM",
- "options": "UOM",
- "read_only": 1
- },
{
"doctype": "DocField",
"fieldname": "ref_rate",
@@ -137,6 +133,37 @@
"print_hide": 1,
"read_only": 0
},
+ {
+ "doctype": "DocField",
+ "fieldname": "col_break2",
+ "fieldtype": "Column Break"
+ },
+ {
+ "doctype": "DocField",
+ "fieldname": "stock_uom",
+ "fieldtype": "Link",
+ "in_list_view": 0,
+ "label": "UOM",
+ "options": "UOM",
+ "read_only": 1
+ },
+ {
+ "doctype": "DocField",
+ "fieldname": "base_ref_rate",
+ "fieldtype": "Currency",
+ "in_list_view": 0,
+ "label": "Price List Rate (Company Currency)",
+ "oldfieldname": "base_ref_rate",
+ "oldfieldtype": "Currency",
+ "options": "Company:company:default_currency",
+ "print_hide": 1,
+ "read_only": 1
+ },
+ {
+ "doctype": "DocField",
+ "fieldname": "section_break1",
+ "fieldtype": "Section Break"
+ },
{
"doctype": "DocField",
"fieldname": "export_rate",
@@ -163,15 +190,8 @@
},
{
"doctype": "DocField",
- "fieldname": "base_ref_rate",
- "fieldtype": "Currency",
- "in_list_view": 0,
- "label": "Price List Rate (Company Currency)",
- "oldfieldname": "base_ref_rate",
- "oldfieldtype": "Currency",
- "options": "Company:company:default_currency",
- "print_hide": 1,
- "read_only": 1
+ "fieldname": "col_break3",
+ "fieldtype": "Column Break"
},
{
"doctype": "DocField",
@@ -237,6 +257,11 @@
"read_only": 0,
"width": "120px"
},
+ {
+ "doctype": "DocField",
+ "fieldname": "col_break4",
+ "fieldtype": "Column Break"
+ },
{
"default": ":Company",
"doctype": "DocField",
@@ -322,6 +347,22 @@
"print_hide": 1,
"read_only": 0
},
+ {
+ "doctype": "DocField",
+ "fieldname": "item_tax_rate",
+ "fieldtype": "Small Text",
+ "hidden": 1,
+ "label": "Item Tax Rate",
+ "oldfieldname": "item_tax_rate",
+ "oldfieldtype": "Small Text",
+ "print_hide": 1,
+ "read_only": 1
+ },
+ {
+ "doctype": "DocField",
+ "fieldname": "col_break5",
+ "fieldtype": "Column Break"
+ },
{
"doctype": "DocField",
"fieldname": "actual_qty",
@@ -334,13 +375,11 @@
},
{
"doctype": "DocField",
- "fieldname": "delivered_qty",
- "fieldtype": "Float",
- "label": "Delivered Qty",
- "oldfieldname": "delivered_qty",
- "oldfieldtype": "Currency",
- "print_hide": 1,
- "read_only": 1
+ "fieldname": "time_log_batch",
+ "fieldtype": "Link",
+ "label": "Time Log Batch",
+ "options": "Time Log Batch",
+ "read_only": 0
},
{
"doctype": "DocField",
@@ -400,20 +439,11 @@
},
{
"doctype": "DocField",
- "fieldname": "time_log_batch",
- "fieldtype": "Link",
- "label": "Time Log Batch",
- "options": "Time Log Batch",
- "read_only": 0
- },
- {
- "doctype": "DocField",
- "fieldname": "item_tax_rate",
- "fieldtype": "Small Text",
- "hidden": 1,
- "label": "Item Tax Rate",
- "oldfieldname": "item_tax_rate",
- "oldfieldtype": "Small Text",
+ "fieldname": "delivered_qty",
+ "fieldtype": "Float",
+ "label": "Delivered Qty",
+ "oldfieldname": "delivered_qty",
+ "oldfieldtype": "Currency",
"print_hide": 1,
"read_only": 1
},
diff --git a/erpnext/accounts/doctype/sales_taxes_and_charges/sales_taxes_and_charges.txt b/erpnext/accounts/doctype/sales_taxes_and_charges/sales_taxes_and_charges.txt
index ab4da2aa4fe..49df5f7291c 100644
--- a/erpnext/accounts/doctype/sales_taxes_and_charges/sales_taxes_and_charges.txt
+++ b/erpnext/accounts/doctype/sales_taxes_and_charges/sales_taxes_and_charges.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-04-24 11:39:32",
"docstatus": 0,
- "modified": "2013-12-20 19:21:45",
+ "modified": "2013-12-31 17:51:47",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -46,6 +46,24 @@
"oldfieldname": "row_id",
"oldfieldtype": "Data"
},
+ {
+ "doctype": "DocField",
+ "fieldname": "description",
+ "fieldtype": "Small Text",
+ "in_list_view": 1,
+ "label": "Description",
+ "oldfieldname": "description",
+ "oldfieldtype": "Small Text",
+ "print_width": "300px",
+ "reqd": 1,
+ "width": "300px"
+ },
+ {
+ "doctype": "DocField",
+ "fieldname": "col_break_1",
+ "fieldtype": "Column Break",
+ "width": "50%"
+ },
{
"doctype": "DocField",
"fieldname": "account_head",
@@ -69,36 +87,6 @@
"oldfieldtype": "Link",
"options": "Cost Center"
},
- {
- "doctype": "DocField",
- "fieldname": "description",
- "fieldtype": "Small Text",
- "in_list_view": 1,
- "label": "Description",
- "oldfieldname": "description",
- "oldfieldtype": "Small Text",
- "print_width": "300px",
- "reqd": 1,
- "width": "300px"
- },
- {
- "allow_on_submit": 0,
- "description": "If checked, the tax amount will be considered as already included in the Print Rate / Print Amount",
- "doctype": "DocField",
- "fieldname": "included_in_print_rate",
- "fieldtype": "Check",
- "label": "Is this Tax included in Basic Rate?",
- "no_copy": 0,
- "print_hide": 1,
- "print_width": "150px",
- "report_hide": 1,
- "width": "150px"
- },
- {
- "doctype": "DocField",
- "fieldname": "section_break_6",
- "fieldtype": "Section Break"
- },
{
"doctype": "DocField",
"fieldname": "rate",
@@ -131,6 +119,19 @@
"options": "Company:company:default_currency",
"read_only": 1
},
+ {
+ "allow_on_submit": 0,
+ "description": "If checked, the tax amount will be considered as already included in the Print Rate / Print Amount",
+ "doctype": "DocField",
+ "fieldname": "included_in_print_rate",
+ "fieldtype": "Check",
+ "label": "Is this Tax included in Basic Rate?",
+ "no_copy": 0,
+ "print_hide": 1,
+ "print_width": "150px",
+ "report_hide": 1,
+ "width": "150px"
+ },
{
"doctype": "DocField",
"fieldname": "item_wise_tax_detail",
diff --git a/erpnext/hr/doctype/employee/employee.js b/erpnext/hr/doctype/employee/employee.js
index 1df6175fae8..23d50670fbb 100644
--- a/erpnext/hr/doctype/employee/employee.js
+++ b/erpnext/hr/doctype/employee/employee.js
@@ -5,7 +5,7 @@ wn.provide("erpnext.hr");
erpnext.hr.EmployeeController = wn.ui.form.Controller.extend({
setup: function() {
this.frm.fields_dict.user_id.get_query = function(doc,cdt,cdn) {
- return { query:"core.doctype.profile.profile.profile_query"} }
+ return { query:"webnotes.core.doctype.profile.profile.profile_query"} }
this.frm.fields_dict.reports_to.get_query = function(doc,cdt,cdn) {
return{ query: "erpnext.controllers.queries.employee_query"} }
},
diff --git a/erpnext/public/js/queries.js b/erpnext/public/js/queries.js
index 621e340ff7c..dbaa27d2de9 100644
--- a/erpnext/public/js/queries.js
+++ b/erpnext/public/js/queries.js
@@ -5,7 +5,7 @@
wn.provide("erpnext.queries");
$.extend(erpnext.queries, {
profile: function() {
- return { query: "core.doctype.profile.profile.profile_query" };
+ return { query: "webnotes.core.doctype.profile.profile.profile_query" };
},
lead: function() {
diff --git a/erpnext/selling/doctype/lead/lead.js b/erpnext/selling/doctype/lead/lead.js
index 4ab1067089e..41f679e34a0 100644
--- a/erpnext/selling/doctype/lead/lead.js
+++ b/erpnext/selling/doctype/lead/lead.js
@@ -14,12 +14,12 @@ erpnext.LeadController = wn.ui.form.Controller.extend({
onload: function() {
if(cur_frm.fields_dict.lead_owner.df.options.match(/^Profile/)) {
cur_frm.fields_dict.lead_owner.get_query = function(doc,cdt,cdn) {
- return { query:"core.doctype.profile.profile.profile_query" } }
+ return { query:"webnotes.core.doctype.profile.profile.profile_query" } }
}
if(cur_frm.fields_dict.contact_by.df.options.match(/^Profile/)) {
cur_frm.fields_dict.contact_by.get_query = function(doc,cdt,cdn) {
- return { query:"core.doctype.profile.profile.profile_query" } }
+ return { query:"webnotes.core.doctype.profile.profile.profile_query" } }
}
if(in_list(user_roles,'System Manager')) {
diff --git a/erpnext/selling/doctype/quotation_item/quotation_item.txt b/erpnext/selling/doctype/quotation_item/quotation_item.txt
index e669937d09a..531f005bd54 100644
--- a/erpnext/selling/doctype/quotation_item/quotation_item.txt
+++ b/erpnext/selling/doctype/quotation_item/quotation_item.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-03-07 11:42:57",
"docstatus": 0,
- "modified": "2013-12-20 19:23:41",
+ "modified": "2013-12-31 18:12:09",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -69,6 +69,11 @@
"search_index": 1,
"width": "150px"
},
+ {
+ "doctype": "DocField",
+ "fieldname": "col_break1",
+ "fieldtype": "Column Break"
+ },
{
"doctype": "DocField",
"fieldname": "description",
@@ -106,21 +111,6 @@
"search_index": 0,
"width": "100px"
},
- {
- "doctype": "DocField",
- "fieldname": "stock_uom",
- "fieldtype": "Link",
- "in_list_view": 0,
- "label": "UOM",
- "oldfieldname": "stock_uom",
- "oldfieldtype": "Data",
- "options": "UOM",
- "print_hide": 0,
- "print_width": "100px",
- "read_only": 1,
- "reqd": 0,
- "width": "100px"
- },
{
"doctype": "DocField",
"fieldname": "ref_rate",
@@ -149,6 +139,45 @@
"read_only": 0,
"width": "100px"
},
+ {
+ "doctype": "DocField",
+ "fieldname": "col_break2",
+ "fieldtype": "Column Break"
+ },
+ {
+ "doctype": "DocField",
+ "fieldname": "stock_uom",
+ "fieldtype": "Link",
+ "in_list_view": 0,
+ "label": "UOM",
+ "oldfieldname": "stock_uom",
+ "oldfieldtype": "Data",
+ "options": "UOM",
+ "print_hide": 0,
+ "print_width": "100px",
+ "read_only": 1,
+ "reqd": 0,
+ "width": "100px"
+ },
+ {
+ "doctype": "DocField",
+ "fieldname": "base_ref_rate",
+ "fieldtype": "Currency",
+ "in_list_view": 0,
+ "label": "Price List Rate (Company Currency)",
+ "oldfieldname": "base_ref_rate",
+ "oldfieldtype": "Currency",
+ "options": "Company:company:default_currency",
+ "print_hide": 1,
+ "print_width": "100px",
+ "read_only": 1,
+ "width": "100px"
+ },
+ {
+ "doctype": "DocField",
+ "fieldname": "Section_break1",
+ "fieldtype": "Section Break"
+ },
{
"doctype": "DocField",
"fieldname": "export_rate",
@@ -185,17 +214,8 @@
},
{
"doctype": "DocField",
- "fieldname": "base_ref_rate",
- "fieldtype": "Currency",
- "in_list_view": 0,
- "label": "Price List Rate (Company Currency)",
- "oldfieldname": "base_ref_rate",
- "oldfieldtype": "Currency",
- "options": "Company:company:default_currency",
- "print_hide": 1,
- "print_width": "100px",
- "read_only": 1,
- "width": "100px"
+ "fieldname": "col_break3",
+ "fieldtype": "Column Break"
},
{
"doctype": "DocField",
@@ -238,6 +258,70 @@
"in_list_view": 0,
"label": "Reference"
},
+ {
+ "doctype": "DocField",
+ "fieldname": "prevdoc_doctype",
+ "fieldtype": "Data",
+ "hidden": 1,
+ "in_list_view": 0,
+ "label": "Against Doctype",
+ "no_copy": 1,
+ "oldfieldname": "prevdoc_doctype",
+ "oldfieldtype": "Data",
+ "print_hide": 1,
+ "print_width": "150px",
+ "read_only": 1,
+ "report_hide": 0,
+ "width": "150px"
+ },
+ {
+ "doctype": "DocField",
+ "fieldname": "prevdoc_docname",
+ "fieldtype": "Data",
+ "in_list_view": 0,
+ "label": "Against Docname",
+ "no_copy": 1,
+ "oldfieldname": "prevdoc_docname",
+ "oldfieldtype": "Data",
+ "print_hide": 1,
+ "print_width": "150px",
+ "read_only": 1,
+ "report_hide": 0,
+ "width": "150px"
+ },
+ {
+ "doctype": "DocField",
+ "fieldname": "item_tax_rate",
+ "fieldtype": "Small Text",
+ "hidden": 1,
+ "in_list_view": 0,
+ "label": "Item Tax Rate",
+ "oldfieldname": "item_tax_rate",
+ "oldfieldtype": "Small Text",
+ "print_hide": 1,
+ "read_only": 1,
+ "report_hide": 1
+ },
+ {
+ "doctype": "DocField",
+ "fieldname": "col_break4",
+ "fieldtype": "Column Break"
+ },
+ {
+ "allow_on_submit": 1,
+ "doctype": "DocField",
+ "fieldname": "page_break",
+ "fieldtype": "Check",
+ "hidden": 0,
+ "in_list_view": 0,
+ "label": "Page Break",
+ "no_copy": 1,
+ "oldfieldname": "page_break",
+ "oldfieldtype": "Check",
+ "print_hide": 1,
+ "read_only": 0,
+ "report_hide": 1
+ },
{
"description": "Add / Edit",
"doctype": "DocField",
@@ -270,64 +354,5 @@
"read_only": 1,
"search_index": 1,
"width": "150px"
- },
- {
- "doctype": "DocField",
- "fieldname": "item_tax_rate",
- "fieldtype": "Small Text",
- "hidden": 1,
- "in_list_view": 0,
- "label": "Item Tax Rate",
- "oldfieldname": "item_tax_rate",
- "oldfieldtype": "Small Text",
- "print_hide": 1,
- "read_only": 1,
- "report_hide": 1
- },
- {
- "doctype": "DocField",
- "fieldname": "prevdoc_docname",
- "fieldtype": "Data",
- "in_list_view": 0,
- "label": "Against Docname",
- "no_copy": 1,
- "oldfieldname": "prevdoc_docname",
- "oldfieldtype": "Data",
- "print_hide": 1,
- "print_width": "150px",
- "read_only": 1,
- "report_hide": 0,
- "width": "150px"
- },
- {
- "doctype": "DocField",
- "fieldname": "prevdoc_doctype",
- "fieldtype": "Data",
- "hidden": 1,
- "in_list_view": 0,
- "label": "Against Doctype",
- "no_copy": 1,
- "oldfieldname": "prevdoc_doctype",
- "oldfieldtype": "Data",
- "print_hide": 1,
- "print_width": "150px",
- "read_only": 1,
- "report_hide": 0,
- "width": "150px"
- },
- {
- "allow_on_submit": 1,
- "doctype": "DocField",
- "fieldname": "page_break",
- "fieldtype": "Check",
- "hidden": 0,
- "in_list_view": 0,
- "label": "Page Break",
- "no_copy": 1,
- "oldfieldname": "page_break",
- "oldfieldtype": "Check",
- "print_hide": 1,
- "read_only": 0,
- "report_hide": 1
}
]
\ No newline at end of file
diff --git a/erpnext/selling/doctype/sales_order_item/sales_order_item.txt b/erpnext/selling/doctype/sales_order_item/sales_order_item.txt
index eb656a600a2..38fb01cc270 100644
--- a/erpnext/selling/doctype/sales_order_item/sales_order_item.txt
+++ b/erpnext/selling/doctype/sales_order_item/sales_order_item.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-03-07 11:42:58",
"docstatus": 0,
- "modified": "2013-12-20 19:21:43",
+ "modified": "2013-12-31 18:07:50",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -65,6 +65,11 @@
"reqd": 1,
"width": "150"
},
+ {
+ "doctype": "DocField",
+ "fieldname": "col_break1",
+ "fieldtype": "Column Break"
+ },
{
"doctype": "DocField",
"fieldname": "description",
@@ -100,21 +105,6 @@
"reqd": 1,
"width": "100px"
},
- {
- "doctype": "DocField",
- "fieldname": "stock_uom",
- "fieldtype": "Link",
- "hidden": 0,
- "in_list_view": 0,
- "label": "UOM",
- "oldfieldname": "stock_uom",
- "oldfieldtype": "Data",
- "options": "UOM",
- "print_width": "70px",
- "read_only": 1,
- "reqd": 0,
- "width": "70px"
- },
{
"doctype": "DocField",
"fieldname": "ref_rate",
@@ -143,6 +133,45 @@
"read_only": 0,
"width": "70px"
},
+ {
+ "doctype": "DocField",
+ "fieldname": "col_break2",
+ "fieldtype": "Column Break"
+ },
+ {
+ "doctype": "DocField",
+ "fieldname": "stock_uom",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "in_list_view": 0,
+ "label": "UOM",
+ "oldfieldname": "stock_uom",
+ "oldfieldtype": "Data",
+ "options": "UOM",
+ "print_width": "70px",
+ "read_only": 1,
+ "reqd": 0,
+ "width": "70px"
+ },
+ {
+ "doctype": "DocField",
+ "fieldname": "base_ref_rate",
+ "fieldtype": "Currency",
+ "in_list_view": 0,
+ "label": "Price List Rate (Company Currency)",
+ "oldfieldname": "base_ref_rate",
+ "oldfieldtype": "Currency",
+ "options": "Company:company:default_currency",
+ "print_hide": 1,
+ "print_width": "100px",
+ "read_only": 1,
+ "width": "100px"
+ },
+ {
+ "doctype": "DocField",
+ "fieldname": "section_break_simple1",
+ "fieldtype": "Section Break"
+ },
{
"doctype": "DocField",
"fieldname": "export_rate",
@@ -174,17 +203,8 @@
},
{
"doctype": "DocField",
- "fieldname": "base_ref_rate",
- "fieldtype": "Currency",
- "in_list_view": 0,
- "label": "Price List Rate (Company Currency)",
- "oldfieldname": "base_ref_rate",
- "oldfieldtype": "Currency",
- "options": "Company:company:default_currency",
- "print_hide": 1,
- "print_width": "100px",
- "read_only": 1,
- "width": "100px"
+ "fieldname": "col_break3",
+ "fieldtype": "Column Break"
},
{
"doctype": "DocField",
@@ -240,6 +260,71 @@
"reqd": 0,
"width": "150px"
},
+ {
+ "doctype": "DocField",
+ "fieldname": "prevdoc_docname",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "in_filter": 1,
+ "in_list_view": 0,
+ "label": "Quotation",
+ "no_copy": 1,
+ "oldfieldname": "prevdoc_docname",
+ "oldfieldtype": "Link",
+ "options": "Quotation",
+ "print_hide": 1,
+ "read_only": 1,
+ "search_index": 1
+ },
+ {
+ "doctype": "DocField",
+ "fieldname": "brand",
+ "fieldtype": "Link",
+ "hidden": 1,
+ "in_filter": 1,
+ "in_list_view": 0,
+ "label": "Brand Name",
+ "oldfieldname": "brand",
+ "oldfieldtype": "Link",
+ "options": "Brand",
+ "print_hide": 1,
+ "read_only": 1,
+ "search_index": 1
+ },
+ {
+ "description": "Add / Edit",
+ "doctype": "DocField",
+ "fieldname": "item_group",
+ "fieldtype": "Link",
+ "hidden": 1,
+ "in_filter": 1,
+ "in_list_view": 0,
+ "label": "Item Group",
+ "oldfieldname": "item_group",
+ "oldfieldtype": "Link",
+ "options": "Item Group",
+ "print_hide": 1,
+ "read_only": 1,
+ "search_index": 1
+ },
+ {
+ "allow_on_submit": 1,
+ "doctype": "DocField",
+ "fieldname": "page_break",
+ "fieldtype": "Check",
+ "in_list_view": 0,
+ "label": "Page Break",
+ "oldfieldname": "page_break",
+ "oldfieldtype": "Check",
+ "print_hide": 1,
+ "read_only": 0,
+ "report_hide": 1
+ },
+ {
+ "doctype": "DocField",
+ "fieldname": "col_break4",
+ "fieldtype": "Column Break"
+ },
{
"doctype": "DocField",
"fieldname": "projected_qty",
@@ -328,66 +413,6 @@
"report_hide": 1,
"width": "50px"
},
- {
- "doctype": "DocField",
- "fieldname": "brand",
- "fieldtype": "Link",
- "hidden": 1,
- "in_filter": 1,
- "in_list_view": 0,
- "label": "Brand Name",
- "oldfieldname": "brand",
- "oldfieldtype": "Link",
- "options": "Brand",
- "print_hide": 1,
- "read_only": 1,
- "search_index": 1
- },
- {
- "description": "Add / Edit",
- "doctype": "DocField",
- "fieldname": "item_group",
- "fieldtype": "Link",
- "hidden": 1,
- "in_filter": 1,
- "in_list_view": 0,
- "label": "Item Group",
- "oldfieldname": "item_group",
- "oldfieldtype": "Link",
- "options": "Item Group",
- "print_hide": 1,
- "read_only": 1,
- "search_index": 1
- },
- {
- "doctype": "DocField",
- "fieldname": "prevdoc_docname",
- "fieldtype": "Link",
- "hidden": 0,
- "in_filter": 1,
- "in_list_view": 0,
- "label": "Quotation",
- "no_copy": 1,
- "oldfieldname": "prevdoc_docname",
- "oldfieldtype": "Link",
- "options": "Quotation",
- "print_hide": 1,
- "read_only": 1,
- "search_index": 1
- },
- {
- "allow_on_submit": 1,
- "doctype": "DocField",
- "fieldname": "page_break",
- "fieldtype": "Check",
- "in_list_view": 0,
- "label": "Page Break",
- "oldfieldname": "page_break",
- "oldfieldtype": "Check",
- "print_hide": 1,
- "read_only": 0,
- "report_hide": 1
- },
{
"doctype": "DocField",
"fieldname": "item_tax_rate",
diff --git a/erpnext/selling/doctype/sales_team/sales_team.txt b/erpnext/selling/doctype/sales_team/sales_team.txt
index 9b584296e85..d012cb41c1f 100644
--- a/erpnext/selling/doctype/sales_team/sales_team.txt
+++ b/erpnext/selling/doctype/sales_team/sales_team.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-04-19 13:30:51",
"docstatus": 0,
- "modified": "2013-12-20 19:21:46",
+ "modified": "2013-12-31 19:00:14",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -63,6 +63,11 @@
"print_width": "100px",
"width": "100px"
},
+ {
+ "doctype": "DocField",
+ "fieldname": "col_break1",
+ "fieldtype": "Column Break"
+ },
{
"doctype": "DocField",
"fieldname": "allocated_percentage",
@@ -89,6 +94,16 @@
"reqd": 0,
"width": "120px"
},
+ {
+ "doctype": "DocField",
+ "fieldname": "incentives",
+ "fieldtype": "Currency",
+ "in_list_view": 1,
+ "label": "Incentives",
+ "oldfieldname": "incentives",
+ "oldfieldtype": "Currency",
+ "options": "Company:company:default_currency"
+ },
{
"doctype": "DocField",
"fieldname": "parenttype",
@@ -101,15 +116,5 @@
"oldfieldtype": "Data",
"print_hide": 1,
"search_index": 1
- },
- {
- "doctype": "DocField",
- "fieldname": "incentives",
- "fieldtype": "Currency",
- "in_list_view": 1,
- "label": "Incentives",
- "oldfieldname": "incentives",
- "oldfieldtype": "Currency",
- "options": "Company:company:default_currency"
}
]
\ No newline at end of file
diff --git a/erpnext/setup/doctype/authorization_rule/authorization_rule.js b/erpnext/setup/doctype/authorization_rule/authorization_rule.js
index bd42618c536..66b14a85ba7 100644
--- a/erpnext/setup/doctype/authorization_rule/authorization_rule.js
+++ b/erpnext/setup/doctype/authorization_rule/authorization_rule.js
@@ -69,10 +69,10 @@ cur_frm.cscript.transaction = function(doc,cdt,cdn){
cur_frm.fields_dict.system_user.get_query = function(doc,cdt,cdn) {
- return{ query:"core.doctype.profile.profile.profile_query" } }
+ return{ query:"webnotes.core.doctype.profile.profile.profile_query" } }
cur_frm.fields_dict.approving_user.get_query = function(doc,cdt,cdn) {
- return{ query:"core.doctype.profile.profile.profile_query" } }
+ return{ query:"webnotes.core.doctype.profile.profile.profile_query" } }
cur_frm.fields_dict['approving_role'].get_query = cur_frm.fields_dict['system_role'].get_query;
diff --git a/erpnext/stock/doctype/delivery_note_item/delivery_note_item.txt b/erpnext/stock/doctype/delivery_note_item/delivery_note_item.txt
index 96c01f6001d..7caa89d1af0 100644
--- a/erpnext/stock/doctype/delivery_note_item/delivery_note_item.txt
+++ b/erpnext/stock/doctype/delivery_note_item/delivery_note_item.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-04-22 13:15:44",
"docstatus": 0,
- "modified": "2013-12-20 19:23:08",
+ "modified": "2013-12-31 18:23:03",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -50,16 +50,6 @@
"search_index": 1,
"width": "150px"
},
- {
- "doctype": "DocField",
- "fieldname": "customer_item_code",
- "fieldtype": "Data",
- "hidden": 1,
- "in_list_view": 0,
- "label": "Customer's Item Code",
- "print_hide": 1,
- "read_only": 1
- },
{
"doctype": "DocField",
"fieldname": "item_name",
@@ -74,6 +64,21 @@
"reqd": 1,
"width": "150px"
},
+ {
+ "doctype": "DocField",
+ "fieldname": "col_break1",
+ "fieldtype": "Column Break"
+ },
+ {
+ "doctype": "DocField",
+ "fieldname": "customer_item_code",
+ "fieldtype": "Data",
+ "hidden": 1,
+ "in_list_view": 0,
+ "label": "Customer's Item Code",
+ "print_hide": 1,
+ "read_only": 1
+ },
{
"doctype": "DocField",
"fieldname": "description",
@@ -107,21 +112,6 @@
"reqd": 1,
"width": "100px"
},
- {
- "doctype": "DocField",
- "fieldname": "stock_uom",
- "fieldtype": "Link",
- "in_list_view": 0,
- "label": "UOM",
- "oldfieldname": "stock_uom",
- "oldfieldtype": "Data",
- "options": "UOM",
- "print_hide": 0,
- "print_width": "50px",
- "read_only": 1,
- "reqd": 1,
- "width": "50px"
- },
{
"doctype": "DocField",
"fieldname": "ref_rate",
@@ -151,6 +141,45 @@
"read_only": 0,
"width": "100px"
},
+ {
+ "doctype": "DocField",
+ "fieldname": "col_break2",
+ "fieldtype": "Column Break"
+ },
+ {
+ "doctype": "DocField",
+ "fieldname": "stock_uom",
+ "fieldtype": "Link",
+ "in_list_view": 0,
+ "label": "UOM",
+ "oldfieldname": "stock_uom",
+ "oldfieldtype": "Data",
+ "options": "UOM",
+ "print_hide": 0,
+ "print_width": "50px",
+ "read_only": 1,
+ "reqd": 1,
+ "width": "50px"
+ },
+ {
+ "doctype": "DocField",
+ "fieldname": "base_ref_rate",
+ "fieldtype": "Currency",
+ "in_list_view": 0,
+ "label": "Price List Rate (Company Currency)",
+ "oldfieldname": "base_ref_rate",
+ "oldfieldtype": "Currency",
+ "options": "Company:company:default_currency",
+ "print_hide": 1,
+ "print_width": "100px",
+ "read_only": 1,
+ "width": "100px"
+ },
+ {
+ "doctype": "DocField",
+ "fieldname": "section_break_1",
+ "fieldtype": "Section Break"
+ },
{
"doctype": "DocField",
"fieldname": "export_rate",
@@ -183,17 +212,8 @@
},
{
"doctype": "DocField",
- "fieldname": "base_ref_rate",
- "fieldtype": "Currency",
- "in_list_view": 0,
- "label": "Price List Rate (Company Currency)",
- "oldfieldname": "base_ref_rate",
- "oldfieldtype": "Currency",
- "options": "Company:company:default_currency",
- "print_hide": 1,
- "print_width": "100px",
- "read_only": 1,
- "width": "100px"
+ "fieldname": "col_break3",
+ "fieldtype": "Column Break"
},
{
"doctype": "DocField",
@@ -271,31 +291,6 @@
"print_hide": 1,
"read_only": 0
},
- {
- "doctype": "DocField",
- "fieldname": "expense_account",
- "fieldtype": "Link",
- "hidden": 0,
- "label": "Expense Account",
- "no_copy": 1,
- "options": "Account",
- "print_hide": 1,
- "read_only": 0,
- "width": "120px"
- },
- {
- "default": ":Company",
- "doctype": "DocField",
- "fieldname": "cost_center",
- "fieldtype": "Link",
- "hidden": 0,
- "label": "Cost Center",
- "no_copy": 1,
- "options": "Cost Center",
- "print_hide": 1,
- "read_only": 0,
- "width": "120px"
- },
{
"description": "Add / Edit",
"doctype": "DocField",
@@ -323,6 +318,22 @@
"read_only": 1,
"width": "150px"
},
+ {
+ "doctype": "DocField",
+ "fieldname": "item_tax_rate",
+ "fieldtype": "Small Text",
+ "hidden": 1,
+ "label": "Item Tax Rate",
+ "oldfieldname": "item_tax_rate",
+ "oldfieldtype": "Small Text",
+ "print_hide": 1,
+ "read_only": 1
+ },
+ {
+ "doctype": "DocField",
+ "fieldname": "col_break4",
+ "fieldtype": "Column Break"
+ },
{
"doctype": "DocField",
"fieldname": "actual_qty",
@@ -338,30 +349,44 @@
},
{
"doctype": "DocField",
- "fieldname": "installed_qty",
- "fieldtype": "Float",
- "label": "Installed Qty",
+ "fieldname": "expense_account",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "label": "Expense Account",
"no_copy": 1,
- "oldfieldname": "installed_qty",
- "oldfieldtype": "Currency",
+ "options": "Account",
"print_hide": 1,
- "print_width": "150px",
- "read_only": 1,
- "width": "150px"
+ "read_only": 0,
+ "width": "120px"
+ },
+ {
+ "default": ":Company",
+ "doctype": "DocField",
+ "fieldname": "cost_center",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "label": "Cost Center",
+ "no_copy": 1,
+ "options": "Cost Center",
+ "print_hide": 1,
+ "read_only": 0,
+ "width": "120px"
},
{
"doctype": "DocField",
"fieldname": "against_sales_order",
"fieldtype": "Link",
"label": "Against Sales Order",
- "options": "Sales Order"
+ "options": "Sales Order",
+ "read_only": 1
},
{
"doctype": "DocField",
"fieldname": "against_sales_invoice",
"fieldtype": "Link",
"label": "Against Sales Invoice",
- "options": "Sales Invoice"
+ "options": "Sales Invoice",
+ "read_only": 1
},
{
"doctype": "DocField",
@@ -381,14 +406,16 @@
},
{
"doctype": "DocField",
- "fieldname": "item_tax_rate",
- "fieldtype": "Small Text",
- "hidden": 1,
- "label": "Item Tax Rate",
- "oldfieldname": "item_tax_rate",
- "oldfieldtype": "Small Text",
+ "fieldname": "installed_qty",
+ "fieldtype": "Float",
+ "label": "Installed Qty",
+ "no_copy": 1,
+ "oldfieldname": "installed_qty",
+ "oldfieldtype": "Currency",
"print_hide": 1,
- "read_only": 1
+ "print_width": "150px",
+ "read_only": 1,
+ "width": "150px"
},
{
"doctype": "DocField",
diff --git a/erpnext/stock/doctype/packing_slip/packing_slip.js b/erpnext/stock/doctype/packing_slip/packing_slip.js
index a0e82e7399d..992b00de87b 100644
--- a/erpnext/stock/doctype/packing_slip/packing_slip.js
+++ b/erpnext/stock/doctype/packing_slip/packing_slip.js
@@ -11,7 +11,7 @@ cur_frm.fields_dict['delivery_note'].get_query = function(doc, cdt, cdn) {
cur_frm.fields_dict['item_details'].grid.get_field('item_code').get_query =
function(doc, cdt, cdn) {
return {
- query: "stock.doctype.packing_slip.packing_slip.item_details",
+ query: "erpnext.stock.doctype.packing_slip.packing_slip.item_details",
filters:{ 'delivery_note': doc.delivery_note}
}
}
diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.js b/erpnext/stock/doctype/stock_entry/stock_entry.js
index ec46685059e..6bd95648455 100644
--- a/erpnext/stock/doctype/stock_entry/stock_entry.js
+++ b/erpnext/stock/doctype/stock_entry/stock_entry.js
@@ -12,7 +12,7 @@ erpnext.stock.StockEntry = erpnext.stock.StockController.extend({
var me = this;
this.frm.fields_dict.delivery_note_no.get_query = function() {
- return { query: "stock.doctype.stock_entry.stock_entry.query_sales_return_doc" };
+ return { query: "erpnext.stock.doctype.stock_entry.stock_entry.query_sales_return_doc" };
};
this.frm.fields_dict.sales_invoice_no.get_query =
@@ -28,7 +28,7 @@ erpnext.stock.StockEntry = erpnext.stock.StockController.extend({
if(in_list(["Sales Return", "Purchase Return"], me.frm.doc.purpose) &&
me.get_doctype_docname()) {
return {
- query: "stock.doctype.stock_entry.stock_entry.query_return_item",
+ query: "erpnext.stock.doctype.stock_entry.stock_entry.query_return_item",
filters: {
purpose: me.frm.doc.purpose,
delivery_note_no: me.frm.doc.delivery_note_no,
@@ -309,7 +309,7 @@ cur_frm.fields_dict['mtn_details'].grid.get_field('batch_no').get_query = functi
var d = locals[cdt][cdn];
if(d.item_code) {
return{
- query: "stock.doctype.stock_entry.stock_entry.get_batch_no",
+ query: "erpnext.stock.doctype.stock_entry.stock_entry.get_batch_no",
filters:{
'item_code': d.item_code,
's_warehouse': d.s_warehouse,