From 8adb21121691a1d8d772c7e150b7539025487f5b Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Wed, 9 Jul 2014 11:09:33 +0530 Subject: [PATCH] Fixed patch: erpnext/patches/v4_1/fix_delivery_and_billing_status.py --- erpnext/patches.txt | 2 +- ...for_draft_so.py => fix_delivery_and_billing_status.py} | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) rename erpnext/patches/v4_1/{fix_delivery_and_billing_status_for_draft_so.py => fix_delivery_and_billing_status.py} (80%) diff --git a/erpnext/patches.txt b/erpnext/patches.txt index 1c2112d7b85..b7fc5e77681 100644 --- a/erpnext/patches.txt +++ b/erpnext/patches.txt @@ -67,4 +67,4 @@ erpnext.patches.v4_0.set_naming_series_property_setter erpnext.patches.v4_1.set_outgoing_email_footer erpnext.patches.v4_1.fix_jv_remarks erpnext.patches.v4_1.fix_sales_order_delivered_status -erpnext.patches.v4_1.fix_delivery_and_billing_status_for_draft_so \ No newline at end of file +erpnext.patches.v4_1.fix_delivery_and_billing_status diff --git a/erpnext/patches/v4_1/fix_delivery_and_billing_status_for_draft_so.py b/erpnext/patches/v4_1/fix_delivery_and_billing_status.py similarity index 80% rename from erpnext/patches/v4_1/fix_delivery_and_billing_status_for_draft_so.py rename to erpnext/patches/v4_1/fix_delivery_and_billing_status.py index 8d38338e040..2dbc8250850 100644 --- a/erpnext/patches/v4_1/fix_delivery_and_billing_status_for_draft_so.py +++ b/erpnext/patches/v4_1/fix_delivery_and_billing_status.py @@ -5,8 +5,8 @@ from __future__ import unicode_literals import frappe def execute(): - frappe.db.sql("""update `tabSales Order` set delivery_status = 'Not Delivered' - where delivery_status = 'Delivered' and ifnull(per_delivered, 0) = 0 and docstatus = 0""") + frappe.db.sql("""update `tabSales Order` set delivery_status = 'Not Delivered' + where delivery_status = 'Delivered' and ifnull(per_delivered, 0) = 0 and ifnull(docstatus, 0) in (0, 1)""") - frappe.db.sql("""update `tabSales Order` set billing_status = 'Not Billed' - where billing_status = 'Billed' and ifnull(per_billed, 0) = 0 and docstatus = 0""") \ No newline at end of file + frappe.db.sql("""update `tabSales Order` set billing_status = 'Not Billed' + where billing_status = 'Billed' and ifnull(per_billed, 0) = 0 and ifnull(docstatus, 0) in (0, 1)""")