nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-27 00:44:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #51197 from ruthra-kumar/fix_deterministic_bug_in_sql_procedures

Browse Source 
refactor: remove custom sql function in AR SQL procedure approach
This commit is contained in:
ruthra kumar
2025-12-18 17:07:24 +05:30
committed by GitHub
parent 41e1f92612 d1e0992253
commit 7a3206f0bf
2 changed files with 3 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
erpnext/accounts/doctype/accounts_settings/accounts_settings.py
View File

@@ -152,6 +152,5 @@ class AccountsSettings(Document):
def drop_ar_sql_procedures(self): def drop_ar_sql_procedures(self):
from erpnext.accounts.report.accounts_receivable.accounts_receivable import InitSQLProceduresForAR from erpnext.accounts.report.accounts_receivable.accounts_receivable import InitSQLProceduresForAR
frappe.db.sql(f"drop function if exists {InitSQLProceduresForAR.genkey_function_name}")
frappe.db.sql(f"drop procedure if exists {InitSQLProceduresForAR.init_procedure_name}") frappe.db.sql(f"drop procedure if exists {InitSQLProceduresForAR.init_procedure_name}")
frappe.db.sql(f"drop procedure if exists {InitSQLProceduresForAR.allocate_procedure_name}") frappe.db.sql(f"drop procedure if exists {InitSQLProceduresForAR.allocate_procedure_name}")

22
erpnext/accounts/report/accounts_receivable/accounts_receivable.py
View File

@@ -1384,27 +1384,14 @@ class InitSQLProceduresForAR:
amount_in_account_currency {_currency_type}) engine=memory; amount_in_account_currency {_currency_type}) engine=memory;
""" """
# Function
genkey_function_name = "ar_genkey"
genkey_function_sql = f"""
create function `{genkey_function_name}`(rec row type of `{_row_def_table_name}`, allocate bool) returns char(40)
begin
if allocate then
return sha1(concat_ws(',', rec.account, rec.against_voucher_type, rec.against_voucher_no, rec.party));
else
return sha1(concat_ws(',', rec.account, rec.voucher_type, rec.voucher_no, rec.party));
end if;
end
"""
# Procedures # Procedures
init_procedure_name = "ar_init_tmp_table" init_procedure_name = "ar_init_tmp_table"
init_procedure_sql = f""" init_procedure_sql = f"""
create procedure ar_init_tmp_table(in ple row type of `{_row_def_table_name}`) create procedure ar_init_tmp_table(in ple row type of `{_row_def_table_name}`)
begin begin
if not exists (select name from `{_voucher_balance_name}` where name = `{genkey_function_name}`(ple, false)) if not exists (select name from `{_voucher_balance_name}` where name = sha1(concat_ws(',', ple.account, ple.against_voucher_type, ple.against_voucher_no, ple.party)))
then then
insert into `{_voucher_balance_name}` values (`{genkey_function_name}`(ple, false), ple.voucher_type, ple.voucher_no, ple.party, ple.account, ple.posting_date, ple.account_currency, ple.cost_center, 0, 0, 0, 0, 0, 0); insert into `{_voucher_balance_name}` values (sha1(concat_ws(',', ple.account, ple.against_voucher_type, ple.against_voucher_no, ple.party)), ple.voucher_type, ple.voucher_no, ple.party, ple.account, ple.posting_date, ple.account_currency, ple.cost_center, 0, 0, 0, 0, 0, 0);
end if; end if;
end; end;
""" """
@@ -1446,16 +1433,13 @@ class InitSQLProceduresForAR:
end if; end if;
insert into `{_voucher_balance_name}` values (`{genkey_function_name}`(ple, true), ple.against_voucher_type, ple.against_voucher_no, ple.party, ple.account, ple.posting_date, ple.account_currency,'', invoiced, paid, 0, invoiced_in_account_currency, paid_in_account_currency, 0); insert into `{_voucher_balance_name}` values (sha1(concat_ws(',', ple.account, ple.voucher_type, ple.voucher_no, ple.party)), ple.against_voucher_type, ple.against_voucher_no, ple.party, ple.account, ple.posting_date, ple.account_currency,'', invoiced, paid, 0, invoiced_in_account_currency, paid_in_account_currency, 0);
end; end;
""" """
def __init__(self): def __init__(self):
existing_procedures = frappe.db.get_routines() existing_procedures = frappe.db.get_routines()
if self.genkey_function_name not in existing_procedures:
frappe.db.sql(self.genkey_function_sql)
if self.init_procedure_name not in existing_procedures: if self.init_procedure_name not in existing_procedures:
frappe.db.sql(self.init_procedure_sql) frappe.db.sql(self.init_procedure_sql)