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

[lint] fixes

Browse Source
This commit is contained in:
pratu16x7 2017-06-26 17:45:49 +05:30
parent ae450fc23b
commit 89d001caf3
3 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/public/js/controllers/transaction.js
View File

@ -273,7 +273,7 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
} else if((this.frm.doc.doctype === 'Purchase Receipt' && me.frm.doc.is_return) || } else if((this.frm.doc.doctype === 'Purchase Receipt' && me.frm.doc.is_return) ||
this.frm.doc.doctype === 'Delivery Note') { this.frm.doc.doctype === 'Delivery Note') {
show_batch_dialog = 1; show_batch_dialog = 1;
} }
// clear barcode if setting item (else barcode will take priority) // clear barcode if setting item (else barcode will take priority)
@ -1186,7 +1186,7 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
erpnext.show_serial_batch_selector = function(frm, d) { erpnext.show_serial_batch_selector = function(frm, d) {
frappe.require("assets/erpnext/js/utils/serial_no_batch_selector.js", function() { frappe.require("assets/erpnext/js/utils/serial_no_batch_selector.js", function() {
let serial_no_batch_selector = new erpnext.SerialNoBatchSelector({ new erpnext.SerialNoBatchSelector({
frm: frm, frm: frm,
item: d, item: d,
warehouse_details: { warehouse_details: {

13
erpnext/public/js/utils/serial_no_batch_selector.js
View File

@ -124,8 +124,6 @@ erpnext.SerialNoBatchSelector = Class.extend({
}, },
set_items: function() { set_items: function() {
var me = this;
if(this.has_batch) { if(this.has_batch) {
this.values.batches.map((batch, i) => { this.values.batches.map((batch, i) => {
let row = (i !== 0) ? this.frm.add_child("items") : this.item; let row = (i !== 0) ? this.frm.add_child("items") : this.item;
@ -135,6 +133,7 @@ erpnext.SerialNoBatchSelector = Class.extend({
// let grid_row = me.frm.fields_dict.items.grid.grid_rows[index]; // let grid_row = me.frm.fields_dict.items.grid.grid_rows[index];
// grid_row.toggle_editable_row(); // grid_row.toggle_editable_row();
// grid_row.on_grid_fields_dict.item_code.set_value(this.item_code); // grid_row.on_grid_fields_dict.item_code.set_value(this.item_code);
row.item_code = this.item_code; row.item_code = this.item_code;
} }
this.map_row_values(row, batch, 'batch_no', this.map_row_values(row, batch, 'batch_no',
@ -165,7 +164,6 @@ erpnext.SerialNoBatchSelector = Class.extend({
let batches_field = this.dialog.fields_dict.batches; let batches_field = this.dialog.fields_dict.batches;
let qty_field = this.dialog.fields_dict.qty; let qty_field = this.dialog.fields_dict.qty;
let item_code = this.item_code;
let update_quantity = (batch) => { let update_quantity = (batch) => {
if(batch) { if(batch) {
@ -181,7 +179,7 @@ erpnext.SerialNoBatchSelector = Class.extend({
.replace(/\n/g, ' ').match(/\S+/g) || []; .replace(/\n/g, ' ').match(/\S+/g) || [];
qty_field.set_input(serial_numbers.length); qty_field.set_input(serial_numbers.length);
} }
} };
if(serial_no_link) { if(serial_no_link) {
let serial_list = []; let serial_list = [];
@ -304,9 +302,10 @@ erpnext.SerialNoBatchSelector = Class.extend({
} }
if(me.warehouse_details.type === 'Source Warehouse' && if(me.warehouse_details.type === 'Source Warehouse' &&
parseFloat(available_qty) < parseFloat(selected_qty)) { parseFloat(available_qty) < parseFloat(selected_qty)) {
this.set_value('0');
frappe.throw(__(`For transfer from source, selected quantity cannot be this.set_value('0');
greater than available quantity`)); frappe.throw(__(`For transfer from source, selected quantity cannot be
greater than available quantity`));
} else { } else {
this.grid.refresh(); this.grid.refresh();
} }

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

@ -569,7 +569,7 @@ erpnext.stock.select_batch_and_serial_no = (frm, item) => {
} }
frappe.require("assets/erpnext/js/utils/serial_no_batch_selector.js", function() { frappe.require("assets/erpnext/js/utils/serial_no_batch_selector.js", function() {
let serial_no_batch_selector = new erpnext.SerialNoBatchSelector({ new erpnext.SerialNoBatchSelector({
frm: frm, frm: frm,
item: item, item: item,
warehouse_details: get_warehouse_type_and_name(item), warehouse_details: get_warehouse_type_and_name(item),