chore(release): Bumped to Version 14.65.8

## [14.65.8](https://github.com/frappe/erpnext/compare/v14.65.7...v14.65.8) (2024-03-25) ### Bug Fixes * reset update outstanding flag for old records ([73c534c](73c534cf1a))
Merge pull request #40644 from frappe/mergify/bp/version-14/pr-40622
2026-07-02 05:06:58 +00:00 · 2024-03-25 02:57:34 +00:00 · 2024-03-25 08:26:21 +05:30 · 2024-03-25 07:47:20 +05:30 · 2024-03-25 07:47:16 +05:30 · 2024-03-22 10:32:42 +00:00
14 changed files with 38 additions and 23 deletions
--- a/erpnext/init.py
+++ b/erpnext/init.py
@@ -3,7 +3,7 @@ import inspect

 import frappe

-__version__ = "14.65.4"
+__version__ = "14.65.8"


 def get_default_company(user=None):
--- a/erpnext/accounts/doctype/pos_invoice/pos_invoice.json
+++ b/erpnext/accounts/doctype/pos_invoice/pos_invoice.json
@@ -774,7 +774,7 @@
  },
  {
   "fieldname": "other_charges_calculation",
-   "fieldtype": "Long Text",
+   "fieldtype": "Text Editor",
   "label": "Taxes and Charges Calculation",
   "no_copy": 1,
   "oldfieldtype": "HTML",
@@ -1562,7 +1562,7 @@
 "icon": "fa fa-file-text",
 "is_submittable": 1,
 "links": [],
- "modified": "2023-11-20 12:27:12.848149",
+ "modified": "2024-03-20 16:00:34.268756",
 "modified_by": "Administrator",
 "module": "Accounts",
 "name": "POS Invoice",
--- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
+++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
@@ -756,7 +756,7 @@
  },
  {
   "fieldname": "other_charges_calculation",
-   "fieldtype": "Long Text",
+   "fieldtype": "Text Editor",
   "label": "Taxes and Charges Calculation",
   "no_copy": 1,
   "oldfieldtype": "HTML",
@@ -1619,7 +1619,7 @@
 "idx": 204,
 "is_submittable": 1,
 "links": [],
- "modified": "2024-03-11 14:46:30.298184",
+ "modified": "2024-03-20 15:57:00.736868",
 "modified_by": "Administrator",
 "module": "Accounts",
 "name": "Purchase Invoice",
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
@@ -943,7 +943,7 @@
  },
  {
   "fieldname": "other_charges_calculation",
-   "fieldtype": "Long Text",
+   "fieldtype": "Text Editor",
   "hide_days": 1,
   "hide_seconds": 1,
   "label": "Taxes and Charges Calculation",
@@ -2170,7 +2170,8 @@
   "fieldname": "update_outstanding_for_self",
   "fieldtype": "Check",
   "label": "Update Outstanding for Self",
-   "no_copy": 1
+   "no_copy": 1,
+   "print_hide": 1
  }
 ],
 "icon": "fa fa-file-text",
@@ -2183,7 +2184,7 @@
   "link_fieldname": "consolidated_invoice"
  }
 ],
- "modified": "2024-03-15 16:44:17.778370",
+ "modified": "2024-03-22 17:50:34.395602",
 "modified_by": "Administrator",
 "module": "Accounts",
 "name": "Sales Invoice",
@@ -2238,4 +2239,4 @@
 "title_field": "title",
 "track_changes": 1,
 "track_seen": 1
