chore(release): Bumped to Version 14.70.0

# [14.70.0](https://github.com/frappe/erpnext/compare/v14.69.1...v14.70.0) (2024-05-15) ### Bug Fixes * "Based on" field always has the value "Not applicable" ([1078a98](1078a98cce)) * address filter and quotation to for prospect ([c9e7f45](c9e7f450c5)) * address filter and quotation to for prospect ([6902780](690278042d)) * address filter and quotation to for prospect ([754e193](754e193c76)) * consistent use of "Address & Contact" (backport [#41386](https://github.com/frappe/erpnext/issues/41386)) ([#41387](https://github.com/frappe/erpnext/issues/41387)) ([256d6a4](256d6a47ac)) * data getting override in delivery trip (backport [#41431](https://github.com/frappe/erpnext/issues/41431)) ([#41432](https://github.com/frappe/erpnext/issues/41432)) ([5366356](5366356400)) * Default dates in report ([c3244f0](c3244f009b)) * default fiscal year ([7a380f5](7a380f584d)) * Duplicate party name column in AR/AP report ([a8be5f0](a8be5f0789)) * PSOA ageing ([e69e540](e69e5404d3)) ### Features * allow to pick manually qty / batches / serial nos (backport [#40723](https://github.com/frappe/erpnext/issues/40723)) ([#41435](https://github.com/frappe/erpnext/issues/41435)) ([7b28d7d](7b28d7d2b8))
Merge pull request #41458 from frappe/version-14-hotfix
2026-06-25 20:08:34 +00:00 · 2024-05-15 05:12:14 +00:00 · 2024-05-15 10:40:58 +05:30 · 2024-05-14 21:19:17 +05:30 · 2024-05-14 14:40:36 +00:00 · 2024-05-14 20:02:56 +05:30
43 changed files with 133 additions and 85 deletions
--- a/erpnext/init.py
+++ b/erpnext/init.py
@@ -3,7 +3,7 @@ import inspect

 import frappe

-__version__ = "14.69.0"
+__version__ = "14.70.0"


 def get_default_company(user=None):
--- a/erpnext/accounts/doctype/pricing_rule/test_pricing_rule.py
+++ b/erpnext/accounts/doctype/pricing_rule/test_pricing_rule.py
@@ -976,7 +976,7 @@ class TestPricingRule(unittest.TestCase):
 		so.load_from_db()
 		self.assertEqual(so.items[1].is_free_item, 1)
 		self.assertEqual(so.items[1].item_code, "_Test Item")
-		self.assertEqual(so.items[1].qty, 4)
+		self.assertEqual(so.items[1].qty, 3)

 	def test_apply_multiple_pricing_rules_for_discount_percentage_and_amount(self):
 		frappe.delete_doc_if_exists("Pricing Rule", "_Test Pricing Rule 1")
--- a/erpnext/accounts/doctype/pricing_rule/utils.py
+++ b/erpnext/accounts/doctype/pricing_rule/utils.py
@@ -6,6 +6,7 @@

 import copy
 import json
+import math

 import frappe
 from frappe import _, bold
@@ -638,7 +639,7 @@ def get_product_discount_rule(pricing_rule, item_details, args=None, doc=None):
 		if transaction_qty:
 			qty = flt(transaction_qty) * qty / pricing_rule.recurse_for
 			if pricing_rule.round_free_qty:
-				qty = round(qty)
+				qty = math.floor(qty)

 	free_item_data_args = {
 		"item_code": free_item,
--- a/erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.py
+++ b/erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.py
@@ -104,7 +104,7 @@ def set_ageing(doc, entry):
 	ageing_filters = frappe._dict(
 		{
 			"company": doc.company,
-			"report_date": doc.to_date,
+			"report_date": doc.posting_date,
 			"ageing_based_on": doc.ageing_based_on,
 			"range1": 30,
 			"range2": 60,
--- a/erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html
+++ b/erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html
@@ -340,10 +340,11 @@
 	<table class="table table-bordered">
 		<thead>
 			<tr>
-				<th style="width: 25%">30 Days</th>
-				<th style="width: 25%">60 Days</th>
-				<th style="width: 25%">90 Days</th>
-				<th style="width: 25%">120 Days</th>
+				<th style="width: 25%">0 - 30 Days</th>
+				<th style="width: 25%">30 - 60 Days</th>
+				<th style="width: 25%">60 - 90 Days</th>
+				<th style="width: 25%">90 - 120 Days</th>
+				<th style="width: 20%">Above 120 Days</th>
 			</tr>
 		</thead>
 		<tbody>
@@ -352,6 +353,7 @@
 				<td>{{ frappe.utils.fmt_money(ageing.range2, currency=data[0]["currency"]) }}</td>
 				<td>{{ frappe.utils.fmt_money(ageing.range3, currency=data[0]["currency"]) }}</td>
 				<td>{{ frappe.utils.fmt_money(ageing.range4, currency=data[0]["currency"]) }}</td>
+				<td>{{ frappe.utils.fmt_money(ageing.range5, currency=filters.presentation_currency) }}</td>
 			</tr>
 		</tbody>
 	</table>
--- a/erpnext/accounts/doctype/psoa_cost_center/psoa_cost_center.json
+++ b/erpnext/accounts/doctype/psoa_cost_center/psoa_cost_center.json
@@ -11,13 +11,15 @@
  {
   "fieldname": "cost_center_name",
   "fieldtype": "Link",
+   "in_list_view": 1,
   "label": "Cost Center",
-   "options": "Cost Center"
+   "options": "Cost Center",
+   "reqd": 1
  }
 ],
 "istable": 1,
 "links": [],
- "modified": "2020-08-03 16:56:45.744905",
+ "modified": "2024-05-03 17:16:51.666461",
 "modified_by": "Administrator",
 "module": "Accounts",
 "name": "PSOA Cost Center",
@@ -27,4 +29,4 @@
 "sort_field": "modified",
 "sort_order": "DESC",
 "track_changes": 1
-}
+}
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
@@ -2030,7 +2030,7 @@
  {
   "fieldname": "contact_and_address_tab",
   "fieldtype": "Tab Break",
-   "label": "Contact & Address"
+   "label": "Address & Contact"
  },
  {
   "fieldname": "payments_tab",
@@ -2184,7 +2184,7 @@
   "link_fieldname": "consolidated_invoice"
  }
 ],
