Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of github.com:frappe/erpnext into v4-hotfix

Browse Source
This commit is contained in:
Nabin Hait 2014-05-11 12:11:50 +05:30
commit 0ff6e3a6bb
51 changed files with 4056 additions and 3932 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
erpnext/accounts/doctype/budget_detail/budget_detail.json
View File

@ -1,6 +1,6 @@
{ {
"autoname": "CBD/.######", "autoname": "CBD/.######",
"creation": "2013-03-07 11:55:04.000000", "creation": "2013-03-07 11:55:04",
"docstatus": 0, "docstatus": 0,
"doctype": "DocType", "doctype": "DocType",
"fields": [ "fields": [
@ -30,13 +30,13 @@
}, },
{ {
"fieldname": "fiscal_year", "fieldname": "fiscal_year",
"fieldtype": "Select", "fieldtype": "Link",
"in_filter": 1, "in_filter": 1,
"in_list_view": 1, "in_list_view": 1,
"label": "Fiscal Year", "label": "Fiscal Year",
"oldfieldname": "fiscal_year", "oldfieldname": "fiscal_year",
"oldfieldtype": "Select", "oldfieldtype": "Select",
"options": "link:Fiscal Year", "options": "Fiscal Year",
"permlevel": 0, "permlevel": 0,
"reqd": 1, "reqd": 1,
"search_index": 1 "search_index": 1
@ -44,9 +44,12 @@
], ],
"idx": 1, "idx": 1,
"istable": 1, "istable": 1,
"modified": "2013-12-20 19:22:59.000000", "modified": "2014-05-09 02:12:39.595788",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Budget Detail", "name": "Budget Detail",
"owner": "Administrator" "owner": "Administrator",
"permissions": [],
"sort_field": "modified",
"sort_order": "DESC"
} }

10
erpnext/accounts/doctype/budget_distribution/budget_distribution.json
View File

@ -18,13 +18,13 @@
}, },
{ {
"fieldname": "fiscal_year", "fieldname": "fiscal_year",
"fieldtype": "Select", "fieldtype": "Link",
"in_filter": 1, "in_filter": 1,
"in_list_view": 1, "in_list_view": 1,
"label": "Fiscal Year", "label": "Fiscal Year",
"oldfieldname": "fiscal_year", "oldfieldname": "fiscal_year",
"oldfieldtype": "Select", "oldfieldtype": "Select",
"options": "link:Fiscal Year", "options": "Fiscal Year",
"permlevel": 0, "permlevel": 0,
"search_index": 1 "search_index": 1
}, },
@ -40,7 +40,7 @@
], ],
"icon": "icon-bar-chart", "icon": "icon-bar-chart",
"idx": 1, "idx": 1,
"modified": "2014-05-07 06:39:40.574148", "modified": "2014-05-09 02:16:47.567367",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Budget Distribution", "name": "Budget Distribution",
@ -70,5 +70,7 @@
"role": "Accounts Manager", "role": "Accounts Manager",
"submit": 0 "submit": 0
} }
] ],
"sort_field": "modified",
"sort_order": "DESC"
} }

10
erpnext/accounts/doctype/c_form/c_form.json
View File

@ -60,17 +60,17 @@
}, },
{ {
"fieldname": "company", "fieldname": "company",
"fieldtype": "Select", "fieldtype": "Link",
"label": "Company", "label": "Company",
"options": "link:Company", "options": "Company",
"permlevel": 0, "permlevel": 0,
"read_only": 0 "read_only": 0
}, },
{ {
"fieldname": "fiscal_year", "fieldname": "fiscal_year",
"fieldtype": "Select", "fieldtype": "Link",
"label": "Fiscal Year", "label": "Fiscal Year",
"options": "link:Fiscal Year", "options": "Fiscal Year",
"permlevel": 0, "permlevel": 0,
"read_only": 0, "read_only": 0,
"reqd": 1 "reqd": 1
@ -139,7 +139,7 @@
"idx": 1, "idx": 1,
"is_submittable": 1, "is_submittable": 1,
"max_attachments": 3, "max_attachments": 3,
"modified": "2014-05-06 08:20:20.124264", "modified": "2014-05-09 02:18:00.162685",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "C-Form", "name": "C-Form",

17
erpnext/accounts/doctype/gl_entry/gl_entry.json
View File

@ -1,6 +1,6 @@
{ {
"autoname": "GL.#######", "autoname": "GL.#######",
"creation": "2013-01-10 16:34:06.000000", "creation": "2013-01-10 16:34:06",
"docstatus": 0, "docstatus": 0,
"doctype": "DocType", "doctype": "DocType",
"fields": [ "fields": [
@ -8,6 +8,7 @@
"fieldname": "posting_date", "fieldname": "posting_date",
"fieldtype": "Date", "fieldtype": "Date",
"in_filter": 1, "in_filter": 1,
"in_list_view": 1,
"label": "Posting Date", "label": "Posting Date",
"oldfieldname": "posting_date", "oldfieldname": "posting_date",
"oldfieldtype": "Date", "oldfieldtype": "Date",
@ -17,6 +18,7 @@
{ {
"fieldname": "transaction_date", "fieldname": "transaction_date",
"fieldtype": "Date", "fieldtype": "Date",
"in_list_view": 1,
"label": "Transaction Date", "label": "Transaction Date",
"oldfieldname": "transaction_date", "oldfieldname": "transaction_date",
"oldfieldtype": "Date", "oldfieldtype": "Date",
@ -26,6 +28,7 @@
"fieldname": "aging_date", "fieldname": "aging_date",
"fieldtype": "Date", "fieldtype": "Date",
"in_filter": 1, "in_filter": 1,
"in_list_view": 1,
"label": "Aging Date", "label": "Aging Date",
"oldfieldname": "aging_date", "oldfieldname": "aging_date",
"oldfieldtype": "Date", "oldfieldtype": "Date",
@ -36,6 +39,7 @@
"fieldname": "account", "fieldname": "account",
"fieldtype": "Link", "fieldtype": "Link",
"in_filter": 1, "in_filter": 1,
"in_list_view": 1,
"label": "Account", "label": "Account",
"oldfieldname": "account", "oldfieldname": "account",
"oldfieldtype": "Link", "oldfieldtype": "Link",
@ -47,6 +51,7 @@
"fieldname": "cost_center", "fieldname": "cost_center",
"fieldtype": "Link", "fieldtype": "Link",
"in_filter": 1, "in_filter": 1,
"in_list_view": 1,
"label": "Cost Center", "label": "Cost Center",
"oldfieldname": "cost_center", "oldfieldname": "cost_center",
"oldfieldtype": "Link", "oldfieldtype": "Link",
@ -157,12 +162,12 @@
}, },
{ {
"fieldname": "fiscal_year", "fieldname": "fiscal_year",
"fieldtype": "Select", "fieldtype": "Link",
"in_filter": 1, "in_filter": 1,
"label": "Fiscal Year", "label": "Fiscal Year",
"oldfieldname": "fiscal_year", "oldfieldname": "fiscal_year",
"oldfieldtype": "Select", "oldfieldtype": "Select",
"options": "link:Fiscal Year", "options": "Fiscal Year",
"permlevel": 0, "permlevel": 0,
"search_index": 0 "search_index": 0
}, },
@ -181,7 +186,7 @@
"icon": "icon-list", "icon": "icon-list",
"idx": 1, "idx": 1,
"in_create": 1, "in_create": 1,
"modified": "2013-12-20 19:24:08.000000", "modified": "2014-05-09 02:16:29.981405",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "GL Entry", "name": "GL Entry",
@ -225,5 +230,7 @@
"write": 0 "write": 0
} }
], ],
"search_fields": "voucher_no,account,posting_date,against_voucher" "search_fields": "voucher_no,account,posting_date,against_voucher",
"sort_field": "modified",
"sort_order": "DESC"
} }

10
erpnext/accounts/doctype/journal_voucher/journal_voucher.json
View File

@ -383,12 +383,12 @@
}, },
{ {
"fieldname": "fiscal_year", "fieldname": "fiscal_year",
"fieldtype": "Select", "fieldtype": "Link",
"in_filter": 1, "in_filter": 1,
"label": "Fiscal Year", "label": "Fiscal Year",
"oldfieldname": "fiscal_year", "oldfieldname": "fiscal_year",
"oldfieldtype": "Select", "oldfieldtype": "Select",
"options": "link:Fiscal Year", "options": "Fiscal Year",
"permlevel": 0, "permlevel": 0,
"print_hide": 1, "print_hide": 1,
"read_only": 0, "read_only": 0,
@ -440,7 +440,7 @@
"icon": "icon-file-text", "icon": "icon-file-text",
"idx": 1, "idx": 1,
"is_submittable": 1, "is_submittable": 1,
"modified": "2014-05-06 08:20:21.064775", "modified": "2014-05-09 02:16:47.686703",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Journal Voucher", "name": "Journal Voucher",
@ -490,5 +490,7 @@
} }
], ],
"read_only_onload": 1, "read_only_onload": 1,
"search_fields": "voucher_type,posting_date, due_date, cheque_no" "search_fields": "voucher_type,posting_date, due_date, cheque_no",
"sort_field": "modified",
"sort_order": "DESC"
} }

20
erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.json
View File

@ -1,6 +1,6 @@
{ {
"autoname": "PCE/.###", "autoname": "PCE/.###",
"creation": "2013-01-10 16:34:07.000000", "creation": "2013-01-10 16:34:07",
"docstatus": 0, "docstatus": 0,
"doctype": "DocType", "doctype": "DocType",
"fields": [ "fields": [
@ -14,6 +14,7 @@
{ {
"fieldname": "transaction_date", "fieldname": "transaction_date",
"fieldtype": "Date", "fieldtype": "Date",
"in_list_view": 1,
"label": "Transaction Date", "label": "Transaction Date",
"oldfieldname": "transaction_date", "oldfieldname": "transaction_date",
"oldfieldtype": "Date", "oldfieldtype": "Date",
@ -22,6 +23,7 @@
{ {
"fieldname": "posting_date", "fieldname": "posting_date",
"fieldtype": "Date", "fieldtype": "Date",
"in_list_view": 1,
"label": "Posting Date", "label": "Posting Date",
"oldfieldname": "posting_date", "oldfieldname": "posting_date",
"oldfieldtype": "Date", "oldfieldtype": "Date",
@ -30,11 +32,12 @@
}, },
{ {
"fieldname": "fiscal_year", "fieldname": "fiscal_year",
"fieldtype": "Select", "fieldtype": "Link",
"in_list_view": 1,
"label": "Closing Fiscal Year", "label": "Closing Fiscal Year",
"oldfieldname": "fiscal_year", "oldfieldname": "fiscal_year",
"oldfieldtype": "Select", "oldfieldtype": "Select",
"options": "link:Fiscal Year", "options": "Fiscal Year",
"permlevel": 0, "permlevel": 0,
"reqd": 1 "reqd": 1
}, },
@ -42,6 +45,7 @@
"fieldname": "amended_from", "fieldname": "amended_from",
"fieldtype": "Data", "fieldtype": "Data",
"ignore_restrictions": 1, "ignore_restrictions": 1,
"in_list_view": 1,
"label": "Amended From", "label": "Amended From",
"no_copy": 1, "no_copy": 1,
"oldfieldname": "amended_from", "oldfieldname": "amended_from",
@ -51,11 +55,11 @@
}, },
{ {
"fieldname": "company", "fieldname": "company",
"fieldtype": "Select", "fieldtype": "Link",
"label": "Company", "label": "Company",
"oldfieldname": "company", "oldfieldname": "company",
"oldfieldtype": "Select", "oldfieldtype": "Select",
"options": "link:Company", "options": "Company",
"permlevel": 0, "permlevel": 0,
"reqd": 1 "reqd": 1
}, },
@ -97,7 +101,7 @@
"icon": "icon-file-text", "icon": "icon-file-text",
"idx": 1, "idx": 1,
"is_submittable": 1, "is_submittable": 1,
"modified": "2014-01-20 17:48:59.000000", "modified": "2014-05-09 02:16:36.920034",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Period Closing Voucher", "name": "Period Closing Voucher",
@ -132,5 +136,7 @@
"write": 1 "write": 1
} }
], ],
"search_fields": "posting_date, fiscal_year" "search_fields": "posting_date, fiscal_year",
"sort_field": "modified",
"sort_order": "DESC"
} }