-}
+}
--- a/erpnext/buying/doctype/purchase_order/purchase_order.json
+++ b/erpnext/buying/doctype/purchase_order/purchase_order.json
@@ -639,7 +639,7 @@
  },
  {
   "fieldname": "other_charges_calculation",
-   "fieldtype": "Long Text",
+   "fieldtype": "Text Editor",
   "label": "Taxes and Charges Calculation",
   "no_copy": 1,
   "oldfieldtype": "HTML",
@@ -1273,7 +1273,7 @@
 "idx": 105,
 "is_submittable": 1,
 "links": [],
- "modified": "2023-10-01 20:58:07.851037",
+ "modified": "2024-03-20 16:03:31.611808",
 "modified_by": "Administrator",
 "module": "Buying",
 "name": "Purchase Order",
--- a/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
+++ b/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
@@ -461,7 +461,7 @@
  },
  {
   "fieldname": "other_charges_calculation",
-   "fieldtype": "Long Text",
+   "fieldtype": "Markdown Editor",
   "label": "Taxes and Charges Calculation",
   "no_copy": 1,
   "oldfieldtype": "HTML",
@@ -927,7 +927,7 @@
 "index_web_pages_for_search": 1,
 "is_submittable": 1,
 "links": [],
- "modified": "2023-11-20 11:15:30.083077",
+ "modified": "2024-03-20 16:03:59.069145",
 "modified_by": "Administrator",
 "module": "Buying",
 "name": "Supplier Quotation",
--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@@ -354,7 +354,7 @@ execute:frappe.db.set_single_value("Buying Settings", "project_update_frequency"
 erpnext.patches.v14_0.clear_reconciliation_values_from_singles
 erpnext.patches.v14_0.update_total_asset_cost_field
 erpnext.patches.v14_0.create_accounting_dimensions_in_reconciliation_tool
-erpnext.patches.v14_0.update_flag_for_return_invoices
+erpnext.patches.v14_0.update_flag_for_return_invoices #2024-03-22
 # below migration patch should always run last
 erpnext.patches.v14_0.migrate_gl_to_payment_ledger
 erpnext.stock.doctype.delivery_note.patches.drop_unused_return_against_index # 2023-12-20
--- a/erpnext/patches/v14_0/update_flag_for_return_invoices.py
+++ b/erpnext/patches/v14_0/update_flag_for_return_invoices.py
@@ -12,6 +12,10 @@ def execute():
 	creation_date = "2024-01-25"

 	si = qb.DocType("Sales Invoice")
+
+	# unset flag, as migration would have set it for all records, as the field was introduced with default '1'
+	qb.update(si).set(si.update_outstanding_for_self, False).run()
+
 	if cr_notes := (
 		qb.from_(si)
 		.select(si.name)
@@ -37,6 +41,10 @@ def execute():
 			).run()

 	pi = qb.DocType("Purchase Invoice")
+
+	# unset flag, as migration would have set it for all records, as the field was introduced with default '1'
+	qb.update(pi).set(pi.update_outstanding_for_self, False).run()
+
 	if dr_notes := (
 		qb.from_(pi)
 		.select(pi.name)
--- a/erpnext/public/scss/erpnext.scss
+++ b/erpnext/public/scss/erpnext.scss
@@ -496,3 +496,7 @@ body[data-route="pos"] {
 .exercise-col {
 	padding: 10px;
 }
+
+.frappe-control[data-fieldname="other_charges_calculation"] .ql-editor {
+	white-space: normal;
+}
--- a/erpnext/selling/doctype/quotation/quotation.json
+++ b/erpnext/selling/doctype/quotation/quotation.json
@@ -556,7 +556,7 @@
  },
  {
   "fieldname": "other_charges_calculation",
-   "fieldtype": "Long Text",
+   "fieldtype": "Text Editor",
   "label": "Taxes and Charges Calculation",
   "no_copy": 1,
   "oldfieldtype": "HTML",
@@ -1072,7 +1072,7 @@
 "idx": 82,
 "is_submittable": 1,
 "links": [],
- "modified": "2023-04-14 16:50:44.550098",
+ "modified": "2024-03-20 16:04:21.567847",
 "modified_by": "Administrator",
 "module": "Selling",
 "name": "Quotation",
--- a/erpnext/selling/doctype/sales_order/sales_order.json
+++ b/erpnext/selling/doctype/sales_order/sales_order.json
@@ -774,7 +774,7 @@
  },
  {
   "fieldname": "other_charges_calculation",
-   "fieldtype": "Long Text",
+   "fieldtype": "Text Editor",
   "hide_days": 1,
   "hide_seconds": 1,
   "label": "Taxes and Charges Calculation",
@@ -1631,7 +1631,7 @@
 "idx": 105,
 "is_submittable": 1,
 "links": [],
- "modified": "2023-10-18 12:41:54.813462",
+ "modified": "2024-03-20 16:04:43.627183",
 "modified_by": "Administrator",
 "module": "Selling",
 "name": "Sales Order",
--- a/erpnext/stock/doctype/delivery_note/delivery_note.json
+++ b/erpnext/stock/doctype/delivery_note/delivery_note.json
@@ -680,7 +680,7 @@
  },
  {
   "fieldname": "other_charges_calculation",
-   "fieldtype": "Long Text",
+   "fieldtype": "Text Editor",
   "label": "Taxes and Charges Calculation",
   "no_copy": 1,
   "oldfieldtype": "HTML",
@@ -1401,7 +1401,7 @@
 "idx": 146,
 "is_submittable": 1,
 "links": [],
- "modified": "2023-12-18 17:19:39.368239",
+ "modified": "2024-03-20 16:05:02.854990",
 "modified_by": "Administrator",
 "module": "Stock",
 "name": "Delivery Note",
--- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
+++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
@@ -649,7 +649,7 @@
  },
  {
   "fieldname": "other_charges_calculation",
-   "fieldtype": "Long Text",
+   "fieldtype": "Text Editor",
   "label": "Taxes and Charges Calculation",
   "no_copy": 1,
   "oldfieldtype": "HTML",
@@ -1242,7 +1242,7 @@
 "idx": 261,
 "is_submittable": 1,
 "links": [],
- "modified": "2023-12-18 17:26:41.279663",
+ "modified": "2024-03-20 16:05:31.713453",
 "modified_by": "Administrator",
 "module": "Stock",
 "name": "Purchase Receipt",
--- a/erpnext/stock/get_item_details.py
+++ b/erpnext/stock/get_item_details.py
@@ -859,7 +859,9 @@ def get_price_list_rate(args, item_doc, out=None):
 		):
 			if args.price_list and args.rate:
 				insert_item_price(args)
-			return out
+
+			if not price_list_rate:
+				return out

 		out.price_list_rate = (
 			flt(price_list_rate) * flt(args.plc_conversion_rate) / flt(args.conversion_rate)
Author	SHA1	Message	Date
Frappe PR Bot	cf770e784d	chore(release): Bumped to Version 14.65.8 ## [14.65.8](https://github.com/frappe/erpnext/compare/v14.65.7...v14.65.8) (2024-03-25) ### Bug Fixes * reset update outstanding flag for old records ([`73c534c`](`73c534cf1a`))	2024-03-25 02:57:34 +00:00
ruthra kumar	fda9c03d4d	Merge pull request #40644 from frappe/mergify/bp/version-14/pr-40622 fix: reset update_outstanding_for_self flag for old records (backport #40622)	2024-03-25 08:26:21 +05:30
ruthra kumar	adec93de18	refactor: hide on print formats (cherry picked from commit `fdcdc8a56e`)	2024-03-25 07:47:20 +05:30
ruthra kumar	73c534cf1a	fix: reset update outstanding flag for old records (cherry picked from commit `a88bf8419e`)	2024-03-25 07:47:16 +05:30
Frappe PR Bot	1c6f5b6525	chore(release): Bumped to Version 14.65.7 ## [14.65.7](https://github.com/frappe/erpnext/compare/v14.65.6...v14.65.7) (2024-03-22) ### Bug Fixes * rate reset to zero ([`e09b3ad`](`e09b3ad720`))	2024-03-22 10:32:42 +00:00
rohitwaghchaure	a6b887312b	Merge pull request #40620 from frappe/mergify/bp/version-14/pr-40618 fix: rate reset to zero (backport #40616) (backport #40618)	2024-03-22 16:01:27 +05:30
Rohit Waghchaure	e09b3ad720	fix: rate reset to zero (cherry picked from commit `6821baa850`) (cherry picked from commit `2f839fbf6d`)	2024-03-22 10:12:07 +00:00
Frappe PR Bot	14f7aef4d0	chore(release): Bumped to Version 14.65.6 ## [14.65.6](https://github.com/frappe/erpnext/compare/v14.65.5...v14.65.6) (2024-03-21) ### Bug Fixes * rate not fetching from the item price ([`18279a6`](`18279a6dbd`))	2024-03-21 17:33:34 +00:00
rohitwaghchaure	5f84e0d7e8	Merge pull request #40601 from frappe/mergify/bp/version-14/pr-40599 fix: rate not fetching from the item price (backport #40595) (backport #40599)	2024-03-21 23:02:23 +05:30
Rohit Waghchaure	18279a6dbd	fix: rate not fetching from the item price (cherry picked from commit `d893a465d7`) (cherry picked from commit `9b3c4ac575`)	2024-03-21 17:12:01 +00:00
Frappe PR Bot	74ec853b97	chore(release): Bumped to Version 14.65.5 ## [14.65.5](https://github.com/frappe/erpnext/compare/v14.65.4...v14.65.5) (2024-03-20) ### Bug Fixes * style for tax breakup ([`a0156e1`](`a0156e1e47`)) * use Text Editor for rendering tax breakup table ([`7df09d1`](`7df09d18e1`))	2024-03-20 15:22:12 +00:00
Deepesh Garg	7ed625d5e1	Merge pull request #40569 from frappe/mergify/bp/version-14/pr-40563 fix: use `Text Editor` for rendering tax breakup table (backport #40563)	2024-03-20 20:50:31 +05:30
Gursheen Anand	381899bf5f	chore: resolve conflicts	2024-03-20 20:25:31 +05:30
Ankush Menat	a0156e1e47	fix: style for tax breakup (cherry picked from commit `967540da18`) # Conflicts: # erpnext/public/scss/erpnext.scss	2024-03-20 13:06:47 +00:00
Gursheen Anand	7df09d18e1	fix: use Text Editor for rendering tax breakup table (cherry picked from commit `1c63983873`) # Conflicts: # erpnext/accounts/doctype/pos_invoice/pos_invoice.py # erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py # erpnext/accounts/doctype/sales_invoice/sales_invoice.py # erpnext/buying/doctype/purchase_order/purchase_order.json # erpnext/buying/doctype/purchase_order/purchase_order.py # erpnext/buying/doctype/supplier_quotation/supplier_quotation.json # erpnext/buying/doctype/supplier_quotation/supplier_quotation.py # erpnext/selling/doctype/quotation/quotation.json # erpnext/selling/doctype/quotation/quotation.py # erpnext/selling/doctype/sales_order/sales_order.py # erpnext/stock/doctype/delivery_note/delivery_note.json # erpnext/stock/doctype/delivery_note/delivery_note.py # erpnext/stock/doctype/purchase_receipt/purchase_receipt.py	2024-03-20 13:06:46 +00:00