-
-
+
@@ -52,23 +52,23 @@
{% } %} -->
{{ d.job_card_link }}
+
-
+
-
+
-
-
{% endif %}
{% endblock %}
diff --git a/erpnext/templates/pages/partners.html b/erpnext/templates/pages/partners.html
index 72d6a6478f7..5b6ae2c5670 100644
--- a/erpnext/templates/pages/partners.html
+++ b/erpnext/templates/pages/partners.html
@@ -10,18 +10,18 @@
diff --git a/erpnext/templates/pages/projects.html b/erpnext/templates/pages/projects.html index e671e91db2f..2b55679fa71 100644 --- a/erpnext/templates/pages/projects.html +++ b/erpnext/templates/pages/projects.html @@ -1,7 +1,7 @@ {% extends "templates/web.html" %} {% block title %} - {{ doc.project_name }} + {{ doc.project_name | e }} {% endblock %} {% block head_include %} @@ -9,7 +9,7 @@ {% endblock %} {% block header %} -
{% if doc.tasks %}
diff --git a/erpnext/templates/pages/projects.js b/erpnext/templates/pages/projects.js
index 622ed42f85f..bf037bcf6a5 100644
--- a/erpnext/templates/pages/projects.js
+++ b/erpnext/templates/pages/projects.js
@@ -45,7 +45,7 @@ frappe.ready(function () {
dataType: "json",
data: {
cmd: "erpnext.templates.pages.projects.get_" + item + "_html",
- project: "{{ doc.name }}",
+ project: frappe.utils.get_url_arg("project"),
item_status: item_status,
},
success: function (data) {
@@ -80,7 +80,7 @@ frappe.ready(function () {
dataType: "json",
data: {
cmd: "erpnext.templates.pages.projects.get_" + item + "_html",
- project: "{{ doc.name }}",
+ project: frappe.utils.get_url_arg("project"),
start: start,
item_status: item_status,
},
@@ -96,7 +96,7 @@ frappe.ready(function () {
var close_item = function (item, item_name) {
var args = {
- project: "{{ doc.name }}",
+ project: frappe.utils.get_url_arg("project"),
item_name: item_name,
};
frappe.call({
diff --git a/erpnext/templates/pages/rfq.html b/erpnext/templates/pages/rfq.html
index d371bf2161d..d2a9382dc6b 100644
--- a/erpnext/templates/pages/rfq.html
+++ b/erpnext/templates/pages/rfq.html
@@ -13,7 +13,7 @@
{% endblock %}
{% block header_actions %}
-{% if doc.items %}
+{% if doc.items and not doc.rfq_links %}
@@ -22,10 +22,7 @@
{% block page_content %}
+
@@ -86,7 +86,7 @@
-
{% if(tasks[i].date) { %}
@@ -89,7 +89,7 @@
{% } %}
@@ -114,13 +114,13 @@
-
- {%= events[i].subject %}
+
+ {%= frappe.utils.escape_html(events[i].subject) %}
+ name="{{ frappe.utils.escape_html(events[i].name) }}" title="{{ __('Mark As Closed') }}">
@@ -161,8 +161,8 @@
-
- {%= event.subject %}
+
+ {%= frappe.utils.escape_html(event.subject) %}
diff --git a/erpnext/public/js/utils/serial_no_batch_selector.js b/erpnext/public/js/utils/serial_no_batch_selector.js
index 9161903ba7f..1b93c9b46c9 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();
}
@@ -390,7 +400,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(),
@@ -536,7 +546,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;
@@ -670,6 +680,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 713e85a556e..e1174073b27 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/selling/doctype/quotation/quotation.json b/erpnext/selling/doctype/quotation/quotation.json
index d7193d7637c..6faaa0b3dd0 100644
--- a/erpnext/selling/doctype/quotation/quotation.json
+++ b/erpnext/selling/doctype/quotation/quotation.json
@@ -341,6 +341,7 @@
},
{
"collapsible": 1,
+ "collapsible_depends_on": "eval:doc.currency && doc.currency != erpnext.get_currency(doc.company)",
"fieldname": "currency_and_price_list",
"fieldtype": "Section Break",
"label": "Currency and Price List",
@@ -1136,7 +1137,7 @@
"idx": 82,
"is_submittable": 1,
"links": [],
- "modified": "2026-05-30 17:40:02.667637",
+ "modified": "2026-08-12 12:00:00.000000",
"modified_by": "Administrator",
"module": "Selling",
"name": "Quotation",
diff --git a/erpnext/selling/doctype/sales_order/sales_order.json b/erpnext/selling/doctype/sales_order/sales_order.json
index 893485a7369..f3ca862c73f 100644
--- a/erpnext/selling/doctype/sales_order/sales_order.json
+++ b/erpnext/selling/doctype/sales_order/sales_order.json
@@ -478,6 +478,7 @@
},
{
"collapsible": 1,
+ "collapsible_depends_on": "eval:doc.currency && doc.currency != erpnext.get_currency(doc.company)",
"fieldname": "currency_and_price_list",
"fieldtype": "Section Break",
"hide_days": 1,
@@ -1762,7 +1763,7 @@
"idx": 105,
"is_submittable": 1,
"links": [],
- "modified": "2026-06-24 12:00:00.000000",
+ "modified": "2026-08-12 12:00:00.000000",
"modified_by": "Administrator",
"module": "Selling",
"name": "Sales Order",
diff --git a/erpnext/selling/print_format/quotation_with_item_image/quotation_with_item_image.json b/erpnext/selling/print_format/quotation_with_item_image/quotation_with_item_image.json
index ba1474a8173..dc9ebc50970 100644
--- a/erpnext/selling/print_format/quotation_with_item_image/quotation_with_item_image.json
+++ b/erpnext/selling/print_format/quotation_with_item_image/quotation_with_item_image.json
@@ -9,7 +9,7 @@
"docstatus": 0,
"doctype": "Print Format",
"font_size": 14,
- "html": "{%- macro add_header(page_num, max_pages, doc, letter_head, no_letterhead, footer, print_settings=None, print_heading_template=None) -%}\n\n{% if letter_head and not no_letterhead %}\n
{% } %}
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 { %}
@@ -151,7 +151,7 @@
{% if doc.terms %}
{{ letter_head }}
\n{% endif %}\n{% if print_heading_template %}\n{{ frappe.render_template(print_heading_template, {\"doc\":doc}) }}\n{% endif %}\n{%- endmacro -%}\n\n{% for page in layout %}\n\n\t
\n{% endfor %}",
+ "html": "{%- macro add_header(page_num, max_pages, doc, letter_head, no_letterhead, footer, print_settings=None, print_heading_template=None) -%}\n\n{% if letter_head and not no_letterhead %}\n\n\t\t{{ add_header(loop.index, layout|len, doc, letter_head, no_letterhead, footer, print_settings) }}\n\t
\n\t{%- if doc.meta.is_submittable and doc.docstatus==2-%}\n\t\t\n\t\t\t
\n\t{%- endif -%}\n\t{%- if doc.meta.is_submittable and doc.docstatus==0 and (print_settings==None or print_settings.add_draft_heading) -%}\n\t\t{{ _(\"CANCELLED\") }}
\n\t\t\n\t\t\t
\n\t{%- endif -%}\n\n\t\n\n\t{{ _(\"DRAFT\") }}
\n\t\t\n\t\t\n\t\t\t
\n\n\t\t\n\t\t{% set item_naming_by = frappe.db.get_single_value(\"Stock Settings\", \"item_naming_by\") %}\n\t\t\n\t\t\t\n\t\t\t\t
\n\n\t\t
\n\t\n| \n\t\t\t\t\t \n\t\t\t\t\t\t \n\t\t\t\t\tCustomer Name: \n\t\t\t\t\t\tBill to: \n\t\t\t\t\t\n\t\t\t\t\t\t \n\t\t\t\t{{ doc.customer_name }} \n\t\t\t\t\t\t\n \t\t\t\t\t{% if doc.customer_address %}\n \t\t\t\t\t\t{% set customer_address = frappe.db.get_value(\"Address\", doc.customer_address, [\"address_line1\", \"address_line2\", \"city\", \"state\", \"pincode\", \"country\"], as_dict=True) %}\n \t\t\t\t\t\t{{ customer_address.address_line1 or \"\" }} \n\n\t\t\t\t\t\n \t\t\t\t\t\t{% if customer_address.address_line2 %}{{ customer_address.address_line2 }} {% endif %}\n \t\t\t\t\t\t{{ customer_address.city or \"\" }} {{ customer_address.state or \"\" }} {{ customer_address.pincode or \"\" }} {{ customer_address.country or \"\" }} \n \t\t\t\t\t{% endif %}\n\t\t\t\t\t\t | \n\n\t\t\t\t\n\t\t\t\t\t \n\t\t\t\t\t\t \n\t\t\t\t\t{{ _(\"Quotation:\") }} \n\t\t\t\t\t\n\t\t\t\t\t\t \n\t\t\t\t\t{{ doc.name }} \n\t\t\t\t\t\n\t\t\t\t\t\t \n\t\t\t\t\t{{ _(\"Posting Date:\") }} \n\t\t\t\t\t\n\t\t\t\t\t\t \n\t\t\t\t\t{{ frappe.utils.format_date(doc.transaction_date) }} \n\t\t\t\t\t\n\t\t\t\t\t\t \n\t\t\t\t\t{{ _(\"Valid Till:\") }} \n\t\t\t\t\t\n\t\t\t\t\t\t \n\t\t\t\t{{ frappe.utils.format_date(doc.valid_till) }} \n\t\t\t\t\t | \n\t\t\t
| {{ _(\"No\") }} | \n\t\t\t\t\t{{ _(\"Item\") }} | \n\t\t\t\t\t{% if item_naming_by != \"Item Code\" %}\n\t\t\t\t\t\t{{ _(\"Item Code\") }} | \n\t\t\t\t\t{% endif %}\n\t\t\t\t\t{{ _(\"Quantity\") }} | \n\t\t\t\t\t{{ _(\"Rate\") }} | \n\t\t\t\t\t{{ _(\"Amount\") }} | \n\t\t\t\t|
| {{ loop.index }} | \n\t\t\t\t\t\n\t\t\t\t\t\t
| \n\t\t\t\t\t{% if item_naming_by != \"Item Code\" %}\n\t\t\t\t\t\t{{ item.item_code }} | \n\t\t\t\t\t{% endif %}\n\n\t\t\t\t\t{{ item.get_formatted(\"qty\", 0) }} {{ item.uom }} | \n\t\t\t\t\t{{ item.get_formatted(\"net_rate\", doc) }} | \n\t\t\t\t\t{{ item.get_formatted(\"net_amount\", doc) }} | \n\t\t\t\t
\n\t\t\t\n\t\t\t\t
\n\t\t
\n\n\t\t| {{ _(\"Sub Total:\") }} | \n\t\t\t\t\t{{ doc.get_formatted(\"total\", doc) }} | \n\t\t\t\t
| \n\t\t\t\t\t\t\t{{ _(\"Discount\") }} ({{ doc.additional_discount_percentage }}%):\n\t\t\t\t\t\t | \n\t\t\t\t\t\t{{ doc.get_formatted(\"discount_amount\", doc) }} | \n\t\t\t\t\t
| {{ tax.get_formatted(\"description\") }} ({{ tax.get_formatted(\"rate\") }}%): | \n\t\t\t\t\t\t\t{{ tax.get_formatted(\"tax_amount\") }} | \n\t\t\t\t\t\t
| \n\t\t\t\t\t\t\t{{ _(\"Discount\") }} ({{ doc.additional_discount_percentage }}%):\n\t\t\t\t\t\t | \n\t\t\t\t\t\t{{ doc.get_formatted(\"discount_amount\", doc) }} | \n\t\t\t\t\t
\n\t\t\t\n\t\t\t\t
\n\t\t
\n\n\n\t\t\n\t\t{% if doc.terms %}\n\t\t| \n\t\t\t\t\t\t \n\t\t\t\t\t\t\t {{ _(\"In Words: \") }}{{ doc.in_words }}\n\t\t\t\t\t\t \n\t\t\t\t\t | \n\t\t\t\t\t{{ _(\"Grand Total:\") }} | \n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t{{ doc.get_formatted(\"grand_total\", doc) }}\n\t\t\t\t\t\t\n\t\t\t\t\t | \n\t\t\t\t
\n\t\t\t
\n\t\t{% endif %}\n\t{{ _(\"Terms and Conditions\") }}
\n\t\t\t{{ doc.terms}}\n\t\t{{ letter_head }}
\n{% endif %}\n{% if print_heading_template %}\n{{ frappe.render_template(print_heading_template, {\"doc\":doc}) }}\n{% endif %}\n{%- endmacro -%}\n\n{% for page in layout %}\n\n\t
\n{% endfor %}",
"idx": 0,
"line_breaks": 0,
"margin_bottom": 15.0,
diff --git a/erpnext/selling/print_format/sales_order_with_item_image/sales_order_with_item_image.json b/erpnext/selling/print_format/sales_order_with_item_image/sales_order_with_item_image.json
index 47c89caccc0..8bf466e7080 100644
--- a/erpnext/selling/print_format/sales_order_with_item_image/sales_order_with_item_image.json
+++ b/erpnext/selling/print_format/sales_order_with_item_image/sales_order_with_item_image.json
@@ -9,7 +9,7 @@
"docstatus": 0,
"doctype": "Print Format",
"font_size": 14,
- "html": "{%- macro add_header(page_num, max_pages, doc, letter_head, no_letterhead, footer, print_settings=None, print_heading_template=None) -%}\n\n{% if letter_head and not no_letterhead %}\n\n\t\t{{ add_header(loop.index, layout|len, doc, letter_head, no_letterhead, footer, print_settings) }}\n\t
\n\t{%- if doc.meta.is_submittable and doc.docstatus==2-%}\n\t\t\n\t\t\t
\n\t{%- endif -%}\n\t{%- if doc.meta.is_submittable and doc.docstatus==0 and (print_settings==None or print_settings.add_draft_heading) -%}\n\t\t{{ _(\"CANCELLED\") }}
\n\t\t\n\t\t\t
\n\t{%- endif -%}\n\n\t\n\n\t{{ _(\"DRAFT\") }}
\n\t\t\n\t\t\n\t\t\t
\n\n\t\t\n\t\t{% set item_naming_by = frappe.db.get_single_value(\"Stock Settings\", \"item_naming_by\") %}\n\t\t\n\t\t\t\n\t\t\t\t
\n\n\t\t
\n\t\n| \n\t\t\t\t\t \n\t\t\t\t\t\t \n\t\t\t\t\tCustomer Name: \n\t\t\t\t\t\tBill to: \n\t\t\t\t\t\n\t\t\t\t\t\t \n\t\t\t\t{{ doc.customer_name }} \n\t\t\t\t\t\t\n \t\t\t\t\t{% if doc.customer_address %}\n \t\t\t\t\t\t{% set customer_address = frappe.db.get_value(\"Address\", doc.customer_address, [\"address_line1\", \"address_line2\", \"city\", \"state\", \"pincode\", \"country\"], as_dict=True) %}\n \t\t\t\t\t\t{{ customer_address.address_line1 or \"\" }} \n\n\t\t\t\t\t\n \t\t\t\t\t\t{% if customer_address.address_line2 %}{{ customer_address.address_line2 }} {% endif %}\n \t\t\t\t\t\t{{ customer_address.city or \"\" }} {{ customer_address.state or \"\" }} {{ customer_address.pincode or \"\" }} {{ customer_address.country or \"\" }} \n \t\t\t\t\t{% endif %}\n\t\t\t\t\t\t | \n\n\t\t\t\t\n\t\t\t\t\t \n\t\t\t\t\t\t \n\t\t\t\t\t{{ _(\"Quotation:\") }} \n\t\t\t\t\t\n\t\t\t\t\t\t \n\t\t\t\t\t{{ doc.name }} \n\t\t\t\t\t\n\t\t\t\t\t\t \n\t\t\t\t\t{{ _(\"Posting Date:\") }} \n\t\t\t\t\t\n\t\t\t\t\t\t \n\t\t\t\t\t{{ frappe.utils.format_date(doc.transaction_date) }} \n\t\t\t\t\t\n\t\t\t\t\t\t \n\t\t\t\t\t{{ _(\"Valid Till:\") }} \n\t\t\t\t\t\n\t\t\t\t\t\t \n\t\t\t\t{{ frappe.utils.format_date(doc.valid_till) }} \n\t\t\t\t\t | \n\t\t\t
| {{ _(\"No\") }} | \n\t\t\t\t\t{{ _(\"Item\") }} | \n\t\t\t\t\t{% if item_naming_by != \"Item Code\" %}\n\t\t\t\t\t\t{{ _(\"Item Code\") }} | \n\t\t\t\t\t{% endif %}\n\t\t\t\t\t{{ _(\"Quantity\") }} | \n\t\t\t\t\t{{ _(\"Rate\") }} | \n\t\t\t\t\t{{ _(\"Amount\") }} | \n\t\t\t\t|
| {{ loop.index }} | \n\t\t\t\t\t\n\t\t\t\t\t\t
| \n\t\t\t\t\t{% if item_naming_by != \"Item Code\" %}\n\t\t\t\t\t\t{{ item.item_code }} | \n\t\t\t\t\t{% endif %}\n\n\t\t\t\t\t{{ item.get_formatted(\"qty\", 0) }} {{ item.uom }} | \n\t\t\t\t\t{{ item.get_formatted(\"net_rate\", doc) }} | \n\t\t\t\t\t{{ item.get_formatted(\"net_amount\", doc) }} | \n\t\t\t\t
\n\t\t\t\n\t\t\t\t
\n\t\t
\n\n\t\t| {{ _(\"Sub Total:\") }} | \n\t\t\t\t\t{{ doc.get_formatted(\"total\", doc) }} | \n\t\t\t\t
| \n\t\t\t\t\t\t\t{{ _(\"Discount\") }} ({{ doc.additional_discount_percentage }}%):\n\t\t\t\t\t\t | \n\t\t\t\t\t\t{{ doc.get_formatted(\"discount_amount\", doc) }} | \n\t\t\t\t\t
| {{ tax.get_formatted(\"description\") }} ({{ tax.get_formatted(\"rate\") }}%): | \n\t\t\t\t\t\t\t{{ tax.get_formatted(\"tax_amount\") }} | \n\t\t\t\t\t\t
| \n\t\t\t\t\t\t\t{{ _(\"Discount\") }} ({{ doc.additional_discount_percentage }}%):\n\t\t\t\t\t\t | \n\t\t\t\t\t\t{{ doc.get_formatted(\"discount_amount\", doc) }} | \n\t\t\t\t\t
\n\t\t\t\n\t\t\t\t
\n\t\t
\n\n\n\t\t\n\t\t{% if doc.terms %}\n\t\t| \n\t\t\t\t\t\t \n\t\t\t\t\t\t\t {{ _(\"In Words: \") }}{{ doc.in_words }}\n\t\t\t\t\t\t \n\t\t\t\t\t | \n\t\t\t\t\t{{ _(\"Grand Total:\") }} | \n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t{{ doc.get_formatted(\"grand_total\", doc) }}\n\t\t\t\t\t\t\n\t\t\t\t\t | \n\t\t\t\t
\n\t\t\t
\n\t\t{% endif %}\n\t{{ _(\"Terms and Conditions\") }}
\n\t\t\t{{ doc.terms}}\n\t\t{{ letter_head }}
\n{% endif %}\n{% if print_heading_template %}\n{{ frappe.render_template(print_heading_template, {\"doc\":doc}) }}\n{% endif %}\n{%- endmacro -%}\n\n{% for page in layout %}\n\n\t
\n{% endfor %}",
+ "html": "{%- macro add_header(page_num, max_pages, doc, letter_head, no_letterhead, footer, print_settings=None, print_heading_template=None) -%}\n\n{% if letter_head and not no_letterhead %}\n\n\t\t{{ add_header(loop.index, layout|len, doc, letter_head, no_letterhead, footer, print_settings) }}\n\t
\n\t{%- if doc.meta.is_submittable and doc.docstatus==2-%}\n\t\t\n\t\t\t
\n\t{%- endif -%}\n\t{%- if doc.meta.is_submittable and doc.docstatus==0 and (print_settings==None or print_settings.add_draft_heading) -%}\n\t\t{{ _(\"CANCELLED\") }}
\n\t\t\n\t\t\t
\n\t{%- endif -%}\n\n\t\n\n\t{{ _(\"DRAFT\") }}
\n\t\t\n\t\t\n\t\t\t
\n\n\t\t\n\t\t{% set item_naming_by = frappe.db.get_single_value(\"Stock Settings\", \"item_naming_by\") %}\n\t\t\n\t\t\t\n\t\t\t\t
\n\n\t\t
\n\t\n| \n\t\t\t\t\t \n\t\t\t\t\t\t \n\t\t\t\t\tCustomer Name: \n\t\t\t\t\t\tBill to: \n\t\t\t\t\t\n\t\t\t\t\t\t \n\t\t\t\t{{ doc.customer_name }} \n\t\t\t\t\t\t\n \t\t\t\t\t{% if doc.customer_address %}\n \t\t\t\t\t\t{% set customer_address = frappe.db.get_value(\"Address\", doc.customer_address, [\"address_line1\", \"address_line2\", \"city\", \"state\", \"pincode\", \"country\"], as_dict=True) %}\n \t\t\t\t\t\t{{ customer_address.address_line1 or \"\" }} \n\n\t\t\t\t\t\n \t\t\t\t\t\t{% if customer_address.address_line2 %}{{ customer_address.address_line2 }} {% endif %}\n \t\t\t\t\t\t{{ customer_address.city or \"\" }} {{ customer_address.state or \"\" }} {{ customer_address.pincode or \"\" }} {{ customer_address.country or \"\" }} \n \t\t\t\t\t{% endif %}\n\t\t\t\t\t\t | \n\n\t\t\t\t\n\t\t\t\t\t \n\t\t\t\t\t\t \n\t\t\t\t\t{{ _(\"Sales Order:\") }} \n\t\t\t\t\t\n\t\t\t\t\t\t \n\t\t\t\t\t{{ doc.name }} \n\t\t\t\t\t\n\t\t\t\t\t\t \n\t\t\t\t\t{{ _(\"Order Date:\") }} \n\t\t\t\t\t\n\t\t\t\t\t\t \n\t\t\t\t\t{{ frappe.utils.format_date(doc.transaction_date) }} \n\t\t\t\t\t\n\t\t\t\t\t\t \n\t\t\t\t\t{{ _(\"Delivery Date:\") }} \n\t\t\t\t\t\n\t\t\t\t\t\t \n\t\t\t\t{{ frappe.utils.format_date(doc.delivery_date) }} \n\t\t\t\t\t | \n\t\t\t
| {{ _(\"No\") }} | \n\t\t\t\t\t{{ _(\"Item\") }} | \n\t\t\t\t\t{% if item_naming_by != \"Item Code\" %}\n\t\t\t\t\t\t{{ _(\"Item Code\") }} | \n\t\t\t\t\t{% endif %}\n\t\t\t\t\t{{ _(\"Quantity\") }} | \n\t\t\t\t\t{{ _(\"Rate\") }} | \n\t\t\t\t\t{{ _(\"Amount\") }} | \n\t\t\t\t|
| {{ loop.index }} | \n\t\t\t\t\t\n\t\t\t\t\t\t
| \n\t\t\t\t\t{% if item_naming_by != \"Item Code\" %}\n\t\t\t\t\t\t{{ item.item_code }} | \n\t\t\t\t\t{% endif %}\n\n\t\t\t\t\t{{ item.get_formatted(\"qty\", 0) }} {{ item.uom }} | \n\t\t\t\t\t{{ item.get_formatted(\"net_rate\", doc) }} | \n\t\t\t\t\t{{ item.get_formatted(\"net_amount\", doc) }} | \n\t\t\t\t
\n\t\t\t\n\t\t\t\t
\n\t\t
\n\n\t\t| {{ _(\"Sub Total:\") }} | \n\t\t\t\t\t{{ doc.get_formatted(\"total\", doc) }} | \n\t\t\t\t
| \n\t\t\t\t\t\t\t{{ _(\"Discount\") }} ({{ doc.additional_discount_percentage }}%):\n\t\t\t\t\t\t | \n\t\t\t\t\t\t{{ doc.get_formatted(\"discount_amount\", doc) }} | \n\t\t\t\t\t
| {{ tax.get_formatted(\"description\") }} ({{ tax.get_formatted(\"rate\") }}%): | \n\t\t\t\t\t\t\t{{ tax.get_formatted(\"tax_amount\") }} | \n\t\t\t\t\t\t
| \n\t\t\t\t\t\t\t{{ _(\"Discount\") }} ({{ doc.additional_discount_percentage }}%):\n\t\t\t\t\t\t | \n\t\t\t\t\t\t{{ doc.get_formatted(\"discount_amount\", doc) }} | \n\t\t\t\t\t
\n\t\t\t\n\t\t\t\t
\n\t\t
\n\n\n\t\t\n\t\t{% if doc.terms %}\n\t\t| \n\t\t\t\t\t\t \n\t\t\t\t\t\t\t {{ _(\"In Words: \") }}{{ doc.in_words }}\n\t\t\t\t\t\t \n\t\t\t\t\t | \n\t\t\t\t\t{{ _(\"Grand Total:\") }} | \n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t{{ doc.get_formatted(\"grand_total\", doc) }}\n\t\t\t\t\t\t\n\t\t\t\t\t | \n\t\t\t\t
\n\t\t\t
\n\t\t{% endif %}\n\t{{ _(\"Terms and Conditions\") }}
\n\t\t\t{{ doc.terms}}\n\t\t{{ letter_head }}
\n{% endif %}\n{% if print_heading_template %}\n{{ frappe.render_template(print_heading_template, {\"doc\":doc}) }}\n{% endif %}\n{%- endmacro -%}\n\n{% for page in layout %}\n\n\t
\n{% endfor %}",
"idx": 0,
"line_breaks": 0,
"margin_bottom": 15.0,
diff --git a/erpnext/setup/doctype/email_digest/email_digest.py b/erpnext/setup/doctype/email_digest/email_digest.py
index 4e323097970..6590794a1a5 100644
--- a/erpnext/setup/doctype/email_digest/email_digest.py
+++ b/erpnext/setup/doctype/email_digest/email_digest.py
@@ -910,7 +910,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/setup/doctype/employee/employee.py b/erpnext/setup/doctype/employee/employee.py
index b9def9a7df4..8e8ff5a0777 100755
--- a/erpnext/setup/doctype/employee/employee.py
+++ b/erpnext/setup/doctype/employee/employee.py
@@ -139,7 +139,7 @@ class Employee(NestedSet):
user = frappe.get_doc("User", existing_user_id)
validate_employee_role(user, ignore_emp_check=True)
user.save(ignore_permissions=True)
- remove_user_permission("Employee", self.name, existing_user_id)
+ remove_user_permission("Employee", self.name, existing_user_id, ignore_permissions=True)
def after_rename(self, old, new, merge):
self.db_set("employee", new)
@@ -203,11 +203,11 @@ class Employee(NestedSet):
)
if employee_user_permission_exists and not self.create_user_permission:
- remove_user_permission("Employee", self.name, self.user_id)
- remove_user_permission("Company", self.company, self.user_id)
+ remove_user_permission("Employee", self.name, self.user_id, ignore_permissions=True)
+ remove_user_permission("Company", self.company, self.user_id, ignore_permissions=True)
elif not employee_user_permission_exists and self.create_user_permission:
- add_user_permission("Employee", self.name, self.user_id)
- add_user_permission("Company", self.company, self.user_id)
+ add_user_permission("Employee", self.name, self.user_id, ignore_permissions=True)
+ add_user_permission("Company", self.company, self.user_id, ignore_permissions=True)
def update_user(self):
# add employee role if missing
diff --git a/erpnext/startup/boot.py b/erpnext/startup/boot.py
index 08cf9154c2b..ca9fbfc3884 100644
--- a/erpnext/startup/boot.py
+++ b/erpnext/startup/boot.py
@@ -24,6 +24,9 @@ def boot_session(bootinfo):
bootinfo.sysdefaults.over_billing_allowance = frappe.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/bin/test_bin.py b/erpnext/stock/doctype/bin/test_bin.py
index 45302c66f01..02e576b5ba7 100644
--- a/erpnext/stock/doctype/bin/test_bin.py
+++ b/erpnext/stock/doctype/bin/test_bin.py
@@ -55,6 +55,68 @@ class TestBin(ERPNextTestSuite):
self.assertEqual(bin.valuation_rate, 0)
self.assertEqual(bin.stock_value, 0)
+ def test_repost_resets_bin_without_sle(self):
+ """A repost must zero the bin when the ledger is empty, e.g. after entries were deleted."""
+ from erpnext.stock.doctype.stock_entry.stock_entry_utils import make_stock_entry
+ from erpnext.stock.stock_ledger import update_entries_after
+
+ item_code = make_item().name
+ warehouse = "_Test Warehouse - _TC"
+ make_stock_entry(item_code=item_code, target=warehouse, qty=10, rate=100)
+
+ # deleting a transaction with `delete_linked_ledger_entries` on drops its entries outright
+ frappe.db.delete("Stock Ledger Entry", {"item_code": item_code, "warehouse": warehouse})
+
+ update_entries_after(
+ {
+ "item_code": item_code,
+ "warehouse": warehouse,
+ "posting_date": "1900-01-01",
+ "posting_time": "00:01",
+ }
+ )
+
+ bin = frappe.get_doc("Bin", {"item_code": item_code, "warehouse": warehouse})
+ self.assertEqual(bin.actual_qty, 0)
+ self.assertEqual(bin.valuation_rate, 0)
+ self.assertEqual(bin.stock_value, 0)
+
+ def test_cancelling_last_entry_resets_bin(self):
+ """Cancelling the only voucher must clear stock value, not just quantity."""
+ from erpnext.stock.doctype.stock_entry.stock_entry_utils import make_stock_entry
+
+ item_code = make_item().name
+ warehouse = "_Test Warehouse - _TC"
+ se = make_stock_entry(item_code=item_code, target=warehouse, qty=10, rate=100)
+
+ se.cancel()
+
+ bin = frappe.get_doc("Bin", {"item_code": item_code, "warehouse": warehouse})
+ self.assertEqual(bin.actual_qty, 0)
+ self.assertEqual(bin.valuation_rate, 0)
+ self.assertEqual(bin.stock_value, 0)
+
+ def test_deleting_last_voucher_resets_bin(self):
+ """Deleting the only voucher wipes its ledger entries outright, the bin must still be cleared."""
+ from erpnext.stock.doctype.stock_entry.stock_entry_utils import make_stock_entry
+
+ item_code = make_item().name
+ warehouse = "_Test Warehouse - _TC"
+ delete_entries = frappe.get_single_value("Accounts Settings", "delete_linked_ledger_entries")
+ frappe.db.set_single_value("Accounts Settings", "delete_linked_ledger_entries", 1)
+
+ try:
+ se = make_stock_entry(item_code=item_code, target=warehouse, qty=10, rate=100)
+ se.cancel()
+ frappe.delete_doc("Stock Entry", se.name, force=1)
+ finally:
+ frappe.db.set_single_value("Accounts Settings", "delete_linked_ledger_entries", delete_entries)
+
+ bin = frappe.get_doc("Bin", {"item_code": item_code, "warehouse": warehouse})
+ self.assertEqual(bin.actual_qty, 0)
+ self.assertEqual(bin.valuation_rate, 0)
+ self.assertEqual(bin.stock_value, 0)
+
def test_index_exists(self):
indexes = frappe.db.sql("show index from tabBin where Non_unique = 0", as_dict=1)
if not any(index.get("Key_name") == "unique_item_warehouse" for index in indexes):
diff --git a/erpnext/stock/doctype/delivery_note/delivery_note.json b/erpnext/stock/doctype/delivery_note/delivery_note.json
index 5d156970ec4..45bcf39febc 100644
--- a/erpnext/stock/doctype/delivery_note/delivery_note.json
+++ b/erpnext/stock/doctype/delivery_note/delivery_note.json
@@ -426,6 +426,7 @@
},
{
"collapsible": 1,
+ "collapsible_depends_on": "eval:doc.currency && doc.currency != erpnext.get_currency(doc.company)",
"fieldname": "currency_and_price_list",
"fieldtype": "Section Break",
"label": "Currency and Price List",
@@ -1461,7 +1462,7 @@
"idx": 146,
"is_submittable": 1,
"links": [],
- "modified": "2026-05-28 11:44:37.286743",
+ "modified": "2026-08-12 12:00:00.000000",
"modified_by": "Administrator",
"module": "Stock",
"name": "Delivery Note",
diff --git a/erpnext/stock/doctype/item/item.js b/erpnext/stock/doctype/item/item.js
index d7fde5f6961..67a7c3564dc 100644
--- a/erpnext/stock/doctype/item/item.js
+++ b/erpnext/stock/doctype/item/item.js
@@ -7,6 +7,12 @@ const SALES_DOCTYPES = ["Quotation", "Sales Order", "Delivery Note", "Sales Invo
const PURCHASE_DOCTYPES = ["Purchase Order", "Purchase Receipt", "Purchase Invoice"];
frappe.ui.form.on("Item", {
+ stock_uom(frm) {
+ // Each factor is relative to Stock UOM and becomes invalid when it changes.
+ frm.clear_table("uoms");
+ frm.refresh_field("uoms");
+ },
+
valuation_method(frm) {
if (!frm.is_new() && frm.doc.valuation_method === "Moving Average") {
let stock_exists = frm.doc.__onload && frm.doc.__onload.stock_exists ? 1 : 0;
@@ -249,7 +255,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/item.py b/erpnext/stock/doctype/item/item.py
index a11c9b1c6dc..03197ca4114 100644
--- a/erpnext/stock/doctype/item/item.py
+++ b/erpnext/stock/doctype/item/item.py
@@ -1023,6 +1023,9 @@ class Item(Document):
def validate_uom_conversion_factor(self):
if self.uoms:
for d in self.uoms:
+ if d.conversion_factor:
+ continue
+
value = get_uom_conv_factor(d.uom, self.stock_uom)
if value:
d.conversion_factor = value
diff --git a/erpnext/stock/doctype/item/test_item.py b/erpnext/stock/doctype/item/test_item.py
index 221c45e3591..72c5b1465f3 100644
--- a/erpnext/stock/doctype/item/test_item.py
+++ b/erpnext/stock/doctype/item/test_item.py
@@ -749,15 +749,25 @@ class TestItem(ERPNextTestSuite):
"Test Item UOM", {"stock_uom": "Gram", "uoms": [dict(uom="Carat"), dict(uom="Kg")]}
)
- for d in item_doc.uoms:
- value = get_uom_conv_factor(d.uom, item_doc.stock_uom)
- d.conversion_factor = value
-
self.assertEqual(item_doc.uoms[0].uom, "Carat")
self.assertEqual(item_doc.uoms[0].conversion_factor, 0.2)
self.assertEqual(item_doc.uoms[1].uom, "Kg")
self.assertEqual(item_doc.uoms[1].conversion_factor, 1000)
+ def test_item_uom_conversion_factor_overrides_global_factor(self):
+ custom_factor = 10.76
+ global_factor = get_uom_conv_factor("Square Meter", "Square Foot")
+ self.assertNotEqual(custom_factor, global_factor)
+
+ item = make_item(
+ properties={"stock_uom": "Square Foot"},
+ uoms=[{"uom": "Square Meter", "conversion_factor": custom_factor}],
+ )
+ item.reload()
+
+ conversion_factor = next(row.conversion_factor for row in item.uoms if row.uom == "Square Meter")
+ self.assertEqual(conversion_factor, custom_factor)
+
def test_uom_conv_intermediate(self):
factor = get_uom_conv_factor("Pound", "Gram")
self.assertAlmostEqual(factor, 453.592, 3)
@@ -930,7 +940,10 @@ class TestItem(ERPNextTestSuite):
item.reload()
item.stock_uom = "Nos"
item.save()
- self.assertEqual(len(item.uoms), 1)
+ self.assertEqual(
+ [(row.uom, row.conversion_factor) for row in item.uoms],
+ [("Nos", 1)],
+ )
def test_validate_stock_item(self):
self.assertRaises(frappe.ValidationError, validate_is_stock_item, "_Test Non Stock Item")
diff --git a/erpnext/stock/doctype/item_price/item_price.json b/erpnext/stock/doctype/item_price/item_price.json
index acbaef6b05e..69085f57b1c 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
},
@@ -226,7 +226,7 @@
"idx": 1,
"index_web_pages_for_search": 1,
"links": [],
- "modified": "2025-03-19 20:27:21.382369",
+ "modified": "2026-08-12 13:14:41.847412",
"modified_by": "Administrator",
"module": "Stock",
"name": "Item Price",
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/material_request/test_material_request.py b/erpnext/stock/doctype/material_request/test_material_request.py
index 7d044b929f4..aaa69e9d130 100644
--- a/erpnext/stock/doctype/material_request/test_material_request.py
+++ b/erpnext/stock/doctype/material_request/test_material_request.py
@@ -942,6 +942,33 @@ class TestMaterialRequest(ERPNextTestSuite):
for perm in permissions:
perm.delete()
+ def test_auto_email_single_company_without_user_permission(self):
+ from unittest.mock import patch
+
+ from erpnext.stock.reorder_item import get_email_list
+
+ users = ["test_reorder_single_1@example.com", "test_reorder_single_2@example.com"]
+ for user in users:
+ if not frappe.db.exists("User", user):
+ frappe.get_doc(
+ {
+ "doctype": "User",
+ "email": user,
+ "first_name": user,
+ "send_notifications": 0,
+ "enabled": 1,
+ "user_type": "System User",
+ "roles": [{"role": "Purchase Manager"}],
+ }
+ ).insert(ignore_permissions=True)
+
+ # single company: managers without any Company User Permission must still be emailed
+ with patch("frappe.db.count", return_value=1):
+ emails = get_email_list("_Test Company")
+
+ for user in users:
+ self.assertIn(user, emails)
+
def test_manufacture_type_status_over_wo(self):
from erpnext.stock.doctype.material_request.material_request import raise_work_orders
diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
index fa71e305e4b..1ab5c12fbd4 100755
--- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
+++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
@@ -356,6 +356,7 @@
},
{
"collapsible": 1,
+ "collapsible_depends_on": "eval:doc.currency && doc.currency != erpnext.get_currency(doc.company)",
"fieldname": "currency_and_price_list",
"fieldtype": "Section Break",
"label": "Currency and Price List",
@@ -1301,7 +1302,7 @@
"idx": 261,
"is_submittable": 1,
"links": [],
- "modified": "2026-05-28 12:38:05.907578",
+ "modified": "2026-08-12 12:00:00.000000",
"modified_by": "Administrator",
"module": "Stock",
"name": "Purchase Receipt",
diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py
index 54acee1af02..24227810dcb 100644
--- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py
+++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py
@@ -264,7 +264,7 @@ class PurchaseReceipt(BuyingController):
self.validate_cwip_accounts()
self.validate_provisional_expense_account()
- self.check_for_on_hold_or_closed_status("Purchase Order", "purchase_order")
+ self.check_purchase_order_on_hold_or_close("purchase_order")
if getdate(self.posting_date) > getdate(nowdate()):
throw(_("Posting Date cannot be future date"))
@@ -437,7 +437,7 @@ class PurchaseReceipt(BuyingController):
def on_cancel(self):
super().on_cancel()
- self.check_for_on_hold_or_closed_status("Purchase Order", "purchase_order")
+ self.check_purchase_order_on_hold_or_close("purchase_order")
self.update_prevdoc_status()
self.update_billing_status()
diff --git a/erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py b/erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py
index 4e9dc7f747a..cede0dc726d 100644
--- a/erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py
+++ b/erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py
@@ -703,6 +703,43 @@ class TestPurchaseReceipt(ERPNextTestSuite):
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/quality_inspection/quality_inspection.py b/erpnext/stock/doctype/quality_inspection/quality_inspection.py
index 58fa5a56a60..31ebe8224e0 100644
--- a/erpnext/stock/doctype/quality_inspection/quality_inspection.py
+++ b/erpnext/stock/doctype/quality_inspection/quality_inspection.py
@@ -444,7 +444,7 @@ def item_query(doctype, txt, searchfield, start, page_len, filters):
my_filters.extend(
[
"and",
- ["items.type", "is", "not set"],
+ ["items.secondary_item_type", "is", "not set"],
"and",
["items.is_legacy_scrap_item", "=", 0],
]
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 cd442909b1c..b8b874af600 100644
--- a/erpnext/stock/doctype/stock_entry/stock_entry.py
+++ b/erpnext/stock/doctype/stock_entry/stock_entry.py
@@ -33,6 +33,9 @@ from erpnext.manufacturing.doctype.bom.bom import (
get_secondary_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
@@ -89,7 +92,7 @@ def is_costed_out_of_finished_item(row) -> bool:
A secondary item that is not linked to a BOM has no cost allocation of its own, so it is
valued the way the legacy scrap item was: its cost is deducted from the finished good.
"""
- return bool(row.is_legacy_scrap_item or (row.type and not row.bom_secondary_item))
+ return bool(row.is_legacy_scrap_item or (row.secondary_item_type and not row.bom_secondary_item))
def _qty_tolerance(precision: int) -> float:
@@ -312,6 +315,7 @@ class StockEntry(StockController, SubcontractingInwardController):
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()
# Stock Entry overrides validate() without calling super(), so the shared mandatory
# inventory dimension check must be invoked explicitly here.
@@ -973,7 +977,7 @@ class StockEntry(StockController, SubcontractingInwardController):
frappe.throw(_("Target warehouse is mandatory for row {0}").format(d.idx))
if self.purpose in ["Manufacture", "Repack"]:
- if d.is_finished_item or d.type or d.is_legacy_scrap_item:
+ if d.is_finished_item or d.secondary_item_type or d.is_legacy_scrap_item:
d.s_warehouse = None
if not d.t_warehouse:
frappe.throw(_("Target warehouse is mandatory for row {0}").format(d.idx))
@@ -984,7 +988,7 @@ class StockEntry(StockController, SubcontractingInwardController):
if self.purpose == "Disassemble":
if has_bom:
- if d.is_finished_item or d.type or d.is_legacy_scrap_item:
+ if d.is_finished_item or d.secondary_item_type or d.is_legacy_scrap_item:
d.t_warehouse = None
if not d.s_warehouse:
frappe.throw(_("Source warehouse is mandatory for row {0}").format(d.idx))
@@ -1294,6 +1298,71 @@ class StockEntry(StockController, SubcontractingInwardController):
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")
+ )
+ extra_materials_percentage = flt(
+ frappe.db.get_single_value("Manufacturing Settings", "transfer_extra_materials_percentage")
+ )
+ to_transfer_qty = flt(self.pro_doc.material_transferred_for_manufacturing) + flt(
+ self.fg_completed_qty
+ )
+ limit_percentage = extra_materials_percentage or overproduction_percentage
+ transfer_limit_qty = max_qty + (max_qty * limit_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
@@ -1467,7 +1536,7 @@ class StockEntry(StockController, SubcontractingInwardController):
continue
# Zero-qty secondary items carry no inventory value; skip rate calculation
- if d.type and flt(d.transfer_qty) == 0:
+ if d.secondary_item_type and flt(d.transfer_qty) == 0:
d.basic_rate = 0.0
d.basic_amount = 0.0
continue
@@ -1490,7 +1559,7 @@ class StockEntry(StockController, SubcontractingInwardController):
if self.bom_no:
d.basic_rate *= frappe.get_value("BOM", self.bom_no, "cost_allocation_per") / 100
- elif d.type and d.bom_secondary_item:
+ elif d.secondary_item_type and d.bom_secondary_item:
cost_allocation_per = flt(
frappe.get_value("BOM Secondary Item", d.bom_secondary_item, "cost_allocation_per")
)
@@ -1656,7 +1725,11 @@ class StockEntry(StockController, SubcontractingInwardController):
# Validate only if Material Consumption Entry exists for the Work Order.
if self.get_consumption_entries():
for item in self.items:
- if not item.is_finished_item and not item.type and not item.is_legacy_scrap_item:
+ if (
+ not item.is_finished_item
+ and not item.secondary_item_type
+ and not item.is_legacy_scrap_item
+ ):
label = frappe.get_meta(settings.doctype).get_label(
"get_rm_cost_from_consumption_entry"
)
@@ -2062,13 +2135,13 @@ class StockEntry(StockController, SubcontractingInwardController):
for d in self.items:
if d.t_warehouse and not d.s_warehouse:
- if d.type or d.is_legacy_scrap_item:
+ if d.secondary_item_type or d.is_legacy_scrap_item:
d.is_finished_item = 0
elif self.purpose == "Repack" or d.item_code == finished_item:
d.is_finished_item = 1
else:
d.is_finished_item = 0
- d.type = ""
+ d.secondary_item_type = ""
def get_finished_item(self):
finished_item = None
@@ -2812,7 +2885,7 @@ class StockEntry(StockController, SubcontractingInwardController):
"s_warehouse": s_warehouse,
"t_warehouse": t_warehouse,
"is_finished_item": source_row.is_finished_item,
- "type": source_row.type,
+ "secondary_item_type": source_row.secondary_item_type,
"is_legacy_scrap_item": source_row.is_legacy_scrap_item,
"bom_secondary_item": source_row.bom_secondary_item,
"bom_no": source_row.bom_no,
@@ -2884,7 +2957,7 @@ class StockEntry(StockController, SubcontractingInwardController):
SED.basic_rate,
SED.conversion_factor,
SED.is_finished_item,
- SED.type,
+ SED.secondary_item_type,
SED.is_legacy_scrap_item,
SED.bom_secondary_item,
SED.batch_no,
@@ -3176,8 +3249,8 @@ class StockEntry(StockController, SubcontractingInwardController):
if self.purpose in ["Manufacture", "Repack"]:
secondary_items_dict = self.get_secondary_items(self.fg_completed_qty)
for item in secondary_items_dict.values():
- if self.pro_doc and item.type:
- if self.pro_doc.scrap_warehouse and item.type == "Scrap":
+ if self.pro_doc and item.secondary_item_type:
+ if self.pro_doc.scrap_warehouse and item.secondary_item_type == "Scrap":
item["to_warehouse"] = self.pro_doc.scrap_warehouse
if item.process_loss_per:
@@ -3254,7 +3327,7 @@ class StockEntry(StockController, SubcontractingInwardController):
def get_pending_process_loss_qty(self):
"""Loss this entry should still book: the job card's unbooked loss when the entry
- belongs to one, else the largest operation loss on the work order (legacy flow)."""
+ belongs to one, else the unbooked portion of the largest operation loss on the work order."""
if self.job_card:
job_card = frappe.get_doc("Job Card", self.job_card)
return max(flt(job_card.process_loss_qty) - flt(job_card.get_consumed_process_loss()), 0)
@@ -3265,7 +3338,9 @@ class StockEntry(StockController, SubcontractingInwardController):
filters={"parent": self.work_order},
fields=[{"MAX": "process_loss_qty", "as": "process_loss_qty"}],
)
- return flt(data[0].process_loss_qty) if data else 0
+ max_operation_loss = flt(data[0].process_loss_qty) if data else 0
+ booked_loss = flt(frappe.db.get_value("Work Order", self.work_order, "process_loss_qty"))
+ return max(max_operation_loss - booked_loss, 0)
return 0
@@ -3465,7 +3540,7 @@ class StockEntry(StockController, SubcontractingInwardController):
"from_warehouse": "",
"qty": row.stock_qty,
"conversion_factor": 1,
- "type": row.type,
+ "secondary_item_type": row.secondary_item_type,
"item_name": row.item_name,
"description": row.description,
"bom_secondary_item": row.bom_secondary_item,
@@ -3498,7 +3573,7 @@ class StockEntry(StockController, SubcontractingInwardController):
job_card_secondary_item.item_name,
job_card_secondary_item.description,
job_card_secondary_item.stock_uom,
- job_card_secondary_item.type,
+ job_card_secondary_item.secondary_item_type,
job_card_secondary_item.bom_secondary_item,
)
.join(job_card_secondary_item)
@@ -3508,7 +3583,7 @@ class StockEntry(StockController, SubcontractingInwardController):
& (job_card.work_order == self.work_order)
& (job_card.docstatus == 1)
)
- .groupby(job_card_secondary_item.item_code, job_card_secondary_item.type)
+ .groupby(job_card_secondary_item.item_code, job_card_secondary_item.secondary_item_type)
.orderby(job_card_secondary_item.idx)
)
@@ -3550,7 +3625,10 @@ class StockEntry(StockController, SubcontractingInwardController):
.select(StockEntryDetail.item_code, StockEntryDetail.qty)
.where(
(StockEntry.work_order == self.work_order)
- & ((StockEntryDetail.type.isnotnull()) | (StockEntryDetail.is_legacy_scrap_item == 1))
+ & (
+ (StockEntryDetail.secondary_item_type.isnotnull())
+ | (StockEntryDetail.is_legacy_scrap_item == 1)
+ )
& (StockEntry.docstatus == 1)
& (StockEntry.purpose.isin(["Repack", "Manufacture"]))
)
@@ -3854,7 +3932,7 @@ class StockEntry(StockController, SubcontractingInwardController):
if (
not self.is_return
and child_qty <= 0
- and not item_row.get("type")
+ and not item_row.get("secondary_item_type")
and not item_row.get("is_legacy_scrap_item")
):
if self.purpose not in ["Receive from Customer", "Send to Subcontractor"]:
@@ -3878,7 +3956,7 @@ class StockEntry(StockController, SubcontractingInwardController):
se_child.sco_rm_detail = item_row.get("sco_rm_detail")
se_child.scio_detail = item_row.get("scio_detail")
se_child.sample_quantity = item_row.get("sample_quantity", 0)
- se_child.type = item_row.get("type")
+ se_child.secondary_item_type = item_row.get("secondary_item_type")
se_child.is_legacy_scrap_item = item_row.get("is_legacy")
se_child.bom_secondary_item = item_row.get("name") or item_row.get("bom_secondary_item")
diff --git a/erpnext/stock/doctype/stock_entry/test_stock_entry.py b/erpnext/stock/doctype/stock_entry/test_stock_entry.py
index ff64b88c26d..70aad40926b 100644
--- a/erpnext/stock/doctype/stock_entry/test_stock_entry.py
+++ b/erpnext/stock/doctype/stock_entry/test_stock_entry.py
@@ -1004,7 +1004,9 @@ class TestStockEntry(ERPNextTestSuite):
if d.s_warehouse:
rm_cost += d.amount
fg_cost = next(filter(lambda x: x.item_code == "_Test FG Item", s.get("items"))).amount
- secondary_item_cost = next(filter(lambda x: x.type or x.is_legacy_scrap_item, s.get("items"))).amount
+ secondary_item_cost = next(
+ filter(lambda x: x.secondary_item_type or x.is_legacy_scrap_item, s.get("items"))
+ ).amount
self.assertEqual(fg_cost, flt(rm_cost - secondary_item_cost, 2))
# When Stock Entry has only FG + Scrap
@@ -1122,7 +1124,7 @@ class TestStockEntry(ERPNextTestSuite):
basic_rate=row.basic_rate or 100,
)
- if row.type or row.is_legacy_scrap_item:
+ if row.secondary_item_type or row.is_legacy_scrap_item:
row.item_code = secondary_item
row.uom = frappe.db.get_value("Item", secondary_item, "stock_uom")
row.stock_uom = frappe.db.get_value("Item", secondary_item, "stock_uom")
@@ -1130,10 +1132,16 @@ class TestStockEntry(ERPNextTestSuite):
stock_entry.inspection_required = 1
stock_entry.save()
- self.assertTrue([row.item_code for row in stock_entry.items if row.type or row.is_legacy_scrap_item])
+ self.assertTrue(
+ [
+ row.item_code
+ for row in stock_entry.items
+ if row.secondary_item_type or row.is_legacy_scrap_item
+ ]
+ )
for row in stock_entry.items:
- if not row.type and not row.is_legacy_scrap_item:
+ if not row.secondary_item_type and not row.is_legacy_scrap_item:
qc = frappe.get_doc(
{
"doctype": "Quality Inspection",
@@ -1153,7 +1161,7 @@ class TestStockEntry(ERPNextTestSuite):
stock_entry.reload()
stock_entry.submit()
for row in stock_entry.items:
- if row.type or row.is_legacy_scrap_item:
+ if row.secondary_item_type or row.is_legacy_scrap_item:
self.assertFalse(row.quality_inspection)
else:
self.assertTrue(row.quality_inspection)
@@ -2769,7 +2777,7 @@ class TestStockEntry(ERPNextTestSuite):
"item_code": scrap_item,
"t_warehouse": warehouse,
"qty": 5,
- "type": "Scrap",
+ "secondary_item_type": "Scrap",
"conversion_factor": 1,
},
)
@@ -2807,7 +2815,7 @@ class TestStockEntry(ERPNextTestSuite):
bom.append(
"secondary_items",
{
- "type": "Scrap",
+ "secondary_item_type": "Scrap",
"item_code": scrap_item,
"item_name": scrap_item,
"qty": 5,
@@ -2833,7 +2841,7 @@ class TestStockEntry(ERPNextTestSuite):
se.save()
fg_row = next(d for d in se.items if d.is_finished_item)
- scrap_row = next(d for d in se.items if d.type)
+ scrap_row = next(d for d in se.items if d.secondary_item_type)
self.assertFalse(scrap_row.is_finished_item)
self.assertEqual(flt(scrap_row.basic_amount), 250.0)
@@ -2868,7 +2876,7 @@ class TestStockEntry(ERPNextTestSuite):
bom.append(
"secondary_items",
{
- "type": "Scrap",
+ "secondary_item_type": "Scrap",
"item_code": scrap_item,
"item_name": scrap_item,
"qty": 5,
@@ -2888,7 +2896,7 @@ class TestStockEntry(ERPNextTestSuite):
se = frappe.get_doc(make_stock_entry_from_wo(wo.name, "Manufacture", 10))
se.save()
- scrap_row = next(d for d in se.items if d.type)
+ scrap_row = next(d for d in se.items if d.secondary_item_type)
fg_row = next(d for d in se.items if d.is_finished_item)
self.assertEqual(flt(scrap_row.basic_rate), 0.0)
@@ -2918,7 +2926,7 @@ class TestStockEntry(ERPNextTestSuite):
"t_warehouse": "_Test Warehouse - _TC",
"qty": 10,
"conversion_factor": 1,
- "type": secondary_item_type,
+ "secondary_item_type": secondary_item_type,
},
)
return se
@@ -2954,7 +2962,7 @@ class TestStockEntry(ERPNextTestSuite):
bom.append(
"secondary_items",
{
- "type": "Scrap",
+ "secondary_item_type": "Scrap",
"item_code": scrap_item,
"item_name": scrap_item,
"qty": 5,
@@ -2979,7 +2987,7 @@ class TestStockEntry(ERPNextTestSuite):
se = frappe.get_doc(make_stock_entry_from_wo(wo.name, "Manufacture", 10))
se.save()
- scrap_row = next(d for d in se.items if d.type)
+ scrap_row = next(d for d in se.items if d.secondary_item_type)
fg_row = next(d for d in se.items if d.is_finished_item)
self.assertEqual(flt(fg_row.basic_amount), 750.0)
diff --git a/erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.json b/erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.json
index defb69d548b..1c675baeb38 100644
--- a/erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.json
+++ b/erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.json
@@ -19,7 +19,7 @@
"col_break2",
"is_finished_item",
"is_legacy_scrap_item",
- "type",
+ "secondary_item_type",
"quality_inspection",
"subcontracted_item",
"against_fg",
@@ -570,7 +570,7 @@
},
{
"default": "0",
- "depends_on": "eval:!doc.is_legacy_scrap_item && !doc.type",
+ "depends_on": "eval:!doc.is_legacy_scrap_item && !doc.secondary_item_type",
"fieldname": "is_finished_item",
"fieldtype": "Check",
"label": "Is Finished Item",
@@ -664,7 +664,7 @@
},
{
"depends_on": "eval:parent.purpose == \"Manufacture\" && doc.t_warehouse && !doc.is_finished_item && !doc.is_legacy_scrap_item",
- "fieldname": "type",
+ "fieldname": "secondary_item_type",
"fieldtype": "Select",
"label": "Type",
"options": "\nCo-Product\nBy-Product\nScrap\nAdditional Finished Good"
diff --git a/erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.py b/erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.py
index 62e6d70b6eb..aeebf02a232 100644
--- a/erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.py
+++ b/erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.py
@@ -68,7 +68,7 @@ class StockEntryDetail(Document):
t_warehouse: DF.Link | None
transfer_qty: DF.Float
transferred_qty: DF.Float
- type: DF.Literal["", "Co-Product", "By-Product", "Scrap", "Additional Finished Good"]
+ secondary_item_type: DF.Literal["", "Co-Product", "By-Product", "Scrap", "Additional Finished Good"]
uom: DF.Link
use_serial_batch_fields: DF.Check
valuation_rate: DF.Currency
diff --git a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py
index d6df4790517..12cda4cb691 100644
--- a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py
+++ b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py
@@ -1179,12 +1179,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
@@ -1194,7 +1197,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
@@ -1212,7 +1216,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
@@ -1258,6 +1263,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"),
}
@@ -1285,6 +1291,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 0d54ea89eba..37e2eb840c6 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(ERPNextTestSuite, 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(ERPNextTestSuite, 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/print_format/delivery_note_with_item_image/delivery_note_with_item_image.json b/erpnext/stock/print_format/delivery_note_with_item_image/delivery_note_with_item_image.json
index b3dc2dbb580..c6994b956c0 100644
--- a/erpnext/stock/print_format/delivery_note_with_item_image/delivery_note_with_item_image.json
+++ b/erpnext/stock/print_format/delivery_note_with_item_image/delivery_note_with_item_image.json
@@ -9,7 +9,7 @@
"docstatus": 0,
"doctype": "Print Format",
"font_size": 14,
- "html": "{%- macro add_header(page_num, max_pages, doc, letter_head, no_letterhead, footer, print_settings=None, print_heading_template=None) -%}\n\n{% if letter_head and not no_letterhead %}\n\n\t\t{{ add_header(loop.index, layout|len, doc, letter_head, no_letterhead, footer, print_settings) }}\n\t
\n\t{%- if doc.meta.is_submittable and doc.docstatus==2-%}\n\t\t\n\t\t\t
\n\t{%- endif -%}\n\t{%- if doc.meta.is_submittable and doc.docstatus==0 and (print_settings==None or print_settings.add_draft_heading) -%}\n\t\t{{ _(\"CANCELLED\") }}
\n\t\t\n\t\t\t
\n\t{%- endif -%}\n\n\t\n\n\t{{ _(\"DRAFT\") }}
\n\t\t\n\t\t\n\t\t\t
\n\n\t\t\n\t\t{% set item_naming_by = frappe.db.get_single_value(\"Stock Settings\", \"item_naming_by\") %}\n\t\t\n\t\t\t\n\t\t\t\t
\n\n\t\t
\n\t\n| \n\t\t\t\t\t \n\t\t\t\t\t\t \n\t\t\t\t\tCustomer Name: \n\t\t\t\t\t\tBill to: \n\t\t\t\t\t\n\t\t\t\t\t\t \n\t\t\t\t{{ doc.customer_name }} \n\t\t\t\t\t\t\n \t\t\t\t\t{% if doc.customer_address %}\n \t\t\t\t\t\t{% set customer_address = frappe.db.get_value(\"Address\", doc.customer_address, [\"address_line1\", \"address_line2\", \"city\", \"state\", \"pincode\", \"country\"], as_dict=True) %}\n \t\t\t\t\t\t{{ customer_address.address_line1 or \"\" }} \n\n\t\t\t\t\t\n \t\t\t\t\t\t{% if customer_address.address_line2 %}{{ customer_address.address_line2 }} {% endif %}\n \t\t\t\t\t\t{{ customer_address.city or \"\" }} {{ customer_address.state or \"\" }} {{ customer_address.pincode or \"\" }} {{ customer_address.country or \"\" }} \n \t\t\t\t\t{% endif %}\n\t\t\t\t\t\t | \n\n\t\t\t\t\n\t\t\t\t\t \n\t\t\t\t\t\t \n\t\t\t\t\t{{ _(\"Sales Order:\") }} \n\t\t\t\t\t\n\t\t\t\t\t\t \n\t\t\t\t\t{{ doc.name }} \n\t\t\t\t\t\n\t\t\t\t\t\t \n\t\t\t\t\t{{ _(\"Order Date:\") }} \n\t\t\t\t\t\n\t\t\t\t\t\t \n\t\t\t\t\t{{ frappe.utils.format_date(doc.transaction_date) }} \n\t\t\t\t\t\n\t\t\t\t\t\t \n\t\t\t\t\t{{ _(\"Delivery Date:\") }} \n\t\t\t\t\t\n\t\t\t\t\t\t \n\t\t\t\t{{ frappe.utils.format_date(doc.delivery_date) }} \n\t\t\t\t\t | \n\t\t\t
| {{ _(\"No\") }} | \n\t\t\t\t\t{{ _(\"Item\") }} | \n\t\t\t\t\t{% if item_naming_by != \"Item Code\" %}\n\t\t\t\t\t\t{{ _(\"Item Code\") }} | \n\t\t\t\t\t{% endif %}\n\t\t\t\t\t{{ _(\"Quantity\") }} | \n\t\t\t\t\t{{ _(\"Rate\") }} | \n\t\t\t\t\t{{ _(\"Amount\") }} | \n\t\t\t\t|
| {{ loop.index }} | \n\t\t\t\t\t\n\t\t\t\t\t\t
| \n\t\t\t\t\t{% if item_naming_by != \"Item Code\" %}\n\t\t\t\t\t\t{{ item.item_code }} | \n\t\t\t\t\t{% endif %}\n\n\t\t\t\t\t{{ item.get_formatted(\"qty\", 0) }} {{ item.uom }} | \n\t\t\t\t\t{{ item.get_formatted(\"net_rate\", doc) }} | \n\t\t\t\t\t{{ item.get_formatted(\"net_amount\", doc) }} | \n\t\t\t\t
\n\t\t\t\n\t\t\t\t
\n\t\t
\n\n\t\t| {{ _(\"Sub Total:\") }} | \n\t\t\t\t\t{{ doc.get_formatted(\"total\", doc) }} | \n\t\t\t\t
| \n\t\t\t\t\t\t\t{{ _(\"Discount\") }} ({{ doc.additional_discount_percentage }}%):\n\t\t\t\t\t\t | \n\t\t\t\t\t\t{{ doc.get_formatted(\"discount_amount\", doc) }} | \n\t\t\t\t\t
| {{ tax.get_formatted(\"description\") }} ({{ tax.get_formatted(\"rate\") }}%): | \n\t\t\t\t\t\t\t{{ tax.get_formatted(\"tax_amount\") }} | \n\t\t\t\t\t\t
| \n\t\t\t\t\t\t\t{{ _(\"Discount\") }} ({{ doc.additional_discount_percentage }}%):\n\t\t\t\t\t\t | \n\t\t\t\t\t\t{{ doc.get_formatted(\"discount_amount\", doc) }} | \n\t\t\t\t\t
\n\t\t\t\n\t\t\t\t
\n\t\t
\n\n\n\t\t\n\t\t{% if doc.terms %}\n\t\t| \n\t\t\t\t\t\t \n\t\t\t\t\t\t\t {{ _(\"In Words: \") }}{{ doc.in_words }}\n\t\t\t\t\t\t \n\t\t\t\t\t | \n\t\t\t\t\t{{ _(\"Grand Total:\") }} | \n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t{{ doc.get_formatted(\"grand_total\", doc) }}\n\t\t\t\t\t\t\n\t\t\t\t\t | \n\t\t\t\t
\n\t\t\t
\n\t\t{% endif %}\n\t{{ _(\"Terms and Conditions\") }}
\n\t\t\t{{ doc.terms}}\n\t\t{{ letter_head }}
\n{% endif %}\n{% if print_heading_template %}\n{{ frappe.render_template(print_heading_template, {\"doc\":doc}) }}\n{% endif %}\n{%- endmacro -%}\n\n{% for page in layout %}\n\n\t
\n{% endfor %}",
+ "html": "{%- macro add_header(page_num, max_pages, doc, letter_head, no_letterhead, footer, print_settings=None, print_heading_template=None) -%}\n\n{% if letter_head and not no_letterhead %}\n\n\t\t{{ add_header(loop.index, layout|len, doc, letter_head, no_letterhead, footer, print_settings) }}\n\t
\n\t{%- if doc.meta.is_submittable and doc.docstatus==2-%}\n\t\t\n\t\t\t
\n\t{%- endif -%}\n\t{%- if doc.meta.is_submittable and doc.docstatus==0 and (print_settings==None or print_settings.add_draft_heading) -%}\n\t\t{{ _(\"CANCELLED\") }}
\n\t\t\n\t\t\t
\n\t{%- endif -%}\n\n\t\n\n\t{{ _(\"DRAFT\") }}
\n\t\t\n\t\t\n\t\t\t
\n\n\t\t\n\t\t{% set item_naming_by = frappe.db.get_single_value(\"Stock Settings\", \"item_naming_by\") %}\n\t\t\n\t\t\t\n\t\t\t\t
\n\n\t\t
\n\t\n| \n\t\t\t\t\t \n\t\t\t\t\t\t \n\t\t\t\t\t{{ _(\"Customer Name:\") }} \n\t\t\t\t\t\t{{ _(\"Address:\") }} \n\t\t\t\t\t\n\t\t\t\t\t\t \n\t\t\t\t{{ doc.customer_name }} \n\t\t\t\t\t\t\n \t\t\t\t\t{% if doc.customer_address %}\n \t\t\t\t\t\t{% set customer_address = frappe.db.get_value(\"Address\", doc.customer_address, [\"address_line1\", \"address_line2\", \"city\", \"state\", \"pincode\", \"country\"], as_dict=True) %}\n \t\t\t\t\t\t{{ customer_address.address_line1 or \"\" }} \n\n\t\t\t\t\t\n \t\t\t\t\t\t{% if customer_address.address_line2 %}{{ customer_address.address_line2 }} {% endif %}\n \t\t\t\t\t\t{{ customer_address.city or \"\" }} {{ customer_address.state or \"\" }} {{ customer_address.pincode or \"\" }} {{ customer_address.country or \"\" }} \n \t\t\t\t\t{% endif %}\n\t\t\t\t\t\t | \n\n\t\t\t\t\n\t\t\t\t\t \n\t\t\t\t\t\t \n\t\t\t\t\t{{ _(\"Delivery Note:\") }} \n\t\t\t\t\t\n\t\t\t\t\t\t \n\t\t\t\t\t{{ doc.name }} \n\t\t\t\t\t\n\t\t\t\t\t\t \n\t\t\t\t\t{{ _(\"Delivery Date:\") }} \n\t\t\t\t\t\n\t\t\t\t\t\t \n\t\t\t\t\t{{ frappe.utils.format_date(doc.posting_date) }} \n\t\t\t\t\t\n\t\t\t\t\t\t \n\t\t\t\t\t{{ _(\"Status:\") }} \n\t\t\t\t\t\n\t\t\t\t\t\t \n\t\t\t\t{{ doc.status }} \n\t\t\t\t\t | \n\t\t\t
| {{ _(\"No\") }} | \n\t\t\t\t\t{{ _(\"Item\") }} | \n\t\t\t\t\t{% if item_naming_by != \"Item Code\" %}\n\t\t\t\t\t\t{{ _(\"Item Code\") }} | \n\t\t\t\t\t{% endif %}\n\t\t\t\t\t{{ _(\"Quantity\") }} | \n\t\t\t\t\t{{ _(\"Rate\") }} | \n\t\t\t\t\t{{ _(\"Amount\") }} | \n\t\t\t\t|
| {{ loop.index }} | \n\t\t\t\t\t\n\t\t\t\t\t\t
| \n\t\t\t\t\t{% if item_naming_by != \"Item Code\" %}\n\t\t\t\t\t\t{{ item.item_code }} | \n\t\t\t\t\t{% endif %}\n\n\t\t\t\t\t{{ item.get_formatted(\"qty\", 0) }} {{ item.uom }} | \n\t\t\t\t\t{{ item.get_formatted(\"net_rate\", doc) }} | \n\t\t\t\t\t{{ item.get_formatted(\"net_amount\", doc) }} | \n\t\t\t\t
\n\t\t\t\n\t\t\t\t
\n\t\t
\n\n\t\t| {{ _(\"Sub Total:\") }} | \n\t\t\t\t\t{{ doc.get_formatted(\"total\", doc) }} | \n\t\t\t\t
| \n\t\t\t\t\t\t\t{{ _(\"Discount\") }} ({{ doc.additional_discount_percentage }}%):\n\t\t\t\t\t\t | \n\t\t\t\t\t\t{{ doc.get_formatted(\"discount_amount\", doc) }} | \n\t\t\t\t\t
| {{ tax.get_formatted(\"description\") }} ({{ tax.get_formatted(\"rate\") }}%): | \n\t\t\t\t\t\t\t{{ tax.get_formatted(\"tax_amount\") }} | \n\t\t\t\t\t\t
| \n\t\t\t\t\t\t\t{{ _(\"Discount\") }} ({{ doc.additional_discount_percentage }}%):\n\t\t\t\t\t\t | \n\t\t\t\t\t\t{{ doc.get_formatted(\"discount_amount\", doc) }} | \n\t\t\t\t\t
\n\t\t\t\n\t\t\t\t
\n\t\t
\n\n\n\t\t\n\t\t{% if doc.terms %}\n\t\t| \n\t\t\t\t\t\t \n\t\t\t\t\t\t\t {{ _(\"In Words: \") }}{{ doc.in_words }}\n\t\t\t\t\t\t \n\t\t\t\t\t | \n\t\t\t\t\t{{ _(\"Grand Total:\") }} | \n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t{{ doc.get_formatted(\"grand_total\", doc) }}\n\t\t\t\t\t\t\n\t\t\t\t\t | \n\t\t\t\t
\n\t\t\t
\n\t\t{% endif %}\n\t{{ _(\"Terms and Conditions\") }}
\n\t\t\t{{ doc.terms}}\n\t\t{{ letter_head }}
\n{% endif %}\n{% if print_heading_template %}\n{{ frappe.render_template(print_heading_template, {\"doc\":doc}) }}\n{% endif %}\n{%- endmacro -%}\n\n{% for page in layout %}\n\n\t
\n{% endfor %}",
"idx": 0,
"line_breaks": 0,
"margin_bottom": 15.0,
diff --git a/erpnext/stock/reorder_item.py b/erpnext/stock/reorder_item.py
index a92b41d52fb..496d725f1fb 100644
--- a/erpnext/stock/reorder_item.py
+++ b/erpnext/stock/reorder_item.py
@@ -358,6 +358,10 @@ def get_email_list(company):
def get_comapny_wise_users(company):
+ # single company: no explicit permission needed, everyone has access
+ if frappe.db.count("Company") == 1:
+ return []
+
companies = [company]
if parent_company := frappe.db.get_value("Company", company, "parent_company"):
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/item_where_used/item_where_used.py b/erpnext/stock/report/item_where_used/item_where_used.py
index 4fecf71b35b..d603cf676e3 100644
--- a/erpnext/stock/report/item_where_used/item_where_used.py
+++ b/erpnext/stock/report/item_where_used/item_where_used.py
@@ -195,7 +195,7 @@ def get_bom_secondary_item_rows(item, company=None):
rows = frappe.get_all(
"BOM Secondary Item",
filters={"item_code": item, "parenttype": "BOM", "docstatus": 1},
- fields=["parent", "idx", "type", "qty", "uom", "stock_qty", "stock_uom"],
+ fields=["parent", "idx", "secondary_item_type", "qty", "uom", "stock_qty", "stock_uom"],
order_by="parent asc, idx asc",
)
bom_map = get_bom_map([row.parent for row in rows], company)
@@ -219,7 +219,7 @@ def get_bom_secondary_item_rows(item, company=None):
company=bom.company,
is_default=bom.is_default,
is_active=bom.is_active,
- details=row.type,
+ details=row.secondary_item_type,
)
)
diff --git a/erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.js b/erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.js
index 59cb2eb6545..d17b38d7f8f 100644
--- a/erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.js
+++ b/erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.js
@@ -68,7 +68,7 @@ frappe.query_reports["Serial No and Batch Traceability"] = {
function getTraceabilityLink({ type, value, original_value, item_code, data, filter_values }) {
if (!value) return value;
- const base_url = type === "batch_no" ? "/app/batch/" : "/app/serial-no/";
+ const link_doctype = type === "batch_no" ? "Batch" : "Serial No";
const filter_list = filter_values[type]; // either batches or serial_nos
let css_class = "ellipsis";
@@ -84,7 +84,10 @@ function getTraceabilityLink({ type, value, original_value, item_code, data, fil
css_class = data.direction === "Backward" ? "ellipsis text-success" : "ellipsis text-danger";
}
- return `${original_value}`;
+ return `${frappe.utils.escape_html(original_value)}`;
}
function custom_formatter(value, row, column, data, default_formatter) {
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 2ea732180ad..e12d0489b6f 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
@@ -5,7 +5,7 @@
import frappe
from frappe import _
from frappe.query_builder import Order
-from frappe.query_builder.functions import Coalesce
+from frappe.query_builder.functions import Coalesce, Sum
from frappe.utils import cstr, flt
from pypika import analytics as an
@@ -44,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
@@ -59,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
diff --git a/erpnext/stock/stock_ledger.py b/erpnext/stock/stock_ledger.py
index 0ee68469706..9710c05e5de 100644
--- a/erpnext/stock/stock_ledger.py
+++ b/erpnext/stock/stock_ledger.py
@@ -587,16 +587,6 @@ class update_entries_after:
previous_sle = get_previous_sle_of_current_voucher(args)
if previous_sle:
self.prev_sle_dict[(args.get("item_code"), args.get("warehouse"))] = previous_sle
- else:
- self.prev_sle_dict[(args.get("item_code"), args.get("warehouse"))] = frappe._dict(
- {
- "qty_after_transaction": 0.0,
- "valuation_rate": 0.0,
- "stock_value": 0.0,
- "prev_stock_value": 0.0,
- "stock_queue": [],
- }
- )
warehouse_dict.previous_sle = previous_sle
@@ -1800,6 +1790,30 @@ class update_entries_after:
frappe.db.set_value("Bin", bin_name, updated_values, update_modified=True)
+ self.reset_bin_without_stock_ledger_entries()
+
+ def reset_bin_without_stock_ledger_entries(self):
+ """Reset the bin when its ledger has no entries left, prev_sle_dict never covers that case."""
+ item_code, warehouse = self.args.get("item_code"), self.args.get("warehouse")
+ if not item_code or not warehouse or (item_code, warehouse) in self.prev_sle_dict:
+ return
+
+ if frappe.db.exists(
+ "Stock Ledger Entry", {"item_code": item_code, "warehouse": warehouse, "is_cancelled": 0}
+ ):
+ return
+
+ bin_name = frappe.db.get_value("Bin", {"item_code": item_code, "warehouse": warehouse})
+ if not bin_name:
+ return
+
+ frappe.db.set_value(
+ "Bin",
+ bin_name,
+ {"actual_qty": 0.0, "stock_value": 0.0, "valuation_rate": 0.0},
+ update_modified=True,
+ )
+
def get_sle_against_current_voucher(kwargs):
kwargs["posting_datetime"] = get_combine_datetime(kwargs.posting_date, kwargs.posting_time)
diff --git a/erpnext/subcontracting/doctype/subcontracting_inward_order/subcontracting_inward_order.py b/erpnext/subcontracting/doctype/subcontracting_inward_order/subcontracting_inward_order.py
index 9687a070bda..d6ec3219684 100644
--- a/erpnext/subcontracting/doctype/subcontracting_inward_order/subcontracting_inward_order.py
+++ b/erpnext/subcontracting/doctype/subcontracting_inward_order/subcontracting_inward_order.py
@@ -345,6 +345,26 @@ class SubcontractingInwardOrder(SubcontractingController):
if target_doc and target_doc.get("items"):
target_doc.items = []
+ def postprocess(source, target):
+ target.purpose = "Receive from Customer"
+ target.subcontracting_inward_order = source.name
+ target.set_stock_entry_type()
+
+ for rm_item in source.received_items:
+ if not rm_item.required_qty or not rm_item.is_customer_provided_item:
+ continue
+
+ target.append(
+ "items",
+ {
+ "scio_detail": rm_item.get("name"),
+ "item_code": rm_item.get("rm_item_code"),
+ "qty": calculate_qty_as_per_bom(rm_item),
+ "t_warehouse": rm_item.get("warehouse"),
+ "stock_uom": rm_item.get("stock_uom"),
+ },
+ )
+
stock_entry = get_mapped_doc(
"Subcontracting Inward Order",
self.name,
@@ -357,29 +377,10 @@ class SubcontractingInwardOrder(SubcontractingController):
},
},
target_doc,
+ postprocess=postprocess,
ignore_child_tables=True,
)
- stock_entry.purpose = "Receive from Customer"
- stock_entry.subcontracting_inward_order = self.name
-
- stock_entry.set_stock_entry_type()
-
- for rm_item in self.received_items:
- if not rm_item.required_qty or not rm_item.is_customer_provided_item:
- continue
-
- items_dict = {
- rm_item.get("rm_item_code"): {
- "scio_detail": rm_item.get("name"),
- "qty": calculate_qty_as_per_bom(rm_item),
- "to_warehouse": rm_item.get("warehouse"),
- "stock_uom": rm_item.get("stock_uom"),
- }
- }
-
- stock_entry.add_to_stock_entry_detail(items_dict)
-
if target_doc:
return stock_entry
else:
@@ -390,6 +391,27 @@ class SubcontractingInwardOrder(SubcontractingController):
if target_doc and target_doc.get("items"):
target_doc.items = []
+ def postprocess(source, target):
+ target.purpose = "Return Raw Material to Customer"
+ target.subcontracting_inward_order = source.name
+ target.set_stock_entry_type()
+
+ for rm_item in source.received_items:
+ qty = rm_item.received_qty - rm_item.work_order_qty - rm_item.returned_qty
+ if not qty:
+ continue
+
+ target.append(
+ "items",
+ {
+ "scio_detail": rm_item.get("name"),
+ "item_code": rm_item.get("rm_item_code"),
+ "qty": qty,
+ "s_warehouse": rm_item.get("warehouse"),
+ "stock_uom": rm_item.get("stock_uom"),
+ },
+ )
+
stock_entry = get_mapped_doc(
"Subcontracting Inward Order",
self.name,
@@ -402,25 +424,10 @@ class SubcontractingInwardOrder(SubcontractingController):
},
},
target_doc,
+ postprocess=postprocess,
ignore_child_tables=True,
)
- stock_entry.purpose = "Return Raw Material to Customer"
- stock_entry.set_stock_entry_type()
- stock_entry.subcontracting_inward_order = self.name
-
- for rm_item in self.received_items:
- items_dict = {
- rm_item.get("rm_item_code"): {
- "scio_detail": rm_item.get("name"),
- "qty": rm_item.received_qty - rm_item.work_order_qty - rm_item.returned_qty,
- "from_warehouse": rm_item.get("warehouse"),
- "stock_uom": rm_item.get("stock_uom"),
- }
- }
-
- stock_entry.add_to_stock_entry_detail(items_dict)
-
if target_doc:
return stock_entry
else:
@@ -431,6 +438,58 @@ class SubcontractingInwardOrder(SubcontractingController):
if target_doc and target_doc.get("items"):
target_doc.items = []
+ def postprocess(source, target):
+ target.purpose = "Subcontracting Delivery"
+ target.subcontracting_inward_order = source.name
+ target.set_stock_entry_type()
+
+ scio_details = []
+ allow_over = frappe.get_single_value("Selling Settings", "allow_delivery_of_overproduced_qty")
+ for fg_item in source.items:
+ qty = (
+ fg_item.produced_qty
+ if allow_over
+ else min(fg_item.qty, fg_item.produced_qty) - fg_item.delivered_qty
+ )
+ if qty < 0:
+ continue
+
+ scio_details.append(fg_item.name)
+ target.append(
+ "items",
+ {
+ "qty": qty,
+ "item_code": fg_item.item_code,
+ "s_warehouse": fg_item.delivery_warehouse,
+ "stock_uom": fg_item.stock_uom,
+ "scio_detail": fg_item.name,
+ "is_finished_item": 1,
+ },
+ )
+
+ if (
+ frappe.get_single_value("Selling Settings", "deliver_secondary_items")
+ and source.secondary_items
+ and scio_details
+ ):
+ for secondary_item in source.secondary_items:
+ if secondary_item.reference_name not in scio_details:
+ continue
+
+ qty = secondary_item.produced_qty - secondary_item.delivered_qty
+ if qty > 0:
+ target.append(
+ "items",
+ {
+ "qty": qty,
+ "item_code": secondary_item.item_code,
+ "s_warehouse": secondary_item.warehouse,
+ "stock_uom": secondary_item.stock_uom,
+ "scio_detail": secondary_item.name,
+ "secondary_item_type": secondary_item.secondary_item_type,
+ },
+ )
+
stock_entry = get_mapped_doc(
"Subcontracting Inward Order",
self.name,
@@ -443,62 +502,10 @@ class SubcontractingInwardOrder(SubcontractingController):
},
},
target_doc,
+ postprocess=postprocess,
ignore_child_tables=True,
)
- stock_entry.purpose = "Subcontracting Delivery"
- stock_entry.set_stock_entry_type()
- stock_entry.subcontracting_inward_order = self.name
- scio_details = []
-
- allow_over = frappe.get_single_value("Selling Settings", "allow_delivery_of_overproduced_qty")
- for fg_item in self.items:
- qty = (
- fg_item.produced_qty
- if allow_over
- else min(fg_item.qty, fg_item.produced_qty) - fg_item.delivered_qty
- )
- if qty < 0:
- continue
-
- scio_details.append(fg_item.name)
- items_dict = {
- fg_item.item_code: {
- "qty": qty,
- "from_warehouse": fg_item.delivery_warehouse,
- "stock_uom": fg_item.stock_uom,
- "scio_detail": fg_item.name,
- "is_finished_item": 1,
- }
- }
-
- stock_entry.add_to_stock_entry_detail(items_dict)
-
- if (
- frappe.get_single_value("Selling Settings", "deliver_secondary_items")
- and self.secondary_items
- and scio_details
- ):
- secondary_items = [
- secondary_item
- for secondary_item in self.secondary_items
- if secondary_item.reference_name in scio_details
- ]
- for secondary_item in secondary_items:
- qty = secondary_item.produced_qty - secondary_item.delivered_qty
- if qty > 0:
- items_dict = {
- secondary_item.item_code: {
- "qty": secondary_item.produced_qty - secondary_item.delivered_qty,
- "from_warehouse": secondary_item.warehouse,
- "stock_uom": secondary_item.stock_uom,
- "scio_detail": secondary_item.name,
- "type": secondary_item.type,
- }
- }
-
- stock_entry.add_to_stock_entry_detail(items_dict)
-
if target_doc:
return stock_entry
else:
@@ -509,6 +516,26 @@ class SubcontractingInwardOrder(SubcontractingController):
if target_doc and target_doc.get("items"):
target_doc.items = []
+ def postprocess(source, target):
+ target.purpose = "Subcontracting Return"
+ target.set_stock_entry_type()
+
+ for fg_item in source.items:
+ qty = fg_item.delivered_qty - fg_item.returned_qty
+ if qty < 0:
+ continue
+
+ target.append(
+ "items",
+ {
+ "qty": qty,
+ "item_code": fg_item.item_code,
+ "stock_uom": fg_item.stock_uom,
+ "scio_detail": fg_item.name,
+ "is_finished_item": 1,
+ },
+ )
+
stock_entry = get_mapped_doc(
"Subcontracting Inward Order",
self.name,
@@ -522,28 +549,10 @@ class SubcontractingInwardOrder(SubcontractingController):
},
},
target_doc,
+ postprocess=postprocess,
ignore_child_tables=True,
)
- stock_entry.purpose = "Subcontracting Return"
- stock_entry.set_stock_entry_type()
-
- for fg_item in self.items:
- qty = fg_item.delivered_qty - fg_item.returned_qty
- if qty < 0:
- continue
-
- items_dict = {
- fg_item.item_code: {
- "qty": qty,
- "stock_uom": fg_item.stock_uom,
- "scio_detail": fg_item.name,
- "is_finished_item": 1,
- }
- }
-
- stock_entry.add_to_stock_entry_detail(items_dict)
-
if target_doc:
return stock_entry
else:
diff --git a/erpnext/subcontracting/doctype/subcontracting_inward_order/test_subcontracting_inward_order.py b/erpnext/subcontracting/doctype/subcontracting_inward_order/test_subcontracting_inward_order.py
index f74d3d73391..d2bf418e814 100644
--- a/erpnext/subcontracting/doctype/subcontracting_inward_order/test_subcontracting_inward_order.py
+++ b/erpnext/subcontracting/doctype/subcontracting_inward_order/test_subcontracting_inward_order.py
@@ -367,7 +367,7 @@ class IntegrationTestSubcontractingInwardOrder(ERPNextTestSuite):
def test_secondary_items_delivery(self):
new_bom = frappe.copy_doc(frappe.get_doc("BOM", "BOM-Basic FG Item-001"))
new_bom.secondary_items.append(
- frappe.new_doc("BOM Secondary Item", item_code="Basic RM 2", qty=1, type="Scrap")
+ frappe.new_doc("BOM Secondary Item", item_code="Basic RM 2", qty=1, secondary_item_type="Scrap")
)
new_bom.submit()
sc_bom = frappe.get_doc("Subcontracting BOM", "SB-0001")
diff --git a/erpnext/subcontracting/doctype/subcontracting_inward_order_secondary_item/subcontracting_inward_order_secondary_item.json b/erpnext/subcontracting/doctype/subcontracting_inward_order_secondary_item/subcontracting_inward_order_secondary_item.json
index 94a640b41ce..01e4c63ad2f 100644
--- a/erpnext/subcontracting/doctype/subcontracting_inward_order_secondary_item/subcontracting_inward_order_secondary_item.json
+++ b/erpnext/subcontracting/doctype/subcontracting_inward_order_secondary_item/subcontracting_inward_order_secondary_item.json
@@ -7,7 +7,7 @@
"engine": "InnoDB",
"field_order": [
"column_break_rptg",
- "type",
+ "secondary_item_type",
"reference_name",
"column_break_jkzt",
"item_code",
@@ -97,7 +97,7 @@
"fieldtype": "Column Break"
},
{
- "fieldname": "type",
+ "fieldname": "secondary_item_type",
"fieldtype": "Select",
"label": "Type",
"no_copy": 1,
@@ -114,7 +114,7 @@
"index_web_pages_for_search": 1,
"istable": 1,
"links": [],
- "modified": "2026-02-27 15:15:40.009957",
+ "modified": "2026-06-01 10:00:00.000000",
"modified_by": "Administrator",
"module": "Subcontracting",
"name": "Subcontracting Inward Order Secondary Item",
diff --git a/erpnext/subcontracting/doctype/subcontracting_inward_order_secondary_item/subcontracting_inward_order_secondary_item.py b/erpnext/subcontracting/doctype/subcontracting_inward_order_secondary_item/subcontracting_inward_order_secondary_item.py
index 767f216921a..9fcc8b20135 100644
--- a/erpnext/subcontracting/doctype/subcontracting_inward_order_secondary_item/subcontracting_inward_order_secondary_item.py
+++ b/erpnext/subcontracting/doctype/subcontracting_inward_order_secondary_item/subcontracting_inward_order_secondary_item.py
@@ -23,7 +23,7 @@ class SubcontractingInwardOrderSecondaryItem(Document):
produced_qty: DF.Float
reference_name: DF.Data
stock_uom: DF.Link
- type: DF.Literal["Co-Product", "By-Product", "Scrap", "Additional Finished Good"]
+ secondary_item_type: DF.Literal["Co-Product", "By-Product", "Scrap", "Additional Finished Good"]
warehouse: DF.Link
# end: auto-generated types
diff --git a/erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py b/erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py
index dd2028a9520..9e70e005318 100644
--- a/erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py
+++ b/erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py
@@ -421,7 +421,7 @@ class SubcontractingReceipt(SubcontractingController):
self.append(
"items",
{
- "type": secondary_item.type,
+ "secondary_item_type": secondary_item.secondary_item_type,
"is_legacy_scrap_item": secondary_item.is_legacy,
"reference_name": item.name,
"item_code": secondary_item.item_code,
@@ -449,7 +449,7 @@ class SubcontractingReceipt(SubcontractingController):
def remove_secondary_items(self):
for item in list(self.items):
- if item.type or item.is_legacy_scrap_item:
+ if item.secondary_item_type or item.is_legacy_scrap_item:
self.remove(item)
else:
item.secondary_items_cost_per_qty = 0
@@ -509,7 +509,7 @@ class SubcontractingReceipt(SubcontractingController):
secondary_items_cost_map = {}
for item in self.get("items") or []:
- if item.type or item.is_legacy_scrap_item:
+ if item.secondary_item_type or item.is_legacy_scrap_item:
qty = (
flt(item.qty)
if item.is_legacy_scrap_item
@@ -524,7 +524,7 @@ class SubcontractingReceipt(SubcontractingController):
total_qty = total_amount = 0
for item in self.get("items") or []:
- if not item.type and not item.is_legacy_scrap_item:
+ if not item.secondary_item_type and not item.is_legacy_scrap_item:
if item.qty:
if item.name in rm_cost_map:
item.rm_supp_cost = rm_cost_map[item.name]
@@ -568,7 +568,7 @@ class SubcontractingReceipt(SubcontractingController):
def validate_secondary_items(self):
for item in self.items:
- if item.type or item.is_legacy_scrap_item:
+ if item.secondary_item_type or item.is_legacy_scrap_item:
if not item.qty:
frappe.throw(
_("Row #{0}: Secondary Item Qty cannot be zero").format(item.idx),
diff --git a/erpnext/subcontracting/doctype/subcontracting_receipt/test_subcontracting_receipt.py b/erpnext/subcontracting/doctype/subcontracting_receipt/test_subcontracting_receipt.py
index 5d623af60eb..0f1e666fae5 100644
--- a/erpnext/subcontracting/doctype/subcontracting_receipt/test_subcontracting_receipt.py
+++ b/erpnext/subcontracting/doctype/subcontracting_receipt/test_subcontracting_receipt.py
@@ -1221,7 +1221,7 @@ class TestSubcontractingReceipt(ERPNextTestSuite):
scr.get_secondary_items()
scr_secondary_items = set(
- [item.item_code for item in scr.items if item.type or item.is_legacy_scrap_item]
+ [item.item_code for item in scr.items if item.secondary_item_type or item.is_legacy_scrap_item]
)
self.assertEqual(len(scr.items), 3) # 1 FG Item + 2 Scrap Items
self.assertEqual(scr_secondary_items, set(secondary_items))
diff --git a/erpnext/subcontracting/doctype/subcontracting_receipt_item/subcontracting_receipt_item.json b/erpnext/subcontracting/doctype/subcontracting_receipt_item/subcontracting_receipt_item.json
index 8622889515e..0e6721291ef 100644
--- a/erpnext/subcontracting/doctype/subcontracting_receipt_item/subcontracting_receipt_item.json
+++ b/erpnext/subcontracting/doctype/subcontracting_receipt_item/subcontracting_receipt_item.json
@@ -9,7 +9,7 @@
"field_order": [
"item_code",
"is_legacy_scrap_item",
- "type",
+ "secondary_item_type",
"column_break_2",
"item_name",
"section_break_4",
@@ -162,12 +162,12 @@
"label": "Accepted Qty",
"no_copy": 1,
"print_width": "100px",
- "read_only_depends_on": "eval:doc.type || doc.is_legacy_scrap_item",
+ "read_only_depends_on": "eval:doc.secondary_item_type || doc.is_legacy_scrap_item",
"width": "100px"
},
{
"columns": 1,
- "depends_on": "eval:!parent.is_return && !doc.type && !doc.is_legacy_scrap_item",
+ "depends_on": "eval:!parent.is_return && !doc.secondary_item_type && !doc.is_legacy_scrap_item",
"fieldname": "rejected_qty",
"fieldtype": "Float",
"in_list_view": 1,
@@ -175,7 +175,7 @@
"no_copy": 1,
"print_hide": 1,
"print_width": "100px",
- "read_only_depends_on": "eval:doc.type || doc.is_legacy_scrap_item",
+ "read_only_depends_on": "eval:doc.secondary_item_type || doc.is_legacy_scrap_item",
"width": "100px"
},
{
@@ -235,7 +235,7 @@
},
{
"default": "0",
- "depends_on": "eval:!doc.type && !doc.is_legacy_scrap_item",
+ "depends_on": "eval:!doc.secondary_item_type && !doc.is_legacy_scrap_item",
"fieldname": "rm_cost_per_qty",
"fieldtype": "Currency",
"label": "Raw Material Cost Per Qty",
@@ -245,7 +245,7 @@
},
{
"default": "0",
- "depends_on": "eval:!doc.type && !doc.is_legacy_scrap_item",
+ "depends_on": "eval:!doc.secondary_item_type && !doc.is_legacy_scrap_item",
"fieldname": "service_cost_per_qty",
"fieldtype": "Currency",
"label": "Service Cost Per Qty",
@@ -255,7 +255,7 @@
},
{
"default": "0",
- "depends_on": "eval:!doc.type && !doc.is_legacy_scrap_item",
+ "depends_on": "eval:!doc.secondary_item_type && !doc.is_legacy_scrap_item",
"fieldname": "additional_cost_per_qty",
"fieldtype": "Currency",
"label": "Additional Cost Per Qty",
@@ -279,7 +279,7 @@
"width": "100px"
},
{
- "depends_on": "eval: !parent.is_return && !doc.type && !doc.is_legacy_scrap_item",
+ "depends_on": "eval: !parent.is_return && !doc.secondary_item_type && !doc.is_legacy_scrap_item",
"fieldname": "rejected_warehouse",
"fieldtype": "Link",
"ignore_user_permissions": 1,
@@ -291,7 +291,7 @@
"width": "100px"
},
{
- "depends_on": "eval:!doc.__islocal && !doc.type && !doc.is_legacy_scrap_item",
+ "depends_on": "eval:!doc.__islocal && !doc.secondary_item_type && !doc.is_legacy_scrap_item",
"fieldname": "quality_inspection",
"fieldtype": "Link",
"label": "Quality Inspection",
@@ -373,7 +373,7 @@
"no_copy": 1,
"options": "BOM",
"print_hide": 1,
- "read_only_depends_on": "eval:doc.type || doc.is_legacy_scrap_item"
+ "read_only_depends_on": "eval:doc.secondary_item_type || doc.is_legacy_scrap_item"
},
{
"fetch_from": "item_code.brand",
@@ -500,7 +500,7 @@
"print_hide": 1
},
{
- "depends_on": "eval:(doc.use_serial_batch_fields === 0 || doc.docstatus === 1) && !doc.type && !doc.is_legacy_scrap_item",
+ "depends_on": "eval:(doc.use_serial_batch_fields === 0 || doc.docstatus === 1) && !doc.secondary_item_type && !doc.is_legacy_scrap_item",
"fieldname": "rejected_serial_and_batch_bundle",
"fieldtype": "Link",
"label": "Rejected Serial and Batch Bundle",
@@ -565,7 +565,7 @@
"label": "Add Serial / Batch Bundle"
},
{
- "depends_on": "eval:doc.use_serial_batch_fields === 0 && !doc.type && !doc.is_legacy_scrap_item",
+ "depends_on": "eval:doc.use_serial_batch_fields === 0 && !doc.secondary_item_type && !doc.is_legacy_scrap_item",
"fieldname": "add_serial_batch_for_rejected_qty",
"fieldtype": "Button",
"label": "Add Serial / Batch No (Rejected Qty)"
@@ -579,7 +579,7 @@
"search_index": 1
},
{
- "depends_on": "eval:!doc.type && !doc.is_legacy_scrap_item",
+ "depends_on": "eval:!doc.secondary_item_type && !doc.is_legacy_scrap_item",
"fieldname": "landed_cost_voucher_amount",
"fieldtype": "Currency",
"label": "Landed Cost Voucher Amount",
@@ -597,7 +597,7 @@
"options": "Account"
},
{
- "fieldname": "type",
+ "fieldname": "secondary_item_type",
"fieldtype": "Select",
"label": "Type",
"no_copy": 1,
@@ -607,7 +607,7 @@
},
{
"default": "0",
- "depends_on": "eval:!doc.type && !doc.is_legacy_scrap_item",
+ "depends_on": "eval:!doc.secondary_item_type && !doc.is_legacy_scrap_item",
"fieldname": "secondary_items_cost_per_qty",
"fieldtype": "Currency",
"label": "Secondary Items Cost Per Qty",
diff --git a/erpnext/subcontracting/doctype/subcontracting_receipt_item/subcontracting_receipt_item.py b/erpnext/subcontracting/doctype/subcontracting_receipt_item/subcontracting_receipt_item.py
index c6233b841a2..47cfd9a1648 100644
--- a/erpnext/subcontracting/doctype/subcontracting_receipt_item/subcontracting_receipt_item.py
+++ b/erpnext/subcontracting/doctype/subcontracting_receipt_item/subcontracting_receipt_item.py
@@ -62,7 +62,7 @@ class SubcontractingReceiptItem(Document):
subcontracting_order: DF.Link | None
subcontracting_order_item: DF.Data | None
subcontracting_receipt_item: DF.Data | None
- type: DF.Literal["", "Co-Product", "By-Product", "Scrap", "Additional Finished Good"]
+ secondary_item_type: DF.Literal["", "Co-Product", "By-Product", "Scrap", "Additional Finished Good"]
use_serial_batch_fields: DF.Check
warehouse: DF.Link | None
# end: auto-generated types
diff --git a/erpnext/templates/form_grid/includes/visible_cols.html b/erpnext/templates/form_grid/includes/visible_cols.html
index 8d79bcdf879..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) { %}
\n\t\t{{ add_header(loop.index, layout|len, doc, letter_head, no_letterhead, footer, print_settings) }}\n\t
\n\t{%- if doc.meta.is_submittable and doc.docstatus==2-%}\n\t\t\n\t\t\t
\n\t{%- endif -%}\n\t{%- if doc.meta.is_submittable and doc.docstatus==0 and (print_settings==None or print_settings.add_draft_heading) -%}\n\t\t{{ _(\"CANCELLED\") }}
\n\t\t\n\t\t\t
\n\t{%- endif -%}\n\n\t\n\n\t{{ _(\"DRAFT\") }}
\n\t\t\n\t\t\n\t\t\t
\n\n\t\t\n\t\t{% set item_naming_by = frappe.db.get_single_value(\"Stock Settings\", \"item_naming_by\") %}\n\t\t\n\t\t\t\n\t\t\t\t
\n\n\t\t
\n\t\n| \n\t\t\t\t\t \n\t\t\t\t\t\t \n\t\t\t\t\t{{ _(\"Customer Name:\") }} \n\t\t\t\t\t\t{{ _(\"Address:\") }} \n\t\t\t\t\t\n\t\t\t\t\t\t \n\t\t\t\t{{ doc.customer_name }} \n\t\t\t\t\t\t\n \t\t\t\t\t{% if doc.customer_address %}\n \t\t\t\t\t\t{% set customer_address = frappe.db.get_value(\"Address\", doc.customer_address, [\"address_line1\", \"address_line2\", \"city\", \"state\", \"pincode\", \"country\"], as_dict=True) %}\n \t\t\t\t\t\t{{ customer_address.address_line1 or \"\" }} \n\n\t\t\t\t\t\n \t\t\t\t\t\t{% if customer_address.address_line2 %}{{ customer_address.address_line2 }} {% endif %}\n \t\t\t\t\t\t{{ customer_address.city or \"\" }} {{ customer_address.state or \"\" }} {{ customer_address.pincode or \"\" }} {{ customer_address.country or \"\" }} \n \t\t\t\t\t{% endif %}\n\t\t\t\t\t\t | \n\n\t\t\t\t\n\t\t\t\t\t \n\t\t\t\t\t\t \n\t\t\t\t\t{{ _(\"Delivery Note:\") }} \n\t\t\t\t\t\n\t\t\t\t\t\t \n\t\t\t\t\t{{ doc.name }} \n\t\t\t\t\t\n\t\t\t\t\t\t \n\t\t\t\t\t{{ _(\"Delivery Date:\") }} \n\t\t\t\t\t\n\t\t\t\t\t\t \n\t\t\t\t\t{{ frappe.utils.format_date(doc.posting_date) }} \n\t\t\t\t\t\n\t\t\t\t\t\t \n\t\t\t\t\t{{ _(\"Status:\") }} \n\t\t\t\t\t\n\t\t\t\t\t\t \n\t\t\t\t{{ doc.status }} \n\t\t\t\t\t | \n\t\t\t
| {{ _(\"No\") }} | \n\t\t\t\t\t{{ _(\"Item\") }} | \n\t\t\t\t\t{% if item_naming_by != \"Item Code\" %}\n\t\t\t\t\t\t{{ _(\"Item Code\") }} | \n\t\t\t\t\t{% endif %}\n\t\t\t\t\t{{ _(\"Quantity\") }} | \n\t\t\t\t\t{{ _(\"Rate\") }} | \n\t\t\t\t\t{{ _(\"Amount\") }} | \n\t\t\t\t|
| {{ loop.index }} | \n\t\t\t\t\t\n\t\t\t\t\t\t
| \n\t\t\t\t\t{% if item_naming_by != \"Item Code\" %}\n\t\t\t\t\t\t{{ item.item_code }} | \n\t\t\t\t\t{% endif %}\n\n\t\t\t\t\t{{ item.get_formatted(\"qty\", 0) }} {{ item.uom }} | \n\t\t\t\t\t{{ item.get_formatted(\"net_rate\", doc) }} | \n\t\t\t\t\t{{ item.get_formatted(\"net_amount\", doc) }} | \n\t\t\t\t
\n\t\t\t\n\t\t\t\t
\n\t\t
\n\n\t\t| {{ _(\"Sub Total:\") }} | \n\t\t\t\t\t{{ doc.get_formatted(\"total\", doc) }} | \n\t\t\t\t
| \n\t\t\t\t\t\t\t{{ _(\"Discount\") }} ({{ doc.additional_discount_percentage }}%):\n\t\t\t\t\t\t | \n\t\t\t\t\t\t{{ doc.get_formatted(\"discount_amount\", doc) }} | \n\t\t\t\t\t
| {{ tax.get_formatted(\"description\") }} ({{ tax.get_formatted(\"rate\") }}%): | \n\t\t\t\t\t\t\t{{ tax.get_formatted(\"tax_amount\") }} | \n\t\t\t\t\t\t
| \n\t\t\t\t\t\t\t{{ _(\"Discount\") }} ({{ doc.additional_discount_percentage }}%):\n\t\t\t\t\t\t | \n\t\t\t\t\t\t{{ doc.get_formatted(\"discount_amount\", doc) }} | \n\t\t\t\t\t
\n\t\t\t\n\t\t\t\t
\n\t\t
\n\n\n\t\t\n\t\t{% if doc.terms %}\n\t\t| \n\t\t\t\t\t\t \n\t\t\t\t\t\t\t {{ _(\"In Words: \") }}{{ doc.in_words }}\n\t\t\t\t\t\t \n\t\t\t\t\t | \n\t\t\t\t\t{{ _(\"Grand Total:\") }} | \n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t{{ doc.get_formatted(\"grand_total\", doc) }}\n\t\t\t\t\t\t\n\t\t\t\t\t | \n\t\t\t\t
\n\t\t\t
\n\t\t{% endif %}\n\t{{ _(\"Terms and Conditions\") }}
\n\t\t\t{{ doc.terms}}\n\t\t
- {%= __(df.label, null, df.parent) %}:
+ {%= 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) { %}
{% } %} - {%= doc.item_name %}{% } %} + {%= frappe.utils.escape_html(doc.item_name) %}{% } %} {% include "templates/form_grid/includes/visible_cols.html" %}
@@ -57,7 +57,7 @@
@@ -84,7 +84,7 @@
{% if (frappe.perm.is_visible("rate", doc, frm.perm)) { %}
{% } %} - {%= doc.item_name %}{% } %} + {%= frappe.utils.escape_html(doc.item_name) %}{% } %} {% include "templates/form_grid/includes/visible_cols.html" %}
- {%= 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.item_name %}{% } %} +
{%= frappe.utils.escape_html(doc.item_name) %}{% } %} {% include "templates/form_grid/includes/visible_cols.html" %} @@ -35,7 +35,7 @@ {% if(doc.warehouse) { %} - {%= doc.warehouse %} + {%= frappe.utils.escape_html(doc.warehouse) %} {% } %}
@@ -43,7 +43,7 @@
{%= doc.item_name %}{% } %} +
{%= frappe.utils.escape_html(doc.item_name) %}{% } %} {% include "templates/form_grid/includes/visible_cols.html" %} @@ -35,7 +35,7 @@ {% if(doc.warehouse) { %} - {%= doc.warehouse %} + {%= frappe.utils.escape_html(doc.warehouse) %} {% } %}
{%= doc.get_formatted("qty") %}
- {%= doc.uom || doc.stock_uom %}
+ {%= frappe.utils.escape_html(doc.uom || doc.stock_uom) %}
-
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 %}
{%= doc.item_code %}
+
@@ -42,7 +42,7 @@
{%= frappe.utils.escape_html(doc.item_code) %}
{% if(doc.item_name != doc.item_code) { %}
-
{%= doc.item_name %}{% } %} +
{%= frappe.utils.escape_html(doc.item_name) %}{% } %} {% include "templates/form_grid/includes/visible_cols.html" %}
@@ -30,11 +30,11 @@
}
%}
- {%= doc.s_warehouse %}
+ {%= frappe.utils.escape_html(doc.s_warehouse) %}
{% }; %}
{% if(doc.t_warehouse) { %}
{%= doc.item_name %}{% } %} +
{%= frappe.utils.escape_html(doc.item_name) %}{% } %} {% include "templates/form_grid/includes/visible_cols.html" %}
- {%= doc.t_warehouse %}
+ {%= frappe.utils.escape_html(doc.t_warehouse) %}
{% }; %}
{%= 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 9dd2db99023..8577140d039 100644
--- a/erpnext/templates/generators/sales_partner.html
+++ b/erpnext/templates/generators/sales_partner.html
@@ -9,16 +9,16 @@
{%= doc.uom || doc.stock_uom %} +
{%= frappe.utils.escape_html(doc.uom || doc.stock_uom) %}
{% if logo %}
- 
+ 
{% endif %} {% if addresses %} {% for address in addresses %} - {% if address.partner_address %}
{% endmacro %}
@@ -10,7 +10,7 @@
{% macro product_image(website_image, css_class="product-image", alt="", no_border=False) %}
{% endif %}
- Link
+ Link
{% endif %} {% if addresses %} {% for address in addresses %} - {% if address.partner_address %}
{{ address.partner_address }}
{% endif %} - {% if address.phone %}{{ address.phone }}
{% endif %} - {% if address.email %}{{ address.email }}
{% endif %} + {% if address.partner_address %}{{ address.partner_address | e }}
{% endif %} + {% if address.phone %}{{ address.phone | e }}
{% endif %} + {% if address.email %}{{ address.email | e }}
{% endif %} {% endfor %} {% endif %} diff --git a/erpnext/templates/includes/macros.html b/erpnext/templates/includes/macros.html index 5c8714db8f9..9886d13fec3 100644 --- a/erpnext/templates/includes/macros.html +++ b/erpnext/templates/includes/macros.html @@ -2,7 +2,7 @@
-
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 @@
{{ section["name"] }}
+{{ section["name"] | e }}
{% for item in section["items"] %}
- {{ item.title }}
+ {{ item.title | e }}
{% if item.description -%}
-
{% endfor %}
@@ -35,15 +35,15 @@
{{ item.description }}
+{{ item.description | e }}
{%- endif %}{{ _("Forum Activity") }}
{% for topic in topics %}
-
- {{ topic[post_params.title] }}
+
+ {{ topic[post_params.title] | e }}
{% if topic[post_params.description] -%}
-
{% endfor %}
-
+
{{ topic[post_params.description] }}
+{{ topic[post_params.description] | e }}
{%- endif %}
{%- 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 %}
- {{ doc.contact_display }} + {{ doc.contact_display | e }} {% endif %}
- {{ doc.contact_display }} + {{ doc.contact_display | e }} {% endif %}
-
{{ doc.terms }}
+{{ frappe.sanitize_html(doc.terms) }}
-
+
{{ partner_info.partner_name }}
{{ partner_info.territory }} - {{ partner_info.partner_type }}
-{{ partner_info.introduction }}
+{{ partner_info.introduction | e }}
diff --git a/erpnext/templates/pages/projects.html b/erpnext/templates/pages/projects.html index e671e91db2f..2b55679fa71 100644 --- a/erpnext/templates/pages/projects.html +++ b/erpnext/templates/pages/projects.html @@ -1,7 +1,7 @@ {% extends "templates/web.html" %} {% block title %} - {{ doc.project_name }} + {{ doc.project_name | e }} {% endblock %} {% block head_include %} @@ -9,7 +9,7 @@ {% endblock %} {% block header %} -
{{ doc.project_name }}
+{{ doc.project_name | e }}
{% endblock %} {% block style %} @@ -34,7 +34,7 @@{{ _("Tasks") }}
-
{% endfor %}
@@ -72,7 +72,7 @@
-
- {{ doc.supplier }}
-
+
diff --git a/erpnext/templates/print_formats/includes/item_table_description.html b/erpnext/templates/print_formats/includes/item_table_description.html
index 7569e50b45c..4ad3d6dd1d1 100644
--- a/erpnext/templates/print_formats/includes/item_table_description.html
+++ b/erpnext/templates/print_formats/includes/item_table_description.html
@@ -5,7 +5,7 @@
{% if doc.in_format_data("image") and doc.get("image") and "image" in display_columns -%}
{{ doc.get_formatted("transaction_date") }}
- 
+ 
{%- endif %}
diff --git a/erpnext/tests/utils.py b/erpnext/tests/utils.py
index a48f193c700..cf168d16545 100644
--- a/erpnext/tests/utils.py
+++ b/erpnext/tests/utils.py
@@ -184,6 +184,7 @@ class BootStrapTestData:
self.make_loyalty_program()
self.make_shareholder()
self.make_sales_taxes_template()
+ self.make_purchase_taxes_template()
self.make_workstation()
self.make_operation()
self.make_bom()
@@ -2339,6 +2340,29 @@ class BootStrapTestData:
]
self.make_records(["title", "company"], records)
+ def make_purchase_taxes_template(self):
+ records = [
+ {
+ "company": "_Test Company",
+ "doctype": "Purchase Taxes and Charges Template",
+ "title": "_Test Purchase Taxes and Charges Template",
+ "taxes": [
+ {
+ "account_head": "_Test Account VAT - _TC",
+ "add_deduct_tax": "Add",
+ "category": "Total",
+ "charge_type": "On Net Total",
+ "cost_center": "Main - _TC",
+ "description": "VAT",
+ "doctype": "Purchase Taxes and Charges",
+ "parentfield": "taxes",
+ "rate": 6,
+ }
+ ],
+ }
+ ]
+ self.make_records(["title", "company"], records)
+
def make_asset_category(self):
records = [
{
diff --git a/erpnext/www/support/index.html b/erpnext/www/support/index.html
index 3c19198cc16..d2625cd55ad 100644
--- a/erpnext/www/support/index.html
+++ b/erpnext/www/support/index.html
@@ -49,11 +49,11 @@
{{ item['category'].name }}
{% for article in item['articles'] %}
- {{ article.title }}
+ {{ article.title | e }}
{% endfor %}