14
erpnext/accounts/doctype/pos_setting/pos_setting.json
View File

@ -172,11 +172,11 @@
}, },
{ {
"fieldname": "letter_head", "fieldname": "letter_head",
"fieldtype": "Select", "fieldtype": "Link",
"label": "Letter Head", "label": "Letter Head",
"oldfieldname": "letter_head", "oldfieldname": "letter_head",
"oldfieldtype": "Select", "oldfieldtype": "Select",
"options": "link:Letter Head", "options": "Letter Head",
"permlevel": 0, "permlevel": 0,
"print_hide": 1, "print_hide": 1,
"read_only": 0 "read_only": 0
@ -193,19 +193,19 @@
}, },
{ {
"fieldname": "select_print_heading", "fieldname": "select_print_heading",
"fieldtype": "Select", "fieldtype": "Link",
"in_filter": 0, "in_filter": 0,
"label": "Print Heading", "label": "Print Heading",
"oldfieldname": "select_print_heading", "oldfieldname": "select_print_heading",
"oldfieldtype": "Select", "oldfieldtype": "Select",
"options": "link:Print Heading", "options": "Print Heading",
"permlevel": 0, "permlevel": 0,
"read_only": 0 "read_only": 0
} }
], ],
"icon": "icon-cog", "icon": "icon-cog",
"idx": 1, "idx": 1,
"modified": "2014-05-04 08:47:33.250720", "modified": "2014-05-09 02:17:34.814856",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "POS Setting", "name": "POS Setting",
@ -235,5 +235,7 @@
"role": "Accounts User", "role": "Accounts User",
"submit": 0 "submit": 0
} }
] ],
"sort_field": "modified",
"sort_order": "DESC"
} }

18
erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
View File

@ -692,11 +692,11 @@
}, },
{ {
"fieldname": "mode_of_payment", "fieldname": "mode_of_payment",
"fieldtype": "Select", "fieldtype": "Link",
"label": "Mode of Payment", "label": "Mode of Payment",
"oldfieldname": "mode_of_payment", "oldfieldname": "mode_of_payment",
"oldfieldtype": "Select", "oldfieldtype": "Select",
"options": "link:Mode of Payment", "options": "Mode of Payment",
"permlevel": 0, "permlevel": 0,
"read_only": 0 "read_only": 0
}, },
@ -709,20 +709,20 @@
{ {
"allow_on_submit": 1, "allow_on_submit": 1,
"fieldname": "letter_head", "fieldname": "letter_head",
"fieldtype": "Select", "fieldtype": "Link",
"label": "Letter Head", "label": "Letter Head",
"options": "link:Letter Head", "options": "Letter Head",
"permlevel": 0, "permlevel": 0,
"print_hide": 1 "print_hide": 1
}, },
{ {
"fieldname": "fiscal_year", "fieldname": "fiscal_year",
"fieldtype": "Select", "fieldtype": "Link",
"in_filter": 1, "in_filter": 1,
"label": "Fiscal Year", "label": "Fiscal Year",
"oldfieldname": "fiscal_year", "oldfieldname": "fiscal_year",
"oldfieldtype": "Select", "oldfieldtype": "Select",
"options": "link:Fiscal Year", "options": "Fiscal Year",
"permlevel": 0, "permlevel": 0,
"print_hide": 1, "print_hide": 1,
"read_only": 0, "read_only": 0,
@ -744,7 +744,7 @@
"icon": "icon-file-text", "icon": "icon-file-text",
"idx": 1, "idx": 1,
"is_submittable": 1, "is_submittable": 1,
"modified": "2014-05-06 08:20:33.283402", "modified": "2014-05-09 02:16:52.618986",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Purchase Invoice", "name": "Purchase Invoice",
@ -822,5 +822,7 @@
} }
], ],
"read_only_onload": 1, "read_only_onload": 1,
"search_fields": "posting_date, credit_to, fiscal_year, bill_no, grand_total, outstanding_amount" "search_fields": "posting_date, credit_to, fiscal_year, bill_no, grand_total, outstanding_amount",
"sort_field": "modified",
"sort_order": "DESC"
} }

18
erpnext/accounts/doctype/sales_invoice/sales_invoice.json
View File

@ -160,12 +160,12 @@
}, },
{ {
"fieldname": "mode_of_payment", "fieldname": "mode_of_payment",
"fieldtype": "Select", "fieldtype": "Link",
"label": "Mode of Payment", "label": "Mode of Payment",
"no_copy": 0, "no_copy": 0,
"oldfieldname": "mode_of_payment", "oldfieldname": "mode_of_payment",
"oldfieldtype": "Select", "oldfieldtype": "Select",
"options": "link:Mode of Payment", "options": "Mode of Payment",
"permlevel": 0, "permlevel": 0,
"read_only": 0 "read_only": 0
}, },
@ -878,11 +878,11 @@
{ {
"allow_on_submit": 1, "allow_on_submit": 1,
"fieldname": "letter_head", "fieldname": "letter_head",
"fieldtype": "Select", "fieldtype": "Link",
"label": "Letter Head", "label": "Letter Head",
"oldfieldname": "letter_head", "oldfieldname": "letter_head",
"oldfieldtype": "Select", "oldfieldtype": "Select",
"options": "link:Letter Head", "options": "Letter Head",
"permlevel": 0, "permlevel": 0,
"print_hide": 1, "print_hide": 1,
"read_only": 0 "read_only": 0
@ -925,13 +925,13 @@
}, },
{ {
"fieldname": "fiscal_year", "fieldname": "fiscal_year",
"fieldtype": "Select", "fieldtype": "Link",
"in_filter": 1, "in_filter": 1,
"label": "Fiscal Year", "label": "Fiscal Year",
"no_copy": 0, "no_copy": 0,
"oldfieldname": "fiscal_year", "oldfieldname": "fiscal_year",
"oldfieldtype": "Select", "oldfieldtype": "Select",
"options": "link:Fiscal Year", "options": "Fiscal Year",
"permlevel": 0, "permlevel": 0,
"print_hide": 1, "print_hide": 1,
"read_only": 0, "read_only": 0,
@ -1180,7 +1180,7 @@
"icon": "icon-file-text", "icon": "icon-file-text",
"idx": 1, "idx": 1,
"is_submittable": 1, "is_submittable": 1,
"modified": "2014-05-06 08:20:37.429430", "modified": "2014-05-09 02:17:00.217556",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Sales Invoice", "name": "Sales Invoice",
@ -1226,5 +1226,7 @@
} }
], ],
"read_only_onload": 1, "read_only_onload": 1,
"search_fields": "posting_date, due_date, debit_to, fiscal_year, grand_total, outstanding_amount" "search_fields": "posting_date, due_date, debit_to, fiscal_year, grand_total, outstanding_amount",
"sort_field": "modified",
"sort_order": "DESC"
} }

14
erpnext/buying/doctype/purchase_order/purchase_order.json
View File

@ -537,23 +537,23 @@
{ {
"allow_on_submit": 1, "allow_on_submit": 1,
"fieldname": "letter_head", "fieldname": "letter_head",
"fieldtype": "Select", "fieldtype": "Link",
"label": "Letter Head", "label": "Letter Head",
"oldfieldname": "letter_head", "oldfieldname": "letter_head",
"oldfieldtype": "Select", "oldfieldtype": "Select",
"options": "link:Letter Head", "options": "Letter Head",
"permlevel": 0, "permlevel": 0,
"print_hide": 1 "print_hide": 1
}, },
{ {
"fieldname": "fiscal_year", "fieldname": "fiscal_year",
"fieldtype": "Select", "fieldtype": "Link",
"in_filter": 1, "in_filter": 1,
"label": "Fiscal Year", "label": "Fiscal Year",
"no_copy": 0, "no_copy": 0,
"oldfieldname": "fiscal_year", "oldfieldname": "fiscal_year",
"oldfieldtype": "Select", "oldfieldtype": "Select",
"options": "link:Fiscal Year", "options": "Fiscal Year",
"permlevel": 0, "permlevel": 0,
"print_hide": 1, "print_hide": 1,
"reqd": 1, "reqd": 1,
@ -636,7 +636,7 @@
"icon": "icon-file-text", "icon": "icon-file-text",
"idx": 1, "idx": 1,
"is_submittable": 1, "is_submittable": 1,
"modified": "2014-05-07 05:38:27.896932", "modified": "2014-05-09 02:17:04.992233",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Buying", "module": "Buying",
"name": "Purchase Order", "name": "Purchase Order",
@ -696,5 +696,7 @@
} }
], ],
"read_only_onload": 1, "read_only_onload": 1,
"search_fields": "status, transaction_date, supplier,grand_total" "search_fields": "status, transaction_date, supplier,grand_total",
"sort_field": "modified",
"sort_order": "DESC"
} }

14
erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
View File

@ -435,11 +435,11 @@
{ {
"allow_on_submit": 1, "allow_on_submit": 1,
"fieldname": "letter_head", "fieldname": "letter_head",
"fieldtype": "Select", "fieldtype": "Link",
"label": "Letter Head", "label": "Letter Head",
"oldfieldname": "letter_head", "oldfieldname": "letter_head",
"oldfieldtype": "Select", "oldfieldtype": "Select",
"options": "link:Letter Head", "options": "Letter Head",
"permlevel": 0, "permlevel": 0,
"print_hide": 1 "print_hide": 1
}, },
@ -533,13 +533,13 @@
}, },
{ {
"fieldname": "fiscal_year", "fieldname": "fiscal_year",
"fieldtype": "Select", "fieldtype": "Link",
"in_filter": 1, "in_filter": 1,
"label": "Fiscal Year", "label": "Fiscal Year",
"no_copy": 0, "no_copy": 0,
"oldfieldname": "fiscal_year", "oldfieldname": "fiscal_year",
"oldfieldtype": "Select", "oldfieldtype": "Select",
"options": "link:Fiscal Year", "options": "Fiscal Year",
"permlevel": 0, "permlevel": 0,
"print_hide": 1, "print_hide": 1,
"reqd": 1, "reqd": 1,
@ -562,7 +562,7 @@
"icon": "icon-shopping-cart", "icon": "icon-shopping-cart",
"idx": 1, "idx": 1,
"is_submittable": 1, "is_submittable": 1,
"modified": "2014-05-06 08:20:23.630279", "modified": "2014-05-09 02:17:10.664189",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Buying", "module": "Buying",
"name": "Supplier Quotation", "name": "Supplier Quotation",
@ -640,5 +640,7 @@
} }
], ],
"read_only_onload": 1, "read_only_onload": 1,
"search_fields": "status, transaction_date, supplier,grand_total" "search_fields": "status, transaction_date, supplier,grand_total",
"sort_field": "modified",
"sort_order": "DESC"
} }

16
erpnext/hr/doctype/appraisal/appraisal.json
View File

