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

[minor] add disabled property in fiscal year:

Browse Source
This commit is contained in:
Rushabh Mehta 2015-04-18 17:03:49 +05:30
parent ddaedefb32
commit d7330ec709
2 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
erpnext/accounts/doctype/fiscal_year/fiscal_year.json
View File

@ -18,6 +18,13 @@
"permlevel": 0, "permlevel": 0,
"reqd": 1 "reqd": 1
}, },
{
"fieldname": "disabled",
"fieldtype": "Check",
"label": "Disabled",
"permlevel": 0,
"precision": ""
},
{ {
"fieldname": "year_start_date", "fieldname": "year_start_date",
"fieldtype": "Date", "fieldtype": "Date",
@ -49,7 +56,7 @@
], ],
"icon": "icon-calendar", "icon": "icon-calendar",
"idx": 1, "idx": 1,
"modified": "2015-02-05 05:11:38.994147", "modified": "2015-04-18 07:33:23.922518",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Fiscal Year", "name": "Fiscal Year",

2
erpnext/manufacturing/doctype/production_order/production_order.js
View File

@ -69,14 +69,12 @@ erpnext.production_order = {
cur_frm.cscript['Update Finished Goods'], frappe.boot.doctype_icons["Stock Entry"]); cur_frm.cscript['Update Finished Goods'], frappe.boot.doctype_icons["Stock Entry"]);
} }
if(doc.status==="Completed") {
frm.add_custom_button(__("Show Stock Entries"), function() { frm.add_custom_button(__("Show Stock Entries"), function() {
frappe.route_options = { frappe.route_options = {
production_order: frm.doc.name production_order: frm.doc.name
} }
frappe.set_route("List", "Stock Entry"); frappe.set_route("List", "Stock Entry");
}); });
}
if (doc.status != 'Stopped' && doc.status != 'Completed') { if (doc.status != 'Stopped' && doc.status != 'Completed') {
frm.add_custom_button(__('Stop'), cur_frm.cscript['Stop Production Order'], frm.add_custom_button(__('Stop'), cur_frm.cscript['Stop Production Order'],