nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-27 00:44:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: Linter and Sider fixes

Browse Source 
- Translatable  strings cannot be multi line or be formatted by '+'
- Reduce no of tabs in stock_entry.js
This commit is contained in:
marination
2020-11-02 08:50:48 +05:30
parent 97d38548aa
commit 542ae6ab97
3 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/buying/doctype/purchase_order/purchase_order.js
View File

@@ -299,7 +299,7 @@ erpnext.buying.PurchaseOrderController = erpnext.buying.BuyingController.extend(
if(me.values) { if(me.values) {
me.values.sub_con_rm_items.map((row,i) => { me.values.sub_con_rm_items.map((row,i) => {
if (!row.item_code || !row.rm_item_code || !row.warehouse || !row.qty || row.qty === 0) { if (!row.item_code || !row.rm_item_code || !row.warehouse || !row.qty || row.qty === 0) {
frappe.throw(__("Item Code, warehouse, quantity are required on row" + (i+1))); frappe.throw(__("Item Code, warehouse, quantity are required on row {0}", [i+1]));
} }
}) })
me._make_rm_stock_entry(me.dialog.fields_dict.sub_con_rm_items.grid.get_selected_children()) me._make_rm_stock_entry(me.dialog.fields_dict.sub_con_rm_items.grid.get_selected_children())

3
erpnext/stock/doctype/material_request/material_request.js
View File

@@ -281,8 +281,7 @@ frappe.ui.form.on('Material Request', {
fieldname:'default_supplier', fieldname:'default_supplier',
fieldtype: 'Link', fieldtype: 'Link',
options: 'Supplier', options: 'Supplier',
description: __('Select a Supplier from the Default Suppliers of the items below. \ description: __('Select a Supplier from the Default Suppliers of the items below. On selection, a Purchase Order will be made against items belonging to the selected Supplier only.'),
On selection, a Purchase Order will be made against items belonging to the selected Supplier only.'),
get_query: () => { get_query: () => {
return{ return{
query: "erpnext.stock.doctype.material_request.material_request.get_default_supplier_query", query: "erpnext.stock.doctype.material_request.material_request.get_default_supplier_query",

6
erpnext/stock/doctype/stock_entry/stock_entry.js
View File

@@ -425,9 +425,9 @@ frappe.ui.form.on('Stock Entry', {
show_bom_custom_button: function(frm){ show_bom_custom_button: function(frm){
if (frm.doc.docstatus === 0 && if (frm.doc.docstatus === 0 &&
['Material Issue', 'Material Receipt', 'Material Transfer', 'Send to Subcontractor'].includes(frm.doc.purpose)) { ['Material Issue', 'Material Receipt', 'Material Transfer', 'Send to Subcontractor'].includes(frm.doc.purpose)) {
frm.add_custom_button(__('Bill of Materials'), function() { frm.add_custom_button(__('Bill of Materials'), function() {
frm.events.get_items_from_bom(frm); frm.events.get_items_from_bom(frm);
}, __("Get Items From")); }, __("Get Items From"));
} }
}, },