- "modified": "2024-03-22 17:50:34.395602",
+ "modified": "2024-05-08 18:02:28.549041",
 "modified_by": "Administrator",
 "module": "Accounts",
 "name": "Sales Invoice",
--- a/erpnext/accounts/party.py
+++ b/erpnext/accounts/party.py
@@ -188,7 +188,9 @@ def set_address_details(
 	*,
 	ignore_permissions=False,
 ):
-	billing_address_field = "customer_address" if party_type == "Lead" else party_type.lower() + "_address"
+	billing_address_field = (
+		"customer_address" if party_type in ["Lead", "Prospect"] else party_type.lower() + "_address"
+	)
 	party_details[billing_address_field] = party_address or get_default_address(party_type, party.name)
 	if doctype:
 		party_details.update(
--- a/erpnext/accounts/report/accounts_receivable/accounts_receivable.py
+++ b/erpnext/accounts/report/accounts_receivable/accounts_receivable.py
@@ -1028,20 +1028,6 @@ class ReceivablePayableReport:
 				fieldtype="Link",
 				options="Contact",
 			)
-		if self.filters.party_type == "Customer":
-			self.add_column(
-				_("Customer Name"),
-				fieldname="customer_name",
-				fieldtype="Link",
-				options="Customer",
-			)
-		elif self.filters.party_type == "Supplier":
-			self.add_column(
-				_("Supplier Name"),
-				fieldname="supplier_name",
-				fieldtype="Link",
-				options="Supplier",
-			)

 		self.add_column(label=_("Cost Center"), fieldname="cost_center", fieldtype="Data")
 		self.add_column(label=_("Voucher Type"), fieldname="voucher_type", fieldtype="Data")
--- a/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.js
+++ b/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.js
@@ -15,14 +15,14 @@ frappe.query_reports["Asset Depreciations and Balances"] = {
 			fieldname: "from_date",
 			label: __("From Date"),
 			fieldtype: "Date",
-			default: frappe.defaults.get_user_default("year_start_date"),
+			default: erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), true)[1],
 			reqd: 1,
 		},
 		{
 			fieldname: "to_date",
 			label: __("To Date"),
 			fieldtype: "Date",
-			default: frappe.defaults.get_user_default("year_end_date"),
+			default: erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), true)[2],
 			reqd: 1,
 		},
 		{
--- a/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.js
+++ b/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.js
@@ -7,7 +7,7 @@ frappe.query_reports["Bank Clearance Summary"] = {
 			fieldname: "from_date",
 			label: __("From Date"),
 			fieldtype: "Date",
-			default: frappe.defaults.get_user_default("year_start_date"),
+			default: erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), true)[1],
 			width: "80",
 		},
 		{
--- a/erpnext/accounts/report/dimension_wise_accounts_balance_report/dimension_wise_accounts_balance_report.js
+++ b/erpnext/accounts/report/dimension_wise_accounts_balance_report/dimension_wise_accounts_balance_report.js
@@ -38,14 +38,14 @@ frappe.require("assets/erpnext/js/financial_statements.js", function () {
 				fieldname: "from_date",
 				label: __("From Date"),
 				fieldtype: "Date",
-				default: frappe.defaults.get_user_default("year_start_date"),
+				default: erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), true)[1],
 				reqd: 1,
 			},
 			{
 				fieldname: "to_date",
 				label: __("To Date"),
 				fieldtype: "Date",
-				default: frappe.defaults.get_user_default("year_end_date"),
+				default: erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), true)[2],
 				reqd: 1,
 			},
 			{
--- a/erpnext/accounts/report/gross_profit/gross_profit.js
+++ b/erpnext/accounts/report/gross_profit/gross_profit.js
@@ -15,14 +15,14 @@ frappe.query_reports["Gross Profit"] = {
 			fieldname: "from_date",
 			label: __("From Date"),
 			fieldtype: "Date",
-			default: frappe.defaults.get_user_default("year_start_date"),
+			default: erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), true)[1],
 			reqd: 1,
 		},
 		{
 			fieldname: "to_date",
 			label: __("To Date"),
 			fieldtype: "Date",
-			default: frappe.defaults.get_user_default("year_end_date"),
+			default: erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), true)[2],
 			reqd: 1,
 		},
 		{
--- a/erpnext/accounts/report/gross_profit/gross_profit.py
+++ b/erpnext/accounts/report/gross_profit/gross_profit.py
@@ -717,20 +717,22 @@ class GrossProfitGenerator:
 			frappe.qb.from_(purchase_invoice_item)
 			.inner_join(purchase_invoice)
 			.on(purchase_invoice.name == purchase_invoice_item.parent)
-			.select(purchase_invoice_item.base_rate / purchase_invoice_item.conversion_factor)
+			.select(
+				purchase_invoice.name,
+				purchase_invoice_item.base_rate / purchase_invoice_item.conversion_factor,
+			)
 			.where(purchase_invoice.docstatus == 1)
 			.where(purchase_invoice.posting_date <= self.filters.to_date)
 			.where(purchase_invoice_item.item_code == item_code)
 		)

 		if row.project:
