chore(release): Bumped to Version 13.51.2

## [13.51.2](https://github.com/frappe/erpnext/compare/v13.51.1...v13.51.2) (2023-06-14)

### Bug Fixes

* **accounts:** validate payment entry references with latest data. (backport [#31166](https://github.com/frappe/erpnext/issues/31166)) ([#35674](https://github.com/frappe/erpnext/issues/35674)) ([4d4f218](4d4f218175))
* Asset Depreciation Ledger Report - Add Total Row Checkbox Enabled ([3831c79](3831c7920d))
* calculate wdv depr schedule properly for existing assets [v13] ([#35615](https://github.com/frappe/erpnext/issues/35615)) ([97f4af8](97f4af8d97))
* CSS not applied to product title (backport [#35582](https://github.com/frappe/erpnext/issues/35582)) ([#35635](https://github.com/frappe/erpnext/issues/35635)) ([1b69b37](1b69b37229))
* don't set default payment amount in case of invoice return (backport [#35645](https://github.com/frappe/erpnext/issues/35645)) ([#35648](https://github.com/frappe/erpnext/issues/35648)) ([8e3636f](8e3636ff53))
* Lower deduction certificate not getting applied ([#35667](https://github.com/frappe/erpnext/issues/35667)) ([c2bf8e3](c2bf8e3502))
* make showing taxes as table in print configurable ([#35672](https://github.com/frappe/erpnext/issues/35672)) ([4c2c037](4c2c037a86))
* Project in item-wise sales register ([#35596](https://github.com/frappe/erpnext/issues/35596)) ([9d5b500](9d5b500060))
* savepoint policy assignment submission, log errors & inform the user about failures ([#35507](https://github.com/frappe/erpnext/issues/35507)) ([4a35ff0](4a35ff0e57))

### Performance Improvements

* refactor `get_all_nodes` in Org Chart ([986a90e](986a90efe0))

erpnext/__init__.py

@@ -4,7 +4,7 @@ import frappe
 
 from erpnext.hooks import regional_overrides
 
-__version__ = "13.42.7"
+__version__ = "13.51.2"
 
 
 def get_default_company(user=None):

erpnext/accounts/doctype/journal_entry/journal_entry.py

@@ -330,10 +330,12 @@ class JournalEntry(AccountsController):
 				d.db_update()
 
 	def unlink_asset_reference(self):
+		if self.voucher_type != "Depreciation Entry":
+			return
+
 		for d in self.get("accounts"):
 			if (
-				self.voucher_type == "Depreciation Entry"
-				and d.reference_type == "Asset"
+				d.reference_type == "Asset"
 				and d.reference_name
 				and d.account_type == "Depreciation"
 				and d.debit
@@ -360,15 +362,6 @@ class JournalEntry(AccountsController):
 				else:
 					asset.db_set("value_after_depreciation", asset.value_after_depreciation + d.debit)
 				asset.set_status()
-			elif self.voucher_type == "Journal Entry" and d.reference_type == "Asset" and d.reference_name:
-				journal_entry_for_scrap = frappe.db.get_value(
-					"Asset", d.reference_name, "journal_entry_for_scrap"
-				)
-
-				if journal_entry_for_scrap == self.name:
-					frappe.throw(
-						_("Journal Entry for Asset scrapping cannot be cancelled. Please restore the Asset.")
-					)
 
 	def unlink_inter_company_jv(self):
 		if (

erpnext/accounts/doctype/payment_entry/payment_entry.js

@@ -623,7 +623,7 @@ frappe.ui.form.on('Payment Entry', {
 			frm.events.set_unallocated_amount(frm);
 	},
 
-	get_outstanding_invoices_or_orders: function(frm, get_outstanding_invoices, get_orders_to_be_billed) {
+	get_outstanding_invoice: function(frm) {
 		const today = frappe.datetime.get_today();
 		const fields = [
 			{fieldtype:"Section Break", label: __("Posting Date")},
@@ -653,29 +653,12 @@ frappe.ui.form.on('Payment Entry', {
 			{fieldtype:"Check", label: __("Allocate Payment Amount"), fieldname:"allocate_payment_amount", default:1},
 		];
 
-		let btn_text = "";
-
-		if (get_outstanding_invoices) {
-			btn_text = "Get Outstanding Invoices";
-		}
-		else if (get_orders_to_be_billed) {
-			btn_text = "Get Outstanding Orders";
-		}
-
 		frappe.prompt(fields, function(filters){
 			frappe.flags.allocate_payment_amount = true;
 			frm.events.validate_filters_data(frm, filters);
 			frm.doc.cost_center = filters.cost_center;
-			frm.events.get_outstanding_documents(frm, filters, get_outstanding_invoices, get_orders_to_be_billed);
-		}, __("Filters"), __(btn_text));
-	},
-
-	get_outstanding_invoices: function(frm) {
-		frm.events.get_outstanding_invoices_or_orders(frm, true, false);
-	},
-
-	get_outstanding_orders: function(frm) {
-		frm.events.get_outstanding_invoices_or_orders(frm, false, true);
+			frm.events.get_outstanding_documents(frm, filters);
+		}, __("Filters"), __("Get Outstanding Documents"));
 	},
 
 	validate_filters_data: function(frm, filters) {
@@ -701,7 +684,7 @@ frappe.ui.form.on('Payment Entry', {
 		}
 	},
 
-	get_outstanding_documents: function(frm, filters, get_outstanding_invoices, get_orders_to_be_billed) {
+	get_outstanding_documents: function(frm, filters) {
 		frm.clear_table("references");
 
 		if(!frm.doc.party) {
@@ -725,13 +708,6 @@ frappe.ui.form.on('Payment Entry', {
 			args[key] = filters[key];
 		}
 
-		if (get_outstanding_invoices) {
-			args["get_outstanding_invoices"] = true;
-		}
-		else if (get_orders_to_be_billed) {
-			args["get_orders_to_be_billed"] = true;
-		}
-
 		frappe.flags.allocate_payment_amount = filters['allocate_payment_amount'];
 
 		return  frappe.call({

erpnext/accounts/doctype/payment_entry/payment_entry.json

@@ -48,8 +48,7 @@
   "base_received_amount",
   "base_received_amount_after_tax",
   "section_break_14",
-  "get_outstanding_invoices",
-  "get_outstanding_orders",
+  "get_outstanding_invoice",
   "references",
   "section_break_34",
   "total_allocated_amount",
@@ -354,6 +353,12 @@
    "fieldtype": "Section Break",
    "label": "Reference"
   },
+  {
+   "depends_on": "eval:doc.docstatus==0",
+   "fieldname": "get_outstanding_invoice",
+   "fieldtype": "Button",
+   "label": "Get Outstanding Invoice"
+  },
   {
    "fieldname": "references",
    "fieldtype": "Table",
@@ -721,24 +726,12 @@
    "fieldname": "section_break_60",
    "fieldtype": "Section Break",
    "hide_border": 1
-  },
-  {
-   "depends_on": "eval:doc.docstatus==0",
-   "fieldname": "get_outstanding_invoices",
-   "fieldtype": "Button",
-   "label": "Get Outstanding Invoices"
-  },
-  {
-   "depends_on": "eval:doc.docstatus==0",
-   "fieldname": "get_outstanding_orders",
-   "fieldtype": "Button",
-   "label": "Get Outstanding Orders"
   }
  ],
  "index_web_pages_for_search": 1,
  "is_submittable": 1,
  "links": [],
- "modified": "2023-06-19 11:38:04.387219",
+ "modified": "2022-02-23 20:08:39.559814",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Payment Entry",

erpnext/accounts/doctype/payment_entry/payment_entry.py

@@ -150,22 +150,9 @@ class PaymentEntry(AccountsController):
 			)
 
 	def validate_allocated_amount(self):
-		if self.payment_type == "Internal Transfer":
+		if self.payment_type == "Internal Transfer" or self.party_type in ("Donor"):
 			return
 
-		if self.party_type in ("Customer", "Supplier"):
-			self.validate_allocated_amount_with_latest_data()
-		else:
-			fail_message = _("Row #{0}: Allocated Amount cannot be greater than outstanding amount.")
-			for d in self.get("references"):
-				if (flt(d.allocated_amount)) > 0 and flt(d.allocated_amount) > flt(d.outstanding_amount):
-					frappe.throw(fail_message.format(d.idx))
-
-				# Check for negative outstanding invoices as well
-				if flt(d.allocated_amount) < 0 and flt(d.allocated_amount) < flt(d.outstanding_amount):
-					frappe.throw(fail_message.format(d.idx))
-
-	def validate_allocated_amount_with_latest_data(self):
 		latest_references = get_outstanding_reference_documents(
 			{
 				"posting_date": self.posting_date,
@@ -174,8 +161,6 @@ class PaymentEntry(AccountsController):
 				"payment_type": self.payment_type,
 				"party": self.party,
 				"party_account": self.paid_from if self.payment_type == "Receive" else self.paid_to,
-				"get_outstanding_invoices": True,
-				"get_orders_to_be_billed": True,
 			}
 		)
 
@@ -185,7 +170,7 @@ class PaymentEntry(AccountsController):
 			d = frappe._dict(d)
 			latest_lookup.update({(d.voucher_type, d.voucher_no): d})
 
-		for d in self.get("references"):
+		for d in self.get("references").copy():
 			latest = latest_lookup.get((d.reference_doctype, d.reference_name))
 
 			# The reference has already been fully paid
@@ -196,22 +181,26 @@ class PaymentEntry(AccountsController):
 			# The reference has already been partly paid
 			elif (
 				latest.outstanding_amount < latest.invoice_amount
-				and flt(d.outstanding_amount, d.precision("outstanding_amount")) != latest.outstanding_amount
+				and d.outstanding_amount != latest.outstanding_amount
 			):
 				frappe.throw(
 					_(
-						"{0} {1} has already been partly paid. Please use the 'Get Outstanding Invoice' or the 'Get Outstanding Orders' button to get the latest outstanding amounts."
+						"{0} {1} has already been partly paid. Please use the 'Get Outstanding Invoice' button to get the latest outstanding amount."
 					).format(d.reference_doctype, d.reference_name)
 				)
 
+			d.outstanding_amount = latest.outstanding_amount
+
 			fail_message = _("Row #{0}: Allocated Amount cannot be greater than outstanding amount.")
 
-			if (flt(d.allocated_amount)) > 0 and flt(d.allocated_amount) > flt(latest.outstanding_amount):
-				frappe.throw(fail_message.format(d.idx))
+			if (flt(d.allocated_amount)) > 0:
+				if flt(d.allocated_amount) > flt(d.outstanding_amount):
+					frappe.throw(fail_message.format(d.idx))
 
 			# Check for negative outstanding invoices as well
-			if flt(d.allocated_amount) < 0 and flt(d.allocated_amount) < flt(latest.outstanding_amount):
-				frappe.throw(fail_message.format(d.idx))
+			if flt(d.allocated_amount) < 0:
+				if flt(d.allocated_amount) < flt(d.outstanding_amount):
+					frappe.throw(fail_message.format(d.idx))
 
 	def delink_advance_entry_references(self):
 		for reference in self.references:
@@ -1367,48 +1356,32 @@ def get_outstanding_reference_documents(args):
 	if args.get("company"):
 		condition += " and company = {0}".format(frappe.db.escape(args.get("company")))
 
-	outstanding_invoices = []
-	negative_outstanding_invoices = []
+	outstanding_invoices = get_outstanding_invoices(
+		args.get("party_type"),
+		args.get("party"),
+		args.get("party_account"),
+		args.get("company"),
+		filters=args,
+		condition=condition,
+	)
 
-	if args.get("get_outstanding_invoices"):
-		outstanding_invoices = get_outstanding_invoices(
-			args.get("party_type"),
-			args.get("party"),
-			args.get("party_account"),
-			args.get("company"),
-			filters=args,
-			condition=condition,
-		)
+	outstanding_invoices = split_invoices_based_on_payment_terms(outstanding_invoices)
 
-		outstanding_invoices = split_invoices_based_on_payment_terms(outstanding_invoices)
-
-		for d in outstanding_invoices:
-			d["exchange_rate"] = 1
-			if party_account_currency != company_currency:
-				if d.voucher_type in ("Sales Invoice", "Purchase Invoice", "Expense Claim"):
-					d["exchange_rate"] = frappe.db.get_value(d.voucher_type, d.voucher_no, "conversion_rate")
-				elif d.voucher_type == "Journal Entry":
-					d["exchange_rate"] = get_exchange_rate(
-						party_account_currency, company_currency, d.posting_date
-					)
-			if d.voucher_type in ("Purchase Invoice"):
-				d["bill_no"] = frappe.db.get_value(d.voucher_type, d.voucher_no, "bill_no")
-
-		# Get negative outstanding sales /purchase invoices
-		negative_outstanding_invoices = []
-		if args.get("party_type") not in ["Student", "Employee"] and not args.get("voucher_no"):
-			negative_outstanding_invoices = get_negative_outstanding_invoices(
-				args.get("party_type"),
-				args.get("party"),
-				args.get("party_account"),
-				party_account_currency,
-				company_currency,
-				condition=condition,
-			)
+	for d in outstanding_invoices:
+		d["exchange_rate"] = 1
+		if party_account_currency != company_currency:
+			if d.voucher_type in ("Sales Invoice", "Purchase Invoice", "Expense Claim"):
+				d["exchange_rate"] = frappe.db.get_value(d.voucher_type, d.voucher_no, "conversion_rate")
+			elif d.voucher_type == "Journal Entry":
+				d["exchange_rate"] = get_exchange_rate(
+					party_account_currency, company_currency, d.posting_date
+				)
+		if d.voucher_type in ("Purchase Invoice"):
+			d["bill_no"] = frappe.db.get_value(d.voucher_type, d.voucher_no, "bill_no")
 
 	# Get all SO / PO which are not fully billed or against which full advance not paid
 	orders_to_be_billed = []
-	if args.get("get_orders_to_be_billed") and args.get("party_type") != "Student":
+	if args.get("party_type") != "Student":
 		orders_to_be_billed = get_orders_to_be_billed(
 			args.get("posting_date"),
 			args.get("party_type"),
@@ -1419,22 +1392,25 @@ def get_outstanding_reference_documents(args):
 			filters=args,
 		)
 
+	# Get negative outstanding sales /purchase invoices
+	negative_outstanding_invoices = []
+	if args.get("party_type") not in ["Student", "Employee"] and not args.get("voucher_no"):
+		negative_outstanding_invoices = get_negative_outstanding_invoices(
+			args.get("party_type"),
+			args.get("party"),
+			args.get("party_account"),
+			party_account_currency,
+			company_currency,
+			condition=condition,
+		)
+
 	data = negative_outstanding_invoices + outstanding_invoices + orders_to_be_billed
 
 	if not data:
-		if args.get("get_outstanding_invoices") and args.get("get_orders_to_be_billed"):
-			ref_document_type = "invoices or orders"
-		elif args.get("get_outstanding_invoices"):
-			ref_document_type = "invoices"
-		elif args.get("get_orders_to_be_billed"):
-			ref_document_type = "orders"
-
 		frappe.msgprint(
 			_(
-				"No outstanding {0} found for the {1} {2} which qualify the filters you have specified."
-			).format(
-				ref_document_type, _(args.get("party_type")).lower(), frappe.bold(args.get("party"))
-			)
+				"No outstanding invoices found for the {0} {1} which qualify the filters you have specified."
+			).format(_(args.get("party_type")).lower(), frappe.bold(args.get("party")))
 		)
 
 	return data

erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json

@@ -176,7 +176,6 @@
    "fieldname": "received_qty",
    "fieldtype": "Float",
    "label": "Received Qty",
-   "no_copy": 1,
    "read_only": 1
   },
   {
@@ -873,7 +872,7 @@
  "idx": 1,
  "istable": 1,
  "links": [],
- "modified": "2023-07-02 18:39:41.495723",
+ "modified": "2022-10-12 03:37:29.032732",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Purchase Invoice Item",

erpnext/accounts/doctype/sales_invoice/sales_invoice.js

@@ -653,6 +653,19 @@ frappe.ui.form.on('Sales Invoice', {
 			}
 		}
 
+		// expense account
+		frm.fields_dict['items'].grid.get_field('expense_account').get_query = function(doc) {
+			if (erpnext.is_perpetual_inventory_enabled(doc.company)) {
+				return {
+					filters: {
+						'report_type': 'Profit and Loss',
+						'company': doc.company,
+						"is_group": 0
+					}
+				}
+			}
+		}
+
 		// discount account
 		frm.fields_dict['items'].grid.get_field('discount_account').get_query = function(doc) {
 			return {

erpnext/accounts/doctype/tax_withholding_category/tax_withholding_category.py

@@ -518,19 +518,15 @@ def get_invoice_total_without_tcs(inv, tax_details):
 
 def get_tds_amount_from_ldc(ldc, parties, pan_no, tax_details, posting_date, net_total):
 	tds_amount = 0
-
-	limit_consumed = flt(
-		frappe.db.get_all(
-			"Purchase Invoice",
-			filters={
-				"supplier": ("in", parties),
-				"apply_tds": 1,
-				"docstatus": 1,
-				"tax_withholding_category": ldc.tax_withholding_category,
-				"posting_date": ("between", (ldc.valid_from, ldc.valid_upto)),
-			},
-			fields=["sum(base_net_total) as limit_consumed"],
-		)[0].get("limit_consumed")
+	limit_consumed = frappe.db.get_value(
+		"Purchase Invoice",
+		{
+			"supplier": ("in", parties),
+			"apply_tds": 1,
+			"docstatus": 1,
+			"posting_date": ("between", (ldc.valid_from, ldc.valid_upto)),
+		},
+		"sum(tax_withholding_net_total)",
 	)
 
 	if is_valid_certificate(
@@ -558,7 +554,7 @@ def is_valid_certificate(
 ):
 	valid = False
 
-	available_amount = flt(certificate_limit) - flt(deducted_amount)
+	available_amount = flt(certificate_limit) - flt(deducted_amount) - flt(current_amount)
 
 	if (getdate(valid_from) <= getdate(posting_date) <= getdate(valid_upto)) and available_amount > 0:
 		valid = True

erpnext/accounts/report/gross_and_net_profit_report/gross_and_net_profit_report.py

@@ -125,14 +125,12 @@ def get_revenue(data, period_list, include_in_gross=1):
 
 	data_to_be_removed = True
 	while data_to_be_removed:
-		revenue, data_to_be_removed = remove_parent_with_no_child(revenue)
-
-	adjust_account_totals(revenue, period_list)
-
+		revenue, data_to_be_removed = remove_parent_with_no_child(revenue, period_list)
+	revenue = adjust_account(revenue, period_list)
 	return copy.deepcopy(revenue)
 
 
-def remove_parent_with_no_child(data):
+def remove_parent_with_no_child(data, period_list):
 	data_to_be_removed = False
 	for parent in data:
 		if "is_group" in parent and parent.get("is_group") == 1:
@@ -149,19 +147,16 @@ def remove_parent_with_no_child(data):
 	return data, data_to_be_removed
 
 
-def adjust_account_totals(data, period_list):
+def adjust_account(data, period_list, consolidated=False):
+	leaf_nodes = [item for item in data if item["is_group"] == 0]
 	totals = {}
-	for d in reversed(data):
-		if d.get("is_group"):
-			for period in period_list:
-				# reset totals for group accounts as totals set by get_data doesn't consider include_in_gross check
-				d[period.key] = sum(
-					item[period.key] for item in data if item.get("parent_account") == d.get("account")
-				)
-		else:
-			set_total(d, d["total"], data, totals)
-
-		d["total"] = totals[d["account"]]
+	for node in leaf_nodes:
+		set_total(node, node["total"], data, totals)
+	for d in data:
+		for period in period_list:
+			key = period if consolidated else period.key
+			d["total"] = totals[d["account"]]
+	return data
 
 
 def set_total(node, value, complete_list, totals):
@@ -196,9 +191,6 @@ def get_profit(
 
 		if profit_loss[key]:
 			has_value = True
-			if not profit_loss.get("total"):
-				profit_loss["total"] = 0
-			profit_loss["total"] += profit_loss[key]
 
 	if has_value:
 		return profit_loss
@@ -237,9 +229,6 @@ def get_net_profit(
 
 		if profit_loss[key]:
 			has_value = True
-			if not profit_loss.get("total"):
-				profit_loss["total"] = 0
-			profit_loss["total"] += profit_loss[key]
 
 	if has_value:
 		return profit_loss

erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py

@@ -87,7 +87,7 @@ def _execute(filters=None, additional_table_columns=None, additional_query_colum
 				"project": d.project,
 				"company": d.company,
 				"purchase_order": d.purchase_order,
-				"purchase_receipt": purchase_receipt,
+				"purchase_receipt": d.purchase_receipt,
 				"expense_account": expense_account,
 				"stock_qty": d.stock_qty,
 				"stock_uom": d.stock_uom,
@@ -241,7 +241,7 @@ def get_columns(additional_table_columns, filters):
 		},
 		{
 			"label": _("Purchase Receipt"),
-			"fieldname": "purchase_receipt",
+			"fieldname": "Purchase Receipt",
 			"fieldtype": "Link",
 			"options": "Purchase Receipt",
 			"width": 100,

erpnext/assets/doctype/asset/depreciation.py

@@ -136,15 +136,15 @@ def make_depreciation_entry(asset_name, date=None):
 			je.flags.ignore_permissions = True
 			je.flags.planned_depr_entry = True
 			je.save()
+			if not je.meta.get_workflow():
+				je.submit()
 
 			d.db_set("journal_entry", je.name)
 
-			if not je.meta.get_workflow():
-				je.submit()
-				idx = cint(d.finance_book_id)
-				finance_books = asset.get("finance_books")[idx - 1]
-				finance_books.value_after_depreciation -= d.depreciation_amount
-				finance_books.db_update()
+			idx = cint(d.finance_book_id)
+			finance_books = asset.get("finance_books")[idx - 1]
+			finance_books.value_after_depreciation -= d.depreciation_amount
+			finance_books.db_update()
 
 	asset.db_set("depr_entry_posting_status", "Successful")
 
@@ -344,9 +344,6 @@ def modify_depreciation_schedule_for_asset_repairs(asset):
 def reverse_depreciation_entry_made_after_disposal(asset, date):
 	from erpnext.accounts.doctype.journal_entry.journal_entry import make_reverse_journal_entry
 
-	if not asset.calculate_depreciation:
-		return
-
 	row = -1
 	finance_book = asset.get("schedules")[0].get("finance_book")
 	for schedule in asset.get("schedules"):
@@ -469,19 +466,15 @@ def get_gl_entries_on_asset_disposal(asset, selling_amount=0, finance_book=None,
 			"cost_center": depreciation_cost_center,
 			"posting_date": date,
 		},
+		{
+			"account": accumulated_depr_account,
+			"debit_in_account_currency": accumulated_depr_amount,
+			"debit": accumulated_depr_amount,
+			"cost_center": depreciation_cost_center,
+			"posting_date": date,
+		},
 	]
 
-	if accumulated_depr_amount:
-		gl_entries.append(
-			{
-				"account": accumulated_depr_account,
-				"debit_in_account_currency": accumulated_depr_amount,
-				"debit": accumulated_depr_amount,
-				"cost_center": depreciation_cost_center,
-				"posting_date": date,
-			},
-		)
-
 	profit_amount = flt(selling_amount) - flt(value_after_depreciation)
 	if profit_amount:
 		get_profit_gl_entries(

erpnext/assets/doctype/asset_movement/asset_movement.js

@@ -70,21 +70,19 @@ frappe.ui.form.on('Asset Movement', {
 		else if (frm.doc.purpose === 'Issue') {
 			fieldnames_to_be_altered = {
 				target_location: { read_only: 1, reqd: 0 },
-				source_location: { read_only: 1, reqd: 0 },
+				source_location: { read_only: 1, reqd: 1 },
 				from_employee: { read_only: 1, reqd: 0 },
 				to_employee: { read_only: 0, reqd: 1 }
 			};
 		}
-		if (fieldnames_to_be_altered) {
-			Object.keys(fieldnames_to_be_altered).forEach(fieldname => {
-				let property_to_be_altered = fieldnames_to_be_altered[fieldname];
-				Object.keys(property_to_be_altered).forEach(property => {
-					let value = property_to_be_altered[property];
-					frm.fields_dict['assets'].grid.update_docfield_property(fieldname, property, value);
-				});
+		Object.keys(fieldnames_to_be_altered).forEach(fieldname => {
+			let property_to_be_altered = fieldnames_to_be_altered[fieldname];
+			Object.keys(property_to_be_altered).forEach(property => {
+				let value = property_to_be_altered[property];
+				frm.set_df_property(fieldname, property, value, cdn, 'assets');
 			});
-			frm.refresh_field('assets');
-		}
+		});
+		frm.refresh_field('assets');
 	}
 });
 

erpnext/assets/doctype/asset_movement/asset_movement.json

@@ -37,7 +37,6 @@
    "reqd": 1
   },
   {
-   "default": "Now",
    "fieldname": "transaction_date",
    "fieldtype": "Datetime",
    "in_list_view": 1,
@@ -96,11 +95,10 @@
  "index_web_pages_for_search": 1,
  "is_submittable": 1,
  "links": [],
- "modified": "2023-06-28 16:54:26.571083",
+ "modified": "2021-01-22 12:30:55.295670",
  "modified_by": "Administrator",
  "module": "Assets",
  "name": "Asset Movement",
- "naming_rule": "Expression",
  "owner": "Administrator",
  "permissions": [
   {
@@ -150,6 +148,5 @@
   }
  ],
  "sort_field": "modified",
- "sort_order": "DESC",
- "states": []
+ "sort_order": "DESC"
 }

erpnext/assets/doctype/asset_movement/asset_movement.py

@@ -28,20 +28,26 @@ class AssetMovement(Document):
 	def validate_location(self):
 		for d in self.assets:
 			if self.purpose in ["Transfer", "Issue"]:
-				current_location = frappe.db.get_value("Asset", d.asset, "location")
+				if not d.source_location:
+					d.source_location = frappe.db.get_value("Asset", d.asset, "location")
+
+				if not d.source_location:
+					frappe.throw(_("Source Location is required for the Asset {0}").format(d.asset))
+
 				if d.source_location:
+					current_location = frappe.db.get_value("Asset", d.asset, "location")
+
 					if current_location != d.source_location:
 						frappe.throw(
 							_("Asset {0} does not belongs to the location {1}").format(d.asset, d.source_location)
 						)
-				else:
-					d.source_location = current_location
 
 			if self.purpose == "Issue":
 				if d.target_location:
 					frappe.throw(
 						_(
-							"Issuing cannot be done to a location. Please enter employee to issue the Asset {0} to"
+							"Issuing cannot be done to a location. \
+						Please enter employee who has issued Asset {0}"
 						).format(d.asset),
 						title="Incorrect Movement Purpose",
 					)
@@ -104,12 +110,12 @@ class AssetMovement(Document):
 				)
 
 	def on_submit(self):
-		self.set_latest_location_and_custodian_in_asset()
+		self.set_latest_location_in_asset()
 
 	def on_cancel(self):
-		self.set_latest_location_and_custodian_in_asset()
+		self.set_latest_location_in_asset()
 
-	def set_latest_location_and_custodian_in_asset(self):
+	def set_latest_location_in_asset(self):
 		current_location, current_employee = "", ""
 		cond = "1=1"
 

erpnext/assets/doctype/asset_movement/test_asset_movement.py

@@ -47,7 +47,7 @@ class TestAssetMovement(unittest.TestCase):
 		if not frappe.db.exists("Location", "Test Location 2"):
 			frappe.get_doc({"doctype": "Location", "location_name": "Test Location 2"}).insert()
 
-		create_asset_movement(
+		movement1 = create_asset_movement(
 			purpose="Transfer",
 			company=asset.company,
 			assets=[
@@ -58,7 +58,7 @@ class TestAssetMovement(unittest.TestCase):
 		)
 		self.assertEqual(frappe.db.get_value("Asset", asset.name, "location"), "Test Location 2")
 
-		movement1 = create_asset_movement(
+		create_asset_movement(
 			purpose="Transfer",
 			company=asset.company,
 			assets=[
@@ -70,32 +70,21 @@ class TestAssetMovement(unittest.TestCase):
 		self.assertEqual(frappe.db.get_value("Asset", asset.name, "location"), "Test Location")
 
 		movement1.cancel()
-		self.assertEqual(frappe.db.get_value("Asset", asset.name, "location"), "Test Location 2")
+		self.assertEqual(frappe.db.get_value("Asset", asset.name, "location"), "Test Location")
 
 		employee = make_employee("testassetmovemp@example.com", company="_Test Company")
 		create_asset_movement(
 			purpose="Issue",
 			company=asset.company,
-			assets=[{"asset": asset.name, "source_location": "Test Location 2", "to_employee": employee}],
+			assets=[{"asset": asset.name, "source_location": "Test Location", "to_employee": employee}],
 			reference_doctype="Purchase Receipt",
 			reference_name=pr.name,
 		)
 
-		# after issuing, asset should belong to an employee not at a location
+		# after issuing asset should belong to an employee not at a location
 		self.assertEqual(frappe.db.get_value("Asset", asset.name, "location"), None)
 		self.assertEqual(frappe.db.get_value("Asset", asset.name, "custodian"), employee)
 
-		create_asset_movement(
-			purpose="Receipt",
-			company=asset.company,
-			assets=[{"asset": asset.name, "from_employee": employee, "target_location": "Test Location"}],
-			reference_doctype="Purchase Receipt",
-			reference_name=pr.name,
-		)
-
-		# after receiving, asset should belong to a location not at an employee
-		self.assertEqual(frappe.db.get_value("Asset", asset.name, "location"), "Test Location")
-
 	def test_last_movement_cancellation(self):
 		pr = make_purchase_receipt(
 			item_code="Macbook Pro", qty=1, rate=100000.0, location="Test Location"

erpnext/assets/report/fixed_asset_register/fixed_asset_register.js

@@ -19,6 +19,56 @@ frappe.query_reports["Fixed Asset Register"] = {
 			options: "\nIn Location\nDisposed",
 			default: 'In Location'
 		},
+		{
+			"fieldname":"filter_based_on",
+			"label": __("Period Based On"),
+			"fieldtype": "Select",
+			"options": ["Fiscal Year", "Date Range"],
+			"default": "Fiscal Year",
+			"reqd": 1
+		},
+		{
+			"fieldname":"from_date",
+			"label": __("Start Date"),
+			"fieldtype": "Date",
+			"default": frappe.datetime.add_months(frappe.datetime.nowdate(), -12),
+			"depends_on": "eval: doc.filter_based_on == 'Date Range'",
+			"reqd": 1
+		},
+		{
+			"fieldname":"to_date",
+			"label": __("End Date"),
+			"fieldtype": "Date",
+			"default": frappe.datetime.nowdate(),
+			"depends_on": "eval: doc.filter_based_on == 'Date Range'",
+			"reqd": 1
+		},
+		{
+			"fieldname":"from_fiscal_year",
+			"label": __("Start Year"),
+			"fieldtype": "Link",
+			"options": "Fiscal Year",
+			"default": frappe.defaults.get_user_default("fiscal_year"),
+			"depends_on": "eval: doc.filter_based_on == 'Fiscal Year'",
+			"reqd": 1
+		},
+		{
+			"fieldname":"to_fiscal_year",
+			"label": __("End Year"),
+			"fieldtype": "Link",
+			"options": "Fiscal Year",
+			"default": frappe.defaults.get_user_default("fiscal_year"),
+			"depends_on": "eval: doc.filter_based_on == 'Fiscal Year'",
+			"reqd": 1
+		},
+		{
+			"fieldname":"date_based_on",
+			"label": __("Date Based On"),
+			"fieldtype": "Select",
+			"options": ["Purchase Date", "Available For Use Date"],
+			"default": "Purchase Date",
+			"reqd": 1
+		},
 		{
 			fieldname:"asset_category",
 			label: __("Asset Category"),
@@ -39,67 +89,22 @@ frappe.query_reports["Fixed Asset Register"] = {
 			default: "--Select a group--",
 			reqd: 1
 		},
-		{
-			fieldname:"only_existing_assets",
-			label: __("Only existing assets"),
-			fieldtype: "Check"
-		},
 		{
 			fieldname:"finance_book",
 			label: __("Finance Book"),
 			fieldtype: "Link",
 			options: "Finance Book",
+			depends_on: "eval: doc.filter_by_finance_book == 1",
 		},
 		{
-			"fieldname": "include_default_book_assets",
-			"label": __("Include Default Book Assets"),
-			"fieldtype": "Check",
-			"default": 1
+			fieldname:"filter_by_finance_book",
+			label: __("Filter by Finance Book"),
+			fieldtype: "Check"
 		},
 		{
-			"fieldname":"filter_based_on",
-			"label": __("Period Based On"),
-			"fieldtype": "Select",
-			"options": ["--Select a period--", "Fiscal Year", "Date Range"],
-			"default": "--Select a period--",
-		},
-		{
-			"fieldname":"from_date",
-			"label": __("Start Date"),
-			"fieldtype": "Date",
-			"default": frappe.datetime.add_months(frappe.datetime.nowdate(), -12),
-			"depends_on": "eval: doc.filter_based_on == 'Date Range'",
-		},
-		{
-			"fieldname":"to_date",
-			"label": __("End Date"),
-			"fieldtype": "Date",
-			"default": frappe.datetime.nowdate(),
-			"depends_on": "eval: doc.filter_based_on == 'Date Range'",
-		},
-		{
-			"fieldname":"from_fiscal_year",
-			"label": __("Start Year"),
-			"fieldtype": "Link",
-			"options": "Fiscal Year",
-			"default": frappe.defaults.get_user_default("fiscal_year"),
-			"depends_on": "eval: doc.filter_based_on == 'Fiscal Year'",
-		},
-		{
-			"fieldname":"to_fiscal_year",
-			"label": __("End Year"),
-			"fieldtype": "Link",
-			"options": "Fiscal Year",
-			"default": frappe.defaults.get_user_default("fiscal_year"),
-			"depends_on": "eval: doc.filter_based_on == 'Fiscal Year'",
-		},
-		{
-			"fieldname":"date_based_on",
-			"label": __("Date Based On"),
-			"fieldtype": "Select",
-			"options": ["Purchase Date", "Available For Use Date"],
-			"default": "Purchase Date",
-			"depends_on": "eval: doc.filter_based_on == 'Date Range' || doc.filter_based_on == 'Fiscal Year'",
+			fieldname:"only_existing_assets",
+			label: __("Only existing assets"),
+			fieldtype: "Check"
 		},
 	]
 };

erpnext/assets/report/fixed_asset_register/fixed_asset_register.py

@@ -2,11 +2,9 @@
 # For license information, please see license.txt
 
 
-from itertools import chain
-
 import frappe
 from frappe import _
-from frappe.query_builder.functions import IfNull, Sum
+from frappe.query_builder.functions import Sum
 from frappe.utils import cstr, flt, formatdate, getdate
 
 from erpnext.accounts.report.financial_statements import (
@@ -15,6 +13,7 @@ from erpnext.accounts.report.financial_statements import (
 	validate_fiscal_year,
 )
 from erpnext.assets.doctype.asset.asset import get_asset_value_after_depreciation
+from erpnext.assets.doctype.asset.depreciation import get_depreciation_accounts
 
 
 def execute(filters=None):
@@ -65,9 +64,11 @@ def get_conditions(filters):
 
 
 def get_data(filters):
+
 	data = []
 
 	conditions = get_conditions(filters)
+	depreciation_amount_map = get_finance_book_value_map(filters)
 	pr_supplier_map = get_purchase_receipt_supplier_map()
 	pi_supplier_map = get_purchase_invoice_supplier_map()
 
@@ -101,31 +102,20 @@ def get_data(filters):
 		]
 		assets_record = frappe.db.get_all("Asset", filters=conditions, fields=fields)
 
-	assets_linked_to_fb = get_assets_linked_to_fb(filters)
+	assets_linked_to_fb = None
 
-	company_fb = frappe.get_cached_value("Company", filters.company, "default_finance_book")
-
-	if filters.include_default_book_assets and company_fb:
-		finance_book = company_fb
-	elif filters.finance_book:
-		finance_book = filters.finance_book
-	else:
-		finance_book = None
-
-	depreciation_amount_map = get_asset_depreciation_amount_map(filters, finance_book)
+	if filters.filter_by_finance_book:
+		assets_linked_to_fb = frappe.db.get_all(
+			doctype="Asset Finance Book",
+			filters={"finance_book": filters.finance_book or ("is", "not set")},
+			pluck="parent",
+		)
 
 	for asset in assets_record:
-		if (
-			assets_linked_to_fb
-			and asset.calculate_depreciation
-			and asset.asset_id not in assets_linked_to_fb
-		):
+		if assets_linked_to_fb and asset.asset_id not in assets_linked_to_fb:
 			continue
 
-		asset_value = get_asset_value_after_depreciation(
-			asset.asset_id, finance_book
-		) or get_asset_value_after_depreciation(asset.asset_id)
-
+		asset_value = get_asset_value_after_depreciation(asset.asset_id, filters.finance_book)
 		row = {
 			"asset_id": asset.asset_id,
 			"asset_name": asset.asset_name,
@@ -136,7 +126,7 @@ def get_data(filters):
 			or pi_supplier_map.get(asset.purchase_invoice),
 			"gross_purchase_amount": asset.gross_purchase_amount,
 			"opening_accumulated_depreciation": asset.opening_accumulated_depreciation,
-			"depreciated_amount": get_depreciation_amount_of_asset(asset, depreciation_amount_map),
+			"depreciated_amount": get_depreciation_amount_of_asset(asset, depreciation_amount_map, filters),
 			"available_for_use_date": asset.available_for_use_date,
 			"location": asset.location,
 			"asset_category": asset.asset_category,
@@ -150,23 +140,14 @@ def get_data(filters):
 
 def prepare_chart_data(data, filters):
 	labels_values_map = {}
-	if filters.filter_based_on not in ("Date Range", "Fiscal Year"):
-		filters_filter_based_on = "Date Range"
-		date_field = "purchase_date"
-		filters_from_date = min(data, key=lambda a: a.get(date_field)).get(date_field)
-		filters_to_date = max(data, key=lambda a: a.get(date_field)).get(date_field)
-	else:
-		filters_filter_based_on = filters.filter_based_on
-		date_field = frappe.scrub(filters.date_based_on)
-		filters_from_date = filters.from_date
-		filters_to_date = filters.to_date
+	date_field = frappe.scrub(filters.date_based_on)
 
 	period_list = get_period_list(
 		filters.from_fiscal_year,
 		filters.to_fiscal_year,
-		filters_from_date,
-		filters_to_date,
-		filters_filter_based_on,
+		filters.from_date,
+		filters.to_date,
+		filters.filter_based_on,
 		"Monthly",
 		company=filters.company,
 		ignore_fiscal_year=True,
@@ -203,76 +184,57 @@ def prepare_chart_data(data, filters):
 	}
 
 
-def get_assets_linked_to_fb(filters):
-	afb = frappe.qb.DocType("Asset Finance Book")
-
-	query = frappe.qb.from_(afb).select(
-		afb.parent,
-	)
-
-	if filters.include_default_book_assets:
-		company_fb = frappe.get_cached_value("Company", filters.company, "default_finance_book")
-
-		if filters.finance_book and company_fb and cstr(filters.finance_book) != cstr(company_fb):
-			frappe.throw(_("To use a different finance book, please uncheck 'Include Default Book Assets'"))
-
-		query = query.where(
-			(afb.finance_book.isin([cstr(filters.finance_book), cstr(company_fb), ""]))
-			| (afb.finance_book.isnull())
-		)
+def get_depreciation_amount_of_asset(asset, depreciation_amount_map, filters):
+	if asset.calculate_depreciation:
+		depr_amount = depreciation_amount_map.get(asset.asset_id) or 0.0
 	else:
-		query = query.where(
-			(afb.finance_book.isin([cstr(filters.finance_book), ""])) | (afb.finance_book.isnull())
-		)
+		depr_amount = get_manual_depreciation_amount_of_asset(asset, filters)
 
-	assets_linked_to_fb = list(chain(*query.run(as_list=1)))
-
-	return assets_linked_to_fb
+	return flt(depr_amount, 2)
 
 
-def get_depreciation_amount_of_asset(asset, depreciation_amount_map):
-	return depreciation_amount_map.get(asset.asset_id) or 0.0
-
-
-def get_asset_depreciation_amount_map(filters, finance_book):
+def get_finance_book_value_map(filters):
 	date = filters.to_date if filters.filter_based_on == "Date Range" else filters.year_end_date
 
-	asset = frappe.qb.DocType("Asset")
-	gle = frappe.qb.DocType("GL Entry")
-	aca = frappe.qb.DocType("Asset Category Account")
-	company = frappe.qb.DocType("Company")
-
-	query = (
-		frappe.qb.from_(gle)
-		.join(asset)
-		.on(gle.against_voucher == asset.name)
-		.join(aca)
-		.on((aca.parent == asset.asset_category) & (aca.company_name == asset.company))
-		.join(company)
-		.on(company.name == asset.company)
-		.select(asset.name.as_("asset"), Sum(gle.debit).as_("depreciation_amount"))
-		.where(
-			gle.account == IfNull(aca.depreciation_expense_account, company.depreciation_expense_account)
+	return frappe._dict(
+		frappe.db.sql(
+			""" Select
+		parent, SUM(depreciation_amount)
+		FROM `tabDepreciation Schedule`
+		WHERE
+			parentfield='schedules'
+			AND schedule_date<=%s
+			AND journal_entry IS NOT NULL
+			AND ifnull(finance_book, '')=%s
+		GROUP BY parent""",
+			(date, cstr(filters.finance_book or "")),
 		)
-		.where(gle.debit != 0)
-		.where(gle.is_cancelled == 0)
-		.where(asset.docstatus == 1)
-		.groupby(asset.name)
 	)
 
-	if finance_book:
-		query = query.where(
-			(gle.finance_book.isin([cstr(finance_book), ""])) | (gle.finance_book.isnull())
-		)
+
+def get_manual_depreciation_amount_of_asset(asset, filters):
+	date = filters.to_date if filters.filter_based_on == "Date Range" else filters.year_end_date
+
+	(_, _, depreciation_expense_account) = get_depreciation_accounts(asset)
+
+	gle = frappe.qb.DocType("GL Entry")
+
+	result = (
+		frappe.qb.from_(gle)
+		.select(Sum(gle.debit))
+		.where(gle.against_voucher == asset.asset_id)
+		.where(gle.account == depreciation_expense_account)
+		.where(gle.debit != 0)
+		.where(gle.is_cancelled == 0)
+		.where(gle.posting_date <= date)
+	).run()
+
+	if result and result[0] and result[0][0]:
+		depr_amount = result[0][0]
 	else:
-		query = query.where((gle.finance_book.isin([""])) | (gle.finance_book.isnull()))
+		depr_amount = 0
 
-	if filters.filter_based_on in ("Date Range", "Fiscal Year"):
-		query = query.where(gle.posting_date <= date)
-
-	asset_depr_amount_map = query.run()
-
-	return dict(asset_depr_amount_map)
+	return depr_amount
 
 
 def get_purchase_receipt_supplier_map():

erpnext/buying/doctype/purchase_order/purchase_order.js

@@ -242,7 +242,7 @@ erpnext.buying.PurchaseOrderController = erpnext.buying.BuyingController.extend(
 			source_name: this.frm.doc.supplier,
 			target: this.frm,
 			setters: {
-				company: this.frm.doc.company
+				company: me.frm.doc.company
 			},
 			get_query_filters: {
 				docstatus: ["!=", 2],

erpnext/buying/report/purchase_order_analysis/purchase_order_analysis.py

@@ -84,7 +84,7 @@ def get_data(conditions, filters):
 			and po.docstatus = 1
 			{0}
 		GROUP BY poi.name
-		ORDER BY po.transaction_date ASC, poi.item_code ASC
+		ORDER BY po.transaction_date ASC
 	""".format(
 			conditions
 		),

erpnext/hooks.py

@@ -29,6 +29,10 @@ doctype_js = {
 
 override_doctype_class = {"Address": "erpnext.accounts.custom.address.ERPNextAddress"}
 
+override_whitelisted_methods = {
+	"frappe.www.contact.send_message": "erpnext.templates.utils.send_message"
+}
+
 welcome_email = "erpnext.setup.utils.welcome_email"
 
 # setup wizard

erpnext/hr/doctype/leave_allocation/leave_allocation.py

@@ -333,6 +333,7 @@ def get_leave_allocation_for_period(
 	).run()[0][0] or 0.0
 
 
+@frappe.whitelist()
 def get_carry_forwarded_leaves(employee, leave_type, date, carry_forward=None):
 	"""Returns carry forwarded leaves for the given employee"""
 	unused_leaves = 0.0

erpnext/hr/doctype/leave_policy_assignment/leave_policy_assignment.py

@@ -74,6 +74,7 @@ class LeavePolicyAssignment(Document):
 				).format(frappe.bold(get_link_to_form("Leave Type", leave_type.name)))
 				frappe.msgprint(msg, indicator="orange", alert=True)
 
+	@frappe.whitelist()
 	def grant_leave_alloc_for_employee(self):
 		if self.leaves_allocated:
 			frappe.throw(_("Leave already have been assigned for this Leave Policy Assignment"))

erpnext/loan_management/doctype/loan_interest_accrual/loan_interest_accrual.py

@@ -293,8 +293,8 @@ def get_last_accrual_date(loan, posting_date):
 		# interest for last interest accrual date is already booked, so add 1 day
 		last_disbursement_date = get_last_disbursement_date(loan, posting_date)
 
-		if last_disbursement_date and getdate(last_disbursement_date) > add_days(
-			getdate(last_interest_accrual_date), 1
+		if last_disbursement_date and getdate(last_disbursement_date) > getdate(
+			last_interest_accrual_date
 		):
 			last_interest_accrual_date = last_disbursement_date
 

erpnext/payroll/doctype/additional_salary/additional_salary.py

@@ -145,6 +145,7 @@ class AdditionalSalary(Document):
 		return amount_per_day * no_of_days
 
 
+@frappe.whitelist()
 def get_additional_salaries(employee, start_date, end_date, component_type):
 	from frappe.query_builder import Criterion
 

erpnext/public/js/controllers/transaction.js

@@ -173,9 +173,7 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
 			this.frm.set_query("expense_account", "items", function(doc) {
 				return {
 					filters: {
-						"company": doc.company,
-						"report_type": "Profit and Loss",
-						"is_group": 0
+						"company": doc.company
 					}
 				};
 			});

erpnext/public/js/website_utils.js

@@ -3,18 +3,6 @@
 
 if(!window.erpnext) window.erpnext = {};
 
-// Add / update a new Lead / Communication
-// subject, sender, description
-frappe.send_message = function(opts, btn) {
-	return frappe.call({
-		type: "POST",
-		method: "erpnext.templates.utils.send_message",
-		btn: btn,
-		args: opts,
-		callback: opts.callback
-	});
-};
-
 erpnext.subscribe_to_newsletter = function(opts, btn) {
 	return frappe.call({
 		type: "POST",
@@ -24,6 +12,3 @@ erpnext.subscribe_to_newsletter = function(opts, btn) {
 		callback: opts.callback
 	});
 }
-
-// for backward compatibility
-erpnext.send_message = frappe.send_message;

erpnext/regional/doctype/datev_settings/datev_settings.json

@@ -14,8 +14,7 @@
   "section_break_4",
   "account_number_length",
   "column_break_6",
-  "temporary_against_account_number",
-  "opening_against_account_number"
+  "temporary_against_account_number"
  ],
  "fields": [
   {
@@ -71,23 +70,14 @@
   },
   {
    "allow_in_quick_entry": 1,
-   "default": "9999",
-   "description": "Will be used as against account for all normal ledger entries",
    "fieldname": "temporary_against_account_number",
    "fieldtype": "Data",
    "label": "Temporary Against Account Number",
    "reqd": 1
-  },
-  {
-   "default": "9000",
-   "description": "Will be used as against account for opening ledger entries",
-   "fieldname": "opening_against_account_number",
-   "fieldtype": "Data",
-   "label": "Opening Against Account Number"
   }
  ],
  "links": [],
- "modified": "2023-06-30 00:56:59.556731",
+ "modified": "2020-11-19 19:00:09.088816",
  "modified_by": "Administrator",
  "module": "Regional",
  "name": "DATEV Settings",

erpnext/regional/doctype/datev_settings/datev_settings.py

@@ -1,26 +1,10 @@
 # Copyright (c) 2019, Frappe Technologies Pvt. Ltd. and contributors
 # For license information, please see license.txt
 
-from frappe import _, throw
+
+# import frappe
 from frappe.model.document import Document
 
 
 class DATEVSettings(Document):
-	def validate(self):
-		if (
-			self.temporary_against_account_number
-			and len(self.temporary_against_account_number) != self.account_number_length
-		):
-			throw(
-				_("Temporary Against Account Number must be {0} digits long").format(
-					self.account_number_length
-				)
-			)
-
-		if (
-			self.opening_against_account_number
-			and len(self.opening_against_account_number) != self.account_number_length
-		):
-			throw(
-				_("Opening Against Account Number must be {0} digits long").format(self.account_number_length)
-			)
+	pass

erpnext/regional/report/datev/datev.py

@@ -132,12 +132,8 @@ def execute(filters=None):
 	"""Entry point for frappe."""
 	data = []
 	if filters and validate(filters):
-		temp, opening = frappe.get_value(
-			"DATEV Settings",
-			filters.get("company"),
-			["temporary_against_account_number", "opening_against_account_number"],
-		)
-		filters.update({"against_account": temp, "opening_account": opening or temp})
+		fn = "temporary_against_account_number"
+		filters[fn] = frappe.get_value("DATEV Settings", filters.get("company"), fn)
 		data = get_transactions(filters, as_dict=0)
 
 	return COLUMNS, data
@@ -319,7 +315,7 @@ def run_query(filters, extra_fields, extra_joins, extra_filters, as_dict=1):
 			acc.account_number as 'Konto',
 
 			/* against number or, if empty, party against number */
-			CASE gl.is_opening when 'Yes' then %(opening_account)s else %(against_account)s end as 'Gegenkonto (ohne BU-Schlüssel)',
+			%(temporary_against_account_number)s as 'Gegenkonto (ohne BU-Schlüssel)',
 
 			'' as 'BU-Schlüssel',
 
@@ -534,22 +530,18 @@ def download_datev_csv(filters):
 		filters = json.loads(filters)
 
 	validate(filters)
-
 	company = filters.get("company")
-	fiscal_year = get_fiscal_year(date=filters.get("from_date"), company=company)
-	coa = frappe.get_value("Company", company, "chart_of_accounts")
-	datev_settings = frappe.get_doc("DATEV Settings", company)
 
-	filters.update(
-		{
-			"fiscal_year_start": fiscal_year[1],
-			"skr": "04" if "SKR04" in coa else ("03" if "SKR03" in coa else ""),
-			"account_number_length": datev_settings.account_number_length,
-			"against_account": datev_settings.temporary_against_account_number,
-			"opening_account": datev_settings.opening_against_account_number
-			or datev_settings.temporary_against_account_number,
-		}
-	)
+	fiscal_year = get_fiscal_year(date=filters.get("from_date"), company=company)
+	filters["fiscal_year_start"] = fiscal_year[1]
+
+	# set chart of accounts used
+	coa = frappe.get_value("Company", company, "chart_of_accounts")
+	filters["skr"] = "04" if "SKR04" in coa else ("03" if "SKR03" in coa else "")
+
+	datev_settings = frappe.get_doc("DATEV Settings", company)
+	filters["account_number_length"] = datev_settings.account_number_length
+	filters["temporary_against_account_number"] = datev_settings.temporary_against_account_number
 
 	transactions = get_transactions(filters)
 	account_names = get_account_names(filters)

erpnext/regional/report/datev/test_datev.py

@@ -139,9 +139,7 @@ def make_datev_settings(company):
 				"client": company.name,
 				"client_number": "12345",
 				"consultant_number": "67890",
-				"account_number_length": 4,
 				"temporary_against_account_number": "9999",
-				"opening_against_account_number": "9000",
 			}
 		).insert()
 
@@ -154,8 +152,7 @@ class TestDatev(TestCase):
 			"company": self.company.name,
 			"from_date": today(),
 			"to_date": today(),
-			"against_account": "9999",
-			"opening_account": "9000",
+			"temporary_against_account_number": "9999",
 		}
 
 		make_datev_settings(self.company)

erpnext/regional/report/gst_itemised_purchase_register/gst_itemised_purchase_register.py

@@ -28,7 +28,7 @@ def execute(filters=None):
 			"gst_category",
 			"export_type",
 			"ecommerce_gstin",
-			"`tabPurchase Invoice Item`.gst_hsn_code",
+			"gst_hsn_code",
 			"bill_no",
 			"bill_date",
 		],

erpnext/regional/report/gst_itemised_sales_register/gst_itemised_sales_register.py

@@ -39,7 +39,7 @@ def execute(filters=None):
 		"gst_category",
 		"export_type",
 		"ecommerce_gstin",
-		"`tabSales Invoice Item`.gst_hsn_code",
+		"gst_hsn_code",
 	]
 
 	additional_conditions = get_conditions(filters, additional_query_columns)

erpnext/regional/report/professional_tax_deductions/professional_tax_deductions.py

@@ -21,14 +21,16 @@ def get_columns(filters):
 	columns = [
 		{
 			"label": _("Employee"),
+			"options": "Employee",
 			"fieldname": "employee",
 			"fieldtype": "Link",
-			"options": "Employee",
 			"width": 200,
 		},
 		{
 			"label": _("Employee Name"),
+			"options": "Employee",
 			"fieldname": "employee_name",
+			"fieldtype": "Link",
 			"width": 160,
 		},
 		{"label": _("Amount"), "fieldname": "amount", "fieldtype": "Currency", "width": 140},

erpnext/regional/report/provident_fund_deductions/provident_fund_deductions.py

@@ -18,14 +18,16 @@ def get_columns(filters):
 	columns = [
 		{
 			"label": _("Employee"),
+			"options": "Employee",
 			"fieldname": "employee",
 			"fieldtype": "Link",
-			"options": "Employee",
 			"width": 200,
 		},
 		{
 			"label": _("Employee Name"),
+			"options": "Employee",
 			"fieldname": "employee_name",
+			"fieldtype": "Link",
 			"width": 160,
 		},
 		{"label": _("PF Account"), "fieldname": "pf_account", "fieldtype": "Data", "width": 140},

erpnext/regional/saudi_arabia/setup.py

@@ -35,7 +35,6 @@ def add_print_formats():
 
 
 def add_permissions():
-	frappe.reload_doc("regional", "doctype", "ksa_vat_setting", force=True)
 	"""Add Permissions for KSA VAT Setting."""
 	add_permission("KSA VAT Setting", "All", 0)
 	for role in ("Accounts Manager", "Accounts User", "System Manager"):

erpnext/stock/doctype/purchase_receipt/purchase_receipt.py

@@ -113,7 +113,6 @@ class PurchaseReceipt(BuyingController):
 			self.set_status()
 
 		self.po_required()
-		self.validate_items_quality_inspection()
 		self.validate_with_previous_doc()
 		self.validate_uom_is_integer("uom", ["qty", "received_qty"])
 		self.validate_uom_is_integer("stock_uom", "stock_qty")
@@ -184,26 +183,6 @@ class PurchaseReceipt(BuyingController):
 				if not d.purchase_order:
 					frappe.throw(_("Purchase Order number required for Item {0}").format(d.item_code))
 
-	def validate_items_quality_inspection(self):
-		for item in self.get("items"):
-			if item.quality_inspection:
-				qi = frappe.db.get_value(
-					"Quality Inspection",
-					item.quality_inspection,
-					["reference_type", "reference_name", "item_code"],
-					as_dict=True,
-				)
-
-				if qi.reference_type != self.doctype or qi.reference_name != self.name:
-					msg = f"""Row #{item.idx}: Please select a valid Quality Inspection with Reference Type
-						{frappe.bold(self.doctype)} and Reference Name {frappe.bold(self.name)}."""
-					frappe.throw(_(msg))
-
-				if qi.item_code != item.item_code:
-					msg = f"""Row #{item.idx}: Please select a valid Quality Inspection with Item Code
-						{frappe.bold(item.item_code)}."""
-					frappe.throw(_(msg))
-
 	def get_already_received_qty(self, po, po_detail):
 		qty = frappe.db.sql(
 			"""select sum(qty) from `tabPurchase Receipt Item`

erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py

@@ -1849,121 +1849,6 @@ class TestPurchaseReceipt(FrappeTestCase):
 		pr.items[0].delivery_note_item = delivery_note_item
 		pr.save()
 
-	def test_purchase_receipt_with_backdated_landed_cost_voucher(self):
-		from erpnext.controllers.sales_and_purchase_return import make_return_doc
-		from erpnext.stock.doctype.landed_cost_voucher.test_landed_cost_voucher import (
-			create_landed_cost_voucher,
-		)
-		from erpnext.stock.doctype.stock_entry.test_stock_entry import make_stock_entry
-
-		item_code = "_Test Purchase Item With Landed Cost"
-		create_item(item_code)
-
-		warehouse = create_warehouse("_Test Purchase Warehouse With Landed Cost")
-		warehouse1 = create_warehouse("_Test Purchase Warehouse With Landed Cost 1")
-		warehouse2 = create_warehouse("_Test Purchase Warehouse With Landed Cost 2")
-		warehouse3 = create_warehouse("_Test Purchase Warehouse With Landed Cost 3")
-
-		pr = make_purchase_receipt(
-			item_code=item_code,
-			warehouse=warehouse,
-			posting_date=add_days(today(), -10),
-			posting_time="10:59:59",
-			qty=100,
-			rate=275.00,
-		)
-
-		pr_return = make_return_doc("Purchase Receipt", pr.name)
-		pr_return.posting_date = add_days(today(), -9)
-		pr_return.items[0].qty = 2 * -1
-		pr_return.items[0].received_qty = 2 * -1
-		pr_return.submit()
-
-		ste1 = make_stock_entry(
-			purpose="Material Transfer",
-			posting_date=add_days(today(), -8),
-			source=warehouse,
-			target=warehouse1,
-			item_code=item_code,
-			qty=20,
-			company=pr.company,
-		)
-
-		ste1.reload()
-		self.assertEqual(ste1.items[0].valuation_rate, 275.00)
-
-		ste2 = make_stock_entry(
-			purpose="Material Transfer",
-			posting_date=add_days(today(), -7),
-			source=warehouse,
-			target=warehouse2,
-			item_code=item_code,
-			qty=20,
-			company=pr.company,
-		)
-
-		ste2.reload()
-		self.assertEqual(ste2.items[0].valuation_rate, 275.00)
-
-		ste3 = make_stock_entry(
-			purpose="Material Transfer",
-			posting_date=add_days(today(), -6),
-			source=warehouse,
-			target=warehouse3,
-			item_code=item_code,
-			qty=20,
-			company=pr.company,
-		)
-
-		ste3.reload()
-		self.assertEqual(ste3.items[0].valuation_rate, 275.00)
-
-		ste4 = make_stock_entry(
-			purpose="Material Transfer",
-			posting_date=add_days(today(), -5),
-			source=warehouse1,
-			target=warehouse,
-			item_code=item_code,
-			qty=20,
-			company=pr.company,
-		)
-
-		ste4.reload()
-		self.assertEqual(ste4.items[0].valuation_rate, 275.00)
-
-		ste5 = make_stock_entry(
-			purpose="Material Transfer",
-			posting_date=add_days(today(), -4),
-			source=warehouse,
-			target=warehouse1,
-			item_code=item_code,
-			qty=20,
-			company=pr.company,
-		)
-
-		ste5.reload()
-		self.assertEqual(ste5.items[0].valuation_rate, 275.00)
-
-		create_landed_cost_voucher("Purchase Receipt", pr.name, pr.company, charges=2500 * -1)
-
-		pr.reload()
-		valuation_rate = pr.items[0].valuation_rate
-
-		ste1.reload()
-		self.assertEqual(ste1.items[0].valuation_rate, valuation_rate)
-
-		ste2.reload()
-		self.assertEqual(ste2.items[0].valuation_rate, valuation_rate)
-
-		ste3.reload()
-		self.assertEqual(ste3.items[0].valuation_rate, valuation_rate)
-
-		ste4.reload()
-		self.assertEqual(ste4.items[0].valuation_rate, valuation_rate)
-
-		ste5.reload()
-		self.assertEqual(ste5.items[0].valuation_rate, valuation_rate)
-
 
 def prepare_data_for_internal_transfer():
 	from erpnext.accounts.doctype.sales_invoice.test_sales_invoice import create_internal_supplier

erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json

@@ -204,7 +204,6 @@
    "fieldname": "received_qty",
    "fieldtype": "Float",
    "label": "Received Quantity",
-   "no_copy": 1,
    "oldfieldname": "received_qty",
    "oldfieldtype": "Currency",
    "print_hide": 1,
@@ -994,7 +993,7 @@
  "idx": 1,
  "istable": 1,
  "links": [],
- "modified": "2023-07-02 18:40:48.152637",
+ "modified": "2022-10-12 03:37:59.516609",
  "modified_by": "Administrator",
  "module": "Stock",
  "name": "Purchase Receipt Item",
@@ -1005,4 +1004,4 @@
  "sort_field": "modified",
  "sort_order": "DESC",
  "states": []
-}
+}

erpnext/stock/doctype/stock_entry/stock_entry.json

@@ -122,8 +122,7 @@
    "oldfieldname": "purpose",
    "oldfieldtype": "Select",
    "options": "Material Issue\nMaterial Receipt\nMaterial Transfer\nMaterial Transfer for Manufacture\nMaterial Consumption for Manufacture\nManufacture\nRepack\nSend to Subcontractor",
-   "read_only": 1,
-   "search_index": 1
+   "read_only": 1
   },
   {
    "fieldname": "company",
@@ -620,7 +619,7 @@
  "index_web_pages_for_search": 1,
  "is_submittable": 1,
  "links": [],
- "modified": "2023-06-19 18:23:40.748114",
+ "modified": "2022-05-02 05:21:39.060501",
  "modified_by": "Administrator",
  "module": "Stock",
  "name": "Stock Entry",

erpnext/stock/doctype/warehouse/warehouse.js

@@ -13,11 +13,10 @@ frappe.ui.form.on("Warehouse", {
 			};
 		});
 
-		frm.set_query("parent_warehouse", function (doc) {
+		frm.set_query("parent_warehouse", function () {
 			return {
 				filters: {
 					is_group: 1,
-					company: doc.company,
 				},
 			};
 		});

erpnext/stock/stock_ledger.py

@@ -502,7 +502,6 @@ class update_entries_after(object):
 	def update_distinct_item_warehouses(self, dependant_sle):
 		key = (dependant_sle.item_code, dependant_sle.warehouse)
 		val = frappe._dict({"sle": dependant_sle})
-
 		if key not in self.distinct_item_warehouses:
 			self.distinct_item_warehouses[key] = val
 			self.new_items_found = True
@@ -514,9 +513,6 @@ class update_entries_after(object):
 				val.sle_changed = True
 				self.distinct_item_warehouses[key] = val
 				self.new_items_found = True
-			elif self.distinct_item_warehouses[key].get("reposting_status"):
-				self.distinct_item_warehouses[key] = val
-				self.new_items_found = True
 
 	def process_sle(self, sle):
 		from erpnext.stock.doctype.serial_no.serial_no import get_serial_nos
@@ -1158,8 +1154,6 @@ def get_sle_by_voucher_detail_no(voucher_detail_no, excluded_sle=None):
 		[
 			"item_code",
 			"warehouse",
-			"actual_qty",
-			"qty_after_transaction",
 			"posting_date",
 			"posting_time",
 			"timestamp(posting_date, posting_time) as timestamp",

erpnext/translations/de.csv

@@ -9896,11 +9896,3 @@ Total Equity,Eigenkapital,
 Warehouse wise Stock Value,Warenwert nach Lager,
 Discount Validity,Frist für den Rabatt,
 Discount Validity Based On,Frist für den Rabatt berechnet sich nach,
-Account Number Length,Kontonummer Länge,
-Temporary Against Account Number,Temporäre Gegenkontonummer,
-Change DATEV Settings,DATEV-Einstellungen ändern,
-Opening Against Account Number,Gegenkontonummer für Eröffnungsbuchungen,
-Will be used as against account for all normal ledger entries,Wird als Gegenkonto für alle normalen Buchungen verwendet,
-Will be used as against account for opening ledger entries,Wird als Gegenkonto für alle Eröffnungsbuchungen verwendet,
-Temporary Against Account Number must be {0} digits long,Temporäre Gegenkontonummer muss {0} Ziffern lang sein,
-Opening Against Account Number must be {0} digits long,Gegenkontonummer für Eröffnungsbuchungen muss {0} Ziffern lang sein,

erpnext/translations/nl.csv

@@ -875,7 +875,7 @@ Donor,schenker,
 Donor Type information.,Donor Type informatie.,
 Donor information.,Donorinformatie.,
 Download JSON,JSON downloaden,
-Draft,Concept,
+Draft,Droogte,
 Drop Ship,Drop Ship,
 Drug,drug,
 Due / Reference Date cannot be after {0},Verval- / Referentiedatum kan niet na {0} zijn,
@@ -4280,7 +4280,7 @@ Failed to setup defaults for country {0}. Please contact support@erpnext.com,Kan
 Row #{0}: Item {1} is not a Serialized/Batched Item. It cannot have a Serial No/Batch No against it.,Rij # {0}: artikel {1} is geen geserialiseerd / batch artikel. Het kan geen serienummer / batchnummer hebben.,
 Please set {0},Stel {0} in,
 Please set {0},Stel {0} in,supplier
-Draft,Concept,"docstatus,=,0"
+Draft,Droogte,"docstatus,=,0"
 Cancelled,Geannuleerd,"docstatus,=,2"
 Please setup Instructor Naming System in Education > Education Settings,Stel het instructeursysteem in onder onderwijs> onderwijsinstellingen,
 Please set Naming Series for {0} via Setup > Settings > Naming Series,Stel Naming Series in op {0} via Instellingen> Instellingen> Naming Series,
@@ -8192,7 +8192,7 @@ Actual Batch Quantity,Werkelijke batchhoeveelheid,
 Prevdoc DocType,Prevdoc DocType,
 Parent Detail docname,Bovenliggende Detail docname,
 "Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Genereren van pakbonnen voor pakketten te leveren. Gebruikt voor pakket nummer, inhoud van de verpakking en het gewicht te melden.",
-Indicates that the package is a part of this delivery (Only Draft),Geeft aan dat het pakket een onderdeel is van deze levering (alleen concept),
+Indicates that the package is a part of this delivery (Only Draft),Geeft aan dat het pakket een onderdeel is van deze levering (alleen ontwerp),
 MAT-PAC-.YYYY.-,MAT-PAC-.YYYY.-,
 From Package No.,Van Pakket No,
 Identification of the package for the delivery (for print),Identificatie van het pakket voor de levering (voor afdrukken),

requirements.txt

@@ -1,7 +1,7 @@
 # frappe   # https://github.com/frappe/frappe is installed during bench-init
 gocardless-pro~=1.22.0
 googlemaps  # used in ERPNext, but dependency is defined in Frappe
-pandas>=1.1.5,<2.0.0
+pandas~=1.1.5
 plaid-python~=7.2.1
 pycountry~=20.7.3
 PyGithub~=1.54.1
@@ -10,4 +10,4 @@ python-youtube~=0.8.0
 taxjar~=1.9.2
 tweepy~=3.10.0
 Unidecode~=1.2.0
-redisearch==2.0.0
+redisearch==2.0.0