diff --git a/erpnext/public/js/utils.js b/erpnext/public/js/utils.js index 5942b34158d..a80d4317f2a 100755 --- a/erpnext/public/js/utils.js +++ b/erpnext/public/js/utils.js @@ -1036,12 +1036,49 @@ erpnext.utils.map_current_doc = function (opts) { } }; +<<<<<<< HEAD frappe.form.link_formatters["Item"] = function (value, doc) { if (doc && value && doc.item_name && doc.item_name !== value && doc.item_code === value) { return value + ": " + doc.item_name; } else if (!value && doc.doctype && doc.item_name) { // format blank value in child table return doc.item_name; +======= +frappe.form.link_formatters["Item"] = function (value, doc, df) { + return add_link_title(value, doc, df, "item_name"); +}; + +frappe.form.link_formatters["Employee"] = function (value, doc, df) { + return add_link_title(value, doc, df, "employee_name"); +}; + +frappe.form.link_formatters["Project"] = function (value, doc, df) { + return add_link_title(value, doc, df, "project_name"); +}; + +/** + * Add a title to a link value based on the provided document and field information. + * + * @param {string} value - The value to add a link title to. + * @param {Object} doc - The document object. + * @param {Object} df - The field object. + * @param {string} title_field - The field name for the title. + * @returns {string} - The link value with the added title. + */ +function add_link_title(value, doc, df, title_field) { + if (doc.doctype != df.parent) { + return value; + } else if ( + doc && + value && + doc[title_field] && + doc[title_field] !== value && + doc[df.fieldname] === value + ) { + return value + ": " + doc[title_field]; + } else if (!value && doc.doctype && doc[title_field]) { + return doc[title_field]; +>>>>>>> b20f57321f (fix: item code not showing in report view) } else { // if value is blank in report view or item code and name are the same, return as is return value;