@ -1,6 +1,6 @@
{ {
"autoname": "APRSL.#####", "autoname": "APRSL.#####",
"creation": "2013-01-10 16:34:12.000000", "creation": "2013-01-10 16:34:12",
"docstatus": 0, "docstatus": 0,
"doctype": "DocType", "doctype": "DocType",
"fields": [ "fields": [
@ -157,23 +157,23 @@
}, },
{ {
"fieldname": "company", "fieldname": "company",
"fieldtype": "Select", "fieldtype": "Link",
"in_filter": 1, "in_filter": 1,
"label": "Company", "label": "Company",
"oldfieldname": "company", "oldfieldname": "company",
"oldfieldtype": "Link", "oldfieldtype": "Link",
"options": "link:Company", "options": "Company",
"permlevel": 0, "permlevel": 0,
"reqd": 1 "reqd": 1
}, },
{ {
"fieldname": "fiscal_year", "fieldname": "fiscal_year",
"fieldtype": "Select", "fieldtype": "Link",
"in_filter": 1, "in_filter": 1,
"label": "Fiscal Year", "label": "Fiscal Year",
"oldfieldname": "fiscal_year", "oldfieldname": "fiscal_year",
"oldfieldtype": "Select", "oldfieldtype": "Select",
"options": "link:Fiscal Year", "options": "Fiscal Year",
"permlevel": 0, "permlevel": 0,
"reqd": 1 "reqd": 1
}, },
@ -196,7 +196,7 @@
"icon": "icon-thumbs-up", "icon": "icon-thumbs-up",
"idx": 1, "idx": 1,
"is_submittable": 1, "is_submittable": 1,
"modified": "2014-01-22 16:05:34.000000", "modified": "2014-05-09 02:16:37.334857",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "HR", "module": "HR",
"name": "Appraisal", "name": "Appraisal",
@ -245,5 +245,7 @@
"write": 1 "write": 1
} }
], ],
"search_fields": "status, employee, employee_name" "search_fields": "status, employee, employee_name",
"sort_field": "modified",
"sort_order": "DESC"
} }

14
erpnext/hr/doctype/attendance/attendance.json
View File

@ -94,23 +94,23 @@
}, },
{ {
"fieldname": "fiscal_year", "fieldname": "fiscal_year",
"fieldtype": "Select", "fieldtype": "Link",
"in_filter": 1, "in_filter": 1,
"label": "Fiscal Year", "label": "Fiscal Year",
"oldfieldname": "fiscal_year", "oldfieldname": "fiscal_year",
"oldfieldtype": "Select", "oldfieldtype": "Select",
"options": "link:Fiscal Year", "options": "Fiscal Year",
"permlevel": 0, "permlevel": 0,
"reqd": 1 "reqd": 1
}, },
{ {
"fieldname": "company", "fieldname": "company",
"fieldtype": "Select", "fieldtype": "Link",
"in_filter": 1, "in_filter": 1,
"label": "Company", "label": "Company",
"oldfieldname": "company", "oldfieldname": "company",
"oldfieldtype": "Link", "oldfieldtype": "Link",
"options": "link:Company", "options": "Company",
"permlevel": 0, "permlevel": 0,
"reqd": 1 "reqd": 1
}, },
@ -129,7 +129,7 @@
"icon": "icon-ok", "icon": "icon-ok",
"idx": 1, "idx": 1,
"is_submittable": 1, "is_submittable": 1,
"modified": "2014-05-06 08:20:11.263301", "modified": "2014-05-09 02:16:37.761770",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "HR", "module": "HR",
"name": "Attendance", "name": "Attendance",
@ -175,5 +175,7 @@
"write": 1 "write": 1
} }
], ],
"search_fields": "employee, employee_name, att_date, status" "search_fields": "employee, employee_name, att_date, status",
"sort_field": "modified",
"sort_order": "DESC"
} }

10
erpnext/hr/doctype/employee/employee.json
View File

@ -136,10 +136,10 @@
}, },
{ {
"fieldname": "company", "fieldname": "company",
"fieldtype": "Select", "fieldtype": "Link",
"in_filter": 1, "in_filter": 1,
"label": "Company", "label": "Company",
"options": "link:Company", "options": "Company",
"permlevel": 0, "permlevel": 0,
"print_hide": 1, "print_hide": 1,
"reqd": 1 "reqd": 1
@ -672,7 +672,7 @@
], ],
"icon": "icon-user", "icon": "icon-user",
"idx": 1, "idx": 1,
"modified": "2014-05-07 06:39:40.142903", "modified": "2014-05-09 02:16:47.217445",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "HR", "module": "HR",
"name": "Employee", "name": "Employee",
@ -730,5 +730,7 @@
"role": "Leave Approver" "role": "Leave Approver"
} }
], ],
"search_fields": "employee_name" "search_fields": "employee_name",
"sort_field": "modified",
"sort_order": "DESC"
} }

8
erpnext/hr/doctype/employee/employee.py
View File

@ -129,12 +129,6 @@ class Employee(Document):
if self.date_of_birth and self.date_of_joining and getdate(self.date_of_birth) >= getdate(self.date_of_joining): if self.date_of_birth and self.date_of_joining and getdate(self.date_of_birth) >= getdate(self.date_of_joining):
throw(_("Date of Joining must be greater than Date of Birth")) throw(_("Date of Joining must be greater than Date of Birth"))
elif self.scheduled_confirmation_date and self.date_of_joining and (getdate(self.scheduled_confirmation_date) < getdate(self.date_of_joining)):
throw(_("Scheduled Confirmation Date must be greater than Date of Joining"))
elif self.final_confirmation_date and self.date_of_joining and (getdate(self.final_confirmation_date) < getdate(self.date_of_joining)):
throw(_("Final Confirmation Date must be greater than Date of Joining"))
elif self.date_of_retirement and self.date_of_joining and (getdate(self.date_of_retirement) <= getdate(self.date_of_joining)): elif self.date_of_retirement and self.date_of_joining and (getdate(self.date_of_retirement) <= getdate(self.date_of_joining)):
throw(_("Date Of Retirement must be greater than Date of Joining")) throw(_("Date Of Retirement must be greater than Date of Joining"))
@ -155,6 +149,8 @@ class Employee(Document):
throw(_("Please enter relieving date.")) throw(_("Please enter relieving date."))
def validate_for_enabled_user_id(self): def validate_for_enabled_user_id(self):
if not self.status == 'Active':
return
enabled = frappe.db.sql("""select name from `tabUser` where enabled = frappe.db.sql("""select name from `tabUser` where
name=%s and enabled=1""", self.user_id) name=%s and enabled=1""", self.user_id)
if not enabled: if not enabled:

21
erpnext/hr/doctype/employee_internal_work_history/employee_internal_work_history.json
View File

@ -1,36 +1,36 @@
{ {
"creation": "2013-02-22 01:27:45.000000", "creation": "2013-02-22 01:27:45",
"docstatus": 0, "docstatus": 0,
"doctype": "DocType", "doctype": "DocType",
"fields": [ "fields": [
{ {
"fieldname": "branch", "fieldname": "branch",
"fieldtype": "Select", "fieldtype": "Link",
"in_list_view": 1, "in_list_view": 1,
"label": "Branch", "label": "Branch",
"oldfieldname": "branch", "oldfieldname": "branch",
"oldfieldtype": "Select", "oldfieldtype": "Select",
"options": "link:Branch", "options": "Branch",
"permlevel": 0 "permlevel": 0
}, },
{ {
"fieldname": "department", "fieldname": "department",
"fieldtype": "Select", "fieldtype": "Link",
"in_list_view": 1, "in_list_view": 1,
"label": "Department", "label": "Department",
"oldfieldname": "department", "oldfieldname": "department",
"oldfieldtype": "Select", "oldfieldtype": "Select",
"options": "link:Department", "options": "Department",
"permlevel": 0 "permlevel": 0
}, },
{ {
"fieldname": "designation", "fieldname": "designation",
"fieldtype": "Select", "fieldtype": "Link",
"in_list_view": 1, "in_list_view": 1,
"label": "Designation", "label": "Designation",
"oldfieldname": "designation", "oldfieldname": "designation",
"oldfieldtype": "Select", "oldfieldtype": "Select",
"options": "link:Designation", "options": "Designation",
"permlevel": 0 "permlevel": 0
}, },
{ {
@ -54,9 +54,12 @@
], ],
"idx": 1, "idx": 1,
"istable": 1, "istable": 1,
"modified": "2013-12-20 19:24:12.000000", "modified": "2014-05-09 02:16:44.613840",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "HR", "module": "HR",
"name": "Employee Internal Work History", "name": "Employee Internal Work History",
"owner": "Administrator" "owner": "Administrator",
"permissions": [],
"sort_field": "modified",
"sort_order": "DESC"
} }

16
erpnext/hr/doctype/expense_claim/expense_claim.json
View File

@ -1,6 +1,6 @@
{ {
"autoname": "EXP.######", "autoname": "EXP.######",
"creation": "2013-01-10 16:34:14.000000", "creation": "2013-01-10 16:34:14",
"docstatus": 0, "docstatus": 0,
"doctype": "DocType", "doctype": "DocType",
"fields": [ "fields": [
@ -114,23 +114,23 @@
}, },
{ {
"fieldname": "fiscal_year", "fieldname": "fiscal_year",
"fieldtype": "Select", "fieldtype": "Link",
"in_filter": 1, "in_filter": 1,
"label": "Fiscal Year", "label": "Fiscal Year",
"oldfieldname": "fiscal_year", "oldfieldname": "fiscal_year",
"oldfieldtype": "Select", "oldfieldtype": "Select",
"options": "link:Fiscal Year", "options": "Fiscal Year",
"permlevel": 0, "permlevel": 0,
"reqd": 1 "reqd": 1
}, },
{ {
"fieldname": "company", "fieldname": "company",
"fieldtype": "Select", "fieldtype": "Link",
"in_filter": 1, "in_filter": 1,
"label": "Company", "label": "Company",
"oldfieldname": "company", "oldfieldname": "company",
"oldfieldtype": "Link", "oldfieldtype": "Link",
"options": "link:Company", "options": "Company",
"permlevel": 0, "permlevel": 0,
"reqd": 1 "reqd": 1
}, },
@ -187,7 +187,7 @@
"icon": "icon-money", "icon": "icon-money",
"idx": 1, "idx": 1,
"is_submittable": 1, "is_submittable": 1,
"modified": "2014-01-22 16:05:34.000000", "modified": "2014-05-09 02:16:38.198490",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "HR", "module": "HR",
"name": "Expense Claim", "name": "Expense Claim",
@ -234,5 +234,7 @@
"write": 1 "write": 1
} }
], ],
"search_fields": "approval_status,employee,employee_name" "search_fields": "approval_status,employee,employee_name",
"sort_field": "modified",
"sort_order": "DESC"
} }

13
erpnext/hr/doctype/expense_claim_detail/expense_claim_detail.json
View File

@ -1,5 +1,5 @@
{ {
"creation": "2013-02-22 01:27:46.000000", "creation": "2013-02-22 01:27:46",
"docstatus": 0, "docstatus": 0,
"doctype": "DocType", "doctype": "DocType",
"fields": [ "fields": [
@ -17,12 +17,12 @@
}, },
{ {
"fieldname": "expense_type", "fieldname": "expense_type",
"fieldtype": "Select", "fieldtype": "Link",
"in_list_view": 1, "in_list_view": 1,
"label": "Expense Claim Type", "label": "Expense Claim Type",
"oldfieldname": "expense_type", "oldfieldname": "expense_type",
"oldfieldtype": "Link", "oldfieldtype": "Link",
"options": "link:Expense Claim Type", "options": "Expense Claim Type",
"permlevel": 0, "permlevel": 0,
"print_width": "150px", "print_width": "150px",
"reqd": 1, "reqd": 1,
@ -69,9 +69,12 @@
], ],
"idx": 1, "idx": 1,
"istable": 1, "istable": 1,
"modified": "2013-12-20 19:23:13.000000", "modified": "2014-05-09 02:16:38.529082",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "HR", "module": "HR",
"name": "Expense Claim Detail", "name": "Expense Claim Detail",
"owner": "harshada@webnotestech.com" "owner": "harshada@webnotestech.com",
"permissions": [],
"sort_field": "modified",
"sort_order": "DESC"
} }

10
erpnext/hr/doctype/holiday_list/holiday_list.json
View File

@ -24,13 +24,13 @@
}, },
{ {
"fieldname": "fiscal_year", "fieldname": "fiscal_year",
"fieldtype": "Select", "fieldtype": "Link",
"in_filter": 1, "in_filter": 1,
"in_list_view": 1, "in_list_view": 1,
"label": "Fiscal Year", "label": "Fiscal Year",
"oldfieldname": "fiscal_year", "oldfieldname": "fiscal_year",
"oldfieldtype": "Link", "oldfieldtype": "Link",
"options": "link:Fiscal Year", "options": "Fiscal Year",
"permlevel": 0, "permlevel": 0,
"reqd": 1 "reqd": 1
}, },
@ -72,7 +72,7 @@
], ],
"icon": "icon-calendar", "icon": "icon-calendar",
"idx": 1, "idx": 1,
"modified": "2014-05-07 06:39:38.738033", "modified": "2014-05-09 02:16:38.887266",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "HR", "module": "HR",
"name": "Holiday List", "name": "Holiday List",
@ -91,5 +91,7 @@
"submit": 0, "submit": 0,
"write": 1 "write": 1
} }
] ],
"sort_field": "modified",
"sort_order": "DESC"
} }

20
erpnext/hr/doctype/leave_allocation/leave_allocation.json
View File

@ -1,7 +1,7 @@
{ {
"allow_import": 1, "allow_import": 1,
"autoname": "LAL/.#####", "autoname": "LAL/.#####",
"creation": "2013-02-20 19:10:38.000000", "creation": "2013-02-20 19:10:38",
"docstatus": 0, "docstatus": 0,
"doctype": "DocType", "doctype": "DocType",
"fields": [ "fields": [
@ -15,6 +15,7 @@
"fieldname": "employee", "fieldname": "employee",
"fieldtype": "Link", "fieldtype": "Link",
"in_filter": 1, "in_filter": 1,
"in_list_view": 1,
"label": "Employee", "label": "Employee",
"oldfieldname": "employee", "oldfieldname": "employee",
"oldfieldtype": "Link", "oldfieldtype": "Link",
@ -27,6 +28,7 @@
"fieldname": "employee_name", "fieldname": "employee_name",
"fieldtype": "Data", "fieldtype": "Data",
"in_filter": 1, "in_filter": 1,
"in_list_view": 1,
"label": "Employee Name", "label": "Employee Name",
"permlevel": 0, "permlevel": 0,
"read_only": 1, "read_only": 1,
@ -34,12 +36,13 @@
}, },
{ {
"fieldname": "leave_type", "fieldname": "leave_type",
"fieldtype": "Select", "fieldtype": "Link",
"in_filter": 1, "in_filter": 1,
"in_list_view": 1,
"label": "Leave Type", "label": "Leave Type",
"oldfieldname": "leave_type", "oldfieldname": "leave_type",
"oldfieldtype": "Link", "oldfieldtype": "Link",
"options": "link:Leave Type", "options": "Leave Type",
"permlevel": 0, "permlevel": 0,
"reqd": 1, "reqd": 1,
"search_index": 1 "search_index": 1
@ -49,6 +52,7 @@
"fieldname": "posting_date", "fieldname": "posting_date",
"fieldtype": "Date", "fieldtype": "Date",
"hidden": 0, "hidden": 0,
"in_list_view": 1,
"label": "Posting Date", "label": "Posting Date",
"no_copy": 1, "no_copy": 1,
"oldfieldname": "date", "oldfieldname": "date",
@ -60,12 +64,12 @@
}, },
{ {
"fieldname": "fiscal_year", "fieldname": "fiscal_year",
"fieldtype": "Select", "fieldtype": "Link",
"in_filter": 1, "in_filter": 1,
"label": "Fiscal Year", "label": "Fiscal Year",
"oldfieldname": "fiscal_year", "oldfieldname": "fiscal_year",
"oldfieldtype": "Data", "oldfieldtype": "Data",
"options": "link:Fiscal Year", "options": "Fiscal Year",
"permlevel": 0, "permlevel": 0,
"reqd": 1, "reqd": 1,
"search_index": 1 "search_index": 1
@ -132,7 +136,7 @@
"icon": "icon-ok", "icon": "icon-ok",
"idx": 1, "idx": 1,
"is_submittable": 1, "is_submittable": 1,
"modified": "2014-01-22 16:05:35.000000", "modified": "2014-05-09 02:16:39.508488",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "HR", "module": "HR",
"name": "Leave Allocation", "name": "Leave Allocation",
@ -168,5 +172,7 @@
"write": 1 "write": 1
} }
], ],
"search_fields": "employee,employee_name,leave_type,total_leaves_allocated,fiscal_year" "search_fields": "employee,employee_name,leave_type,total_leaves_allocated,fiscal_year",
"sort_field": "modified",
"sort_order": "DESC"
} }

20
erpnext/hr/doctype/leave_application/leave_application.json
View File

@ -1,7 +1,7 @@
{ {
"allow_attach": 1, "allow_attach": 1,
"autoname": "LAP/.#####", "autoname": "LAP/.#####",
"creation": "2013-02-20 11:18:11.000000", "creation": "2013-02-20 11:18:11",
"description": "Apply / Approve Leaves", "description": "Apply / Approve Leaves",
"docstatus": 0, "docstatus": 0,
"doctype": "DocType", "doctype": "DocType",
@ -20,18 +20,18 @@
{ {
"description": "Leave can be approved by users with Role, \"Leave Approver\"", "description": "Leave can be approved by users with Role, \"Leave Approver\"",
"fieldname": "leave_approver", "fieldname": "leave_approver",
"fieldtype": "Select", "fieldtype": "Link",
"label": "Leave Approver", "label": "Leave Approver",
"options": "link:User", "options": "User",
"permlevel": 0 "permlevel": 0
}, },
{ {
"fieldname": "leave_type", "fieldname": "leave_type",
"fieldtype": "Select", "fieldtype": "Link",
"in_filter": 1, "in_filter": 1,
"in_list_view": 1, "in_list_view": 1,
"label": "Leave Type", "label": "Leave Type",
"options": "link:Leave Type", "options": "Leave Type",
"permlevel": 0, "permlevel": 0,
"reqd": 1, "reqd": 1,
"search_index": 1 "search_index": 1
@ -135,10 +135,10 @@
}, },
{ {
"fieldname": "fiscal_year", "fieldname": "fiscal_year",
"fieldtype": "Select", "fieldtype": "Link",
"in_filter": 1, "in_filter": 1,
"label": "Fiscal Year", "label": "Fiscal Year",
"options": "link:Fiscal Year", "options": "Fiscal Year",
"permlevel": 0, "permlevel": 0,
"read_only": 0, "read_only": 0,
"reqd": 1, "reqd": 1,
@ -182,7 +182,7 @@
"idx": 1, "idx": 1,
"is_submittable": 1, "is_submittable": 1,
"max_attachments": 3, "max_attachments": 3,
"modified": "2014-01-20 17:48:56.000000", "modified": "2014-05-09 02:17:13.936705",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "HR", "module": "HR",
"name": "Leave Application", "name": "Leave Application",
@ -263,5 +263,7 @@
"write": 1 "write": 1
} }
], ],
"search_fields": "employee,employee_name,leave_type,from_date,to_date,total_leave_days,fiscal_year" "search_fields": "employee,employee_name,leave_type,from_date,to_date,total_leave_days,fiscal_year",
"sort_field": "modified",
"sort_order": "DESC"
} }

36
erpnext/hr/doctype/leave_control_panel/leave_control_panel.json
View File

@ -2,7 +2,7 @@
"allow_copy": 1, "allow_copy": 1,
"allow_email": 1, "allow_email": 1,
"allow_print": 1, "allow_print": 1,
"creation": "2013-01-10 16:34:15.000000", "creation": "2013-01-10 16:34:15",
"docstatus": 0, "docstatus": 0,
"doctype": "DocType", "doctype": "DocType",
"fields": [ "fields": [
@ -15,33 +15,37 @@
{ {
"description": "Leave blank if considered for all employee types", "description": "Leave blank if considered for all employee types",
"fieldname": "employee_type", "fieldname": "employee_type",
"fieldtype": "Select", "fieldtype": "Link",
"in_list_view": 1,
"label": "Employee Type", "label": "Employee Type",
"options": "link:Employment Type", "options": "Employment Type",
"permlevel": 0 "permlevel": 0
}, },
{ {
"description": "Leave blank if considered for all branches", "description": "Leave blank if considered for all branches",
"fieldname": "branch", "fieldname": "branch",
"fieldtype": "Select", "fieldtype": "Link",
"in_list_view": 1,
"label": "Branch", "label": "Branch",
"options": "link:Branch", "options": "Branch",
"permlevel": 0 "permlevel": 0
}, },
{ {
"description": "Leave blank if considered for all departments", "description": "Leave blank if considered for all departments",
"fieldname": "department", "fieldname": "department",
"fieldtype": "Select", "fieldtype": "Link",
"in_list_view": 1,
"label": "Department", "label": "Department",
"options": "link:Department", "options": "Department",
"permlevel": 0 "permlevel": 0
}, },
{ {
"description": "Leave blank if considered for all designations", "description": "Leave blank if considered for all designations",
"fieldname": "designation", "fieldname": "designation",
"fieldtype": "Select", "fieldtype": "Link",
"in_list_view": 1,
"label": "Designation", "label": "Designation",
"options": "link:Designation", "options": "Designation",
"permlevel": 0 "permlevel": 0
}, },
{ {
@ -52,18 +56,18 @@
}, },
{ {
"fieldname": "fiscal_year", "fieldname": "fiscal_year",
"fieldtype": "Select", "fieldtype": "Link",
"in_filter": 1, "in_filter": 1,
"label": "Fiscal Year", "label": "Fiscal Year",
"options": "link:Fiscal Year", "options": "Fiscal Year",
"permlevel": 0, "permlevel": 0,
"reqd": 1 "reqd": 1
}, },
{ {
"fieldname": "leave_type", "fieldname": "leave_type",
"fieldtype": "Select", "fieldtype": "Link",
"label": "Leave Type", "label": "Leave Type",
"options": "link:Leave Type", "options": "Leave Type",
"permlevel": 0, "permlevel": 0,
"reqd": 1 "reqd": 1
}, },
@ -94,7 +98,7 @@
"icon": "icon-cog", "icon": "icon-cog",
"idx": 1, "idx": 1,
"issingle": 1, "issingle": 1,
"modified": "2013-07-05 14:45:50.000000", "modified": "2014-05-09 02:16:44.996178",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "HR", "module": "HR",
"name": "Leave Control Panel", "name": "Leave Control Panel",
@ -110,5 +114,7 @@
"write": 1 "write": 1
} }
], ],
"read_only": 1 "read_only": 1,
"sort_field": "modified",
"sort_order": "DESC"
} }

