diff --git a/erpnext/accounts/report/general_ledger/general_ledger.html b/erpnext/accounts/report/general_ledger/general_ledger.html index 5cfdc9f156..7f50599fbe 100644 --- a/erpnext/accounts/report/general_ledger/general_ledger.html +++ b/erpnext/accounts/report/general_ledger/general_ledger.html @@ -9,9 +9,9 @@ {% } %}
- {%= dateutil.str_to_user(filters.from_date) %} + {%= frappe.datetime.str_to_user(filters.from_date) %} {%= __("to") %} - {%= dateutil.str_to_user(filters.to_date) %} + {%= frappe.datetime.str_to_user(filters.to_date) %}

@@ -29,7 +29,7 @@ {% for(var i=0, l=data.length; i {% if(data[i].posting_date) { %} - + - {% } %} + {% } %} @@ -66,4 +66,4 @@ {% } %}
{%= dateutil.str_to_user(data[i].posting_date) %}{%= frappe.datetime.str_to_user(data[i].posting_date) %} {%= data[i].voucher_type %}
{%= data[i].voucher_no %}
@@ -58,7 +58,7 @@ {%= data[i].account && format_currency(data[i].credit, filters.presentation_currency) %} {%= format_currency(data[i].balance, filters.presentation_currency) %}
-

Printed On {%= dateutil.str_to_user(dateutil.get_datetime_as_string()) %}

+

Printed On {%= frappe.datetime.str_to_user(frappe.datetime.get_datetime_as_string()) %}

diff --git a/erpnext/projects/doctype/task/task.py b/erpnext/projects/doctype/task/task.py index 480926c056..76c34db1e9 100644 --- a/erpnext/projects/doctype/task/task.py +++ b/erpnext/projects/doctype/task/task.py @@ -50,7 +50,7 @@ class Task(NestedSet): clear(self.doctype, self.name) def validate_progress(self): - if self.progress > 100: + if (self.progress or 0) > 100: frappe.throw(_("Progress % for a task cannot be more than 100.")) def update_depends_on(self):