Skip to content

TASK-2025-01184:Edited Asset Transfer Request doctype #1033

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MhmdSinanKT merged 2 commits into from
Jun 10, 2025
Merged

TASK-2025-01184:Edited Asset Transfer Request doctype #1033

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a90de51
fix:Edited asset transfer request doctype
NaseeraVP Jun 10, 2025
911e59a
fix:Removed unnecessary line breaks
NaseeraVP Jun 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 4 additions & 20 deletions beams/beams/doctype/asset_transfer_request/asset_transfer_request.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,26 +105,6 @@ frappe.ui.form.on("Asset Transfer Request", {
frm.refresh_field('assets');
}
},
asset_return_checklist_template: function(frm) {
if (frm.doc.asset_return_checklist_template) {
frappe.call({
method: "beams.beams.doctype.asset_transfer_request.asset_transfer_request.get_asset_return_checklist_template",
args: {
template_name: frm.doc.asset_return_checklist_template
},
callback: function(response) {
if (response.message) {
frm.clear_table("aresponse.messageet_return_checklist");
response.message.forEach(item => {
let row = frm.add_child("asset_return_checklist");
row.checklist_item = item.checklist_item;
});
frm.refresh_field("asset_return_checklist");
}
}
});
}
},
refresh(frm) {
frappe.db.get_list("Asset Transfer Request", {
fields: ["asset", "bundle"],
Expand All @@ -143,6 +123,10 @@ frappe.ui.form.on("Asset Transfer Request", {
]
}));
}).catch(err => console.error("Error:", err));
frm.set_df_property("asset_return_checklist", "cannot_add_rows", true);
frm.fields_dict.asset_return_checklist.grid.update_docfield_property(
'checklist_item', 'read_only', 1
);
}
});

Expand Down
14 changes: 2 additions & 12 deletions beams/beams/doctype/asset_transfer_request/asset_transfer_request.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
"stock_entry",
"section_break_sesi",
"items",
"asset_return_checklist_template",
"asset_return_checklist",
"amended_from"
],
Expand Down Expand Up @@ -67,16 +66,7 @@
},
{
"allow_on_submit": 1,
"depends_on": "eval:doc.workflow_state == \"Transferred\"",
"fieldname": "asset_return_checklist_template",
"fieldtype": "Link",
"label": "Asset Return Checklist template",
"mandatory_depends_on": "eval:doc.workflow_state == \"Transferred\"",
"options": "Asset Return Checklist Template"
},
{
"allow_on_submit": 1,
"depends_on": "eval:doc.asset_return_checklist_template",
"depends_on": "eval:doc.workflow_state == 'Transferred and Received'\n",
"fieldname": "asset_return_checklist",
"fieldtype": "Table",
"label": "Asset Return Checklist",
Expand Down Expand Up @@ -171,7 +161,7 @@
"index_web_pages_for_search": 1,
"is_submittable": 1,
"links": [],
"modified": "2025-03-03 13:58:26.799954",
"modified": "2025-06-10 10:15:13.555858",
"modified_by": "Administrator",
"module": "BEAMS",
"name": "Asset Transfer Request",
Expand Down
14 changes: 1 addition & 13 deletions beams/beams/doctype/asset_transfer_request/asset_transfer_request.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ def on_update_after_submit(self):
Handles updates after submission by adding assets,items,asset to the asset return checklist when the workflow state is 'Transferred'
'''

if self.workflow_state == "Transferred" and self.asset_return_checklist_template:
if self.workflow_state == "Transferred and Received":
existing_checklist_items = {row.checklist_item for row in self.get("asset_return_checklist")}
assets_to_add = set()

Expand Down Expand Up @@ -363,18 +363,6 @@ def get_stock_items_from_bundle(bundle):
)
return stock_items


@frappe.whitelist()
def get_asset_return_checklist_template(template_name):
if not frappe.db.exists("Asset Return Checklist Template", template_name):
frappe.msgprint(_("Asset Return Checklist Template '{}' not found").format(template_name))

return frappe.get_all(
"Asset Return Check",
filters={"parent": template_name},
fields=["checklist_item"]
)

@frappe.whitelist()
def get_bundle_assets(bundle):
if not bundle:
Expand Down