-			query.where(purchase_invoice_item.project == row.project)
+			query = query.where(purchase_invoice_item.project == row.project)

 		if row.cost_center:
-			query.where(purchase_invoice_item.cost_center == row.cost_center)
+			query = query.where(purchase_invoice_item.cost_center == row.cost_center)

-		query.orderby(purchase_invoice.posting_date, order=frappe.qb.desc)
-		query.limit(1)
+		query = query.orderby(purchase_invoice.posting_date, order=frappe.qb.desc).limit(1)
 		last_purchase_rate = query.run()

 		return flt(last_purchase_rate[0][0]) if last_purchase_rate else 0
--- a/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js
+++ b/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js
@@ -15,7 +15,7 @@ frappe.query_reports["Payment Period Based On Invoice Date"] = {
 			fieldname: "from_date",
 			label: __("From Date"),
 			fieldtype: "Date",
-			default: frappe.defaults.get_user_default("year_start_date"),
+			default: erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), true)[1],
 		},
 		{
 			fieldname: "to_date",
--- a/erpnext/accounts/report/profitability_analysis/profitability_analysis.js
+++ b/erpnext/accounts/report/profitability_analysis/profitability_analysis.js
@@ -59,13 +59,13 @@ frappe.require("assets/erpnext/js/financial_statements.js", function () {
 				fieldname: "from_date",
 				label: __("From Date"),
 				fieldtype: "Date",
-				default: frappe.defaults.get_user_default("year_start_date"),
+				default: erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), true)[1],
 			},
 			{
 				fieldname: "to_date",
 				label: __("To Date"),
 				fieldtype: "Date",
-				default: frappe.defaults.get_user_default("year_end_date"),
+				default: erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), true)[2],
 			},
 			{
 				fieldname: "show_zero_values",
--- a/erpnext/accounts/report/trial_balance/trial_balance.js
+++ b/erpnext/accounts/report/trial_balance/trial_balance.js
@@ -37,13 +37,13 @@ frappe.require("assets/erpnext/js/financial_statements.js", function () {
 				fieldname: "from_date",
 				label: __("From Date"),
 				fieldtype: "Date",
-				default: frappe.defaults.get_user_default("year_start_date"),
+				default: erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), true)[1],
 			},
 			{
 				fieldname: "to_date",
 				label: __("To Date"),
 				fieldtype: "Date",
-				default: frappe.defaults.get_user_default("year_end_date"),
+				default: erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), true)[2],
 			},
 			{
 				fieldname: "cost_center",
--- a/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.js
+++ b/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.js
@@ -36,13 +36,13 @@ frappe.query_reports["Trial Balance for Party"] = {
 			fieldname: "from_date",
 			label: __("From Date"),
 			fieldtype: "Date",
-			default: frappe.defaults.get_user_default("year_start_date"),
+			default: erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), true)[1],
 		},
 		{
 			fieldname: "to_date",
 			label: __("To Date"),
 			fieldtype: "Date",
-			default: frappe.defaults.get_user_default("year_end_date"),
+			default: erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), true)[2],
 		},
 		{
 			fieldname: "party_type",
--- a/erpnext/accounts/utils.py
+++ b/erpnext/accounts/utils.py
@@ -55,6 +55,9 @@ GL_REPOSTING_CHUNK = 100
 def get_fiscal_year(
 	date=None, fiscal_year=None, label="Date", verbose=1, company=None, as_dict=False, boolean=False
 ):
+	if isinstance(boolean, str):
+		boolean = frappe.json.loads(boolean)
+
 	fiscal_years = get_fiscal_years(
 		date, fiscal_year, label, verbose, company, as_dict=as_dict, boolean=boolean
 	)
--- a/erpnext/buying/doctype/supplier/supplier.json
+++ b/erpnext/buying/doctype/supplier/supplier.json
@@ -402,7 +402,7 @@
  {
   "fieldname": "contact_and_address_tab",
   "fieldtype": "Tab Break",
-   "label": "Contact & Address"
+   "label": "Address & Contact"
  },
  {
   "fieldname": "accounting_tab",
@@ -457,7 +457,7 @@
   "link_fieldname": "party"
  }
 ],
- "modified": "2023-10-19 16:55:15.148325",
+ "modified": "2024-05-08 18:02:57.342931",
 "modified_by": "Administrator",
 "module": "Buying",
 "name": "Supplier",
--- a/erpnext/buying/report/procurement_tracker/procurement_tracker.js
+++ b/erpnext/buying/report/procurement_tracker/procurement_tracker.js
@@ -27,13 +27,13 @@ frappe.query_reports["Procurement Tracker"] = {
 			fieldname: "from_date",
 			label: __("From Date"),
 			fieldtype: "Date",
-			default: frappe.defaults.get_user_default("year_start_date"),
+			default: erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), true)[1],
 		},
 		{
 			fieldname: "to_date",
 			label: __("To Date"),
 			fieldtype: "Date",
-			default: frappe.defaults.get_user_default("year_end_date"),
+			default: erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), true)[2],
 		},
 	],
 };
