From 67e6c8043785135ffab9b4f895fa0732a74e0834 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Thu, 18 Jul 2013 13:25:47 +0530 Subject: [PATCH] [fix] [minor] validate same sales rate patch --- patches/july_2013/p06_same_sales_rate.py | 10 +++++----- setup/doctype/global_defaults/global_defaults.py | 1 - 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/patches/july_2013/p06_same_sales_rate.py b/patches/july_2013/p06_same_sales_rate.py index ea429b2745..8222d3b361 100644 --- a/patches/july_2013/p06_same_sales_rate.py +++ b/patches/july_2013/p06_same_sales_rate.py @@ -3,11 +3,11 @@ def execute(): webnotes.reload_doc("selling", "doctype", "selling_settings") ss = webnotes.bean("Selling Settings") - same_rate = webnotes.conn.sql("""select field, value from `tabSingles` - where doctype = 'Global Defaults' and field = 'maintain_same_sales_rate'""") - if same_rate: - ss.doc.maintain_same_sales_rate = same_rate[1] + same_rate = webnotes.conn.get_value("Global Defaults", "maintain_same_sales_rate") + + if same_rate or same_rate == 0: + ss.doc.maintain_same_sales_rate = same_rate else: ss.doc.maintain_same_sales_rate = 1 - + ss.save() \ No newline at end of file diff --git a/setup/doctype/global_defaults/global_defaults.py b/setup/doctype/global_defaults/global_defaults.py index 9be849952f..7b0c277900 100644 --- a/setup/doctype/global_defaults/global_defaults.py +++ b/setup/doctype/global_defaults/global_defaults.py @@ -33,7 +33,6 @@ keydict = { 'account_url':'account_url', 'session_expiry': 'session_expiry', 'disable_rounded_total': 'disable_rounded_total', - 'maintain_same_sales_rate' : 'maintain_same_sales_rate', } class DocType: