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

fix: Use extend_cscript function to properly extend class methods to cscript

Browse Source
This commit is contained in:
Suraj Shetty 2021-05-21 17:03:09 +05:30
parent 94a52c0e17
commit 81d49e9c71
23 changed files with 42 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.eslintrc
View File

@ -151,6 +151,7 @@
"context": true, "context": true,
"before": true, "before": true,
"beforeEach": true, "beforeEach": true,
"onScan": true "onScan": true,
"extend_cscript": true
} }
} }

2
erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js
View File

@ -262,4 +262,4 @@ erpnext.accounts.PaymentReconciliationController = class PaymentReconciliationCo
}; };
$.extend(cur_frm.cscript, new erpnext.accounts.PaymentReconciliationController({frm: cur_frm})); extend_cscript(cur_frm.cscript, new erpnext.accounts.PaymentReconciliationController({frm: cur_frm}));

2
erpnext/accounts/doctype/pos_invoice/pos_invoice.js
View File

@ -135,7 +135,7 @@ erpnext.selling.POSInvoiceController = class POSInvoiceController extends erpnex
} }
} }
$.extend(cur_frm.cscript, new erpnext.selling.POSInvoiceController({ frm: cur_frm })) extend_cscript(cur_frm.cscript, new erpnext.selling.POSInvoiceController({ frm: cur_frm }))
frappe.ui.form.on('POS Invoice', { frappe.ui.form.on('POS Invoice', {
redeem_loyalty_points: function(frm) { redeem_loyalty_points: function(frm) {

5
erpnext/accounts/doctype/sales_invoice/sales_invoice.js
View File

@ -450,8 +450,11 @@ erpnext.accounts.SalesInvoiceController = class SalesInvoiceController extends e
} }
}; };
console.log('innn')
// for backward compatibility: combine new and previous states // for backward compatibility: combine new and previous states
$.extend(cur_frm.cscript, new erpnext.accounts.SalesInvoiceController({frm: cur_frm})); let controller_instance = new erpnext.accounts.SalesInvoiceController({frm: cur_frm})
extend_cscript(cur_frm.cscript, controller_instance);
extend_cscript(cur_frm.cscript.__proto_, controller_instance.__proto__);
cur_frm.cscript['Make Delivery Note'] = function() { cur_frm.cscript['Make Delivery Note'] = function() {
frappe.model.open_mapped_doc({ frappe.model.open_mapped_doc({

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

@ -547,7 +547,7 @@ erpnext.buying.PurchaseOrderController = class PurchaseOrderController extends e
}; };
// for backward compatibility: combine new and previous states // for backward compatibility: combine new and previous states
$.extend(cur_frm.cscript, new erpnext.buying.PurchaseOrderController({frm: cur_frm})); extend_cscript(cur_frm.cscript, new erpnext.buying.PurchaseOrderController({frm: cur_frm}));
cur_frm.cscript.update_status= function(label, status){ cur_frm.cscript.update_status= function(label, status){
frappe.call({ frappe.call({

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

@ -414,4 +414,4 @@ erpnext.buying.RequestforQuotationController = class RequestforQuotationControll
}; };
// for backward compatibility: combine new and previous states // for backward compatibility: combine new and previous states
$.extend(cur_frm.cscript, new erpnext.buying.RequestforQuotationController({frm: cur_frm})); extend_cscript(cur_frm.cscript, new erpnext.buying.RequestforQuotationController({frm: cur_frm}));

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

@ -95,7 +95,7 @@ erpnext.buying.SupplierQuotationController = class SupplierQuotationController e
}; };
// for backward compatibility: combine new and previous states // for backward compatibility: combine new and previous states
$.extend(cur_frm.cscript, new erpnext.buying.SupplierQuotationController({frm: cur_frm})); extend_cscript(cur_frm.cscript, new erpnext.buying.SupplierQuotationController({frm: cur_frm}));
cur_frm.fields_dict['items'].grid.get_field('project').get_query = cur_frm.fields_dict['items'].grid.get_field('project').get_query =
function(doc, cdt, cdn) { function(doc, cdt, cdn) {

2
erpnext/crm/doctype/lead/lead.js
View File

@ -88,4 +88,4 @@ erpnext.LeadController = class LeadController extends frappe.ui.form.Controller
} }
}; };
$.extend(cur_frm.cscript, new erpnext.LeadController({ frm: cur_frm })); extend_cscript(cur_frm.cscript, new erpnext.LeadController({ frm: cur_frm }));

2
erpnext/crm/doctype/opportunity/opportunity.js
View File

@ -195,7 +195,7 @@ erpnext.crm.Opportunity = class Opportunity extends frappe.ui.form.Controller {
} }
}; };
$.extend(cur_frm.cscript, new erpnext.crm.Opportunity({frm: cur_frm})); extend_cscript(cur_frm.cscript, new erpnext.crm.Opportunity({frm: cur_frm}));
cur_frm.cscript.item_code = function(doc, cdt, cdn) { cur_frm.cscript.item_code = function(doc, cdt, cdn) {
var d = locals[cdt][cdn]; var d = locals[cdt][cdn];

2
erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js
View File

@ -115,5 +115,5 @@ erpnext.maintenance.MaintenanceSchedule = class MaintenanceSchedule extends frap
} }
}; };
$.extend(cur_frm.cscript, new erpnext.maintenance.MaintenanceSchedule({frm: cur_frm})); extend_cscript(cur_frm.cscript, new erpnext.maintenance.MaintenanceSchedule({frm: cur_frm}));

2
erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js
View File

@ -99,4 +99,4 @@ erpnext.maintenance.MaintenanceVisit = class MaintenanceVisit extends frappe.ui.
} }
}; };
$.extend(cur_frm.cscript, new erpnext.maintenance.MaintenanceVisit({frm: cur_frm})); extend_cscript(cur_frm.cscript, new erpnext.maintenance.MaintenanceVisit({frm: cur_frm}));

