Merge branch 'master' of github.com:webnotes/erpnext
diff --git a/hr/doctype/employee_leave_approver/employee_leave_approver.txt b/hr/doctype/employee_leave_approver/employee_leave_approver.txt
index f175bbd..d51d6a1 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",
diff --git a/public/js/transaction.js b/public/js/transaction.js
index c0a7506..7a1dc0c 100644
--- a/public/js/transaction.js
+++ b/public/js/transaction.js
@@ -40,22 +40,6 @@
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();
},
@@ -333,17 +317,6 @@
</table></div>';
},
- 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]) {