18
erpnext/hr/doctype/salary_manager/salary_manager.json
View File

@ -2,7 +2,7 @@
"allow_copy": 1, "allow_copy": 1,
"allow_email": 1, "allow_email": 1,
"allow_print": 1, "allow_print": 1,
"creation": "2012-03-27 14:35:59.000000", "creation": "2012-03-27 14:35:59",
"docstatus": 0, "docstatus": 0,
"doctype": "DocType", "doctype": "DocType",
"document_type": "Other", "document_type": "Other",
@ -27,15 +27,17 @@
}, },
{ {
"fieldname": "company", "fieldname": "company",
"fieldtype": "Select", "fieldtype": "Link",
"in_list_view": 1,
"label": "Company", "label": "Company",
"options": "link:Company", "options": "Company",
"permlevel": 0, "permlevel": 0,
"reqd": 1 "reqd": 1
}, },
{ {
"fieldname": "branch", "fieldname": "branch",
"fieldtype": "Link", "fieldtype": "Link",
"in_list_view": 1,
"label": "Branch", "label": "Branch",
"options": "Branch", "options": "Branch",
"permlevel": 0 "permlevel": 0
@ -62,9 +64,9 @@
}, },
{ {
"fieldname": "fiscal_year", "fieldname": "fiscal_year",
"fieldtype": "Select", "fieldtype": "Link",
"label": "Fiscal Year", "label": "Fiscal Year",
"options": "link:Fiscal Year", "options": "Fiscal Year",
"permlevel": 0, "permlevel": 0,
"reqd": 1 "reqd": 1
}, },
@ -142,7 +144,7 @@
"icon": "icon-cog", "icon": "icon-cog",
"idx": 1, "idx": 1,
"issingle": 1, "issingle": 1,
"modified": "2013-07-22 15:23:58.000000", "modified": "2014-05-09 02:16:45.165977",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "HR", "module": "HR",
"name": "Salary Manager", "name": "Salary Manager",
@ -155,5 +157,7 @@
"role": "HR Manager", "role": "HR Manager",
"write": 1 "write": 1
} }
] ],
"sort_field": "modified",
"sort_order": "DESC"
} }

10
erpnext/hr/doctype/salary_slip/salary_slip.json
View File

@ -100,10 +100,10 @@
}, },
{ {
"fieldname": "company", "fieldname": "company",
"fieldtype": "Select", "fieldtype": "Link",
"in_filter": 1, "in_filter": 1,
"label": "Company", "label": "Company",
"options": "link:Company", "options": "Company",
"permlevel": 0, "permlevel": 0,
"reqd": 1 "reqd": 1
}, },
@ -325,7 +325,7 @@
"icon": "icon-file-text", "icon": "icon-file-text",
"idx": 1, "idx": 1,
"is_submittable": 1, "is_submittable": 1,
"modified": "2014-05-01 04:22:14.543092", "modified": "2014-05-09 02:17:14.634335",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "HR", "module": "HR",
"name": "Salary Slip", "name": "Salary Slip",
@ -364,5 +364,7 @@
"restricted": 0, "restricted": 0,
"role": "Employee" "role": "Employee"
} }
] ],
"sort_field": "modified",
"sort_order": "DESC"
} }

24
erpnext/hr/doctype/salary_structure/salary_structure.json
View File

@ -1,6 +1,6 @@
{ {
"allow_import": 1, "allow_import": 1,
"creation": "2013-03-07 18:50:29.000000", "creation": "2013-03-07 18:50:29",
"docstatus": 0, "docstatus": 0,
"doctype": "DocType", "doctype": "DocType",
"fields": [ "fields": [
@ -35,36 +35,36 @@
}, },
{ {
"fieldname": "branch", "fieldname": "branch",
"fieldtype": "Select", "fieldtype": "Link",
"in_filter": 1, "in_filter": 1,
"label": "Branch", "label": "Branch",
"oldfieldname": "branch", "oldfieldname": "branch",
"oldfieldtype": "Select", "oldfieldtype": "Select",
"options": "link:Branch", "options": "Branch",
"permlevel": 0, "permlevel": 0,
"read_only": 1, "read_only": 1,
"reqd": 0 "reqd": 0
}, },
{ {
"fieldname": "designation", "fieldname": "designation",
"fieldtype": "Select", "fieldtype": "Link",
"in_filter": 1, "in_filter": 1,
"label": "Designation", "label": "Designation",
"oldfieldname": "designation", "oldfieldname": "designation",
"oldfieldtype": "Select", "oldfieldtype": "Select",
"options": "link:Designation", "options": "Designation",
"permlevel": 0, "permlevel": 0,
"read_only": 1, "read_only": 1,
"reqd": 0 "reqd": 0
}, },
{ {
"fieldname": "department", "fieldname": "department",
"fieldtype": "Select", "fieldtype": "Link",
"in_filter": 1, "in_filter": 1,
"label": "Department", "label": "Department",
"oldfieldname": "department", "oldfieldname": "department",
"oldfieldtype": "Select", "oldfieldtype": "Select",
"options": "link:Department", "options": "Department",
"permlevel": 0, "permlevel": 0,
"read_only": 1, "read_only": 1,
"reqd": 0 "reqd": 0
@ -113,10 +113,10 @@
}, },
{ {
"fieldname": "company", "fieldname": "company",
"fieldtype": "Select", "fieldtype": "Link",
"in_filter": 1, "in_filter": 1,
"label": "Company", "label": "Company",
"options": "link:Company", "options": "Company",
"permlevel": 0, "permlevel": 0,
"read_only": 0, "read_only": 0,
"reqd": 1 "reqd": 1
@ -227,7 +227,7 @@
], ],
"icon": "icon-file-text", "icon": "icon-file-text",
"idx": 1, "idx": 1,
"modified": "2013-12-20 19:23:28.000000", "modified": "2014-05-09 02:16:46.711184",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "HR", "module": "HR",
"name": "Salary Structure", "name": "Salary Structure",
@ -257,5 +257,7 @@
"submit": 0, "submit": 0,
"write": 1 "write": 1
} }
] ],
"sort_field": "modified",
"sort_order": "DESC"
} }

12
erpnext/manufacturing/doctype/bom/bom.json
View File

@ -3,7 +3,7 @@
"allow_copy": 0, "allow_copy": 0,
"allow_import": 1, "allow_import": 1,
"allow_rename": 0, "allow_rename": 0,
"creation": "2013-01-22 15:11:38.000000", "creation": "2013-01-22 15:11:38",
"docstatus": 0, "docstatus": 0,
"doctype": "DocType", "doctype": "DocType",
"document_type": "Master", "document_type": "Master",
@ -162,9 +162,9 @@
}, },
{ {
"fieldname": "uom", "fieldname": "uom",
"fieldtype": "Select", "fieldtype": "Link",
"label": "Item UOM", "label": "Item UOM",
"options": "link:UOM", "options": "UOM",
"permlevel": 0, "permlevel": 0,
"read_only": 1 "read_only": 1
}, },
@ -233,7 +233,7 @@
"is_submittable": 1, "is_submittable": 1,
"issingle": 0, "issingle": 0,
"istable": 0, "istable": 0,
"modified": "2014-01-20 17:48:26.000000", "modified": "2014-05-09 02:16:39.975486",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Manufacturing", "module": "Manufacturing",
"name": "BOM", "name": "BOM",
@ -267,5 +267,7 @@
} }
], ],
"read_only": 0, "read_only": 0,
"search_fields": "item" "search_fields": "item",
"sort_field": "modified",
"sort_order": "DESC"
} }

2
erpnext/patches/4_0/customer_discount_to_pricing_rule.py
View File

@ -23,7 +23,7 @@ def execute():
"item_group": item_group, "item_group": item_group,
"applicable_for": "Customer", "applicable_for": "Customer",
"customer": d.parent, "customer": d.parent,
"price_or_discount": "Discount", "price_or_discount": "Discount Percentage",
"discount_percentage": d.discount "discount_percentage": d.discount
}).insert() }).insert()

3
erpnext/patches/4_0/remove_india_specific_fields.py
View File

@ -6,6 +6,7 @@ import frappe
from frappe.core.doctype.custom_field.custom_field import create_custom_field_if_values_exist from frappe.core.doctype.custom_field.custom_field import create_custom_field_if_values_exist
def execute(): def execute():
frappe.db.sql("delete from tabDocField where parent='Salary Slip' and options='Grade'")
docfields = { docfields = {
("Purchase Receipt", "challan_no"): frappe.get_meta("Purchase Receipt").get_field("challan_no"), ("Purchase Receipt", "challan_no"): frappe.get_meta("Purchase Receipt").get_field("challan_no"),
("Purchase Receipt", "challan_date"): frappe.get_meta("Purchase Receipt").get_field("challan_date"), ("Purchase Receipt", "challan_date"): frappe.get_meta("Purchase Receipt").get_field("challan_date"),
@ -18,6 +19,8 @@ def execute():
} }
for (doctype, fieldname), df in docfields.items(): for (doctype, fieldname), df in docfields.items():
if not df:
continue
opts = df.as_dict() opts = df.as_dict()
if df.idx >= 2: if df.idx >= 2:
opts["insert_after"] = frappe.get_meta(doctype).get("fields")[df.idx - 2].fieldname opts["insert_after"] = frappe.get_meta(doctype).get("fields")[df.idx - 2].fieldname

8
erpnext/patches/4_0/split_email_settings.py
View File

@ -8,7 +8,7 @@ def execute():
frappe.reload_doc("core", "doctype", "outgoing_email_settings") frappe.reload_doc("core", "doctype", "outgoing_email_settings")
frappe.reload_doc("support", "doctype", "support_email_settings") frappe.reload_doc("support", "doctype", "support_email_settings")
email_settings = frappe.get_doc("Email Settings") email_settings = get_email_settings()
map_outgoing_email_settings(email_settings) map_outgoing_email_settings(email_settings)
map_support_email_settings(email_settings) map_support_email_settings(email_settings)
frappe.delete_doc("Doctype", "Email Settings") frappe.delete_doc("Doctype", "Email Settings")
@ -48,3 +48,9 @@ def map_support_email_settings(email_settings):
support_email_settings.save() support_email_settings.save()
def get_email_settings():
ret = {}
for field, value in frappe.db.sql("select field, value from tabSingles where doctype='Email Settings'"):
ret[field] = value
return ret

5
erpnext/patches/4_0/update_user_properties.py
View File