--- a/erpnext/buying/report/purchase_analytics/purchase_analytics.js
+++ b/erpnext/buying/report/purchase_analytics/purchase_analytics.js
@@ -35,14 +35,14 @@ frappe.query_reports["Purchase Analytics"] = {
 			fieldname: "from_date",
 			label: __("From Date"),
 			fieldtype: "Date",
-			default: frappe.defaults.get_user_default("year_start_date"),
+			default: erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), true)[1],
 			reqd: 1,
 		},
 		{
 			fieldname: "to_date",
 			label: __("To Date"),
 			fieldtype: "Date",
-			default: frappe.defaults.get_user_default("year_end_date"),
+			default: erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), true)[2],
 			reqd: 1,
 		},
 		{
--- a/erpnext/crm/report/campaign_efficiency/campaign_efficiency.js
+++ b/erpnext/crm/report/campaign_efficiency/campaign_efficiency.js
@@ -6,13 +6,13 @@ frappe.query_reports["Campaign Efficiency"] = {
 			fieldname: "from_date",
 			label: __("From Date"),
 			fieldtype: "Date",
-			default: frappe.defaults.get_user_default("year_start_date"),
+			default: erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), true)[1],
 		},
 		{
 			fieldname: "to_date",
 			label: __("To Date"),
 			fieldtype: "Date",
-			default: frappe.defaults.get_user_default("year_end_date"),
+			default: erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), true)[2],
 		},
 	],
 };
--- a/erpnext/crm/report/lead_owner_efficiency/lead_owner_efficiency.js
+++ b/erpnext/crm/report/lead_owner_efficiency/lead_owner_efficiency.js
@@ -6,13 +6,13 @@ frappe.query_reports["Lead Owner Efficiency"] = {
 			fieldname: "from_date",
 			label: __("From Date"),
 			fieldtype: "Date",
-			default: frappe.defaults.get_user_default("year_start_date"),
+			default: erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), true)[1],
 		},
 		{
 			fieldname: "to_date",
 			label: __("To Date"),
 			fieldtype: "Date",
-			default: frappe.defaults.get_user_default("year_end_date"),
+			default: erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), true)[2],
 		},
 	],
 };
--- a/erpnext/manufacturing/report/job_card_summary/job_card_summary.js
+++ b/erpnext/manufacturing/report/job_card_summary/job_card_summary.js
@@ -37,14 +37,14 @@ frappe.query_reports["Job Card Summary"] = {
 			label: __("From Posting Date"),
 			fieldname: "from_date",
 			fieldtype: "Date",
-			default: frappe.defaults.get_user_default("year_start_date"),
+			default: erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), true)[1],
 			reqd: 1,
 		},
 		{
 			label: __("To Posting Date"),
 			fieldname: "to_date",
 			fieldtype: "Date",
-			default: frappe.defaults.get_user_default("year_end_date"),
+			default: erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), true)[2],
 			reqd: 1,
 		},
 		{
--- a/erpnext/manufacturing/report/production_analytics/production_analytics.js
+++ b/erpnext/manufacturing/report/production_analytics/production_analytics.js
@@ -16,14 +16,14 @@ frappe.query_reports["Production Analytics"] = {
 			fieldname: "from_date",
 			label: __("From Date"),
 			fieldtype: "Date",
-			default: frappe.defaults.get_user_default("year_start_date"),
+			default: erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), true)[1],
 			reqd: 1,
 		},
 		{
 			fieldname: "to_date",
 			label: __("To Date"),
 			fieldtype: "Date",
-			default: frappe.defaults.get_user_default("year_end_date"),
+			default: erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), true)[2],
 			reqd: 1,
 		},
 		{
--- a/erpnext/public/js/utils.js
+++ b/erpnext/public/js/utils.js
@@ -410,11 +410,13 @@ $.extend(erpnext.utils, {
 			method: "erpnext.accounts.utils.get_fiscal_year",
 			args: {
 				date: date,
+				boolean: boolean,
 			},
 			async: false,
 			callback: function (r) {
 				if (r.message) {
-					fiscal_year = r.message[0];
+					if (with_dates) fiscal_year = r.message;
+					else fiscal_year = r.message[0];
 				}
 			},
 		});
--- a/erpnext/selling/doctype/customer/customer.json
+++ b/erpnext/selling/doctype/customer/customer.json
@@ -481,7 +481,7 @@
  {
   "fieldname": "contact_and_address_tab",
   "fieldtype": "Tab Break",
-   "label": "Contact & Address"
+   "label": "Address & Contact"
  },
  {
   "fieldname": "defaults_tab",
@@ -567,7 +567,7 @@
   "link_fieldname": "party"
  }
 ],
- "modified": "2023-12-28 13:15:36.298369",
+ "modified": "2024-05-08 18:03:20.716169",
 "modified_by": "Administrator",
 "module": "Selling",
 "name": "Customer",
--- a/erpnext/selling/doctype/quotation/quotation.js
+++ b/erpnext/selling/doctype/quotation/quotation.js
@@ -45,6 +45,8 @@ frappe.ui.form.on('Quotation', {
 		frm.trigger("set_label");
 		frm.trigger("toggle_reqd_lead_customer");
 		frm.trigger("set_dynamic_field_label");
+		frm.set_value("party_name", "");
+		frm.set_value("customer_name", "");
 	},

 	set_label: function(frm) {
@@ -71,7 +73,7 @@ erpnext.selling.QuotationController = class QuotationController extends erpnext.
 		frappe.dynamic_link = {
 			doc: this.frm.doc,
 			fieldname: 'party_name',
-			doctype: doc.quotation_to == 'Customer' ? 'Customer' : 'Lead',
+			doctype: doc.quotation_to,
 		};

 		var me = this;
@@ -170,6 +172,7 @@ erpnext.selling.QuotationController = class QuotationController extends erpnext.
 			}
 		} else if (this.frm.doc.quotation_to == "Prospect") {
 			this.frm.set_df_property("party_name", "label", "Prospect");
+			this.frm.fields_dict.party_name.get_query = null;
 		}
 	}

