|
@ -766,7 +766,7 @@ def old_merge_json_files(old_json_path, new_json_path, out_file_path): |
|
|
except Exception as e: |
|
|
except Exception as e: |
|
|
return False, frappe.get_traceback() |
|
|
return False, frappe.get_traceback() |
|
|
|
|
|
|
|
|
|
|
|
@frappe.whitelist() |
|
|
def merge_json_files(old_json_path, new_json_path, out_file_path): |
|
|
def merge_json_files(old_json_path, new_json_path, out_file_path): |
|
|
try: |
|
|
try: |
|
|
final_data = {"JSON": []} |
|
|
final_data = {"JSON": []} |
|
|