|
@@ -34,7 +34,6 @@ def get_file_path(module, dt, dn): |
|
|
|
|
|
|
|
|
def import_file_by_path(path, force=False, data_import=False, pre_process=None, ignore_version=None, |
|
|
def import_file_by_path(path, force=False, data_import=False, pre_process=None, ignore_version=None, |
|
|
reset_permissions=False): |
|
|
reset_permissions=False): |
|
|
frappe.flags.in_import = True |
|
|
|
|
|
try: |
|
|
try: |
|
|
docs = read_doc_from_file(path) |
|
|
docs = read_doc_from_file(path) |
|
|
except IOError: |
|
|
except IOError: |
|
@@ -54,8 +53,10 @@ def import_file_by_path(path, force=False, data_import=False, pre_process=None, |
|
|
|
|
|
|
|
|
original_modified = doc.get("modified") |
|
|
original_modified = doc.get("modified") |
|
|
|
|
|
|
|
|
|
|
|
frappe.flags.in_import = True |
|
|
import_doc(doc, force=force, data_import=data_import, pre_process=pre_process, |
|
|
import_doc(doc, force=force, data_import=data_import, pre_process=pre_process, |
|
|
ignore_version=ignore_version, reset_permissions=reset_permissions) |
|
|
ignore_version=ignore_version, reset_permissions=reset_permissions) |
|
|
|
|
|
frappe.flags.in_import = False |
|
|
|
|
|
|
|
|
if original_modified: |
|
|
if original_modified: |
|
|
# since there is a new timestamp on the file, update timestamp in |
|
|
# since there is a new timestamp on the file, update timestamp in |
|
@@ -67,7 +68,6 @@ def import_file_by_path(path, force=False, data_import=False, pre_process=None, |
|
|
(doc['doctype'], '%s', '%s'), |
|
|
(doc['doctype'], '%s', '%s'), |
|
|
(original_modified, doc['name'])) |
|
|
(original_modified, doc['name'])) |
|
|
|
|
|
|
|
|
frappe.flags.in_import = False |
|
|
|
|
|
return True |
|
|
return True |
|
|
|
|
|
|
|
|
def read_doc_from_file(path): |
|
|
def read_doc_from_file(path): |
|
|