Merge pull request #5013 from agusputra/patch-25
Update allow-over-delivery-billing-against-sales-order-upto-certain-l…
diff --git a/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js b/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js
index f29bc89..3493719 100644
--- a/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js
+++ b/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js
@@ -2,8 +2,9 @@
refresh: function(frm) {
frm.disable_save();
},
-
+
onload: function(frm) {
+ frm.set_value("date", get_today());
erpnext.employee_attendance_tool.load_employees(frm);
},
@@ -22,8 +23,7 @@
company: function(frm) {
erpnext.employee_attendance_tool.load_employees(frm);
}
-
-
+
});
diff --git a/erpnext/public/js/controllers/transaction.js b/erpnext/public/js/controllers/transaction.js
index d109c65..6de5154 100644
--- a/erpnext/public/js/controllers/transaction.js
+++ b/erpnext/public/js/controllers/transaction.js
@@ -841,11 +841,11 @@
return;
}
- if(!this.frm.doc.recurring_id) {
- this.frm.set_value('recurring_id', this.frm.doc.name);
- }
-
if(this.frm.doc.is_recurring) {
+ if(!this.frm.doc.recurring_id) {
+ this.frm.set_value('recurring_id', this.frm.doc.name);
+ }
+
var owner_email = this.frm.doc.owner=="Administrator"
? frappe.user_info("Administrator").email
: this.frm.doc.owner;