CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-29 09:01:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix: base_amount and exchange_rate in additional-cost table

Browse Source 
(cherry picked from commit eabd3135f0)
This commit is contained in:
Sagar Sharma
2022-08-18 17:16:29 +05:30
committed by Mergify
parent da69cc5477
commit d48487ada2
2 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/stock/landed_taxes_and_charges_common.js
View File

@@ -1,4 +1,4 @@
let document_list = ['Landed Cost Voucher', 'Stock Entry']; let document_list = ['Landed Cost Voucher', 'Stock Entry', 'Subcontracting Order'];
document_list.forEach((doctype) => { document_list.forEach((doctype) => {
frappe.ui.form.on(doctype, { frappe.ui.form.on(doctype, {

12
erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.js
View File

@@ -3,6 +3,8 @@
frappe.provide('erpnext.buying'); frappe.provide('erpnext.buying');
{% include 'erpnext/stock/landed_taxes_and_charges_common.js' %};
frappe.ui.form.on('Subcontracting Order', { frappe.ui.form.on('Subcontracting Order', {
setup: (frm) => { setup: (frm) => {
frm.get_field("items").grid.cannot_add_rows = true; frm.get_field("items").grid.cannot_add_rows = true;
@@ -136,6 +138,16 @@ frappe.ui.form.on('Subcontracting Order', {
} }
}); });
frappe.ui.form.on('Landed Cost Taxes and Charges', {
amount: function (frm, cdt, cdn) {
frm.events.set_base_amount(frm, cdt, cdn);
},
expense_account: function (frm, cdt, cdn) {
frm.events.set_account_currency(frm, cdt, cdn);
}
});
erpnext.buying.SubcontractingOrderController = class SubcontractingOrderController { erpnext.buying.SubcontractingOrderController = class SubcontractingOrderController {
setup() { setup() {
this.frm.custom_make_buttons = { this.frm.custom_make_buttons = {