From 1f3374fcdf3e29a9fa6ad7d317db1b9c087bdbfb Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Sat, 29 Jun 2024 07:32:45 +0530 Subject: [PATCH] fix: reposting file attachment permission issue (backport #42068) (#42075) * fix: reposting file attachment permission issue (#42068) (cherry picked from commit 03e674e21d7ede46c43496d51db26ad523ae3fb1) # Conflicts: # erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.json * chore: fix conflicts --------- Co-authored-by: rohitwaghchaure --- .../doctype/repost_item_valuation/repost_item_valuation.js | 4 +--- .../repost_item_valuation/repost_item_valuation.json | 5 +++-- .../doctype/repost_item_valuation/repost_item_valuation.py | 6 ++++-- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.js b/erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.js index f0506ab6930..6f2548ac8ea 100644 --- a/erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.js +++ b/erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.js @@ -128,9 +128,7 @@ frappe.ui.form.on("Repost Item Valuation", { method: "restart_reposting", doc: frm.doc, callback: function (r) { - if (!r.exc) { - frm.refresh(); - } + frm.reload_doc(); }, }); }, diff --git a/erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.json b/erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.json index 1c5b521c296..67e97964e18 100644 --- a/erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.json +++ b/erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.json @@ -218,13 +218,14 @@ "fieldname": "reposting_data_file", "fieldtype": "Attach", "label": "Reposting Data File", + "no_copy": 1, "read_only": 1 } ], "index_web_pages_for_search": 1, "is_submittable": 1, "links": [], - "modified": "2023-05-31 12:48:57.138693", + "modified": "2024-06-27 16:55:23.150146", "modified_by": "Administrator", "module": "Stock", "name": "Repost Item Valuation", @@ -276,4 +277,4 @@ "sort_field": "modified", "sort_order": "DESC", "states": [] -} \ No newline at end of file +} diff --git a/erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py b/erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py index 40767704f4e..717b1c31026 100644 --- a/erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py +++ b/erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py @@ -179,7 +179,7 @@ class RepostItemValuation(Document): def clear_attachment(self): if attachments := get_attachments(self.doctype, self.name): attachment = attachments[0] - frappe.delete_doc("File", attachment.name) + frappe.delete_doc("File", attachment.name, ignore_permissions=True) if self.reposting_data_file: self.db_set("reposting_data_file", None) @@ -219,6 +219,7 @@ class RepostItemValuation(Document): self.distinct_item_and_warehouse = None self.items_to_be_repost = None self.gl_reposting_index = 0 + self.clear_attachment() self.db_update() def deduplicate_similar_repost(self): @@ -271,6 +272,7 @@ def repost(doc): repost_gl_entries(doc) doc.set_status("Completed") + doc.db_set("reposting_data_file", None) remove_attached_file(doc.name) except Exception as e: @@ -315,7 +317,7 @@ def remove_attached_file(docname): if file_name := frappe.db.get_value( "File", {"attached_to_name": docname, "attached_to_doctype": "Repost Item Valuation"}, "name" ): - frappe.delete_doc("File", file_name, delete_permanently=True) + frappe.delete_doc("File", file_name, ignore_permissions=True, delete_permanently=True) def repost_sl_entries(doc):