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

Reset values in tools like Payment Tool

Browse Source
This commit is contained in:
Nabin Hait 2015-06-05 12:01:29 +05:30
parent 6262496e70
commit 0b18a2d347
14 changed files with 53 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.js
View File

@ -2,6 +2,10 @@
// License: GNU General Public License v3. See license.txt // License: GNU General Public License v3. See license.txt
frappe.ui.form.on("Bank Reconciliation", { frappe.ui.form.on("Bank Reconciliation", {
refresh: function(frm) {
frm.disable_save();
},
update_clearance_date: function(frm) { update_clearance_date: function(frm) {
return frappe.call({ return frappe.call({
method: "update_details", method: "update_details",
@ -34,4 +38,3 @@ cur_frm.cscript.onload = function(doc, cdt, cdn) {
cur_frm.set_value("from_date", frappe.datetime.month_start()); cur_frm.set_value("from_date", frappe.datetime.month_start());
cur_frm.set_value("to_date", frappe.datetime.month_end()); cur_frm.set_value("to_date", frappe.datetime.month_end());
} }

4
erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js
View File

@ -45,6 +45,10 @@ erpnext.accounts.PaymentReconciliationController = frappe.ui.form.Controller.ext
}); });
}, },
refresh: function() {
this.frm.disable_save();
},
party: function() { party: function() {
var me = this var me = this
if(!me.frm.doc.receivable_payable_account && me.frm.doc.party_type && me.frm.doc.party) { if(!me.frm.doc.receivable_payable_account && me.frm.doc.party_type && me.frm.doc.party) {

1
erpnext/accounts/doctype/payment_tool/payment_tool.js
View File

@ -32,6 +32,7 @@ frappe.ui.form.on("Payment Tool", "onload", function(frm) {
}); });
frappe.ui.form.on("Payment Tool", "refresh", function(frm) { frappe.ui.form.on("Payment Tool", "refresh", function(frm) {
frm.disable_save();
frappe.ui.form.trigger("Payment Tool", "party_type"); frappe.ui.form.trigger("Payment Tool", "party_type");
}); });

2
erpnext/accounts/doctype/payment_tool/payment_tool.json
View File

@ -312,7 +312,7 @@
"is_submittable": 0, "is_submittable": 0,
"issingle": 1, "issingle": 1,
"istable": 0, "istable": 0,
"modified": "2015-02-21 03:59:08.154966", "modified": "2015-06-05 11:17:33.843334",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Payment Tool", "name": "Payment Tool",

2
erpnext/accounts/report/gross_profit/gross_profit.py
View File

@ -14,7 +14,7 @@ def execute(filters=None):
source = gross_profit_data.grouped_data if filters.get("group_by") != "Invoice" else gross_profit_data.data source = gross_profit_data.grouped_data if filters.get("group_by") != "Invoice" else gross_profit_data.data
group_wise_columns = frappe._dict({ group_wise_columns = frappe._dict({
"invoice": ["parent", "posting_date", "posting_time", "item_code", "item_name", "brand", "description", \ "invoice": ["parent", "customer", "posting_date", "posting_time", "item_code", "item_name", "brand", "description", \
"warehouse", "qty", "base_rate", "buying_rate", "base_amount", "warehouse", "qty", "base_rate", "buying_rate", "base_amount",
"buying_amount", "gross_profit", "gross_profit_percent", "project"], "buying_amount", "gross_profit", "gross_profit_percent", "project"],
"item_code": ["item_code", "item_name", "brand", "description", "warehouse", "qty", "base_rate", "item_code": ["item_code", "item_name", "brand", "description", "warehouse", "qty", "base_rate",

4
erpnext/hr/doctype/leave_control_panel/leave_control_panel.js
View File

@ -25,3 +25,7 @@ cur_frm.cscript.allocation_type = function (doc, cdt, cdn){
doc.no_of_days = ''; doc.no_of_days = '';
refresh_field('no_of_days'); refresh_field('no_of_days');
} }
frappe.ui.form.on("Leave Control Panel", "refresh", function(frm) {
frm.disable_save();
});

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

@ -94,11 +94,11 @@
} }
], ],
"hide_heading": 0, "hide_heading": 0,
"hide_toolbar": 0, "hide_toolbar": 1,
"icon": "icon-cog", "icon": "icon-cog",
"idx": 1, "idx": 1,
"issingle": 1, "issingle": 1,
"modified": "2015-02-05 05:11:40.791976", "modified": "2015-06-05 11:38:19.994852",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "HR", "module": "HR",
"name": "Leave Control Panel", "name": "Leave Control Panel",
@ -110,7 +110,7 @@
"read": 1, "read": 1,
"report": 0, "report": 0,
"role": "HR User", "role": "HR User",
"share": 1, "share": 0,
"submit": 0, "submit": 0,
"write": 1 "write": 1
} }

5
erpnext/hr/doctype/salary_manager/salary_manager.js
View File

@ -43,3 +43,8 @@ cur_frm.cscript.make_jv = function(doc, dt, dn) {
frappe.set_route("Form", doc.doctype, doc.name); frappe.set_route("Form", doc.doctype, doc.name);
}); });
} }
frappe.ui.form.on("Salary Manager", "refresh", function(frm) {
frm.disable_save();
});

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