@ -8,6 +8,7 @@ import frappe.defaults
def execute(): def execute():
frappe.reload_doc("core", "doctype", "docperm") frappe.reload_doc("core", "doctype", "docperm")
frappe.reload_doc("hr", "doctype", "employee")
update_user_properties() update_user_properties()
update_user_match() update_user_match()
add_employee_restrictions_to_leave_approver() add_employee_restrictions_to_leave_approver()
@ -82,9 +83,9 @@ def add_employee_restrictions_to_leave_approver():
# add Employee restrictions (in on_update method) # add Employee restrictions (in on_update method)
for employee in frappe.db.sql_list("""select name from `tabEmployee` for employee in frappe.db.sql_list("""select name from `tabEmployee`
where exists(select leave_approver from `tabEmployee Leave Approver` where (exists(select leave_approver from `tabEmployee Leave Approver`
where `tabEmployee Leave Approver`.parent=`tabEmployee`.name) where `tabEmployee Leave Approver`.parent=`tabEmployee`.name)
or ifnull(`reports_to`, '')!=''"""): or ifnull(`reports_to`, '')!='') and docstatus<2 and status='Active'"""):
frappe.get_doc("Employee", employee).save() frappe.get_doc("Employee", employee).save()

14
erpnext/selling/doctype/installation_note/installation_note.json
View File

@ -170,12 +170,12 @@
{ {
"description": "Select the relevant company name if you have multiple companies.", "description": "Select the relevant company name if you have multiple companies.",
"fieldname": "company", "fieldname": "company",
"fieldtype": "Select", "fieldtype": "Link",
"in_filter": 1, "in_filter": 1,
"label": "Company", "label": "Company",
"oldfieldname": "company", "oldfieldname": "company",
"oldfieldtype": "Select", "oldfieldtype": "Select",
"options": "link:Company", "options": "Company",
"permlevel": 0, "permlevel": 0,
"print_hide": 1, "print_hide": 1,
"reqd": 1, "reqd": 1,
@ -183,12 +183,12 @@
}, },
{ {
"fieldname": "fiscal_year", "fieldname": "fiscal_year",
"fieldtype": "Select", "fieldtype": "Link",
"in_filter": 1, "in_filter": 1,
"label": "Fiscal Year", "label": "Fiscal Year",
"oldfieldname": "fiscal_year", "oldfieldname": "fiscal_year",
"oldfieldtype": "Select", "oldfieldtype": "Select",
"options": "link:Fiscal Year", "options": "Fiscal Year",
"permlevel": 0, "permlevel": 0,
"print_hide": 1, "print_hide": 1,
"reqd": 1 "reqd": 1
@ -235,7 +235,7 @@
"icon": "icon-wrench", "icon": "icon-wrench",
"idx": 1, "idx": 1,
"is_submittable": 1, "is_submittable": 1,
"modified": "2014-05-06 08:21:19.053088", "modified": "2014-05-09 02:17:16.592562",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Selling", "module": "Selling",
"name": "Installation Note", "name": "Installation Note",
@ -266,5 +266,7 @@
"role": "Sales User", "role": "Sales User",
"submit": 0 "submit": 0
} }
] ],
"sort_field": "modified",
"sort_order": "DESC"
} }

10
erpnext/selling/doctype/lead/lead.json
View File

@ -312,13 +312,13 @@
}, },
{ {
"fieldname": "fiscal_year", "fieldname": "fiscal_year",
"fieldtype": "Select", "fieldtype": "Link",
"hidden": 1, "hidden": 1,
"in_filter": 1, "in_filter": 1,
"label": "Fiscal Year", "label": "Fiscal Year",
"oldfieldname": "fiscal_year", "oldfieldname": "fiscal_year",
"oldfieldtype": "Select", "oldfieldtype": "Select",
"options": "link:Fiscal Year", "options": "Fiscal Year",
"permlevel": 0 "permlevel": 0
}, },
{ {
@ -362,7 +362,7 @@
], ],
"icon": "icon-user", "icon": "icon-user",
"idx": 1, "idx": 1,
"modified": "2014-05-06 08:20:17.819234", "modified": "2014-05-09 02:16:40.769432",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Selling", "module": "Selling",
"name": "Lead", "name": "Lead",
@ -397,5 +397,7 @@
"write": 1 "write": 1
} }
], ],
"search_fields": "lead_name,lead_owner,status" "search_fields": "lead_name,lead_owner,status",
"sort_field": "modified",
"sort_order": "DESC"
} }

10
erpnext/selling/doctype/opportunity/opportunity.json
View File

@ -286,12 +286,12 @@
}, },
{ {
"fieldname": "fiscal_year", "fieldname": "fiscal_year",
"fieldtype": "Select", "fieldtype": "Link",
"in_filter": 1, "in_filter": 1,
"label": "Fiscal Year", "label": "Fiscal Year",
"oldfieldname": "fiscal_year", "oldfieldname": "fiscal_year",
"oldfieldtype": "Select", "oldfieldtype": "Select",
"options": "link:Fiscal Year", "options": "Fiscal Year",
"permlevel": 0, "permlevel": 0,
"print_hide": 1, "print_hide": 1,
"read_only": 0, "read_only": 0,
@ -409,7 +409,7 @@
"icon": "icon-info-sign", "icon": "icon-info-sign",
"idx": 1, "idx": 1,
"is_submittable": 1, "is_submittable": 1,
"modified": "2014-05-06 08:20:25.377095", "modified": "2014-05-09 02:16:41.042535",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Selling", "module": "Selling",
"name": "Opportunity", "name": "Opportunity",
@ -444,5 +444,7 @@
"write": 1 "write": 1
} }
], ],
"search_fields": "status,transaction_date,customer,lead,enquiry_type,territory,company" "search_fields": "status,transaction_date,customer,lead,enquiry_type,territory,company",
"sort_field": "modified",
"sort_order": "DESC"
} }

14
erpnext/selling/doctype/quotation/quotation.json
View File

@ -730,11 +730,11 @@
{ {
"allow_on_submit": 1, "allow_on_submit": 1,
"fieldname": "letter_head", "fieldname": "letter_head",
"fieldtype": "Select", "fieldtype": "Link",
"label": "Letter Head", "label": "Letter Head",
"oldfieldname": "letter_head", "oldfieldname": "letter_head",
"oldfieldtype": "Select", "oldfieldtype": "Select",
"options": "link:Letter Head", "options": "Letter Head",
"permlevel": 0, "permlevel": 0,
"print_hide": 1, "print_hide": 1,
"read_only": 0 "read_only": 0
@ -755,12 +755,12 @@
}, },
{ {
"fieldname": "fiscal_year", "fieldname": "fiscal_year",
"fieldtype": "Select", "fieldtype": "Link",
"in_filter": 1, "in_filter": 1,
"label": "Fiscal Year", "label": "Fiscal Year",
"oldfieldname": "fiscal_year", "oldfieldname": "fiscal_year",
"oldfieldtype": "Select", "oldfieldtype": "Select",
"options": "link:Fiscal Year", "options": "Fiscal Year",
"permlevel": 0, "permlevel": 0,
"print_hide": 1, "print_hide": 1,
"read_only": 0, "read_only": 0,
@ -818,7 +818,7 @@
"idx": 1, "idx": 1,
"is_submittable": 1, "is_submittable": 1,
"max_attachments": 1, "max_attachments": 1,
"modified": "2014-05-06 08:20:26.222037", "modified": "2014-05-09 02:17:19.143693",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Selling", "module": "Selling",
"name": "Quotation", "name": "Quotation",
@ -896,5 +896,7 @@
} }
], ],
"read_only_onload": 1, "read_only_onload": 1,
"search_fields": "status,transaction_date,customer,lead,order_type" "search_fields": "status,transaction_date,customer,lead,order_type",
"sort_field": "modified",
"sort_order": "DESC"
} }

14
erpnext/selling/doctype/sales_order/sales_order.json
View File

@ -686,11 +686,11 @@
{ {
"allow_on_submit": 1, "allow_on_submit": 1,
"fieldname": "letter_head", "fieldname": "letter_head",
"fieldtype": "Select", "fieldtype": "Link",
"label": "Letter Head", "label": "Letter Head",
"oldfieldname": "letter_head", "oldfieldname": "letter_head",
"oldfieldtype": "Select", "oldfieldtype": "Select",
"options": "link:Letter Head", "options": "Letter Head",
"permlevel": 0, "permlevel": 0,
"print_hide": 1 "print_hide": 1
}, },
@ -709,12 +709,12 @@
}, },
{ {
"fieldname": "fiscal_year", "fieldname": "fiscal_year",
"fieldtype": "Select", "fieldtype": "Link",
"in_filter": 1, "in_filter": 1,
"label": "Fiscal Year", "label": "Fiscal Year",
"oldfieldname": "fiscal_year", "oldfieldname": "fiscal_year",
"oldfieldtype": "Select", "oldfieldtype": "Select",
"options": "link:Fiscal Year", "options": "Fiscal Year",
"permlevel": 0, "permlevel": 0,
"print_hide": 1, "print_hide": 1,
"reqd": 1, "reqd": 1,
@ -874,7 +874,7 @@
"idx": 1, "idx": 1,
"is_submittable": 1, "is_submittable": 1,
"issingle": 0, "issingle": 0,
"modified": "2014-05-07 14:37:33.548622", "modified": "2014-05-09 02:17:52.206802",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Selling", "module": "Selling",
"name": "Sales Order", "name": "Sales Order",
@ -934,5 +934,7 @@
} }
], ],
"read_only_onload": 1, "read_only_onload": 1,
"search_fields": "status,transaction_date,customer,customer_name, territory,order_type,company" "search_fields": "status,transaction_date,customer,customer_name, territory,order_type,company",
"sort_field": "modified",
"sort_order": "DESC"
} }

20
erpnext/selling/doctype/sms_center/sms_center.json
View File

@ -1,7 +1,7 @@
{ {
"allow_attach": 0, "allow_attach": 0,
"allow_copy": 1, "allow_copy": 1,
"creation": "2013-01-10 16:34:22.000000", "creation": "2013-01-10 16:34:22",
"docstatus": 0, "docstatus": 0,
"doctype": "DocType", "doctype": "DocType",
"fields": [ "fields": [
@ -14,6 +14,7 @@
{ {
"fieldname": "send_to", "fieldname": "send_to",
"fieldtype": "Select", "fieldtype": "Select",
"in_list_view": 1,
"label": "Send To", "label": "Send To",
"options": "\nAll Contact\nAll Customer Contact\nAll Supplier Contact\nAll Sales Partner Contact\nAll Lead (Open)\nAll Employee (Active)\nAll Sales Person", "options": "\nAll Contact\nAll Customer Contact\nAll Supplier Contact\nAll Sales Partner Contact\nAll Lead (Open)\nAll Employee (Active)\nAll Sales Person",
"permlevel": 0 "permlevel": 0
@ -22,6 +23,7 @@
"depends_on": "eval:doc.send_to=='All Customer Contact'", "depends_on": "eval:doc.send_to=='All Customer Contact'",
"fieldname": "customer", "fieldname": "customer",
"fieldtype": "Link", "fieldtype": "Link",
"in_list_view": 1,
"label": "Customer", "label": "Customer",
"options": "Customer", "options": "Customer",
"permlevel": 0 "permlevel": 0
@ -30,6 +32,7 @@
"depends_on": "eval:doc.send_to=='All Supplier Contact'", "depends_on": "eval:doc.send_to=='All Supplier Contact'",
"fieldname": "supplier", "fieldname": "supplier",
"fieldtype": "Link", "fieldtype": "Link",
"in_list_view": 1,
"label": "Supplier", "label": "Supplier",
"options": "Supplier", "options": "Supplier",
"permlevel": 0 "permlevel": 0
@ -37,17 +40,18 @@
{ {
"depends_on": "eval:doc.send_to=='All Employee (Active)'", "depends_on": "eval:doc.send_to=='All Employee (Active)'",
"fieldname": "department", "fieldname": "department",
"fieldtype": "Select", "fieldtype": "Link",
"in_list_view": 1,
"label": "Department", "label": "Department",
"options": "link:Department", "options": "Department",
"permlevel": 0 "permlevel": 0
}, },
{ {
"depends_on": "eval:doc.send_to=='All Employee (Active)'", "depends_on": "eval:doc.send_to=='All Employee (Active)'",
"fieldname": "branch", "fieldname": "branch",
"fieldtype": "Select", "fieldtype": "Link",
"label": "Branch", "label": "Branch",
"options": "link:Branch", "options": "Branch",
"permlevel": 0 "permlevel": 0
}, },
{ {
@ -105,7 +109,7 @@
"idx": 1, "idx": 1,
"in_create": 0, "in_create": 0,
"issingle": 1, "issingle": 1,
"modified": "2014-01-30 15:29:04.000000", "modified": "2014-05-09 02:16:41.375945",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Selling", "module": "Selling",
"name": "SMS Center", "name": "SMS Center",
@ -125,5 +129,7 @@
"write": 1 "write": 1
} }
], ],
"read_only": 1 "read_only": 1,
"sort_field": "modified",
"sort_order": "DESC"
} }

10
erpnext/setup/doctype/email_digest/email_digest.json
View File

@ -28,10 +28,10 @@
}, },
{ {
"fieldname": "company", "fieldname": "company",
"fieldtype": "Select", "fieldtype": "Link",
"in_list_view": 1, "in_list_view": 1,
"label": "For Company", "label": "For Company",
"options": "link:Company", "options": "Company",
"permlevel": 0, "permlevel": 0,
"reqd": 1 "reqd": 1
}, },
@ -328,7 +328,7 @@
], ],
"icon": "icon-envelope", "icon": "icon-envelope",
"idx": 1, "idx": 1,
"modified": "2014-04-28 17:21:08.300969", "modified": "2014-05-09 02:16:43.979204",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Setup", "module": "Setup",
"name": "Email Digest", "name": "Email Digest",
@ -357,5 +357,7 @@
"role": "System Manager", "role": "System Manager",
"submit": 0 "submit": 0
} }
] ],
"sort_field": "modified",
"sort_order": "DESC"
} }