--- a/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.js
+++ b/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.js
@@ -23,14 +23,14 @@ frappe.query_reports["Customer Acquisition and Loyalty"] = {
 			fieldname: "from_date",
 			label: __("From Date"),
 			fieldtype: "Date",
-			default: frappe.defaults.get_user_default("year_start_date"),
+			default: erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), true)[1],
 			reqd: 1,
 		},
 		{
 			fieldname: "to_date",
 			label: __("To Date"),
 			fieldtype: "Date",
-			default: frappe.defaults.get_user_default("year_end_date"),
+			default: erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), true)[2],
 			reqd: 1,
 		},
 	],
--- a/erpnext/selling/report/sales_analytics/sales_analytics.js
+++ b/erpnext/selling/report/sales_analytics/sales_analytics.js
@@ -43,14 +43,14 @@ frappe.query_reports["Sales Analytics"] = {
 			fieldname: "from_date",
 			label: __("From Date"),
 			fieldtype: "Date",
-			default: frappe.defaults.get_user_default("year_start_date"),
+			default: erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), true)[1],
 			reqd: 1,
 		},
 		{
 			fieldname: "to_date",
 			label: __("To Date"),
 			fieldtype: "Date",
-			default: frappe.defaults.get_user_default("year_end_date"),
+			default: erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), true)[2],
 			reqd: 1,
 		},
 		{
--- a/erpnext/selling/report/sales_person_commission_summary/sales_person_commission_summary.js
+++ b/erpnext/selling/report/sales_person_commission_summary/sales_person_commission_summary.js
@@ -21,7 +21,7 @@ frappe.query_reports["Sales Person Commission Summary"] = {
 			fieldname: "from_date",
 			label: __("From Date"),
 			fieldtype: "Date",
-			default: frappe.defaults.get_user_default("year_start_date"),
+			default: erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), true)[1],
 		},
 		{
 			fieldname: "to_date",
--- a/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.js
+++ b/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.js
@@ -20,7 +20,7 @@ frappe.query_reports["Sales Person-wise Transaction Summary"] = {
 			fieldname: "from_date",
 			label: __("From Date"),
 			fieldtype: "Date",
-			default: frappe.defaults.get_user_default("year_start_date"),
+			default: erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), true)[1],
 		},
 		{
 			fieldname: "to_date",
--- a/erpnext/setup/doctype/authorization_rule/authorization_rule.py
+++ b/erpnext/setup/doctype/authorization_rule/authorization_rule.py
@@ -53,8 +53,6 @@ class AuthorizationRule(Document):
 			frappe.throw(_("Discount must be less than 100"))
 		elif self.based_on == "Customerwise Discount" and not self.master_name:
 			frappe.throw(_("Customer required for 'Customerwise Discount'"))
-		else:
-			self.based_on = "Not Applicable"

 	def validate(self):
 		self.check_duplicate_entry()
--- a/erpnext/stock/doctype/delivery_trip/delivery_trip.js
+++ b/erpnext/stock/doctype/delivery_trip/delivery_trip.js
@@ -51,7 +51,6 @@ frappe.ui.form.on("Delivery Trip", {
 			frm.add_custom_button(
 				__("Delivery Note"),
 				() => {
-					frm.clear_table("delivery_stops");
 					erpnext.utils.map_current_doc({
 						method: "erpnext.stock.doctype.delivery_note.delivery_note.make_delivery_trip",
 						source_doctype: "Delivery Note",
--- a/erpnext/stock/doctype/item/item.js
+++ b/erpnext/stock/doctype/item/item.js
@@ -15,6 +15,9 @@ frappe.ui.form.on("Item", {
 		frm.add_fetch("tax_type", "tax_rate", "tax_rate");

 		frm.make_methods = {
+			Quotation: () => {
+				open_form(frm, "Quotation", "Quotation Item", "items");
+			},
 			"Sales Order": () => {
 				open_form(frm, "Sales Order", "Sales Order Item", "items");
 			},
--- a/erpnext/stock/doctype/pick_list/pick_list.json
+++ b/erpnext/stock/doctype/pick_list/pick_list.json
@@ -18,6 +18,7 @@
  "parent_warehouse",
  "consider_rejected_warehouses",
  "get_item_locations",
+  "pick_manually",
  "section_break_6",
  "scan_barcode",
  "column_break_13",
@@ -192,11 +193,18 @@
   "fieldname": "consider_rejected_warehouses",
   "fieldtype": "Check",
   "label": "Consider Rejected Warehouses"
+  },
+  {
+   "default": "0",
+   "description": "If enabled then system won't override the picked qty / batches / serial numbers.",
+   "fieldname": "pick_manually",
+   "fieldtype": "Check",
+   "label": "Pick Manually"
  }
 ],
 "is_submittable": 1,
 "links": [],
- "modified": "2024-01-24 17:05:20.317180",
+ "modified": "2024-03-27 22:49:16.954637",
 "modified_by": "Administrator",
 "module": "Stock",
 "name": "Pick List",
@@ -268,4 +276,4 @@
 "sort_order": "DESC",
 "states": [],
 "track_changes": 1
-}
+}
--- a/erpnext/stock/doctype/pick_list/pick_list.py
+++ b/erpnext/stock/doctype/pick_list/pick_list.py
@@ -29,7 +29,8 @@ class PickList(Document):

 	def before_save(self):
 		self.update_status()
-		self.set_item_locations()
+		if not self.pick_manually:
+			self.set_item_locations()

 		if self.get("locations"):
 			self.validate_sales_order_percentage()
--- a/erpnext/stock/doctype/pick_list_item/pick_list_item.json
+++ b/erpnext/stock/doctype/pick_list_item/pick_list_item.json
@@ -126,7 +126,8 @@
   "in_list_view": 1,
   "label": "Item",
   "options": "Item",
-   "reqd": 1
+   "reqd": 1,
+   "search_index": 1
  },
  {
   "fieldname": "quantity_section",
@@ -193,7 +194,7 @@
 ],
 "istable": 1,
 "links": [],
- "modified": "2023-07-25 11:56:23.361867",
+ "modified": "2024-05-07 15:32:42.905446",
 "modified_by": "Administrator",
 "module": "Stock",
 "name": "Pick List Item",
@@ -204,4 +205,4 @@
 "sort_order": "DESC",
 "states": [],
 "track_changes": 1
-}
+}
--- a/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py
+++ b/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py
@@ -29,8 +29,15 @@ def execute(filters=None):

 	sle_count = _estimate_table_row_count("Stock Ledger Entry")

-	if sle_count > SLE_COUNT_LIMIT and not filters.get("item_code") and not filters.get("warehouse"):
-		frappe.throw(_("Please select either the Item or Warehouse filter to generate the report."))
+	if (
+		sle_count > SLE_COUNT_LIMIT
+		and not filters.get("item_code")
+		and not filters.get("warehouse")
+		and not filters.get("warehouse_type")
+	):
+		frappe.throw(
+			_("Please select either the Item or Warehouse or Warehouse Type filter to generate the report.")
+		)

 	if filters.from_date > filters.to_date:
 		frappe.throw(_("From Date must be before To Date"))
--- a/erpnext/stock/report/incorrect_serial_no_valuation/incorrect_serial_no_valuation.js
+++ b/erpnext/stock/report/incorrect_serial_no_valuation/incorrect_serial_no_valuation.js
@@ -22,14 +22,14 @@ frappe.query_reports["Incorrect Serial No Valuation"] = {
 			fieldtype: "Date",
 			fieldname: "from_date",
 			reqd: 1,
-			default: frappe.defaults.get_user_default("year_start_date"),
+			default: erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), true)[1],
 		},
 		{
 			label: __("To Date"),
 			fieldtype: "Date",
 			fieldname: "to_date",
 			reqd: 1,
-			default: frappe.defaults.get_user_default("year_end_date"),
+			default: erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), true)[2],
 		},
 	],
 };
