From a9b1c091665bc35bdc516d9556e859de3b472bd5 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Mon, 5 Aug 2013 18:07:45 +0530 Subject: [PATCH 1/2] [minor] [fixes] removed onload_post_render from transaction.js, since it is already called after mapping on server side --- public/js/transaction.js | 27 --------------------------- 1 file changed, 27 deletions(-) diff --git a/public/js/transaction.js b/public/js/transaction.js index 34d3cb0429..3348307b80 100644 --- a/public/js/transaction.js +++ b/public/js/transaction.js @@ -53,22 +53,6 @@ erpnext.TransactionController = erpnext.stock.StockController.extend({ this.set_dynamic_labels(); }, - onload_post_render: function() { - if(this.frm.doc.__islocal && this.frm.doc.company) { - var me = this; - return this.frm.call({ - doc: this.frm.doc, - method: "onload_post_render", - freeze: true, - callback: function(r) { - // remove this call when using client side mapper - me.set_default_values(); - me.frm.refresh(); - } - }); - } - }, - validate: function() { this.calculate_taxes_and_totals(); }, @@ -346,17 +330,6 @@ erpnext.TransactionController = erpnext.stock.StockController.extend({ '; }, - set_default_values: function() { - $.each(wn.model.get_doclist(this.frm.doctype, this.frm.docname), function(i, doc) { - var updated = wn.model.set_default_values(doc); - if(doc.parentfield) { - refresh_field(doc.parentfield); - } else { - refresh_field(updated); - } - }); - }, - _validate_before_fetch: function(fieldname) { var me = this; if(!me.frm.doc[fieldname]) { From 15253cb36a7865634a802a38dcc6bc64a91284e5 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Mon, 5 Aug 2013 18:08:04 +0530 Subject: [PATCH 2/2] [fix] [minor] in_list_view for employee leave approver --- .../employee_leave_approver/employee_leave_approver.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hr/doctype/employee_leave_approver/employee_leave_approver.txt b/hr/doctype/employee_leave_approver/employee_leave_approver.txt index f175bbdc29..d51d6a128b 100644 --- a/hr/doctype/employee_leave_approver/employee_leave_approver.txt +++ b/hr/doctype/employee_leave_approver/employee_leave_approver.txt @@ -2,7 +2,7 @@ { "creation": "2013-04-12 06:56:15", "docstatus": 0, - "modified": "2013-07-10 14:54:08", + "modified": "2013-08-05 14:15:44", "modified_by": "Administrator", "owner": "Administrator" }, @@ -19,7 +19,7 @@ "doctype": "DocField", "fieldname": "leave_approver", "fieldtype": "Select", - "in_list_view": 0, + "in_list_view": 1, "label": "Leave Approver", "name": "__common__", "parent": "Employee Leave Approver",