diff --git a/erpnext/projects/doctype/task/task.py b/erpnext/projects/doctype/task/task.py
index 5028c60f1ad..b5e2fbf31df 100755
--- a/erpnext/projects/doctype/task/task.py
+++ b/erpnext/projects/doctype/task/task.py
@@ -116,19 +116,35 @@ class Task(NestedSet):
if not self.project or frappe.flags.in_test:
return
- if project_end_date := frappe.db.get_value("Project", self.project, "expected_end_date"):
- project_end_date = getdate(project_end_date)
- for fieldname in ("exp_start_date", "exp_end_date", "act_start_date", "act_end_date"):
- task_date = self.get(fieldname)
- if task_date and date_diff(project_end_date, getdate(task_date)) < 0:
- frappe.throw(
- _("{0}'s {1} cannot be after {2}'s Expected End Date.").format(
- frappe.bold(frappe.get_desk_link("Task", self.name)),
- _(self.meta.get_label(fieldname)),
- frappe.bold(frappe.get_desk_link("Project", self.project)),
- ),
- frappe.exceptions.InvalidDates,
- )
+ project_start_date, project_end_date = frappe.db.get_value(
+ "Project", self.project, ["expected_start_date", "expected_end_date"]
+ )
+
+ for fieldname in ("exp_start_date", "exp_end_date", "act_start_date", "act_end_date"):
+ task_date = self.get(fieldname)
+ if not task_date:
+ continue
+ task_date = getdate(task_date)
+
+ if project_end_date and date_diff(getdate(project_end_date), task_date) < 0:
+ frappe.throw(
+ _("{0}'s {1} cannot be after {2}'s Expected End Date.").format(
+ get_link_to_form("Task", self.name),
+ _(self.meta.get_label(fieldname)),
+ get_link_to_form("Project", self.project),
+ ),
+ frappe.exceptions.InvalidDates,
+ )
+
+ if project_start_date and date_diff(task_date, getdate(project_start_date)) < 0:
+ frappe.throw(
+ _("{0}'s {1} cannot be before {2}'s Expected Start Date.").format(
+ get_link_to_form("Task", self.name),
+ _(self.meta.get_label(fieldname)),
+ get_link_to_form("Project", self.project),
+ ),
+ frappe.exceptions.InvalidDates,
+ )
def validate_status(self):
if self.is_template and self.status != "Template":
diff --git a/erpnext/projects/report/timesheet_billing_summary/timesheet_billing_summary.py b/erpnext/projects/report/timesheet_billing_summary/timesheet_billing_summary.py
new file mode 100644
index 00000000000..70b3d0c0c80
--- /dev/null
+++ b/erpnext/projects/report/timesheet_billing_summary/timesheet_billing_summary.py
@@ -0,0 +1,198 @@
+import frappe
+from frappe import _
+from frappe.desk.query_report import get_filtered_data
+from frappe.model.docstatus import DocStatus
+from frappe.utils import add_days, getdate
+
+VALUE_FIELDNAMES = ("hours", "billing_hours", "billing_amount")
+
+
+def execute(filters=None):
+ group_fieldname = filters.pop("group_by", None)
+
+ filters = frappe._dict(filters or {})
+ columns = get_columns(filters, group_fieldname)
+
+ data = get_data(filters)
+ data = get_filtered_data("Timesheet", columns, data, frappe.session.user)
+ report_summary = get_report_summary(data)
+
+ if group_fieldname:
+ data = group_by(data, group_fieldname)
+
+ return columns, data, None, None, report_summary, 1
+
+
+def get_columns(filters, group_fieldname=None):
+ group_columns = {
+ "date": {
+ "label": _("Date"),
+ "fieldtype": "Date",
+ "fieldname": "date",
+ "width": 150,
+ },
+ "project": {
+ "label": _("Project"),
+ "fieldtype": "Link",
+ "fieldname": "project",
+ "options": "Project",
+ "width": 200,
+ "hidden": int(bool(filters.get("project"))),
+ },
+ "employee": {
+ "label": _("Employee ID"),
+ "fieldtype": "Link",
+ "fieldname": "employee",
+ "options": "Employee",
+ "width": 200,
+ "hidden": int(bool(filters.get("employee"))),
+ },
+ }
+ columns = []
+ if group_fieldname in group_columns:
+ # the grouped column labels the group rows: keep it visible even when it is filtered too
+ group_columns[group_fieldname]["hidden"] = 0
+ columns.append(group_columns.pop(group_fieldname))
+
+ columns.extend(group_columns.values())
+
+ columns.extend(
+ [
+ {
+ "label": _("Employee Name"),
+ "fieldtype": "data",
+ "fieldname": "employee_name",
+ "hidden": 1,
+ },
+ {
+ "label": _("Timesheet"),
+ "fieldtype": "Link",
+ "fieldname": "timesheet",
+ "options": "Timesheet",
+ "width": 150,
+ },
+ {"label": _("Working Hours"), "fieldtype": "Float", "fieldname": "hours", "width": 150},
+ {
+ "label": _("Billing Hours"),
+ "fieldtype": "Float",
+ "fieldname": "billing_hours",
+ "width": 150,
+ },
+ {
+ "label": _("Billing Amount"),
+ "fieldtype": "Currency",
+ "fieldname": "billing_amount",
+ "width": 150,
+ },
+ ]
+ )
+
+ return columns
+
+
+def get_data(filters):
+ _filters = []
+ if filters.get("employee"):
+ _filters.append(("employee", "=", filters.get("employee")))
+ if filters.get("project"):
+ _filters.append(("Timesheet Detail", "project", "=", filters.get("project")))
+ if filters.get("from_date"):
+ _filters.append(("Timesheet Detail", "from_time", ">=", filters.get("from_date")))
+ if filters.get("to_date"):
+ _filters.append(("Timesheet Detail", "from_time", "<", add_days(getdate(filters.get("to_date")), 1)))
+ if not filters.get("include_draft_timesheets"):
+ _filters.append(("docstatus", "=", DocStatus.submitted()))
+ else:
+ _filters.append(("docstatus", "in", (DocStatus.submitted(), DocStatus.draft())))
+
+ data = frappe.get_list(
+ "Timesheet",
+ fields=[
+ "name as timesheet",
+ "`tabTimesheet`.employee",
+ "`tabTimesheet`.employee_name",
+ "`tabTimesheet Detail`.from_time as date",
+ "`tabTimesheet Detail`.project",
+ "`tabTimesheet Detail`.hours",
+ "`tabTimesheet Detail`.billing_hours",
+ "`tabTimesheet Detail`.billing_amount",
+ ],
+ filters=_filters,
+ order_by="`tabTimesheet Detail`.from_time",
+ )
+
+ return data
+
+
+def group_by(data, fieldname):
+ groups = {}
+ for row in data:
+ groups.setdefault(get_group_value(row, fieldname), []).append(row)
+
+ grouped_data = []
+ for group in sorted(groups, key=lambda g: (g is None, g)):
+ hours = billing_hours = billing_amount = 0
+ child_rows = []
+ for row in groups[group]:
+ hours += row.get("hours") or 0
+ billing_hours += row.get("billing_hours") or 0
+ billing_amount += row.get("billing_amount") or 0
+
+ _row = row.copy()
+ _row[fieldname] = None
+ _row["indent"] = 1
+ _row["is_group"] = 0
+ child_rows.append(_row)
+
+ group_row = {
+ fieldname: group,
+ "hours": hours,
+ "billing_hours": billing_hours,
+ "billing_amount": billing_amount,
+ "indent": 0,
+ "is_group": 1,
+ }
+ if fieldname == "employee":
+ group_row["employee_name"] = groups[group][0].get("employee_name")
+
+ grouped_data.append(group_row)
+ grouped_data.extend(child_rows)
+
+ return grouped_data
+
+
+def get_group_value(row, fieldname):
+ value = row.get(fieldname)
+ # `date` is `Timesheet Detail.from_time`, a datetime: everything logged on a day is one group
+ return getdate(value) if fieldname == "date" and value else value
+
+
+def get_report_summary(data):
+ if not data:
+ return None
+
+ totals = dict.fromkeys(VALUE_FIELDNAMES, 0.0)
+ for row in data:
+ for value_fieldname in VALUE_FIELDNAMES:
+ totals[value_fieldname] += row.get(value_fieldname) or 0
+
+ return [
+ {
+ "value": totals["hours"],
+ "indicator": "Blue",
+ "label": _("Total Working Hours"),
+ "datatype": "Float",
+ },
+ {
+ "value": totals["billing_hours"],
+ "indicator": "Blue",
+ "label": _("Total Billing Hours"),
+ "datatype": "Float",
+ },
+ {
+ "value": totals["billing_amount"],
+ "indicator": "Green",
+ "label": _("Total Billing Amount"),
+ "datatype": "Currency",
+ },
+ ]
diff --git a/erpnext/public/js/controllers/taxes_and_totals.js b/erpnext/public/js/controllers/taxes_and_totals.js
index 4d980d7e277..dc1d85b87ab 100644
--- a/erpnext/public/js/controllers/taxes_and_totals.js
+++ b/erpnext/public/js/controllers/taxes_and_totals.js
@@ -1,6 +1,14 @@
// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
// License: GNU General Public License v3. See license.txt
+// mirror of erpnext.stock.get_item_details.NOT_APPLICABLE_TAX
+erpnext.NOT_APPLICABLE_TAX = "N/A";
+
+// Per-charge_type base resolvers, mirror of the `erpnext_taxable_base_resolvers`
+// server hook. A localization registers `fn(calc, item, tax)` returning the per-item
+// base, so the client preview matches the server for custom charge types.
+erpnext.taxable_base_resolvers = erpnext.taxable_base_resolvers || {};
+
erpnext.taxes_and_totals = class TaxesAndTotals extends erpnext.payments {
setup() {
this.fetch_round_off_accounts();
@@ -252,28 +260,33 @@ erpnext.taxes_and_totals = class TaxesAndTotals extends erpnext.payments {
$.each(this.frm.doc.items || [], function(n, item) {
var item_tax_map = me._load_item_tax_rate(item.item_tax_rate);
- var cumulated_tax_fraction = 0.0;
- var total_inclusive_tax_amount_per_qty = 0;
+ var total_tax_slope = 0.0;
+ var total_tax_intercept = 0;
$.each(me.frm.doc["taxes"] || [], function(i, tax) {
- var current_tax_fraction = me.get_current_tax_fraction(tax, item_tax_map);
- tax.tax_fraction_for_current_item = current_tax_fraction[0];
- var inclusive_tax_amount_per_qty = current_tax_fraction[1];
+ var tax_contribution = me.get_current_tax_fraction(tax, item_tax_map, item);
+ tax.tax_fraction_for_current_item = tax_contribution[0];
+ var tax_intercept_per_qty = tax_contribution[1];
+ tax.inclusive_amount_per_qty = tax_intercept_per_qty;
if(i==0) {
tax.grand_total_fraction_for_current_item = 1 + tax.tax_fraction_for_current_item;
+ tax.grand_total_amount_per_qty = tax_intercept_per_qty;
} else {
+ var prev = me.frm.doc["taxes"][i - 1];
tax.grand_total_fraction_for_current_item =
- me.frm.doc["taxes"][i-1].grand_total_fraction_for_current_item +
+ prev.grand_total_fraction_for_current_item +
tax.tax_fraction_for_current_item;
+ tax.grand_total_amount_per_qty =
+ flt(prev.grand_total_amount_per_qty) + tax_intercept_per_qty;
}
- cumulated_tax_fraction += tax.tax_fraction_for_current_item;
- total_inclusive_tax_amount_per_qty += inclusive_tax_amount_per_qty * flt(item.qty);
+ total_tax_slope += tax.tax_fraction_for_current_item;
+ total_tax_intercept += tax_intercept_per_qty * flt(item.qty);
});
- if(!me.discount_amount_applied && item.qty && (total_inclusive_tax_amount_per_qty || cumulated_tax_fraction)) {
- var amount = flt(item.amount) - total_inclusive_tax_amount_per_qty;
- item.net_amount = flt(amount / (1 + cumulated_tax_fraction), precision("net_amount", item));
+ if(!me.discount_amount_applied && item.qty && (total_tax_intercept || total_tax_slope)) {
+ var amount = flt(item.amount) - total_tax_intercept;
+ item.net_amount = flt(amount / (1 + total_tax_slope), precision("net_amount", item));
item.net_rate = item.qty ? flt(item.net_amount / item.qty, precision("net_rate", item)) : 0;
me.set_in_company_currency(item, ["net_rate", "net_amount"]);
@@ -281,40 +294,66 @@ erpnext.taxes_and_totals = class TaxesAndTotals extends erpnext.payments {
});
}
- get_current_tax_fraction(tax, item_tax_map) {
- // Get tax fraction for calculating tax exclusive amount
- // from tax inclusive amount
- var current_tax_fraction = 0.0;
- var inclusive_tax_amount_per_qty = 0;
+ get_current_tax_fraction(tax, item_tax_map, item) {
+ // tax = slope * net + intercept.
+ // Returns [slope, intercept_per_qty]
+ var tax_slope = 0.0;
+ var tax_intercept = 0;
if(cint(tax.included_in_print_rate)) {
var tax_rate = this._get_tax_rate(tax, item_tax_map);
+ if (tax_rate === erpnext.NOT_APPLICABLE_TAX) {
+ return [tax_slope, tax_intercept];
+ }
+
if(tax.charge_type == "On Net Total") {
- current_tax_fraction = (tax_rate / 100.0);
+ tax_slope = (tax_rate / 100.0);
} else if(tax.charge_type == "On Previous Row Amount") {
- current_tax_fraction = (tax_rate / 100.0) *
- this.frm.doc["taxes"][cint(tax.row_id) - 1].tax_fraction_for_current_item;
+ const row = this.frm.doc["taxes"][cint(tax.row_id) - 1];
+ tax_slope = (tax_rate / 100.0) * row.tax_fraction_for_current_item;
+ tax_intercept = (tax_rate / 100.0) * flt(row.inclusive_amount_per_qty);
} else if(tax.charge_type == "On Previous Row Total") {
- current_tax_fraction = (tax_rate / 100.0) *
- this.frm.doc["taxes"][cint(tax.row_id) - 1].grand_total_fraction_for_current_item;
+ const row = this.frm.doc["taxes"][cint(tax.row_id) - 1];
+ tax_slope = (tax_rate / 100.0) * row.grand_total_fraction_for_current_item;
+ tax_intercept = (tax_rate / 100.0) * flt(row.grand_total_amount_per_qty);
} else if (tax.charge_type == "On Item Quantity") {
- inclusive_tax_amount_per_qty = flt(tax_rate);
+ tax_intercept = flt(tax_rate);
+ } else {
+ // Custom charge_type: the rate applies to a resolved (fixed) base,
+ // e.g. a tax on MRP included in the printed price.
+ const qty = flt(item.qty) || 1;
+ const base = this.get_item_taxable_base(item, tax);
+ tax_intercept = ((tax_rate / 100.0) * base) / qty;
}
}
if(tax.add_deduct_tax && tax.add_deduct_tax == "Deduct") {
- current_tax_fraction *= -1;
- inclusive_tax_amount_per_qty *= -1;
+ tax_slope *= -1;
+ tax_intercept *= -1;
}
- return [current_tax_fraction, inclusive_tax_amount_per_qty];
+ return [tax_slope, tax_intercept];
+ }
+
+ get_item_taxable_base(item, tax) {
+ // Mirror of the server get_item_taxable_base: a custom charge_type's resolver
+ // overrides the base value; otherwise the net amount.
+ const resolver = erpnext.taxable_base_resolvers[tax.charge_type];
+ if (resolver) return flt(resolver(this, item, tax));
+ return flt(item.net_amount);
}
_get_tax_rate(tax, item_tax_map) {
- return (Object.keys(item_tax_map).indexOf(tax.account_head) != -1) ?
- flt(item_tax_map[tax.account_head], precision("rate", tax)) : tax.rate;
+ if (tax.account_head in item_tax_map) {
+ let rate = item_tax_map[tax.account_head];
+ if (rate === erpnext.NOT_APPLICABLE_TAX) {
+ return erpnext.NOT_APPLICABLE_TAX;
+ }
+ return flt(rate, precision("rate", tax));
+ }
+ return tax.rate;
}
calculate_net_total() {
@@ -353,6 +392,9 @@ erpnext.taxes_and_totals = class TaxesAndTotals extends erpnext.payments {
}
$.each(item_tax_map, function(tax, rate) {
+ if (rate === erpnext.NOT_APPLICABLE_TAX) {
+ return;
+ }
let found = (me.frm.doc.taxes || []).find(d => d.account_head === tax);
if (!found) {
let child = frappe.model.add_child(me.frm.doc, "taxes");
@@ -403,11 +445,14 @@ erpnext.taxes_and_totals = class TaxesAndTotals extends erpnext.payments {
}
}
+ // net_amount is the taxable basis, it feeds no total and is always
+ // accumulated, unlike tax_amount which is kept from the first pass
+ tax.net_amount += current_net_amount;
+
// accumulate tax amount into tax.tax_amount
if (tax.charge_type != "Actual" &&
!(me.discount_amount_applied && me.frm.doc.apply_discount_on=="Grand Total")) {
tax.tax_amount += current_tax_amount;
- tax.net_amount += current_net_amount;
}
// store tax_amount for current item as it will be used for
@@ -493,6 +538,10 @@ erpnext.taxes_and_totals = class TaxesAndTotals extends erpnext.payments {
var current_tax_amount = 0.0;
var current_net_amount = 0.0;
+ if (tax_rate === erpnext.NOT_APPLICABLE_TAX) {
+ return [current_net_amount, current_tax_amount];
+ }
+
// To set row_id by default as previous row.
if(["On Previous Row Amount", "On Previous Row Total"].includes(tax.charge_type)) {
if (tax.idx === 1) {
@@ -526,6 +575,11 @@ erpnext.taxes_and_totals = class TaxesAndTotals extends erpnext.payments {
} else if (tax.charge_type == "On Item Quantity") {
// don't sum current net amount due to the field being a currency field
current_tax_amount = tax_rate * item.qty;
+ } else {
+ // Custom charge_type: rate applies to the resolver-provided base.
+ var resolved_base = this.get_item_taxable_base(item, tax);
+ current_net_amount = resolved_base;
+ current_tax_amount = (tax_rate / 100.0) * resolved_base;
}
if (!tax.dont_recompute_tax) {
diff --git a/erpnext/public/js/controllers/transaction.js b/erpnext/public/js/controllers/transaction.js
index e7f4cdec979..7a133acaf9e 100644
--- a/erpnext/public/js/controllers/transaction.js
+++ b/erpnext/public/js/controllers/transaction.js
@@ -818,6 +818,9 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
}
$.each(item_tax_map, function(tax, rate) {
+ if (rate === erpnext.NOT_APPLICABLE_TAX) {
+ return;
+ }
let found = (me.frm.doc.taxes || []).find(d => d.account_head === tax);
if(!found) {
let child = frappe.model.add_child(me.frm.doc, "taxes");
@@ -1611,9 +1614,9 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
}
if (this.frm.doc.taxes && this.frm.doc.taxes.length > 0) {
- this.frm.set_currency_labels(["tax_amount", "total", "tax_amount_after_discount"], this.frm.doc.currency, "taxes");
+ this.frm.set_currency_labels(["net_amount", "tax_amount", "total", "tax_amount_after_discount"], this.frm.doc.currency, "taxes");
- this.frm.set_currency_labels(["base_tax_amount", "base_total", "base_tax_amount_after_discount"], company_currency, "taxes");
+ this.frm.set_currency_labels(["base_net_amount", "base_tax_amount", "base_total", "base_tax_amount_after_discount"], company_currency, "taxes");
}
if (this.frm.doc.advances && this.frm.doc.advances.length > 0) {
diff --git a/erpnext/public/js/queries.js b/erpnext/public/js/queries.js
index 8b174da244f..32a4e0958c9 100644
--- a/erpnext/public/js/queries.js
+++ b/erpnext/public/js/queries.js
@@ -12,6 +12,10 @@ $.extend(erpnext.queries, {
return { query: "erpnext.controllers.queries.lead_query" };
},
+ customer: function () {
+ return { filters: { disabled: 0 } };
+ },
+
item: function (filters) {
var args = { query: "erpnext.controllers.queries.item_query" };
if (filters) args["filters"] = filters;
diff --git a/erpnext/public/js/templates/call_link.html b/erpnext/public/js/templates/call_link.html
index 071078c776e..bb49c6b402b 100644
--- a/erpnext/public/js/templates/call_link.html
+++ b/erpnext/public/js/templates/call_link.html
@@ -8,7 +8,7 @@
• {{ comment_when(creation) }}
-
+
@@ -34,7 +34,7 @@
+ src="{{ frappe.utils.escape_html(recording_url) }}">
{% } %}
diff --git a/erpnext/public/js/templates/crm_activities.html b/erpnext/public/js/templates/crm_activities.html
index 42603196087..c6561dabf03 100644
--- a/erpnext/public/js/templates/crm_activities.html
+++ b/erpnext/public/js/templates/crm_activities.html
@@ -30,13 +30,13 @@
-
+
{%= tasks[i].description %}
diff --git a/erpnext/public/js/utils/serial_no_batch_selector.js b/erpnext/public/js/utils/serial_no_batch_selector.js
index 91cda58718c..14011751d3f 100644
--- a/erpnext/public/js/utils/serial_no_batch_selector.js
+++ b/erpnext/public/js/utils/serial_no_batch_selector.js
@@ -8,6 +8,16 @@ erpnext.SerialBatchPackageSelector = class SerialNoBatchBundleUpdate {
? this.item.rejected_serial_and_batch_bundle
: this.item.serial_and_batch_bundle;
+ this.init();
+ }
+
+ async init() {
+ try {
+ this.based_on = await erpnext.stock.get_pick_serial_batch_based_on();
+ } catch (e) {
+ this.based_on = "FIFO";
+ }
+
this.make();
this.render_data();
}
@@ -379,7 +389,7 @@ erpnext.SerialBatchPackageSelector = class SerialNoBatchBundleUpdate {
{
fieldtype: "Select",
options: ["FIFO", "LIFO", "Expiry"],
- default: "FIFO",
+ default: this.based_on,
fieldname: "based_on",
label: __("Fetch Based On"),
onchange: () => this.get_auto_data(),
@@ -525,7 +535,7 @@ erpnext.SerialBatchPackageSelector = class SerialNoBatchBundleUpdate {
}
if (!based_on) {
- based_on = "FIFO";
+ based_on = this.based_on;
}
let warehouse = this.item.warehouse || this.item.s_warehouse;
@@ -658,6 +668,27 @@ erpnext.SerialBatchPackageSelector = class SerialNoBatchBundleUpdate {
frappe.throw(__("Rejected Warehouse and Accepted Warehouse cannot be same."));
}
+ let qty_to_fetch = flt(this.dialog.get_value("qty"));
+ let total_qty = entries.reduce((total, row) => total + (flt(row.qty) || 1.0), 0);
+
+ if (flt(total_qty, 6) !== flt(qty_to_fetch, 6)) {
+ const confirm_dialog = frappe.confirm(
+ __(
+ "
Total qty of the rows (
{0} ) does not match the
Qty to Fetch (
{1} ). Qty of the item will be changed to
{0} . Are you sure want to proceed?",
+ [format_number(total_qty), format_number(qty_to_fetch)]
+ ),
+ () => this.create_bundle_entries(entries, warehouse)
+ );
+ confirm_dialog.indicator = "blue";
+ confirm_dialog.set_indicator();
+
+ return;
+ }
+
+ this.create_bundle_entries(entries, warehouse);
+ }
+
+ create_bundle_entries(entries, warehouse) {
frappe
.call({
method: "erpnext.stock.doctype.serial_and_batch_bundle.serial_and_batch_bundle.add_serial_batch_ledgers",
diff --git a/erpnext/regional/italy/e-invoice.xml b/erpnext/regional/italy/e-invoice.xml
index ef1e94ff27b..43ea59a26d9 100644
--- a/erpnext/regional/italy/e-invoice.xml
+++ b/erpnext/regional/italy/e-invoice.xml
@@ -191,7 +191,7 @@
{{ html2text(item.description or '') or item.item_name }}
{{ format_float(item.qty) }}
{{ item.stock_uom }}
- {%- set item_unit_net_price = (item.price_list_rate / tax_divisor) or (item.net_rate) or (item.rate / tax_divisor) %}
+ {%- set item_unit_net_price = ((item.price_list_rate or 0) / tax_divisor) or (item.net_rate) or (item.rate / tax_divisor) %}
{{ format_float(item_unit_net_price, item_meta.get_field("rate").precision) }}
{{ render_discount_or_margin(item, tax_divisor) }}
{{ format_float(item.net_amount, item_meta.get_field("amount").precision) }}
diff --git a/erpnext/regional/italy/test_italy.py b/erpnext/regional/italy/test_italy.py
new file mode 100644
index 00000000000..57b6704e867
--- /dev/null
+++ b/erpnext/regional/italy/test_italy.py
@@ -0,0 +1,80 @@
+import frappe
+from frappe.tests.utils import FrappeTestCase
+
+from erpnext.regional.italy.utils import get_invoice_summary
+
+VAT_7 = "_Test Italy VAT 7 - _TC"
+VAT_19 = "_Test Italy VAT 19 - _TC"
+
+
+def make_item(item_code, net_amount, tax_amount, item_tax_rate):
+ return frappe._dict(
+ item_code=item_code,
+ net_amount=net_amount,
+ tax_amount=tax_amount,
+ item_tax_rate=item_tax_rate,
+ )
+
+
+def make_tax(account_head, total, charge_type="On Net Total", **kwargs):
+ return frappe._dict(
+ charge_type=charge_type,
+ account_head=account_head,
+ rate=0,
+ total=total,
+ tax_exemption_reason="N4-esenti",
+ tax_exemption_law="Art.10",
+ **kwargs,
+ )
+
+
+class TestItalyInvoiceSummary(FrappeTestCase):
+ def test_not_applicable_tax_excluded_from_summary(self):
+ """An item that marks a tax not applicable belongs to another summary
+ block. Counting it here inflates DatiRiepilogo and emits a block with
+ AliquotaIVA 0.00 and no Natura, which SDI rejects."""
+ items = [
+ make_item("A", 100.0, 7.0, {VAT_7: 7.0, VAT_19: "N/A"}),
+ make_item("B", 100.0, 19.0, {VAT_7: "N/A", VAT_19: 19.0}),
+ ]
+ taxes = [make_tax(VAT_7, 107.0), make_tax(VAT_19, 126.0)]
+
+ summary = get_invoice_summary(items, taxes)
+
+ self.assertEqual(sorted(summary.keys()), ["19.0", "7.0"])
+ self.assertEqual(summary["7.0"]["taxable_amount"], 100.0)
+ self.assertEqual(summary["19.0"]["taxable_amount"], 100.0)
+
+ def test_zero_rated_tax_keeps_exemption_reason(self):
+ """A genuine 0% rate is still exempt and must carry its Natura."""
+ items = [make_item("C", 100.0, 0.0, {VAT_7: 0.0})]
+
+ summary = get_invoice_summary(items, [make_tax(VAT_7, 100.0)])
+
+ self.assertEqual(list(summary.keys()), ["0.0"])
+ self.assertEqual(summary["0.0"]["taxable_amount"], 100.0)
+ self.assertEqual(summary["0.0"]["tax_exemption_reason"], "N4-esenti")
+
+ def test_all_items_not_applicable_falls_back_to_zero_vat(self):
+ """With every item excluded the summary would be empty, so the existing
+ zero VAT fallback has to supply the block and its Natura."""
+ items = [make_item("D", 100.0, 0.0, {VAT_7: "N/A"})]
+
+ summary = get_invoice_summary(items, [make_tax(VAT_7, 100.0)])
+
+ self.assertEqual(list(summary.keys()), ["0.0"])
+ self.assertEqual(summary["0.0"]["tax_exemption_reason"], "N4-esenti")
+
+ def test_previous_row_tax_with_only_not_applicable_items(self):
+ """The summary key leaks out of the item loop and is read again for
+ previous-row charges. Every item being excluded leaves it unset."""
+ items = [make_item("A", 100.0, 0.0, {VAT_7: 0.0, VAT_19: "N/A"})]
+ taxes = [
+ make_tax(VAT_7, 100.0, idx=1),
+ make_tax(VAT_19, 100.0, charge_type="On Previous Row Total", idx=2, row_id=None),
+ ]
+
+ summary = get_invoice_summary(items, taxes)
+
+ self.assertEqual(list(summary.keys()), ["0.0"])
+ self.assertEqual(summary["0.0"]["taxable_amount"], 100.0)
diff --git a/erpnext/regional/italy/utils.py b/erpnext/regional/italy/utils.py
index 8e216644857..ef35ad26ab6 100644
--- a/erpnext/regional/italy/utils.py
+++ b/erpnext/regional/italy/utils.py
@@ -8,6 +8,7 @@ from frappe.utils.file_manager import remove_file
from erpnext.controllers.taxes_and_totals import get_itemised_tax
from erpnext.regional.italy import state_codes
+from erpnext.stock.get_item_details import NOT_APPLICABLE_TAX
def update_itemised_tax_data(doc):
@@ -171,13 +172,20 @@ def get_invoice_summary(items, taxes):
# Check item tax rates if tax rate is zero.
if tax.rate == 0:
+ key = None
for item in items:
item_tax_rate = item.item_tax_rate
if isinstance(item.item_tax_rate, str):
item_tax_rate = json.loads(item.item_tax_rate)
if item_tax_rate and tax.account_head in item_tax_rate:
- key = cstr(item_tax_rate[tax.account_head])
+ rate = item_tax_rate[tax.account_head]
+ if rate == NOT_APPLICABLE_TAX:
+ # the tax does not apply to this item, so the item belongs
+ # to another summary block and must not be counted here
+ continue
+
+ key = cstr(rate)
if key not in summary_data:
summary_data.setdefault(
key,
@@ -195,10 +203,15 @@ def get_invoice_summary(items, taxes):
summary_data[key]["tax_exemption_reason"] = tax.tax_exemption_reason
summary_data[key]["tax_exemption_law"] = tax.tax_exemption_law
- if summary_data.get("0.0") and tax.charge_type in [
- "On Previous Row Total",
- "On Previous Row Amount",
- ]:
+ if (
+ key
+ and summary_data.get("0.0")
+ and tax.charge_type
+ in [
+ "On Previous Row Total",
+ "On Previous Row Amount",
+ ]
+ ):
summary_data[key]["taxable_amount"] = tax.total
if summary_data == {}: # Implies that Zero VAT has not been set on any item.
diff --git a/erpnext/selling/doctype/customer/test_customer.py b/erpnext/selling/doctype/customer/test_customer.py
index e6ed7acb508..cc6c55a37f1 100644
--- a/erpnext/selling/doctype/customer/test_customer.py
+++ b/erpnext/selling/doctype/customer/test_customer.py
@@ -67,7 +67,7 @@ class TestCustomer(FrappeTestCase):
doc.delete()
def test_party_details(self):
- from erpnext.accounts.party import get_party_details
+ from erpnext.accounts.party import _get_party_details
to_check = {
"selling_price_list": None,
@@ -91,7 +91,7 @@ class TestCustomer(FrappeTestCase):
"Contact", "_Test Contact for _Test Customer-_Test Customer", "is_primary_contact", 1
)
- details = get_party_details("_Test Customer")
+ details = _get_party_details("_Test Customer")
for key, value in to_check.items():
val = details.get(key)
@@ -101,13 +101,13 @@ class TestCustomer(FrappeTestCase):
self.assertEqual(value, val)
def test_party_details_tax_category(self):
- from erpnext.accounts.party import get_party_details
+ from erpnext.accounts.party import _get_party_details
frappe.delete_doc_if_exists("Address", "_Test Address With Tax Category-Billing")
frappe.delete_doc_if_exists("Address", "_Test Address With Tax Category-Shipping")
# Tax Category without Address
- details = get_party_details("_Test Customer With Tax Category")
+ details = _get_party_details("_Test Customer With Tax Category")
self.assertEqual(details.tax_category, "_Test Tax Category 1")
billing_address = frappe.get_doc(
@@ -141,13 +141,13 @@ class TestCustomer(FrappeTestCase):
# Tax Category from Billing Address
settings.determine_address_tax_category_from = "Billing Address"
settings.save()
- details = get_party_details("_Test Customer With Tax Category")
+ details = _get_party_details("_Test Customer With Tax Category")
self.assertEqual(details.tax_category, "_Test Tax Category 2")
# Tax Category from Shipping Address
settings.determine_address_tax_category_from = "Shipping Address"
settings.save()
- details = get_party_details("_Test Customer With Tax Category")
+ details = _get_party_details("_Test Customer With Tax Category")
self.assertEqual(details.tax_category, "_Test Tax Category 3")
# Rollback
diff --git a/erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.py b/erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.py
index 84da765d930..46056c94129 100644
--- a/erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.py
+++ b/erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.py
@@ -7,7 +7,7 @@ from frappe import _, qb
from frappe.query_builder import Criterion
from erpnext import get_default_company
-from erpnext.accounts.party import get_party_details
+from erpnext.accounts.party import _get_party_details
def execute(filters=None):
@@ -125,7 +125,7 @@ def get_data(filters=None):
def get_customer_details(filters):
- customer_details = get_party_details(party=filters.get("customer"), party_type="Customer")
+ customer_details = _get_party_details(party=filters.get("customer"), party_type="Customer")
customer_details.update(
{"company": get_default_company(), "price_list": customer_details.get("selling_price_list")}
)
diff --git a/erpnext/setup/doctype/email_digest/email_digest.py b/erpnext/setup/doctype/email_digest/email_digest.py
index ea25bd033b9..eb01d7234d4 100644
--- a/erpnext/setup/doctype/email_digest/email_digest.py
+++ b/erpnext/setup/doctype/email_digest/email_digest.py
@@ -901,7 +901,9 @@ def send():
@frappe.whitelist()
def get_digest_msg(name):
- return frappe.get_doc("Email Digest", name).get_msg_html()
+ email_digest = frappe.get_doc("Email Digest", name)
+ email_digest.check_permission()
+ return email_digest.get_msg_html()
def get_incomes_expenses_for_period(account, from_date, to_date):
diff --git a/erpnext/startup/boot.py b/erpnext/startup/boot.py
index ff1141fb07e..ffe81ab3915 100644
--- a/erpnext/startup/boot.py
+++ b/erpnext/startup/boot.py
@@ -25,6 +25,9 @@ def boot_session(bootinfo):
bootinfo.sysdefaults.over_billing_allowance = frappe.db.get_single_value(
"Accounts Settings", "over_billing_allowance"
)
+ bootinfo.sysdefaults.disable_include_dimensions = cint(
+ frappe.get_single_value("Accounts Settings", "disable_include_dimensions")
+ )
bootinfo.sysdefaults.quotation_valid_till = cint(
frappe.db.get_single_value("CRM Settings", "default_valid_till")
diff --git a/erpnext/stock/doctype/item/item.js b/erpnext/stock/doctype/item/item.js
index 47dd2f50656..cfdb4d04250 100644
--- a/erpnext/stock/doctype/item/item.js
+++ b/erpnext/stock/doctype/item/item.js
@@ -188,7 +188,10 @@ frappe.ui.form.on("Item", {
if (frm.doc.variant_of) {
frm.set_intro(
__("This Item is a Variant of {0} (Template).", [
- `
${frm.doc.variant_of} `,
+ `
${frappe.utils.escape_html(frm.doc.variant_of)} `,
]),
true
);
diff --git a/erpnext/stock/doctype/item_price/item_price.json b/erpnext/stock/doctype/item_price/item_price.json
index c6950b9a10f..95d5dbe9147 100644
--- a/erpnext/stock/doctype/item_price/item_price.json
+++ b/erpnext/stock/doctype/item_price/item_price.json
@@ -89,7 +89,7 @@
},
{
"fieldname": "item_description",
- "fieldtype": "Text",
+ "fieldtype": "Text Editor",
"label": "Item Description",
"read_only": 1
},
@@ -224,7 +224,7 @@
"idx": 1,
"index_web_pages_for_search": 1,
"links": [],
- "modified": "2024-04-02 22:18:00.450641",
+ "modified": "2026-08-12 13:14:41.847412",
"modified_by": "Administrator",
"module": "Stock",
"name": "Item Price",
@@ -264,4 +264,4 @@
"states": [],
"title_field": "item_name",
"track_changes": 1
-}
\ No newline at end of file
+}
diff --git a/erpnext/stock/doctype/item_price/item_price.py b/erpnext/stock/doctype/item_price/item_price.py
index dc693890cd7..c982a2f706f 100644
--- a/erpnext/stock/doctype/item_price/item_price.py
+++ b/erpnext/stock/doctype/item_price/item_price.py
@@ -28,7 +28,7 @@ class ItemPrice(Document):
currency: DF.Link | None
customer: DF.Link | None
item_code: DF.Link
- item_description: DF.Text | None
+ item_description: DF.TextEditor | None
item_name: DF.Data | None
lead_time_days: DF.Int
note: DF.Text | None
diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py
index 25c6fd987f5..f7df8ecd9f3 100644
--- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py
+++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py
@@ -372,6 +372,9 @@ class PurchaseReceipt(BuyingController):
# Check for Closed status
def check_on_hold_or_closed_status(self):
+ if self.get("is_return"):
+ return
+
check_list = []
for d in self.get("items"):
if d.meta.get_field("purchase_order") and d.purchase_order and d.purchase_order not in check_list:
diff --git a/erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py b/erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py
index 40cf324010d..f30158b4f51 100644
--- a/erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py
+++ b/erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py
@@ -708,6 +708,43 @@ class TestPurchaseReceipt(FrappeTestCase):
update_purchase_receipt_status(pr.name, "Closed")
self.assertEqual(frappe.db.get_value("Purchase Receipt", pr.name, "status"), "Closed")
+ def test_purchase_return_against_closed_purchase_order(self):
+ from erpnext.buying.doctype.purchase_order.purchase_order import (
+ make_purchase_receipt as make_pr_from_po,
+ )
+ from erpnext.buying.doctype.purchase_order.test_purchase_order import create_purchase_order
+ from erpnext.controllers.sales_and_purchase_return import make_return_doc
+
+ po = create_purchase_order(qty=2, rate=100)
+
+ receipts = []
+ for _ in range(2):
+ pr = make_pr_from_po(po.name)
+ pr.items[0].qty = pr.items[0].received_qty = 1
+ pr.submit()
+ receipts.append(pr)
+
+ first_return = make_return_doc("Purchase Receipt", receipts[0].name)
+ first_return.submit()
+
+ po.reload()
+ po.update_status("Closed")
+
+ # a return against a closed Purchase Order should still go through,
+ # the same way a Delivery Note return does against a closed Sales Order
+ second_return = make_return_doc("Purchase Receipt", receipts[1].name)
+ second_return.submit()
+
+ self.assertEqual(second_return.docstatus, 1)
+ self.assertEqual(frappe.db.get_value("Purchase Order", po.name, "status"), "Closed")
+
+ # cancelling the return runs the same check on the closed order
+ second_return.cancel()
+
+ # a regular receipt against the closed order must still be blocked
+ blocked_pr = make_pr_from_po(po.name)
+ self.assertRaisesRegex(frappe.InvalidStatusError, "Closed", blocked_pr.save)
+
def test_pr_billing_status(self):
"""Flow:
1. PO -> PR1 -> PI
diff --git a/erpnext/stock/doctype/shipment/shipment.js b/erpnext/stock/doctype/shipment/shipment.js
index f22139c89f5..9c86fefc183 100644
--- a/erpnext/stock/doctype/shipment/shipment.js
+++ b/erpnext/stock/doctype/shipment/shipment.js
@@ -174,7 +174,10 @@ frappe.ui.form.on("Shipment", {
__("Email or Phone/Mobile of the Contact are mandatory to continue.") +
"" +
__("Please set Email/Phone for the contact") +
- `
${contact_name} `
+ `
${frappe.utils.escape_html(contact_name)} `
);
}
let contact_display = r.message.contact_display;
diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.py b/erpnext/stock/doctype/stock_entry/stock_entry.py
index c50671d9d3f..0541193184c 100644
--- a/erpnext/stock/doctype/stock_entry/stock_entry.py
+++ b/erpnext/stock/doctype/stock_entry/stock_entry.py
@@ -32,6 +32,9 @@ from erpnext.manufacturing.doctype.bom.bom import (
get_scrap_items_from_sub_assemblies,
validate_bom_no,
)
+from erpnext.manufacturing.doctype.work_order.services.material_coverage import (
+ get_minimum_material_coverage_fraction,
+)
from erpnext.setup.doctype.brand.brand import get_brand_defaults
from erpnext.setup.doctype.item_group.item_group import get_item_group_defaults
from erpnext.stock.doctype.batch.batch import get_batch_qty
@@ -262,6 +265,7 @@ class StockEntry(StockController):
self.calculate_rate_and_amount()
self.validate_putaway_capacity()
self.validate_component_and_quantities()
+ self._cap_completed_qty_to_material_coverage()
self.validate_finished_good_serial_batch_for_work_order()
if not self.get("purpose") == "Manufacture":
@@ -1186,6 +1190,67 @@ class StockEntry(StockController):
title=_("Missing Item"),
)
+ def _cap_completed_qty_to_material_coverage(self):
+ if not self._should_cap_completed_qty():
+ return
+ # Keep an excessive claim intact so the Work Order allowance check can reject it.
+ max_qty = flt(self.pro_doc.qty)
+ overproduction_percentage = flt(
+ frappe.db.get_single_value("Manufacturing Settings", "overproduction_percentage_for_work_order")
+ )
+ to_transfer_qty = flt(self.pro_doc.material_transferred_for_manufacturing) + flt(
+ self.fg_completed_qty
+ )
+ transfer_limit_qty = max_qty + (max_qty * overproduction_percentage / 100)
+ if transfer_limit_qty < to_transfer_qty:
+ return
+
+ required_qty, transferred_qty = self._get_work_order_material_qty()
+ if not required_qty:
+ return
+
+ covered_before = self._get_covered_work_order_qty(required_qty, transferred_qty)
+ for row in self.items:
+ item_code = row.original_item or row.item_code
+ if row.s_warehouse and item_code in required_qty:
+ transferred_qty[item_code] += flt(row.qty) * flt(row.conversion_factor or 1)
+
+ covered_after = self._get_covered_work_order_qty(required_qty, transferred_qty)
+ covered_by_entry = flt(max(covered_after - covered_before, 0), self.precision("fg_completed_qty"))
+ self.fg_completed_qty = min(flt(self.fg_completed_qty), covered_by_entry)
+
+ def _should_cap_completed_qty(self):
+ if self.get("_action") != "submit":
+ return False
+ if self.purpose != "Material Transfer for Manufacture":
+ return False
+ if not self.pro_doc or not self.fg_completed_qty:
+ return False
+ if self.is_return or self.get("is_additional_transfer_entry"):
+ return False
+ return not (self.pro_doc.operations and self.pro_doc.transfer_material_against == "Job Card")
+
+ def _get_work_order_material_qty(self):
+ required_qty = {}
+ transferred_qty = {}
+ for row in self.pro_doc.required_items:
+ if not row.include_item_in_manufacturing or flt(row.required_qty) <= 0:
+ continue
+ required_qty[row.item_code] = required_qty.get(row.item_code, 0.0) + flt(row.required_qty)
+ # Duplicate required-item rows each hold the aggregate transferred quantity.
+ transferred_qty[row.item_code] = max(
+ transferred_qty.get(row.item_code, 0.0), flt(row.transferred_qty)
+ )
+ return required_qty, transferred_qty
+
+ def _get_covered_work_order_qty(self, required_qty, transferred_qty):
+ min_fraction = get_minimum_material_coverage_fraction(
+ required_qty,
+ transferred_qty,
+ self.pro_doc.precision("required_qty", "required_items"),
+ )
+ return min_fraction * flt(self.pro_doc.qty)
+
def _validate_no_excess_transfer(self):
if self.is_return:
return
diff --git a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py
index 9f84909b432..9470795f13f 100644
--- a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py
+++ b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py
@@ -1162,12 +1162,15 @@ def get_item_and_warehouses(item_code, warehouse):
from frappe.utils.nestedset import get_descendants_of
items = []
+ stock_uom = frappe.get_cached_value("Item", item_code, "stock_uom")
if frappe.get_cached_value("Warehouse", warehouse, "is_group"):
childrens = get_descendants_of("Warehouse", warehouse, ignore_permissions=True, order_by="lft")
for ch_warehouse in childrens:
- items.append(frappe._dict({"item_code": item_code, "warehouse": ch_warehouse}))
+ items.append(
+ frappe._dict({"item_code": item_code, "warehouse": ch_warehouse, "stock_uom": stock_uom})
+ )
else:
- items = [frappe._dict({"item_code": item_code, "warehouse": warehouse})]
+ items = [frappe._dict({"item_code": item_code, "warehouse": warehouse, "stock_uom": stock_uom})]
return items
@@ -1177,7 +1180,8 @@ def get_items_for_stock_reco(warehouse, company):
items = frappe.db.sql(
f"""
select
- i.name as item_code, i.item_name, bin.warehouse as warehouse, i.has_serial_no, i.has_batch_no
+ i.name as item_code, i.item_name, bin.warehouse as warehouse, i.has_serial_no, i.has_batch_no,
+ i.stock_uom
from
`tabBin` bin, `tabItem` i
where
@@ -1195,7 +1199,8 @@ def get_items_for_stock_reco(warehouse, company):
items += frappe.db.sql(
"""
select
- i.name as item_code, i.item_name, id.default_warehouse as warehouse, i.has_serial_no, i.has_batch_no
+ i.name as item_code, i.item_name, id.default_warehouse as warehouse, i.has_serial_no,
+ i.has_batch_no, i.stock_uom
from
`tabItem` i, `tabItem Default` id
where
@@ -1241,6 +1246,7 @@ def get_item_data(row, qty, valuation_rate, serial_no=None):
"current_serial_no": serial_no,
"serial_no": serial_no,
"batch_no": row.get("batch_no"),
+ "stock_uom": row.get("stock_uom"),
}
@@ -1268,6 +1274,7 @@ def get_itemwise_batch(warehouse, posting_date, company, item_code=None):
"valuation_rate": row[9],
"item_name": row[1],
"batch_no": row[4],
+ "stock_uom": row[11],
}
)
)
diff --git a/erpnext/stock/doctype/stock_reconciliation/test_stock_reconciliation.py b/erpnext/stock/doctype/stock_reconciliation/test_stock_reconciliation.py
index 11d7850913e..835f2a25f9f 100644
--- a/erpnext/stock/doctype/stock_reconciliation/test_stock_reconciliation.py
+++ b/erpnext/stock/doctype/stock_reconciliation/test_stock_reconciliation.py
@@ -141,6 +141,7 @@ class TestStockReconciliation(FrappeTestCase, StockTestMixin):
"_Test Stock Reco Item",
is_stock_item=1,
valuation_rate=100,
+ stock_uom="_Test UOM",
warehouse="_Test Warehouse Ledger 1 - _TC",
opening_stock=100,
)
@@ -148,8 +149,8 @@ class TestStockReconciliation(FrappeTestCase, StockTestMixin):
items = get_items("_Test Warehouse Group 1 - _TC", nowdate(), nowtime(), "_Test Company")
self.assertEqual(
- ["_Test Stock Reco Item", "_Test Warehouse Ledger 1 - _TC", 100],
- [items[0]["item_code"], items[0]["warehouse"], items[0]["qty"]],
+ ["_Test Stock Reco Item", "_Test Warehouse Ledger 1 - _TC", 100, "_Test UOM"],
+ [items[0]["item_code"], items[0]["warehouse"], items[0]["qty"], items[0]["stock_uom"]],
)
def test_stock_reco_for_serialized_item(self):
diff --git a/erpnext/stock/get_item_details.py b/erpnext/stock/get_item_details.py
index aecc20d8aa2..c9fa5fe6e16 100644
--- a/erpnext/stock/get_item_details.py
+++ b/erpnext/stock/get_item_details.py
@@ -34,6 +34,8 @@ purchase_doctypes = [
"Purchase Invoice",
]
+NOT_APPLICABLE_TAX = "N/A"
+
@frappe.whitelist()
def get_item_details(args, doc=None, for_validate=False, overwrite_warehouse=True):
@@ -806,7 +808,10 @@ def get_item_tax_map(company, item_tax_template, as_json=True):
template = frappe.get_cached_doc("Item Tax Template", item_tax_template)
for d in template.taxes:
if frappe.get_cached_value("Account", d.tax_type, "company") == company:
- item_tax_map[d.tax_type] = d.tax_rate
+ if d.get("not_applicable"):
+ item_tax_map[d.tax_type] = NOT_APPLICABLE_TAX
+ else:
+ item_tax_map[d.tax_type] = d.tax_rate
return json.dumps(item_tax_map) if as_json else item_tax_map
diff --git a/erpnext/stock/report/available_batch_report/available_batch_report.py b/erpnext/stock/report/available_batch_report/available_batch_report.py
index e5f14315773..84a671431ed 100644
--- a/erpnext/stock/report/available_batch_report/available_batch_report.py
+++ b/erpnext/stock/report/available_batch_report/available_batch_report.py
@@ -154,6 +154,9 @@ def get_batchwise_data_from_serial_batch_bundle(batchwise_data, filters):
def get_query_based_on_filters(query, batch, table, filters):
+ if filters.company:
+ query = query.where(table.company == filters.company)
+
if filters.item_code:
query = query.where(table.item_code == filters.item_code)
diff --git a/erpnext/stock/report/stock_qty_vs_serial_no_count/stock_qty_vs_serial_no_count.js b/erpnext/stock/report/stock_qty_vs_serial_no_count/stock_qty_vs_serial_no_count.js
index c38f0237436..6df8458fd3c 100644
--- a/erpnext/stock/report/stock_qty_vs_serial_no_count/stock_qty_vs_serial_no_count.js
+++ b/erpnext/stock/report/stock_qty_vs_serial_no_count/stock_qty_vs_serial_no_count.js
@@ -2,6 +2,30 @@
// For license information, please see license.txt
frappe.query_reports["Stock Qty vs Serial No Count"] = {
+ onload: function (report) {
+ report.page.add_inner_button(__("Sync Serial No Status"), () => {
+ const warehouse = report.get_filter_value("warehouse");
+ if (!warehouse) {
+ frappe.msgprint(__("Please select a warehouse first."));
+ return;
+ }
+
+ frappe.confirm(
+ __(
+ "This will update the warehouse and status of Serial Nos counted in {0} to match the stock ledger. Continue?",
+ [warehouse.bold()]
+ ),
+ () => {
+ frappe.call({
+ method: "erpnext.stock.report.stock_qty_vs_serial_no_count.stock_qty_vs_serial_no_count.sync_serial_no_status",
+ args: { warehouse: warehouse },
+ freeze: true,
+ });
+ }
+ );
+ });
+ },
+
filters: [
{
fieldname: "company",
diff --git a/erpnext/stock/report/stock_qty_vs_serial_no_count/stock_qty_vs_serial_no_count.py b/erpnext/stock/report/stock_qty_vs_serial_no_count/stock_qty_vs_serial_no_count.py
index 6087c747374..bc83c8a35e5 100644
--- a/erpnext/stock/report/stock_qty_vs_serial_no_count/stock_qty_vs_serial_no_count.py
+++ b/erpnext/stock/report/stock_qty_vs_serial_no_count/stock_qty_vs_serial_no_count.py
@@ -4,6 +4,12 @@
import frappe
from frappe import _
+from frappe.query_builder import Order
+from frappe.query_builder.functions import Coalesce, Sum
+from frappe.utils import cstr, flt
+from pypika import analytics as an
+
+from erpnext.stock.serial_batch_bundle import get_serial_no_status
def execute(filters=None):
@@ -38,7 +44,20 @@ def get_columns():
return columns
+def get_warehouses(warehouse):
+ if frappe.db.get_value("Warehouse", warehouse, "is_group"):
+ from erpnext.stock.doctype.warehouse.warehouse import get_child_warehouses
+
+ return get_child_warehouses(warehouse)
+
+ return [warehouse]
+
+
def get_data(warehouse, show_disabled_items):
+ # A group (parent) warehouse holds no stock itself; stock lives in its child
+ # warehouses. Expand it to all its descendants so the report aggregates them.
+ warehouses = get_warehouses(warehouse)
+
filters = {"has_serial_no": True}
if not show_disabled_items:
filters["disabled"] = False
@@ -53,16 +72,23 @@ def get_data(warehouse, show_disabled_items):
for item in serial_item_list:
total_serial_no = frappe.db.count(
"Serial No",
- filters={"item_code": item.item_code, "status": ("in", status_list), "warehouse": warehouse},
+ filters={
+ "item_code": item.item_code,
+ "status": ("in", status_list),
+ "warehouse": ("in", warehouses),
+ },
)
- actual_qty = frappe.db.get_value(
- "Bin", fieldname=["actual_qty"], filters={"warehouse": warehouse, "item_code": item.item_code}
- )
+ bin_table = frappe.qb.DocType("Bin")
+ bin_qty = (
+ frappe.qb.from_(bin_table)
+ .select(Sum(bin_table.actual_qty))
+ .where(bin_table.item_code == item.item_code)
+ .where(bin_table.warehouse.isin(warehouses))
+ ).run()
- # frappe.db.get_value returns null if no record exist.
- if not actual_qty:
- actual_qty = 0
+ # Sum is null when no Bin record exists for the item in these warehouses.
+ actual_qty = flt(bin_qty[0][0]) if bin_qty else 0
difference = total_serial_no - actual_qty
@@ -77,3 +103,172 @@ def get_data(warehouse, show_disabled_items):
data.append(row)
return data
+
+
+SYNC_CHUNK_SIZE = 1000
+
+
+@frappe.whitelist(methods=["POST"])
+def sync_serial_no_status(warehouse: str, item_code: str | None = None):
+ if not frappe.has_permission("Serial No", "write"):
+ frappe.throw(_("Not permitted to update Serial No"), frappe.PermissionError)
+
+ warehouse = cstr(warehouse)
+ item_code = cstr(item_code) if item_code else None
+ if not frappe.db.exists("Warehouse", warehouse):
+ frappe.throw(_("Warehouse {0} does not exist").format(warehouse))
+
+ if item_code and not frappe.db.exists("Item", item_code):
+ frappe.throw(_("Item {0} does not exist").format(item_code))
+
+ frappe.enqueue(
+ sync_serial_no_status_for_warehouse,
+ queue="long",
+ warehouse=warehouse,
+ item_code=item_code,
+ )
+ frappe.msgprint(
+ _("Serial No status sync has been queued. Reload the report after a few minutes."),
+ alert=True,
+ )
+
+
+def sync_serial_no_status_for_warehouse(warehouse, item_code=None):
+ filters = {"has_serial_no": 1}
+ if item_code:
+ filters["name"] = item_code
+
+ for item in frappe.get_all("Item", filters=filters, pluck="name"):
+ sync_serial_no_status_for_item(item, warehouse)
+
+
+def sync_serial_no_status_for_item(item_code, warehouse):
+ """Correct Serial No records this report counts in the warehouse but whose last
+ stock ledger movement says the stock left it. Reposting rebuilds qty and valuation
+ from the ledger but never rewrites Serial No warehouse/status, so records orphaned
+ by cancelled or amended vouchers keep inflating the serial count."""
+ serial_nos = frappe.get_all(
+ "Serial No",
+ filters={"item_code": item_code, "warehouse": warehouse, "status": ("in", ["Active", "Expired"])},
+ pluck="name",
+ )
+ if not serial_nos:
+ return
+
+ last_moves = get_last_ledger_moves(item_code, serial_nos)
+ for serial_no in serial_nos:
+ row = last_moves.get(serial_no)
+ if row and flt(row.qty) > 0 and row.warehouse == warehouse:
+ continue
+
+ set_serial_no_state_from_ledger(serial_no, row)
+
+
+def set_serial_no_state_from_ledger(serial_no, row):
+ if not row:
+ frappe.db.set_value(
+ "Serial No", serial_no, {"warehouse": None, "status": "Inactive"}, update_modified=False
+ )
+ return
+
+ status = get_serial_no_status(
+ frappe._dict(
+ actual_qty=flt(row.qty),
+ warehouse=row.warehouse,
+ voucher_type=row.voucher_type,
+ voucher_no=row.voucher_no,
+ is_cancelled=0,
+ )
+ )
+ warehouse = row.warehouse if status == "Active" else None
+ frappe.db.set_value(
+ "Serial No", serial_no, {"warehouse": warehouse, "status": status}, update_modified=False
+ )
+
+
+def get_last_ledger_moves(item_code, serial_nos):
+ last_moves = get_last_bundle_moves(item_code, serial_nos)
+ if missing := [serial_no for serial_no in serial_nos if serial_no not in last_moves]:
+ set_legacy_last_moves(item_code, missing, last_moves)
+
+ return last_moves
+
+
+def get_last_bundle_moves(item_code, serial_nos):
+ last_moves = {}
+ for start in range(0, len(serial_nos), SYNC_CHUNK_SIZE):
+ for row in get_last_bundle_moves_chunk(item_code, serial_nos[start : start + SYNC_CHUNK_SIZE]):
+ last_moves[row.serial_no] = row
+
+ return last_moves
+
+
+def get_last_bundle_moves_chunk(item_code, serial_nos):
+ """A bundle can be created much before its Stock Ledger Entry, so same-posting-datetime
+ ties are broken on the creation of the bundle's own SLE. The SLE join also keeps only
+ real stock movements - reservation bundles (Pick List) carry no SLE."""
+ entry = frappe.qb.DocType("Serial and Batch Entry")
+ bundle = frappe.qb.DocType("Serial and Batch Bundle")
+ sle = frappe.qb.DocType("Stock Ledger Entry")
+
+ row_number = (
+ an.RowNumber()
+ .over(entry.serial_no)
+ .orderby(bundle.posting_datetime, order=Order.desc)
+ .orderby(sle.creation, order=Order.desc)
+ )
+
+ ranked = (
+ frappe.qb.from_(entry)
+ .inner_join(bundle)
+ .on(entry.parent == bundle.name)
+ .inner_join(sle)
+ .on(sle.serial_and_batch_bundle == bundle.name)
+ .select(
+ entry.serial_no,
+ entry.qty,
+ Coalesce(entry.warehouse, bundle.warehouse).as_("warehouse"),
+ bundle.voucher_type,
+ bundle.voucher_no,
+ row_number.as_("row_no"),
+ )
+ .where(
+ (bundle.docstatus == 1)
+ & (Coalesce(bundle.is_cancelled, 0) == 0)
+ & (sle.is_cancelled == 0)
+ & (bundle.item_code == item_code)
+ & (entry.serial_no.isin(serial_nos))
+ )
+ ).as_("ranked")
+
+ return (
+ frappe.qb.from_(ranked)
+ .select(ranked.serial_no, ranked.qty, ranked.warehouse, ranked.voucher_type, ranked.voucher_no)
+ .where(ranked.row_no == 1)
+ .run(as_dict=True)
+ )
+
+
+def set_legacy_last_moves(item_code, serial_nos, last_moves):
+ """Movements posted before Serial and Batch Bundle exist only as newline-separated
+ text on Stock Ledger Entry."""
+ from erpnext.stock.doctype.serial_no.serial_no import get_serial_nos
+
+ pending = set(serial_nos)
+ rows = frappe.get_all(
+ "Stock Ledger Entry",
+ filters={"item_code": item_code, "is_cancelled": 0, "serial_no": ("is", "set")},
+ fields=["serial_no", "actual_qty", "warehouse", "voucher_type", "voucher_no"],
+ order_by="posting_datetime asc, creation asc",
+ )
+
+ for row in rows:
+ qty = 1 if flt(row.actual_qty) > 0 else -1
+ for serial_no in get_serial_nos(row.serial_no):
+ if serial_no in pending:
+ last_moves[serial_no] = frappe._dict(
+ qty=qty,
+ warehouse=row.warehouse,
+ voucher_type=row.voucher_type,
+ voucher_no=row.voucher_no,
+ )
diff --git a/erpnext/stock/report/stock_qty_vs_serial_no_count/test_stock_qty_vs_serial_no_count.py b/erpnext/stock/report/stock_qty_vs_serial_no_count/test_stock_qty_vs_serial_no_count.py
new file mode 100644
index 00000000000..f61ed70ef72
--- /dev/null
+++ b/erpnext/stock/report/stock_qty_vs_serial_no_count/test_stock_qty_vs_serial_no_count.py
@@ -0,0 +1,41 @@
+# Copyright (c) 2026, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+
+import frappe
+from frappe.tests.utils import FrappeTestCase
+
+from erpnext.stock.doctype.stock_entry.stock_entry_utils import make_stock_entry
+
+
+class TestStockQtyVsSerialNoCount(FrappeTestCase):
+ def test_sync_serial_no_status(self):
+ from erpnext.stock.doctype.delivery_note.test_delivery_note import create_delivery_note
+ from erpnext.stock.report.stock_qty_vs_serial_no_count.stock_qty_vs_serial_no_count import (
+ sync_serial_no_status_for_warehouse,
+ )
+
+ item = "_Test Serialized Item With Series"
+ warehouse = "Stores - _TC"
+ se = make_stock_entry(item_code=item, to_warehouse=warehouse, qty=2, rate=100)
+ serial_no = frappe.get_all(
+ "Serial and Batch Entry",
+ {"parent": se.items[0].serial_and_batch_bundle},
+ pluck="serial_no",
+ )[0]
+
+ create_delivery_note(
+ item_code=item,
+ warehouse=warehouse,
+ qty=1,
+ serial_no=serial_no,
+ use_serial_batch_fields=1,
+ )
+ self.assertEqual(frappe.db.get_value("Serial No", serial_no, "status"), "Delivered")
+
+ frappe.db.set_value("Serial No", serial_no, {"status": "Active", "warehouse": warehouse})
+
+ sync_serial_no_status_for_warehouse(warehouse, item_code=item)
+
+ details = frappe.db.get_value("Serial No", serial_no, ["status", "warehouse"], as_dict=True)
+ self.assertEqual(details.status, "Delivered")
+ self.assertFalse(details.warehouse)
diff --git a/erpnext/templates/form_grid/includes/visible_cols.html b/erpnext/templates/form_grid/includes/visible_cols.html
index 3a0cc8d7239..578335ddcd4 100644
--- a/erpnext/templates/form_grid/includes/visible_cols.html
+++ b/erpnext/templates/form_grid/includes/visible_cols.html
@@ -3,7 +3,7 @@
if((df.fieldname !== "description" && df.fieldname !== "item_name") && val) { %}
- {%= __(df.label) %}:
+ {%= frappe.utils.escape_html(__(df.label, null, df.parent)) %}:
{%= doc.get_formatted(df.fieldname) %}
diff --git a/erpnext/templates/form_grid/item_grid.html b/erpnext/templates/form_grid/item_grid.html
index 72db6c8e653..fac31c7c1a1 100644
--- a/erpnext/templates/form_grid/item_grid.html
+++ b/erpnext/templates/form_grid/item_grid.html
@@ -31,7 +31,7 @@
} %}
- {%= doc.warehouse %}
+ {%= frappe.utils.escape_html(doc.warehouse) %}
{% } %}
@@ -42,14 +42,14 @@
doc.delivered_qty : doc.received_qty;
var pending = flt(doc.qty) - flt(delivered);
%}
- {%= doc.item_code %}
+ {%= frappe.utils.escape_html(doc.item_code) %}
{% } else { %}
- {%= doc.item_code %}
+ {%= frappe.utils.escape_html(doc.item_code) %}
{% } %}
{% if(doc.item_name != doc.item_code && in_list(visible_column_fieldnames, "item_name")) { %}
{% if (doc.item_code) { %}
@@ -57,7 +57,7 @@
{%= doc.get_formatted("qty") %}
- {%= doc.uom || doc.stock_uom %}
+ {%= frappe.utils.escape_html(doc.uom || doc.stock_uom) %}
@@ -84,7 +84,7 @@
{% if (frappe.perm.is_visible("rate", doc, frm.perm)) { %}
- {%= doc.get_formatted("qty") %} {%= doc.uom || doc.stock_uom %}
+ {%= doc.get_formatted("qty") %} {%= frappe.utils.escape_html(doc.uom || doc.stock_uom) %}
x {%= doc.get_formatted("rate") %}
{% } %}
diff --git a/erpnext/templates/form_grid/material_request_grid.html b/erpnext/templates/form_grid/material_request_grid.html
index 866c06e5863..ff58da62ab5 100644
--- a/erpnext/templates/form_grid/material_request_grid.html
+++ b/erpnext/templates/form_grid/material_request_grid.html
@@ -11,9 +11,9 @@
{% } else { %}
- {%= doc.item_code %}
+ {%= frappe.utils.escape_html(doc.item_code) %}
{% if(doc.item_name != doc.item_code) { %}
-
- {%= doc.warehouse %}
+ {%= frappe.utils.escape_html(doc.warehouse) %}
{% } %}
@@ -43,7 +43,7 @@
{%= doc.get_formatted("qty") %}
- {%= doc.uom || doc.stock_uom %}
+ {%= frappe.utils.escape_html(doc.uom || doc.stock_uom) %}
{% } %}
diff --git a/erpnext/templates/form_grid/stock_entry_grid.html b/erpnext/templates/form_grid/stock_entry_grid.html
index 8604881812d..d0afa926c50 100644
--- a/erpnext/templates/form_grid/stock_entry_grid.html
+++ b/erpnext/templates/form_grid/stock_entry_grid.html
@@ -12,9 +12,9 @@
{% } else { %}
-
{%= doc.item_code %}
+
{%= frappe.utils.escape_html(doc.item_code) %}
{% if(doc.item_name != doc.item_code) { %}
-
@@ -30,11 +30,11 @@
}
%}
- {%= doc.s_warehouse %}
+ {%= frappe.utils.escape_html(doc.s_warehouse) %}
{% }; %}
{% if(doc.t_warehouse) { %}
- {%= doc.t_warehouse %}
+ {%= frappe.utils.escape_html(doc.t_warehouse) %}
{% }; %}
@@ -42,7 +42,7 @@
{%= doc.get_formatted("qty") %}
- {%= doc.uom || doc.stock_uom %}
+ {%= frappe.utils.escape_html(doc.uom || doc.stock_uom) %}
diff --git a/erpnext/templates/generators/sales_partner.html b/erpnext/templates/generators/sales_partner.html
index 39138d3c6cc..0cd886f1ce7 100644
--- a/erpnext/templates/generators/sales_partner.html
+++ b/erpnext/templates/generators/sales_partner.html
@@ -9,16 +9,16 @@
{% if logo -%}
-
+
{%- endif %}
{% if partner_website -%}{{ partner_website }}
{%- endif %}
- {% if partner_address -%}{{ partner_address }}
{%- endif %}
- {% if phone -%}{{ phone }}
{%- endif %}
- {% if email -%}
{%- endif %}
+ {% if partner_address -%}{{ partner_address | e }}
{%- endif %}
+ {% if phone -%}{{ phone | e }}
{%- endif %}
+ {% if email -%}
{%- endif %}
diff --git a/erpnext/templates/includes/macros.html b/erpnext/templates/includes/macros.html
index dc9ee234d9e..5945d487d29 100644
--- a/erpnext/templates/includes/macros.html
+++ b/erpnext/templates/includes/macros.html
@@ -2,7 +2,7 @@
{% endmacro %}
@@ -10,7 +10,7 @@
{% macro product_image(website_image, css_class="product-image", alt="", no_border=False) %}
{% if website_image %}
-
+
{% else %}
{{ frappe.utils.get_abbr(alt) or "NA" }}
@@ -22,11 +22,11 @@
{% macro media_image(website_image, name, css_class="") %}
- {{ doc.project_name }}
+ {{ doc.project_name | e }}
{% if doc.percent_complete %}
@@ -33,11 +33,11 @@
"full_name", "user_image"
], as_dict = True) %}
{% if user_details.user_image %}
-
+
{% else %}
-
+
{{ frappe.utils.get_abbr(user_details.full_name) }}
diff --git a/erpnext/templates/includes/projects/project_tasks.html b/erpnext/templates/includes/projects/project_tasks.html
index 43fa591cd47..32719adf71d 100644
--- a/erpnext/templates/includes/projects/project_tasks.html
+++ b/erpnext/templates/includes/projects/project_tasks.html
@@ -8,7 +8,7 @@
{% endif %}
- {{ task.subject }}
+ {{ task.subject | e }}
{{ task.status }}
@@ -26,11 +26,11 @@
["full_name", "user_image"],
as_dict = True)%}
{% if user_details.user_image %}
-
+
{% else %}
-
+
{{ frappe.utils.get_abbr(user_details.full_name) }}
diff --git a/erpnext/templates/includes/projects/project_timesheets.html b/erpnext/templates/includes/projects/project_timesheets.html
index 6c3f8011ecd..8e118d2499c 100644
--- a/erpnext/templates/includes/projects/project_timesheets.html
+++ b/erpnext/templates/includes/projects/project_timesheets.html
@@ -14,11 +14,11 @@
], as_dict = True)
%}
{% if user_details.user_image %}
-
+
{% else %}
-
+
{{ frappe.utils.get_abbr(user_details.full_name) }}
diff --git a/erpnext/templates/includes/rfq.js b/erpnext/templates/includes/rfq.js
index cc998a90030..6b76404d004 100644
--- a/erpnext/templates/includes/rfq.js
+++ b/erpnext/templates/includes/rfq.js
@@ -5,10 +5,10 @@ window.doc={{ doc.as_json() }};
$(document).ready(function() {
new rfq();
- doc.supplier = "{{ doc.supplier }}"
- doc.currency = "{{ doc.currency }}"
- doc.number_format = "{{ doc.number_format }}"
- doc.buying_price_list = "{{ doc.buying_price_list }}"
+ doc.supplier = {{ doc.supplier | tojson }}
+ doc.currency = {{ doc.currency | tojson }}
+ doc.number_format = {{ doc.number_format | tojson }}
+ doc.buying_price_list = {{ doc.buying_price_list | tojson }}
});
rfq = class rfq {
diff --git a/erpnext/templates/includes/transaction_row.html b/erpnext/templates/includes/transaction_row.html
index 061c9bd1796..49524b92431 100644
--- a/erpnext/templates/includes/transaction_row.html
+++ b/erpnext/templates/includes/transaction_row.html
@@ -7,12 +7,14 @@
{{ frappe.utils.global_date_format(doc.modified) }}
-
- {{ _(doc.status) }}
-
+ {% if doc.doctype != "Request for Quotation" %}
+
+ {{ _(doc.status) }}
+
+ {% endif %}
- {{ doc.items_preview }}
+ {{ doc.items_preview | e }}
{% if doc.is_rounded_total_disabled() and doc.get('grand_total') %}
@@ -25,5 +27,5 @@
{% endif %}
-
Link
+
Link
diff --git a/erpnext/templates/pages/help.html b/erpnext/templates/pages/help.html
index 726d5e1b881..7e11bcb7d54 100644
--- a/erpnext/templates/pages/help.html
+++ b/erpnext/templates/pages/help.html
@@ -17,12 +17,12 @@
{% for section in get_started_sections %}
diff --git a/erpnext/templates/pages/order.html b/erpnext/templates/pages/order.html
index 5563a58b730..ec9d75e350a 100644
--- a/erpnext/templates/pages/order.html
+++ b/erpnext/templates/pages/order.html
@@ -73,11 +73,11 @@
{%- set party_name = doc.supplier_name if doc.doctype in ['Supplier Quotation', 'Purchase Invoice', 'Purchase Order'] else doc.customer_name %}
- {{ party_name }}
+ {{ party_name | e }}
{% if doc.contact_display and doc.contact_display != party_name %}
+ 