--- a/erpnext/stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.py
+++ b/erpnext/stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.py
@@ -56,13 +56,14 @@ def execute(filters=None):
 		item_value.setdefault((item, item_map[item]["item_group"]), [])
 		item_value[(item, item_map[item]["item_group"])].append(total_stock_value)

+	itemwise_brand = frappe._dict(get_itemwise_brand(items))
 	# sum bal_qty by item
 	for (item, item_group), wh_balance in item_balance.items():
 		if not item_ageing.get(item):
 			continue

 		total_stock_value = sum(item_value[(item, item_group)])
-		row = [item, item_map[item]["item_name"], item_group, total_stock_value]
+		row = [item, item_map[item]["item_name"], item_group, itemwise_brand.get(item), total_stock_value]

 		fifo_queue = item_ageing[item]["fifo_queue"]
 		average_age = 0.00
@@ -85,6 +86,10 @@ def execute(filters=None):
 	return columns, data


+def get_itemwise_brand(items):
+	return frappe.get_all("Item", filters={"name": ("in", items)}, fields=["name", "brand"], as_list=1)
+
+
 def get_columns(filters):
 	"""return columns"""

@@ -92,6 +97,7 @@ def get_columns(filters):
 		_("Item") + ":Link/Item:150",
 		_("Item Name") + ":Link/Item:150",
 		_("Item Group") + "::120",
+		_("Brand") + ":Link/Brand:120",
 		_("Value") + ":Currency:120",
 		_("Age") + ":Float:120",
 	]
--- a/erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py
+++ b/erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py
@@ -8,6 +8,7 @@ from frappe.utils import cint, flt, getdate, nowdate
 import erpnext
 from erpnext.accounts.utils import get_account_currency
 from erpnext.controllers.subcontracting_controller import SubcontractingController
+from erpnext.stock.utils import get_incoming_rate


 class SubcontractingReceipt(SubcontractingController):
@@ -67,6 +68,7 @@ class SubcontractingReceipt(SubcontractingController):
 		self.set_items_bom()
 		self.set_items_cost_center()
 		self.set_items_expense_account()