13
erpnext/setup/doctype/target_detail/target_detail.json
View File

@ -1,5 +1,5 @@
{ {
"creation": "2013-02-22 01:27:58.000000", "creation": "2013-02-22 01:27:58",
"docstatus": 0, "docstatus": 0,
"doctype": "DocType", "doctype": "DocType",
"fields": [ "fields": [
@ -19,13 +19,13 @@
}, },
{ {
"fieldname": "fiscal_year", "fieldname": "fiscal_year",
"fieldtype": "Select", "fieldtype": "Link",
"in_filter": 1, "in_filter": 1,
"in_list_view": 1, "in_list_view": 1,
"label": "Fiscal Year", "label": "Fiscal Year",
"oldfieldname": "fiscal_year", "oldfieldname": "fiscal_year",
"oldfieldtype": "Select", "oldfieldtype": "Select",
"options": "link:Fiscal Year", "options": "Fiscal Year",
"permlevel": 0, "permlevel": 0,
"reqd": 1, "reqd": 1,
"search_index": 1 "search_index": 1
@ -54,9 +54,12 @@
], ],
"idx": 1, "idx": 1,
"istable": 1, "istable": 1,
"modified": "2013-12-20 19:21:51.000000", "modified": "2014-05-09 02:16:41.436257",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Setup", "module": "Setup",
"name": "Target Detail", "name": "Target Detail",
"owner": "Administrator" "owner": "Administrator",
"permissions": [],
"sort_field": "modified",
"sort_order": "DESC"
} }

1
erpnext/setup/page/setup_wizard/setup_wizard.js
View File

@ -29,6 +29,7 @@ frappe.pages['setup-wizard'].onload = function(wrapper) {
}, 2000); }, 2000);
}, },
error: function(r) { error: function(r) {
var d = msgprint(__("There were errors.")); var d = msgprint(__("There were errors."));
d.custom_onhide = function() { d.custom_onhide = function() {
frappe.set_route(erpnext.wiz.page_name, "0"); frappe.set_route(erpnext.wiz.page_name, "0");

1
erpnext/setup/page/setup_wizard/setup_wizard.py
View File

@ -15,6 +15,7 @@ import install_fixtures
@frappe.whitelist() @frappe.whitelist()
def setup_account(args=None): def setup_account(args=None):
frappe.clear_cache()
if frappe.db.sql("select name from tabCompany"): if frappe.db.sql("select name from tabCompany"):
frappe.throw(_("Setup Already Complete!!")) frappe.throw(_("Setup Already Complete!!"))

14
erpnext/stock/doctype/delivery_note/delivery_note.json
View File

@ -779,12 +779,12 @@
}, },
{ {
"fieldname": "fiscal_year", "fieldname": "fiscal_year",
"fieldtype": "Select", "fieldtype": "Link",
"in_filter": 1, "in_filter": 1,
"label": "Fiscal Year", "label": "Fiscal Year",
"oldfieldname": "fiscal_year", "oldfieldname": "fiscal_year",
"oldfieldtype": "Select", "oldfieldtype": "Select",
"options": "link:Fiscal Year", "options": "Fiscal Year",
"permlevel": 0, "permlevel": 0,
"print_hide": 1, "print_hide": 1,
"print_width": "150px", "print_width": "150px",
@ -796,11 +796,11 @@
{ {
"allow_on_submit": 1, "allow_on_submit": 1,
"fieldname": "letter_head", "fieldname": "letter_head",
"fieldtype": "Select", "fieldtype": "Link",
"label": "Letter Head", "label": "Letter Head",
"oldfieldname": "letter_head", "oldfieldname": "letter_head",
"oldfieldtype": "Link", "oldfieldtype": "Link",
"options": "link:Letter Head", "options": "Letter Head",
"permlevel": 0, "permlevel": 0,
"print_hide": 1, "print_hide": 1,
"read_only": 0 "read_only": 0
@ -999,7 +999,7 @@
"idx": 1, "idx": 1,
"in_create": 0, "in_create": 0,
"is_submittable": 1, "is_submittable": 1,
"modified": "2014-05-07 05:39:05.540566", "modified": "2014-05-09 02:17:22.579628",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Stock", "module": "Stock",
"name": "Delivery Note", "name": "Delivery Note",
@ -1072,5 +1072,7 @@
} }
], ],
"read_only_onload": 1, "read_only_onload": 1,
"search_fields": "status,customer,customer_name, territory,grand_total" "search_fields": "status,customer,customer_name, territory,grand_total",
"sort_field": "modified",
"sort_order": "DESC"
} }

14
erpnext/stock/doctype/material_request/material_request.json
View File

@ -126,12 +126,12 @@
}, },
{ {
"fieldname": "fiscal_year", "fieldname": "fiscal_year",
"fieldtype": "Select", "fieldtype": "Link",
"in_filter": 1, "in_filter": 1,
"label": "Fiscal Year", "label": "Fiscal Year",
"oldfieldname": "fiscal_year", "oldfieldname": "fiscal_year",
"oldfieldtype": "Select", "oldfieldtype": "Select",
"options": "link:Fiscal Year", "options": "Fiscal Year",
"permlevel": 0, "permlevel": 0,
"print_hide": 1, "print_hide": 1,
"print_width": "150px", "print_width": "150px",
@ -168,11 +168,11 @@
{ {
"allow_on_submit": 1, "allow_on_submit": 1,
"fieldname": "letter_head", "fieldname": "letter_head",
"fieldtype": "Select", "fieldtype": "Link",
"label": "Letter Head", "label": "Letter Head",
"oldfieldname": "letter_head", "oldfieldname": "letter_head",
"oldfieldtype": "Select", "oldfieldtype": "Select",
"options": "link:Letter Head", "options": "Letter Head",
"permlevel": 0, "permlevel": 0,
"print_hide": 1 "print_hide": 1
}, },
@ -229,7 +229,7 @@
"icon": "icon-ticket", "icon": "icon-ticket",
"idx": 1, "idx": 1,
"is_submittable": 1, "is_submittable": 1,
"modified": "2014-05-06 08:20:18.286091", "modified": "2014-05-09 02:17:25.742502",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Stock", "module": "Stock",
"name": "Material Request", "name": "Material Request",
@ -293,5 +293,7 @@
} }
], ],
"read_only_onload": 1, "read_only_onload": 1,
"search_fields": "status,transaction_date" "search_fields": "status,transaction_date",
"sort_field": "modified",
"sort_order": "DESC"
} }

14
erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
View File

@ -563,9 +563,9 @@
{ {
"allow_on_submit": 1, "allow_on_submit": 1,
"fieldname": "letter_head", "fieldname": "letter_head",
"fieldtype": "Select", "fieldtype": "Link",
"label": "Letter Head", "label": "Letter Head",
"options": "link:Letter Head", "options": "Letter Head",
"permlevel": 0, "permlevel": 0,
"print_hide": 1 "print_hide": 1
}, },
@ -602,12 +602,12 @@
}, },
{ {
"fieldname": "fiscal_year", "fieldname": "fiscal_year",
"fieldtype": "Select", "fieldtype": "Link",
"in_filter": 1, "in_filter": 1,
"label": "Fiscal Year", "label": "Fiscal Year",
"oldfieldname": "fiscal_year", "oldfieldname": "fiscal_year",
"oldfieldtype": "Select", "oldfieldtype": "Select",
"options": "link:Fiscal Year", "options": "Fiscal Year",
"permlevel": 0, "permlevel": 0,
"print_hide": 1, "print_hide": 1,
"print_width": "150px", "print_width": "150px",
@ -754,7 +754,7 @@
"icon": "icon-truck", "icon": "icon-truck",
"idx": 1, "idx": 1,
"is_submittable": 1, "is_submittable": 1,
"modified": "2014-05-07 05:40:51.109407", "modified": "2014-05-09 02:17:29.990590",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Stock", "module": "Stock",
"name": "Purchase Receipt", "name": "Purchase Receipt",
@ -820,5 +820,7 @@
} }
], ],
"read_only_onload": 1, "read_only_onload": 1,
"search_fields": "status, posting_date, supplier" "search_fields": "status, posting_date, supplier",
"sort_field": "modified",
"sort_order": "DESC"
} }

10
erpnext/stock/doctype/serial_no/serial_no.json
View File

@ -405,10 +405,10 @@
}, },
{ {
"fieldname": "company", "fieldname": "company",
"fieldtype": "Select", "fieldtype": "Link",
"in_filter": 1, "in_filter": 1,
"label": "Company", "label": "Company",
"options": "link:Company", "options": "Company",
"permlevel": 0, "permlevel": 0,
"read_only": 1, "read_only": 1,
"reqd": 1, "reqd": 1,
@ -418,7 +418,7 @@
"icon": "icon-barcode", "icon": "icon-barcode",
"idx": 1, "idx": 1,
"in_create": 0, "in_create": 0,
"modified": "2014-05-04 00:47:20.443476", "modified": "2014-05-09 02:16:41.833590",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Stock", "module": "Stock",
"name": "Serial No", "name": "Serial No",
@ -466,5 +466,7 @@
"write": 0 "write": 0
} }
], ],
"search_fields": "item_code,status" "search_fields": "item_code,status",
"sort_field": "modified",
"sort_order": "DESC"
} }

10
erpnext/stock/doctype/stock_entry/stock_entry.json
View File

@ -499,10 +499,10 @@
}, },
{ {
"fieldname": "fiscal_year", "fieldname": "fiscal_year",
"fieldtype": "Select", "fieldtype": "Link",
"in_filter": 0, "in_filter": 0,
"label": "Fiscal Year", "label": "Fiscal Year",
"options": "link:Fiscal Year", "options": "Fiscal Year",
"permlevel": 0, "permlevel": 0,
"print_hide": 1, "print_hide": 1,
"read_only": 0, "read_only": 0,
@ -580,7 +580,7 @@
"is_submittable": 1, "is_submittable": 1,
"issingle": 0, "issingle": 0,
"max_attachments": 0, "max_attachments": 0,
"modified": "2014-05-06 08:20:25.647078", "modified": "2014-05-09 02:17:33.093429",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Stock", "module": "Stock",
"name": "Stock Entry", "name": "Stock Entry",
@ -645,5 +645,7 @@
], ],
"read_only": 0, "read_only": 0,
"read_only_onload": 0, "read_only_onload": 0,
"search_fields": "transfer_date, from_warehouse, to_warehouse, purpose, remarks" "search_fields": "transfer_date, from_warehouse, to_warehouse, purpose, remarks",
"sort_field": "modified",
"sort_order": "DESC"
} }

