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

fix: item stock levels displaying inconsistently (#25506)

Browse Source 
* fix: fixed stock levels dashboard not displaying after any interactions

* fix: minor translation fix
This commit is contained in:
Noah Jacob 2021-04-29 11:03:27 +05:30 committed by GitHub
parent 3b1ae4eb90
commit dc086dd52f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
erpnext/stock/doctype/item/item.js
View File

@ -46,9 +46,6 @@ frappe.ui.form.on("Item", {
}, __("View")); }, __("View"));
} }
if (!frm.doc.is_fixed_asset) {
erpnext.item.make_dashboard(frm);
}
if (frm.doc.is_fixed_asset) { if (frm.doc.is_fixed_asset) {
frm.trigger('is_fixed_asset'); frm.trigger('is_fixed_asset');
@ -96,6 +93,10 @@ frappe.ui.form.on("Item", {
erpnext.item.edit_prices_button(frm); erpnext.item.edit_prices_button(frm);
erpnext.item.toggle_attributes(frm); erpnext.item.toggle_attributes(frm);
if (!frm.doc.is_fixed_asset) {
erpnext.item.make_dashboard(frm);
}
frm.add_custom_button(__('Duplicate'), function() { frm.add_custom_button(__('Duplicate'), function() {
var new_item = frappe.model.copy_doc(frm.doc); var new_item = frappe.model.copy_doc(frm.doc);
@ -473,11 +474,15 @@ $.extend(erpnext.item, {
me.multiple_variant_dialog.get_primary_btn().html(__('Create Variants')); me.multiple_variant_dialog.get_primary_btn().html(__('Create Variants'));
me.multiple_variant_dialog.disable_primary_action(); me.multiple_variant_dialog.disable_primary_action();
} else { } else {
let no_of_combinations = lengths.reduce((a, b) => a * b, 1); let no_of_combinations = lengths.reduce((a, b) => a * b, 1);
me.multiple_variant_dialog.get_primary_btn() let msg;
.html(__( if (no_of_combinations === 1) {
`Make ${no_of_combinations} Variant${no_of_combinations === 1 ? '' : 's'}` msg = __("Make {0} Variant", [no_of_combinations]);
)); } else {
msg = __("Make {0} Variants", [no_of_combinations]);
}
me.multiple_variant_dialog.get_primary_btn().html(msg);
me.multiple_variant_dialog.enable_primary_action(); me.multiple_variant_dialog.enable_primary_action();
} }
} }