match condition added in daily time log summary report
diff --git a/projects/report/daily_time_log_summary/daily_time_log_summary.js b/projects/report/daily_time_log_summary/daily_time_log_summary.js
index 8147676..ba87d0d 100644
--- a/projects/report/daily_time_log_summary/daily_time_log_summary.js
+++ b/projects/report/daily_time_log_summary/daily_time_log_summary.js
@@ -3,13 +3,13 @@
{
"fieldname":"from_date",
"label": "From Date",
- "fieldtype": "Datetime",
+ "fieldtype": "Date",
"default": wn.datetime.get_today()
},
{
"fieldname":"to_date",
"label": "To Date",
- "fieldtype": "Datetime",
+ "fieldtype": "Date",
"default": wn.datetime.get_today()
},
]
diff --git a/projects/report/daily_time_log_summary/daily_time_log_summary.py b/projects/report/daily_time_log_summary/daily_time_log_summary.py
index 0309977..eec5444 100644
--- a/projects/report/daily_time_log_summary/daily_time_log_summary.py
+++ b/projects/report/daily_time_log_summary/daily_time_log_summary.py
@@ -2,7 +2,11 @@
import webnotes
def execute(filters=None):
- if not filters: filters = {}
+ if not filters:
+ filters = {}
+ elif filters.get("to_date"):
+ filters["to_date"] = filters.get("to_date") + "24:00:00"
+
columns = ["Employee::150", "From Datetime::120", "To Datetime::120", "Hours::70", "Task::150",
"Project:Link/Project:120", "Status::70"]
@@ -10,19 +14,19 @@
conditions = build_conditions(filters)
time_logs = webnotes.conn.sql("""select * from `tabTime Log`
- where docstatus < 2 %s order by owner asc""" % (conditions,), filters, as_dict=1)
-
- data = []
- profiles = [time_logs[0].owner]
+ where docstatus < 2 %s order by owner asc""" % (conditions, ), filters, as_dict=1)
+
+ data = []
+ if time_logs:
+ profiles = [time_logs[0].owner]
for tl in time_logs:
-
if tl.owner not in profiles:
profiles.append(tl.owner)
data.append([])
data.append([profile_map[tl.owner], tl.from_time, tl.to_time, tl.hours,
- tl.task, tl.project, tl.status])
+ tl.task, tl.project, tl.status])
return columns, data
@@ -42,5 +46,10 @@
conditions += " and from_time >= %(from_date)s"
if filters.get("to_date"):
conditions += " and to_time <= %(to_date)s"
+
+ from webnotes.widgets.reportview import build_match_conditions
+ match_conditions = build_match_conditions("Time Log")
+ if match_conditions:
+ conditions += " and %s" % match_conditions
return conditions
\ No newline at end of file
diff --git a/stock/doctype/stock_reconciliation/stock_reconciliation.js b/stock/doctype/stock_reconciliation/stock_reconciliation.js
index b723061..3938661 100644
--- a/stock/doctype/stock_reconciliation/stock_reconciliation.js
+++ b/stock/doctype/stock_reconciliation/stock_reconciliation.js
@@ -67,7 +67,7 @@
attach the modified file.");
}
} else if(this.frm.doc.docstatus == 1) {
- this.frm.set_intro("Cancelling this Stock Reconciliation will nullify it's effect.");
+ this.frm.set_intro("Cancelling this Stock Reconciliation will nullify its effect.");
this.show_stock_ledger();
} else {
this.frm.set_intro("");