schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: minor issues (#29140)

Browse Source
This commit is contained in:
mergify[bot]
2022-01-04 19:16:52 +05:30
committed by GitHub
parent 2838dc537e
commit f4670a86a0
3 changed files with 24 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
erpnext/accounts/doctype/account/account.js
View File

@@ -43,12 +43,12 @@ frappe.ui.form.on('Account', {
frm.trigger('add_toolbar_buttons'); frm.trigger('add_toolbar_buttons');
} }
if (frm.has_perm('write')) { if (frm.has_perm('write')) {
frm.add_custom_button(__('Update Account Name / Number'), function () {
frm.trigger("update_account_number");
});
frm.add_custom_button(__('Merge Account'), function () { frm.add_custom_button(__('Merge Account'), function () {
frm.trigger("merge_account"); frm.trigger("merge_account");
}); }, __('Actions'));
frm.add_custom_button(__('Update Account Name / Number'), function () {
frm.trigger("update_account_number");
}, __('Actions'));
} }
} }
}, },
@@ -59,11 +59,12 @@ frappe.ui.form.on('Account', {
} }
}, },
add_toolbar_buttons: function(frm) { add_toolbar_buttons: function(frm) {
frm.add_custom_button(__('Chart of Accounts'), frm.add_custom_button(__('Chart of Accounts'), () => {
function () { frappe.set_route("Tree", "Account"); }); frappe.set_route("Tree", "Account");
}, __('View'));
if (frm.doc.is_group == 1) { if (frm.doc.is_group == 1) {
frm.add_custom_button(__('Group to Non-Group'), function () { frm.add_custom_button(__('Convert to Non-Group'), function () {
return frappe.call({ return frappe.call({
doc: frm.doc, doc: frm.doc,
method: 'convert_group_to_ledger', method: 'convert_group_to_ledger',
@@ -71,10 +72,11 @@ frappe.ui.form.on('Account', {
frm.refresh(); frm.refresh();
} }
}); });
}); }, __('Actions'));
} else if (cint(frm.doc.is_group) == 0 } else if (cint(frm.doc.is_group) == 0
&& frappe.boot.user.can_read.indexOf("GL Entry") !== -1) { && frappe.boot.user.can_read.indexOf("GL Entry") !== -1) {
frm.add_custom_button(__('Ledger'), function () { frm.add_custom_button(__('General Ledger'), function () {
frappe.route_options = { frappe.route_options = {
"account": frm.doc.name, "account": frm.doc.name,
"from_date": frappe.sys_defaults.year_start_date, "from_date": frappe.sys_defaults.year_start_date,
@@ -82,9 +84,9 @@ frappe.ui.form.on('Account', {
"company": frm.doc.company "company": frm.doc.company
}; };
frappe.set_route("query-report", "General Ledger"); frappe.set_route("query-report", "General Ledger");
}); }, __('View'));
frm.add_custom_button(__('Non-Group to Group'), function () { frm.add_custom_button(__('Convert to Group'), function () {
return frappe.call({ return frappe.call({
doc: frm.doc, doc: frm.doc,
method: 'convert_ledger_to_group', method: 'convert_ledger_to_group',
@@ -92,7 +94,7 @@ frappe.ui.form.on('Account', {
frm.refresh(); frm.refresh();
} }
}); });
}); }, __('Actions'));
} }
}, },

12
erpnext/regional/doctype/uae_vat_settings/uae_vat_settings.js
View File

@@ -2,7 +2,13 @@
// For license information, please see license.txt // For license information, please see license.txt
frappe.ui.form.on('UAE VAT Settings', { frappe.ui.form.on('UAE VAT Settings', {
// refresh: function(frm) { onload: function(frm) {
frm.set_query('account', 'uae_vat_accounts', function() {
// } return {
filters: {
'company': frm.doc.company
}
};
});
}
}); });

2
erpnext/selling/page/point_of_sale/pos_item_selector.js
View File

@@ -113,7 +113,7 @@ erpnext.PointOfSale.ItemSelector = class {
`<div class="item-wrapper" `<div class="item-wrapper"
data-item-code="${escape(item.item_code)}" data-serial-no="${escape(serial_no)}" data-item-code="${escape(item.item_code)}" data-serial-no="${escape(serial_no)}"
data-batch-no="${escape(batch_no)}" data-uom="${escape(stock_uom)}" data-batch-no="${escape(batch_no)}" data-uom="${escape(stock_uom)}"
data-rate="${escape(price_list_rate)}" data-rate="${escape(price_list_rate || 0)}"
title="${item.item_name}"> title="${item.item_name}">
${get_item_image_html()} ${get_item_image_html()}