nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-04-12 11:25:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

style: format controllers with prettier

Browse Source
This commit is contained in:
barredterra
2025-08-19 15:43:35 +02:00
parent a0f23339cc
commit 1cdf32d807
5 changed files with 2079 additions and 1496 deletions
Download Patch File Download Diff File Expand all files Collapse all files

216
erpnext/public/js/controllers/accounts.js
View File

@@ -5,61 +5,69 @@
frappe.provide("erpnext.taxes");
erpnext.accounts.taxes = {
setup_tax_validations: function(doctype) {
setup_tax_validations: function (doctype) {
let me = this;
frappe.ui.form.on(doctype, {
setup: function(frm) {
setup: function (frm) {
// set conditional display for rate column in taxes
$(frm.wrapper).on('grid-row-render', function(e, grid_row) {
if(['Sales Taxes and Charges', 'Purchase Taxes and Charges'].includes(grid_row.doc.doctype)) {
$(frm.wrapper).on("grid-row-render", function (e, grid_row) {
if (
["Sales Taxes and Charges", "Purchase Taxes and Charges"].includes(
grid_row.doc.doctype
)
) {
me.set_conditional_mandatory_rate_or_amount(grid_row);
}
});
},
onload: function(frm) {
if(frm.get_field("taxes")) {
frm.set_query("account_head", "taxes", function(doc) {
if(frm.cscript.tax_table == "Sales Taxes and Charges") {
onload: function (frm) {
if (frm.get_field("taxes")) {
frm.set_query("account_head", "taxes", function (doc) {
if (frm.cscript.tax_table == "Sales Taxes and Charges") {
var account_type = ["Tax", "Chargeable", "Expense Account"];
} else {
var account_type = ["Tax", "Chargeable", "Income Account", "Expenses Included In Valuation"];
var account_type = [
"Tax",
"Chargeable",
"Income Account",
"Expenses Included In Valuation",
];
}
return {
query: "erpnext.controllers.queries.tax_account_query",
filters: {
"account_type": account_type,
"company": doc.company,
}
}
account_type: account_type,
company: doc.company,
},
};
});
frm.set_query("cost_center", "taxes", function(doc) {
frm.set_query("cost_center", "taxes", function (doc) {
return {
filters: {
"company": doc.company,
"is_group": 0
}
company: doc.company,
is_group: 0,
},
};
});
}
},
validate: function(frm) {
validate: function (frm) {
// neither is absolutely mandatory
if(frm.get_docfield("taxes")) {
if (frm.get_docfield("taxes")) {
frm.get_docfield("taxes", "rate").reqd = 0;
frm.get_docfield("taxes", "tax_amount").reqd = 0;
}
},
taxes_on_form_rendered: function(frm) {
taxes_on_form_rendered: function (frm) {
me.set_conditional_mandatory_rate_or_amount(frm.open_grid_row());
},
});
},
set_conditional_mandatory_rate_or_amount: function(grid_row) {
if(grid_row) {
if(grid_row.doc.charge_type==="Actual") {
set_conditional_mandatory_rate_or_amount: function (grid_row) {
if (grid_row) {
if (grid_row.doc.charge_type === "Actual") {
grid_row.toggle_editable("tax_amount", true);
grid_row.toggle_reqd("tax_amount", true);
grid_row.toggle_editable("rate", false);
@@ -73,31 +81,45 @@ erpnext.accounts.taxes = {
}
},
validate_taxes_and_charges: function(cdt, cdn) {
validate_taxes_and_charges: function (cdt, cdn) {
let d = locals[cdt][cdn];
let msg = "";
if (d.account_head && !d.description) {
// set description from account head
d.description = d.account_head.split(' - ').slice(0, -1).join(' - ');
d.description = d.account_head.split(" - ").slice(0, -1).join(" - ");
}
if (!d.charge_type && (d.row_id || d.rate || d.tax_amount)) {
msg = __("Please select Charge Type first");
d.row_id = "";
d.rate = d.tax_amount = 0.0;
} else if ((d.charge_type == 'Actual' || d.charge_type == 'On Net Total' || d.charge_type == 'On Paid Amount') && d.row_id) {
msg = __("Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total'");
} else if (
(d.charge_type == "Actual" ||
d.charge_type == "On Net Total" ||
d.charge_type == "On Paid Amount") &&
d.row_id
) {
msg = __(
"Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total'"
);
d.row_id = "";
} else if ((d.charge_type == 'On Previous Row Amount' || d.charge_type == 'On Previous Row Total') && d.row_id) {
} else if (
(d.charge_type == "On Previous Row Amount" || d.charge_type == "On Previous Row Total") &&
d.row_id
) {
if (d.idx == 1) {
msg = __("Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row");
d.charge_type = '';
msg = __(
"Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row"
);
d.charge_type = "";
} else if (!d.row_id) {
msg = __("Please specify a valid Row ID for row {0} in table {1}", [d.idx, __(d.doctype)]);
d.row_id = "";
} else if (d.row_id && d.row_id >= d.idx) {
msg = __("Cannot refer row number greater than or equal to current row number for this Charge type");
msg = __(
"Cannot refer row number greater than or equal to current row number for this Charge type"
);
d.row_id = "";
}
}
@@ -106,13 +128,12 @@ erpnext.accounts.taxes = {
refresh_field("taxes");
frappe.throw(msg);
}
},
setup_tax_filters: function(doctype) {
setup_tax_filters: function (doctype) {
let me = this;
frappe.ui.form.on(doctype, {
account_head: function(frm, cdt, cdn) {
account_head: function (frm, cdt, cdn) {
let d = locals[cdt][cdn];
if (d.docstatus == 1) {
@@ -120,150 +141,157 @@ erpnext.accounts.taxes = {
return;
}
if(!d.charge_type && d.account_head){
if (!d.charge_type && d.account_head) {
frappe.msgprint(__("Please select Charge Type first"));
frappe.model.set_value(cdt, cdn, "account_head", "");
} else if (d.account_head) {
frappe.call({
type:"GET",
type: "GET",
method: "erpnext.controllers.accounts_controller.get_tax_rate",
args: {"account_head":d.account_head},
callback: function(r) {
if (d.charge_type!=="Actual") {
args: { account_head: d.account_head },
callback: function (r) {
if (d.charge_type !== "Actual") {
frappe.model.set_value(cdt, cdn, "rate", r.message.tax_rate || 0);
}
frappe.model.set_value(cdt, cdn, "description", r.message.account_name);
}
})
},
});
}
},
row_id: function(frm, cdt, cdn) {
row_id: function (frm, cdt, cdn) {
me.validate_taxes_and_charges(cdt, cdn);
},
rate: function(frm, cdt, cdn) {
rate: function (frm, cdt, cdn) {
me.validate_taxes_and_charges(cdt, cdn);
},
tax_amount: function(frm, cdt, cdn) {
tax_amount: function (frm, cdt, cdn) {
me.validate_taxes_and_charges(cdt, cdn);
},
charge_type: function(frm, cdt, cdn) {
charge_type: function (frm, cdt, cdn) {
me.validate_taxes_and_charges(cdt, cdn);
let open_form = frm.open_grid_row();
if(open_form) {
if (open_form) {
me.set_conditional_mandatory_rate_or_amount(open_form);
} else {
// apply in current row
me.set_conditional_mandatory_rate_or_amount(frm.get_field('taxes').grid.get_row(cdn));
me.set_conditional_mandatory_rate_or_amount(frm.get_field("taxes").grid.get_row(cdn));
}
},
included_in_print_rate: function(frm, cdt, cdn) {
included_in_print_rate: function (frm, cdt, cdn) {
let tax = frappe.get_doc(cdt, cdn);
try {
me.validate_taxes_and_charges(cdt, cdn);
me.validate_inclusive_tax(tax, frm);
} catch(e) {
} catch (e) {
tax.included_in_print_rate = 0;
refresh_field("included_in_print_rate", tax.name, tax.parentfield);
throw e;
}
}
},
});
},
validate_inclusive_tax: function(tax, frm) {
validate_inclusive_tax: function (tax, frm) {
this.frm = this.frm || frm;
let actual_type_error = function() {
var msg = __("Actual type tax cannot be included in Item rate in row {0}", [tax.idx])
let actual_type_error = function () {
var msg = __("Actual type tax cannot be included in Item rate in row {0}", [tax.idx]);
frappe.throw(msg);
};
let on_previous_row_error = function(row_range) {
var msg = __("For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included",
[tax.idx, __(tax.doctype), tax.charge_type, row_range])
let on_previous_row_error = function (row_range) {
var msg = __("For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included", [
tax.idx,
__(tax.doctype),
tax.charge_type,
row_range,
]);
frappe.throw(msg);
};
if(cint(tax.included_in_print_rate)) {
if(tax.charge_type == "Actual") {
if (cint(tax.included_in_print_rate)) {
if (tax.charge_type == "Actual") {
// inclusive tax cannot be of type Actual
actual_type_error();
} else if (tax.charge_type == "On Previous Row Amount" && this.frm &&
} else if (
tax.charge_type == "On Previous Row Amount" &&
this.frm &&
!cint(this.frm.doc["taxes"][tax.row_id - 1].included_in_print_rate)
) {
// referred row should also be an inclusive tax
on_previous_row_error(tax.row_id);
} else if (tax.charge_type == "On Previous Row Total" && this.frm) {
var taxes_not_included = $.map(this.frm.doc["taxes"].slice(0, tax.row_id),
function(t) { return cint(t.included_in_print_rate) ? null : t; });
if(taxes_not_included.length > 0) {
var taxes_not_included = $.map(this.frm.doc["taxes"].slice(0, tax.row_id), function (t) {
return cint(t.included_in_print_rate) ? null : t;
});
if (taxes_not_included.length > 0) {
// all rows above this tax should be inclusive
on_previous_row_error(tax.row_id == 1 ? "1" : "1 - " + tax.row_id);
}
} else if(tax.category == "Valuation") {
} else if (tax.category == "Valuation") {
frappe.throw(__("Valuation type charges can not marked as Inclusive"));
}
}
}
}
},
};
erpnext.accounts.payment_triggers = {
setup: function(doctype) {
setup: function (doctype) {
frappe.ui.form.on(doctype, {
allocate_advances_automatically(frm) {
frm.trigger('fetch_advances');
frm.trigger("fetch_advances");
},
only_include_allocated_payments(frm) {
frm.trigger('fetch_advances');
frm.trigger("fetch_advances");
},
fetch_advances(frm) {
if(frm.doc.allocate_advances_automatically) {
if (frm.doc.allocate_advances_automatically) {
frappe.call({
doc: frm.doc,
method: "set_advances",
callback: function(r, rt) {
callback: function (r, rt) {
refresh_field("advances");
}
})
},
});
}
}
},
});
},
}
};
erpnext.accounts.pos = {
setup: function(doctype) {
setup: function (doctype) {
frappe.ui.form.on(doctype, {
mode_of_payment: function(frm, cdt, cdn) {
mode_of_payment: function (frm, cdt, cdn) {
var d = locals[cdt][cdn];
get_payment_mode_account(frm, d.mode_of_payment, function(account){
frappe.model.set_value(cdt, cdn, 'account', account)
})
}
get_payment_mode_account(frm, d.mode_of_payment, function (account) {
frappe.model.set_value(cdt, cdn, "account", account);
});
},
});
},
get_payment_mode_account: function(frm, mode_of_payment, callback) {
if(!frm.doc.company) {
frappe.throw({message:__("Please select a Company first."), title: __("Mandatory")});
get_payment_mode_account: function (frm, mode_of_payment, callback) {
if (!frm.doc.company) {
frappe.throw({ message: __("Please select a Company first."), title: __("Mandatory") });
}
if(!mode_of_payment) {
if (!mode_of_payment) {
return;
}
return frappe.call({
return frappe.call({
method: "erpnext.accounts.doctype.sales_invoice.sales_invoice.get_bank_cash_account",
args: {
"mode_of_payment": mode_of_payment,
"company": frm.doc.company
mode_of_payment: mode_of_payment,
company: frm.doc.company,
},
callback: function(r, rt) {
if(r.message) {
callback(r.message.account)
callback: function (r, rt) {
if (r.message) {
callback(r.message.account);
}
}
},
});
}
}
},
};

552
erpnext/public/js/controllers/buying.js
View File

@@ -5,7 +5,7 @@ frappe.provide("erpnext.buying");
// cur_frm.add_fetch('project', 'cost_center', 'cost_center');
erpnext.buying = {
setup_buying_controller: function() {
setup_buying_controller: function () {
erpnext.buying.BuyingController = class BuyingController extends erpnext.TransactionController {
setup() {
super.setup();
@@ -17,11 +17,11 @@ erpnext.buying = {
this.setup_queries(doc, cdt, cdn);
super.onload();
this.frm.set_query('shipping_rule', function() {
this.frm.set_query("shipping_rule", function () {
return {
filters: {
"shipping_rule_type": "Buying"
}
shipping_rule_type: "Buying",
},
};
});
@@ -33,29 +33,28 @@ erpnext.buying = {
};
});
if (this.frm.doc.__islocal
&& frappe.meta.has_field(this.frm.doc.doctype, "disable_rounded_total")) {
var df = frappe.meta.get_docfield(this.frm.doc.doctype, "disable_rounded_total");
var disable = cint(df.default) || cint(frappe.sys_defaults.disable_rounded_total);
this.frm.set_value("disable_rounded_total", disable);
if (
this.frm.doc.__islocal &&
frappe.meta.has_field(this.frm.doc.doctype, "disable_rounded_total")
) {
var df = frappe.meta.get_docfield(this.frm.doc.doctype, "disable_rounded_total");
var disable = cint(df.default) || cint(frappe.sys_defaults.disable_rounded_total);
this.frm.set_value("disable_rounded_total", disable);
}
// no idea where me is coming from
if(this.frm.get_field('shipping_address')) {
if (this.frm.get_field("shipping_address")) {
this.frm.set_query("shipping_address", () => {
if(this.frm.doc.customer) {
if (this.frm.doc.customer) {
return {
query: 'frappe.contacts.doctype.address.address.address_query',
filters: { link_doctype: 'Customer', link_name: this.frm.doc.customer }
query: "frappe.contacts.doctype.address.address.address_query",
filters: { link_doctype: "Customer", link_name: this.frm.doc.customer },
};
} else
return erpnext.queries.company_address_query(this.frm.doc)
} else return erpnext.queries.company_address_query(this.frm.doc);
});
}
if(this.frm.get_field('dispatch_address')) {
if (this.frm.get_field("dispatch_address")) {
this.frm.set_query("dispatch_address", () => {
return erpnext.queries.address_query(this.frm.doc);
});
@@ -65,76 +64,77 @@ erpnext.buying = {
setup_queries(doc, cdt, cdn) {
var me = this;
if(this.frm.fields_dict.buying_price_list) {
this.frm.set_query("buying_price_list", function() {
return{
filters: { 'buying': 1 }
}
if (this.frm.fields_dict.buying_price_list) {
this.frm.set_query("buying_price_list", function () {
return {
filters: { buying: 1 },
};
});
}
if(this.frm.fields_dict.tc_name) {
this.frm.set_query("tc_name", function() {
return{
filters: { 'buying': 1 }
}
if (this.frm.fields_dict.tc_name) {
this.frm.set_query("tc_name", function () {
return {
filters: { buying: 1 },
};
});
}
me.frm.set_query('supplier', erpnext.queries.supplier);
me.frm.set_query('contact_person', erpnext.queries.contact_query);
me.frm.set_query('supplier_address', erpnext.queries.address_query);
me.frm.set_query("supplier", erpnext.queries.supplier);
me.frm.set_query("contact_person", erpnext.queries.contact_query);
me.frm.set_query("supplier_address", erpnext.queries.address_query);
me.frm.set_query('billing_address', erpnext.queries.company_address_query);
me.frm.set_query("billing_address", erpnext.queries.company_address_query);
erpnext.accounts.dimensions.setup_dimension_filters(me.frm, me.frm.doctype);
this.frm.set_query("item_code", "items", function() {
this.frm.set_query("item_code", "items", function () {
if (me.frm.doc.is_subcontracted) {
var filters = {'supplier': me.frm.doc.supplier};
var filters = { supplier: me.frm.doc.supplier };
if (me.frm.doc.is_old_subcontracting_flow) {
filters["is_sub_contracted_item"] = 1;
}
else {
} else {
filters["is_stock_item"] = 0;
}
return{
return {
query: "erpnext.controllers.queries.item_query",
filters: filters
}
}
else {
return{
filters: filters,
};
} else {
return {
query: "erpnext.controllers.queries.item_query",
filters: { 'supplier': me.frm.doc.supplier, 'is_purchase_item': 1, 'has_variants': 0}
}
filters: { supplier: me.frm.doc.supplier, is_purchase_item: 1, has_variants: 0 },
};
}
});
this.frm.set_query("manufacturer", "items", function(doc, cdt, cdn) {
this.frm.set_query("manufacturer", "items", function (doc, cdt, cdn) {
const row = locals[cdt][cdn];
return {
query: "erpnext.controllers.queries.item_manufacturer_query",
filters:{ 'item_code': row.item_code }
}
filters: { item_code: row.item_code },
};
});
if(this.frm.fields_dict["items"].grid.get_field('item_code')) {
this.frm.set_query("item_tax_template", "items", function(doc, cdt, cdn) {
return me.set_query_for_item_tax_template(doc, cdt, cdn)
if (this.frm.fields_dict["items"].grid.get_field("item_code")) {
this.frm.set_query("item_tax_template", "items", function (doc, cdt, cdn) {
return me.set_query_for_item_tax_template(doc, cdt, cdn);
});
}
}
refresh(doc) {
frappe.dynamic_link = {doc: this.frm.doc, fieldname: 'supplier', doctype: 'Supplier'};
frappe.dynamic_link = { doc: this.frm.doc, fieldname: "supplier", doctype: "Supplier" };
this.frm.toggle_display("supplier_name",
(this.frm.doc.supplier_name && this.frm.doc.supplier_name!==this.frm.doc.supplier));
this.frm.toggle_display(
"supplier_name",
this.frm.doc.supplier_name && this.frm.doc.supplier_name !== this.frm.doc.supplier
);
if(this.frm.doc.docstatus==0 &&
(this.frm.doctype==="Purchase Order" || this.frm.doctype==="Material Request")) {
if (
this.frm.doc.docstatus == 0 &&
(this.frm.doctype === "Purchase Order" || this.frm.doctype === "Material Request")
) {
this.set_from_product_bundle();
}
@@ -143,45 +143,53 @@ erpnext.buying = {
}
toggle_subcontracting_fields() {
if (['Purchase Receipt', 'Purchase Invoice'].includes(this.frm.doc.doctype)) {
this.frm.fields_dict.supplied_items.grid.update_docfield_property('consumed_qty',
'read_only', this.frm.doc.__onload && this.frm.doc.__onload.backflush_based_on === 'BOM');
if (["Purchase Receipt", "Purchase Invoice"].includes(this.frm.doc.doctype)) {
this.frm.fields_dict.supplied_items.grid.update_docfield_property(
"consumed_qty",
"read_only",
this.frm.doc.__onload && this.frm.doc.__onload.backflush_based_on === "BOM"
);
this.frm.set_df_property('supplied_items', 'cannot_add_rows', 1);
this.frm.set_df_property('supplied_items', 'cannot_delete_rows', 1);
this.frm.set_df_property("supplied_items", "cannot_add_rows", 1);
this.frm.set_df_property("supplied_items", "cannot_delete_rows", 1);
}
}
supplier() {
var me = this;
erpnext.utils.get_party_details(this.frm, null, null, function(){
erpnext.utils.get_party_details(this.frm, null, null, function () {
me.apply_price_list();
});
}
company(){
if(!frappe.meta.has_field(this.frm.doc.doctype, "billing_address")) return;
company() {
if (!frappe.meta.has_field(this.frm.doc.doctype, "billing_address")) return;
frappe.call({
method: "erpnext.setup.doctype.company.company.get_billing_shipping_address",
args: {
name: this.frm.doc.company,
billing_address:this.frm.doc.billing_address,
shipping_address: this.frm.doc.shipping_address
billing_address: this.frm.doc.billing_address,
shipping_address: this.frm.doc.shipping_address,
},
callback: (r) => {
this.frm.set_value("billing_address", r.message.primary_address || "");
if(!frappe.meta.has_field(this.frm.doc.doctype, "shipping_address")) return;
if (!frappe.meta.has_field(this.frm.doc.doctype, "shipping_address")) return;
this.frm.set_value("shipping_address", r.message.shipping_address || "");
},
});
erpnext.utils.set_letter_head(this.frm)
erpnext.utils.set_letter_head(this.frm);
}
supplier_address() {
erpnext.utils.get_address_display(this.frm);
erpnext.utils.set_taxes_from_address(this.frm, "supplier_address", "supplier_address", "supplier_address");
erpnext.utils.set_taxes_from_address(
this.frm,
"supplier_address",
"supplier_address",
"supplier_address"
);
}
buying_price_list() {
@@ -201,24 +209,33 @@ erpnext.buying = {
}
qty(doc, cdt, cdn) {
if ((doc.doctype == "Purchase Receipt") || (doc.doctype == "Purchase Invoice" && doc.update_stock)) {
this.calculate_received_qty(doc, cdt, cdn)
if (
doc.doctype == "Purchase Receipt" ||
(doc.doctype == "Purchase Invoice" && doc.update_stock)
) {
this.calculate_received_qty(doc, cdt, cdn);
}
super.qty(doc, cdt, cdn);
}
rejected_qty(doc, cdt, cdn) {
this.calculate_received_qty(doc, cdt, cdn)
this.calculate_received_qty(doc, cdt, cdn);
}
calculate_received_qty(doc, cdt, cdn){
calculate_received_qty(doc, cdt, cdn) {
var item = frappe.get_doc(cdt, cdn);
frappe.model.round_floats_in(item, ["qty", "rejected_qty"]);
if(!doc.is_return && this.validate_negative_quantity(cdt, cdn, item, ["qty", "rejected_qty"])){ return }
if (
!doc.is_return &&
this.validate_negative_quantity(cdt, cdn, item, ["qty", "rejected_qty"])
) {
return;
}
let received_qty = flt(item.qty + item.rejected_qty, precision("received_qty", item));
let received_stock_qty = flt(item.conversion_factor, precision("conversion_factor", item)) * flt(received_qty);
let received_stock_qty =
flt(item.conversion_factor, precision("conversion_factor", item)) * flt(received_qty);
frappe.model.set_value(cdt, cdn, "received_qty", received_qty);
frappe.model.set_value(cdt, cdn, "received_stock_qty", received_stock_qty);
@@ -228,24 +245,32 @@ erpnext.buying = {
super.batch_no(doc, cdt, cdn);
}
validate_negative_quantity(cdt, cdn, item, fieldnames){
if(!item || !fieldnames) { return }
validate_negative_quantity(cdt, cdn, item, fieldnames) {
if (!item || !fieldnames) {
return;
}
var is_negative_qty = false;
for(var i = 0; i<fieldnames.length; i++) {
if(item[fieldnames[i]] < 0){
frappe.msgprint(__("Row #{0}: {1} can not be negative for item {2}", [item.idx,__(frappe.meta.get_label(cdt, fieldnames[i], cdn)), item.item_code]));
for (var i = 0; i < fieldnames.length; i++) {
if (item[fieldnames[i]] < 0) {
frappe.msgprint(
__("Row #{0}: {1} can not be negative for item {2}", [
item.idx,
__(frappe.meta.get_label(cdt, fieldnames[i], cdn)),
item.item_code,
])
);
is_negative_qty = true;
break;
}
}
return is_negative_qty
return is_negative_qty;
}
warehouse(doc, cdt, cdn) {
var item = frappe.get_doc(cdt, cdn);
if(item.item_code && item.warehouse) {
if (item.item_code && item.warehouse) {
return this.frm.call({
method: "erpnext.stock.get_item_details.get_bin_details",
child: item,
@@ -253,22 +278,21 @@ erpnext.buying = {
item_code: item.item_code,
warehouse: item.warehouse,
company: doc.company,
include_child_warehouses: true
}
include_child_warehouses: true,
},
});
}
}
project(doc, cdt, cdn) {
var item = frappe.get_doc(cdt, cdn);
if(item.project) {
$.each(this.frm.doc["items"] || [],
function(i, other_item) {
if(!other_item.project) {
other_item.project = item.project;
refresh_field("project", other_item.name, other_item.parentfield);
}
});
if (item.project) {
$.each(this.frm.doc["items"] || [], function (i, other_item) {
if (!other_item.project) {
other_item.project = item.project;
refresh_field("project", other_item.name, other_item.parentfield);
}
});
}
}
@@ -281,7 +305,7 @@ erpnext.buying = {
category(doc, cdt, cdn) {
// should be the category field of tax table
if(cdt != doc.doctype) {
if (cdt != doc.doctype) {
this.calculate_taxes_and_totals();
}
}
@@ -291,26 +315,42 @@ erpnext.buying = {
set_from_product_bundle() {
var me = this;
this.frm.add_custom_button(__("Product Bundle"), function() {
erpnext.buying.get_items_from_product_bundle(me.frm);
}, __("Get Items From"));
this.frm.add_custom_button(
__("Product Bundle"),
function () {
erpnext.buying.get_items_from_product_bundle(me.frm);
},
__("Get Items From")
);
}
shipping_address(){
shipping_address() {
var me = this;
erpnext.utils.get_address_display(this.frm, "shipping_address",
"shipping_address_display", true);
erpnext.utils.get_address_display(
this.frm,
"shipping_address",
"shipping_address_display",
true
);
}
dispatch_address(){
dispatch_address() {
var me = this;
erpnext.utils.get_address_display(this.frm, "dispatch_address",
"dispatch_address_display", true);
erpnext.utils.get_address_display(
this.frm,
"dispatch_address",
"dispatch_address_display",
true
);
}
billing_address() {
erpnext.utils.get_address_display(this.frm, "billing_address",
"billing_address_display", true);
erpnext.utils.get_address_display(
this.frm,
"billing_address",
"billing_address_display",
true
);
}
tc_name() {
@@ -320,37 +360,43 @@ erpnext.buying = {
update_auto_repeat_reference(doc) {
if (doc.auto_repeat) {
frappe.call({
method:"frappe.automation.doctype.auto_repeat.auto_repeat.update_reference",
args:{
method: "frappe.automation.doctype.auto_repeat.auto_repeat.update_reference",
args: {
docname: doc.auto_repeat,
reference:doc.name
reference: doc.name,
},
callback: function(r){
if (r.message=="success") {
frappe.show_alert({message:__("Auto repeat document updated"), indicator:'green'});
callback: function (r) {
if (r.message == "success") {
frappe.show_alert({
message: __("Auto repeat document updated"),
indicator: "green",
});
} else {
frappe.show_alert({message:__("An error occurred during the update process"), indicator:'red'});
frappe.show_alert({
message: __("An error occurred during the update process"),
indicator: "red",
});
}
}
})
},
});
}
}
manufacturer(doc, cdt, cdn) {
const row = locals[cdt][cdn];
if(row.manufacturer) {
if (row.manufacturer) {
frappe.call({
method: "erpnext.stock.doctype.item_manufacturer.item_manufacturer.get_item_manufacturer_part_no",
args: {
'item_code': row.item_code,
'manufacturer': row.manufacturer
item_code: row.item_code,
manufacturer: row.manufacturer,
},
callback: function(r) {
callback: function (r) {
if (r.message) {
frappe.model.set_value(cdt, cdn, 'manufacturer_part_no', r.message);
frappe.model.set_value(cdt, cdn, "manufacturer_part_no", r.message);
}
}
},
});
}
}
@@ -359,19 +405,22 @@ erpnext.buying = {
const row = locals[cdt][cdn];
if (row.manufacturer_part_no) {
frappe.model.get_value('Item Manufacturer',
frappe.model.get_value(
"Item Manufacturer",
{
'item_code': row.item_code,
'manufacturer': row.manufacturer,
'manufacturer_part_no': row.manufacturer_part_no
item_code: row.item_code,
manufacturer: row.manufacturer,
manufacturer_part_no: row.manufacturer_part_no,
},
'name',
function(data) {
"name",
function (data) {
if (!data) {
let msg = {
message: __("Manufacturer Part Number <b>{0}</b> is invalid", [row.manufacturer_part_no]),
title: __("Invalid Part Number")
}
message: __("Manufacturer Part Number <b>{0}</b> is invalid", [
row.manufacturer_part_no,
]),
title: __("Invalid Part Number"),
};
frappe.throw(msg);
}
}
@@ -384,40 +433,42 @@ erpnext.buying = {
let me = this;
let fields = ["has_batch_no", "has_serial_no"];
frappe.db.get_value("Item", item.item_code, fields)
.then((r) => {
if (r.message && (r.message.has_batch_no || r.message.has_serial_no)) {
fields.forEach((field) => {
item[field] = r.message[field];
});
frappe.db.get_value("Item", item.item_code, fields).then((r) => {
if (r.message && (r.message.has_batch_no || r.message.has_serial_no)) {
fields.forEach((field) => {
item[field] = r.message[field];
});
item.type_of_transaction = item.qty > 0 ? "Inward" : "Outward";
item.is_rejected = false;
item.type_of_transaction = item.qty > 0 ? "Inward" : "Outward";
item.is_rejected = false;
new erpnext.SerialBatchPackageSelector(
me.frm, item, (r) => {
if (r) {
let qty = Math.abs(r.total_qty);
if (doc.is_return) {
qty = qty * -1;
}
let update_values = {
"serial_and_batch_bundle": r.name,
"use_serial_batch_fields": 0,
"qty": qty / flt(item.conversion_factor || 1, precision("conversion_factor", item))
}
if (r.warehouse) {
update_values["warehouse"] = r.warehouse;
}
frappe.model.set_value(item.doctype, item.name, update_values);
}
new erpnext.SerialBatchPackageSelector(me.frm, item, (r) => {
if (r) {
let qty = Math.abs(r.total_qty);
if (doc.is_return) {
qty = qty * -1;
}
);
}
});
let update_values = {
serial_and_batch_bundle: r.name,
use_serial_batch_fields: 0,
qty:
qty /
flt(
item.conversion_factor || 1,
precision("conversion_factor", item)
),
};
if (r.warehouse) {
update_values["warehouse"] = r.warehouse;
}
frappe.model.set_value(item.doctype, item.name, update_values);
}
});
}
});
}
add_serial_batch_for_rejected_qty(doc, cdt, cdn) {
@@ -425,142 +476,147 @@ erpnext.buying = {
let me = this;
let fields = ["has_batch_no", "has_serial_no"];
frappe.db.get_value("Item", item.item_code, fields)
.then((r) => {
if (r.message && (r.message.has_batch_no || r.message.has_serial_no)) {
fields.forEach((field) => {
item[field] = r.message[field];
});
frappe.db.get_value("Item", item.item_code, fields).then((r) => {
if (r.message && (r.message.has_batch_no || r.message.has_serial_no)) {
fields.forEach((field) => {
item[field] = r.message[field];
});
item.type_of_transaction = !doc.is_return > 0 ? "Inward" : "Outward";
item.is_rejected = true;
item.type_of_transaction = !doc.is_return > 0 ? "Inward" : "Outward";
item.is_rejected = true;
new erpnext.SerialBatchPackageSelector(
me.frm, item, (r) => {
if (r) {
let qty = Math.abs(r.total_qty);
if (doc.is_return) {
qty = qty * -1;
}
let update_values = {
"rejected_serial_and_batch_bundle": r.name,
"use_serial_batch_fields": 0,
"rejected_qty": qty / flt(item.conversion_factor || 1, precision("conversion_factor", item))
}
if (r.warehouse) {
update_values["rejected_warehouse"] = r.warehouse;
}
frappe.model.set_value(item.doctype, item.name, update_values);
}
new erpnext.SerialBatchPackageSelector(me.frm, item, (r) => {
if (r) {
let qty = Math.abs(r.total_qty);
if (doc.is_return) {
qty = qty * -1;
}
);
}
});
let update_values = {
rejected_serial_and_batch_bundle: r.name,
use_serial_batch_fields: 0,
rejected_qty:
qty /
flt(
item.conversion_factor || 1,
precision("conversion_factor", item)
),
};
if (r.warehouse) {
update_values["rejected_warehouse"] = r.warehouse;
}
frappe.model.set_value(item.doctype, item.name, update_values);
}
});
}
});
}
};
}
}
},
};
erpnext.buying.link_to_mrs = function(frm) {
erpnext.buying.link_to_mrs = function (frm) {
frappe.call({
method: "erpnext.buying.utils.get_linked_material_requests",
args:{
items: frm.doc.items.map((item) => item.item_code)
args: {
items: frm.doc.items.map((item) => item.item_code),
},
callback: function(r) {
callback: function (r) {
if (!r.message || r.message.length == 0) {
frappe.throw({
message: __("No pending Material Requests found to link for the given items."),
title: __("Note")
title: __("Note"),
});
}
var item_length = frm.doc.items.length;
for (let item of frm.doc.items) {
var qty = item.qty;
(r.message[0] || []).forEach(function(d) {
if (d.qty > 0 && qty > 0 && item.item_code == d.item_code && !item.material_request_item)
{
(r.message[0] || []).forEach(function (d) {
if (
d.qty > 0 &&
qty > 0 &&
item.item_code == d.item_code &&
!item.material_request_item
) {
item.material_request = d.mr_name;
item.material_request_item = d.mr_item;
var my_qty = Math.min(qty, d.qty);
qty = qty - my_qty;
d.qty = d.qty - my_qty;
item.stock_qty = my_qty*item.conversion_factor;
item.stock_qty = my_qty * item.conversion_factor;
item.qty = my_qty;
frappe.msgprint("Assigning " + d.mr_name + " to " + d.item_code + " (row " + item.idx + ")");
if (qty > 0)
{
frappe.msgprint(
"Assigning " + d.mr_name + " to " + d.item_code + " (row " + item.idx + ")"
);
if (qty > 0) {
frappe.msgprint("Splitting " + qty + " units of " + d.item_code);
var newrow = frappe.model.add_child(frm.doc, item.doctype, "items");
item_length++;
for (var key in item)
{
for (var key in item) {
newrow[key] = item[key];
}
newrow.idx = item_length;
newrow["stock_qty"] = newrow.conversion_factor*qty;
newrow["stock_qty"] = newrow.conversion_factor * qty;
newrow["qty"] = qty;
newrow["material_request"] = "";
newrow["material_request_item"] = "";
}
}
});
}
refresh_field("items");
}
},
});
}
};
erpnext.buying.get_default_bom = function(frm) {
$.each(frm.doc["items"] || [], function(i, d) {
erpnext.buying.get_default_bom = function (frm) {
$.each(frm.doc["items"] || [], function (i, d) {
if (d.item_code && d.bom === "") {
return frappe.call({
type: "GET",
method: "erpnext.stock.get_item_details.get_default_bom",
args: {
"item_code": d.item_code,
item_code: d.item_code,
},
callback: function(r) {
if(r) {
callback: function (r) {
if (r) {
frappe.model.set_value(d.doctype, d.name, "bom", r.message);
}
}
})
},
});
}
});
}
};
erpnext.buying.get_items_from_product_bundle = function(frm) {
erpnext.buying.get_items_from_product_bundle = function (frm) {
var dialog = new frappe.ui.Dialog({
title: __("Get Items from Product Bundle"),
fields: [
{
"fieldtype": "Link",
"label": __("Product Bundle"),
"fieldname": "product_bundle",
"options":"Product Bundle",
"reqd": 1
fieldtype: "Link",
label: __("Product Bundle"),
fieldname: "product_bundle",
options: "Product Bundle",
reqd: 1,
},
{
"fieldtype": "Currency",
"label": __("Quantity"),
"fieldname": "quantity",
"reqd": 1,
"default": 1
}
fieldtype: "Currency",
label: __("Quantity"),
fieldname: "quantity",
reqd: 1,
default: 1,
},
],
primary_action_label: 'Get Items',
primary_action(args){
if(!args) return;
primary_action_label: "Get Items",
primary_action(args) {
if (!args) return;
dialog.hide();
return frappe.call({
type: "GET",
@@ -581,44 +637,44 @@ erpnext.buying.get_items_from_product_bundle = function(frm) {
is_subcontracted: frm.doc.is_subcontracted,
transaction_date: frm.doc.transaction_date || frm.doc.posting_date,
ignore_pricing_rule: frm.doc.ignore_pricing_rule,
doctype: frm.doc.doctype
doctype: frm.doc.doctype,
},
},
freeze: true,
callback: function(r) {
const first_row_is_empty = function(child_table){
if($.isArray(child_table) && child_table.length > 0) {
callback: function (r) {
const first_row_is_empty = function (child_table) {
if ($.isArray(child_table) && child_table.length > 0) {
return !child_table[0].item_code;
}
return false;
};
const remove_empty_first_row = function(frm){
if (first_row_is_empty(frm.doc.items)){
frm.doc.items = frm.doc.items.splice(1);
const remove_empty_first_row = function (frm) {
if (first_row_is_empty(frm.doc.items)) {
frm.doc.items = frm.doc.items.splice(1);
}
};
if(!r.exc && r.message) {
if (!r.exc && r.message) {
remove_empty_first_row(frm);
for (var i=0; i< r.message.length; i++) {
for (var i = 0; i < r.message.length; i++) {
var d = frm.add_child("items");
var item = r.message[i];
for (var key in item) {
for (var key in item) {
if (!is_null(item[key]) && key !== "doctype") {
d[key] = item[key];
}
}
if(frappe.meta.get_docfield(d.doctype, "price_list_rate", d.name)) {
if (frappe.meta.get_docfield(d.doctype, "price_list_rate", d.name)) {
frm.script_manager.trigger("price_list_rate", d.doctype, d.name);
}
}
frm.refresh_field("items");
}
}
})
}
},
});
},
});
dialog.show();
}
};

101
erpnext/public/js/controllers/stock_controller.js
View File

@@ -11,13 +11,13 @@ erpnext.stock.StockController = class StockController extends frappe.ui.form.Con
}
}
barcode(doc, cdt, cdn) {
barcode(doc, cdt, cdn) {
let row = locals[cdt][cdn];
if (row.barcode) {
erpnext.stock.utils.set_item_details_using_barcode(this.frm, row, (r) => {
frappe.model.set_value(cdt, cdn, {
"item_code": r.message.item_code,
"qty": 1,
item_code: r.message.item_code,
qty: 1,
});
});
}
@@ -25,74 +25,81 @@ erpnext.stock.StockController = class StockController extends frappe.ui.form.Con
setup_warehouse_query() {
var me = this;
erpnext.queries.setup_queries(this.frm, "Warehouse", function() {
erpnext.queries.setup_queries(this.frm, "Warehouse", function () {
return erpnext.queries.warehouse(me.frm.doc);
});
}
setup_posting_date_time_check() {
// make posting date default and read only unless explictly checked
frappe.ui.form.on(this.frm.doctype, 'set_posting_date_and_time_read_only', function(frm) {
if(frm.doc.docstatus == 0 && frm.doc.set_posting_time) {
frm.set_df_property('posting_date', 'read_only', 0);
frm.set_df_property('posting_time', 'read_only', 0);
frappe.ui.form.on(this.frm.doctype, "set_posting_date_and_time_read_only", function (frm) {
if (frm.doc.docstatus == 0 && frm.doc.set_posting_time) {
frm.set_df_property("posting_date", "read_only", 0);
frm.set_df_property("posting_time", "read_only", 0);
} else {
frm.set_df_property('posting_date', 'read_only', 1);
frm.set_df_property('posting_time', 'read_only', 1);
frm.set_df_property("posting_date", "read_only", 1);
frm.set_df_property("posting_time", "read_only", 1);
}
})
frappe.ui.form.on(this.frm.doctype, 'set_posting_time', function(frm) {
frm.trigger('set_posting_date_and_time_read_only');
});
frappe.ui.form.on(this.frm.doctype, 'refresh', function(frm) {
frappe.ui.form.on(this.frm.doctype, "set_posting_time", function (frm) {
frm.trigger("set_posting_date_and_time_read_only");
});
frappe.ui.form.on(this.frm.doctype, "refresh", function (frm) {
// set default posting date / time
if(frm.doc.docstatus==0) {
if(!frm.doc.posting_date) {
frm.set_value('posting_date', frappe.datetime.nowdate());
if (frm.doc.docstatus == 0) {
if (!frm.doc.posting_date) {
frm.set_value("posting_date", frappe.datetime.nowdate());
}
if(!frm.doc.posting_time) {
frm.set_value('posting_time', frappe.datetime.now_time());
if (!frm.doc.posting_time) {
frm.set_value("posting_time", frappe.datetime.now_time());
}
frm.trigger('set_posting_date_and_time_read_only');
frm.trigger("set_posting_date_and_time_read_only");
}
});
}
show_stock_ledger() {
var me = this;
if(this.frm.doc.docstatus > 0) {
cur_frm.add_custom_button(__("Stock Ledger"), function() {
frappe.route_options = {
voucher_no: me.frm.doc.name,
from_date: me.frm.doc.posting_date,
to_date: moment(me.frm.doc.modified).format('YYYY-MM-DD'),
company: me.frm.doc.company,
show_cancelled_entries: me.frm.doc.docstatus === 2,
ignore_prepared_report: true
};
frappe.set_route("query-report", "Stock Ledger");
}, __("View"));
if (this.frm.doc.docstatus > 0) {
cur_frm.add_custom_button(
__("Stock Ledger"),
function () {
frappe.route_options = {
voucher_no: me.frm.doc.name,
from_date: me.frm.doc.posting_date,
to_date: moment(me.frm.doc.modified).format("YYYY-MM-DD"),
company: me.frm.doc.company,
show_cancelled_entries: me.frm.doc.docstatus === 2,
ignore_prepared_report: true,
};
frappe.set_route("query-report", "Stock Ledger");
},
__("View")
);
}
}
show_general_ledger() {
let me = this;
if(this.frm.doc.docstatus > 0) {
cur_frm.add_custom_button(__('Accounting Ledger'), function() {
frappe.route_options = {
voucher_no: me.frm.doc.name,
from_date: me.frm.doc.posting_date,
to_date: moment(me.frm.doc.modified).format('YYYY-MM-DD'),
company: me.frm.doc.company,
categorize_by: "Categorize by Voucher (Consolidated)",
show_cancelled_entries: me.frm.doc.docstatus === 2,
ignore_prepared_report: true
};
frappe.set_route("query-report", "General Ledger");
}, __("View"));
if (this.frm.doc.docstatus > 0) {
cur_frm.add_custom_button(
__("Accounting Ledger"),
function () {
frappe.route_options = {
voucher_no: me.frm.doc.name,
from_date: me.frm.doc.posting_date,
to_date: moment(me.frm.doc.modified).format("YYYY-MM-DD"),
company: me.frm.doc.company,
categorize_by: "Categorize by Voucher (Consolidated)",
show_cancelled_entries: me.frm.doc.docstatus === 2,
ignore_prepared_report: true,
};
frappe.set_route("query-report", "General Ledger");
},
__("View")
);
}
}
};

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

File diff suppressed because it is too large Load Diff

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

File diff suppressed because it is too large Load Diff