@ -150,10 +150,11 @@
"permlevel": 0 "permlevel": 0
} }
], ],
"hide_toolbar": 1,
"icon": "icon-cog", "icon": "icon-cog",
"idx": 1, "idx": 1,
"issingle": 1, "issingle": 1,
"modified": "2015-02-25 07:21:04.778082", "modified": "2015-06-05 11:33:00.152362",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "HR", "module": "HR",
"name": "Salary Manager", "name": "Salary Manager",

1
erpnext/hr/doctype/upload_attendance/upload_attendance.js
View File

@ -12,6 +12,7 @@ erpnext.hr.AttendanceControlPanel = frappe.ui.form.Controller.extend({
}, },
refresh: function() { refresh: function() {
this.frm.disable_save();
this.show_upload(); this.show_upload();
}, },

17
erpnext/hr/doctype/upload_attendance/upload_attendance.json
View File

@ -1,4 +1,5 @@
{ {
"allow_copy": 1,
"creation": "2013-01-25 11:34:53", "creation": "2013-01-25 11:34:53",
"docstatus": 0, "docstatus": 0,
"doctype": "DocType", "doctype": "DocType",
@ -53,11 +54,13 @@
"permlevel": 0 "permlevel": 0
} }
], ],
"hide_heading": 0,
"hide_toolbar": 1,
"icon": "icon-upload-alt", "icon": "icon-upload-alt",
"idx": 1, "idx": 1,
"issingle": 1, "issingle": 1,
"max_attachments": 1, "max_attachments": 1,
"modified": "2015-02-05 05:11:48.540845", "modified": "2015-06-05 11:37:04.348120",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "HR", "module": "HR",
"name": "Upload Attendance", "name": "Upload Attendance",
@ -65,25 +68,25 @@
"permissions": [ "permissions": [
{ {
"create": 1, "create": 1,
"email": 1, "email": 0,
"permlevel": 0, "permlevel": 0,
"print": 1, "print": 0,
"read": 1, "read": 1,
"report": 0, "report": 0,
"role": "HR User", "role": "HR User",
"share": 1, "share": 0,
"submit": 0, "submit": 0,
"write": 1 "write": 1
}, },
{ {
"create": 1, "create": 1,
"email": 1, "email": 0,
"permlevel": 0, "permlevel": 0,
"print": 1, "print": 0,
"read": 1, "read": 1,
"report": 0, "report": 0,
"role": "HR Manager", "role": "HR Manager",
"share": 1, "share": 0,
"submit": 0, "submit": 0,
"write": 1 "write": 1
} }

4
erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.json
View File

@ -1,4 +1,5 @@
{ {
"allow_copy": 1,
"creation": "2013-01-21 12:03:47", "creation": "2013-01-21 12:03:47",
"default_print_format": "Standard", "default_print_format": "Standard",
"docstatus": 0, "docstatus": 0,
@ -154,11 +155,12 @@
"permlevel": 0 "permlevel": 0
} }
], ],
"hide_toolbar": 1,
"icon": "icon-calendar", "icon": "icon-calendar",
"idx": 1, "idx": 1,
"in_create": 1, "in_create": 1,
"issingle": 1, "issingle": 1,
"modified": "2015-02-05 05:11:43.010625", "modified": "2015-06-05 11:44:31.629114",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Manufacturing", "module": "Manufacturing",
"name": "Production Planning Tool", "name": "Production Planning Tool",

1
erpnext/patches.txt
View File

@ -163,3 +163,4 @@ execute:frappe.db.sql_list("delete from `tabDocPerm` where parent='Issue' and mo
erpnext.patches.v5_0.update_item_and_description_again erpnext.patches.v5_0.update_item_and_description_again
erpnext.patches.v5_0.repost_gle_for_jv_with_multiple_party erpnext.patches.v5_0.repost_gle_for_jv_with_multiple_party
erpnext.patches.v5_0.portal_fixes erpnext.patches.v5_0.portal_fixes
erpnext.patches.v5_0.reset_values_in_tools

11
erpnext/patches/v5_0/reset_values_in_tools.py Normal file
View File

@ -0,0 +1,11 @@
# Copyright (c) 2013, Frappe Technologies Pvt. Ltd. and Contributors
# License: GNU General Public License v3. See license.txt
from __future__ import unicode_literals
import frappe
def execute():
for dt in ["Payment Tool", "Bank Reconciliation", "Payment Reconciliation", "Leave Control Panel",
"Salary Manager", "Upload Attenadance", "Production Planning Tool", "BOM Replace Tool"]:
frappe.db.sql("delete from `tabSingles` where doctype=%s", dt)