Invalid date value comparison, fixes for mariadb 10.2.3+
This commit is contained in:
parent
e37e5d6134
commit
7918b92d95
@ -130,8 +130,8 @@ def get_party_details(party, party_type, args=None):
|
|||||||
def get_tax_template(posting_date, args):
|
def get_tax_template(posting_date, args):
|
||||||
"""Get matching tax rule"""
|
"""Get matching tax rule"""
|
||||||
args = frappe._dict(args)
|
args = frappe._dict(args)
|
||||||
conditions = ["""(from_date is null or from_date = '' or from_date <= '{0}')
|
conditions = ["""(from_date is null or from_date <= '{0}')
|
||||||
and (to_date is null or to_date = '' or to_date >= '{0}')""".format(posting_date)]
|
and (to_date is null or to_date >= '{0}')""".format(posting_date)]
|
||||||
|
|
||||||
for key, value in args.iteritems():
|
for key, value in args.iteritems():
|
||||||
if key=="use_for_shopping_cart":
|
if key=="use_for_shopping_cart":
|
||||||
|
@ -257,7 +257,7 @@ def get_delivery_notes_to_be_billed(doctype, txt, searchfield, start, page_len,
|
|||||||
def get_batch_no(doctype, txt, searchfield, start, page_len, filters):
|
def get_batch_no(doctype, txt, searchfield, start, page_len, filters):
|
||||||
cond = ""
|
cond = ""
|
||||||
if filters.get("posting_date"):
|
if filters.get("posting_date"):
|
||||||
cond = "and (ifnull(batch.expiry_date, '')='' or batch.expiry_date >= %(posting_date)s)"
|
cond = "and (batch.expiry_date is null or batch.expiry_date >= %(posting_date)s)"
|
||||||
|
|
||||||
batch_nos = None
|
batch_nos = None
|
||||||
args = {
|
args = {
|
||||||
|
@ -5,5 +5,5 @@ def execute():
|
|||||||
frappe.db.sql("""
|
frappe.db.sql("""
|
||||||
update `tabCurrency Exchange`
|
update `tabCurrency Exchange`
|
||||||
set `date` = '2010-01-01'
|
set `date` = '2010-01-01'
|
||||||
where date is null or date = '' or date = '0000-00-00'
|
where date is null or date = '0000-00-00'
|
||||||
""")
|
""")
|
@ -7,7 +7,7 @@ def execute():
|
|||||||
frappe.reload_doc("hr", "doctype", "attendance")
|
frappe.reload_doc("hr", "doctype", "attendance")
|
||||||
frappe.db.sql("""update `tabAttendance`
|
frappe.db.sql("""update `tabAttendance`
|
||||||
set attendance_date = att_date
|
set attendance_date = att_date
|
||||||
where attendance_date is null or attendance_date = '' or attendance_date = '0000-00-00'""")
|
where attendance_date is null or attendance_date = '0000-00-00'""")
|
||||||
|
|
||||||
update_reports("Attendance", "att_date", "attendance_date")
|
update_reports("Attendance", "att_date", "attendance_date")
|
||||||
update_users_report_view_settings("Attendance", "att_date", "attendance_date")
|
update_users_report_view_settings("Attendance", "att_date", "attendance_date")
|
||||||
|
@ -9,8 +9,7 @@ def execute():
|
|||||||
|
|
||||||
salary_slips = frappe.db.sql("""select month, name, fiscal_year from `tabSalary Slip`
|
salary_slips = frappe.db.sql("""select month, name, fiscal_year from `tabSalary Slip`
|
||||||
where (month is not null and month != '') and
|
where (month is not null and month != '') and
|
||||||
(start_date is null or start_date = '') and
|
start_date is null and end_date is null and docstatus != 2""", as_dict=True)
|
||||||
(end_date is null or end_date = '') and docstatus != 2""", as_dict=True)
|
|
||||||
|
|
||||||
for salary_slip in salary_slips:
|
for salary_slip in salary_slips:
|
||||||
if not cint(salary_slip.month):
|
if not cint(salary_slip.month):
|
||||||
|
Loading…
x
Reference in New Issue
Block a user