+		self.reset_rate_for_serial_batch_supplied_items()

 	def validate(self):
 		if (
@@ -124,6 +126,26 @@ class SubcontractingReceipt(SubcontractingController):
 		self.calculate_supplied_items_qty_and_amount()
 		self.calculate_items_qty_and_amount()

+	def reset_rate_for_serial_batch_supplied_items(self):
+		for item in self.supplied_items:
+			if item.serial_no or item.batch_no:
+				args = frappe._dict(
+					{
+						"item_code": item.rm_item_code,
+						"warehouse": self.supplier_warehouse,
+						"posting_date": self.posting_date,
+						"posting_time": self.posting_time,
+						"qty": flt(item.consumed_qty),
+						"serial_no": item.serial_no,
+						"batch_no": item.batch_no,
+						"voucher_type": self.doctype,
+						"voucher_no": self.name,
+						"company": self.company,
+						"allow_zero_valuation": 1,
+					}
+				)
+				item.rate = get_incoming_rate(args)
+
 	def has_serial_batch_items(self):
 		if not self.get("supplied_items"):
 			return False
Author	SHA1	Message	Date
Frappe PR Bot	dfaca93292	chore(release): Bumped to Version 14.70.0 # [14.70.0](https://github.com/frappe/erpnext/compare/v14.69.1...v14.70.0) (2024-05-15) ### Bug Fixes * "Based on" field always has the value "Not applicable" ([`1078a98`](`1078a98cce`)) * address filter and quotation to for prospect ([`c9e7f45`](`c9e7f450c5`)) * address filter and quotation to for prospect ([`6902780`](`690278042d`)) * address filter and quotation to for prospect ([`754e193`](`754e193c76`)) * consistent use of "Address & Contact" (backport [#41386](https://github.com/frappe/erpnext/issues/41386)) ([#41387](https://github.com/frappe/erpnext/issues/41387)) ([`256d6a4`](`256d6a47ac`)) * data getting override in delivery trip (backport [#41431](https://github.com/frappe/erpnext/issues/41431)) ([#41432](https://github.com/frappe/erpnext/issues/41432)) ([`5366356`](`5366356400`)) * Default dates in report ([`c3244f0`](`c3244f009b`)) * default fiscal year ([`7a380f5`](`7a380f584d`)) * Duplicate party name column in AR/AP report ([`a8be5f0`](`a8be5f0789`)) * PSOA ageing ([`e69e540`](`e69e5404d3`)) ### Features * allow to pick manually qty / batches / serial nos (backport [#40723](https://github.com/frappe/erpnext/issues/40723)) ([#41435](https://github.com/frappe/erpnext/issues/41435)) ([`7b28d7d`](`7b28d7d2b8`))	2024-05-15 05:12:14 +00:00
Deepesh Garg	40de3f3481	Merge pull request #41458 from frappe/version-14-hotfix chore: release v14	2024-05-15 10:40:58 +05:30
Deepesh Garg	fc2614612b	Merge pull request #41466 from frappe/mergify/bp/version-14-hotfix/pr-41258 fix: PSOA ageing (#41258)	2024-05-14 21:19:17 +05:30
Deepesh Garg	e69e5404d3	fix: PSOA ageing (cherry picked from commit `fed2d11905`)	2024-05-14 14:40:36 +00:00
Nabin Hait	14ec6351ae	Merge pull request #41448 from frappe/mergify/bp/version-14-hotfix/pr-41412 fix: Duplicate party name column in AR/AP report (backport #41412)	2024-05-14 20:02:56 +05:30
Deepesh Garg	a8be5f0789	fix: Duplicate party name column in AR/AP report (cherry picked from commit `7501fe8ebd`)	2024-05-14 02:53:49 +00:00
Deepesh Garg	42312c5bba	Merge pull request #41170 from deepeshgarg007/default_dates_in_reports fix: Default dates in report	2024-05-14 08:21:51 +05:30
mergify[bot]	7b28d7d2b8	feat: allow to pick manually qty / batches / serial nos (backport #40723 ) (#41435 ) * feat: allow to pick manually qty / batches / serial nos (cherry picked from commit `50dd9fa8a3`) # Conflicts: # erpnext/stock/doctype/pick_list/pick_list.json # erpnext/stock/doctype/pick_list/pick_list.py * chore: fix conflicts * chore: fix conflicts --------- Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com>	2024-05-13 21:37:13 +05:30
mergify[bot]	5366356400	fix: data getting override in delivery trip (backport #41431 ) (#41432 ) fix: data getting override in delivery trip (#41431) fix: data getting override (cherry picked from commit `663fcb374d`) Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>	2024-05-13 16:31:34 +05:30
Deepesh Garg	7a380f584d	fix: default fiscal year	2024-05-11 17:51:53 +05:30
mergify[bot]	256d6a47ac	fix: consistent use of "Address & Contact" (backport #41386 ) (#41387 ) Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com> fix: consistent use of "Address & Contact" (#41386)	2024-05-10 17:42:27 +02:00
Akhil Narang	67e06615a3	Merge pull request #41406 from frappe/mergify/bp/version-14-hotfix/pr-37031 fix: "Based on" field always has the value "Not applicable" (backport #37031)	2024-05-10 16:44:33 +05:30
HarryPaulo	1078a98cce	fix: "Based on" field always has the value "Not applicable" (cherry picked from commit `fae640c56f`)	2024-05-10 11:13:03 +00:00
ruthra kumar	d87ffae03f	Merge pull request #41394 from frappe/mergify/bp/version-14-hotfix/pr-41040 fix: address filter and quotation to for prospect (backport #41040)	2024-05-09 12:48:48 +05:30
ruthra kumar	0404941fb2	chore: resolve conflict	2024-05-09 12:21:29 +05:30
ruthra kumar	c4dfcbec96	refactor: make use of doc.quotation_to (cherry picked from commit `754c7f6d1c`) # Conflicts: # erpnext/selling/doctype/quotation/quotation.js	2024-05-09 06:45:53 +00:00
Nihantra Patel	c9e7f450c5	fix: address filter and quotation to for prospect (cherry picked from commit `2896e3666c`)	2024-05-09 06:45:53 +00:00
Nihantra Patel	690278042d	fix: address filter and quotation to for prospect (cherry picked from commit `24a68a79df`)	2024-05-09 06:45:52 +00:00
Nihantra Patel	754e193c76	fix: address filter and quotation to for prospect (cherry picked from commit `fe5b88522e`) # Conflicts: # erpnext/selling/doctype/quotation/quotation.js	2024-05-09 06:45:52 +00:00
Frappe PR Bot	9d5e4b3b3a	chore(release): Bumped to Version 14.69.1 ## [14.69.1](https://github.com/frappe/erpnext/compare/v14.69.0...v14.69.1) (2024-05-09) ### Bug Fixes * added brand column in Warehouse wise Item Balance Age and Value … (backport [#41280](https://github.com/frappe/erpnext/issues/41280)) ([#41281](https://github.com/frappe/erpnext/issues/41281)) ([`d727c52`](`d727c52421`)) * Cost center not getting saved in PSOA ([`e82ea12`](`e82ea12cbc`)) * filter validation for batch-wise balance history report (backport [#41356](https://github.com/frappe/erpnext/issues/41356)) ([#41360](https://github.com/frappe/erpnext/issues/41360)) ([`339256b`](`339256bc71`)) * incorrect query for Purchase Invoice rate in GP ([`93b30d9`](`93b30d9f11`)) * missing Item Name on Save for Quotation created from Item (backport [#41233](https://github.com/frappe/erpnext/issues/41233)) ([#41303](https://github.com/frappe/erpnext/issues/41303)) ([`a26ae64`](`a26ae64385`)) * pricing rule rounding ([`d2ce927`](`d2ce927891`)) * reset rate for serial batch supplied items ([#41293](https://github.com/frappe/erpnext/issues/41293)) ([`cd33199`](`cd33199da2`)) ### Performance Improvements * index on item code for the Pick List Item doctype (backport [#41357](https://github.com/frappe/erpnext/issues/41357)) ([#41362](https://github.com/frappe/erpnext/issues/41362)) ([`4647ec8`](`4647ec8892`))	2024-05-09 05:30:06 +00:00
ruthra kumar	d7709cf4e4	Merge pull request #41354 from frappe/version-14-hotfix chore: release v14	2024-05-09 10:58:39 +05:30
mergify[bot]	4647ec8892	perf: index on item code for the Pick List Item doctype (backport #41357 ) (#41362 ) * perf: index on item code for the Pick List Item doctype (#41357) (cherry picked from commit `0887161f2a`) # Conflicts: # erpnext/stock/doctype/pick_list_item/pick_list_item.json * chore: fix conflicts --------- Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>	2024-05-08 11:38:02 +05:30
mergify[bot]	339256bc71	fix: filter validation for batch-wise balance history report (backport #41356 ) (#41360 ) fix: filter validation for batch-wise balance history report (#41356) fix: filter validation for batchwise balance history report (cherry picked from commit `544fc60093`) Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>	2024-05-08 00:15:33 +05:30
ruthra kumar	c3d567b291	Merge pull request #41348 from frappe/mergify/bp/version-14-hotfix/pr-41288 fix: pricing rule rounding (backport #41288)	2024-05-07 10:32:20 +05:30
ruthra kumar	e068bec212	refactor(test): test floor based rounding (cherry picked from commit `c41a037174`)	2024-05-07 04:32:04 +00:00
ruthra kumar	d2ce927891	fix: pricing rule rounding Consider a pricing rule of 20:1 with recursion enabled, free items should follow the below progression \| Qty \| Free item qty \| \|-------+---------------\| \| 0-19 \| 0 \| \| 20-39 \| 1 \| \| 40-59 \| 2 \| (cherry picked from commit `9bf37426c1`)	2024-05-07 04:32:03 +00:00
mergify[bot]	a26ae64385	fix: missing Item Name on Save for Quotation created from Item (backport #41233 ) (#41303 ) fix: missing Item Name on Save for Quotation created from Item (#41233) * fix: missing Item Name on Save for Quotation created from Item * fix: missing Item Name on Save for Quotation created from Item (cherry picked from commit `c8e92cb1b2`) Co-authored-by: HENRY Florian <florian.henry@open-concept.pro>	2024-05-06 21:46:18 +05:30
s-aga-r	cd33199da2	fix: reset rate for serial batch supplied items (#41293 )	2024-05-06 21:37:27 +05:30
ruthra kumar	27100401aa	Merge pull request #41336 from frappe/mergify/bp/version-14-hotfix/pr-41334 fix: incorrect query for Purchase Invoice rate in GP (backport #41334)	2024-05-06 13:17:58 +05:30
ruthra kumar	93b30d9f11	fix: incorrect query for Purchase Invoice rate in GP (cherry picked from commit `bd8382c592`)	2024-05-06 07:24:49 +00:00
Deepesh Garg	904f369e99	Merge pull request #41324 from frappe/mergify/bp/version-14-hotfix/pr-41318 fix: Cost center not getting saved in PSOA (#41318)	2024-05-06 12:25:14 +05:30
Deepesh Garg	7b9c22775c	chore: resolve conflicts	2024-05-06 11:52:26 +05:30
Deepesh Garg	6aa8d5fb4b	chore: resolve conflicts	2024-05-06 11:29:53 +05:30
Deepesh Garg	e82ea12cbc	fix: Cost center not getting saved in PSOA (cherry picked from commit `58f7039630`) # Conflicts: # erpnext/accounts/doctype/psoa_cost_center/psoa_cost_center.json # erpnext/accounts/doctype/psoa_cost_center/psoa_cost_center.py	2024-05-04 08:26:55 +00:00
mergify[bot]	d727c52421	fix: added brand column in Warehouse wise Item Balance Age and Value … (backport #41280 ) (#41281 ) fix: added brand column in Warehouse wise Item Balance Age and Value … (#41280) fix: added brand coulmn in Warehouse wise Item Balance Age and Value report (cherry picked from commit `1cbc200770`) Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>	2024-05-03 17:53:52 +05:30
Deepesh Garg	ff8dba1cb7	Merge branch 'version-14-hotfix' of https://github.com/frappe/erpnext into default_dates_in_reports	2024-04-24 17:20:55 +05:30
Deepesh Garg	c3244f009b	fix: Default dates in report	2024-04-24 16:59:51 +05:30