Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: broken bom tree view and remove duplicate button (#28512) (#28527)

Browse Source 
* fix: broken bom tree view and remove duplicate button

(cherry picked from commit 7ae1369d64ecaa829965d89915475fbd3211b5c2)

Co-authored-by: Bhavesh Maheshwari <34086262+bhavesh95863@users.noreply.github.com>
Co-authored-by: Ankush Menat <ankush@frappe.io>
This commit is contained in:
mergify[bot] 2021-11-23 17:53:26 +05:30 committed by GitHub
parent 0df9cf9526
commit 34d1fec7de
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
erpnext/manufacturing/doctype/bom/bom_item_preview.html
View File

@ -16,26 +16,15 @@
</div> </div>
<hr style="margin: 15px -15px;"> <hr style="margin: 15px -15px;">
<p> <p>
{% if data.value %} {% if data.value && data.value != "BOM" %}
<a style="margin-right: 7px; margin-bottom: 7px" class="btn btn-default btn-xs" href="#Form/BOM/{{ data.value }}"> <a style="margin-right: 7px; margin-bottom: 7px" class="btn btn-default btn-xs" href="/app/bom/{{ data.value }}">
{{ __("Open BOM {0}", [data.value.bold()]) }}</a> {{ __("Open BOM {0}", [data.value.bold()]) }}</a>
{% endif %} {% endif %}
{% if data.item_code %} {% if data.item_code %}
<a class="btn btn-default btn-xs" href="#Form/Item/{{ data.item_code }}"> <a style="margin-right: 7px; margin-bottom: 7px" class="btn btn-default btn-xs" href="/app/item/{{ data.item_code }}">
{{ __("Open Item {0}", [data.item_code.bold()]) }}</a> {{ __("Open Item {0}", [data.item_code.bold()]) }}</a>
{% endif %} {% endif %}
</p> </p>
</div> </div>
</div> </div>
<hr style="margin: 15px -15px;">
<p>
{% if data.value %}
<a style="margin-right: 7px; margin-bottom: 7px" class="btn btn-default btn-xs" href="/app/Form/BOM/{{ data.value }}">
{{ __("Open BOM {0}", [data.value.bold()]) }}</a>
{% endif %}
{% if data.item_code %}
<a class="btn btn-default btn-xs" href="/app/Form/Item/{{ data.item_code }}">
{{ __("Open Item {0}", [data.item_code.bold()]) }}</a>
{% endif %}
</p>
</div> </div>

1
erpnext/manufacturing/doctype/bom/bom_tree.js
View File

@ -66,6 +66,7 @@ frappe.treeview_settings["BOM"] = {
var bom = frappe.model.get_doc("BOM", node.data.value); var bom = frappe.model.get_doc("BOM", node.data.value);
node.data.image = escape(bom.image) || ""; node.data.image = escape(bom.image) || "";
node.data.description = bom.description || ""; node.data.description = bom.description || "";
node.data.item_code = bom.item || "";
}); });
} }
}, },