2
erpnext/manufacturing/doctype/bom/bom.js
View File

@ -405,7 +405,7 @@ erpnext.bom.BomController = class BomController extends erpnext.TransactionContr
} }
}; };
$.extend(cur_frm.cscript, new erpnext.bom.BomController({frm: cur_frm})); extend_cscript(cur_frm.cscript, new erpnext.bom.BomController({frm: cur_frm}));
cur_frm.cscript.hour_rate = function(doc) { cur_frm.cscript.hour_rate = function(doc) {
erpnext.bom.calculate_op_cost(doc); erpnext.bom.calculate_op_cost(doc);

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

@ -166,7 +166,9 @@ erpnext.taxes_and_totals = class TaxesAndTotals extends erpnext.payments {
"account_list": frappe.flags.round_off_applicable_accounts "account_list": frappe.flags.round_off_applicable_accounts
}, },
callback(r) { callback(r) {
frappe.flags.round_off_applicable_accounts.push(...r.message); if (r.message) {
frappe.flags.round_off_applicable_accounts.push(...r.message);
}
} }
}); });
} }

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

@ -5,7 +5,7 @@ frappe.provide('erpnext.accounts.dimensions');
erpnext.TransactionController = class TransactionController extends erpnext.taxes_and_totals { erpnext.TransactionController = class TransactionController extends erpnext.taxes_and_totals {
setup() { setup() {
this._super(); super.setup();
frappe.flags.hide_serial_batch_dialog = true; frappe.flags.hide_serial_batch_dialog = true;
frappe.ui.form.on(this.frm.doctype + " Item", "rate", function(frm, cdt, cdn) { frappe.ui.form.on(this.frm.doctype + " Item", "rate", function(frm, cdt, cdn) {
var item = frappe.get_doc(cdt, cdn); var item = frappe.get_doc(cdt, cdn);

2
erpnext/selling/doctype/installation_note/installation_note.js
View File

@ -57,4 +57,4 @@ erpnext.selling.InstallationNote = class InstallationNote extends frappe.ui.form
} }
}; };
$.extend(cur_frm.cscript, new erpnext.selling.InstallationNote({frm: cur_frm})); extend_cscript(cur_frm.cscript, new erpnext.selling.InstallationNote({frm: cur_frm}));

5
erpnext/selling/doctype/sales_order/sales_order.js
View File

@ -104,7 +104,7 @@ frappe.ui.form.on("Sales Order Item", {
erpnext.selling.SalesOrderController = class SalesOrderController extends erpnext.selling.SellingController { erpnext.selling.SalesOrderController = class SalesOrderController extends erpnext.selling.SellingController {
onload(doc, dt, dn) { onload(doc, dt, dn) {
super.onload(); super.onload(doc, dt, dn);
} }
refresh(doc, dt, dn) { refresh(doc, dt, dn) {
@ -744,4 +744,5 @@ erpnext.selling.SalesOrderController = class SalesOrderController extends erpnex
}); });
} }
}; };
$.extend(cur_frm.cscript, new erpnext.selling.SalesOrderController({frm: cur_frm}));
extend_cscript(cur_frm.cscript, new erpnext.selling.SalesOrderController({frm: cur_frm}));

2
erpnext/selling/doctype/sms_center/sms_center.js
View File

@ -1,7 +1,7 @@
// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors // Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
// License: GNU General Public License v3. See license.txt // License: GNU General Public License v3. See license.txt
$.extend(cur_frm.cscript, { extend_cscript(cur_frm.cscript, {
message: function () { message: function () {
var total_characters = this.frm.doc.message.length; var total_characters = this.frm.doc.message.length;
var total_msg = 1; var total_msg = 1;

2
erpnext/setup/doctype/currency_exchange/currency_exchange.js
View File

@ -1,7 +1,7 @@
// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors // Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
// License: GNU General Public License v3. See license.txt // License: GNU General Public License v3. See license.txt
$.extend(cur_frm.cscript, { extend_cscript(cur_frm.cscript, {
onload: function() { onload: function() {
if(cur_frm.doc.__islocal) { if(cur_frm.doc.__islocal) {
cur_frm.set_value("to_currency", frappe.defaults.get_global_default("currency")); cur_frm.set_value("to_currency", frappe.defaults.get_global_default("currency"));

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

@ -305,7 +305,7 @@ erpnext.stock.DeliveryNoteController = class DeliveryNoteController extends erpn
} }
}; };
$.extend(cur_frm.cscript, new erpnext.stock.DeliveryNoteController({frm: cur_frm})); extend_cscript(cur_frm.cscript, new erpnext.stock.DeliveryNoteController({frm: cur_frm}));
frappe.ui.form.on('Delivery Note', { frappe.ui.form.on('Delivery Note', {
setup: function(frm) { setup: function(frm) {

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

@ -472,7 +472,7 @@ erpnext.buying.MaterialRequestController = class MaterialRequestController exten
}; };
// for backward compatibility: combine new and previous states // for backward compatibility: combine new and previous states
$.extend(cur_frm.cscript, new erpnext.buying.MaterialRequestController({frm: cur_frm})); extend_cscript(cur_frm.cscript, new erpnext.buying.MaterialRequestController({frm: cur_frm}));
function set_schedule_date(frm) { function set_schedule_date(frm) {
if(frm.doc.schedule_date){ if(frm.doc.schedule_date){

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

@ -251,7 +251,7 @@ erpnext.stock.PurchaseReceiptController = class PurchaseReceiptController extend
}; };
// for backward compatibility: combine new and previous states // for backward compatibility: combine new and previous states
$.extend(cur_frm.cscript, new erpnext.stock.PurchaseReceiptController({frm: cur_frm})); extend_cscript(cur_frm.cscript, new erpnext.stock.PurchaseReceiptController({frm: cur_frm}));
cur_frm.cscript.update_status = function(status) { cur_frm.cscript.update_status = function(status) {
frappe.ui.form.is_saving = true; frappe.ui.form.is_saving = true;

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

@ -1064,4 +1064,4 @@ erpnext.stock.select_batch_and_serial_no = (frm, item) => {
} }
$.extend(cur_frm.cscript, new erpnext.stock.StockEntry({frm: cur_frm})); extend_cscript(cur_frm.cscript, new erpnext.stock.StockEntry({frm: cur_frm}));

2
erpnext/support/doctype/warranty_claim/warranty_claim.js
View File

@ -55,7 +55,7 @@ erpnext.support.WarrantyClaim = class WarrantyClaim extends frappe.ui.form.Contr
} }
}; };
$.extend(cur_frm.cscript, new erpnext.support.WarrantyClaim({frm: cur_frm})); extend_cscript(cur_frm.cscript, new erpnext.support.WarrantyClaim({frm: cur_frm}));
cur_frm.fields_dict['serial_no'].get_query = function(doc, cdt, cdn) { cur_frm.fields_dict['serial_no'].get_query = function(doc, cdt, cdn) {
var cond = []; var cond = [];