17
erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json
View File

@ -3,7 +3,7 @@
"allow_email": 1, "allow_email": 1,
"allow_print": 1, "allow_print": 1,
"autoname": "SLE/.########", "autoname": "SLE/.########",
"creation": "2013-01-29 19:25:42.000000", "creation": "2013-01-29 19:25:42",
"docstatus": 0, "docstatus": 0,
"doctype": "DocType", "doctype": "DocType",
"document_type": "Other", "document_type": "Other",
@ -12,6 +12,7 @@
"fieldname": "item_code", "fieldname": "item_code",
"fieldtype": "Link", "fieldtype": "Link",
"in_filter": 1, "in_filter": 1,
"in_list_view": 1,
"label": "Item Code", "label": "Item Code",
"oldfieldname": "item_code", "oldfieldname": "item_code",
"oldfieldtype": "Link", "oldfieldtype": "Link",
@ -27,6 +28,7 @@
"fieldname": "serial_no", "fieldname": "serial_no",
"fieldtype": "Text", "fieldtype": "Text",
"in_filter": 0, "in_filter": 0,
"in_list_view": 1,
"label": "Serial No", "label": "Serial No",
"permlevel": 0, "permlevel": 0,
"print_width": "100px", "print_width": "100px",
@ -37,6 +39,7 @@
{ {
"fieldname": "batch_no", "fieldname": "batch_no",
"fieldtype": "Data", "fieldtype": "Data",
"in_list_view": 1,
"label": "Batch No", "label": "Batch No",
"oldfieldname": "batch_no", "oldfieldname": "batch_no",
"oldfieldtype": "Data", "oldfieldtype": "Data",
@ -47,6 +50,7 @@
"fieldname": "warehouse", "fieldname": "warehouse",
"fieldtype": "Link", "fieldtype": "Link",
"in_filter": 1, "in_filter": 1,
"in_list_view": 1,
"label": "Warehouse", "label": "Warehouse",
"oldfieldname": "warehouse", "oldfieldname": "warehouse",
"oldfieldtype": "Link", "oldfieldtype": "Link",
@ -61,6 +65,7 @@
"fieldname": "posting_date", "fieldname": "posting_date",
"fieldtype": "Date", "fieldtype": "Date",
"in_filter": 1, "in_filter": 1,
"in_list_view": 1,
"label": "Posting Date", "label": "Posting Date",
"oldfieldname": "posting_date", "oldfieldname": "posting_date",
"oldfieldtype": "Date", "oldfieldtype": "Date",
@ -220,12 +225,12 @@
}, },
{ {
"fieldname": "company", "fieldname": "company",
"fieldtype": "Select", "fieldtype": "Link",
"in_filter": 1, "in_filter": 1,
"label": "Company", "label": "Company",
"oldfieldname": "company", "oldfieldname": "company",
"oldfieldtype": "Data", "oldfieldtype": "Data",
"options": "link:Company", "options": "Company",
"permlevel": 0, "permlevel": 0,
"print_width": "150px", "print_width": "150px",
"read_only": 1, "read_only": 1,
@ -259,7 +264,7 @@
"icon": "icon-list", "icon": "icon-list",
"idx": 1, "idx": 1,
"in_create": 1, "in_create": 1,
"modified": "2013-11-03 14:11:43.000000", "modified": "2014-05-09 02:16:42.262203",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Stock", "module": "Stock",
"name": "Stock Ledger Entry", "name": "Stock Ledger Entry",
@ -283,5 +288,7 @@
"role": "Accounts Manager", "role": "Accounts Manager",
"submit": 0 "submit": 0
} }
] ],
"sort_field": "modified",
"sort_order": "DESC"
} }

12
erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.json
View File

@ -2,7 +2,7 @@
"allow_attach": 0, "allow_attach": 0,
"allow_copy": 1, "allow_copy": 1,
"autoname": "SR/.######", "autoname": "SR/.######",
"creation": "2013-03-28 10:35:31.000000", "creation": "2013-03-28 10:35:31",
"description": "This tool helps you to update or fix the quantity and valuation of stock in the system. It is typically used to synchronise the system values and what actually exists in your warehouses.", "description": "This tool helps you to update or fix the quantity and valuation of stock in the system. It is typically used to synchronise the system values and what actually exists in your warehouses.",
"docstatus": 0, "docstatus": 0,
"doctype": "DocType", "doctype": "DocType",
@ -44,9 +44,9 @@
}, },
{ {
"fieldname": "fiscal_year", "fieldname": "fiscal_year",
"fieldtype": "Select", "fieldtype": "Link",
"label": "Fiscal Year", "label": "Fiscal Year",
"options": "link:Fiscal Year", "options": "Fiscal Year",
"permlevel": 0, "permlevel": 0,
"print_hide": 1, "print_hide": 1,
"reqd": 1 "reqd": 1
@ -119,7 +119,7 @@
"idx": 1, "idx": 1,
"is_submittable": 1, "is_submittable": 1,
"max_attachments": 1, "max_attachments": 1,
"modified": "2014-01-20 17:49:28.000000", "modified": "2014-05-09 02:17:34.080012",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Stock", "module": "Stock",
"name": "Stock Reconciliation", "name": "Stock Reconciliation",
@ -139,5 +139,7 @@
} }
], ],
"read_only_onload": 0, "read_only_onload": 0,
"search_fields": "posting_date" "search_fields": "posting_date",
"sort_field": "modified",
"sort_order": "DESC"
} }

10
erpnext/support/doctype/customer_issue/customer_issue.json
View File

@ -344,12 +344,12 @@
}, },
{ {
"fieldname": "fiscal_year", "fieldname": "fiscal_year",
"fieldtype": "Select", "fieldtype": "Link",
"in_filter": 1, "in_filter": 1,
"label": "Fiscal Year", "label": "Fiscal Year",
"oldfieldname": "fiscal_year", "oldfieldname": "fiscal_year",
"oldfieldtype": "Select", "oldfieldtype": "Select",
"options": "link:Fiscal Year", "options": "Fiscal Year",
"permlevel": 0, "permlevel": 0,
"print_hide": 1, "print_hide": 1,
"reqd": 1, "reqd": 1,
@ -394,7 +394,7 @@
"icon": "icon-bug", "icon": "icon-bug",
"idx": 1, "idx": 1,
"is_submittable": 0, "is_submittable": 0,
"modified": "2014-05-06 08:20:32.784295", "modified": "2014-05-09 02:16:43.267003",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Support", "module": "Support",
"name": "Customer Issue", "name": "Customer Issue",
@ -415,5 +415,7 @@
"write": 1 "write": 1
} }
], ],
"search_fields": "status,customer,customer_name,territory" "search_fields": "status,customer,customer_name,territory",
"sort_field": "modified",
"sort_order": "DESC"
} }

16
erpnext/support/doctype/maintenance_visit/maintenance_visit.json
View File

@ -1,6 +1,6 @@
{ {
"autoname": "MV.#####", "autoname": "MV.#####",
"creation": "2013-01-10 16:34:31.000000", "creation": "2013-01-10 16:34:31",
"docstatus": 0, "docstatus": 0,
"doctype": "DocType", "doctype": "DocType",
"fields": [ "fields": [
@ -203,12 +203,12 @@
}, },
{ {
"fieldname": "company", "fieldname": "company",
"fieldtype": "Select", "fieldtype": "Link",
"in_filter": 1, "in_filter": 1,
"label": "Company", "label": "Company",
"oldfieldname": "company", "oldfieldname": "company",
"oldfieldtype": "Select", "oldfieldtype": "Select",
"options": "link:Company", "options": "Company",
"permlevel": 0, "permlevel": 0,
"print_hide": 1, "print_hide": 1,
"reqd": 1, "reqd": 1,
@ -216,12 +216,12 @@
}, },
{ {
"fieldname": "fiscal_year", "fieldname": "fiscal_year",
"fieldtype": "Select", "fieldtype": "Link",
"in_filter": 1, "in_filter": 1,
"label": "Fiscal Year", "label": "Fiscal Year",
"oldfieldname": "fiscal_year", "oldfieldname": "fiscal_year",
"oldfieldtype": "Select", "oldfieldtype": "Select",
"options": "link:Fiscal Year", "options": "Fiscal Year",
"permlevel": 0, "permlevel": 0,
"print_hide": 1, "print_hide": 1,
"reqd": 1, "reqd": 1,
@ -278,7 +278,7 @@
"icon": "icon-file-text", "icon": "icon-file-text",
"idx": 1, "idx": 1,
"is_submittable": 1, "is_submittable": 1,
"modified": "2014-01-20 17:48:57.000001", "modified": "2014-05-09 02:16:43.663232",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Support", "module": "Support",
"name": "Maintenance Visit", "name": "Maintenance Visit",
@ -299,5 +299,7 @@
"write": 1 "write": 1
} }
], ],
"search_fields": "status,maintenance_type,customer,customer_name, address,mntc_date,company,fiscal_year" "search_fields": "status,maintenance_type,customer,customer_name, address,mntc_date,company,fiscal_year",
"sort_field": "modified",
"sort_order": "DESC"
} }

2
erpnext/support/doctype/support_email_settings/support_email_settings.py
View File

@ -17,7 +17,7 @@ class SupportEmailSettings(Document):
Checks support ticket email settings Checks support ticket email settings
""" """
if self.sync_support_mails and self.mail_server: if self.sync_support_mails and self.mail_server:
inc_email = frappe.get_doc('Incoming Email Settings') inc_email = frappe._dict(self.as_dict())
# inc_email.encode() # inc_email.encode()
inc_email.host = self.mail_server inc_email.host = self.mail_server
inc_email.use_ssl = self.use_ssl inc_email.use_ssl = self.use_ssl

12
erpnext/utilities/doctype/address/address.json
View File

@ -1,7 +1,7 @@
{ {
"allow_import": 1, "allow_import": 1,
"allow_rename": 1, "allow_rename": 1,
"creation": "2013-01-10 16:34:32.000000", "creation": "2013-01-10 16:34:32",
"docstatus": 0, "docstatus": 0,
"doctype": "DocType", "doctype": "DocType",
"document_type": "Master", "document_type": "Master",
@ -74,11 +74,11 @@
}, },
{ {
"fieldname": "country", "fieldname": "country",
"fieldtype": "Select", "fieldtype": "Link",
"in_filter": 1, "in_filter": 1,
"in_list_view": 1, "in_list_view": 1,
"label": "Country", "label": "Country",
"options": "link:Country", "options": "Country",
"permlevel": 0, "permlevel": 0,
"reqd": 1, "reqd": 1,
"search_index": 1 "search_index": 1
@ -199,7 +199,7 @@
"icon": "icon-map-marker", "icon": "icon-map-marker",
"idx": 1, "idx": 1,
"in_dialog": 0, "in_dialog": 0,
"modified": "2014-01-27 11:19:06.000000", "modified": "2014-05-09 02:16:43.798644",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Utilities", "module": "Utilities",
"name": "Address", "name": "Address",
@ -258,5 +258,7 @@
"write": 1 "write": 1
} }
], ],
"search_fields": "customer, supplier, sales_partner, country, state" "search_fields": "customer, supplier, sales_partner, country, state",
"sort_field": "modified",
"sort_order": "DESC"
} }