ci: disable test orchestrator v13

.github/helper/.flake8_strict

@@ -66,8 +66,7 @@ ignore =
     F841,
     E713,
     E712,
-    B023,
-    B028
+    B023
 
 
 max-line-length = 200

.github/helper/documentation.py

@@ -3,71 +3,52 @@ from urllib.parse import urlparse
 
 import requests
 
-WEBSITE_REPOS = [
+docs_repos = [
+	"frappe_docs",
+	"erpnext_documentation",
 	"erpnext_com",
 	"frappe_io",
 ]
 
-DOCUMENTATION_DOMAINS = [
-	"docs.erpnext.com",
-	"frappeframework.com",
-]
 
+def uri_validator(x):
+	result = urlparse(x)
+	return all([result.scheme, result.netloc, result.path])
 
-def is_valid_url(url: str) -> bool:
-	parts = urlparse(url)
-	return all((parts.scheme, parts.netloc, parts.path))
-
-
-def is_documentation_link(word: str) -> bool:
-	if not word.startswith("http") or not is_valid_url(word):
-		return False
-
-	parsed_url = urlparse(word)
-	if parsed_url.netloc in DOCUMENTATION_DOMAINS:
-		return True
-
-	if parsed_url.netloc == "github.com":
-		parts = parsed_url.path.split("/")
-		if len(parts) == 5 and parts[1] == "frappe" and parts[2] in WEBSITE_REPOS:
-			return True
-
-	return False
-
-
-def contains_documentation_link(body: str) -> bool:
-	return any(
-		is_documentation_link(word)
-		for line in body.splitlines()
-		for word in line.split()
-	)
-
-
-def check_pull_request(number: str) -> "tuple[int, str]":
-	response = requests.get(f"https://api.github.com/repos/frappe/erpnext/pulls/{number}")
-	if not response.ok:
-		return 1, "Pull Request Not Found! ⚠️"
-
-	payload = response.json()
-	title = (payload.get("title") or "").lower().strip()
-	head_sha = (payload.get("head") or {}).get("sha")
-	body = (payload.get("body") or "").lower()
-
-	if (
-		not title.startswith("feat")
-		or not head_sha
-		or "no-docs" in body
-		or "backport" in body
-	):
-		return 0, "Skipping documentation checks... 🏃"
-
-	if contains_documentation_link(body):
-		return 0, "Documentation Link Found. You're Awesome! 🎉"
-
-	return 1, "Documentation Link Not Found! ⚠️"
+def docs_link_exists(body):
+	for line in body.splitlines():
+		for word in line.split():
+			if word.startswith('http') and uri_validator(word):
+				parsed_url = urlparse(word)
+				if parsed_url.netloc == "github.com":
+					parts = parsed_url.path.split('/')
+					if len(parts) == 5 and parts[1] == "frappe" and parts[2] in docs_repos:
+						return True
+				elif parsed_url.netloc == "docs.erpnext.com":
+					return True
 
 
 if __name__ == "__main__":
-	exit_code, message = check_pull_request(sys.argv[1])
-	print(message)
-	sys.exit(exit_code)
+	pr = sys.argv[1]
+	response = requests.get("https://api.github.com/repos/frappe/erpnext/pulls/{}".format(pr))
+
+	if response.ok:
+		payload = response.json()
+		title = (payload.get("title") or "").lower().strip()
+		head_sha = (payload.get("head") or {}).get("sha")
+		body = (payload.get("body") or "").lower()
+
+		if (title.startswith("feat")
+			and head_sha
+			and "no-docs" not in body
+			and "backport" not in body
+		):
+			if docs_link_exists(body):
+				print("Documentation Link Found. You're Awesome! 🎉")
+
+			else:
+				print("Documentation Link Not Found! ⚠️")
+				sys.exit(1)
+
+		else:
+			print("Skipping documentation checks... 🏃")

.github/workflows/docs-checker.yml

@@ -12,7 +12,7 @@ jobs:
       - name: 'Setup Environment'
         uses: actions/setup-python@v2
         with:
-          python-version: '3.10'
+          python-version: 3.6
 
       - name: 'Clone repo'
         uses: actions/checkout@v2

.github/workflows/linters.yml

@@ -11,10 +11,10 @@ jobs:
     steps:
       - uses: actions/checkout@v2
 
-      - name: Set up Python 3.10
+      - name: Set up Python 3.8
         uses: actions/setup-python@v2
         with:
-          python-version: '3.10'
+          python-version: 3.8
 
       - name: Install and Run Pre-commit
         uses: pre-commit/action@v2.0.3
@@ -22,8 +22,10 @@ jobs:
       - name: Download Semgrep rules
         run: git clone --depth 1 https://github.com/frappe/semgrep-rules.git frappe-semgrep-rules
 
-      - name: Download semgrep
-        run: pip install semgrep
-
-      - name: Run Semgrep rules
-        run: semgrep ci --config ./frappe-semgrep-rules/rules --config r/python.lang.correctness
+      - uses: returntocorp/semgrep-action@v1
+        env:
+            SEMGREP_TIMEOUT: 120
+        with:
+            config: >-
+              r/python.lang.correctness
+              ./frappe-semgrep-rules/rules

.github/workflows/patch.yml

@@ -14,7 +14,7 @@ concurrency:
 
 jobs:
   test:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-18.04
     timeout-minutes: 60
 
     name: Patch Test

.github/workflows/release.yml

@@ -13,10 +13,10 @@ jobs:
         with:
           fetch-depth: 0
           persist-credentials: false
-      - name: Setup Node.js
+      - name: Setup Node.js v14
         uses: actions/setup-node@v2
         with:
-          node-version: 18
+          node-version: 14
       - name: Setup dependencies
         run: |
           npm install @semantic-release/git @semantic-release/exec --no-save
@@ -28,4 +28,4 @@ jobs:
           GIT_AUTHOR_EMAIL: "developers@frappe.io"
           GIT_COMMITTER_NAME: "Frappe PR Bot"
           GIT_COMMITTER_EMAIL: "developers@frappe.io"
-        run: npx semantic-release
+        run: npx semantic-release

.github/workflows/release_notes.yml

@@ -1,38 +0,0 @@
-# This action:
-#
-# 1. Generates release notes using github API.
-# 2. Strips unnecessary info like chore/style etc from notes.
-# 3. Updates release info.
-
-# This action needs to be maintained on all branches that do releases.
-
-name: 'Release Notes'
-
-on:
-  workflow_dispatch:
-    inputs:
-      tag_name:
-        description: 'Tag of release like v13.0.0'
-        required: true
-        type: string
-  release:
-    types: [released]
-
-permissions:
-  contents: read
-
-jobs:
-  regen-notes:
-    name: 'Regenerate release notes'
-    runs-on: ubuntu-latest
-
-    steps:
-    - name: Update notes
-      run: |
-        NEW_NOTES=$(gh api --method POST -H "Accept: application/vnd.github+json"  /repos/frappe/erpnext/releases/generate-notes  -f tag_name=$RELEASE_TAG | jq -r '.body' | sed  -E '/^\* (chore|ci|test|docs|style)/d' )
-        RELEASE_ID=$(gh api -H "Accept: application/vnd.github+json" /repos/frappe/erpnext/releases/tags/$RELEASE_TAG | jq -r '.id')
-        gh api --method PATCH -H "Accept: application/vnd.github+json" /repos/frappe/erpnext/releases/$RELEASE_ID -f body="$NEW_NOTES"
-
-      env:
-        GH_TOKEN: ${{ secrets.RELEASE_TOKEN }}
-        RELEASE_TAG: ${{ github.event.inputs.tag_name || github.event.release.tag_name }}

.github/workflows/server-tests.yml

@@ -18,7 +18,7 @@ concurrency:
 
 jobs:
   test:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-18.04
     timeout-minutes: 60
 
     strategy:

.github/workflows/translation_linter.yml

@@ -8,7 +8,7 @@ on:
 jobs:
   check_translation:
     name: Translation Syntax Check
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-18.04
     steps:
     - uses: actions/checkout@v2
     - name: Setup python3

.pre-commit-config.yaml

@@ -16,8 +16,8 @@ repos:
       - id: check-merge-conflict
       - id: check-ast
 
-  - repo: https://github.com/PyCQA/flake8
-    rev: 5.0.4
+  - repo: https://gitlab.com/pycqa/flake8
+    rev: 3.9.2
     hooks:
       - id: flake8
         additional_dependencies: [
@@ -32,8 +32,8 @@ repos:
       - id: black
         additional_dependencies: ['click==8.0.4']
 
-  - repo: https://github.com/PyCQA/isort
-    rev: 5.12.0
+  - repo: https://github.com/timothycrosley/isort
+    rev: 5.9.1
     hooks:
       - id: isort
         exclude: ".*setup.py$"

CODEOWNERS

@@ -3,13 +3,14 @@
 # These owners will be the default owners for everything in
 # the repo. Unless a later match takes precedence,
 
-erpnext/accounts/               @deepeshgarg007 @ruthra-kumar
-erpnext/assets/                 @anandbaburajan @deepeshgarg007
-erpnext/loan_management/        @deepeshgarg007
-erpnext/regional                @deepeshgarg007 @ruthra-kumar
-erpnext/selling                 @deepeshgarg007 @ruthra-kumar
-erpnext/support/                @deepeshgarg007
-pos*
+erpnext/accounts/               @nextchamp-saqib @deepeshgarg007 @ruthra-kumar
+erpnext/assets/                 @nextchamp-saqib @deepeshgarg007 @ruthra-kumar
+erpnext/erpnext_integrations/   @nextchamp-saqib
+erpnext/loan_management/        @nextchamp-saqib @deepeshgarg007
+erpnext/regional                @nextchamp-saqib @deepeshgarg007 @ruthra-kumar
+erpnext/selling                 @nextchamp-saqib @deepeshgarg007 @ruthra-kumar
+erpnext/support/                @nextchamp-saqib @deepeshgarg007
+pos*                            @nextchamp-saqib
 
 erpnext/buying/                 @rohitwaghchaure @s-aga-r
 erpnext/maintenance/            @rohitwaghchaure @s-aga-r
@@ -17,10 +18,16 @@ erpnext/manufacturing/          @rohitwaghchaure @s-aga-r
 erpnext/quality_management/     @rohitwaghchaure @s-aga-r
 erpnext/stock/                  @rohitwaghchaure @s-aga-r
 
-erpnext/controllers             @deepeshgarg007 @rohitwaghchaure
-erpnext/patches/                @deepeshgarg007 @rohitwaghchaure
-requirements.txt                @ankush
 
-.github/                        @deepeshgarg007
-pyproject.toml                  @ankush
+erpnext/healthcare/             @chillaranand
+erpnext/hr/                     @ruchamahabal
+erpnext/non_profit/             @ruchamahabal
+erpnext/payroll                 @ruchamahabal
+erpnext/projects/               @ruchamahabal
 
+erpnext/controllers             @deepeshgarg007 @nextchamp-saqib @rohitwaghchaure @marination
+erpnext/patches/                @deepeshgarg007 @nextchamp-saqib @rohitwaghchaure
+erpnext/public/                 @nextchamp-saqib @marination
+
+.github/                        @ankush
+requirements.txt                @gavindsouza @ankush

erpnext/__init__.py

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

erpnext/accounts/deferred_revenue.py

@@ -378,7 +378,7 @@ def book_deferred_income_or_expense(doc, deferred_process, posting_date=None):
 			return
 
 		# check if books nor frozen till endate:
-		if accounts_frozen_upto and getdate(end_date) <= getdate(accounts_frozen_upto):
+		if accounts_frozen_upto and (end_date) <= getdate(accounts_frozen_upto):
 			end_date = get_last_day(add_days(accounts_frozen_upto, 1))
 
 		if via_journal_entry:

erpnext/accounts/doctype/account/chart_of_accounts/verified/de_kontenplan_SKR03_gnucash.json

@@ -1,38 +1,38 @@
 {
-	"country_code": "de",
-	"name": "SKR03 mit Kontonummern",
-	"tree": {
-		"Aktiva": {
-			"is_group": 1,
+    "country_code": "de",
+    "name": "SKR03 mit Kontonummern",
+    "tree": {
+        "Aktiva": {
+            "is_group": 1,
 			"root_type": "Asset",
-			"A - Anlagevermögen": {
-				"is_group": 1,
-				"EDV-Software": {
-					"account_number": "0027",
-					"account_type": "Fixed Asset"
-				},
-				"Geschäftsausstattung": {
-					"account_number": "0410",
-					"account_type": "Fixed Asset"
-				},
-				"Büroeinrichtung": {
-					"account_number": "0420",
-					"account_type": "Fixed Asset"
-				},
-				"Darlehen": {
-					"account_number": "0565"
-				},
-				"Maschinen": {
-					"account_number": "0210",
-					"account_type": "Fixed Asset"
-				},
-				"Betriebsausstattung": {
-					"account_number": "0400",
-					"account_type": "Fixed Asset"
-				},
-				"Ladeneinrichtung": {
-					"account_number": "0430",
-					"account_type": "Fixed Asset"
+            "A - Anlagevermögen": {
+                "is_group": 1,
+                "EDV-Software": {
+                    "account_number": "0027",
+                    "account_type": "Fixed Asset"
+                },
+                "Gesch\u00e4ftsausstattung": {
+                    "account_number": "0410",
+                    "account_type": "Fixed Asset"
+                },
+                "B\u00fcroeinrichtung": {
+                    "account_number": "0420",
+                    "account_type": "Fixed Asset"
+                },
+                "Darlehen": {
+                    "account_number": "0565"
+                },
+                "Maschinen": {
+                    "account_number": "0210",
+                    "account_type": "Fixed Asset"
+                },
+                "Betriebsausstattung": {
+                    "account_number": "0400",
+                    "account_type": "Fixed Asset"
+                },
+                "Ladeneinrichtung": {
+                    "account_number": "0430",
+                    "account_type": "Fixed Asset"
 				},
 				"Accumulated Depreciation": {
 					"account_type": "Accumulated Depreciation"
@@ -60,46 +60,36 @@
 					"Durchlaufende Posten": {
 						"account_number": "1590"
 					},
-					"Verrechnungskonto Gewinnermittlung § 4 Abs. 3 EStG, nicht ergebniswirksam": {
+					"Gewinnermittlung \u00a74/3 nicht Ergebniswirksam": {
 						"account_number": "1371"
 					},
 					"Abziehbare Vorsteuer": {
+						"account_type": "Tax",
 						"is_group": 1,
-						"Abziehbare Vorsteuer 7 %": {
-							"account_number": "1571",
-							"account_type": "Tax",
-							"tax_rate": 7.0
+						"Abziehbare Vorsteuer 7%": {
+							"account_number": "1571"
 						},
-						"Abziehbare Vorsteuer 19 %": {
-							"account_number": "1576",
-							"account_type": "Tax",
-							"tax_rate": 19.0
+						"Abziehbare Vorsteuer 19%": {
+							"account_number": "1576"
 						},
-						"Abziehbare Vorsteuer nach § 13b UStG 19 %": {
-							"account_number": "1577",
-							"account_type": "Tax",
-							"tax_rate": 19.0
+						"Abziehbare Vorsteuer nach \u00a713b UStG 19%": {
+							"account_number": "1577"
+						},
+						"Leistungen \u00a713b UStG 19% Vorsteuer, 19% Umsatzsteuer": {
+							"account_number": "3120"
 						}
 					}
 				},
 				"III. Wertpapiere": {
-					"is_group": 1,
-					"Anteile an verbundenen Unternehmen (Umlaufvermögen)": {
-						"account_number": "1340"
-					},
-					"Anteile an herrschender oder mit Mehrheit beteiligter Gesellschaft": {
-						"account_number": "1344"
-					},
-					"Sonstige Wertpapiere": {
-						"account_number": "1348"
-					}
+					"is_group": 1
 				},
 				"IV. Kassenbestand, Bundesbankguthaben, Guthaben bei Kreditinstituten und Schecks.": {
 					"is_group": 1,
 					"Kasse": {
-						"is_group": 1,
 						"account_type": "Cash",
+						"is_group": 1,
 						"Kasse": {
+							"is_group": 1,
 							"account_number": "1000",
 							"account_type": "Cash"
 						}
@@ -121,21 +111,21 @@
 			"C - Rechnungsabgrenzungsposten": {
 				"is_group": 1,
 				"Aktive Rechnungsabgrenzung": {
-					"account_number": "0980"
+                    "account_number": "0980"
 				}
 			},
 			"D - Aktive latente Steuern": {
 				"is_group": 1,
 				"Aktive latente Steuern": {
-					"account_number": "0983"
+                    "account_number": "0983"
 				}
 			},
 			"E - Aktiver Unterschiedsbetrag aus der Vermögensverrechnung": {
 				"is_group": 1
 			}
-		},
-		"Passiva": {
-			"is_group": 1,
+        },
+        "Passiva": {
+            "is_group": 1,
 			"root_type": "Liability",
 			"A. Eigenkapital": {
 				"is_group": 1,
@@ -210,32 +200,26 @@
 					},
 					"Umsatzsteuer": {
 						"is_group": 1,
-						"Umsatzsteuer 7 %": {
-							"account_number": "1771",
-							"account_type": "Tax",
-							"tax_rate": 7.0
+						"account_type": "Tax",
+						"Umsatzsteuer 7%": {
+							"account_number": "1771"
 						},
-						"Umsatzsteuer 19 %": {
-							"account_number": "1776",
-							"account_type": "Tax",
-							"tax_rate": 19.0
+						"Umsatzsteuer 19%": {
+							"account_number": "1776"
 						},
 						"Umsatzsteuer-Vorauszahlung": {
-							"account_number": "1780",
-							"account_type": "Tax"
+							"account_number": "1780"
 						},
 						"Umsatzsteuer-Vorauszahlung 1/11": {
 							"account_number": "1781"
 						},
-						"Umsatzsteuer nach § 13b UStG 19 %": {
-							"account_number": "1787",
-							"account_type": "Tax",
-							"tax_rate": 19.0
+						"Umsatzsteuer \u00a7 13b UStG 19%": {
+							"account_number": "1787"
 						},
 						"Umsatzsteuer Vorjahr": {
 							"account_number": "1790"
 						},
-						"Umsatzsteuer frühere Jahre": {
+						"Umsatzsteuer fr\u00fchere Jahre": {
 							"account_number": "1791"
 						}
 					}
@@ -250,56 +234,44 @@
 			"E. Passive latente Steuern": {
 				"is_group": 1
 			}
-		},
-		"Erlöse u. Erträge 2/8": {
-			"is_group": 1,
-			"root_type": "Income",
-			"Erlöskonten 8": {
+        },
+        "Erl\u00f6se u. Ertr\u00e4ge 2/8": {
+            "is_group": 1,
+            "root_type": "Income",
+            "Erl\u00f6skonten 8": {
 				"is_group": 1,
-				"Erlöse": {
-					"account_number": "8200",
-					"account_type": "Income Account"
-				},
-				"Erlöse USt. 19 %": {
-					"account_number": "8400",
-					"account_type": "Income Account"
-				},
-				"Erlöse USt. 7 %": {
-					"account_number": "8300",
-					"account_type": "Income Account"
-				}
-			},
-			"Ertragskonten 2": {
-				"is_group": 1,
-				"sonstige Zinsen und ähnliche Erträge": {
-					"account_number": "2650",
-					"account_type": "Income Account"
-				},
-				"Außerordentliche Erträge": {
-					"account_number": "2500",
-					"account_type": "Income Account"
-				},
-				"Sonstige Erträge": {
-					"account_number": "2700",
-					"account_type": "Income Account"
-				}
-			}
-		},
-		"Aufwendungen 2/4": {
-			"is_group": 1,
+				"Erl\u00f6se": {
+                    "account_number": "8200",
+                    "account_type": "Income Account"
+                },
+                "Erl\u00f6se USt. 19%": {
+                    "account_number": "8400",
+                    "account_type": "Income Account"
+                },
+                "Erl\u00f6se USt. 7%": {
+                    "account_number": "8300",
+                    "account_type": "Income Account"
+                }
+            },
+            "Ertragskonten 2": {
+                "is_group": 1,
+                "sonstige Zinsen und \u00e4hnliche Ertr\u00e4ge": {
+                    "account_number": "2650",
+                    "account_type": "Income Account"
+                },
+                "Au\u00dferordentliche Ertr\u00e4ge": {
+                    "account_number": "2500",
+                    "account_type": "Income Account"
+                },
+                "Sonstige Ertr\u00e4ge": {
+                    "account_number": "2700",
+                    "account_type": "Income Account"
+                }
+            }
+        },
+        "Aufwendungen 2/4": {
+            "is_group": 1,
 			"root_type": "Expense",
-			"Fremdleistungen": {
-				"account_number": "3100",
-				"account_type": "Expense Account"
-			},
-			"Fremdleistungen ohne Vorsteuer": {
-				"account_number": "3109",
-				"account_type": "Expense Account"
-			},
-			"Bauleistungen eines im Inland ansässigen Unternehmers 19 % Vorsteuer und 19 % Umsatzsteuer": {
-				"account_number": "3120",
-				"account_type": "Expense Account"
-			},
 			"Wareneingang": {
 				"account_number": "3200"
 			},
@@ -326,234 +298,234 @@
 			"Gegenkonto 4996-4998": {
 				"account_number": "4999"
 			},
-			"Abschreibungen": {
-				"is_group": 1,
+            "Abschreibungen": {
+                "is_group": 1,
 				"Abschreibungen auf Sachanlagen (ohne AfA auf Kfz und Gebäude)": {
-					"account_number": "4830",
-					"account_type": "Accumulated Depreciation"
+                    "account_number": "4830",
+                    "account_type": "Accumulated Depreciation"
 				},
 				"Abschreibungen auf Gebäude": {
-					"account_number": "4831",
-					"account_type": "Depreciation"
+                    "account_number": "4831",
+                    "account_type": "Depreciation"
 				},
 				"Abschreibungen auf Kfz": {
-					"account_number": "4832",
-					"account_type": "Depreciation"
+                    "account_number": "4832",
+                    "account_type": "Depreciation"
 				},
 				"Sofortabschreibung GWG": {
-					"account_number": "4855",
-					"account_type": "Expense Account"
+                    "account_number": "4855",
+                    "account_type": "Expense Account"
 				}
-			},
-			"Kfz-Kosten": {
-				"is_group": 1,
-				"Kfz-Steuer": {
-					"account_number": "4510",
-					"account_type": "Expense Account"
-				},
-				"Kfz-Versicherungen": {
-					"account_number": "4520",
-					"account_type": "Expense Account"
-				},
-				"laufende Kfz-Betriebskosten": {
-					"account_number": "4530",
-					"account_type": "Expense Account"
-				},
-				"Kfz-Reparaturen": {
-					"account_number": "4540",
-					"account_type": "Expense Account"
-				},
-				"Fremdfahrzeuge": {
-					"account_number": "4570",
-					"account_type": "Expense Account"
-				},
-				"sonstige Kfz-Kosten": {
-					"account_number": "4580",
-					"account_type": "Expense Account"
-				}
-			},
-			"Personalkosten": {
-				"is_group": 1,
-				"Gehälter": {
-					"account_number": "4120",
-					"account_type": "Expense Account"
-				},
-				"gesetzliche soziale Aufwendungen": {
-					"account_number": "4130",
-					"account_type": "Expense Account"
-				},
-				"Aufwendungen für Altersvorsorge": {
-					"account_number": "4165",
-					"account_type": "Expense Account"
-				},
-				"Vermögenswirksame Leistungen": {
-					"account_number": "4170",
-					"account_type": "Expense Account"
-				},
-				"Aushilfslöhne": {
-					"account_number": "4190",
-					"account_type": "Expense Account"
-				}
-			},
-			"Raumkosten": {
-				"is_group": 1,
-				"Miete und Nebenkosten": {
-					"account_number": "4210",
-					"account_type": "Expense Account"
-				},
-				"Gas, Wasser, Strom (Verwaltung, Vertrieb)": {
-					"account_number": "4240",
-					"account_type": "Expense Account"
-				},
-				"Reinigung": {
-					"account_number": "4250",
-					"account_type": "Expense Account"
-				}
-			},
-			"Reparatur/Instandhaltung": {
-				"is_group": 1,
-				"Reparaturen und Instandhaltungen von anderen Anlagen und Betriebs- und Geschäftsausstattung": {
-					"account_number": "4805",
-					"account_type": "Expense Account"
-				}
-			},
-			"Versicherungsbeiträge": {
-				"is_group": 1,
-				"Versicherungen": {
-					"account_number": "4360",
-					"account_type": "Expense Account"
-				},
-				"Beiträge": {
-					"account_number": "4380",
-					"account_type": "Expense Account"
-				},
-				"sonstige Ausgaben": {
-					"account_number": "4390",
-					"account_type": "Expense Account"
-				},
-				"steuerlich abzugsfähige Verspätungszuschläge und Zwangsgelder": {
-					"account_number": "4396",
-					"account_type": "Expense Account"
-				}
-			},
-			"Werbe-/Reisekosten": {
-				"is_group": 1,
-				"Werbekosten": {
-					"account_number": "4610",
-					"account_type": "Expense Account"
-				},
-				"Aufmerksamkeiten": {
-					"account_number": "4653",
-					"account_type": "Expense Account"
-				},
-				"nicht abzugsfähige Betriebsausg. aus Werbe-, Repräs.- u. Reisekosten": {
-					"account_number": "4665",
-					"account_type": "Expense Account"
-				},
-				"Reisekosten Unternehmer": {
-					"account_number": "4670",
-					"account_type": "Expense Account"
-				}
-			},
-			"verschiedene Kosten": {
-				"is_group": 1,
-				"Porto": {
-					"account_number": "4910",
-					"account_type": "Expense Account"
-				},
-				"Telekom": {
-					"account_number": "4920",
-					"account_type": "Expense Account"
-				},
-				"Mobilfunk D2": {
-					"account_number": "4921",
-					"account_type": "Expense Account"
-				},
-				"Internet": {
-					"account_number": "4922",
-					"account_type": "Expense Account"
-				},
-				"Bürobedarf": {
-					"account_number": "4930",
-					"account_type": "Expense Account"
-				},
-				"Zeitschriften, Bücher": {
-					"account_number": "4940",
-					"account_type": "Expense Account"
-				},
-				"Fortbildungskosten": {
-					"account_number": "4945",
-					"account_type": "Expense Account"
-				},
-				"Buchführungskosten": {
-					"account_number": "4955",
-					"account_type": "Expense Account"
-				},
-				"Abschluß- u. Prüfungskosten": {
-					"account_number": "4957",
-					"account_type": "Expense Account"
-				},
-				"Nebenkosten des Geldverkehrs": {
-					"account_number": "4970",
-					"account_type": "Expense Account"
-				},
-				"Werkzeuge und Kleingeräte": {
-					"account_number": "4985",
-					"account_type": "Expense Account"
-				}
-			},
-			"Zinsaufwendungen": {
-				"is_group": 1,
-				"Zinsaufwendungen für kurzfristige Verbindlichkeiten": {
-					"account_number": "2110",
-					"account_type": "Expense Account"
-				},
-				"Zinsaufwendungen für KFZ Finanzierung": {
-					"account_number": "2121",
-					"account_type": "Expense Account"
-				}
-			}
-		},
-		"Anfangsbestand 9": {
-			"is_group": 1,
-			"root_type": "Equity",
-			"Saldenvortragskonten": {
-				"is_group": 1,
-				"Saldenvortrag Sachkonten": {
-					"account_number": "9000"
-				},
-				"Saldenvorträge Debitoren": {
-					"account_number": "9008"
-				},
-				"Saldenvorträge Kreditoren": {
-					"account_number": "9009"
-				}
-			}
-		},
-		"Privatkonten 1": {
-			"is_group": 1,
-			"root_type": "Equity",
-			"Privatentnahmen/-einlagen": {
-				"is_group": 1,
-				"Privatentnahme allgemein": {
-					"account_number": "1800"
-				},
-				"Privatsteuern": {
-					"account_number": "1810"
-				},
-				"Sonderausgaben beschränkt abzugsfähig": {
-					"account_number": "1820"
-				},
-				"Sonderausgaben unbeschränkt abzugsfähig": {
-					"account_number": "1830"
-				},
-				"Außergewöhnliche Belastungen": {
-					"account_number": "1850"
-				},
-				"Privateinlagen": {
-					"account_number": "1890"
-				}
-			}
-		}
-	}
+            },
+            "Kfz-Kosten": {
+                "is_group": 1,
+                "Kfz-Steuer": {
+                    "account_number": "4510",
+                    "account_type": "Expense Account"
+                },
+                "Kfz-Versicherungen": {
+                    "account_number": "4520",
+                    "account_type": "Expense Account"
+                },
+                "laufende Kfz-Betriebskosten": {
+                    "account_number": "4530",
+                    "account_type": "Expense Account"
+                },
+                "Kfz-Reparaturen": {
+                    "account_number": "4540",
+                    "account_type": "Expense Account"
+                },
+                "Fremdfahrzeuge": {
+                    "account_number": "4570",
+                    "account_type": "Expense Account"
+                },
+                "sonstige Kfz-Kosten": {
+                    "account_number": "4580",
+                    "account_type": "Expense Account"
+                }
+            },
+            "Personalkosten": {
+                "is_group": 1,
+                "Geh\u00e4lter": {
+                    "account_number": "4120",
+                    "account_type": "Expense Account"
+                },
+                "gesetzliche soziale Aufwendungen": {
+                    "account_number": "4130",
+                    "account_type": "Expense Account"
+                },
+                "Aufwendungen f\u00fcr Altersvorsorge": {
+                    "account_number": "4165",
+                    "account_type": "Expense Account"
+                },
+                "Verm\u00f6genswirksame Leistungen": {
+                    "account_number": "4170",
+                    "account_type": "Expense Account"
+                },
+                "Aushilfsl\u00f6hne": {
+                    "account_number": "4190",
+                    "account_type": "Expense Account"
+                }
+            },
+            "Raumkosten": {
+                "is_group": 1,
+                "Miete und Nebenkosten": {
+                    "account_number": "4210",
+                    "account_type": "Expense Account"
+                },
+                "Gas, Wasser, Strom (Verwaltung, Vertrieb)": {
+                    "account_number": "4240",
+                    "account_type": "Expense Account"
+                },
+                "Reinigung": {
+                    "account_number": "4250",
+                    "account_type": "Expense Account"
+                }
+            },
+            "Reparatur/Instandhaltung": {
+                "is_group": 1,
+                "Reparatur u. Instandh. von Anlagen/Maschinen u. Betriebs- u. Gesch\u00e4ftsausst.": {
+                    "account_number": "4805",
+                    "account_type": "Expense Account"
+                }
+            },
+            "Versicherungsbeitr\u00e4ge": {
+                "is_group": 1,
+                "Versicherungen": {
+                    "account_number": "4360",
+                    "account_type": "Expense Account"
+                },
+                "Beitr\u00e4ge": {
+                    "account_number": "4380",
+                    "account_type": "Expense Account"
+                },
+                "sonstige Ausgaben": {
+                    "account_number": "4390",
+                    "account_type": "Expense Account"
+                },
+                "steuerlich abzugsf\u00e4hige Versp\u00e4tungszuschl\u00e4ge und Zwangsgelder": {
+                    "account_number": "4396",
+                    "account_type": "Expense Account"
+                }
+            },
+            "Werbe-/Reisekosten": {
+                "is_group": 1,
+                "Werbekosten": {
+                    "account_number": "4610",
+                    "account_type": "Expense Account"
+                },
+                "Aufmerksamkeiten": {
+                    "account_number": "4653",
+                    "account_type": "Expense Account"
+                },
+                "nicht abzugsf\u00e4hige Betriebsausg. aus Werbe-, Repr\u00e4s.- u. Reisekosten": {
+                    "account_number": "4665",
+                    "account_type": "Expense Account"
+                },
+                "Reisekosten Unternehmer": {
+                    "account_number": "4670",
+                    "account_type": "Expense Account"
+                }
+            },
+            "verschiedene Kosten": {
+                "is_group": 1,
+                "Porto": {
+                    "account_number": "4910",
+                    "account_type": "Expense Account"
+                },
+                "Telekom": {
+                    "account_number": "4920",
+                    "account_type": "Expense Account"
+                },
+                "Mobilfunk D2": {
+                    "account_number": "4921",
+                    "account_type": "Expense Account"
+                },
+                "Internet": {
+                    "account_number": "4922",
+                    "account_type": "Expense Account"
+                },
+                "B\u00fcrobedarf": {
+                    "account_number": "4930",
+                    "account_type": "Expense Account"
+                },
+                "Zeitschriften, B\u00fccher": {
+                    "account_number": "4940",
+                    "account_type": "Expense Account"
+                },
+                "Fortbildungskosten": {
+                    "account_number": "4945",
+                    "account_type": "Expense Account"
+                },
+                "Buchf\u00fchrungskosten": {
+                    "account_number": "4955",
+                    "account_type": "Expense Account"
+                },
+                "Abschlu\u00df- u. Pr\u00fcfungskosten": {
+                    "account_number": "4957",
+                    "account_type": "Expense Account"
+                },
+                "Nebenkosten des Geldverkehrs": {
+                    "account_number": "4970",
+                    "account_type": "Expense Account"
+                },
+                "Werkzeuge und Kleinger\u00e4te": {
+                    "account_number": "4985",
+                    "account_type": "Expense Account"
+                }
+            },
+            "Zinsaufwendungen": {
+                "is_group": 1,
+                "Zinsaufwendungen f\u00fcr kurzfristige Verbindlichkeiten": {
+                    "account_number": "2110",
+                    "account_type": "Expense Account"
+                },
+                "Zinsaufwendungen f\u00fcr KFZ Finanzierung": {
+                    "account_number": "2121",
+                    "account_type": "Expense Account"
+                }
+            }
+        },
+        "Anfangsbestand 9": {
+            "is_group": 1,
+            "root_type": "Equity",
+            "Saldenvortragskonten": {
+                "is_group": 1,
+                "Saldenvortrag Sachkonten": {
+                    "account_number": "9000"
+                },
+                "Saldenvortr\u00e4ge Debitoren": {
+                    "account_number": "9008"
+                },
+                "Saldenvortr\u00e4ge Kreditoren": {
+                    "account_number": "9009"
+                }
+            }
+        },
+        "Privatkonten 1": {
+            "is_group": 1,
+            "root_type": "Equity",
+            "Privatentnahmen/-einlagen": {
+                "is_group": 1,
+                "Privatentnahme allgemein": {
+                    "account_number": "1800"
+                },
+                "Privatsteuern": {
+                    "account_number": "1810"
+                },
+                "Sonderausgaben beschr\u00e4nkt abzugsf\u00e4hig": {
+                    "account_number": "1820"
+                },
+                "Sonderausgaben unbeschr\u00e4nkt abzugsf\u00e4hig": {
+                    "account_number": "1830"
+                },
+                "Au\u00dfergew\u00f6hnliche Belastungen": {
+                    "account_number": "1850"
+                },
+                "Privateinlagen": {
+                    "account_number": "1890"
+                }
+            }
+        }
+    }
 }

erpnext/accounts/doctype/account/test_account.py

@@ -297,7 +297,7 @@ def _make_test_records(verbose=None):
 		# fixed asset depreciation
 		["_Test Fixed Asset", "Current Assets", 0, "Fixed Asset", None],
 		["_Test Accumulated Depreciations", "Current Assets", 0, "Accumulated Depreciation", None],
-		["_Test Depreciations", "Expenses", 0, "Depreciation", None],
+		["_Test Depreciations", "Expenses", 0, None, None],
 		["_Test Gain/Loss on Asset Disposal", "Expenses", 0, None, None],
 		# Receivable / Payable Account
 		["_Test Receivable", "Current Assets", 0, "Receivable", None],

erpnext/accounts/doctype/accounting_dimension_filter/accounting_dimension_filter.js

@@ -3,6 +3,10 @@
 
 frappe.ui.form.on('Accounting Dimension Filter', {
 	refresh: function(frm, cdt, cdn) {
+		if (frm.doc.accounting_dimension) {
+			frm.set_df_property('dimensions', 'label', frm.doc.accounting_dimension, cdn, 'dimension_value');
+		}
+
 		let help_content =
 			`<table class="table table-bordered" style="background-color: var(--scrollbar-track-color);">
 				<tr><td>
@@ -64,7 +68,6 @@ frappe.ui.form.on('Accounting Dimension Filter', {
 		frm.clear_table("dimensions");
 		let row = frm.add_child("dimensions");
 		row.accounting_dimension = frm.doc.accounting_dimension;
-		frm.fields_dict["dimensions"].grid.update_docfield_property("dimension_value", "label", frm.doc.accounting_dimension);
 		frm.refresh_field("dimensions");
 		frm.trigger('setup_filters');
 	},

erpnext/accounts/doctype/accounts_settings/accounts_settings.js

@@ -4,12 +4,6 @@
 frappe.ui.form.on('Accounts Settings', {
 	refresh: function(frm) {
 
-	},
-	validate_access_key(frm) {
-		frappe.call({
-			doc: frm.doc,
-			method: "validate_access_key"
-		});
 	}
 });
 

erpnext/accounts/doctype/accounts_settings/accounts_settings.json

@@ -26,7 +26,6 @@
   "determine_address_tax_category_from",
   "column_break_19",
   "add_taxes_from_item_tax_template",
-  "book_tax_discount_loss",
   "period_closing_settings_section",
   "acc_frozen_upto",
   "frozen_accounts_modifier",
@@ -40,16 +39,11 @@
   "submit_journal_entries",
   "print_settings",
   "show_inclusive_tax_in_print",
-  "show_taxes_as_table_in_print",
   "column_break_12",
   "show_payment_schedule_in_print",
   "currency_exchange_section",
   "allow_stale",
   "stale_days",
-  "service_provider",
-  "column_break_eiyok",
-  "access_key",
-  "validate_access_key",
   "report_settings_sb",
   "use_custom_cash_flow"
  ],
@@ -180,7 +174,6 @@
   },
   {
    "default": "0",
-   "description": "Payment Terms from orders will be fetched into the invoices as is",
    "fieldname": "automatically_fetch_payment_terms",
    "fieldtype": "Check",
    "label": "Automatically Fetch Payment Terms from Order"
@@ -286,56 +279,19 @@
    "label": "Enable Common Party Accounting"
   },
   {
-   "default": "0",
-   "description": "Enabling this will allow creation of multi-currency invoices against single party account in company currency",
-   "fieldname": "allow_multi_currency_invoices_against_single_party_account",
-   "fieldtype": "Check",
-   "label": "Allow multi-currency invoices against single party account"
-  },
-  {
-   "default": "0",
-   "description": "Split Early Payment Discount Loss into Income and Tax Loss",
-   "fieldname": "book_tax_discount_loss",
-   "fieldtype": "Check",
-   "label": "Book Tax Loss on Early Payment Discount"
-  },
-  {
-   "default": "0",
-   "fieldname": "show_taxes_as_table_in_print",
-   "fieldtype": "Check",
-   "label": "Show Taxes as Table in Print"
-  },
-  {
-   "default": "frankfurter.app",
-   "fieldname": "service_provider",
-   "fieldtype": "Select",
-   "label": "Service Provider",
-   "options": "frankfurter.app\nexchangerate.host"
-  },
-  {
-   "depends_on": "eval:doc.service_provider == \"exchangerate.host\"",
-   "description": "Access Key is mandatory for exchangerate.host",
-   "fieldname": "access_key",
-   "fieldtype": "Data",
-   "label": "Access Key"
-  },
-  {
-   "depends_on": "eval:doc.service_provider == \"exchangerate.host\"",
-   "fieldname": "validate_access_key",
-   "fieldtype": "Button",
-   "label": "Validate Access Key"
-  },
-  {
-   "fieldname": "column_break_eiyok",
-   "fieldtype": "Column Break"
-  }
+    "default": "0",
+    "description": "Enabling this will allow creation of multi-currency invoices against single party account in company currency",
+    "fieldname": "allow_multi_currency_invoices_against_single_party_account",
+    "fieldtype": "Check",
+    "label": "Allow multi-currency invoices against single party account"
+   }
  ],
  "icon": "icon-cog",
  "idx": 1,
  "index_web_pages_for_search": 1,
  "issingle": 1,
  "links": [],
- "modified": "2023-10-07 14:20:01.779208",
+ "modified": "2022-07-11 13:37:50.605141",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Accounts Settings",

erpnext/accounts/doctype/accounts_settings/accounts_settings.py

@@ -8,43 +8,12 @@ import frappe
 from frappe import _
 from frappe.custom.doctype.property_setter.property_setter import make_property_setter
 from frappe.model.document import Document
-from frappe.utils import cint, nowdate
+from frappe.utils import cint
 
 from erpnext.stock.utils import check_pending_reposting
 
 
 class AccountsSettings(Document):
-	@frappe.whitelist()
-	def validate_access_key(self):
-		if self.service_provider == "exchangerate.host":
-			if not self.access_key:
-				frappe.throw(_("Access Key is required for exchangerate.host"))
-			else:
-				import requests
-
-				# Validate access key
-				api_url = "https://api.exchangerate.host/convert"
-				response = requests.get(
-					api_url,
-					params={
-						"access_key": self.access_key,
-						"transaction_date": nowdate(),
-						"amount": 1,
-						"from": "USD",
-						"to": "INR",
-					},
-				)
-				# exchangerate.host return 200 for all requests. Can't rely on it to raise exception
-				if not response.json()["success"]:
-					frappe.throw(
-						title=_("Service Provider Error"),
-						msg=_("Currency exchange rate serivce provider: {0} returned Error. {1}").format(
-							frappe.bold(self.service_provider), response.json()
-						),
-						exc=frappe.ValidationError,
-					)
-				frappe.msgprint(msg=_("Success"), title=_("Access Key Validation"))
-
 	def on_update(self):
 		frappe.clear_cache()
 

erpnext/accounts/doctype/bank_clearance/bank_clearance.py

@@ -56,7 +56,7 @@ class BankClearance(Document):
 			select
 				"Payment Entry" as payment_document, name as payment_entry,
 				reference_no as cheque_number, reference_date as cheque_date,
-				if(paid_from=%(account)s, paid_amount + total_taxes_and_charges, 0) as credit,
+				if(paid_from=%(account)s, paid_amount, 0) as credit,
 				if(paid_from=%(account)s, 0, received_amount) as debit,
 				posting_date, ifnull(party,if(paid_from=%(account)s,paid_to,paid_from)) as against_account, clearance_date,
 				if(paid_to=%(account)s, paid_to_account_currency, paid_from_account_currency) as account_currency

erpnext/accounts/doctype/bank_guarantee/bank_guarantee.js

@@ -43,13 +43,20 @@ frappe.ui.form.on('Bank Guarantee', {
 
 	reference_docname: function(frm) {
 		if (frm.doc.reference_docname && frm.doc.reference_doctype) {
+			let fields_to_fetch = ["grand_total"];
 			let party_field = frm.doc.reference_doctype == "Sales Order" ? "customer" : "supplier";
 
+			if (frm.doc.reference_doctype == "Sales Order") {
+				fields_to_fetch.push("project");
+			}
+
+			fields_to_fetch.push(party_field);
 			frappe.call({
-				method: "erpnext.accounts.doctype.bank_guarantee.bank_guarantee.get_voucher_details",
+				method: "erpnext.accounts.doctype.bank_guarantee.bank_guarantee.get_vouchar_detials",
 				args: {
-					"bank_guarantee_type": frm.doc.bg_type,
-					"reference_name": frm.doc.reference_docname
+					"column_list": fields_to_fetch,
+					"doctype": frm.doc.reference_doctype,
+					"docname": frm.doc.reference_docname
 				},
 				callback: function(r) {
 					if (r.message) {

erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py

@@ -2,8 +2,11 @@
 # For license information, please see license.txt
 
 
+import json
+
 import frappe
 from frappe import _
+from frappe.desk.search import sanitize_searchfield
 from frappe.model.document import Document
 
 
@@ -22,18 +25,14 @@ class BankGuarantee(Document):
 
 
 @frappe.whitelist()
-def get_voucher_details(bank_guarantee_type: str, reference_name: str):
-	if not isinstance(reference_name, str):
-		raise TypeError("reference_name must be a string")
-
-	fields_to_fetch = ["grand_total"]
-
-	if bank_guarantee_type == "Receiving":
-		doctype = "Sales Order"
-		fields_to_fetch.append("customer")
-		fields_to_fetch.append("project")
-	else:
-		doctype = "Purchase Order"
-		fields_to_fetch.append("supplier")
-
-	return frappe.db.get_value(doctype, reference_name, fields_to_fetch, as_dict=True)
+def get_vouchar_detials(column_list, doctype, docname):
+	column_list = json.loads(column_list)
+	for col in column_list:
+		sanitize_searchfield(col)
+	return frappe.db.sql(
+		""" select {columns} from `tab{doctype}` where name=%s""".format(
+			columns=", ".join(column_list), doctype=doctype
+		),
+		docname,
+		as_dict=1,
+	)[0]

erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py

@@ -299,7 +299,7 @@ def reconcile_vouchers(bank_transaction_name, vouchers):
 			dict(
 				account=account, voucher_type=voucher["payment_doctype"], voucher_no=voucher["payment_name"]
 			),
-			["credit_in_account_currency as credit", "debit_in_account_currency as debit"],
+			["credit", "debit"],
 			as_dict=1,
 		)
 		gl_amount, transaction_amount = (

erpnext/accounts/doctype/bank_transaction/bank_transaction.py

@@ -138,7 +138,7 @@ def get_paid_amount(payment_entry, currency, bank_account):
 				)
 			elif doc.payment_type == "Pay":
 				paid_amount_field = (
-					"paid_amount" if doc.paid_from_account_currency == currency else "base_paid_amount"
+					"paid_amount" if doc.paid_to_account_currency == currency else "base_paid_amount"
 				)
 
 		return frappe.db.get_value(

erpnext/accounts/doctype/fiscal_year/fiscal_year.py

@@ -169,6 +169,5 @@ def auto_create_fiscal_year():
 
 
 def get_from_and_to_date(fiscal_year):
-	fields = ["year_start_date", "year_end_date"]
-	cached_results = frappe.get_cached_value("Fiscal Year", fiscal_year, fields, as_dict=1)
-	return dict(from_date=cached_results.year_start_date, to_date=cached_results.year_end_date)
+	fields = ["year_start_date as from_date", "year_end_date as to_date"]
+	return frappe.db.get_value("Fiscal Year", fiscal_year, fields, as_dict=1)

erpnext/accounts/doctype/gl_entry/gl_entry.py

@@ -358,7 +358,6 @@ def update_outstanding_amt(
 	if against_voucher_type in ["Sales Invoice", "Purchase Invoice", "Fees"]:
 		ref_doc = frappe.get_doc(against_voucher_type, against_voucher)
 
-		bal = flt(bal, frappe.get_precision(against_voucher_type, "outstanding_amount"))
 		# Didn't use db_set for optimization purpose
 		ref_doc.outstanding_amount = bal
 		frappe.db.set_value(against_voucher_type, against_voucher, "outstanding_amount", bal)

erpnext/accounts/doctype/journal_entry/journal_entry.js

@@ -8,7 +8,7 @@ frappe.provide("erpnext.journal_entry");
 frappe.ui.form.on("Journal Entry", {
 	setup: function(frm) {
 		frm.add_fetch("bank_account", "account", "account");
-		frm.ignore_doctypes_on_cancel_all = ['Sales Invoice', 'Purchase Invoice', 'Asset', 'Asset Movement'];
+		frm.ignore_doctypes_on_cancel_all = ['Sales Invoice', 'Purchase Invoice'];
 	},
 
 	refresh: function(frm) {

erpnext/accounts/doctype/journal_entry/journal_entry.py

@@ -75,7 +75,6 @@ class JournalEntry(AccountsController):
 		self.validate_empty_accounts_table()
 		self.set_account_and_party_balance()
 		self.validate_inter_company_accounts()
-		self.validate_depr_entry_voucher_type()
 
 		if self.docstatus == 0:
 			self.apply_tax_withholding()
@@ -88,7 +87,6 @@ class JournalEntry(AccountsController):
 		self.check_credit_limit()
 		self.make_gl_entries()
 		self.update_advance_paid()
-		self.update_asset_value()
 		self.update_expense_claim()
 		self.update_inter_company_jv()
 		self.update_invoice_discounting()
@@ -135,13 +133,6 @@ class JournalEntry(AccountsController):
 				if self.total_credit != doc.total_debit or self.total_debit != doc.total_credit:
 					frappe.throw(_("Total Credit/ Debit Amount should be same as linked Journal Entry"))
 
-	def validate_depr_entry_voucher_type(self):
-		if (
-			any(d.account_type == "Depreciation" for d in self.get("accounts"))
-			and self.voucher_type != "Depreciation Entry"
-		):
-			frappe.throw(_("Journal Entry type should be set as Depreciation Entry for asset depreciation"))
-
 	def validate_stock_accounts(self):
 		stock_accounts = get_stock_accounts(self.company, self.doctype, self.name)
 		for account in stock_accounts:
@@ -244,34 +235,6 @@ class JournalEntry(AccountsController):
 		for d in to_remove:
 			self.remove(d)
 
-	def update_asset_value(self):
-		if self.flags.planned_depr_entry or self.voucher_type != "Depreciation Entry":
-			return
-
-		for d in self.get("accounts"):
-			if (
-				d.reference_type == "Asset"
-				and d.reference_name
-				and d.account_type == "Depreciation"
-				and d.debit
-			):
-				asset = frappe.get_doc("Asset", d.reference_name)
-
-				if asset.calculate_depreciation:
-					fb_idx = 1
-					if self.finance_book:
-						for fb_row in asset.get("finance_books"):
-							if fb_row.finance_book == self.finance_book:
-								fb_idx = fb_row.idx
-								break
-					fb_row = asset.get("finance_books")[fb_idx - 1]
-					fb_row.value_after_depreciation -= d.debit
-					fb_row.db_update()
-				else:
-					asset.db_set("value_after_depreciation", asset.value_after_depreciation - d.debit)
-
-				asset.set_status()
-
 	def update_inter_company_jv(self):
 		if (
 			self.voucher_type == "Inter Company Journal Entry"
@@ -331,44 +294,18 @@ class JournalEntry(AccountsController):
 
 	def unlink_asset_reference(self):
 		for d in self.get("accounts"):
-			if (
-				self.voucher_type == "Depreciation Entry"
-				and d.reference_type == "Asset"
-				and d.reference_name
-				and d.account_type == "Depreciation"
-				and d.debit
-			):
+			if d.reference_type == "Asset" and d.reference_name:
 				asset = frappe.get_doc("Asset", d.reference_name)
+				for s in asset.get("schedules"):
+					if s.journal_entry == self.name:
+						s.db_set("journal_entry", None)
 
-				if asset.calculate_depreciation:
-					fb_idx = None
-					for s in asset.get("schedules"):
-						if s.journal_entry == self.name:
-							s.db_set("journal_entry", None)
-							fb_idx = cint(s.finance_book_id) or 1
-							break
-					if not fb_idx:
-						fb_idx = 1
-						if self.finance_book:
-							for fb_row in asset.get("finance_books"):
-								if fb_row.finance_book == self.finance_book:
-									fb_idx = fb_row.idx
-									break
-					fb_row = asset.get("finance_books")[fb_idx - 1]
-					fb_row.value_after_depreciation += d.debit
-					fb_row.db_update()
-				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"
-				)
+						idx = cint(s.finance_book_id) or 1
+						finance_books = asset.get("finance_books")[idx - 1]
+						finance_books.value_after_depreciation += s.depreciation_amount
+						finance_books.db_update()
 
-				if journal_entry_for_scrap == self.name:
-					frappe.throw(
-						_("Journal Entry for Asset scrapping cannot be cancelled. Please restore the Asset.")
-					)
+						asset.set_status()
 
 	def unlink_inter_company_jv(self):
 		if (
@@ -400,15 +337,6 @@ class JournalEntry(AccountsController):
 							d.idx, d.account
 						)
 					)
-				elif (
-					d.party_type
-					and frappe.db.get_value("Party Type", d.party_type, "account_type") != account_type
-				):
-					frappe.throw(
-						_("Row {0}: Account {1} and Party Type {2} have different account types").format(
-							d.idx, d.account, d.party_type
-						)
-					)
 
 	def check_credit_limit(self):
 		customers = list(

erpnext/accounts/doctype/journal_entry_template/journal_entry_template.js

@@ -2,21 +2,6 @@
 // For license information, please see license.txt
 
 frappe.ui.form.on("Journal Entry Template", {
-	onload: function(frm) {
-		if(frm.is_new()) {
-			frappe.call({
-				type: "GET",
-				method: "erpnext.accounts.doctype.journal_entry_template.journal_entry_template.get_naming_series",
-				callback: function(r){
-					if(r.message) {
-						frm.set_df_property("naming_series", "options", r.message.split("\n"));
-						frm.set_value("naming_series", r.message.split("\n")[0]);
-						frm.refresh_field("naming_series");
-					}
-				}
-			});
-		}
-	},
 	refresh: function(frm) {
 		frappe.model.set_default_values(frm.doc);
 
@@ -34,6 +19,18 @@ frappe.ui.form.on("Journal Entry Template", {
 
 			return { filters: filters };
 		});
+
+		frappe.call({
+			type: "GET",
+			method: "erpnext.accounts.doctype.journal_entry_template.journal_entry_template.get_naming_series",
+			callback: function(r){
+				if(r.message){
+					frm.set_df_property("naming_series", "options", r.message.split("\n"));
+					frm.set_value("naming_series", r.message.split("\n")[0]);
+					frm.refresh_field("naming_series");
+				}
+			}
+		});
 	},
 	voucher_type: function(frm) {
 		var add_accounts = function(doc, r) {
@@ -48,6 +45,21 @@ frappe.ui.form.on("Journal Entry Template", {
 
 		frm.trigger("clear_child");
 		switch(frm.doc.voucher_type){
+			case "Opening Entry":
+				frm.set_value("is_opening", "Yes");
+				frappe.call({
+					type:"GET",
+					method: "erpnext.accounts.doctype.journal_entry.journal_entry.get_opening_accounts",
+					args: {
+						"company": frm.doc.company
+					},
+					callback: function(r) {
+						if(r.message) {
+							add_accounts(frm.doc, r.message);
+						}
+					}
+				});
+				break;
 			case "Bank Entry":
 			case "Cash Entry":
 				frappe.call({

erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js

@@ -20,6 +20,7 @@ frappe.ui.form.on('Opening Invoice Creation Tool', {
 				frm.dashboard.reset();
 				frm.doc.import_in_progress = true;
 			}
+			if (data.user != frappe.session.user) return;
 			if (data.count == data.total) {
 				setTimeout((title) => {
 					frm.doc.import_in_progress = false;

erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py

@@ -271,10 +271,10 @@ def publish(index, total, doctype):
 		dict(
 			title=_("Opening Invoice Creation In Progress"),
 			message=_("Creating {} out of {} {}").format(index + 1, total, doctype),
+			user=frappe.session.user,
 			count=index + 1,
 			total=total,
 		),
-		user=frappe.session.user,
 	)
 
 

erpnext/accounts/doctype/payment_entry/payment_entry.js

@@ -256,6 +256,8 @@ frappe.ui.form.on('Payment Entry', {
 		frm.set_currency_labels(["total_amount", "outstanding_amount", "allocated_amount"],
 			party_account_currency, "references");
 
+		frm.set_currency_labels(["amount"], company_currency, "deductions");
+
 		cur_frm.set_df_property("source_exchange_rate", "description",
 			("1 " + frm.doc.paid_from_account_currency + " = [?] " + company_currency));
 
@@ -623,7 +625,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 +655,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 +686,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 +710,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

@@ -7,16 +7,7 @@ from functools import reduce
 
 import frappe
 from frappe import ValidationError, _, scrub, throw
-from frappe.utils import (
-	cint,
-	comma_and,
-	comma_or,
-	flt,
-	fmt_money,
-	get_link_to_form,
-	getdate,
-	nowdate,
-)
+from frappe.utils import cint, comma_or, flt, getdate, nowdate
 from six import iteritems, string_types
 
 import erpnext
@@ -76,6 +67,7 @@ class PaymentEntry(AccountsController):
 		self.set_missing_values()
 		self.validate_payment_type()
 		self.validate_party_details()
+		self.validate_bank_accounts()
 		self.set_exchange_rate()
 		self.validate_mandatory()
 		self.validate_reference_documents()
@@ -159,99 +151,26 @@ class PaymentEntry(AccountsController):
 			)
 
 	def validate_allocated_amount(self):
-		if self.payment_type == "Internal Transfer":
-			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):
-		if self.references:
-			latest_references = get_outstanding_reference_documents(
-				{
-					"posting_date": self.posting_date,
-					"company": self.company,
-					"party_type": self.party_type,
-					"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,
-				}
-			)
-
-			# Group latest_references by (voucher_type, voucher_no)
-			latest_lookup = {}
-			for d in latest_references:
-				d = frappe._dict(d)
-				latest_lookup.update({(d.voucher_type, d.voucher_no): d})
-
-			for d in self.get("references"):
-				latest = latest_lookup.get((d.reference_doctype, d.reference_name))
-
-				# The reference has already been fully paid
-				if not latest:
+		for d in self.get("references"):
+			if (flt(d.allocated_amount)) > 0:
+				if flt(d.allocated_amount) > flt(d.outstanding_amount):
 					frappe.throw(
-						_("{0} {1} has already been fully paid.").format(_(d.reference_doctype), d.reference_name)
-					)
-				# The reference has already been partly paid
-				elif latest.outstanding_amount < latest.invoice_amount and flt(
-					d.outstanding_amount, d.precision("outstanding_amount")
-				) != flt(latest.outstanding_amount, d.precision("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."
-						).format(_(d.reference_doctype), d.reference_name)
+						_("Row #{0}: Allocated Amount cannot be greater than outstanding amount.").format(d.idx)
 					)
 
-				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))
-
-				# 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))
+			# Check for negative outstanding invoices as well
+			if flt(d.allocated_amount) < 0:
+				if flt(d.allocated_amount) < flt(d.outstanding_amount):
+					frappe.throw(
+						_("Row #{0}: Allocated Amount cannot be greater than outstanding amount.").format(d.idx)
+					)
 
 	def delink_advance_entry_references(self):
 		for reference in self.references:
 			if reference.reference_doctype in ("Sales Invoice", "Purchase Invoice"):
 				doc = frappe.get_doc(reference.reference_doctype, reference.reference_name)
-
-				repost_required = False
-				for adv_reference in doc.get("advances"):
-					if adv_reference.exchange_gain_loss != 0:
-						repost_required = True
-						break
-				if repost_required:
-					for item in doc.get("items"):
-						if item.get("enable_deferred_revenue") or item.get("enable_deferred_expense"):
-							frappe.msgprint(
-								_(
-									"Linked Invoice {0} has Exchange Gain/Loss GL entries due to this Payment. Submit a Journal manually to reverse its effects."
-								).format(get_link_to_form(doc.doctype, doc.name))
-							)
-							repost_required = False
-
 				doc.delink_advance_entries(self.name)
 
-				if repost_required:
-					doc.reload()
-					doc.docstatus = 2
-					doc.make_gl_entries()
-					doc.docstatus = 1
-					doc.make_gl_entries()
-
 	def set_missing_values(self):
 		if self.payment_type == "Internal Transfer":
 			for field in (
@@ -329,7 +248,24 @@ class PaymentEntry(AccountsController):
 	def validate_party_details(self):
 		if self.party:
 			if not frappe.db.exists(self.party_type, self.party):
-				frappe.throw(_("{0} {1} does not exist").format(_(self.party_type), self.party))
+				frappe.throw(_("Invalid {0}: {1}").format(self.party_type, self.party))
+
+			if self.party_account and self.party_type in ("Customer", "Supplier"):
+				self.validate_account_type(
+					self.party_account, [erpnext.get_party_account_type(self.party_type)]
+				)
+
+	def validate_bank_accounts(self):
+		if self.payment_type in ("Pay", "Internal Transfer"):
+			self.validate_account_type(self.paid_from, ["Bank", "Cash"])
+
+		if self.payment_type in ("Receive", "Internal Transfer"):
+			self.validate_account_type(self.paid_to, ["Bank", "Cash"])
+
+	def validate_account_type(self, account, account_types):
+		account_type = frappe.db.get_value("Account", account, "account_type")
+		# if account_type not in account_types:
+		# 	frappe.throw(_("Account Type for {0} must be {1}").format(account, comma_or(account_types)))
 
 	def set_exchange_rate(self, ref_doc=None):
 		self.set_source_exchange_rate(ref_doc)
@@ -386,9 +322,7 @@ class PaymentEntry(AccountsController):
 				continue
 			if d.reference_doctype not in valid_reference_doctypes:
 				frappe.throw(
-					_("Reference Doctype must be one of {0}").format(
-						comma_or((_(d) for d in valid_reference_doctypes))
-					)
+					_("Reference Doctype must be one of {0}").format(comma_or(valid_reference_doctypes))
 				)
 
 			elif d.reference_name:
@@ -401,7 +335,7 @@ class PaymentEntry(AccountsController):
 						if self.party != ref_doc.get(scrub(self.party_type)):
 							frappe.throw(
 								_("{0} {1} is not associated with {2} {3}").format(
-									_(d.reference_doctype), d.reference_name, _(self.party_type), self.party
+									d.reference_doctype, d.reference_name, self.party_type, self.party
 								)
 							)
 					else:
@@ -422,18 +356,18 @@ class PaymentEntry(AccountsController):
 						if ref_party_account != self.party_account:
 							frappe.throw(
 								_("{0} {1} is associated with {2}, but Party Account is {3}").format(
-									_(d.reference_doctype), d.reference_name, ref_party_account, self.party_account
+									d.reference_doctype, d.reference_name, ref_party_account, self.party_account
 								)
 							)
 
 						if ref_doc.doctype == "Purchase Invoice" and ref_doc.get("on_hold"):
 							frappe.throw(
-								_("{0} {1} is on hold").format(_(d.reference_doctype), d.reference_name),
-								title=_("Invalid Purchase Invoice"),
+								_("{0} {1} is on hold").format(d.reference_doctype, d.reference_name),
+								title=_("Invalid Invoice"),
 							)
 
 					if ref_doc.docstatus != 1:
-						frappe.throw(_("{0} {1} must be submitted").format(_(d.reference_doctype), d.reference_name))
+						frappe.throw(_("{0} {1} must be submitted").format(d.reference_doctype, d.reference_name))
 
 	def validate_paid_invoices(self):
 		no_oustanding_refs = {}
@@ -449,13 +383,14 @@ class PaymentEntry(AccountsController):
 				if outstanding_amount <= 0 and not is_return:
 					no_oustanding_refs.setdefault(d.reference_doctype, []).append(d)
 
-		for reference_doctype, references in no_oustanding_refs.items():
+		for k, v in no_oustanding_refs.items():
 			frappe.msgprint(
 				_(
-					"References {0} of type {1} had no outstanding amount left before submitting the Payment Entry. Now they have a negative outstanding amount."
+					"{} - {} now have {} as they had no outstanding amount left before submitting the Payment Entry."
 				).format(
-					frappe.bold(comma_and((d.reference_name for d in references))),
-					_(reference_doctype),
+					_(k),
+					frappe.bold(", ".join(d.reference_name for d in v)),
+					frappe.bold(_("negative outstanding amount")),
 				)
 				+ "<br><br>"
 				+ _("If this is undesirable please cancel the corresponding Payment Entry."),
@@ -490,7 +425,7 @@ class PaymentEntry(AccountsController):
 					if not valid:
 						frappe.throw(
 							_("Against Journal Entry {0} does not have any unmatched {1} entry").format(
-								d.reference_name, _(dr_or_cr)
+								d.reference_name, dr_or_cr
 							)
 						)
 
@@ -500,7 +435,7 @@ class PaymentEntry(AccountsController):
 
 		for ref in self.get("references"):
 			if ref.payment_term and ref.reference_name:
-				key = (ref.payment_term, ref.reference_name, ref.reference_doctype)
+				key = (ref.payment_term, ref.reference_name)
 				invoice_payment_amount_map.setdefault(key, 0.0)
 				invoice_payment_amount_map[key] += ref.allocated_amount
 
@@ -508,37 +443,20 @@ class PaymentEntry(AccountsController):
 					payment_schedule = frappe.get_all(
 						"Payment Schedule",
 						filters={"parent": ref.reference_name},
-						fields=[
-							"paid_amount",
-							"payment_amount",
-							"payment_term",
-							"discount",
-							"outstanding",
-							"discount_type",
-						],
+						fields=["paid_amount", "payment_amount", "payment_term", "discount", "outstanding"],
 					)
 					for term in payment_schedule:
-						invoice_key = (term.payment_term, ref.reference_name, ref.reference_doctype)
+						invoice_key = (term.payment_term, ref.reference_name)
 						invoice_paid_amount_map.setdefault(invoice_key, {})
 						invoice_paid_amount_map[invoice_key]["outstanding"] = term.outstanding
-						if not (term.discount_type and term.discount):
-							continue
-
-						if term.discount_type == "Percentage":
-							invoice_paid_amount_map[invoice_key]["discounted_amt"] = ref.total_amount * (
-								term.discount / 100
-							)
-						else:
-							invoice_paid_amount_map[invoice_key]["discounted_amt"] = term.discount
+						invoice_paid_amount_map[invoice_key]["discounted_amt"] = ref.total_amount * (
+							term.discount / 100
+						)
 
 		for idx, (key, allocated_amount) in enumerate(iteritems(invoice_payment_amount_map), 1):
 			if not invoice_paid_amount_map.get(key):
 				frappe.throw(_("Payment term {0} not used in {1}").format(key[0], key[1]))
 
-			allocated_amount = self.get_allocated_amount_in_transaction_currency(
-				allocated_amount, key[2], key[1]
-			)
-
 			outstanding = flt(invoice_paid_amount_map.get(key, {}).get("outstanding"))
 			discounted_amt = flt(invoice_paid_amount_map.get(key, {}).get("discounted_amt"))
 
@@ -557,7 +475,7 @@ class PaymentEntry(AccountsController):
 				if allocated_amount > outstanding:
 					frappe.throw(
 						_("Row #{0}: Cannot allocate more than {1} against payment term {2}").format(
-							idx, fmt_money(outstanding), key[0]
+							idx, outstanding, key[0]
 						)
 					)
 
@@ -573,33 +491,6 @@ class PaymentEntry(AccountsController):
 						(allocated_amount - discounted_amt, discounted_amt, allocated_amount, key[1], key[0]),
 					)
 
-	def get_allocated_amount_in_transaction_currency(
-		self, allocated_amount, reference_doctype, reference_docname
-	):
-		"""
-		Payment Entry could be in base currency while reference's payment schedule
-		is always in transaction currency.
-		E.g.
-		* SI with base=INR and currency=USD
-		* SI with payment schedule in USD
-		* PE in INR (accounting done in base currency)
-		"""
-		ref_currency, ref_exchange_rate = frappe.db.get_value(
-			reference_doctype, reference_docname, ["currency", "conversion_rate"]
-		)
-		is_single_currency = self.paid_from_account_currency == self.paid_to_account_currency
-		# PE in different currency
-		reference_is_multi_currency = self.paid_from_account_currency != ref_currency
-
-		if not (is_single_currency and reference_is_multi_currency):
-			return allocated_amount
-
-		allocated_amount = flt(
-			allocated_amount / ref_exchange_rate, self.precision("total_allocated_amount")
-		)
-
-		return allocated_amount
-
 	def set_status(self):
 		if self.docstatus == 2:
 			self.status = "Cancelled"
@@ -617,9 +508,7 @@ class PaymentEntry(AccountsController):
 		if not self.apply_tax_withholding_amount:
 			return
 
-		order_amount = self.get_order_net_total()
-
-		net_total = flt(order_amount) + flt(self.unallocated_amount)
+		net_total = self.paid_amount
 
 		# Adding args as purchase invoice to get TDS amount
 		args = frappe._dict(
@@ -664,20 +553,6 @@ class PaymentEntry(AccountsController):
 		for d in to_remove:
 			self.remove(d)
 
-	def get_order_net_total(self):
-		if self.party_type == "Supplier":
-			doctype = "Purchase Order"
-		else:
-			doctype = "Sales Order"
-
-		docnames = [d.reference_name for d in self.references if d.reference_doctype == doctype]
-
-		tax_withholding_net_total = frappe.db.get_value(
-			doctype, {"name": ["in", docnames]}, ["sum(base_net_total)"]
-		)
-
-		return tax_withholding_net_total
-
 	def apply_taxes(self):
 		self.initialize_taxes()
 		self.determine_exclusive_rate()
@@ -850,7 +725,7 @@ class PaymentEntry(AccountsController):
 					_("Cannot {0} {1} {2} without any negative outstanding invoice").format(
 						_(self.payment_type),
 						(_("to") if self.party_type == "Customer" else _("from")),
-						_(self.party_type),
+						self.party_type,
 					),
 					InvalidPaymentEntry,
 				)
@@ -858,7 +733,7 @@ class PaymentEntry(AccountsController):
 			elif paid_amount - additional_charges > total_negative_outstanding:
 				frappe.throw(
 					_("Paid Amount cannot be greater than total negative outstanding amount {0}").format(
-						fmt_money(total_negative_outstanding)
+						total_negative_outstanding
 					),
 					InvalidPaymentEntry,
 				)
@@ -1354,9 +1229,6 @@ def get_outstanding_reference_documents(args):
 	if args.get("party_type") == "Member":
 		return
 
-	if not args.get("get_outstanding_invoices") and not args.get("get_orders_to_be_billed"):
-		args["get_outstanding_invoices"] = True
-
 	# confirm that Supplier is not blocked
 	if args.get("party_type") == "Supplier":
 		supplier_status = get_supplier_block_status(args["party"])
@@ -1397,48 +1269,31 @@ 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"),
+		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"),
@@ -1449,22 +1304,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
@@ -1538,71 +1396,66 @@ def get_orders_to_be_billed(
 	cost_center=None,
 	filters=None,
 ):
-	voucher_type = None
 	if party_type == "Customer":
 		voucher_type = "Sales Order"
 	elif party_type == "Supplier":
 		voucher_type = "Purchase Order"
-
-	if not voucher_type:
-		return []
+	elif party_type == "Employee":
+		voucher_type = None
 
 	# Add cost center condition
-	doc = frappe.get_doc({"doctype": voucher_type})
-	condition = ""
-	if doc and hasattr(doc, "cost_center") and doc.cost_center:
-		condition = " and cost_center='%s'" % cost_center
+	if voucher_type:
+		doc = frappe.get_doc({"doctype": voucher_type})
+		condition = ""
+		if doc and hasattr(doc, "cost_center"):
+			condition = " and cost_center='%s'" % cost_center
 
-	if party_account_currency == company_currency:
-		grand_total_field = "base_grand_total"
-		rounded_total_field = "base_rounded_total"
-	else:
-		grand_total_field = "grand_total"
-		rounded_total_field = "rounded_total"
+	orders = []
+	if voucher_type:
+		if party_account_currency == company_currency:
+			grand_total_field = "base_grand_total"
+			rounded_total_field = "base_rounded_total"
+		else:
+			grand_total_field = "grand_total"
+			rounded_total_field = "rounded_total"
 
-	orders = frappe.db.sql(
-		"""
-		select
-			name as voucher_no,
-			if({rounded_total_field}, {rounded_total_field}, {grand_total_field}) as invoice_amount,
-			(if({rounded_total_field}, {rounded_total_field}, {grand_total_field}) - advance_paid) as outstanding_amount,
-			transaction_date as posting_date
-		from
-			`tab{voucher_type}`
-		where
-			{party_type} = %s
-			and docstatus = 1
-			and company = %s
-			and ifnull(status, "") != "Closed"
-			and if({rounded_total_field}, {rounded_total_field}, {grand_total_field}) > advance_paid
-			and abs(100 - per_billed) > 0.01
-			{condition}
-		order by
-			transaction_date, name
-	""".format(
-			**{
-				"rounded_total_field": rounded_total_field,
-				"grand_total_field": grand_total_field,
-				"voucher_type": voucher_type,
-				"party_type": scrub(party_type),
-				"condition": condition,
-			}
-		),
-		(party, company),
-		as_dict=True,
-	)
+		orders = frappe.db.sql(
+			"""
+			select
+				name as voucher_no,
+				if({rounded_total_field}, {rounded_total_field}, {grand_total_field}) as invoice_amount,
+				(if({rounded_total_field}, {rounded_total_field}, {grand_total_field}) - advance_paid) as outstanding_amount,
+				transaction_date as posting_date
+			from
+				`tab{voucher_type}`
+			where
+				{party_type} = %s
+				and docstatus = 1
+				and company = %s
+				and ifnull(status, "") != "Closed"
+				and if({rounded_total_field}, {rounded_total_field}, {grand_total_field}) > advance_paid
+				and abs(100 - per_billed) > 0.01
+				{condition}
+			order by
+				transaction_date, name
+		""".format(
+				**{
+					"rounded_total_field": rounded_total_field,
+					"grand_total_field": grand_total_field,
+					"voucher_type": voucher_type,
+					"party_type": scrub(party_type),
+					"condition": condition,
+				}
+			),
+			(party, company),
+			as_dict=True,
+		)
 
 	order_list = []
 	for d in orders:
-		if (
-			filters
-			and filters.get("outstanding_amt_greater_than")
-			and filters.get("outstanding_amt_less_than")
-			and not (
-				flt(filters.get("outstanding_amt_greater_than"))
-				<= flt(d.outstanding_amount)
-				<= flt(filters.get("outstanding_amt_less_than"))
-			)
+		if not (
+			flt(d.outstanding_amount) >= flt(filters.get("outstanding_amt_greater_than"))
+			and flt(d.outstanding_amount) <= flt(filters.get("outstanding_amt_less_than"))
 		):
 			continue
 
@@ -1623,8 +1476,6 @@ def get_negative_outstanding_invoices(
 	cost_center=None,
 	condition=None,
 ):
-	if party_type not in ["Customer", "Supplier"]:
-		return []
 	voucher_type = "Sales Invoice" if party_type == "Customer" else "Purchase Invoice"
 	supplier_condition = ""
 	if voucher_type == "Purchase Invoice":
@@ -1673,7 +1524,7 @@ def get_negative_outstanding_invoices(
 def get_party_details(company, party_type, party, date, cost_center=None):
 	bank_account = ""
 	if not frappe.db.exists(party_type, party):
-		frappe.throw(_("{0} {1} does not exist").format(_(party_type), party))
+		frappe.throw(_("Invalid {0}: {1}").format(party_type, party))
 
 	party_account = get_party_account(party_type, party, company)
 
@@ -1944,21 +1795,11 @@ def get_bill_no_and_update_amounts(
 
 
 @frappe.whitelist()
-def get_payment_entry(
-	dt,
-	dn,
-	party_amount=None,
-	bank_account=None,
-	bank_amount=None,
-	reference_date=None,
-):
+def get_payment_entry(dt, dn, party_amount=None, bank_account=None, bank_amount=None):
 	reference_doc = None
 	doc = frappe.get_doc(dt, dn)
-	over_billing_allowance = frappe.db.get_single_value("Accounts Settings", "over_billing_allowance")
-	if dt in ("Sales Order", "Purchase Order") and flt(doc.per_billed, 2) >= (
-		100.0 + over_billing_allowance
-	):
-		frappe.throw(_("Can only make payment against unbilled {0}").format(_(dt)))
+	if dt in ("Sales Order", "Purchase Order") and flt(doc.per_billed, 2) > 0:
+		frappe.throw(_("Can only make payment against unbilled {0}").format(dt))
 
 	party_type = set_party_type(dt)
 	party_account = set_party_account(dt, dn, doc, party_type)
@@ -1975,9 +1816,8 @@ def get_payment_entry(
 		dt, party_account_currency, bank, outstanding_amount, payment_type, bank_amount, doc
 	)
 
-	reference_date = getdate(reference_date)
-	paid_amount, received_amount, discount_amount, valid_discounts = apply_early_payment_discount(
-		paid_amount, received_amount, doc, party_account_currency, reference_date
+	paid_amount, received_amount, discount_amount = apply_early_payment_discount(
+		paid_amount, received_amount, doc
 	)
 
 	pe = frappe.new_doc("Payment Entry")
@@ -1985,7 +1825,6 @@ def get_payment_entry(
 	pe.company = doc.company
 	pe.cost_center = doc.get("cost_center")
 	pe.posting_date = nowdate()
-	pe.reference_date = reference_date
 	pe.mode_of_payment = doc.get("mode_of_payment")
 	pe.party_type = party_type
 	pe.party = doc.get(scrub(party_type))
@@ -2019,19 +1858,14 @@ def get_payment_entry(
 	if doc.doctype == "Purchase Invoice" and doc.invoice_is_blocked():
 		frappe.msgprint(_("{0} is on hold till {1}").format(doc.name, doc.release_date))
 	else:
-		if doc.doctype in (
-			"Sales Invoice",
-			"Purchase Invoice",
-			"Purchase Order",
-			"Sales Order",
-		) and frappe.get_value(
+		if doc.doctype in ("Sales Invoice", "Purchase Invoice") and frappe.get_value(
 			"Payment Terms Template",
 			{"name": doc.payment_terms_template},
 			"allocate_payment_based_on_payment_terms",
 		):
 
 			for reference in get_reference_as_per_payment_terms(
-				doc.payment_schedule, dt, dn, doc, grand_total, outstanding_amount, party_account_currency
+				doc.payment_schedule, dt, dn, doc, grand_total, outstanding_amount
 			):
 				pe.append("references", reference)
 		else:
@@ -2082,17 +1916,16 @@ def get_payment_entry(
 			reference_doc = doc
 		pe.set_exchange_rate(ref_doc=reference_doc)
 		pe.set_amounts()
-
 		if discount_amount:
-			base_total_discount_loss = 0
-			if frappe.db.get_single_value("Accounts Settings", "book_tax_discount_loss"):
-				base_total_discount_loss = split_early_payment_discount_loss(pe, doc, valid_discounts)
-
-			set_pending_discount_loss(
-				pe, doc, discount_amount, base_total_discount_loss, party_account_currency
+			pe.set_gain_or_loss(
+				account_details={
+					"account": frappe.get_cached_value("Company", pe.company, "default_discount_account"),
+					"cost_center": pe.cost_center
+					or frappe.get_cached_value("Company", pe.company, "cost_center"),
+					"amount": discount_amount * (-1 if payment_type == "Pay" else 1),
+				}
 			)
-
-		pe.set_difference_amount()
+			pe.set_difference_amount()
 
 	return pe
 
@@ -2228,30 +2061,20 @@ def set_paid_amount_and_received_amount(
 	return paid_amount, received_amount
 
 
-def apply_early_payment_discount(
-	paid_amount, received_amount, doc, party_account_currency, reference_date
-):
+def apply_early_payment_discount(paid_amount, received_amount, doc):
 	total_discount = 0
-	valid_discounts = []
 	eligible_for_payments = ["Sales Order", "Sales Invoice", "Purchase Order", "Purchase Invoice"]
 	has_payment_schedule = hasattr(doc, "payment_schedule") and doc.payment_schedule
 
 	if doc.doctype in eligible_for_payments and has_payment_schedule:
-		# Non eligible documents may not have `company_currency` field
-		is_multi_currency = party_account_currency != doc.company_currency
-
 		for term in doc.payment_schedule:
-			if not term.discounted_amount and term.discount and reference_date <= term.discount_date:
-
+			if not term.discounted_amount and term.discount and getdate(nowdate()) <= term.discount_date:
 				if term.discount_type == "Percentage":
-					grand_total = doc.get("grand_total") if is_multi_currency else doc.get("base_grand_total")
-					discount_amount = flt(grand_total) * (term.discount / 100)
+					discount_amount = flt(doc.get("grand_total")) * (term.discount / 100)
 				else:
 					discount_amount = term.discount
 
-				# if accounting is done in the same currency, paid_amount = received_amount
-				conversion_rate = doc.get("conversion_rate", 1) if is_multi_currency else 1
-				discount_amount_in_foreign_currency = discount_amount * conversion_rate
+				discount_amount_in_foreign_currency = discount_amount * doc.get("conversion_rate", 1)
 
 				if doc.doctype == "Sales Invoice":
 					paid_amount -= discount_amount
@@ -2260,151 +2083,23 @@ def apply_early_payment_discount(
 					received_amount -= discount_amount
 					paid_amount -= discount_amount_in_foreign_currency
 
-				valid_discounts.append({"type": term.discount_type, "discount": term.discount})
 				total_discount += discount_amount
 
 		if total_discount:
-			currency = doc.get("currency") if is_multi_currency else doc.company_currency
-			money = frappe.utils.fmt_money(total_discount, currency=currency)
+			money = frappe.utils.fmt_money(total_discount, currency=doc.get("currency"))
 			frappe.msgprint(_("Discount of {} applied as per Payment Term").format(money), alert=1)
 
-	return paid_amount, received_amount, total_discount, valid_discounts
-
-
-def set_pending_discount_loss(
-	pe, doc, discount_amount, base_total_discount_loss, party_account_currency
-):
-	# If multi-currency, get base discount amount to adjust with base currency deductions/losses
-	if party_account_currency != doc.company_currency:
-		discount_amount = discount_amount * doc.get("conversion_rate", 1)
-
-	# Avoid considering miniscule losses
-	discount_amount = flt(discount_amount - base_total_discount_loss, doc.precision("grand_total"))
-
-	# Set base discount amount (discount loss/pending rounding loss) in deductions
-	if discount_amount > 0.0:
-		positive_negative = -1 if pe.payment_type == "Pay" else 1
-
-		# If tax loss booking is enabled, pending loss will be rounding loss.
-		# Otherwise it will be the total discount loss.
-		book_tax_loss = frappe.db.get_single_value("Accounts Settings", "book_tax_discount_loss")
-		account_type = "round_off_account" if book_tax_loss else "default_discount_account"
-
-		pe.set_gain_or_loss(
-			account_details={
-				"account": frappe.get_cached_value("Company", pe.company, account_type),
-				"cost_center": pe.cost_center or frappe.get_cached_value("Company", pe.company, "cost_center"),
-				"amount": discount_amount * positive_negative,
-			}
-		)
-
-
-def split_early_payment_discount_loss(pe, doc, valid_discounts) -> float:
-	"""Split early payment discount into Income Loss & Tax Loss."""
-	total_discount_percent = get_total_discount_percent(doc, valid_discounts)
-
-	if not total_discount_percent:
-		return 0.0
-
-	base_loss_on_income = add_income_discount_loss(pe, doc, total_discount_percent)
-	base_loss_on_taxes = add_tax_discount_loss(pe, doc, total_discount_percent)
-
-	# Round off total loss rather than individual losses to reduce rounding error
-	return flt(base_loss_on_income + base_loss_on_taxes, doc.precision("grand_total"))
-
-
-def get_total_discount_percent(doc, valid_discounts) -> float:
-	"""Get total percentage and amount discount applied as a percentage."""
-	total_discount_percent = (
-		sum(
-			discount.get("discount") for discount in valid_discounts if discount.get("type") == "Percentage"
-		)
-		or 0.0
-	)
-
-	# Operate in percentages only as it makes the income & tax split easier
-	total_discount_amount = (
-		sum(discount.get("discount") for discount in valid_discounts if discount.get("type") == "Amount")
-		or 0.0
-	)
-
-	if total_discount_amount:
-		discount_percentage = (total_discount_amount / doc.get("grand_total")) * 100
-		total_discount_percent += discount_percentage
-		return total_discount_percent
-
-	return total_discount_percent
-
-
-def add_income_discount_loss(pe, doc, total_discount_percent) -> float:
-	"""Add loss on income discount in base currency."""
-	precision = doc.precision("total")
-	base_loss_on_income = doc.get("base_total") * (total_discount_percent / 100)
-
-	pe.append(
-		"deductions",
-		{
-			"account": frappe.get_cached_value("Company", pe.company, "default_discount_account"),
-			"cost_center": pe.cost_center or frappe.get_cached_value("Company", pe.company, "cost_center"),
-			"amount": flt(base_loss_on_income, precision),
-		},
-	)
-
-	return base_loss_on_income  # Return loss without rounding
-
-
-def add_tax_discount_loss(pe, doc, total_discount_percentage) -> float:
-	"""Add loss on tax discount in base currency."""
-	tax_discount_loss = {}
-	base_total_tax_loss = 0
-	precision = doc.precision("tax_amount_after_discount_amount", "taxes")
-
-	# The same account head could be used more than once
-	for tax in doc.get("taxes", []):
-		base_tax_loss = tax.get("base_tax_amount_after_discount_amount") * (
-			total_discount_percentage / 100
-		)
-
-		account = tax.get("account_head")
-		if not tax_discount_loss.get(account):
-			tax_discount_loss[account] = base_tax_loss
-		else:
-			tax_discount_loss[account] += base_tax_loss
-
-	for account, loss in tax_discount_loss.items():
-		base_total_tax_loss += loss
-		if loss == 0.0:
-			continue
-
-		pe.append(
-			"deductions",
-			{
-				"account": account,
-				"cost_center": pe.cost_center or frappe.get_cached_value("Company", pe.company, "cost_center"),
-				"amount": flt(loss, precision),
-			},
-		)
-
-	return base_total_tax_loss  # Return loss without rounding
+	return paid_amount, received_amount, total_discount
 
 
 def get_reference_as_per_payment_terms(
-	payment_schedule, dt, dn, doc, grand_total, outstanding_amount, party_account_currency
+	payment_schedule, dt, dn, doc, grand_total, outstanding_amount
 ):
 	references = []
-	is_multi_currency_acc = (doc.currency != doc.company_currency) and (
-		party_account_currency != doc.company_currency
-	)
-
 	for payment_term in payment_schedule:
 		payment_term_outstanding = flt(
 			payment_term.payment_amount - payment_term.paid_amount, payment_term.precision("payment_amount")
 		)
-		if not is_multi_currency_acc:
-			# If accounting is done in company currency for multi-currency transaction
-			payment_term_outstanding = flt(
-				payment_term_outstanding * doc.get("conversion_rate"), payment_term.precision("payment_amount")
-			)
 
 		if payment_term_outstanding:
 			references.append(

erpnext/accounts/doctype/payment_entry/test_payment_entry.py

@@ -5,7 +5,6 @@ import unittest
 
 import frappe
 from frappe import qb
-from frappe.tests.utils import change_settings
 from frappe.utils import flt, nowdate
 
 from erpnext.accounts.doctype.payment_entry.payment_entry import (
@@ -253,25 +252,10 @@ class TestPaymentEntry(unittest.TestCase):
 			},
 		)
 		si.save()
+
 		si.submit()
 
-		frappe.db.set_single_value("Accounts Settings", "book_tax_discount_loss", 1)
-		pe_with_tax_loss = get_payment_entry("Sales Invoice", si.name, bank_account="_Test Cash - _TC")
-
-		self.assertEqual(pe_with_tax_loss.references[0].payment_term, "30 Credit Days with 10% Discount")
-		self.assertEqual(pe_with_tax_loss.references[0].allocated_amount, 236.0)
-		self.assertEqual(pe_with_tax_loss.paid_amount, 212.4)
-		self.assertEqual(pe_with_tax_loss.deductions[0].amount, 20.0)  # Loss on Income
-		self.assertEqual(pe_with_tax_loss.deductions[1].amount, 3.6)  # Loss on Tax
-		self.assertEqual(pe_with_tax_loss.deductions[1].account, "_Test Account Service Tax - _TC")
-
-		frappe.db.set_single_value("Accounts Settings", "book_tax_discount_loss", 0)
 		pe = get_payment_entry("Sales Invoice", si.name, bank_account="_Test Cash - _TC")
-
-		self.assertEqual(pe.references[0].allocated_amount, 236.0)
-		self.assertEqual(pe.paid_amount, 212.4)
-		self.assertEqual(pe.deductions[0].amount, 23.6)
-
 		pe.submit()
 		si.load_from_db()
 
@@ -281,190 +265,6 @@ class TestPaymentEntry(unittest.TestCase):
 		self.assertEqual(si.payment_schedule[0].outstanding, 0)
 		self.assertEqual(si.payment_schedule[0].discounted_amount, 23.6)
 
-	def test_payment_entry_against_payment_terms_with_discount_amount(self):
-		si = create_sales_invoice(do_not_save=1, qty=1, rate=200)
-
-		si.payment_terms_template = "Test Discount Amount Template"
-		create_payment_terms_template_with_discount(
-			name="30 Credit Days with Rs.50 Discount",
-			discount_type="Amount",
-			discount=50,
-			template_name="Test Discount Amount Template",
-		)
-		frappe.db.set_value("Company", si.company, "default_discount_account", "Write Off - _TC")
-
-		si.append(
-			"taxes",
-			{
-				"charge_type": "On Net Total",
-				"account_head": "_Test Account Service Tax - _TC",
-				"cost_center": "_Test Cost Center - _TC",
-				"description": "Service Tax",
-				"rate": 18,
-			},
-		)
-		si.save()
-		si.submit()
-
-		# Set reference date past discount cut off date
-		pe_1 = get_payment_entry(
-			"Sales Invoice",
-			si.name,
-			bank_account="_Test Cash - _TC",
-			reference_date=frappe.utils.add_days(si.posting_date, 2),
-		)
-		self.assertEqual(pe_1.paid_amount, 236.0)  # discount not applied
-
-		# Test if tax loss is booked on enabling configuration
-		frappe.db.set_single_value("Accounts Settings", "book_tax_discount_loss", 1)
-		pe_with_tax_loss = get_payment_entry("Sales Invoice", si.name, bank_account="_Test Cash - _TC")
-		self.assertEqual(pe_with_tax_loss.deductions[0].amount, 42.37)  # Loss on Income
-		self.assertEqual(pe_with_tax_loss.deductions[1].amount, 7.63)  # Loss on Tax
-		self.assertEqual(pe_with_tax_loss.deductions[1].account, "_Test Account Service Tax - _TC")
-
-		frappe.db.set_single_value("Accounts Settings", "book_tax_discount_loss", 0)
-		pe = get_payment_entry("Sales Invoice", si.name, bank_account="_Test Cash - _TC")
-		self.assertEqual(pe.references[0].allocated_amount, 236.0)
-		self.assertEqual(pe.paid_amount, 186)
-		self.assertEqual(pe.deductions[0].amount, 50.0)
-
-		pe.submit()
-		si.load_from_db()
-
-		self.assertEqual(si.payment_schedule[0].payment_amount, 236.0)
-		self.assertEqual(si.payment_schedule[0].paid_amount, 186)
-		self.assertEqual(si.payment_schedule[0].outstanding, 0)
-		self.assertEqual(si.payment_schedule[0].discounted_amount, 50)
-
-	@change_settings(
-		"Accounts Settings",
-		{
-			"allow_multi_currency_invoices_against_single_party_account": 1,
-			"book_tax_discount_loss": 1,
-		},
-	)
-	def test_payment_entry_multicurrency_si_with_base_currency_accounting_early_payment_discount(
-		self,
-	):
-		"""
-		1. Multi-currency SI with single currency accounting (company currency)
-		2. PE with early payment discount
-		3. Test if Paid Amount is calculated in company currency
-		4. Test if deductions are calculated in company currency
-
-		SI is in USD to document agreed amounts that are in USD, but the accounting is in base currency.
-		"""
-		si = create_sales_invoice(
-			customer="_Test Customer",
-			currency="USD",
-			conversion_rate=50,
-			do_not_save=1,
-		)
-		create_payment_terms_template_with_discount()
-		si.payment_terms_template = "Test Discount Template"
-
-		frappe.db.set_value("Company", si.company, "default_discount_account", "Write Off - _TC")
-		si.save()
-		si.submit()
-
-		pe = get_payment_entry(
-			"Sales Invoice",
-			si.name,
-			bank_account="_Test Bank - _TC",
-		)
-		pe.reference_no = si.name
-		pe.reference_date = nowdate()
-
-		# Early payment discount loss on income
-		self.assertEqual(pe.paid_amount, 4500.0)  # Amount in company currency
-		self.assertEqual(pe.received_amount, 4500.0)
-		self.assertEqual(pe.deductions[0].amount, 500.0)
-		self.assertEqual(pe.deductions[0].account, "Write Off - _TC")
-		self.assertEqual(pe.difference_amount, 0.0)
-
-		pe.insert()
-		pe.submit()
-
-		expected_gle = dict(
-			(d[0], d)
-			for d in [
-				["Debtors - _TC", 0, 5000, si.name],
-				["_Test Bank - _TC", 4500, 0, None],
-				["Write Off - _TC", 500.0, 0, None],
-			]
-		)
-
-		self.validate_gl_entries(pe.name, expected_gle)
-
-		outstanding_amount = flt(frappe.db.get_value("Sales Invoice", si.name, "outstanding_amount"))
-		self.assertEqual(outstanding_amount, 0)
-
-	def test_payment_entry_multicurrency_accounting_si_with_early_payment_discount(self):
-		"""
-		1. Multi-currency SI with multi-currency accounting
-		2. PE with early payment discount and also exchange loss
-		3. Test if Paid Amount is calculated in transaction currency
-		4. Test if deductions are calculated in base/company currency
-		5. Test if exchange loss is reflected in difference
-		"""
-		si = create_sales_invoice(
-			customer="_Test Customer USD",
-			debit_to="_Test Receivable USD - _TC",
-			currency="USD",
-			conversion_rate=50,
-			do_not_save=1,
-		)
-		create_payment_terms_template_with_discount()
-		si.payment_terms_template = "Test Discount Template"
-
-		frappe.db.set_value("Company", si.company, "default_discount_account", "Write Off - _TC")
-		si.save()
-		si.submit()
-
-		pe = get_payment_entry(
-			"Sales Invoice", si.name, bank_account="_Test Bank - _TC", bank_amount=4700
-		)
-		pe.reference_no = si.name
-		pe.reference_date = nowdate()
-
-		# Early payment discount loss on income
-		self.assertEqual(pe.paid_amount, 90.0)
-		self.assertEqual(pe.received_amount, 4200.0)  # 5000 - 500 (discount) - 300 (exchange loss)
-		self.assertEqual(pe.deductions[0].amount, 500.0)
-		self.assertEqual(pe.deductions[0].account, "Write Off - _TC")
-
-		# Exchange loss
-		self.assertEqual(pe.difference_amount, 300.0)
-
-		pe.append(
-			"deductions",
-			{
-				"account": "_Test Exchange Gain/Loss - _TC",
-				"cost_center": "_Test Cost Center - _TC",
-				"amount": 300.0,
-			},
-		)
-
-		pe.insert()
-		pe.submit()
-
-		self.assertEqual(pe.difference_amount, 0.0)
-
-		expected_gle = dict(
-			(d[0], d)
-			for d in [
-				["_Test Receivable USD - _TC", 0, 5000, si.name],
-				["_Test Bank - _TC", 4200, 0, None],
-				["Write Off - _TC", 500.0, 0, None],
-				["_Test Exchange Gain/Loss - _TC", 300.0, 0, None],
-			]
-		)
-
-		self.validate_gl_entries(pe.name, expected_gle)
-
-		outstanding_amount = flt(frappe.db.get_value("Sales Invoice", si.name, "outstanding_amount"))
-		self.assertEqual(outstanding_amount, 0)
-
 	def test_payment_against_purchase_invoice_to_check_status(self):
 		pi = make_purchase_invoice(
 			supplier="_Test Supplier USD",
@@ -999,30 +799,6 @@ class TestPaymentEntry(unittest.TestCase):
 
 		self.assertTrue("is on hold" in str(err.exception).lower())
 
-	def test_duplicate_payment_entry_allocate_amount(self):
-		si = create_sales_invoice()
-
-		pe_draft = get_payment_entry("Sales Invoice", si.name)
-		pe_draft.insert()
-
-		pe = get_payment_entry("Sales Invoice", si.name)
-		pe.submit()
-
-		self.assertRaises(frappe.ValidationError, pe_draft.submit)
-
-	def test_duplicate_payment_entry_partial_allocate_amount(self):
-		si = create_sales_invoice()
-
-		pe_draft = get_payment_entry("Sales Invoice", si.name)
-		pe_draft.insert()
-
-		pe = get_payment_entry("Sales Invoice", si.name)
-		pe.received_amount = si.total / 2
-		pe.references[0].allocated_amount = si.total / 2
-		pe.submit()
-
-		self.assertRaises(frappe.ValidationError, pe_draft.submit)
-
 
 def create_payment_entry(**args):
 	payment_entry = frappe.new_doc("Payment Entry")
@@ -1080,27 +856,24 @@ def create_payment_terms_template():
 		).insert()
 
 
-def create_payment_terms_template_with_discount(
-	name=None, discount_type=None, discount=None, template_name=None
-):
-	create_payment_term(name or "30 Credit Days with 10% Discount")
-	template_name = template_name or "Test Discount Template"
+def create_payment_terms_template_with_discount():
 
-	if not frappe.db.exists("Payment Terms Template", template_name):
-		frappe.get_doc(
+	create_payment_term("30 Credit Days with 10% Discount")
+
+	if not frappe.db.exists("Payment Terms Template", "Test Discount Template"):
+		payment_term_template = frappe.get_doc(
 			{
 				"doctype": "Payment Terms Template",
-				"template_name": template_name,
+				"template_name": "Test Discount Template",
 				"allocate_payment_based_on_payment_terms": 1,
 				"terms": [
 					{
 						"doctype": "Payment Terms Template Detail",
-						"payment_term": name or "30 Credit Days with 10% Discount",
+						"payment_term": "30 Credit Days with 10% Discount",
 						"invoice_portion": 100,
 						"credit_days_based_on": "Day(s) after invoice date",
 						"credit_days": 2,
-						"discount_type": discount_type or "Percentage",
-						"discount": discount or 10,
+						"discount": 10,
 						"discount_validity_based_on": "Day(s) after invoice date",
 						"discount_validity": 1,
 					}

erpnext/accounts/doctype/payment_entry_deduction/payment_entry_deduction.json

@@ -3,7 +3,6 @@
  "creation": "2016-06-15 15:56:30.815503",
  "doctype": "DocType",
  "editable_grid": 1,
- "engine": "InnoDB",
  "field_order": [
   "account",
   "cost_center",
@@ -18,7 +17,9 @@
    "in_list_view": 1,
    "label": "Account",
    "options": "Account",
-   "reqd": 1
+   "reqd": 1,
+   "show_days": 1,
+   "show_seconds": 1
   },
   {
    "fieldname": "cost_center",
@@ -27,30 +28,37 @@
    "label": "Cost Center",
    "options": "Cost Center",
    "print_hide": 1,
-   "reqd": 1
+   "reqd": 1,
+   "show_days": 1,
+   "show_seconds": 1
   },
   {
    "fieldname": "amount",
    "fieldtype": "Currency",
    "in_list_view": 1,
-   "label": "Amount (Company Currency)",
-   "options": "Company:company:default_currency",
-   "reqd": 1
+   "label": "Amount",
+   "reqd": 1,
+   "show_days": 1,
+   "show_seconds": 1
   },
   {
    "fieldname": "column_break_2",
-   "fieldtype": "Column Break"
+   "fieldtype": "Column Break",
+   "show_days": 1,
+   "show_seconds": 1
   },
   {
    "fieldname": "description",
    "fieldtype": "Small Text",
-   "label": "Description"
+   "label": "Description",
+   "show_days": 1,
+   "show_seconds": 1
   }
  ],
  "index_web_pages_for_search": 1,
  "istable": 1,
  "links": [],
- "modified": "2023-03-06 07:11:57.739619",
+ "modified": "2020-09-12 20:38:08.110674",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Payment Entry Deduction",
@@ -58,6 +66,5 @@
  "permissions": [],
  "quick_entry": 1,
  "sort_field": "modified",
- "sort_order": "DESC",
- "states": []
+ "sort_order": "DESC"
 }

erpnext/accounts/doctype/payment_entry_reference/payment_entry_reference.json

@@ -25,8 +25,7 @@
    "in_list_view": 1,
    "label": "Type",
    "options": "DocType",
-   "reqd": 1,
-   "search_index": 1
+   "reqd": 1
   },
   {
    "columns": 2,
@@ -36,8 +35,7 @@
    "in_list_view": 1,
    "label": "Name",
    "options": "reference_doctype",
-   "reqd": 1,
-   "search_index": 1
+   "reqd": 1
   },
   {
    "fieldname": "due_date",
@@ -106,7 +104,7 @@
  "index_web_pages_for_search": 1,
  "istable": 1,
  "links": [],
- "modified": "2022-12-12 12:31:44.919895",
+ "modified": "2021-09-26 17:06:55.597389",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Payment Entry Reference",
@@ -115,6 +113,5 @@
  "quick_entry": 1,
  "sort_field": "modified",
  "sort_order": "DESC",
- "states": [],
  "track_changes": 1
 }

erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py

@@ -3,10 +3,8 @@
 
 
 import frappe
-from frappe import _, msgprint, qb
+from frappe import _, msgprint
 from frappe.model.document import Document
-from frappe.query_builder import Criterion
-from frappe.query_builder.functions import Sum
 from frappe.utils import flt, getdate, nowdate, today
 
 import erpnext
@@ -49,10 +47,6 @@ class PaymentReconciliation(Document):
 	def get_payment_entries(self):
 		order_doctype = "Sales Order" if self.party_type == "Customer" else "Purchase Order"
 		condition = self.get_conditions(get_payments=True)
-
-		if self.get("cost_center"):
-			condition += " and cost_center = '{0}' ".format(self.cost_center)
-
 		payment_entries = get_advance_payment_entries(
 			self.party_type,
 			self.party,
@@ -67,10 +61,6 @@ class PaymentReconciliation(Document):
 
 	def get_jv_entries(self):
 		condition = self.get_conditions()
-
-		if self.get("cost_center"):
-			condition += " and t2.cost_center = '{0}' ".format(self.cost_center)
-
 		dr_or_cr = (
 			"credit_in_account_currency"
 			if erpnext.get_party_account_type(self.party_type) == "Receivable"
@@ -122,79 +112,54 @@ class PaymentReconciliation(Document):
 		return list(journal_entries)
 
 	def get_dr_or_cr_notes(self):
-		gl = qb.DocType("GL Entry")
-
-		voucher_type = "Sales Invoice" if self.party_type == "Customer" else "Purchase Invoice"
-		doc = qb.DocType(voucher_type)
-
-		# build conditions
-		sub_query_conditions = []
-		conditions = []
-		sub_query_conditions.append(doc.company == self.company)
-
-		if self.get("from_payment_date"):
-			sub_query_conditions.append(doc.posting_date.gte(self.from_payment_date))
-
-		if self.get("to_payment_date"):
-			sub_query_conditions.append(doc.posting_date.lte(self.to_payment_date))
-
-		if self.get("cost_center"):
-			sub_query_conditions.append(doc.cost_center == self.cost_center)
-
+		condition = self.get_conditions(get_return_invoices=True)
 		dr_or_cr = (
-			gl["credit_in_account_currency"]
+			"credit_in_account_currency"
 			if erpnext.get_party_account_type(self.party_type) == "Receivable"
-			else gl["debit_in_account_currency"]
+			else "debit_in_account_currency"
 		)
 
 		reconciled_dr_or_cr = (
-			gl["debit_in_account_currency"]
-			if dr_or_cr.name == "credit_in_account_currency"
-			else gl["credit_in_account_currency"]
+			"debit_in_account_currency"
+			if dr_or_cr == "credit_in_account_currency"
+			else "credit_in_account_currency"
 		)
 
-		having_clause = qb.Field("amount") > 0
+		voucher_type = "Sales Invoice" if self.party_type == "Customer" else "Purchase Invoice"
 
-		if self.minimum_payment_amount:
-			having_clause = qb.Field("amount") >= self.minimum_payment_amount
-		if self.maximum_payment_amount:
-			having_clause = having_clause & qb.Field("amount") <= self.maximum_payment_amount
-
-		sub_query = (
-			qb.from_(doc)
-			.select(doc.name)
-			.where(Criterion.all(sub_query_conditions))
-			.where(
-				(doc.docstatus == 1)
-				& (doc.is_return == 1)
-				& ((doc.return_against == "") | (doc.return_against.isnull()))
-			)
+		return frappe.db.sql(
+			""" SELECT doc.name as reference_name, %(voucher_type)s as reference_type,
+				(sum(gl.{dr_or_cr}) - sum(gl.{reconciled_dr_or_cr})) as amount, doc.posting_date,
+				account_currency as currency
+			FROM `tab{doc}` doc, `tabGL Entry` gl
+			WHERE
+				(doc.name = gl.against_voucher or doc.name = gl.voucher_no)
+				and doc.{party_type_field} = %(party)s
+				and doc.is_return = 1 and ifnull(doc.return_against, "") = ""
+				and gl.against_voucher_type = %(voucher_type)s
+				and doc.docstatus = 1 and gl.party = %(party)s
+				and gl.party_type = %(party_type)s and gl.account = %(account)s
+				and gl.is_cancelled = 0 {condition}
+			GROUP BY doc.name
+			Having
+				amount > 0
+			ORDER BY doc.posting_date
+		""".format(
+				doc=voucher_type,
+				dr_or_cr=dr_or_cr,
+				reconciled_dr_or_cr=reconciled_dr_or_cr,
+				party_type_field=frappe.scrub(self.party_type),
+				condition=condition or "",
+			),
+			{
+				"party": self.party,
+				"party_type": self.party_type,
+				"voucher_type": voucher_type,
+				"account": self.receivable_payable_account,
+			},
+			as_dict=1,
 		)
 
-		query = (
-			qb.from_(gl)
-			.select(
-				gl.against_voucher_type.as_("reference_type"),
-				gl.against_voucher.as_("reference_name"),
-				(Sum(dr_or_cr) - Sum(reconciled_dr_or_cr)).as_("amount"),
-				gl.posting_date,
-				gl.account_currency.as_("currency"),
-			)
-			.where(
-				(gl.against_voucher.isin(sub_query))
-				& (gl.against_voucher_type == voucher_type)
-				& (gl.is_cancelled == 0)
-				& (gl.account == self.receivable_payable_account)
-				& (gl.party_type == self.party_type)
-				& (gl.party == self.party)
-			)
-			.where(Criterion.all(conditions))
-			.groupby(gl.against_voucher)
-			.having(having_clause)
-		)
-		dr_cr_notes = query.run(as_dict=True)
-		return dr_cr_notes
-
 	def add_payment_entries(self, non_reconciled_payments):
 		self.set("payments", [])
 
@@ -207,11 +172,8 @@ class PaymentReconciliation(Document):
 
 		condition = self.get_conditions(get_invoices=True)
 
-		if self.get("cost_center"):
-			condition += " and cost_center = '{0}' ".format(self.cost_center)
-
 		non_reconciled_invoices = get_outstanding_invoices(
-			self.party_type, self.party, self.receivable_payable_account, self.company, condition=condition
+			self.party_type, self.party, self.receivable_payable_account, condition=condition
 		)
 
 		if self.invoice_limit:
@@ -295,7 +257,6 @@ class PaymentReconciliation(Document):
 				"amount": pay.get("amount"),
 				"allocated_amount": allocated_amount,
 				"difference_amount": pay.get("difference_amount"),
-				"currency": inv.get("currency"),
 			}
 		)
 
@@ -393,9 +354,12 @@ class PaymentReconciliation(Document):
 		if not invoices_to_reconcile:
 			frappe.throw(_("No records found in Allocation table"))
 
-	def get_conditions(self, get_invoices=False, get_payments=False):
+	def get_conditions(self, get_invoices=False, get_payments=False, get_return_invoices=False):
 		condition = " and company = '{0}' ".format(self.company)
 
+		if self.get("cost_center"):
+			condition = " and cost_center = '{0}' ".format(self.cost_center)
+
 		if get_invoices:
 			condition += (
 				" and posting_date >= {0}".format(frappe.db.escape(self.from_invoice_date))
@@ -421,7 +385,35 @@ class PaymentReconciliation(Document):
 				condition += " and {dr_or_cr} <= {amount}".format(
 					dr_or_cr=dr_or_cr, amount=flt(self.maximum_invoice_amount)
 				)
-		elif get_payments:
+
+		elif get_return_invoices:
+			condition = " and doc.company = '{0}' ".format(self.company)
+			condition += (
+				" and doc.posting_date >= {0}".format(frappe.db.escape(self.from_payment_date))
+				if self.from_payment_date
+				else ""
+			)
+			condition += (
+				" and doc.posting_date <= {0}".format(frappe.db.escape(self.to_payment_date))
+				if self.to_payment_date
+				else ""
+			)
+			dr_or_cr = (
+				"debit_in_account_currency"
+				if erpnext.get_party_account_type(self.party_type) == "Receivable"
+				else "credit_in_account_currency"
+			)
+
+			if self.minimum_invoice_amount:
+				condition += " and gl.{dr_or_cr} >= {amount}".format(
+					dr_or_cr=dr_or_cr, amount=flt(self.minimum_payment_amount)
+				)
+			if self.maximum_invoice_amount:
+				condition += " and gl.{dr_or_cr} <= {amount}".format(
+					dr_or_cr=dr_or_cr, amount=flt(self.maximum_payment_amount)
+				)
+
+		else:
 			condition += (
 				" and posting_date >= {0}".format(frappe.db.escape(self.from_payment_date))
 				if self.from_payment_date

erpnext/accounts/doctype/payment_reconciliation_allocation/payment_reconciliation_allocation.json

@@ -20,8 +20,7 @@
   "section_break_5",
   "difference_amount",
   "column_break_7",
-  "difference_account",
-  "currency"
+  "difference_account"
  ],
  "fields": [
   {
@@ -38,7 +37,7 @@
    "fieldtype": "Currency",
    "in_list_view": 1,
    "label": "Allocated Amount",
-   "options": "currency",
+   "options": "Currency",
    "reqd": 1
   },
   {
@@ -113,7 +112,7 @@
    "fieldtype": "Currency",
    "hidden": 1,
    "label": "Unreconciled Amount",
-   "options": "currency",
+   "options": "Currency",
    "read_only": 1
   },
   {
@@ -121,7 +120,7 @@
    "fieldtype": "Currency",
    "hidden": 1,
    "label": "Amount",
-   "options": "currency",
+   "options": "Currency",
    "read_only": 1
   },
   {
@@ -130,18 +129,11 @@
    "hidden": 1,
    "label": "Reference Row",
    "read_only": 1
-  },
-  {
-   "fieldname": "currency",
-   "fieldtype": "Link",
-   "hidden": 1,
-   "label": "Currency",
-   "options": "Currency"
   }
  ],
  "istable": 1,
  "links": [],
- "modified": "2023-11-28 16:30:43.344612",
+ "modified": "2021-10-06 11:48:59.616562",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Payment Reconciliation Allocation",

erpnext/accounts/doctype/payment_request/payment_request.js

@@ -42,7 +42,7 @@ frappe.ui.form.on("Payment Request", "refresh", function(frm) {
 		});
 	}
 
-	if((!frm.doc.payment_gateway_account || frm.doc.payment_request_type == "Outward") && frm.doc.status == "Initiated") {
+	if(!frm.doc.payment_gateway_account && frm.doc.status == "Initiated") {
 		frm.add_custom_button(__('Create Payment Entry'), function(){
 			frappe.call({
 				method: "erpnext.accounts.doctype.payment_request.payment_request.make_payment_entry",

erpnext/accounts/doctype/payment_request/payment_request.py

@@ -254,7 +254,6 @@ class PaymentRequest(Document):
 
 		payment_entry.update(
 			{
-				"mode_of_payment": self.mode_of_payment,
 				"reference_no": self.name,
 				"reference_date": nowdate(),
 				"remarks": "Payment Entry against {0} {1} via Payment Request {2}".format(
@@ -404,22 +403,25 @@ def make_payment_request(**args):
 		else ""
 	)
 
-	draft_payment_request = frappe.db.get_value(
-		"Payment Request",
-		{"reference_doctype": args.dt, "reference_name": args.dn, "docstatus": 0},
-	)
-
-	existing_payment_request_amount = get_existing_payment_request_amount(args.dt, args.dn)
-
-	if existing_payment_request_amount:
-		grand_total -= existing_payment_request_amount
-
-	if draft_payment_request:
-		frappe.db.set_value(
-			"Payment Request", draft_payment_request, "grand_total", grand_total, update_modified=False
+	existing_payment_request = None
+	if args.order_type == "Shopping Cart":
+		existing_payment_request = frappe.db.get_value(
+			"Payment Request",
+			{"reference_doctype": args.dt, "reference_name": args.dn, "docstatus": ("!=", 2)},
 		)
-		pr = frappe.get_doc("Payment Request", draft_payment_request)
+
+	if existing_payment_request:
+		frappe.db.set_value(
+			"Payment Request", existing_payment_request, "grand_total", grand_total, update_modified=False
+		)
+		pr = frappe.get_doc("Payment Request", existing_payment_request)
 	else:
+		if args.order_type != "Shopping Cart":
+			existing_payment_request_amount = get_existing_payment_request_amount(args.dt, args.dn)
+
+			if existing_payment_request_amount:
+				grand_total -= existing_payment_request_amount
+
 		pr = frappe.new_doc("Payment Request")
 		pr.update(
 			{

erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py

@@ -169,18 +169,21 @@ class PeriodClosingVoucher(AccountsController):
 		return frappe.db.sql(
 			"""
 			select
-				t1.account_currency,
+				t2.account_currency,
 				{dimension_fields},
 				sum(t1.debit_in_account_currency) - sum(t1.credit_in_account_currency) as bal_in_account_currency,
 				sum(t1.debit) - sum(t1.credit) as bal_in_company_currency
-			from `tabGL Entry` t1
+			from `tabGL Entry` t1, `tabAccount` t2
 			where
 				t1.is_cancelled = 0
-				and t1.account in (select name from `tabAccount` where report_type = 'Profit and Loss' and docstatus < 2 and company = %s)
+				and t1.account = t2.name
+				and t2.report_type = 'Profit and Loss'
+				and t2.docstatus < 2
+				and t2.company = %s
 				and t1.posting_date between %s and %s
 			group by {dimension_fields}
 		""".format(
-				dimension_fields=", ".join(dimension_fields),
+				dimension_fields=", ".join(dimension_fields)
 			),
 			(self.company, self.get("year_start_date"), self.posting_date),
 			as_dict=1,

erpnext/accounts/doctype/pos_closing_entry/pos_closing_entry.js

@@ -25,7 +25,7 @@ frappe.ui.form.on('POS Closing Entry', {
 
 		frappe.realtime.on('closing_process_complete', async function(data) {
 			await frm.reload_doc();
-			if (frm.doc.status == 'Failed' && frm.doc.error_message) {
+			if (frm.doc.status == 'Failed' && frm.doc.error_message && data.user == frappe.session.user) {
 				frappe.msgprint({
 					title: __('POS Closing Failed'),
 					message: frm.doc.error_message,

erpnext/accounts/doctype/pos_closing_entry/pos_closing_entry.py

@@ -21,24 +21,8 @@ class POSClosingEntry(StatusUpdater):
 		if frappe.db.get_value("POS Opening Entry", self.pos_opening_entry, "status") != "Open":
 			frappe.throw(_("Selected POS Opening Entry should be open."), title=_("Invalid Opening Entry"))
 
-		self.validate_duplicate_pos_invoices()
 		self.validate_pos_invoices()
 
-	def validate_duplicate_pos_invoices(self):
-		pos_occurences = {}
-		for idx, inv in enumerate(self.pos_transactions, 1):
-			pos_occurences.setdefault(inv.pos_invoice, []).append(idx)
-
-		error_list = []
-		for key, value in pos_occurences.items():
-			if len(value) > 1:
-				error_list.append(
-					_("{} is added multiple times on rows: {}".format(frappe.bold(key), frappe.bold(value)))
-				)
-
-		if error_list:
-			frappe.throw(error_list, title=_("Duplicate POS Invoices found"), as_list=True)
-
 	def validate_pos_invoices(self):
 		invalid_rows = []
 		for d in self.pos_transactions:

erpnext/accounts/doctype/pos_invoice/pos_invoice.json

@@ -345,8 +345,7 @@
    "no_copy": 1,
    "options": "POS Invoice",
    "print_hide": 1,
-   "read_only": 1,
-   "search_index": 1
+   "read_only": 1
   },
   {
    "default": "0",
@@ -1573,7 +1572,7 @@
  "icon": "fa fa-file-text",
  "is_submittable": 1,
  "links": [],
- "modified": "2022-09-30 03:49:50.455199",
+ "modified": "2022-09-27 13:00:24.166684",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "POS Invoice",

erpnext/accounts/doctype/pos_invoice/pos_invoice.py

@@ -1,10 +1,9 @@
 # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors and contributors
 # For license information, please see license.txt
-import collections
+
 
 import frappe
 from frappe import _
-from frappe.query_builder.functions import IfNull, Sum
 from frappe.utils import cint, flt, get_link_to_form, getdate, nowdate
 from six import iteritems
 
@@ -44,7 +43,6 @@ class POSInvoice(SalesInvoice):
 		self.validate_debit_to_acc()
 		self.validate_write_off_account()
 		self.validate_change_amount()
-		self.validate_duplicate_serial_and_batch_no()
 		self.validate_change_account()
 		self.validate_item_cost_centers()
 		self.validate_warehouse()
@@ -155,27 +153,6 @@ class POSInvoice(SalesInvoice):
 				title=_("Item Unavailable"),
 			)
 
-	def validate_duplicate_serial_and_batch_no(self):
-		serial_nos = []
-		batch_nos = []
-
-		for row in self.get("items"):
-			if row.serial_no:
-				serial_nos = row.serial_no.split("\n")
-
-			if row.batch_no and not row.serial_no:
-				batch_nos.append(row.batch_no)
-
-		if serial_nos:
-			for key, value in collections.Counter(serial_nos).items():
-				if value > 1:
-					frappe.throw(_("Duplicate Serial No {0} found").format("key"))
-
-		if batch_nos:
-			for key, value in collections.Counter(batch_nos).items():
-				if value > 1:
-					frappe.throw(_("Duplicate Batch No {0} found").format("key"))
-
 	def validate_pos_reserved_batch_qty(self, item):
 		filters = {"item_code": item.item_code, "warehouse": item.warehouse, "batch_no": item.batch_no}
 
@@ -184,7 +161,7 @@ class POSInvoice(SalesInvoice):
 
 		bold_item_name = frappe.bold(item.item_name)
 		bold_extra_batch_qty_needed = frappe.bold(
-			abs(available_batch_qty - reserved_batch_qty - item.stock_qty)
+			abs(available_batch_qty - reserved_batch_qty - item.qty)
 		)
 		bold_invalid_batch_no = frappe.bold(item.batch_no)
 
@@ -195,7 +172,7 @@ class POSInvoice(SalesInvoice):
 				).format(item.idx, bold_invalid_batch_no, bold_item_name),
 				title=_("Item Unavailable"),
 			)
-		elif (available_batch_qty - reserved_batch_qty - item.stock_qty) < 0:
+		elif (available_batch_qty - reserved_batch_qty - item.qty) < 0:
 			frappe.throw(
 				_(
 					"Row #{}: Batch No. {} of item {} has less than required stock available, {} more required"
@@ -269,7 +246,7 @@ class POSInvoice(SalesInvoice):
 						),
 						title=_("Item Unavailable"),
 					)
-				elif is_stock_item and flt(available_stock) < flt(d.stock_qty):
+				elif is_stock_item and flt(available_stock) < flt(d.qty):
 					frappe.throw(
 						_(
 							"Row #{}: Stock quantity not enough for Item Code: {} under warehouse {}. Available quantity {}."
@@ -675,7 +652,7 @@ def get_bundle_availability(bundle_item_code, warehouse):
 		item_pos_reserved_qty = get_pos_reserved_qty(item.item_code, warehouse)
 		available_qty = item_bin_qty - item_pos_reserved_qty
 
-		max_available_bundles = available_qty / item.stock_qty
+		max_available_bundles = available_qty / item.qty
 		if bundle_bin_qty > max_available_bundles and frappe.get_value(
 			"Item", item.item_code, "is_stock_item"
 		):
@@ -698,24 +675,20 @@ def get_bin_qty(item_code, warehouse):
 
 
 def get_pos_reserved_qty(item_code, warehouse):
-	p_inv = frappe.qb.DocType("POS Invoice")
-	p_item = frappe.qb.DocType("POS Invoice Item")
+	reserved_qty = frappe.db.sql(
+		"""select sum(p_item.qty) as qty
+		from `tabPOS Invoice` p, `tabPOS Invoice Item` p_item
+		where p.name = p_item.parent
+		and ifnull(p.consolidated_invoice, '') = ''
+		and p_item.docstatus = 1
+		and p_item.item_code = %s
+		and p_item.warehouse = %s
+		""",
+		(item_code, warehouse),
+		as_dict=1,
+	)
 
-	reserved_qty = (
-		frappe.qb.from_(p_inv)
-		.from_(p_item)
-		.select(Sum(p_item.stock_qty).as_("stock_qty"))
-		.where(
-			(p_inv.name == p_item.parent)
-			& (IfNull(p_inv.consolidated_invoice, "") == "")
-			& (p_inv.is_return == 0)
-			& (p_item.docstatus == 1)
-			& (p_item.item_code == item_code)
-			& (p_item.warehouse == warehouse)
-		)
-	).run(as_dict=True)
-
-	return flt(reserved_qty[0].stock_qty) if reserved_qty else 0
+	return reserved_qty[0].qty or 0 if reserved_qty else 0
 
 
 @frappe.whitelist()
@@ -774,3 +747,7 @@ def add_return_modes(doc, pos_profile):
 		]:
 			payment_mode = get_mode_of_payment_info(mode_of_payment, doc.company)
 			append_payment(payment_mode[0])
+
+
+def on_doctype_update():
+	frappe.db.add_index("POS Invoice", ["return_against"])

erpnext/accounts/doctype/pos_invoice/test_pos_invoice.py

@@ -495,67 +495,6 @@ class TestPOSInvoice(unittest.TestCase):
 
 		self.assertRaises(frappe.ValidationError, pos.submit)
 
-	def test_value_error_on_serial_no_validation(self):
-		from erpnext.stock.doctype.stock_entry.test_stock_entry import make_serialized_item
-
-		se = make_serialized_item(
-			company="_Test Company",
-			target_warehouse="Stores - _TC",
-			cost_center="Main - _TC",
-			expense_account="Cost of Goods Sold - _TC",
-		)
-		serial_nos = se.get("items")[0].serial_no
-
-		# make a pos invoice
-		pos = create_pos_invoice(
-			company="_Test Company",
-			debit_to="Debtors - _TC",
-			account_for_change_amount="Cash - _TC",
-			warehouse="Stores - _TC",
-			income_account="Sales - _TC",
-			expense_account="Cost of Goods Sold - _TC",
-			cost_center="Main - _TC",
-			item=se.get("items")[0].item_code,
-			rate=1000,
-			qty=1,
-			do_not_save=1,
-		)
-		pos.get("items")[0].has_serial_no = 1
-		pos.get("items")[0].serial_no = serial_nos.split("\n")[0]
-		pos.set("payments", [])
-		pos.append(
-			"payments", {"mode_of_payment": "Cash", "account": "Cash - _TC", "amount": 1000, "default": 1}
-		)
-		pos = pos.save().submit()
-
-		# make a return
-		pos_return = make_sales_return(pos.name)
-		pos_return.paid_amount = pos_return.grand_total
-		pos_return.save()
-		pos_return.submit()
-
-		# set docstatus to 2 for pos to trigger this issue
-		frappe.db.set_value("POS Invoice", pos.name, "docstatus", 2)
-
-		pos2 = create_pos_invoice(
-			company="_Test Company",
-			debit_to="Debtors - _TC",
-			account_for_change_amount="Cash - _TC",
-			warehouse="Stores - _TC",
-			income_account="Sales - _TC",
-			expense_account="Cost of Goods Sold - _TC",
-			cost_center="Main - _TC",
-			item=se.get("items")[0].item_code,
-			rate=1000,
-			qty=1,
-			do_not_save=1,
-		)
-
-		pos2.get("items")[0].has_serial_no = 1
-		pos2.get("items")[0].serial_no = serial_nos.split("\n")[0]
-		# Value error should not be triggered on validation
-		pos2.save()
-
 	def test_loyalty_points(self):
 		from erpnext.accounts.doctype.loyalty_program.loyalty_program import (
 			get_loyalty_program_details_with_points,

erpnext/accounts/doctype/pos_invoice_merge_log/pos_invoice_merge_log.py

@@ -18,22 +18,6 @@ class POSInvoiceMergeLog(Document):
 	def validate(self):
 		self.validate_customer()
 		self.validate_pos_invoice_status()
-		self.validate_duplicate_pos_invoices()
-
-	def validate_duplicate_pos_invoices(self):
-		pos_occurences = {}
-		for idx, inv in enumerate(self.pos_invoices, 1):
-			pos_occurences.setdefault(inv.pos_invoice, []).append(idx)
-
-		error_list = []
-		for key, value in pos_occurences.items():
-			if len(value) > 1:
-				error_list.append(
-					_("{} is added multiple times on rows: {}".format(frappe.bold(key), frappe.bold(value)))
-				)
-
-		if error_list:
-			frappe.throw(error_list, title=_("Duplicate POS Invoices found"), as_list=True)
 
 	def validate_customer(self):
 		if self.merge_invoices_based_on == "Customer Group":
@@ -443,14 +427,12 @@ def create_merge_logs(invoice_by_customer, closing_entry=None):
 
 		if closing_entry:
 			closing_entry.set_status(update=True, status="Failed")
-			if type(error_message) == list:
-				error_message = frappe.json.dumps(error_message)
 			closing_entry.db_set("error_message", error_message)
 		raise
 
 	finally:
 		frappe.db.commit()
-		frappe.publish_realtime("closing_process_complete", user=frappe.session.user)
+		frappe.publish_realtime("closing_process_complete", {"user": frappe.session.user})
 
 
 def cancel_merge_logs(merge_logs, closing_entry=None):
@@ -477,7 +459,7 @@ def cancel_merge_logs(merge_logs, closing_entry=None):
 
 	finally:
 		frappe.db.commit()
-		frappe.publish_realtime("closing_process_complete", user=frappe.session.user)
+		frappe.publish_realtime("closing_process_complete", {"user": frappe.session.user})
 
 
 def enqueue_job(job, **kwargs):

erpnext/accounts/doctype/pricing_rule/pricing_rule.py

@@ -269,18 +269,6 @@ def get_serial_no_for_item(args):
 	return item_details
 
 
-def update_pricing_rule_uom(pricing_rule, args):
-	child_doc = {"Item Code": "items", "Item Group": "item_groups", "Brand": "brands"}.get(
-		pricing_rule.apply_on
-	)
-
-	apply_on_field = frappe.scrub(pricing_rule.apply_on)
-
-	for row in pricing_rule.get(child_doc):
-		if row.get(apply_on_field) == args.get(apply_on_field):
-			pricing_rule.uom = row.uom
-
-
 def get_pricing_rule_for_item(args, price_list_rate=0, doc=None, for_validate=False):
 	from erpnext.accounts.doctype.pricing_rule.utils import (
 		get_applied_pricing_rules,
@@ -337,8 +325,7 @@ def get_pricing_rule_for_item(args, price_list_rate=0, doc=None, for_validate=Fa
 
 			if isinstance(pricing_rule, string_types):
 				pricing_rule = frappe.get_cached_doc("Pricing Rule", pricing_rule)
-				update_pricing_rule_uom(pricing_rule, args)
-				pricing_rule.apply_rule_on_other_items = get_pricing_rule_items(pricing_rule) or []
+				pricing_rule.apply_rule_on_other_items = get_pricing_rule_items(pricing_rule)
 
 			if pricing_rule.get("suggestion"):
 				continue
@@ -452,15 +439,12 @@ def apply_price_discount_rule(pricing_rule, item_details, args):
 		if pricing_rule.currency == args.currency:
 			pricing_rule_rate = pricing_rule.rate
 
-		# TODO https://github.com/frappe/erpnext/pull/23636 solve this in some other way.
 		if pricing_rule_rate:
-			is_blank_uom = pricing_rule.get("uom") != args.get("uom")
 			# Override already set price list rate (from item price)
 			# if pricing_rule_rate > 0
 			item_details.update(
 				{
-					"price_list_rate": pricing_rule_rate
-					* (args.get("conversion_factor", 1) if is_blank_uom else 1),
+					"price_list_rate": pricing_rule_rate * args.get("conversion_factor", 1),
 				}
 			)
 		item_details.update({"discount_percentage": 0.0})

erpnext/accounts/doctype/pricing_rule/test_pricing_rule.py

@@ -597,255 +597,6 @@ class TestPricingRule(unittest.TestCase):
 		frappe.get_doc("Item Price", {"item_code": "Water Flask"}).delete()
 		item.delete()
 
-	def test_item_price_with_blank_uom_pricing_rule(self):
-		properties = {
-			"item_code": "Item Blank UOM",
-			"stock_uom": "Nos",
-			"sales_uom": "Box",
-			"uoms": [dict(uom="Box", conversion_factor=10)],
-		}
-		item = make_item(properties=properties)
-
-		make_item_price("Item Blank UOM", "_Test Price List", 100)
-
-		pricing_rule_record = {
-			"doctype": "Pricing Rule",
-			"title": "_Test Item Blank UOM Rule",
-			"apply_on": "Item Code",
-			"items": [
-				{
-					"item_code": "Item Blank UOM",
-				}
-			],
-			"selling": 1,
-			"currency": "INR",
-			"rate_or_discount": "Rate",
-			"rate": 101,
-			"company": "_Test Company",
-		}
-		rule = frappe.get_doc(pricing_rule_record)
-		rule.insert()
-
-		si = create_sales_invoice(
-			do_not_save=True, item_code="Item Blank UOM", uom="Box", conversion_factor=10
-		)
-		si.selling_price_list = "_Test Price List"
-		si.save()
-
-		# If UOM is blank consider it as stock UOM and apply pricing_rule on all UOM.
-		# rate is 101, Selling UOM is Box that have conversion_factor of 10 so 101 * 10 = 1010
-		self.assertEqual(si.items[0].price_list_rate, 1010)
-		self.assertEqual(si.items[0].rate, 1010)
-
-		si.delete()
-
-		si = create_sales_invoice(do_not_save=True, item_code="Item Blank UOM", uom="Nos")
-		si.selling_price_list = "_Test Price List"
-		si.save()
-
-		# UOM is blank so consider it as stock UOM and apply pricing_rule on all UOM.
-		# rate is 101, Selling UOM is Nos that have conversion_factor of 1 so 101 * 1 = 101
-		self.assertEqual(si.items[0].price_list_rate, 101)
-		self.assertEqual(si.items[0].rate, 101)
-
-		si.delete()
-		rule.delete()
-		frappe.get_doc("Item Price", {"item_code": "Item Blank UOM"}).delete()
-
-		item.delete()
-
-	def test_item_price_with_selling_uom_pricing_rule(self):
-		properties = {
-			"item_code": "Item UOM other than Stock",
-			"stock_uom": "Nos",
-			"sales_uom": "Box",
-			"uoms": [dict(uom="Box", conversion_factor=10)],
-		}
-		item = make_item(properties=properties)
-
-		make_item_price("Item UOM other than Stock", "_Test Price List", 100)
-
-		pricing_rule_record = {
-			"doctype": "Pricing Rule",
-			"title": "_Test Item UOM other than Stock Rule",
-			"apply_on": "Item Code",
-			"items": [
-				{
-					"item_code": "Item UOM other than Stock",
-					"uom": "Box",
-				}
-			],
-			"selling": 1,
-			"currency": "INR",
-			"rate_or_discount": "Rate",
-			"rate": 101,
-			"company": "_Test Company",
-		}
-		rule = frappe.get_doc(pricing_rule_record)
-		rule.insert()
-
-		si = create_sales_invoice(
-			do_not_save=True, item_code="Item UOM other than Stock", uom="Box", conversion_factor=10
-		)
-		si.selling_price_list = "_Test Price List"
-		si.save()
-
-		# UOM is Box so apply pricing_rule only on Box UOM.
-		# Selling UOM is Box and as both UOM are same no need to multiply by conversion_factor.
-		self.assertEqual(si.items[0].price_list_rate, 101)
-		self.assertEqual(si.items[0].rate, 101)
-
-		si.delete()
-
-		si = create_sales_invoice(do_not_save=True, item_code="Item UOM other than Stock", uom="Nos")
-		si.selling_price_list = "_Test Price List"
-		si.save()
-
-		# UOM is Box so pricing_rule won't apply as selling_uom is Nos.
-		# As Pricing Rule is not applied price of 100 will be fetched from Item Price List.
-		self.assertEqual(si.items[0].price_list_rate, 100)
-		self.assertEqual(si.items[0].rate, 100)
-
-		si.delete()
-		rule.delete()
-		frappe.get_doc("Item Price", {"item_code": "Item UOM other than Stock"}).delete()
-
-		item.delete()
-
-	def test_item_group_price_with_blank_uom_pricing_rule(self):
-		group = frappe.get_doc(
-			doctype="Item Group",
-			item_group_name="_Test Pricing Rule Item Group",
-			parent_item_group="All Item Groups",
-		)
-		group.save()
-		properties = {
-			"item_code": "Item with Group Blank UOM",
-			"item_group": "_Test Pricing Rule Item Group",
-			"stock_uom": "Nos",
-			"sales_uom": "Box",
-			"uoms": [dict(uom="Box", conversion_factor=10)],
-		}
-		item = make_item(properties=properties)
-
-		make_item_price("Item with Group Blank UOM", "_Test Price List", 100)
-
-		pricing_rule_record = {
-			"doctype": "Pricing Rule",
-			"title": "_Test Item with Group Blank UOM Rule",
-			"apply_on": "Item Group",
-			"item_groups": [
-				{
-					"item_group": "_Test Pricing Rule Item Group",
-				}
-			],
-			"selling": 1,
-			"currency": "INR",
-			"rate_or_discount": "Rate",
-			"rate": 101,
-			"company": "_Test Company",
-		}
-		rule = frappe.get_doc(pricing_rule_record)
-		rule.insert()
-
-		si = create_sales_invoice(
-			do_not_save=True, item_code="Item with Group Blank UOM", uom="Box", conversion_factor=10
-		)
-		si.selling_price_list = "_Test Price List"
-		si.save()
-
-		# If UOM is blank consider it as stock UOM and apply pricing_rule on all UOM.
-		# rate is 101, Selling UOM is Box that have conversion_factor of 10 so 101 * 10 = 1010
-		self.assertEqual(si.items[0].price_list_rate, 1010)
-		self.assertEqual(si.items[0].rate, 1010)
-
-		si.delete()
-
-		si = create_sales_invoice(do_not_save=True, item_code="Item with Group Blank UOM", uom="Nos")
-		si.selling_price_list = "_Test Price List"
-		si.save()
-
-		# UOM is blank so consider it as stock UOM and apply pricing_rule on all UOM.
-		# rate is 101, Selling UOM is Nos that have conversion_factor of 1 so 101 * 1 = 101
-		self.assertEqual(si.items[0].price_list_rate, 101)
-		self.assertEqual(si.items[0].rate, 101)
-
-		si.delete()
-		rule.delete()
-		frappe.get_doc("Item Price", {"item_code": "Item with Group Blank UOM"}).delete()
-		item.delete()
-		group.delete()
-
-	def test_item_group_price_with_selling_uom_pricing_rule(self):
-		group = frappe.get_doc(
-			doctype="Item Group",
-			item_group_name="_Test Pricing Rule Item Group UOM",
-			parent_item_group="All Item Groups",
-		)
-		group.save()
-		properties = {
-			"item_code": "Item with Group UOM other than Stock",
-			"item_group": "_Test Pricing Rule Item Group UOM",
-			"stock_uom": "Nos",
-			"sales_uom": "Box",
-			"uoms": [dict(uom="Box", conversion_factor=10)],
-		}
-		item = make_item(properties=properties)
-
-		make_item_price("Item with Group UOM other than Stock", "_Test Price List", 100)
-
-		pricing_rule_record = {
-			"doctype": "Pricing Rule",
-			"title": "_Test Item with Group UOM other than Stock Rule",
-			"apply_on": "Item Group",
-			"item_groups": [
-				{
-					"item_group": "_Test Pricing Rule Item Group UOM",
-					"uom": "Box",
-				}
-			],
-			"selling": 1,
-			"currency": "INR",
-			"rate_or_discount": "Rate",
-			"rate": 101,
-			"company": "_Test Company",
-		}
-		rule = frappe.get_doc(pricing_rule_record)
-		rule.insert()
-
-		si = create_sales_invoice(
-			do_not_save=True,
-			item_code="Item with Group UOM other than Stock",
-			uom="Box",
-			conversion_factor=10,
-		)
-		si.selling_price_list = "_Test Price List"
-		si.save()
-
-		# UOM is Box so apply pricing_rule only on Box UOM.
-		# Selling UOM is Box and as both UOM are same no need to multiply by conversion_factor.
-		self.assertEqual(si.items[0].price_list_rate, 101)
-		self.assertEqual(si.items[0].rate, 101)
-
-		si.delete()
-
-		si = create_sales_invoice(
-			do_not_save=True, item_code="Item with Group UOM other than Stock", uom="Nos"
-		)
-		si.selling_price_list = "_Test Price List"
-		si.save()
-
-		# UOM is Box so pricing_rule won't apply as selling_uom is Nos.
-		# As Pricing Rule is not applied price of 100 will be fetched from Item Price List.
-		self.assertEqual(si.items[0].price_list_rate, 100)
-		self.assertEqual(si.items[0].rate, 100)
-
-		si.delete()
-		rule.delete()
-		frappe.get_doc("Item Price", {"item_code": "Item with Group UOM other than Stock"}).delete()
-		item.delete()
-		group.delete()
-
 	def test_pricing_rule_for_different_currency(self):
 		make_item("Test Sanitizer Item")
 

erpnext/accounts/doctype/pricing_rule/utils.py

@@ -111,12 +111,6 @@ def _get_pricing_rules(apply_on, args, values):
 		)
 
 		if apply_on_field == "item_code":
-			if args.get("uom", None):
-				item_conditions += (
-					" and ({child_doc}.uom='{item_uom}' or IFNULL({child_doc}.uom, '')='')".format(
-						child_doc=child_doc, item_uom=args.get("uom")
-					)
-				)
 			if "variant_of" not in args:
 				args.variant_of = frappe.get_cached_value("Item", args.item_code, "variant_of")
 
@@ -127,12 +121,7 @@ def _get_pricing_rules(apply_on, args, values):
 				values["variant_of"] = args.variant_of
 	elif apply_on_field == "item_group":
 		item_conditions = _get_tree_conditions(args, "Item Group", child_doc, False)
-		if args.get("uom", None):
-			item_conditions += (
-				" and ({child_doc}.uom='{item_uom}' or IFNULL({child_doc}.uom, '')='')".format(
-					child_doc=child_doc, item_uom=args.get("uom")
-				)
-			)
+
 	conditions += get_other_conditions(conditions, values, args)
 	warehouse_conditions = _get_tree_conditions(args, "Warehouse", "`tabPricing Rule`")
 	if warehouse_conditions:

erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.html

@@ -15,7 +15,7 @@
 	</div>
 	<h2 class="text-center">{{ _("STATEMENTS OF ACCOUNTS") }}</h2>
 	<div>
-		<h5 style="float: left;">{{ _("Customer: ") }} <b>{{filters.party_name[0] }}</b></h5>
+		<h5 style="float: left;">{{ _("Customer: ") }} <b>{{filters.party[0] }}</b></h5>
 		<h5 style="float: right;">
 			{{ _("Date: ") }}
 			<b>{{ frappe.format(filters.from_date, 'Date')}}
@@ -49,6 +49,7 @@
 						<br>
 					{% endif %}
 
+					{{ _("Against") }}: {{ row.against }}
 					<br>{{ _("Remarks") }}: {{ row.remarks }}
 					{% if row.bill_no %}
 						<br>{{ _("Supplier Invoice No") }}: {{ row.bill_no }}

erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.js

@@ -8,8 +8,7 @@ frappe.ui.form.on('Process Statement Of Accounts', {
 	},
 	refresh: function(frm){
 		if(!frm.doc.__islocal) {
-			frm.add_custom_button(__('Send Emails'), function(){
-				if (frm.is_dirty()) frappe.throw(__("Please save before proceeding."))
+			frm.add_custom_button('Send Emails',function(){
 				frappe.call({
 					method: "erpnext.accounts.doctype.process_statement_of_accounts.process_statement_of_accounts.send_emails",
 					args: {
@@ -25,9 +24,8 @@ frappe.ui.form.on('Process Statement Of Accounts', {
 					}
 				});
 			});
-			frm.add_custom_button(__('Download'), function(){
-				if (frm.is_dirty()) frappe.throw(__("Please save before proceeding."))
-				let url = frappe.urllib.get_full_url(
+			frm.add_custom_button('Download',function(){
+				var url = frappe.urllib.get_full_url(
 					'/api/method/erpnext.accounts.doctype.process_statement_of_accounts.process_statement_of_accounts.download_statements?'
 					+ 'document_name='+encodeURIComponent(frm.doc.name))
 				$.ajax({

erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json

@@ -27,7 +27,6 @@
   "customers",
   "preferences",
   "orientation",
-  "include_break",
   "include_ageing",
   "ageing_based_on",
   "section_break_14",
@@ -285,16 +284,10 @@
    "fieldtype": "Link",
    "label": "Terms and Conditions",
    "options": "Terms and Conditions"
-  },
-  {
-   "default": "1",
-   "fieldname": "include_break",
-   "fieldtype": "Check",
-   "label": "Page Break After Each SoA"
   }
  ],
  "links": [],
- "modified": "2022-10-17 17:47:08.662475",
+ "modified": "2021-09-06 21:00:45.732505",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Process Statement Of Accounts",
@@ -327,6 +320,5 @@
  ],
  "sort_field": "modified",
  "sort_order": "DESC",
- "states": [],
  "track_changes": 1
 }

erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.py

@@ -6,7 +6,6 @@ import copy
 
 import frappe
 from frappe import _
-from frappe.desk.reportview import get_match_cond
 from frappe.model.document import Document
 from frappe.utils import add_days, add_months, format_date, getdate, today
 from frappe.utils.jinja import validate_template
@@ -24,7 +23,7 @@ from erpnext.accounts.report.general_ledger.general_ledger import execute as get
 class ProcessStatementOfAccounts(Document):
 	def validate(self):
 		if not self.subject:
-			self.subject = "Statement Of Accounts for {{ customer.customer_name }}"
+			self.subject = "Statement Of Accounts for {{ customer.name }}"
 		if not self.body:
 			self.body = "Hello {{ customer.name }},<br>PFA your Statement Of Accounts from {{ doc.from_date }} to {{ doc.to_date }}."
 
@@ -87,7 +86,6 @@ def get_report_pdf(doc, consolidated=True):
 				"account": [doc.account] if doc.account else None,
 				"party_type": "Customer",
 				"party": [entry.customer],
-				"party_name": [entry.customer_name] if entry.customer_name else None,
 				"presentation_currency": presentation_currency,
 				"group_by": doc.group_by,
 				"currency": doc.currency,
@@ -130,8 +128,7 @@ def get_report_pdf(doc, consolidated=True):
 	if not bool(statement_dict):
 		return False
 	elif consolidated:
-		delimiter = '<div style="page-break-before: always;"></div>' if doc.include_break else ""
-		result = delimiter.join(list(statement_dict.values()))
+		result = "".join(list(statement_dict.values()))
 		return get_pdf(result, {"orientation": doc.orientation})
 	else:
 		for customer, statement_html in statement_dict.items():
@@ -156,7 +153,7 @@ def get_customers_based_on_territory_or_customer_group(customer_collection, coll
 	]
 	return frappe.get_list(
 		"Customer",
-		fields=["name", "customer_name", "email_id"],
+		fields=["name", "email_id"],
 		filters=[[fields_dict[customer_collection], "IN", selected]],
 	)
 
@@ -179,7 +176,7 @@ def get_customers_based_on_sales_person(sales_person):
 	if sales_person_records.get("Customer"):
 		return frappe.get_list(
 			"Customer",
-			fields=["name", "customer_name", "email_id"],
+			fields=["name", "email_id"],
 			filters=[["name", "in", list(sales_person_records["Customer"])]],
 		)
 	else:
@@ -228,7 +225,7 @@ def fetch_customers(customer_collection, collection_name, primary_mandatory):
 		if customer_collection == "Sales Partner":
 			customers = frappe.get_list(
 				"Customer",
-				fields=["name", "customer_name", "email_id"],
+				fields=["name", "email_id"],
 				filters=[["default_sales_partner", "=", collection_name]],
 			)
 		else:
@@ -243,14 +240,11 @@ def fetch_customers(customer_collection, collection_name, primary_mandatory):
 		if int(primary_mandatory):
 			if primary_email == "":
 				continue
+		elif (billing_email == "") and (primary_email == ""):
+			continue
 
 		customer_list.append(
-			{
-				"name": customer.name,
-				"customer_name": customer.customer_name,
-				"primary_email": primary_email,
-				"billing_email": billing_email,
-			}
+			{"name": customer.name, "primary_email": primary_email, "billing_email": billing_email}
 		)
 	return customer_list
 
@@ -279,12 +273,8 @@ def get_customer_emails(customer_name, primary_mandatory, billing_and_primary=Tr
 			link.link_doctype='Customer'
 			and link.link_name=%s
 			and contact.is_billing_contact=1
-			{mcond}
 		ORDER BY
-			contact.creation desc
-		""".format(
-			mcond=get_match_cond("Contact")
-		),
+			contact.creation desc""",
 		customer_name,
 	)
 
@@ -323,8 +313,6 @@ def send_emails(document_name, from_scheduler=False):
 			attachments = [{"fname": customer + ".pdf", "fcontent": report_pdf}]
 
 			recipients, cc = get_recipients_and_cc(customer, doc)
-			if not recipients:
-				continue
 			context = get_context(customer, doc)
 			subject = frappe.render_template(doc.subject, context)
 			message = frappe.render_template(doc.body, context)

erpnext/accounts/doctype/process_statement_of_accounts_customer/process_statement_of_accounts_customer.json

@@ -1,12 +1,12 @@
 {
  "actions": [],
+ "allow_workflow": 1,
  "creation": "2020-08-03 16:35:21.852178",
  "doctype": "DocType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
   "customer",
-  "customer_name",
   "billing_email",
   "primary_email"
  ],
@@ -30,18 +30,11 @@
    "fieldtype": "Read Only",
    "in_list_view": 1,
    "label": "Billing Email"
-  },
-  {
-   "fetch_from": "customer.customer_name",
-   "fieldname": "customer_name",
-   "fieldtype": "Data",
-   "label": "Customer Name",
-   "read_only": 1
   }
  ],
  "istable": 1,
  "links": [],
- "modified": "2023-03-13 00:12:34.508086",
+ "modified": "2020-08-03 22:55:38.875601",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Process Statement Of Accounts Customer",
@@ -50,6 +43,5 @@
  "quick_entry": 1,
  "sort_field": "modified",
  "sort_order": "DESC",
- "states": [],
  "track_changes": 1
 }

erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js

@@ -31,7 +31,7 @@ erpnext.accounts.PurchaseInvoice = erpnext.buying.BuyingController.extend({
 		this._super();
 
 		// Ignore linked advances
-		this.frm.ignore_doctypes_on_cancel_all = ['Journal Entry', 'Payment Entry', 'Purchase Invoice'];
+		this.frm.ignore_doctypes_on_cancel_all = ['Journal Entry', 'Payment Entry'];
 
 		if(!this.frm.doc.__islocal) {
 			// show credit_to in print format
@@ -81,12 +81,8 @@ erpnext.accounts.PurchaseInvoice = erpnext.buying.BuyingController.extend({
 		}
 
 		if(doc.docstatus == 1 && doc.outstanding_amount != 0
-			&& !(doc.is_return && doc.return_against) && !doc.on_hold) {
-			this.frm.add_custom_button(
-				__('Payment'),
-				() => this.make_payment_entry(),
-				__('Create')
-			);
+			&& !(doc.is_return && doc.return_against)) {
+			this.frm.add_custom_button(__('Payment'), this.make_payment_entry, __('Create'));
 			cur_frm.page.set_inner_btn_group_as_primary(__('Create'));
 		}
 
@@ -303,7 +299,7 @@ erpnext.accounts.PurchaseInvoice = erpnext.buying.BuyingController.extend({
 
 	apply_tds: function(frm) {
 		var me = this;
-		me.frm.set_value("tax_withheld_vouchers", []);
+
 		if (!me.frm.doc.apply_tds) {
 			me.frm.set_value("tax_withholding_category", '');
 			me.frm.set_df_property("tax_withholding_category", "hidden", 1);
@@ -573,10 +569,6 @@ frappe.ui.form.on("Purchase Invoice", {
 		erpnext.queries.setup_queries(frm, "Warehouse", function() {
 			return erpnext.queries.warehouse(frm.doc);
 		});
-
-		if (frm.is_new()) {
-			frm.clear_table("tax_withheld_vouchers");
-		}
 	},
 
 	is_subcontracted: function(frm) {

erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py

@@ -67,9 +67,6 @@ class PurchaseInvoice(BuyingController):
 		supplier_tds = frappe.db.get_value("Supplier", self.supplier, "tax_withholding_category")
 		self.set_onload("supplier_tds", supplier_tds)
 
-		if self.is_new():
-			self.set("tax_withheld_vouchers", [])
-
 	def before_save(self):
 		if not self.on_hold:
 			self.release_date = ""
@@ -261,7 +258,9 @@ class PurchaseInvoice(BuyingController):
 			stock_not_billed_account = self.get_company_default("stock_received_but_not_billed")
 			stock_items = self.get_stock_items()
 
-		asset_received_but_not_billed = None
+		asset_items = [d.is_fixed_asset for d in self.items if d.is_fixed_asset]
+		if len(asset_items) > 0:
+			asset_received_but_not_billed = self.get_company_default("asset_received_but_not_billed")
 
 		if self.update_stock:
 			self.validate_item_code()
@@ -355,8 +354,6 @@ class PurchaseInvoice(BuyingController):
 					)
 				item.expense_account = asset_category_account
 			elif item.is_fixed_asset and item.pr_detail:
-				if not asset_received_but_not_billed:
-					asset_received_but_not_billed = self.get_company_default("asset_received_but_not_billed")
 				item.expense_account = asset_received_but_not_billed
 			elif not item.expense_account and for_validate:
 				throw(_("Expense account is mandatory for item {0}").format(item.item_code or item.item_name))
@@ -598,7 +595,7 @@ class PurchaseInvoice(BuyingController):
 
 	def make_supplier_gl_entry(self, gl_entries):
 		# Checked both rounding_adjustment and rounded_total
-		# because rounded_total had value even before introduction of posting GLE based on rounded total
+		# because rounded_total had value even before introcution of posting GLE based on rounded total
 		grand_total = (
 			self.rounded_total if (self.rounding_adjustment and self.rounded_total) else self.grand_total
 		)
@@ -698,10 +695,6 @@ class PurchaseInvoice(BuyingController):
 							)
 						)
 
-						credit_amount = item.base_net_amount
-						if self.is_internal_supplier and item.valuation_rate:
-							credit_amount = flt(item.valuation_rate * item.stock_qty)
-
 						# Intentionally passed negative debit amount to avoid incorrect GL Entry validation
 						gl_entries.append(
 							self.get_gl_dict(
@@ -711,7 +704,7 @@ class PurchaseInvoice(BuyingController):
 									"cost_center": item.cost_center,
 									"project": item.project or self.project,
 									"remarks": self.get("remarks") or _("Accounting Entry for Stock"),
-									"debit": -1 * flt(credit_amount, item.precision("base_net_amount")),
+									"debit": -1 * flt(item.base_net_amount, item.precision("base_net_amount")),
 								},
 								warehouse_account[item.from_warehouse]["account_currency"],
 								item=item,
@@ -799,7 +792,10 @@ class PurchaseInvoice(BuyingController):
 						else item.deferred_expense_account
 					)
 
-					dummy, amount = self.get_amount_and_base_amount(item, None)
+					if not item.is_fixed_asset:
+						dummy, amount = self.get_amount_and_base_amount(item, None)
+					else:
+						amount = flt(item.base_net_amount + item.item_tax_amount, item.precision("base_net_amount"))
 
 					if provisional_accounting_for_non_stock_items:
 						if item.purchase_receipt:
@@ -924,9 +920,8 @@ class PurchaseInvoice(BuyingController):
 						)
 
 	def get_asset_gl_entry(self, gl_entries):
-		arbnb_account = None
-		eiiav_account = None
-		asset_eiiav_currency = None
+		arbnb_account = self.get_company_default("asset_received_but_not_billed")
+		eiiav_account = self.get_company_default("expenses_included_in_asset_valuation")
 
 		for item in self.get("items"):
 			if item.is_fixed_asset:
@@ -938,8 +933,6 @@ class PurchaseInvoice(BuyingController):
 					"Asset Received But Not Billed",
 					"Fixed Asset",
 				]:
-					if not arbnb_account:
-						arbnb_account = self.get_company_default("asset_received_but_not_billed")
 					item.expense_account = arbnb_account
 
 				if not self.update_stock:
@@ -962,10 +955,7 @@ class PurchaseInvoice(BuyingController):
 					)
 
 					if item.item_tax_amount:
-						if not eiiav_account or not asset_eiiav_currency:
-							eiiav_account = self.get_company_default("expenses_included_in_asset_valuation")
-							asset_eiiav_currency = get_account_currency(eiiav_account)
-
+						asset_eiiav_currency = get_account_currency(eiiav_account)
 						gl_entries.append(
 							self.get_gl_dict(
 								{
@@ -1008,10 +998,7 @@ class PurchaseInvoice(BuyingController):
 					)
 
 					if item.item_tax_amount and not cint(erpnext.is_perpetual_inventory_enabled(self.company)):
-						if not eiiav_account or not asset_eiiav_currency:
-							eiiav_account = self.get_company_default("expenses_included_in_asset_valuation")
-							asset_eiiav_currency = get_account_currency(eiiav_account)
-
+						asset_eiiav_currency = get_account_currency(eiiav_account)
 						gl_entries.append(
 							self.get_gl_dict(
 								{
@@ -1031,46 +1018,47 @@ class PurchaseInvoice(BuyingController):
 							)
 						)
 
+					# When update stock is checked
 					# Assets are bought through this document then it will be linked to this document
-					if flt(item.landed_cost_voucher_amount):
-						if not eiiav_account:
-							eiiav_account = self.get_company_default("expenses_included_in_asset_valuation")
-
-						gl_entries.append(
-							self.get_gl_dict(
-								{
-									"account": eiiav_account,
-									"against": cwip_account,
-									"cost_center": item.cost_center,
-									"remarks": self.get("remarks") or _("Accounting Entry for Stock"),
-									"credit": flt(item.landed_cost_voucher_amount),
-									"project": item.project or self.project,
-								},
-								item=item,
+					if self.update_stock:
+						if flt(item.landed_cost_voucher_amount):
+							gl_entries.append(
+								self.get_gl_dict(
+									{
+										"account": eiiav_account,
+										"against": cwip_account,
+										"cost_center": item.cost_center,
+										"remarks": self.get("remarks") or _("Accounting Entry for Stock"),
+										"credit": flt(item.landed_cost_voucher_amount),
+										"project": item.project or self.project,
+									},
+									item=item,
+								)
 							)
-						)
 
-						gl_entries.append(
-							self.get_gl_dict(
-								{
-									"account": cwip_account,
-									"against": eiiav_account,
-									"cost_center": item.cost_center,
-									"remarks": self.get("remarks") or _("Accounting Entry for Stock"),
-									"debit": flt(item.landed_cost_voucher_amount),
-									"project": item.project or self.project,
-								},
-								item=item,
+							gl_entries.append(
+								self.get_gl_dict(
+									{
+										"account": cwip_account,
+										"against": eiiav_account,
+										"cost_center": item.cost_center,
+										"remarks": self.get("remarks") or _("Accounting Entry for Stock"),
+										"debit": flt(item.landed_cost_voucher_amount),
+										"project": item.project or self.project,
+									},
+									item=item,
+								)
 							)
-						)
 
-					# update gross amount of assets bought through this document
-					assets = frappe.db.get_all(
-						"Asset", filters={"purchase_invoice": self.name, "item_code": item.item_code}
-					)
-					for asset in assets:
-						frappe.db.set_value("Asset", asset.name, "gross_purchase_amount", flt(item.valuation_rate))
-						frappe.db.set_value("Asset", asset.name, "purchase_receipt_amount", flt(item.valuation_rate))
+						# update gross amount of assets bought through this document
+						assets = frappe.db.get_all(
+							"Asset", filters={"purchase_invoice": self.name, "item_code": item.item_code}
+						)
+						for asset in assets:
+							frappe.db.set_value("Asset", asset.name, "gross_purchase_amount", flt(item.valuation_rate))
+							frappe.db.set_value(
+								"Asset", asset.name, "purchase_receipt_amount", flt(item.valuation_rate)
+							)
 
 		return gl_entries
 
@@ -1376,14 +1364,7 @@ class PurchaseInvoice(BuyingController):
 		frappe.db.set(self, "status", "Cancelled")
 
 		unlink_inter_company_doc(self.doctype, self.name, self.inter_company_invoice_reference)
-
-		self.ignore_linked_doctypes = (
-			"GL Entry",
-			"Stock Ledger Entry",
-			"Repost Item Valuation",
-			"Tax Withheld Vouchers",
-		)
-
+		self.ignore_linked_doctypes = ("GL Entry", "Stock Ledger Entry", "Repost Item Valuation")
 		self.update_advance_tax_references(cancel=1)
 
 	def update_project(self):

erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py

@@ -1580,76 +1580,6 @@ class TestPurchaseInvoice(unittest.TestCase, StockTestMixin):
 
 		self.assertTrue(return_pi.docstatus == 1)
 
-	def test_payment_allocation_for_payment_terms(self):
-		from erpnext.buying.doctype.purchase_order.test_purchase_order import (
-			create_pr_against_po,
-			create_purchase_order,
-		)
-		from erpnext.selling.doctype.sales_order.test_sales_order import (
-			automatically_fetch_payment_terms,
-		)
-		from erpnext.stock.doctype.purchase_receipt.purchase_receipt import (
-			make_purchase_invoice as make_pi_from_pr,
-		)
-
-		automatically_fetch_payment_terms()
-		frappe.db.set_value(
-			"Payment Terms Template",
-			"_Test Payment Term Template",
-			"allocate_payment_based_on_payment_terms",
-			0,
-		)
-
-		po = create_purchase_order(do_not_save=1)
-		po.payment_terms_template = "_Test Payment Term Template"
-		po.save()
-		po.submit()
-
-		pr = create_pr_against_po(po.name, received_qty=4)
-		pi = make_pi_from_pr(pr.name)
-		self.assertEqual(pi.payment_schedule[0].payment_amount, 1000)
-
-		frappe.db.set_value(
-			"Payment Terms Template",
-			"_Test Payment Term Template",
-			"allocate_payment_based_on_payment_terms",
-			1,
-		)
-		pi = make_pi_from_pr(pr.name)
-		self.assertEqual(pi.payment_schedule[0].payment_amount, 2500)
-
-		automatically_fetch_payment_terms(enable=0)
-		frappe.db.set_value(
-			"Payment Terms Template",
-			"_Test Payment Term Template",
-			"allocate_payment_based_on_payment_terms",
-			0,
-		)
-
-	def test_default_cost_center_for_purchase(self):
-		from erpnext.accounts.doctype.cost_center.test_cost_center import create_cost_center
-
-		for c_center in ["_Test Cost Center Selling", "_Test Cost Center Buying"]:
-			create_cost_center(cost_center_name=c_center)
-
-		item = create_item(
-			"_Test Cost Center Item For Purchase",
-			is_stock_item=1,
-			buying_cost_center="_Test Cost Center Buying - _TC",
-			selling_cost_center="_Test Cost Center Selling - _TC",
-		)
-
-		pi = make_purchase_invoice(
-			item=item.name, qty=1, rate=1000, update_stock=True, do_not_submit=True, cost_center=""
-		)
-
-		pi.items[0].cost_center = ""
-		pi.set_missing_values()
-		pi.calculate_taxes_and_totals()
-		pi.save()
-
-		self.assertEqual(pi.items[0].cost_center, "_Test Cost Center Buying - _TC")
-
 
 def check_gl_entries(doc, voucher_no, expected_gle, posting_date):
 	gl_entries = frappe.db.sql(

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
   },
   {
@@ -707,7 +706,6 @@
    "label": "Valuation Rate",
    "no_copy": 1,
    "options": "Company:company:default_currency",
-   "precision": "6",
    "print_hide": 1,
    "read_only": 1
   },
@@ -873,7 +871,7 @@
  "idx": 1,
  "istable": 1,
  "links": [],
- "modified": "2023-07-02 18:39:41.495723",
+ "modified": "2021-11-15 17:04:07.191013",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Purchase Invoice Item",

erpnext/accounts/doctype/sales_invoice/sales_invoice.js

@@ -75,12 +75,9 @@ erpnext.accounts.SalesInvoiceController = erpnext.selling.SellingController.exte
 
 		if (doc.docstatus == 1 && doc.outstanding_amount!=0
 			&& !(cint(doc.is_return) && doc.return_against)) {
-			this.frm.add_custom_button(
-				__('Payment'),
-				() => this.make_payment_entry(),
-				__('Create')
-			);
-			this.frm.page.set_inner_btn_group_as_primary(__('Create'));
+			cur_frm.add_custom_button(__('Payment'),
+				this.make_payment_entry, __('Create'));
+			cur_frm.page.set_inner_btn_group_as_primary(__('Create'));
 		}
 
 		if(doc.docstatus==1 && !doc.is_return) {
@@ -316,7 +313,6 @@ erpnext.accounts.SalesInvoiceController = erpnext.selling.SellingController.exte
 	},
 
 	make_inter_company_invoice: function() {
-		let me = this;
 		frappe.model.open_mapped_doc({
 			method: "erpnext.accounts.doctype.sales_invoice.sales_invoice.make_inter_company_purchase_invoice",
 			frm: me.frm
@@ -653,6 +649,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 {
@@ -1069,7 +1078,7 @@ var select_loyalty_program = function(frm, loyalty_programs) {
 		]
 	});
 
-	dialog.set_primary_action(__("Set Loyalty Program"), function() {
+	dialog.set_primary_action(__("Set"), function() {
 		dialog.hide();
 		return frappe.call({
 			method: "frappe.client.set_value",

erpnext/accounts/doctype/sales_invoice/sales_invoice.json

@@ -1790,8 +1790,6 @@
    "width": "50%"
   },
   {
-   "fetch_from": "sales_partner.commission_rate",
-   "fetch_if_empty": 1,
    "fieldname": "commission_rate",
    "fieldtype": "Float",
    "hide_days": 1,
@@ -2047,7 +2045,7 @@
    "link_fieldname": "consolidated_invoice"
   }
  ],
- "modified": "2023-01-28 19:45:47.538163",
+ "modified": "2022-09-16 17:44:22.227332",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Sales Invoice",
@@ -2103,4 +2101,4 @@
  "title_field": "title",
  "track_changes": 1,
  "track_seen": 1
-}
+}

erpnext/accounts/doctype/sales_invoice/sales_invoice.py

@@ -7,7 +7,17 @@ from frappe import _, msgprint, throw
 from frappe.contacts.doctype.address.address import get_address_display
 from frappe.model.mapper import get_mapped_doc
 from frappe.model.utils import get_fetch_values
-from frappe.utils import add_days, cint, cstr, flt, formatdate, get_link_to_form, getdate, nowdate
+from frappe.utils import (
+	add_days,
+	add_months,
+	cint,
+	cstr,
+	flt,
+	formatdate,
+	get_link_to_form,
+	getdate,
+	nowdate,
+)
 from six import iteritems
 
 import erpnext
@@ -23,12 +33,10 @@ from erpnext.accounts.general_ledger import get_round_off_account_and_cost_cente
 from erpnext.accounts.party import get_due_date, get_party_account, get_party_details
 from erpnext.accounts.utils import get_account_currency
 from erpnext.assets.doctype.asset.depreciation import (
-	depreciate_asset,
 	get_disposal_account_and_cost_center,
 	get_gl_entries_on_asset_disposal,
 	get_gl_entries_on_asset_regain,
-	reset_depreciation_schedule,
-	reverse_depreciation_entry_made_after_disposal,
+	make_depreciation_entry,
 )
 from erpnext.controllers.accounts_controller import validate_account_head
 from erpnext.controllers.selling_controller import SellingController
@@ -1106,23 +1114,21 @@ class SalesInvoice(SellingController):
 					asset = self.get_asset(item)
 
 					if self.is_return:
+						if asset.calculate_depreciation:
+							self.reverse_depreciation_entry_made_after_sale(asset)
+							self.reset_depreciation_schedule(asset)
+
 						fixed_asset_gl_entries = get_gl_entries_on_asset_regain(
-							asset, item.base_net_amount, item.finance_book, self.posting_date
+							asset, item.base_net_amount, item.finance_book
 						)
 						asset.db_set("disposal_date", None)
 
-						if asset.calculate_depreciation:
-							posting_date = frappe.db.get_value("Sales Invoice", self.return_against, "posting_date")
-							reverse_depreciation_entry_made_after_disposal(asset, posting_date)
-							reset_depreciation_schedule(asset, self.posting_date)
-
 					else:
 						if asset.calculate_depreciation:
-							depreciate_asset(asset, self.posting_date)
-							asset.reload()
+							self.depreciate_asset(asset)
 
 						fixed_asset_gl_entries = get_gl_entries_on_asset_disposal(
-							asset, item.base_net_amount, item.finance_book, self.posting_date
+							asset, item.base_net_amount, item.finance_book
 						)
 						asset.db_set("disposal_date", self.posting_date)
 
@@ -1187,6 +1193,95 @@ class SalesInvoice(SellingController):
 				_("Select finance book for the item {0} at row {1}").format(item.item_code, item.idx)
 			)
 
+	def depreciate_asset(self, asset):
+		asset.flags.ignore_validate_update_after_submit = True
+		asset.prepare_depreciation_data(date_of_sale=self.posting_date)
+		asset.save()
+
+		make_depreciation_entry(asset.name, self.posting_date)
+		asset.load_from_db()
+
+	def reset_depreciation_schedule(self, asset):
+		asset.flags.ignore_validate_update_after_submit = True
+
+		# recreate original depreciation schedule of the asset
+		asset.prepare_depreciation_data(date_of_return=self.posting_date)
+
+		self.modify_depreciation_schedule_for_asset_repairs(asset)
+		asset.save()
+		asset.load_from_db()
+
+	def modify_depreciation_schedule_for_asset_repairs(self, asset):
+		asset_repairs = frappe.get_all(
+			"Asset Repair", filters={"asset": asset.name}, fields=["name", "increase_in_asset_life"]
+		)
+
+		for repair in asset_repairs:
+			if repair.increase_in_asset_life:
+				asset_repair = frappe.get_doc("Asset Repair", repair.name)
+				asset_repair.modify_depreciation_schedule()
+				asset.prepare_depreciation_data()
+
+	def reverse_depreciation_entry_made_after_sale(self, asset):
+		from erpnext.accounts.doctype.journal_entry.journal_entry import make_reverse_journal_entry
+
+		posting_date_of_original_invoice = self.get_posting_date_of_sales_invoice()
+
+		row = -1
+		finance_book = asset.get("schedules")[0].get("finance_book")
+		for schedule in asset.get("schedules"):
+			if schedule.finance_book != finance_book:
+				row = 0
+				finance_book = schedule.finance_book
+			else:
+				row += 1
+
+			if schedule.schedule_date == posting_date_of_original_invoice:
+				if not self.sale_was_made_on_original_schedule_date(
+					asset, schedule, row, posting_date_of_original_invoice
+				) or self.sale_happens_in_the_future(posting_date_of_original_invoice):
+
+					reverse_journal_entry = make_reverse_journal_entry(schedule.journal_entry)
+					reverse_journal_entry.posting_date = nowdate()
+					frappe.flags.is_reverse_depr_entry = True
+					reverse_journal_entry.submit()
+
+					frappe.flags.is_reverse_depr_entry = False
+					asset.flags.ignore_validate_update_after_submit = True
+					schedule.journal_entry = None
+					depreciation_amount = self.get_depreciation_amount_in_je(reverse_journal_entry)
+					asset.finance_books[0].value_after_depreciation += depreciation_amount
+					asset.save()
+
+	def get_posting_date_of_sales_invoice(self):
+		return frappe.db.get_value("Sales Invoice", self.return_against, "posting_date")
+
+	# if the invoice had been posted on the date the depreciation was initially supposed to happen, the depreciation shouldn't be undone
+	def sale_was_made_on_original_schedule_date(
+		self, asset, schedule, row, posting_date_of_original_invoice
+	):
+		for finance_book in asset.get("finance_books"):
+			if schedule.finance_book == finance_book.finance_book:
+				orginal_schedule_date = add_months(
+					finance_book.depreciation_start_date, row * cint(finance_book.frequency_of_depreciation)
+				)
+
+				if orginal_schedule_date == posting_date_of_original_invoice:
+					return True
+		return False
+
+	def sale_happens_in_the_future(self, posting_date_of_original_invoice):
+		if posting_date_of_original_invoice > getdate():
+			return True
+
+		return False
+
+	def get_depreciation_amount_in_je(self, journal_entry):
+		if journal_entry.accounts[0].debit_in_account_currency:
+			return journal_entry.accounts[0].debit_in_account_currency
+		else:
+			return journal_entry.accounts[0].credit_in_account_currency
+
 	@property
 	def enable_discount_accounting(self):
 		if not hasattr(self, "_enable_discount_accounting"):
@@ -1580,13 +1675,15 @@ class SalesInvoice(SellingController):
 		frappe.db.set_value("Customer", self.customer, "loyalty_program_tier", lp_details.tier_name)
 
 	def get_returned_amount(self):
-		from frappe.query_builder.functions import Sum
+		from frappe.query_builder.functions import Coalesce, Sum
 
 		doc = frappe.qb.DocType(self.doctype)
 		returned_amount = (
 			frappe.qb.from_(doc)
 			.select(Sum(doc.grand_total))
-			.where((doc.docstatus == 1) & (doc.is_return == 1) & (doc.return_against == self.name))
+			.where(
+				(doc.docstatus == 1) & (doc.is_return == 1) & (Coalesce(doc.return_against, "") == self.name)
+			)
 		).run()
 
 		return abs(returned_amount[0][0]) if returned_amount[0][0] else 0
@@ -2090,9 +2187,6 @@ def make_inter_company_transaction(doctype, source_name, target_doc=None):
 			update_address(
 				target_doc, "shipping_address", "shipping_address_display", source_doc.customer_address
 			)
-			update_address(
-				target_doc, "billing_address", "billing_address_display", source_doc.customer_address
-			)
 
 			if currency:
 				target_doc.currency = currency

erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py

@@ -31,20 +31,10 @@ from erpnext.stock.doctype.stock_entry.test_stock_entry import (
 	get_qty_after_transaction,
 	make_stock_entry,
 )
-from erpnext.stock.doctype.stock_reconciliation.test_stock_reconciliation import (
-	create_stock_reconciliation,
-)
-from erpnext.stock.utils import get_incoming_rate, get_stock_balance
+from erpnext.stock.utils import get_incoming_rate
 
 
 class TestSalesInvoice(unittest.TestCase):
-	def setUp(self):
-		from erpnext.stock.doctype.stock_ledger_entry.test_stock_ledger_entry import create_items
-
-		create_items(["_Test Internal Transfer Item"], uoms=[{"uom": "Box", "conversion_factor": 10}])
-		create_internal_parties()
-		setup_accounts()
-
 	def make(self):
 		w = frappe.copy_doc(test_records[0])
 		w.is_pos = 0
@@ -916,8 +906,7 @@ class TestSalesInvoice(unittest.TestCase):
 		pos_return.insert()
 		pos_return.submit()
 
-		self.assertEqual(pos_return.get("payments")[0].amount, -500)
-		self.assertEqual(pos_return.get("payments")[1].amount, -500)
+		self.assertEqual(pos_return.get("payments")[0].amount, -1000)
 
 	def test_pos_change_amount(self):
 		make_pos_profile(
@@ -1117,46 +1106,6 @@ class TestSalesInvoice(unittest.TestCase):
 
 		frappe.db.sql("delete from `tabPOS Profile`")
 
-	def test_bin_details_of_packed_item(self):
-		from erpnext.selling.doctype.product_bundle.test_product_bundle import make_product_bundle
-		from erpnext.stock.doctype.item.test_item import make_item
-
-		# test Update Items with product bundle
-		if not frappe.db.exists("Item", "_Test Product Bundle Item New"):
-			bundle_item = make_item("_Test Product Bundle Item New", {"is_stock_item": 0})
-			bundle_item.append(
-				"item_defaults", {"company": "_Test Company", "default_warehouse": "_Test Warehouse - _TC"}
-			)
-			bundle_item.save(ignore_permissions=True)
-
-		make_item("_Packed Item New 1", {"is_stock_item": 1})
-		make_product_bundle("_Test Product Bundle Item New", ["_Packed Item New 1"], 2)
-
-		si = create_sales_invoice(
-			item_code="_Test Product Bundle Item New",
-			update_stock=1,
-			warehouse="_Test Warehouse - _TC",
-			transaction_date=add_days(nowdate(), -1),
-			do_not_submit=1,
-		)
-
-		make_stock_entry(item="_Packed Item New 1", target="_Test Warehouse - _TC", qty=120, rate=100)
-
-		bin_details = frappe.db.get_value(
-			"Bin",
-			{"item_code": "_Packed Item New 1", "warehouse": "_Test Warehouse - _TC"},
-			["actual_qty", "projected_qty", "ordered_qty"],
-			as_dict=1,
-		)
-
-		si.transaction_date = nowdate()
-		si.save()
-
-		packed_item = si.packed_items[0]
-		self.assertEqual(flt(bin_details.actual_qty), flt(packed_item.actual_qty))
-		self.assertEqual(flt(bin_details.projected_qty), flt(packed_item.projected_qty))
-		self.assertEqual(flt(bin_details.ordered_qty), flt(packed_item.ordered_qty))
-
 	def test_pos_si_without_payment(self):
 		make_pos_profile()
 
@@ -1738,7 +1687,7 @@ class TestSalesInvoice(unittest.TestCase):
 		si.save()
 		self.assertEqual(si.get("items")[0].rate, flt((price_list_rate * 25) / 100 + price_list_rate))
 
-	def test_outstanding_amount_after_advance_jv_cancellation(self):
+	def test_outstanding_amount_after_advance_jv_cancelation(self):
 		from erpnext.accounts.doctype.journal_entry.test_journal_entry import (
 			test_records as jv_test_records,
 		)
@@ -1782,11 +1731,7 @@ class TestSalesInvoice(unittest.TestCase):
 			flt(si.rounded_total + si.total_advance, si.precision("outstanding_amount")),
 		)
 
-	def test_outstanding_amount_after_advance_payment_entry_cancellation(self):
-		"""Test impact of advance PE submission/cancellation on SI and SO."""
-		from erpnext.selling.doctype.sales_order.test_sales_order import make_sales_order
-
-		sales_order = make_sales_order(item_code="138-CMS Shoe", qty=1, price_list_rate=500)
+	def test_outstanding_amount_after_advance_payment_entry_cancelation(self):
 		pe = frappe.get_doc(
 			{
 				"doctype": "Payment Entry",
@@ -1806,25 +1751,10 @@ class TestSalesInvoice(unittest.TestCase):
 				"paid_to": "_Test Cash - _TC",
 			}
 		)
-		pe.append(
-			"references",
-			{
-				"reference_doctype": "Sales Order",
-				"reference_name": sales_order.name,
-				"total_amount": sales_order.grand_total,
-				"outstanding_amount": sales_order.grand_total,
-				"allocated_amount": 300,
-			},
-		)
 		pe.insert()
 		pe.submit()
 
-		sales_order.reload()
-		self.assertEqual(sales_order.advance_paid, 300)
-
 		si = frappe.copy_doc(test_records[0])
-		si.items[0].sales_order = sales_order.name
-		si.items[0].so_detail = sales_order.get("items")[0].name
 		si.is_pos = 0
 		si.append(
 			"advances",
@@ -1832,7 +1762,6 @@ class TestSalesInvoice(unittest.TestCase):
 				"doctype": "Sales Invoice Advance",
 				"reference_type": "Payment Entry",
 				"reference_name": pe.name,
-				"reference_row": pe.references[0].name,
 				"advance_amount": 300,
 				"allocated_amount": 300,
 				"remarks": pe.remarks,
@@ -1841,13 +1770,7 @@ class TestSalesInvoice(unittest.TestCase):
 		si.insert()
 		si.submit()
 
-		si.reload()
-		pe.reload()
-		sales_order.reload()
-
-		# Check if SO is unlinked/replaced by SI in PE & if SO advance paid is 0
-		self.assertEqual(pe.references[0].reference_name, si.name)
-		self.assertEqual(sales_order.advance_paid, 0.0)
+		si.load_from_db()
 
 		# check outstanding after advance allocation
 		self.assertEqual(
@@ -1855,9 +1778,11 @@ class TestSalesInvoice(unittest.TestCase):
 			flt(si.rounded_total - si.total_advance, si.precision("outstanding_amount")),
 		)
 
+		# added to avoid Document has been modified exception
+		pe = frappe.get_doc("Payment Entry", pe.name)
 		pe.cancel()
-		si.reload()
 
+		si.load_from_db()
 		# check outstanding after advance cancellation
 		self.assertEqual(
 			flt(si.outstanding_amount),
@@ -2444,6 +2369,29 @@ class TestSalesInvoice(unittest.TestCase):
 		acc_settings.save()
 
 	def test_inter_company_transaction(self):
+		from erpnext.selling.doctype.customer.test_customer import create_internal_customer
+
+		create_internal_customer(
+			customer_name="_Test Internal Customer",
+			represents_company="_Test Company 1",
+			allowed_to_interact_with="Wind Power LLC",
+		)
+
+		if not frappe.db.exists("Supplier", "_Test Internal Supplier"):
+			supplier = frappe.get_doc(
+				{
+					"supplier_group": "_Test Supplier Group",
+					"supplier_name": "_Test Internal Supplier",
+					"doctype": "Supplier",
+					"is_internal_supplier": 1,
+					"represents_company": "Wind Power LLC",
+				}
+			)
+
+			supplier.append("companies", {"company": "_Test Company 1"})
+
+			supplier.insert()
+
 		si = create_sales_invoice(
 			company="Wind Power LLC",
 			customer="_Test Internal Customer",
@@ -2472,10 +2420,65 @@ class TestSalesInvoice(unittest.TestCase):
 		self.assertEqual(target_doc.company, "_Test Company 1")
 		self.assertEqual(target_doc.supplier, "_Test Internal Supplier")
 
+	def test_sle_for_target_warehouse(self):
+		se = make_stock_entry(
+			item_code="138-CMS Shoe",
+			target="Finished Goods - _TC",
+			company="_Test Company",
+			qty=1,
+			basic_rate=500,
+		)
+
+		si = frappe.copy_doc(test_records[0])
+		si.update_stock = 1
+		si.set_warehouse = "Finished Goods - _TC"
+		si.set_target_warehouse = "Stores - _TC"
+		si.get("items")[0].warehouse = "Finished Goods - _TC"
+		si.get("items")[0].target_warehouse = "Stores - _TC"
+		si.insert()
+		si.submit()
+
+		sles = frappe.get_all(
+			"Stock Ledger Entry", filters={"voucher_no": si.name}, fields=["name", "actual_qty"]
+		)
+
+		# check if both SLEs are created
+		self.assertEqual(len(sles), 2)
+		self.assertEqual(sum(d.actual_qty for d in sles), 0.0)
+
+		# tear down
+		si.cancel()
+		se.cancel()
+
 	def test_internal_transfer_gl_entry(self):
+		## Create internal transfer account
+		from erpnext.selling.doctype.customer.test_customer import create_internal_customer
+
+		account = create_account(
+			account_name="Unrealized Profit",
+			parent_account="Current Liabilities - TCP1",
+			company="_Test Company with perpetual inventory",
+		)
+
+		frappe.db.set_value(
+			"Company", "_Test Company with perpetual inventory", "unrealized_profit_loss_account", account
+		)
+
+		customer = create_internal_customer(
+			"_Test Internal Customer 2",
+			"_Test Company with perpetual inventory",
+			"_Test Company with perpetual inventory",
+		)
+
+		create_internal_supplier(
+			"_Test Internal Supplier 2",
+			"_Test Company with perpetual inventory",
+			"_Test Company with perpetual inventory",
+		)
+
 		si = create_sales_invoice(
 			company="_Test Company with perpetual inventory",
-			customer="_Test Internal Customer 2",
+			customer=customer,
 			debit_to="Debtors - TCP1",
 			warehouse="Stores - TCP1",
 			income_account="Sales - TCP1",
@@ -2489,7 +2492,7 @@ class TestSalesInvoice(unittest.TestCase):
 		si.update_stock = 1
 		si.items[0].target_warehouse = "Work In Progress - TCP1"
 
-		# Add stock to stores for successful stock transfer
+		# Add stock to stores for succesful stock transfer
 		make_stock_entry(
 			target="Stores - TCP1", company="_Test Company with perpetual inventory", qty=1, basic_rate=100
 		)
@@ -2827,77 +2830,6 @@ class TestSalesInvoice(unittest.TestCase):
 		self.assertEqual(einvoice["ItemList"][1]["Discount"], 0)
 		self.assertEqual(einvoice["ItemList"][1]["UnitPrice"], 20)
 
-	def test_internal_transfer_gl_precision_issues(self):
-		# Make a stock queue of an item with two valuations
-
-		# Remove all existing stock for this
-		if get_stock_balance("_Test Internal Transfer Item", "Stores - TCP1", "2022-04-10"):
-			create_stock_reconciliation(
-				item_code="_Test Internal Transfer Item",
-				warehouse="Stores - TCP1",
-				qty=0,
-				rate=0,
-				company="_Test Company with perpetual inventory",
-				expense_account="Stock Adjustment - TCP1"
-				if frappe.get_all("Stock Ledger Entry")
-				else "Temporary Opening - TCP1",
-				posting_date="2020-04-10",
-				posting_time="14:00",
-			)
-
-		make_stock_entry(
-			item_code="_Test Internal Transfer Item",
-			target="Stores - TCP1",
-			qty=9000000,
-			basic_rate=52.0,
-			posting_date="2020-04-10",
-			posting_time="14:00",
-		)
-		make_stock_entry(
-			item_code="_Test Internal Transfer Item",
-			target="Stores - TCP1",
-			qty=60000000,
-			basic_rate=52.349777,
-			posting_date="2020-04-10",
-			posting_time="14:00",
-		)
-
-		# Make an internal transfer Sales Invoice Stock in non stock uom to check
-		# for rounding errors while converting to stock uom
-		si = create_sales_invoice(
-			company="_Test Company with perpetual inventory",
-			customer="_Test Internal Customer 2",
-			item_code="_Test Internal Transfer Item",
-			qty=5000000,
-			uom="Box",
-			debit_to="Debtors - TCP1",
-			warehouse="Stores - TCP1",
-			income_account="Sales - TCP1",
-			expense_account="Cost of Goods Sold - TCP1",
-			cost_center="Main - TCP1",
-			currency="INR",
-			do_not_save=1,
-		)
-
-		# Check GL Entries with precision
-		si.update_stock = 1
-		si.items[0].target_warehouse = "Work In Progress - TCP1"
-		si.items[0].conversion_factor = 10
-		si.save()
-		si.submit()
-
-		# Check if adjustment entry is created
-		self.assertTrue(
-			frappe.db.exists(
-				"GL Entry",
-				{
-					"voucher_type": "Sales Invoice",
-					"voucher_no": si.name,
-					"remarks": "Rounding gain/loss Entry for Stock Transfer",
-				},
-			)
-		)
-
 	def test_item_tax_net_range(self):
 		item = create_item("T Shirt")
 
@@ -3346,7 +3278,7 @@ class TestSalesInvoice(unittest.TestCase):
 			[deferred_account, 2022.47, 0.0, "2019-03-15"],
 		]
 
-		gl_entries = frappe.db.sql(
+		gl_entries = gl_entries = frappe.db.sql(
 			"""select account, debit, credit, posting_date
 			from `tabGL Entry`
 			where voucher_type='Journal Entry' and voucher_detail_no=%s and posting_date <= %s
@@ -3464,78 +3396,6 @@ class TestSalesInvoice(unittest.TestCase):
 			"Accounts Settings", "Accounts Settings", "unlink_payment_on_cancel_of_invoice", unlink_enabled
 		)
 
-	def test_gain_loss_on_advance_cancellation(self):
-		unlink_enabled = frappe.db.get_single_value(
-			"Accounts Settings", "unlink_payment_on_cancellation_of_invoice"
-		)
-
-		frappe.db.set_single_value("Accounts Settings", "unlink_payment_on_cancellation_of_invoice", 1)
-
-		pe = frappe.get_doc(
-			{
-				"doctype": "Payment Entry",
-				"payment_type": "Receive",
-				"party_type": "Customer",
-				"party": "_Test Customer USD",
-				"company": "_Test Company",
-				"paid_from_account_currency": "USD",
-				"paid_to_account_currency": "INR",
-				"source_exchange_rate": 70,
-				"target_exchange_rate": 1,
-				"reference_no": "1",
-				"reference_date": nowdate(),
-				"received_amount": 70,
-				"paid_amount": 1,
-				"paid_from": "_Test Receivable USD - _TC",
-				"paid_to": "_Test Cash - _TC",
-			}
-		)
-		pe.insert()
-		pe.submit()
-
-		si = create_sales_invoice(
-			customer="_Test Customer USD",
-			debit_to="_Test Receivable USD - _TC",
-			currency="USD",
-			conversion_rate=75,
-			do_not_save=1,
-			rate=1,
-		)
-		si = si.save()
-
-		si.append(
-			"advances",
-			{
-				"reference_type": "Payment Entry",
-				"reference_name": pe.name,
-				"advance_amount": 1,
-				"allocated_amount": 1,
-				"ref_exchange_rate": 70,
-			},
-		)
-		si.save()
-		si.submit()
-		expected_gle = [
-			["_Test Receivable USD - _TC", 75.0, 5.0],
-			["Exchange Gain/Loss - _TC", 5.0, 0.0],
-			["Sales - _TC", 0.0, 75.0],
-		]
-		check_gl_entries(self, si.name, expected_gle, nowdate())
-
-		# cancel advance payment
-		pe.reload()
-		pe.cancel()
-
-		expected_gle_after = [
-			["_Test Receivable USD - _TC", 75.0, 0.0],
-			["Sales - _TC", 0.0, 75.0],
-		]
-		check_gl_entries(self, si.name, expected_gle_after, nowdate())
-
-		frappe.db.set_single_value(
-			"Accounts Settings", "unlink_payment_on_cancellation_of_invoice", unlink_enabled
-		)
-
 	def test_batch_expiry_for_sales_invoice_return(self):
 		from erpnext.controllers.sales_and_purchase_return import make_return_doc
 		from erpnext.stock.doctype.item.test_item import make_item
@@ -3823,7 +3683,6 @@ def create_sales_invoice(**args):
 			"description": args.description or "_Test Item",
 			"gst_hsn_code": "999800",
 			"warehouse": args.warehouse or "_Test Warehouse - _TC",
-			"target_warehouse": args.target_warehouse,
 			"qty": args.qty or 1,
 			"uom": args.uom or "Nos",
 			"stock_uom": args.uom or "Nos",
@@ -3836,7 +3695,7 @@ def create_sales_invoice(**args):
 			"discount_amount": args.discount_amount or 0,
 			"cost_center": args.cost_center or "_Test Cost Center - _TC",
 			"serial_no": args.serial_no,
-			"conversion_factor": args.get("conversion_factor", 1),
+			"conversion_factor": 1,
 			"incoming_rate": args.incoming_rate or 0,
 			"batch_no": args.batch_no or None,
 		},
@@ -3950,34 +3809,6 @@ def get_taxes_and_charges():
 	]
 
 
-def create_internal_parties():
-	from erpnext.selling.doctype.customer.test_customer import create_internal_customer
-
-	create_internal_customer(
-		customer_name="_Test Internal Customer",
-		represents_company="_Test Company 1",
-		allowed_to_interact_with="Wind Power LLC",
-	)
-
-	create_internal_customer(
-		customer_name="_Test Internal Customer 2",
-		represents_company="_Test Company with perpetual inventory",
-		allowed_to_interact_with="_Test Company with perpetual inventory",
-	)
-
-	create_internal_supplier(
-		supplier_name="_Test Internal Supplier",
-		represents_company="Wind Power LLC",
-		allowed_to_interact_with="_Test Company 1",
-	)
-
-	create_internal_supplier(
-		supplier_name="_Test Internal Supplier 2",
-		represents_company="_Test Company with perpetual inventory",
-		allowed_to_interact_with="_Test Company with perpetual inventory",
-	)
-
-
 def create_internal_supplier(supplier_name, represents_company, allowed_to_interact_with):
 	if not frappe.db.exists("Supplier", supplier_name):
 		supplier = frappe.get_doc(
@@ -4000,19 +3831,6 @@ def create_internal_supplier(supplier_name, represents_company, allowed_to_inter
 	return supplier_name
 
 
-def setup_accounts():
-	## Create internal transfer account
-	account = create_account(
-		account_name="Unrealized Profit",
-		parent_account="Current Liabilities - TCP1",
-		company="_Test Company with perpetual inventory",
-	)
-
-	frappe.db.set_value(
-		"Company", "_Test Company with perpetual inventory", "unrealized_profit_loss_account", account
-	)
-
-
 def add_taxes(doc):
 	doc.append(
 		"taxes",

erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json

@@ -812,8 +812,6 @@
    "fieldtype": "Currency",
    "label": "Incoming Rate (Costing)",
    "no_copy": 1,
-   "options": "Company:company:default_currency",
-   "precision": "6",
    "print_hide": 1
   },
   {
@@ -843,7 +841,7 @@
  "idx": 1,
  "istable": 1,
  "links": [],
- "modified": "2022-12-28 16:17:33.484531",
+ "modified": "2022-08-26 12:06:31.205417",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Sales Invoice Item",

erpnext/accounts/doctype/subscription/test_subscription.py

@@ -694,23 +694,3 @@ class TestSubscription(unittest.TestCase):
 		# Check the currency of the created invoice
 		currency = frappe.db.get_value("Sales Invoice", subscription.invoices[0].invoice, "currency")
 		self.assertEqual(currency, "USD")
-
-	def test_plan_rate_for_midmonth_start_date(self):
-		subscription = frappe.new_doc("Subscription")
-		subscription.party_type = "Supplier"
-		subscription.party = "_Test Supplier"
-		subscription.generate_invoice_at_period_start = 1
-		subscription.follow_calendar_months = 1
-		subscription.generate_new_invoices_past_due_date = 1
-		subscription.start_date = "2023-04-08"
-		subscription.end_date = "2024-02-27"
-		subscription.append("plans", {"plan": "_Test Plan Name 4", "qty": 1})
-		subscription.save()
-
-		subscription.process()
-
-		self.assertEqual(len(subscription.invoices), 1)
-		pi = frappe.get_doc("Purchase Invoice", subscription.invoices[0].invoice)
-		self.assertEqual(pi.total, 55333.33)
-
-		subscription.delete()

erpnext/accounts/doctype/subscription_plan/subscription_plan.py

@@ -56,17 +56,18 @@ def get_plan_rate(
 		prorate = frappe.db.get_single_value("Subscription Settings", "prorate")
 
 		if prorate:
-			cost -= plan.cost * get_prorate_factor(start_date, end_date)
+			prorate_factor = flt(
+				date_diff(start_date, get_first_day(start_date))
+				/ date_diff(get_last_day(start_date), get_first_day(start_date)),
+				1,
+			)
+
+			prorate_factor += flt(
+				date_diff(get_last_day(end_date), end_date)
+				/ date_diff(get_last_day(end_date), get_first_day(end_date)),
+				1,
+			)
+
+			cost -= plan.cost * prorate_factor
+
 		return cost
-
-
-def get_prorate_factor(start_date, end_date):
-	total_days_to_skip = date_diff(start_date, get_first_day(start_date))
-	total_days_in_month = int(get_last_day(start_date).strftime("%d"))
-	prorate_factor = flt(total_days_to_skip / total_days_in_month)
-
-	total_days_to_skip = date_diff(get_last_day(end_date), end_date)
-	total_days_in_month = int(get_last_day(end_date).strftime("%d"))
-	prorate_factor += flt(total_days_to_skip / total_days_in_month)
-
-	return prorate_factor

erpnext/accounts/doctype/tax_withheld_vouchers/tax_withheld_vouchers.json

@@ -36,11 +36,11 @@
  "index_web_pages_for_search": 1,
  "istable": 1,
  "links": [],
- "modified": "2022-12-28 23:40:41.479208",
+ "modified": "2022-09-13 23:40:41.479208",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Tax Withheld Vouchers",
- "naming_rule": "Random",
+ "naming_rule": "Autoincrement",
  "owner": "Administrator",
  "permissions": [],
  "sort_field": "modified",

erpnext/accounts/doctype/tax_withholding_category/tax_withholding_category.py

@@ -5,7 +5,7 @@
 import frappe
 from frappe import _
 from frappe.model.document import Document
-from frappe.utils import cint, flt, getdate
+from frappe.utils import cint, getdate
 
 
 class TaxWithholdingCategory(Document):
@@ -256,7 +256,7 @@ def get_tax_amount(party_type, parties, inv, tax_details, posting_date, pan_no=N
 			tax_amount = get_tcs_amount(parties, inv, tax_details, vouchers, advance_vouchers)
 
 	if cint(tax_details.round_off_tax_amount):
-		tax_amount = normal_round(tax_amount)
+		tax_amount = round(tax_amount)
 
 	return tax_amount, tax_deducted, tax_deducted_on_advances, voucher_wise_amount
 
@@ -274,7 +274,7 @@ def get_invoice_vouchers(parties, tax_details, company, party_type="Supplier"):
 		"docstatus": 1,
 	}
 
-	if doctype != "Sales Invoice":
+	if not tax_details.get("consider_party_ledger_amount") and doctype != "Sales Invoice":
 		filters.update(
 			{"apply_tds": 1, "tax_withholding_category": tax_details.get("tax_withholding_category")}
 		)
@@ -518,19 +518,10 @@ 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},
+		"sum(net_total)",
 	)
 
 	if is_valid_certificate(
@@ -544,10 +535,10 @@ def get_tds_amount_from_ldc(ldc, parties, pan_no, tax_details, posting_date, net
 
 
 def get_ltds_amount(current_amount, deducted_amount, certificate_limit, rate, tax_details):
-	if certificate_limit - flt(deducted_amount) - flt(current_amount) >= 0:
+	if current_amount < (certificate_limit - deducted_amount):
 		return current_amount * rate / 100
 	else:
-		ltds_amount = certificate_limit - flt(deducted_amount)
+		ltds_amount = certificate_limit - deducted_amount
 		tds_amount = current_amount - ltds_amount
 
 		return ltds_amount * rate / 100 + tds_amount * tax_details.rate / 100
@@ -558,26 +549,9 @@ def is_valid_certificate(
 ):
 	valid = False
 
-	available_amount = flt(certificate_limit) - flt(deducted_amount)
-
-	if (getdate(valid_from) <= getdate(posting_date) <= getdate(valid_upto)) and available_amount > 0:
+	if (
+		getdate(valid_from) <= getdate(posting_date) <= getdate(valid_upto)
+	) and certificate_limit > deducted_amount:
 		valid = True
 
 	return valid
-
-
-def normal_round(number):
-	"""
-	Rounds a number to the nearest integer.
-	:param number: The number to round.
-	"""
-	decimal_part = number - int(number)
-
-	if decimal_part >= 0.5:
-		decimal_part = 1
-	else:
-		decimal_part = 0
-
-	number = int(number) + decimal_part
-
-	return number

erpnext/accounts/doctype/tax_withholding_category/test_tax_withholding_category.py

@@ -110,9 +110,9 @@ class TestTaxWithholdingCategory(unittest.TestCase):
 		invoices.append(pi1)
 
 		# Cumulative threshold is 30000
-		# Threshold calculation should be only on the Second invoice
-		# Second didn't breach, no TDS should be applied
-		self.assertEqual(pi1.taxes, [])
+		# Threshold calculation should be on both the invoices
+		# TDS should be applied only on 1000
+		self.assertEqual(pi1.taxes[0].tax_amount, 1000)
 
 		for d in reversed(invoices):
 			d.cancel()
@@ -186,42 +186,6 @@ class TestTaxWithholdingCategory(unittest.TestCase):
 		for d in reversed(invoices):
 			d.cancel()
 
-	def test_tds_deduction_for_po_via_payment_entry(self):
-		from erpnext.accounts.doctype.payment_entry.payment_entry import get_payment_entry
-
-		frappe.db.set_value(
-			"Supplier", "Test TDS Supplier8", "tax_withholding_category", "Cumulative Threshold TDS"
-		)
-		order = create_purchase_order(supplier="Test TDS Supplier8", rate=40000, do_not_save=True)
-
-		# Add some tax on the order
-		order.append(
-			"taxes",
-			{
-				"category": "Total",
-				"charge_type": "Actual",
-				"account_head": "_Test Account VAT - _TC",
-				"cost_center": "Main - _TC",
-				"tax_amount": 8000,
-				"description": "Test",
-				"add_deduct_tax": "Add",
-			},
-		)
-
-		order.save()
-
-		order.apply_tds = 1
-		order.tax_withholding_category = "Cumulative Threshold TDS"
-		order.submit()
-
-		self.assertEqual(order.taxes[0].tax_amount, 4000)
-
-		payment = get_payment_entry(order.doctype, order.name)
-		payment.apply_tax_withholding_amount = 1
-		payment.tax_withholding_category = "Cumulative Threshold TDS"
-		payment.submit()
-		self.assertEqual(payment.taxes[0].tax_amount, 4000)
-
 	def test_multi_category_single_supplier(self):
 		frappe.db.set_value(
 			"Supplier", "Test TDS Supplier5", "tax_withholding_category", "Test Service Category"
@@ -311,37 +275,6 @@ def cancel_invoices():
 		frappe.get_doc("Sales Invoice", d).cancel()
 
 
-def create_purchase_order(**args):
-	# return purchase order doc object
-	item = frappe.db.get_value("Item", {"item_name": "TDS Item"}, "name")
-	args = frappe._dict(args)
-	po = frappe.get_doc(
-		{
-			"doctype": "Purchase Order",
-			"transaction_date": today(),
-			"schedule_date": today(),
-			"apply_tds": 0 if args.do_not_apply_tds else 1,
-			"supplier": args.supplier,
-			"company": "_Test Company",
-			"taxes_and_charges": "",
-			"currency": "INR",
-			"taxes": [],
-			"items": [
-				{
-					"doctype": "Purchase Order Item",
-					"item_code": item,
-					"qty": args.qty or 1,
-					"rate": args.rate or 10000,
-					"cost_center": "Main - _TC",
-					"expense_account": "Stock Received But Not Billed - _TC",
-				}
-			],
-		}
-	)
-	po.save()
-	return po
-
-
 def create_purchase_invoice(**args):
 	# return sales invoice doc object
 	item = frappe.db.get_value("Item", {"item_name": "TDS Item"}, "name")
@@ -418,8 +351,6 @@ def create_records():
 		"Test TDS Supplier4",
 		"Test TDS Supplier5",
 		"Test TDS Supplier6",
-		"Test TDS Supplier7",
-		"Test TDS Supplier8",
 	]:
 		if frappe.db.exists("Supplier", name):
 			continue

erpnext/accounts/general_ledger.py

@@ -298,22 +298,20 @@ def make_round_off_gle(gl_map, debit_credit_diff, precision):
 	round_off_account, round_off_cost_center = get_round_off_account_and_cost_center(
 		gl_map[0].company, gl_map[0].voucher_type, gl_map[0].voucher_no
 	)
-	round_off_gle = frappe._dict()
 	round_off_account_exists = False
+	round_off_gle = frappe._dict()
+	for d in gl_map:
+		if d.account == round_off_account:
+			round_off_gle = d
+			if d.debit:
+				debit_credit_diff -= flt(d.debit)
+			else:
+				debit_credit_diff += flt(d.credit)
+			round_off_account_exists = True
 
-	if gl_map[0].voucher_type != "Period Closing Voucher":
-		for d in gl_map:
-			if d.account == round_off_account:
-				round_off_gle = d
-				if d.debit:
-					debit_credit_diff -= flt(d.debit) - flt(d.credit)
-				else:
-					debit_credit_diff += flt(d.credit)
-				round_off_account_exists = True
-
-		if round_off_account_exists and abs(debit_credit_diff) < (1.0 / (10**precision)):
-			gl_map.remove(round_off_gle)
-			return
+	if round_off_account_exists and abs(debit_credit_diff) < (1.0 / (10**precision)):
+		gl_map.remove(round_off_gle)
+		return
 
 	if not round_off_gle:
 		for k in ["voucher_type", "voucher_no", "company", "posting_date", "remarks"]:
@@ -336,6 +334,7 @@ def make_round_off_gle(gl_map, debit_credit_diff, precision):
 	)
 
 	update_accounting_dimensions(round_off_gle)
+
 	if not round_off_account_exists:
 		gl_map.append(round_off_gle)
 

erpnext/accounts/party.py

@@ -4,7 +4,12 @@
 
 import frappe
 from frappe import _, msgprint, scrub
-from frappe.contacts.doctype.address.address import get_company_address, get_default_address
+from frappe.contacts.doctype.address.address import (
+	get_address_display,
+	get_company_address,
+	get_default_address,
+)
+from frappe.contacts.doctype.contact.contact import get_contact_details
 from frappe.core.doctype.user_permission.user_permission import get_permitted_documents
 from frappe.model.utils import get_fetch_values
 from frappe.utils import (
@@ -115,7 +120,6 @@ def _get_party_details(
 		party_address,
 		company_address,
 		shipping_address,
-		ignore_permissions=ignore_permissions,
 	)
 	set_contact_details(party_details, party, party_type)
 	set_other_values(party_details, party, party_type)
@@ -179,8 +183,6 @@ def set_address_details(
 	party_address=None,
 	company_address=None,
 	shipping_address=None,
-	*,
-	ignore_permissions=False
 ):
 	billing_address_field = (
 		"customer_address" if party_type == "Lead" else party_type.lower() + "_address"
@@ -193,17 +195,13 @@ def set_address_details(
 			get_fetch_values(doctype, billing_address_field, party_details[billing_address_field])
 		)
 	# address display
-	party_details.address_display = render_address(
-		party_details[billing_address_field], check_permissions=not ignore_permissions
-	)
+	party_details.address_display = get_address_display(party_details[billing_address_field])
 	# shipping address
 	if party_type in ["Customer", "Lead"]:
 		party_details.shipping_address_name = shipping_address or get_party_shipping_address(
 			party_type, party.name
 		)
-		party_details.shipping_address = render_address(
-			party_details["shipping_address_name"], check_permissions=not ignore_permissions
-		)
+		party_details.shipping_address = get_address_display(party_details["shipping_address_name"])
 		if doctype:
 			party_details.update(
 				get_fetch_values(doctype, "shipping_address_name", party_details.shipping_address_name)
@@ -226,9 +224,7 @@ def set_address_details(
 			party_details.update(
 				{
 					"shipping_address": shipping_address,
-					"shipping_address_display": render_address(
-						shipping_address, check_permissions=not ignore_permissions
-					),
+					"shipping_address_display": get_address_display(shipping_address),
 					**get_fetch_values(doctype, "shipping_address", shipping_address),
 				}
 			)
@@ -239,8 +235,7 @@ def set_address_details(
 				{
 					"billing_address": party_details.company_address,
 					"billing_address_display": (
-						party_details.company_address_display
-						or render_address(party_details.company_address, check_permissions=True)
+						party_details.company_address_display or get_address_display(party_details.company_address)
 					),
 					**get_fetch_values(doctype, "billing_address", party_details.company_address),
 				}
@@ -282,34 +277,7 @@ def set_contact_details(party_details, party, party_type):
 			}
 		)
 	else:
-		fields = [
-			"name as contact_person",
-			"salutation",
-			"first_name",
-			"last_name",
-			"email_id as contact_email",
-			"mobile_no as contact_mobile",
-			"phone as contact_phone",
-			"designation as contact_designation",
-			"department as contact_department",
-		]
-
-		contact_details = frappe.db.get_value(
-			"Contact", party_details.contact_person, fields, as_dict=True
-		)
-
-		contact_details.contact_display = " ".join(
-			filter(
-				None,
-				[
-					contact_details.get("salutation"),
-					contact_details.get("first_name"),
-					contact_details.get("last_name"),
-				],
-			)
-		)
-
-		party_details.update(contact_details)
+		party_details.update(get_contact_details(party_details.contact_person))
 
 
 def set_other_values(party_details, party, party_type):
@@ -970,13 +938,3 @@ def add_party_account(party_type, party, company, account):
 		doc.append("accounts", accounts)
 
 		doc.save()
-
-
-def render_address(address, check_permissions=True):
-	try:
-		from frappe.contacts.doctype.address.address import render_address as _render
-	except ImportError:
-		# Older frappe versions where this function is not available
-		from frappe.contacts.doctype.address.address import get_address_display as _render
-
-	return frappe.call(_render, address, check_permissions=check_permissions)

erpnext/accounts/print_format/gst_e_invoice/gst_e_invoice.html

@@ -50,10 +50,6 @@
 				<div class="col-xs-4"><label>Document No</label></div>
 				<div class="col-xs-8 value">{{ einvoice.DocDtls.No }}</div>
 			</div>
-			<div class="row data-field">
-				<div class="col-xs-4"><label>Document Date</label></div>
-				<div class="col-xs-8 value">{{ einvoice.DocDtls.Dt }}</div>
-			</div>
 		</div>
 		<div class="col-xs-4 column-break">
 			<img src="{{ doc.qrcode_image }}" width="175px" style="float: right;">

erpnext/accounts/report/accounts_receivable/accounts_receivable.py

@@ -5,7 +5,7 @@
 from collections import OrderedDict
 
 import frappe
-from frappe import _, qb, scrub
+from frappe import _, scrub
 from frappe.utils import cint, cstr, flt, getdate, nowdate
 
 from erpnext.accounts.doctype.accounting_dimension.accounting_dimension import (
@@ -95,9 +95,6 @@ class ReceivablePayableReport(object):
 		# Get return entries
 		self.get_return_entries()
 
-		# Get Exchange Rate Revaluations
-		self.get_exchange_rate_revaluations()
-
 		self.data = []
 		for gle in self.gl_entries:
 			self.update_voucher_balance(gle)
@@ -261,8 +258,7 @@ class ReceivablePayableReport(object):
 			row.invoice_grand_total = row.invoiced
 
 			if (abs(row.outstanding) > 1.0 / 10**self.currency_precision) and (
-				(abs(row.outstanding_in_account_currency) > 1.0 / 10**self.currency_precision)
-				or (row.voucher_no in self.err_journals)
+				abs(row.outstanding_in_account_currency) > 1.0 / 10**self.currency_precision
 			):
 				# non-zero oustanding, we must consider this row
 
@@ -689,10 +685,10 @@ class ReceivablePayableReport(object):
 
 		if self.filters.get(scrub(self.party_type)):
 			select_fields = "debit_in_account_currency as debit, credit_in_account_currency as credit"
-			doc_currency_fields = "debit as debit_in_account_currency, credit as credit_in_account_currency"
 		else:
 			select_fields = "debit, credit"
-			doc_currency_fields = "debit_in_account_currency, credit_in_account_currency"
+
+		doc_currency_fields = "debit_in_account_currency, credit_in_account_currency"
 
 		remarks = ", remarks" if self.filters.get("show_remarks") else ""
 
@@ -1037,17 +1033,3 @@ class ReceivablePayableReport(object):
 			"data": {"labels": self.ageing_column_labels, "datasets": rows},
 			"type": "percentage",
 		}
-
-	def get_exchange_rate_revaluations(self):
-		je = qb.DocType("Journal Entry")
-		results = (
-			qb.from_(je)
-			.select(je.name)
-			.where(
-				(je.company == self.filters.company)
-				& (je.posting_date.lte(self.filters.report_date))
-				& (je.voucher_type == "Exchange Rate Revaluation")
-			)
-			.run()
-		)
-		self.err_journals = [x[0] for x in results] if results else []

erpnext/accounts/report/accounts_receivable/test_accounts_receivable.py

@@ -1,51 +1,18 @@
 import unittest
 
 import frappe
-from frappe.tests.utils import FrappeTestCase, change_settings
-from frappe.utils import add_days, flt, getdate, today
+from frappe.utils import add_days, getdate, today
 
-from erpnext import get_default_cost_center
 from erpnext.accounts.doctype.payment_entry.payment_entry import get_payment_entry
 from erpnext.accounts.doctype.sales_invoice.test_sales_invoice import create_sales_invoice
 from erpnext.accounts.report.accounts_receivable.accounts_receivable import execute
 
 
 class TestAccountsReceivable(unittest.TestCase):
-	def setUp(self):
+	def test_accounts_receivable(self):
 		frappe.db.sql("delete from `tabSales Invoice` where company='_Test Company 2'")
 		frappe.db.sql("delete from `tabGL Entry` where company='_Test Company 2'")
-		frappe.db.sql("delete from `tabJournal Entry` where company='_Test Company 2'")
-		frappe.db.sql("delete from `tabExchange Rate Revaluation` where company='_Test Company 2'")
 
-		self.create_usd_account()
-
-	def tearDown(self):
-		frappe.db.rollback()
-
-	def create_usd_account(self):
-		name = "Debtors USD"
-		exists = frappe.db.get_list(
-			"Account", filters={"company": "_Test Company 2", "account_name": "Debtors USD"}
-		)
-		if exists:
-			self.debtors_usd = exists[0].name
-		else:
-			debtors = frappe.get_doc(
-				"Account",
-				frappe.db.get_list(
-					"Account", filters={"company": "_Test Company 2", "account_name": "Debtors"}
-				)[0].name,
-			)
-
-			debtors_usd = frappe.new_doc("Account")
-			debtors_usd.company = debtors.company
-			debtors_usd.account_name = "Debtors USD"
-			debtors_usd.account_currency = "USD"
-			debtors_usd.parent_account = debtors.parent_account
-			debtors_usd.account_type = debtors.account_type
-			self.debtors_usd = debtors_usd.save().name
-
-	def test_accounts_receivable(self):
 		filters = {
 			"company": "_Test Company 2",
 			"based_on_payment_terms": 1,
@@ -57,7 +24,7 @@ class TestAccountsReceivable(unittest.TestCase):
 		}
 
 		# check invoice grand total and invoiced column's value for 3 payment terms
-		name = make_sales_invoice().name
+		name = make_sales_invoice()
 		report = execute(filters)
 
 		expected_data = [[100, 30], [100, 50], [100, 20]]
@@ -98,74 +65,8 @@ class TestAccountsReceivable(unittest.TestCase):
 			],
 		)
 
-	@change_settings(
-		"Accounts Settings", {"allow_multi_currency_invoices_against_single_party_account": 1}
-	)
-	def test_exchange_revaluation_for_party(self):
-		"""
-		Exchange Revaluation for party on Receivable/Payable shoule be included
-		"""
 
-		company = "_Test Company 2"
-		customer = "_Test Customer 2"
-
-		# Using Exchange Gain/Loss account for unrealized as well.
-		company_doc = frappe.get_doc("Company", company)
-		company_doc.unrealized_exchange_gain_loss_account = company_doc.exchange_gain_loss_account
-		company_doc.save()
-
-		si = make_sales_invoice(no_payment_schedule=True, do_not_submit=True)
-		si.currency = "USD"
-		si.conversion_rate = 0.90
-		si.debit_to = self.debtors_usd
-		si = si.save().submit()
-
-		# Exchange Revaluation
-		err = frappe.new_doc("Exchange Rate Revaluation")
-		err.company = company
-		err.posting_date = today()
-		accounts = err.get_accounts_data()
-		err.extend("accounts", accounts)
-		err.accounts[0].new_exchange_rate = 0.95
-		row = err.accounts[0]
-		row.new_balance_in_base_currency = flt(
-			row.new_exchange_rate * flt(row.balance_in_account_currency)
-		)
-		row.gain_loss = row.new_balance_in_base_currency - flt(row.balance_in_base_currency)
-		err.set_total_gain_loss()
-		err = err.save().submit()
-
-		# Submit JV for ERR
-		jv = frappe.get_doc(err.make_jv_entry())
-		jv = jv.save()
-		for x in jv.accounts:
-			x.cost_center = get_default_cost_center(jv.company)
-		jv.submit()
-
-		filters = {
-			"company": company,
-			"report_date": today(),
-			"range1": 30,
-			"range2": 60,
-			"range3": 90,
-			"range4": 120,
-		}
-		report = execute(filters)
-
-		expected_data_for_err = [0, -5, 0, 5]
-		row = [x for x in report[1] if x.voucher_type == jv.doctype and x.voucher_no == jv.name][0]
-		self.assertEqual(
-			expected_data_for_err,
-			[
-				row.invoiced,
-				row.paid,
-				row.credit_note,
-				row.outstanding,
-			],
-		)
-
-
-def make_sales_invoice(no_payment_schedule=False, do_not_submit=False):
+def make_sales_invoice():
 	frappe.set_user("Administrator")
 
 	si = create_sales_invoice(
@@ -180,26 +81,22 @@ def make_sales_invoice(no_payment_schedule=False, do_not_submit=False):
 		do_not_save=1,
 	)
 
-	if not no_payment_schedule:
-		si.append(
-			"payment_schedule",
-			dict(due_date=getdate(add_days(today(), 30)), invoice_portion=30.00, payment_amount=30),
-		)
-		si.append(
-			"payment_schedule",
-			dict(due_date=getdate(add_days(today(), 60)), invoice_portion=50.00, payment_amount=50),
-		)
-		si.append(
-			"payment_schedule",
-			dict(due_date=getdate(add_days(today(), 90)), invoice_portion=20.00, payment_amount=20),
-		)
+	si.append(
+		"payment_schedule",
+		dict(due_date=getdate(add_days(today(), 30)), invoice_portion=30.00, payment_amount=30),
+	)
+	si.append(
+		"payment_schedule",
+		dict(due_date=getdate(add_days(today(), 60)), invoice_portion=50.00, payment_amount=50),
+	)
+	si.append(
+		"payment_schedule",
+		dict(due_date=getdate(add_days(today(), 90)), invoice_portion=20.00, payment_amount=20),
+	)
 
-	si = si.save()
+	si.submit()
 
-	if not do_not_submit:
-		si = si.submit()
-
-	return si
+	return si.name
 
 
 def make_payment(docname):

erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.json

@@ -1,23 +1,20 @@
 {
- "add_total_row": 1,
- "columns": [],
- "creation": "2016-04-08 14:49:58.133098",
- "disable_prepared_report": 0,
- "disabled": 0,
- "docstatus": 0,
- "doctype": "Report",
- "filters": [],
- "idx": 2,
- "is_standard": "Yes",
- "modified": "2023-06-06 09:00:07.435151",
- "modified_by": "Administrator",
- "module": "Accounts",
- "name": "Asset Depreciation Ledger",
- "owner": "Administrator",
- "prepared_report": 0,
- "ref_doctype": "Asset",
- "report_name": "Asset Depreciation Ledger",
- "report_type": "Script Report",
+ "add_total_row": 0, 
+ "apply_user_permissions": 1, 
+ "creation": "2016-04-08 14:49:58.133098", 
+ "disabled": 0, 
+ "docstatus": 0, 
+ "doctype": "Report", 
+ "idx": 2, 
+ "is_standard": "Yes", 
+ "modified": "2017-02-24 20:08:26.084484", 
+ "modified_by": "Administrator", 
+ "module": "Accounts", 
+ "name": "Asset Depreciation Ledger", 
+ "owner": "Administrator", 
+ "ref_doctype": "Asset", 
+ "report_name": "Asset Depreciation Ledger", 
+ "report_type": "Script Report", 
  "roles": [
   {
    "role": "Accounts User"

erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py

@@ -25,7 +25,6 @@ def get_data(filters):
 		["posting_date", "<=", filters.get("to_date")],
 		["against_voucher_type", "=", "Asset"],
 		["account", "in", depreciation_accounts],
-		["is_cancelled", "=", 0],
 	]
 
 	if filters.get("asset"):

erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.json

@@ -1,23 +1,20 @@
 {
- "add_total_row": 1,
- "columns": [],
- "creation": "2016-04-08 14:56:37.235981",
- "disable_prepared_report": 0,
- "disabled": 0,
- "docstatus": 0,
- "doctype": "Report",
- "filters": [],
- "idx": 2,
- "is_standard": "Yes",
- "modified": "2023-06-06 11:33:29.611277",
- "modified_by": "Administrator",
- "module": "Accounts",
- "name": "Asset Depreciations and Balances",
- "owner": "Administrator",
- "prepared_report": 0,
- "ref_doctype": "Asset",
- "report_name": "Asset Depreciations and Balances",
- "report_type": "Script Report",
+ "add_total_row": 0, 
+ "apply_user_permissions": 1, 
+ "creation": "2016-04-08 14:56:37.235981", 
+ "disabled": 0, 
+ "docstatus": 0, 
+ "doctype": "Report", 
+ "idx": 2, 
+ "is_standard": "Yes", 
+ "modified": "2017-02-24 20:08:18.660476", 
+ "modified_by": "Administrator", 
+ "module": "Accounts", 
+ "name": "Asset Depreciations and Balances", 
+ "owner": "Administrator", 
+ "ref_doctype": "Asset", 
+ "report_name": "Asset Depreciations and Balances", 
+ "report_type": "Script Report", 
  "roles": [
   {
    "role": "Accounts User"

erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py

@@ -114,31 +114,25 @@ def get_assets(filters):
 			   sum(results.depreciation_eliminated_during_the_period) as depreciation_eliminated_during_the_period,
 			   sum(results.depreciation_amount_during_the_period) as depreciation_amount_during_the_period
 		from (SELECT a.asset_category,
-				   ifnull(sum(case when gle.posting_date < %(from_date)s and (ifnull(a.disposal_date, 0) = 0 or a.disposal_date >= %(from_date)s) then
-								   gle.debit
+				   ifnull(sum(case when ds.schedule_date < %(from_date)s and (ifnull(a.disposal_date, 0) = 0 or a.disposal_date >= %(from_date)s) then
+								   ds.depreciation_amount
 							  else
 								   0
 							  end), 0) as accumulated_depreciation_as_on_from_date,
 				   ifnull(sum(case when ifnull(a.disposal_date, 0) != 0 and a.disposal_date >= %(from_date)s
-										and a.disposal_date <= %(to_date)s and gle.posting_date <= a.disposal_date then
-								   gle.debit
+										and a.disposal_date <= %(to_date)s and ds.schedule_date <= a.disposal_date then
+								   ds.depreciation_amount
 							  else
 								   0
 							  end), 0) as depreciation_eliminated_during_the_period,
-				   ifnull(sum(case when gle.posting_date >= %(from_date)s and gle.posting_date <= %(to_date)s
-										and (ifnull(a.disposal_date, 0) = 0 or gle.posting_date <= a.disposal_date) then
-								   gle.debit
+				   ifnull(sum(case when ds.schedule_date >= %(from_date)s and ds.schedule_date <= %(to_date)s
+										and (ifnull(a.disposal_date, 0) = 0 or ds.schedule_date <= a.disposal_date) then
+								   ds.depreciation_amount
 							  else
 								   0
 							  end), 0) as depreciation_amount_during_the_period
-			from `tabGL Entry` gle
-			join `tabAsset` a on
-				gle.against_voucher = a.name
-			join `tabAsset Category Account` aca on
-				aca.parent = a.asset_category and aca.company_name = %(company)s
-			join `tabCompany` company on
-				company.name = %(company)s
-			where a.docstatus=1 and a.company=%(company)s and a.purchase_date <= %(to_date)s and gle.debit != 0 and gle.is_cancelled = 0 and gle.account = ifnull(aca.depreciation_expense_account, company.depreciation_expense_account)
+			from `tabAsset` a, `tabDepreciation Schedule` ds
+			where a.docstatus=1 and a.company=%(company)s and a.purchase_date <= %(to_date)s and a.name = ds.parent and ifnull(ds.journal_entry, '') != ''
 			group by a.asset_category
 			union
 			SELECT a.asset_category,

erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py

@@ -22,7 +22,8 @@ def get_columns():
 		{
 			"label": _("Payment Document Type"),
 			"fieldname": "payment_document_type",
-			"fieldtype": "Data",
+			"fieldtype": "Link",
+			"options": "Doctype",
 			"width": 130,
 		},
 		{
@@ -32,15 +33,15 @@ def get_columns():
 			"options": "payment_document_type",
 			"width": 140,
 		},
-		{"label": _("Posting Date"), "fieldname": "posting_date", "fieldtype": "Date", "width": 120},
+		{"label": _("Posting Date"), "fieldname": "posting_date", "fieldtype": "Date", "width": 100},
 		{"label": _("Cheque/Reference No"), "fieldname": "cheque_no", "width": 120},
-		{"label": _("Clearance Date"), "fieldname": "clearance_date", "fieldtype": "Date", "width": 120},
+		{"label": _("Clearance Date"), "fieldname": "clearance_date", "fieldtype": "Date", "width": 100},
 		{
 			"label": _("Against Account"),
 			"fieldname": "against",
 			"fieldtype": "Link",
 			"options": "Account",
-			"width": 200,
+			"width": 170,
 		},
 		{"label": _("Amount"), "fieldname": "amount", "fieldtype": "Currency", "width": 120},
 	]
@@ -79,7 +80,7 @@ def get_entries(filters):
 	payment_entries = frappe.db.sql(
 		"""SELECT
 			"Payment Entry", name, posting_date, reference_no, clearance_date, party,
-			if(paid_from=%(account)s, ((paid_amount * -1) - total_taxes_and_charges) , received_amount)
+			if(paid_from=%(account)s, paid_amount * -1, received_amount)
 		FROM
 			`tabPayment Entry`
 		WHERE

erpnext/accounts/report/cash_flow/cash_flow.py

@@ -9,7 +9,6 @@ from six import iteritems
 
 from erpnext.accounts.report.financial_statements import (
 	get_columns,
-	get_cost_centers_with_children,
 	get_data,
 	get_filtered_list_for_consolidated_report,
 	get_period_list,
@@ -162,11 +161,10 @@ def get_account_type_based_data(company, account_type, period_list, accumulated_
 	total = 0
 	for period in period_list:
 		start_date = get_start_date(period, accumulated_values, company)
-		filters.start_date = start_date
-		filters.end_date = period["to_date"]
-		filters.account_type = account_type
 
-		amount = get_account_type_based_gl_data(company, filters)
+		amount = get_account_type_based_gl_data(
+			company, start_date, period["to_date"], account_type, filters
+		)
 
 		if amount and account_type == "Depreciation":
 			amount *= -1
@@ -178,7 +176,7 @@ def get_account_type_based_data(company, account_type, period_list, accumulated_
 	return data
 
 
-def get_account_type_based_gl_data(company, filters=None):
+def get_account_type_based_gl_data(company, start_date, end_date, account_type, filters=None):
 	cond = ""
 	filters = frappe._dict(filters or {})
 
@@ -194,21 +192,17 @@ def get_account_type_based_gl_data(company, filters=None):
 			frappe.db.escape(cstr(filters.finance_book))
 		)
 
-	if filters.get("cost_center"):
-		filters.cost_center = get_cost_centers_with_children(filters.cost_center)
-		cond += " and cost_center in %(cost_center)s"
-
 	gl_sum = frappe.db.sql_list(
 		"""
 		select sum(credit) - sum(debit)
 		from `tabGL Entry`
-		where company=%(company)s and posting_date >= %(start_date)s and posting_date <= %(end_date)s
+		where company=%s and posting_date >= %s and posting_date <= %s
 			and voucher_type != 'Period Closing Voucher'
-			and account in ( SELECT name FROM tabAccount WHERE account_type = %(account_type)s) {cond}
+			and account in ( SELECT name FROM tabAccount WHERE account_type = %s) {cond}
 	""".format(
 			cond=cond
 		),
-		filters,
+		(company, start_date, end_date, account_type),
 	)
 
 	return gl_sum[0] if gl_sum and gl_sum[0] else 0

erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.py

@@ -138,8 +138,7 @@ def prepare_companywise_opening_balance(asset_data, liability_data, equity_data,
 		for data in [asset_data, liability_data, equity_data]:
 			if data:
 				account_name = get_root_account_name(data[0].root_type, company)
-				if account_name:
-					opening_value += get_opening_balance(account_name, data, company) or 0.0
+				opening_value += get_opening_balance(account_name, data, company) or 0.0
 
 		opening_balance[company] = opening_value
 
@@ -156,7 +155,7 @@ def get_opening_balance(account_name, data, company):
 
 
 def get_root_account_name(root_type, company):
-	root_account = frappe.get_all(
+	return frappe.get_all(
 		"Account",
 		fields=["account_name"],
 		filters={
@@ -166,10 +165,7 @@ def get_root_account_name(root_type, company):
 			"parent_account": ("is", "not set"),
 		},
 		as_list=1,
-	)
-
-	if root_account:
-		return root_account[0][0]
+	)[0][0]
 
 
 def get_profit_loss_data(fiscal_year, companies, columns, filters):
@@ -272,12 +268,10 @@ def get_cash_flow_data(fiscal_year, companies, filters):
 def get_account_type_based_data(account_type, companies, fiscal_year, filters):
 	data = {}
 	total = 0
-	filters.account_type = account_type
-	filters.start_date = fiscal_year.year_start_date
-	filters.end_date = fiscal_year.year_end_date
-
 	for company in companies:
-		amount = get_account_type_based_gl_data(company, filters)
+		amount = get_account_type_based_gl_data(
+			company, fiscal_year.year_start_date, fiscal_year.year_end_date, account_type, filters
+		)
 
 		if amount and account_type == "Depreciation":
 			amount *= -1
@@ -539,13 +533,12 @@ def get_accounts(root_type, companies):
 			],
 			filters={"company": company, "root_type": root_type},
 		):
-			if account.account_number:
-				account_key = account.account_number + "-" + account.account_name
-			else:
-				account_key = account.account_name
-
-			if account_key not in added_accounts:
+			if account.account_name not in added_accounts:
 				accounts.append(account)
+				if account.account_number:
+					account_key = account.account_number + "-" + account.account_name
+				else:
+					account_key = account.account_name
 				added_accounts.append(account_key)
 
 	return accounts

erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py

@@ -27,7 +27,6 @@ class PartyLedgerSummaryReport(object):
 		)
 
 		self.get_gl_entries()
-		self.get_additional_columns()
 		self.get_return_invoices()
 		self.get_party_adjustment_amounts()
 
@@ -35,42 +34,6 @@ class PartyLedgerSummaryReport(object):
 		data = self.get_data()
 		return columns, data
 
-	def get_additional_columns(self):
-		"""
-		Additional Columns for 'User Permission' based access control
-		"""
-		from frappe import qb
-
-		if self.filters.party_type == "Customer":
-			self.territories = frappe._dict({})
-			self.customer_group = frappe._dict({})
-
-			customer = qb.DocType("Customer")
-			result = (
-				frappe.qb.from_(customer)
-				.select(
-					customer.name, customer.territory, customer.customer_group, customer.default_sales_partner
-				)
-				.where((customer.disabled == 0))
-				.run(as_dict=True)
-			)
-
-			for x in result:
-				self.territories[x.name] = x.territory
-				self.customer_group[x.name] = x.customer_group
-		else:
-			self.supplier_group = frappe._dict({})
-			supplier = qb.DocType("Supplier")
-			result = (
-				frappe.qb.from_(supplier)
-				.select(supplier.name, supplier.supplier_group)
-				.where((supplier.disabled == 0))
-				.run(as_dict=True)
-			)
-
-			for x in result:
-				self.supplier_group[x.name] = x.supplier_group
-
 	def get_columns(self):
 		columns = [
 			{
@@ -154,35 +117,6 @@ class PartyLedgerSummaryReport(object):
 			},
 		]
 
-		# Hidden columns for handling 'User Permissions'
-		if self.filters.party_type == "Customer":
-			columns += [
-				{
-					"label": _("Territory"),
-					"fieldname": "territory",
-					"fieldtype": "Link",
-					"options": "Territory",
-					"hidden": 1,
-				},
-				{
-					"label": _("Customer Group"),
-					"fieldname": "customer_group",
-					"fieldtype": "Link",
-					"options": "Customer Group",
-					"hidden": 1,
-				},
-			]
-		else:
-			columns += [
-				{
-					"label": _("Supplier Group"),
-					"fieldname": "supplier_group",
-					"fieldtype": "Link",
-					"options": "Supplier Group",
-					"hidden": 1,
-				}
-			]
-
 		return columns
 
 	def get_data(self):
@@ -210,12 +144,6 @@ class PartyLedgerSummaryReport(object):
 				),
 			)
 
-			if self.filters.party_type == "Customer":
-				self.party_data[gle.party].update({"territory": self.territories.get(gle.party)})
-				self.party_data[gle.party].update({"customer_group": self.customer_group.get(gle.party)})
-			else:
-				self.party_data[gle.party].update({"supplier_group": self.supplier_group.get(gle.party)})
-
 			amount = gle.get(invoice_dr_or_cr) - gle.get(reverse_dr_or_cr)
 			self.party_data[gle.party].closing_balance += amount
 

erpnext/accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.py

@@ -378,14 +378,15 @@ class Deferred_Revenue_and_Expense_Report(object):
 		ret += [{}]
 
 		# add total row
-		if self.filters.type == "Revenue":
-			total_row = frappe._dict({"name": "Total Deferred Income"})
-		elif self.filters.type == "Expense":
-			total_row = frappe._dict({"name": "Total Deferred Expense"})
+		if ret is not []:
+			if self.filters.type == "Revenue":
+				total_row = frappe._dict({"name": "Total Deferred Income"})
+			elif self.filters.type == "Expense":
+				total_row = frappe._dict({"name": "Total Deferred Expense"})
 
-		for idx, period in enumerate(self.period_list, 0):
-			total_row[period.key] = self.period_total[idx].total
-		ret.append(total_row)
+			for idx, period in enumerate(self.period_list, 0):
+				total_row[period.key] = self.period_total[idx].total
+			ret.append(total_row)
 
 		return ret
 

erpnext/accounts/report/financial_statements.py

@@ -524,26 +524,11 @@ def get_additional_conditions(from_date, ignore_closing_entries, filters):
 			additional_conditions.append("cost_center in %(cost_center)s")
 
 		if filters.get("include_default_book_entries"):
-			if filters.get("finance_book"):
-				if filters.get("company_fb") and cstr(filters.get("finance_book")) != cstr(
-					filters.get("company_fb")
-				):
-					frappe.throw(
-						_("To use a different finance book, please uncheck 'Include Default Book Entries'")
-					)
-				else:
-					additional_conditions.append(
-						"(finance_book in (%(finance_book)s, '') OR finance_book IS NULL)"
-					)
-			else:
-				additional_conditions.append("(finance_book in (%(company_fb)s, '') OR finance_book IS NULL)")
+			additional_conditions.append(
+				"(finance_book in (%(finance_book)s, %(company_fb)s, '') OR finance_book IS NULL)"
+			)
 		else:
-			if filters.get("finance_book"):
-				additional_conditions.append(
-					"(finance_book in (%(finance_book)s, '') OR finance_book IS NULL)"
-				)
-			else:
-				additional_conditions.append("(finance_book in ('') OR finance_book IS NULL)")
+			additional_conditions.append("(finance_book in (%(finance_book)s, '') OR finance_book IS NULL)")
 
 	if accounting_dimensions:
 		for dimension in accounting_dimensions:

erpnext/accounts/report/general_ledger/general_ledger.html

@@ -25,8 +25,8 @@
 	<thead>
 		<tr>
 			<th style="width: 12%">{%= __("Date") %}</th>
-			<th style="width: 15%">{%= __("Reference") %}</th>
-			<th style="width: 25%">{%= __("Remarks") %}</th>
+			<th style="width: 15%">{%= __("Ref") %}</th>
+			<th style="width: 25%">{%= __("Party") %}</th>
 			<th style="width: 15%">{%= __("Debit") %}</th>
 			<th style="width: 15%">{%= __("Credit") %}</th>
 			<th style="width: 18%">{%= __("Balance (Dr - Cr)") %}</th>
@@ -38,28 +38,23 @@
 			{% if(data[i].posting_date) { %}
 				<td>{%= frappe.datetime.str_to_user(data[i].posting_date) %}</td>
 				<td>{%= data[i].voucher_type %}
-					<br>{%= data[i].voucher_no %}
-				</td>
-				{% var longest_word = cstr(data[i].remarks).split(" ").reduce((longest, word) => word.length > longest.length ? word : longest, ""); %}
-				<td {% if longest_word.length > 45 %} class="overflow-wrap-anywhere" {% endif %}>
-					<span>
+					<br>{%= data[i].voucher_no %}</td>
+				<td>
 					{% if(!(filters.party || filters.account)) { %}
 						{%= data[i].party || data[i].account %}
 						<br>
 					{% } %}
 
+					{{ __("Against") }}: {%= data[i].against %}
 					<br>{%= __("Remarks") %}: {%= data[i].remarks %}
 					{% if(data[i].bill_no) { %}
 						<br>{%= __("Supplier Invoice No") %}: {%= data[i].bill_no %}
 					{% } %}
-					</span>
-				</td>
-				<td style="text-align: right">
-					{%= format_currency(data[i].debit, filters.presentation_currency) %}
-				</td>
-				<td style="text-align: right">
-					{%= format_currency(data[i].credit, filters.presentation_currency) %}
-				</td>
+					</td>
+					<td style="text-align: right">
+						{%= format_currency(data[i].debit, filters.presentation_currency) %}</td>
+					<td style="text-align: right">
+						{%= format_currency(data[i].credit, filters.presentation_currency) %}</td>
 			{% } else { %}
 				<td></td>
 				<td></td>

erpnext/accounts/report/general_ledger/general_ledger.js

@@ -58,8 +58,9 @@ frappe.query_reports["General Ledger"] = {
 		{
 			"fieldname":"party_type",
 			"label": __("Party Type"),
-			"fieldtype": "Autocomplete",
-			options: Object.keys(frappe.boot.party_account_types),
+			"fieldtype": "Link",
+			"options": "Party Type",
+			"default": "",
 			on_change: function() {
 				frappe.query_report.set_filter_value('party', "");
 			}
@@ -176,8 +177,7 @@ frappe.query_reports["General Ledger"] = {
 		{
 			"fieldname": "include_default_book_entries",
 			"label": __("Include Default Book Entries"),
-			"fieldtype": "Check",
-			"default": 1
+			"fieldtype": "Check"
 		},
 		{
 			"fieldname": "show_cancelled_entries",

erpnext/accounts/report/general_ledger/general_ledger.py

@@ -282,28 +282,18 @@ def get_conditions(filters):
 	):
 		conditions.append("(posting_date >=%(from_date)s or is_opening = 'Yes')")
 
-	conditions.append("(posting_date <=%(to_date)s or is_opening = 'Yes')")
+	conditions.append("(posting_date <=%(to_date)s)")
 
 	if filters.get("project"):
 		conditions.append("project in %(project)s")
 
-	if filters.get("include_default_book_entries"):
-		if filters.get("finance_book"):
-			if filters.get("company_fb") and cstr(filters.get("finance_book")) != cstr(
-				filters.get("company_fb")
-			):
-				frappe.throw(
-					_("To use a different finance book, please uncheck 'Include Default Book Entries'")
-				)
-			else:
-				conditions.append("(finance_book in (%(finance_book)s, '') OR finance_book IS NULL)")
+	if filters.get("finance_book"):
+		if filters.get("include_default_book_entries"):
+			conditions.append(
+				"(finance_book in (%(finance_book)s, %(company_fb)s, '') OR finance_book IS NULL)"
+			)
 		else:
-			conditions.append("(finance_book in (%(company_fb)s, '') OR finance_book IS NULL)")
-	else:
-		if filters.get("finance_book"):
-			conditions.append("(finance_book in (%(finance_book)s, '') OR finance_book IS NULL)")
-		else:
-			conditions.append("(finance_book in ('') OR finance_book IS NULL)")
+			conditions.append("finance_book in (%(finance_book)s)")
 
 	if not filters.get("show_cancelled_entries"):
 		conditions.append("is_cancelled = 0")

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/gross_profit/gross_profit.py

@@ -1,15 +1,12 @@
 # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
 # License: GNU General Public License v3. See license.txt
 
-from collections import OrderedDict
 
 import frappe
-from frappe import _, qb, scrub
-from frappe.query_builder import Order
+from frappe import _, scrub
 from frappe.utils import cint, flt
 
 from erpnext.controllers.queries import get_match_cond
-from erpnext.stock.report.stock_ledger.stock_ledger import get_item_group_condition
 from erpnext.stock.utils import get_incoming_rate
 
 
@@ -366,16 +363,15 @@ def get_column_names():
 
 class GrossProfitGenerator(object):
 	def __init__(self, filters=None):
-		self.sle = {}
 		self.data = []
 		self.average_buying_rate = {}
 		self.filters = frappe._dict(filters)
 		self.load_invoice_items()
-		self.get_delivery_notes()
 
 		if filters.group_by == "Invoice":
 			self.group_items_by_invoice()
 
+		self.load_stock_ledger_entries()
 		self.load_product_bundle()
 		self.load_non_stock_items()
 		self.get_returned_invoice_items()
@@ -457,8 +453,6 @@ class GrossProfitGenerator(object):
 						new_row.qty += flt(row.qty)
 						new_row.buying_amount += flt(row.buying_amount, self.currency_precision)
 						new_row.base_amount += flt(row.base_amount, self.currency_precision)
-						if self.filters.get("group_by") == "Sales Person":
-							new_row.allocated_amount += flt(row.allocated_amount, self.currency_precision)
 				new_row = self.set_average_rate(new_row)
 				self.grouped_data.append(new_row)
 			else:
@@ -469,14 +463,7 @@ class GrossProfitGenerator(object):
 						):
 							returned_item_rows = self.returned_invoices[row.parent][row.item_code]
 							for returned_item_row in returned_item_rows:
-								# returned_items 'qty' should be stateful
-								if returned_item_row.qty != 0:
-									if row.qty >= abs(returned_item_row.qty):
-										row.qty += returned_item_row.qty
-										returned_item_row.qty = 0
-									else:
-										row.qty = 0
-										returned_item_row.qty += row.qty
+								row.qty += flt(returned_item_row.qty)
 								row.base_amount += flt(returned_item_row.base_amount, self.currency_precision)
 							row.buying_amount = flt(flt(row.qty) * flt(row.buying_rate), self.currency_precision)
 						if flt(row.qty) or row.base_amount:
@@ -548,22 +535,6 @@ class GrossProfitGenerator(object):
 
 		return flt(buying_amount, self.currency_precision)
 
-	def calculate_buying_amount_from_sle(self, row, my_sle, parenttype, parent, item_row, item_code):
-		for i, sle in enumerate(my_sle):
-			# find the stock valution rate from stock ledger entry
-			if (
-				sle.voucher_type == parenttype
-				and parent == sle.voucher_no
-				and sle.voucher_detail_no == item_row
-			):
-				previous_stock_value = len(my_sle) > i + 1 and flt(my_sle[i + 1].stock_value) or 0.0
-
-				if previous_stock_value:
-					return abs(previous_stock_value - flt(sle.stock_value)) * flt(row.qty) / abs(flt(sle.qty))
-				else:
-					return flt(row.qty) * self.get_average_buying_rate(row, item_code)
-		return 0.0
-
 	def get_buying_amount(self, row, item_code):
 		# IMP NOTE
 		# stock_ledger_entries should already be filtered by item_code and warehouse and
@@ -574,54 +545,29 @@ class GrossProfitGenerator(object):
 			return flt(row.qty) * item_rate
 
 		else:
-			my_sle = self.get_stock_ledger_entries(item_code, row.warehouse)
+			my_sle = self.sle.get((item_code, row.warehouse))
 			if (row.update_stock or row.dn_detail) and my_sle:
 				parenttype, parent = row.parenttype, row.parent
 				if row.dn_detail:
 					parenttype, parent = "Delivery Note", row.delivery_note
 
-				return self.calculate_buying_amount_from_sle(
-					row, my_sle, parenttype, parent, row.item_row, item_code
-				)
-			elif self.delivery_notes.get((row.parent, row.item_code), None):
-				#  check if Invoice has delivery notes
-				dn = self.delivery_notes.get((row.parent, row.item_code))
-				parenttype, parent, item_row, warehouse = (
-					"Delivery Note",
-					dn["delivery_note"],
-					dn["item_row"],
-					dn["warehouse"],
-				)
-				my_sle = self.get_stock_ledger_entries(item_code, row.warehouse)
-				return self.calculate_buying_amount_from_sle(
-					row, my_sle, parenttype, parent, item_row, item_code
-				)
-			elif row.sales_order and row.so_detail:
-				incoming_amount = self.get_buying_amount_from_so_dn(row.sales_order, row.so_detail, item_code)
-				if incoming_amount:
-					return incoming_amount
+				for i, sle in enumerate(my_sle):
+					# find the stock valution rate from stock ledger entry
+					if (
+						sle.voucher_type == parenttype
+						and parent == sle.voucher_no
+						and sle.voucher_detail_no == row.item_row
+					):
+						previous_stock_value = len(my_sle) > i + 1 and flt(my_sle[i + 1].stock_value) or 0.0
+
+						if previous_stock_value:
+							return abs(previous_stock_value - flt(sle.stock_value)) * flt(row.qty) / abs(flt(sle.qty))
+						else:
+							return flt(row.qty) * self.get_average_buying_rate(row, item_code)
 			else:
 				return flt(row.qty) * self.get_average_buying_rate(row, item_code)
 
-		return flt(row.qty) * self.get_average_buying_rate(row, item_code)
-
-	def get_buying_amount_from_so_dn(self, sales_order, so_detail, item_code):
-		from frappe.query_builder.functions import Sum
-
-		delivery_note_item = frappe.qb.DocType("Delivery Note Item")
-
-		query = (
-			frappe.qb.from_(delivery_note_item)
-			.select(Sum(delivery_note_item.incoming_rate * delivery_note_item.stock_qty))
-			.where(delivery_note_item.docstatus == 1)
-			.where(delivery_note_item.item_code == item_code)
-			.where(delivery_note_item.against_sales_order == sales_order)
-			.where(delivery_note_item.so_detail == so_detail)
-			.groupby(delivery_note_item.item_code)
-		)
-
-		incoming_amount = query.run()
-		return flt(incoming_amount[0][0]) if incoming_amount else 0
+		return 0.0
 
 	def get_average_buying_rate(self, row, item_code):
 		args = row
@@ -669,25 +615,12 @@ class GrossProfitGenerator(object):
 	def load_invoice_items(self):
 		conditions = ""
 		if self.filters.company:
-			conditions += " and `tabSales Invoice`.company = %(company)s"
+			conditions += " and company = %(company)s"
 		if self.filters.from_date:
 			conditions += " and posting_date >= %(from_date)s"
 		if self.filters.to_date:
 			conditions += " and posting_date <= %(to_date)s"
 
-		conditions += " and (is_return = 0 or (is_return=1 and return_against is null))"
-
-		if self.filters.item_group:
-			conditions += " and {0}".format(get_item_group_condition(self.filters.item_group))
-
-		if self.filters.sales_person:
-			conditions += """
-				and exists(select 1
-							from `tabSales Team` st
-							where st.parent = `tabSales Invoice`.name
-							and   st.sales_person = %(sales_person)s)
-			"""
-
 		if self.filters.group_by == "Sales Person":
 			sales_person_cols = ", sales.sales_person, sales.allocated_amount, sales.incentives"
 			sales_team_table = "left join `tabSales Team` sales on sales.parent = `tabSales Invoice`.name"
@@ -711,8 +644,7 @@ class GrossProfitGenerator(object):
 				`tabSales Invoice`.territory, `tabSales Invoice Item`.item_code,
 				`tabSales Invoice Item`.item_name, `tabSales Invoice Item`.description,
 				`tabSales Invoice Item`.warehouse, `tabSales Invoice Item`.item_group,
-				`tabSales Invoice Item`.brand, `tabSales Invoice Item`.so_detail,
-				`tabSales Invoice Item`.sales_order, `tabSales Invoice Item`.dn_detail,
+				`tabSales Invoice Item`.brand, `tabSales Invoice Item`.dn_detail,
 				`tabSales Invoice Item`.delivery_note, `tabSales Invoice Item`.stock_qty as qty,
 				`tabSales Invoice Item`.base_net_rate, `tabSales Invoice Item`.base_net_amount,
 				`tabSales Invoice Item`.name as "item_row", `tabSales Invoice`.is_return,
@@ -735,58 +667,35 @@ class GrossProfitGenerator(object):
 			as_dict=1,
 		)
 
-	def get_delivery_notes(self):
-		self.delivery_notes = frappe._dict({})
-		if self.si_list:
-			invoices = [x.parent for x in self.si_list]
-			dni = qb.DocType("Delivery Note Item")
-			delivery_notes = (
-				qb.from_(dni)
-				.select(
-					dni.against_sales_invoice.as_("sales_invoice"),
-					dni.item_code,
-					dni.warehouse,
-					dni.parent.as_("delivery_note"),
-					dni.name.as_("item_row"),
-				)
-				.where((dni.docstatus == 1) & (dni.against_sales_invoice.isin(invoices)))
-				.groupby(dni.against_sales_invoice, dni.item_code)
-				.orderby(dni.creation, order=Order.desc)
-				.run(as_dict=True)
-			)
-
-			for entry in delivery_notes:
-				self.delivery_notes[(entry.sales_invoice, entry.item_code)] = entry
-
 	def group_items_by_invoice(self):
 		"""
 		Turns list of Sales Invoice Items to a tree of Sales Invoices with their Items as children.
 		"""
 
-		grouped = OrderedDict()
+		parents = []
 
 		for row in self.si_list:
-			# initialize list with a header row for each new parent
-			grouped.setdefault(row.parent, [self.get_invoice_row(row)]).append(
-				row.update(
-					{"indent": 1.0, "parent_invoice": row.parent, "invoice_or_item": row.item_code}
-				)  # descendant rows will have indent: 1.0 or greater
-			)
+			if row.parent not in parents:
+				parents.append(row.parent)
 
-			# if item is a bundle, add it's components as seperate rows
-			if frappe.db.exists("Product Bundle", row.item_code):
-				bundled_items = self.get_bundle_items(row)
-				for x in bundled_items:
-					bundle_item = self.get_bundle_item_row(row, x)
-					grouped.get(row.parent).append(bundle_item)
+		parents_index = 0
+		for index, row in enumerate(self.si_list):
+			if parents_index < len(parents) and row.parent == parents[parents_index]:
+				invoice = self.get_invoice_row(row)
+				self.si_list.insert(index, invoice)
+				parents_index += 1
 
-		self.si_list.clear()
+			else:
+				# skipping the bundle items rows
+				if not row.indent:
+					row.indent = 1.0
+					row.parent_invoice = row.parent
+					row.invoice_or_item = row.item_code
 
-		for items in grouped.values():
-			self.si_list.extend(items)
+					if frappe.db.exists("Product Bundle", row.item_code):
+						self.add_bundle_items(row, index)
 
 	def get_invoice_row(self, row):
-		# header row format
 		return frappe._dict(
 			{
 				"parent_invoice": "",
@@ -815,6 +724,13 @@ class GrossProfitGenerator(object):
 			}
 		)
 
+	def add_bundle_items(self, product_bundle, index):
+		bundle_items = self.get_bundle_items(product_bundle)
+
+		for i, item in enumerate(bundle_items):
+			bundle_item = self.get_bundle_item_row(product_bundle, item)
+			self.si_list.insert((index + i + 1), bundle_item)
+
 	def get_bundle_items(self, product_bundle):
 		return frappe.get_all(
 			"Product Bundle Item", filters={"parent": product_bundle.item_code}, fields=["item_code", "qty"]
@@ -854,36 +770,24 @@ class GrossProfitGenerator(object):
 			"Item", item_code, ["item_name", "description", "item_group", "brand"]
 		)
 
-	def get_stock_ledger_entries(self, item_code, warehouse):
-		if item_code and warehouse:
-			if (item_code, warehouse) not in self.sle:
-				sle = qb.DocType("Stock Ledger Entry")
-				res = (
-					qb.from_(sle)
-					.select(
-						sle.item_code,
-						sle.voucher_type,
-						sle.voucher_no,
-						sle.voucher_detail_no,
-						sle.stock_value,
-						sle.warehouse,
-						sle.actual_qty.as_("qty"),
-					)
-					.where(
-						(sle.company == self.filters.company)
-						& (sle.item_code == item_code)
-						& (sle.warehouse == warehouse)
-						& (sle.is_cancelled == 0)
-					)
-					.orderby(sle.item_code)
-					.orderby(sle.warehouse, sle.posting_date, sle.posting_time, sle.creation, order=Order.desc)
-					.run(as_dict=True)
-				)
+	def load_stock_ledger_entries(self):
+		res = frappe.db.sql(
+			"""select item_code, voucher_type, voucher_no,
+				voucher_detail_no, stock_value, warehouse, actual_qty as qty
+			from `tabStock Ledger Entry`
+			where company=%(company)s and is_cancelled = 0
+			order by
+				item_code desc, warehouse desc, posting_date desc,
+				posting_time desc, creation desc""",
+			self.filters,
+			as_dict=True,
+		)
+		self.sle = {}
+		for r in res:
+			if (r.item_code, r.warehouse) not in self.sle:
+				self.sle[(r.item_code, r.warehouse)] = []
 
-				self.sle[(item_code, warehouse)] = res
-
-			return self.sle[(item_code, warehouse)]
-		return []
+			self.sle[(r.item_code, r.warehouse)].append(r)
 
 	def load_product_bundle(self):
 		self.product_bundles = {}

erpnext/accounts/report/gross_profit/test_gross_profit.py

@@ -1,461 +0,0 @@
-import frappe
-from frappe import qb
-from frappe.tests.utils import FrappeTestCase
-from frappe.utils import add_days, flt, nowdate
-
-from erpnext.accounts.doctype.sales_invoice.sales_invoice import make_delivery_note
-from erpnext.accounts.doctype.sales_invoice.test_sales_invoice import create_sales_invoice
-from erpnext.accounts.report.gross_profit.gross_profit import execute
-from erpnext.stock.doctype.delivery_note.delivery_note import make_sales_invoice
-from erpnext.stock.doctype.delivery_note.test_delivery_note import create_delivery_note
-from erpnext.stock.doctype.item.test_item import create_item
-from erpnext.stock.doctype.stock_entry.stock_entry_utils import make_stock_entry
-
-
-class TestGrossProfit(FrappeTestCase):
-	def setUp(self):
-		self.create_company()
-		self.create_item()
-		self.create_bundle()
-		self.create_customer()
-		self.create_sales_invoice()
-		self.clear_old_entries()
-
-	def tearDown(self):
-		frappe.db.rollback()
-
-	def create_company(self):
-		company_name = "_Test Gross Profit"
-		abbr = "_GP"
-		if frappe.db.exists("Company", company_name):
-			company = frappe.get_doc("Company", company_name)
-		else:
-			company = frappe.get_doc(
-				{
-					"doctype": "Company",
-					"company_name": company_name,
-					"country": "India",
-					"default_currency": "INR",
-					"create_chart_of_accounts_based_on": "Standard Template",
-					"chart_of_accounts": "Standard",
-				}
-			)
-			company = company.save()
-
-		self.company = company.name
-		self.cost_center = company.cost_center
-		self.warehouse = "Stores - " + abbr
-		self.finished_warehouse = "Finished Goods - " + abbr
-		self.income_account = "Sales - " + abbr
-		self.expense_account = "Cost of Goods Sold - " + abbr
-		self.debit_to = "Debtors - " + abbr
-		self.creditors = "Creditors - " + abbr
-
-	def create_item(self):
-		item = create_item(
-			item_code="_Test GP Item", is_stock_item=1, company=self.company, warehouse=self.warehouse
-		)
-		self.item = item if isinstance(item, str) else item.item_code
-
-	def create_bundle(self):
-		from erpnext.selling.doctype.product_bundle.test_product_bundle import make_product_bundle
-
-		item2 = create_item(
-			item_code="_Test GP Item 2", is_stock_item=1, company=self.company, warehouse=self.warehouse
-		)
-		self.item2 = item2 if isinstance(item2, str) else item2.item_code
-
-		# This will be parent item
-		bundle = create_item(
-			item_code="_Test GP bundle", is_stock_item=0, company=self.company, warehouse=self.warehouse
-		)
-		self.bundle = bundle if isinstance(bundle, str) else bundle.item_code
-
-		# Create Product Bundle
-		self.product_bundle = make_product_bundle(parent=self.bundle, items=[self.item, self.item2])
-
-	def create_customer(self):
-		name = "_Test GP Customer"
-		if frappe.db.exists("Customer", name):
-			self.customer = name
-		else:
-			customer = frappe.new_doc("Customer")
-			customer.customer_name = name
-			customer.type = "Individual"
-			customer.save()
-			self.customer = customer.name
-
-	def create_sales_invoice(
-		self, qty=1, rate=100, posting_date=nowdate(), do_not_save=False, do_not_submit=False
-	):
-		"""
-		Helper function to populate default values in sales invoice
-		"""
-		sinv = create_sales_invoice(
-			qty=qty,
-			rate=rate,
-			company=self.company,
-			customer=self.customer,
-			item_code=self.item,
-			item_name=self.item,
-			cost_center=self.cost_center,
-			warehouse=self.warehouse,
-			debit_to=self.debit_to,
-			parent_cost_center=self.cost_center,
-			update_stock=0,
-			currency="INR",
-			is_pos=0,
-			is_return=0,
-			return_against=None,
-			income_account=self.income_account,
-			expense_account=self.expense_account,
-			do_not_save=do_not_save,
-			do_not_submit=do_not_submit,
-		)
-		return sinv
-
-	def create_delivery_note(
-		self, item=None, qty=1, rate=100, posting_date=nowdate(), do_not_save=False, do_not_submit=False
-	):
-		"""
-		Helper function to populate default values in Delivery Note
-		"""
-		dnote = create_delivery_note(
-			company=self.company,
-			customer=self.customer,
-			currency="INR",
-			item=item or self.item,
-			qty=qty,
-			rate=rate,
-			cost_center=self.cost_center,
-			warehouse=self.warehouse,
-			return_against=None,
-			expense_account=self.expense_account,
-			do_not_save=do_not_save,
-			do_not_submit=do_not_submit,
-		)
-		return dnote
-
-	def clear_old_entries(self):
-		doctype_list = [
-			"Sales Invoice",
-			"GL Entry",
-			"Stock Entry",
-			"Stock Ledger Entry",
-			"Delivery Note",
-		]
-		for doctype in doctype_list:
-			qb.from_(qb.DocType(doctype)).delete().where(qb.DocType(doctype).company == self.company).run()
-
-	def test_invoice_without_only_delivery_note(self):
-		"""
-		Test buying amount for Invoice without `update_stock` flag set but has Delivery Note
-		"""
-		se = make_stock_entry(
-			company=self.company,
-			item_code=self.item,
-			target=self.warehouse,
-			qty=1,
-			basic_rate=100,
-			do_not_submit=True,
-		)
-		item = se.items[0]
-		se.append(
-			"items",
-			{
-				"item_code": item.item_code,
-				"s_warehouse": item.s_warehouse,
-				"t_warehouse": item.t_warehouse,
-				"qty": 1,
-				"basic_rate": 200,
-				"conversion_factor": item.conversion_factor or 1.0,
-				"transfer_qty": flt(item.qty) * (flt(item.conversion_factor) or 1.0),
-				"serial_no": item.serial_no,
-				"batch_no": item.batch_no,
-				"cost_center": item.cost_center,
-				"expense_account": item.expense_account,
-			},
-		)
-		se = se.save().submit()
-
-		sinv = create_sales_invoice(
-			qty=1,
-			rate=100,
-			company=self.company,
-			customer=self.customer,
-			item_code=self.item,
-			item_name=self.item,
-			cost_center=self.cost_center,
-			warehouse=self.warehouse,
-			debit_to=self.debit_to,
-			parent_cost_center=self.cost_center,
-			update_stock=0,
-			currency="INR",
-			income_account=self.income_account,
-			expense_account=self.expense_account,
-		)
-
-		filters = frappe._dict(
-			company=self.company, from_date=nowdate(), to_date=nowdate(), group_by="Invoice"
-		)
-
-		columns, data = execute(filters=filters)
-
-		# Without Delivery Note, buying rate should be 150
-		expected_entry_without_dn = {
-			"parent_invoice": sinv.name,
-			"currency": "INR",
-			"sales_invoice": self.item,
-			"customer": self.customer,
-			"posting_date": frappe.utils.datetime.date.fromisoformat(nowdate()),
-			"item_code": self.item,
-			"item_name": self.item,
-			"warehouse": "Stores - _GP",
-			"qty": 1.0,
-			"avg._selling_rate": 100.0,
-			"valuation_rate": 150.0,
-			"selling_amount": 100.0,
-			"buying_amount": 150.0,
-			"gross_profit": -50.0,
-			"gross_profit_%": -50.0,
-		}
-		gp_entry = [x for x in data if x.parent_invoice == sinv.name]
-		self.assertDictContainsSubset(expected_entry_without_dn, gp_entry[0])
-
-		# make delivery note
-		dn = make_delivery_note(sinv.name)
-		dn.items[0].qty = 1
-		dn = dn.save().submit()
-
-		columns, data = execute(filters=filters)
-
-		# Without Delivery Note, buying rate should be 100
-		expected_entry_with_dn = {
-			"parent_invoice": sinv.name,
-			"currency": "INR",
-			"sales_invoice": self.item,
-			"customer": self.customer,
-			"posting_date": frappe.utils.datetime.date.fromisoformat(nowdate()),
-			"item_code": self.item,
-			"item_name": self.item,
-			"warehouse": "Stores - _GP",
-			"qty": 1.0,
-			"avg._selling_rate": 100.0,
-			"valuation_rate": 100.0,
-			"selling_amount": 100.0,
-			"buying_amount": 100.0,
-			"gross_profit": 0.0,
-			"gross_profit_%": 0.0,
-		}
-		gp_entry = [x for x in data if x.parent_invoice == sinv.name]
-		self.assertDictContainsSubset(expected_entry_with_dn, gp_entry[0])
-
-	def test_bundled_delivery_note_with_different_warehouses(self):
-		"""
-		Test Delivery Note with bundled item. Packed Item from the bundle having different warehouses
-		"""
-		se = make_stock_entry(
-			company=self.company,
-			item_code=self.item,
-			target=self.warehouse,
-			qty=1,
-			basic_rate=100,
-			do_not_submit=True,
-		)
-		item = se.items[0]
-		se.append(
-			"items",
-			{
-				"item_code": self.item2,
-				"s_warehouse": "",
-				"t_warehouse": self.finished_warehouse,
-				"qty": 1,
-				"basic_rate": 100,
-				"conversion_factor": item.conversion_factor or 1.0,
-				"transfer_qty": flt(item.qty) * (flt(item.conversion_factor) or 1.0),
-				"serial_no": item.serial_no,
-				"batch_no": item.batch_no,
-				"cost_center": item.cost_center,
-				"expense_account": item.expense_account,
-			},
-		)
-		se = se.save().submit()
-
-		# Make a Delivery note with Product bundle
-		# Packed Items will have different warehouses
-		dnote = self.create_delivery_note(item=self.bundle, qty=1, rate=200, do_not_submit=True)
-		dnote.packed_items[1].warehouse = self.finished_warehouse
-		dnote = dnote.submit()
-
-		# make Sales Invoice for above delivery note
-		sinv = make_sales_invoice(dnote.name)
-		sinv = sinv.save().submit()
-
-		filters = frappe._dict(
-			company=self.company,
-			from_date=nowdate(),
-			to_date=nowdate(),
-			group_by="Invoice",
-			sales_invoice=sinv.name,
-		)
-
-		columns, data = execute(filters=filters)
-		self.assertGreater(len(data), 0)
-
-	def test_order_connected_dn_and_inv(self):
-		from erpnext.selling.doctype.sales_order.test_sales_order import make_sales_order
-
-		"""
-			Test gp calculation when invoice and delivery note aren't directly connected.
-			SO -- INV
-			|
-			DN
-		"""
-		se = make_stock_entry(
-			company=self.company,
-			item_code=self.item,
-			target=self.warehouse,
-			qty=3,
-			basic_rate=100,
-			do_not_submit=True,
-		)
-		item = se.items[0]
-		se.append(
-			"items",
-			{
-				"item_code": item.item_code,
-				"s_warehouse": item.s_warehouse,
-				"t_warehouse": item.t_warehouse,
-				"qty": 10,
-				"basic_rate": 200,
-				"conversion_factor": item.conversion_factor or 1.0,
-				"transfer_qty": flt(item.qty) * (flt(item.conversion_factor) or 1.0),
-				"serial_no": item.serial_no,
-				"batch_no": item.batch_no,
-				"cost_center": item.cost_center,
-				"expense_account": item.expense_account,
-			},
-		)
-		se = se.save().submit()
-
-		so = make_sales_order(
-			customer=self.customer,
-			company=self.company,
-			warehouse=self.warehouse,
-			item=self.item,
-			qty=4,
-			do_not_save=False,
-			do_not_submit=False,
-		)
-
-		from erpnext.selling.doctype.sales_order.sales_order import (
-			make_delivery_note,
-			make_sales_invoice,
-		)
-
-		make_delivery_note(so.name).submit()
-		sinv = make_sales_invoice(so.name).submit()
-
-		filters = frappe._dict(
-			company=self.company, from_date=nowdate(), to_date=nowdate(), group_by="Invoice"
-		)
-
-		columns, data = execute(filters=filters)
-		expected_entry = {
-			"parent_invoice": sinv.name,
-			"currency": "INR",
-			"sales_invoice": self.item,
-			"customer": self.customer,
-			"posting_date": frappe.utils.datetime.date.fromisoformat(nowdate()),
-			"item_code": self.item,
-			"item_name": self.item,
-			"warehouse": "Stores - _GP",
-			"qty": 4.0,
-			"avg._selling_rate": 100.0,
-			"valuation_rate": 125.0,
-			"selling_amount": 400.0,
-			"buying_amount": 500.0,
-			"gross_profit": -100.0,
-			"gross_profit_%": -25.0,
-		}
-		gp_entry = [x for x in data if x.parent_invoice == sinv.name]
-		self.assertDictContainsSubset(expected_entry, gp_entry[0])
-
-	def test_crnote_against_invoice_with_multiple_instances_of_same_item(self):
-		"""
-		Item Qty for Sales Invoices with multiple instances of same item go in the -ve. Ideally, the credit noteshould cancel out the invoice items.
-		"""
-		from erpnext.accounts.doctype.sales_invoice.sales_invoice import make_sales_return
-
-		# Invoice with an item added twice
-		sinv = self.create_sales_invoice(qty=1, rate=100, posting_date=nowdate(), do_not_submit=True)
-		sinv.append("items", frappe.copy_doc(sinv.items[0], ignore_no_copy=False))
-		sinv = sinv.save().submit()
-
-		# Create Credit Note for Invoice
-		cr_note = make_sales_return(sinv.name)
-		cr_note = cr_note.save().submit()
-
-		filters = frappe._dict(
-			company=self.company, from_date=nowdate(), to_date=nowdate(), group_by="Invoice"
-		)
-
-		columns, data = execute(filters=filters)
-		expected_entry = {
-			"parent_invoice": sinv.name,
-			"currency": "INR",
-			"sales_invoice": self.item,
-			"customer": self.customer,
-			"posting_date": frappe.utils.datetime.date.fromisoformat(nowdate()),
-			"item_code": self.item,
-			"item_name": self.item,
-			"warehouse": "Stores - _GP",
-			"qty": 0.0,
-			"avg._selling_rate": 0.0,
-			"valuation_rate": 0.0,
-			"selling_amount": -100.0,
-			"buying_amount": 0.0,
-			"gross_profit": -100.0,
-			"gross_profit_%": 100.0,
-		}
-		gp_entry = [x for x in data if x.parent_invoice == sinv.name]
-		# Both items of Invoice should have '0' qty
-		self.assertEqual(len(gp_entry), 2)
-		self.assertDictContainsSubset(expected_entry, gp_entry[0])
-		self.assertDictContainsSubset(expected_entry, gp_entry[1])
-
-	def test_standalone_cr_notes(self):
-		"""
-		Standalone cr notes will be reported as usual
-		"""
-		# Make Cr Note
-		sinv = self.create_sales_invoice(
-			qty=-1, rate=100, posting_date=nowdate(), do_not_save=True, do_not_submit=True
-		)
-		sinv.is_return = 1
-		sinv = sinv.save().submit()
-
-		filters = frappe._dict(
-			company=self.company, from_date=nowdate(), to_date=nowdate(), group_by="Invoice"
-		)
-
-		columns, data = execute(filters=filters)
-		expected_entry = {
-			"parent_invoice": sinv.name,
-			"currency": "INR",
-			"sales_invoice": self.item,
-			"customer": self.customer,
-			"posting_date": frappe.utils.datetime.date.fromisoformat(nowdate()),
-			"item_code": self.item,
-			"item_name": self.item,
-			"warehouse": "Stores - _GP",
-			"qty": -1.0,
-			"avg._selling_rate": 100.0,
-			"valuation_rate": 0.0,
-			"selling_amount": -100.0,
-			"buying_amount": 0.0,
-			"gross_profit": -100.0,
-			"gross_profit_%": 100.0,
-		}
-		gp_entry = [x for x in data if x.parent_invoice == sinv.name]
-		self.assertDictContainsSubset(expected_entry, gp_entry[0])

erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py

@@ -53,6 +53,9 @@ def _execute(filters=None, additional_table_columns=None, additional_query_colum
 	item_details = get_item_details()
 
 	for d in item_list:
+		if not d.stock_qty:
+			continue
+
 		item_record = item_details.get(d.item_code)
 
 		purchase_receipt = None
@@ -87,11 +90,11 @@ 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,
-				"rate": d.base_net_amount / d.stock_qty if d.stock_qty else d.base_net_amount,
+				"rate": d.base_net_amount / d.stock_qty,
 				"amount": d.base_net_amount,
 			}
 		)
@@ -241,7 +244,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/accounts/report/item_wise_sales_register/item_wise_sales_register.py

@@ -399,9 +399,8 @@ def get_items(filters, additional_query_columns, additional_conditions=None):
 			`tabSales Invoice`.posting_date, `tabSales Invoice`.debit_to,
 			`tabSales Invoice`.unrealized_profit_loss_account,
 			`tabSales Invoice`.is_internal_customer,
-			`tabSales Invoice`.customer, `tabSales Invoice`.remarks,
+			`tabSales Invoice`.project, `tabSales Invoice`.customer, `tabSales Invoice`.remarks,
 			`tabSales Invoice`.territory, `tabSales Invoice`.company, `tabSales Invoice`.base_net_total,
-			`tabSales Invoice Item`.project,
 			`tabSales Invoice Item`.item_code, `tabSales Invoice Item`.description,
 			`tabSales Invoice Item`.`item_name`, `tabSales Invoice Item`.`item_group`,
 			`tabSales Invoice Item`.sales_order, `tabSales Invoice Item`.delivery_note,

erpnext/accounts/report/purchase_register/purchase_register.py

@@ -232,12 +232,12 @@ def get_conditions(filters):
 
 					conditions += (
 						common_condition
-						+ "and ifnull(`tabPurchase Invoice`.{0}, '') in %({0})s)".format(dimension.fieldname)
+						+ "and ifnull(`tabPurchase Invoice Item`.{0}, '') in %({0})s)".format(dimension.fieldname)
 					)
 				else:
 					conditions += (
 						common_condition
-						+ "and ifnull(`tabPurchase Invoice`.{0}, '') in %({0})s)".format(dimension.fieldname)
+						+ "and ifnull(`tabPurchase Invoice Item`.{0}, '') in %({0})s)".format(dimension.fieldname)
 					)
 
 	return conditions

erpnext/accounts/report/sales_register/sales_register.py

@@ -390,12 +390,12 @@ def get_conditions(filters):
 
 					conditions += (
 						common_condition
-						+ "and ifnull(`tabSales Invoice`.{0}, '') in %({0})s)".format(dimension.fieldname)
+						+ "and ifnull(`tabSales Invoice Item`.{0}, '') in %({0})s)".format(dimension.fieldname)
 					)
 				else:
 					conditions += (
 						common_condition
-						+ "and ifnull(`tabSales Invoice`.{0}, '') in %({0})s)".format(dimension.fieldname)
+						+ "and ifnull(`tabSales Invoice Item`.{0}, '') in %({0})s)".format(dimension.fieldname)
 					)
 
 	return conditions

erpnext/accounts/report/supplier_ledger_summary/supplier_ledger_summary.js

@@ -63,6 +63,24 @@ frappe.query_reports["Supplier Ledger Summary"] = {
 			"fieldtype": "Link",
 			"options": "Payment Terms Template"
 		},
+		{
+			"fieldname":"territory",
+			"label": __("Territory"),
+			"fieldtype": "Link",
+			"options": "Territory"
+		},
+		{
+			"fieldname":"sales_partner",
+			"label": __("Sales Partner"),
+			"fieldtype": "Link",
+			"options": "Sales Partner"
+		},
+		{
+			"fieldname":"sales_person",
+			"label": __("Sales Person"),
+			"fieldtype": "Link",
+			"options": "Sales Person"
+		},
 		{
 			"fieldname":"tax_id",
 			"label": __("Tax Id"),

erpnext/accounts/report/trial_balance/trial_balance.py

@@ -78,6 +78,7 @@ def validate_filters(filters):
 
 
 def get_data(filters):
+
 	accounts = frappe.db.sql(
 		"""select name, account_number, parent_account, account_name, root_type, report_type, lft, rgt
 
@@ -117,10 +118,12 @@ def get_data(filters):
 		ignore_closing_entries=not flt(filters.with_period_closing_entry),
 	)
 
-	calculate_values(accounts, gl_entries_by_account, opening_balances)
+	total_row = calculate_values(
+		accounts, gl_entries_by_account, opening_balances, filters, company_currency
+	)
 	accumulate_values_into_parents(accounts, accounts_by_name)
 
-	data = prepare_data(accounts, filters, parent_children_map, company_currency)
+	data = prepare_data(accounts, filters, total_row, parent_children_map, company_currency)
 	data = filter_out_zero_value_rows(
 		data, parent_children_map, show_zero_values=filters.get("show_zero_values")
 	)
@@ -157,25 +160,12 @@ def get_rootwise_opening_balances(filters, report_type):
 	if filters.project:
 		additional_conditions += " and project = %(project)s"
 
-	company_fb = frappe.db.get_value("Company", filters.company, "default_finance_book")
-
 	if filters.get("include_default_book_entries"):
-		if filters.get("finance_book"):
-			if company_fb and cstr(filters.get("finance_book")) != cstr(company_fb):
-				frappe.throw(
-					_("To use a different finance book, please uncheck 'Include Default Book Entries'")
-				)
-			else:
-				additional_conditions += (
-					" AND (finance_book in (%(finance_book)s, '') OR finance_book IS NULL)"
-				)
-		else:
-			additional_conditions += " AND (finance_book in (%(company_fb)s, '') OR finance_book IS NULL)"
+		additional_conditions += (
+			" AND (finance_book in (%(finance_book)s, %(company_fb)s, '') OR finance_book IS NULL)"
+		)
 	else:
-		if filters.get("finance_book"):
-			additional_conditions += " AND (finance_book in (%(finance_book)s, '') OR finance_book IS NULL)"
-		else:
-			additional_conditions += " AND (finance_book in ('') OR finance_book IS NULL)"
+		additional_conditions += " AND (finance_book in (%(finance_book)s, '') OR finance_book IS NULL)"
 
 	accounting_dimensions = get_accounting_dimensions(as_list=False)
 
@@ -187,7 +177,7 @@ def get_rootwise_opening_balances(filters, report_type):
 		"year_start_date": filters.year_start_date,
 		"project": filters.project,
 		"finance_book": filters.finance_book,
-		"company_fb": company_fb,
+		"company_fb": frappe.db.get_value("Company", filters.company, "default_finance_book"),
 	}
 
 	if accounting_dimensions:
@@ -228,7 +218,7 @@ def get_rootwise_opening_balances(filters, report_type):
 	return opening
 
 
-def calculate_values(accounts, gl_entries_by_account, opening_balances):
+def calculate_values(accounts, gl_entries_by_account, opening_balances, filters, company_currency):
 	init = {
 		"opening_debit": 0.0,
 		"opening_credit": 0.0,
@@ -238,6 +228,22 @@ def calculate_values(accounts, gl_entries_by_account, opening_balances):
 		"closing_credit": 0.0,
 	}
 
+	total_row = {
+		"account": "'" + _("Total") + "'",
+		"account_name": "'" + _("Total") + "'",
+		"warn_if_negative": True,
+		"opening_debit": 0.0,
+		"opening_credit": 0.0,
+		"debit": 0.0,
+		"credit": 0.0,
+		"closing_debit": 0.0,
+		"closing_credit": 0.0,
+		"parent_account": None,
+		"indent": 0,
+		"has_value": True,
+		"currency": company_currency,
+	}
+
 	for d in accounts:
 		d.update(init.copy())
 
@@ -255,28 +261,8 @@ def calculate_values(accounts, gl_entries_by_account, opening_balances):
 
 		prepare_opening_closing(d)
 
-
-def calculate_total_row(accounts, company_currency):
-	total_row = {
-		"account": "'" + _("Total") + "'",
-		"account_name": "'" + _("Total") + "'",
-		"warn_if_negative": True,
-		"opening_debit": 0.0,
-		"opening_credit": 0.0,
-		"debit": 0.0,
-		"credit": 0.0,
-		"closing_debit": 0.0,
-		"closing_credit": 0.0,
-		"parent_account": None,
-		"indent": 0,
-		"has_value": True,
-		"currency": company_currency,
-	}
-
-	for d in accounts:
-		if not d.parent_account:
-			for field in value_fields:
-				total_row[field] += d[field]
+		for field in value_fields:
+			total_row[field] += d[field]
 
 	return total_row
 
@@ -288,7 +274,7 @@ def accumulate_values_into_parents(accounts, accounts_by_name):
 				accounts_by_name[d.parent_account][key] += d[key]
 
 
-def prepare_data(accounts, filters, parent_children_map, company_currency):
+def prepare_data(accounts, filters, total_row, parent_children_map, company_currency):
 	data = []
 
 	for d in accounts:
@@ -319,7 +305,6 @@ def prepare_data(accounts, filters, parent_children_map, company_currency):
 		row["has_value"] = has_value
 		data.append(row)
 
-	total_row = calculate_total_row(accounts, company_currency)
 	data.extend([{}, total_row])
 
 	return data

erpnext/accounts/report/utils.py

@@ -28,7 +28,7 @@ def get_currency(filters):
 		filters["presentation_currency"] if filters.get("presentation_currency") else company_currency
 	)
 
-	report_date = filters.get("to_date") or filters.get("period_end_date")
+	report_date = filters.get("to_date")
 
 	if not report_date:
 		fiscal_year_to_date = get_from_and_to_date(filters.get("to_fiscal_year"))["to_date"]

erpnext/accounts/utils.py

@@ -537,10 +537,6 @@ def update_reference_in_journal_entry(d, journal_entry, do_not_save=False):
 	"""
 	jv_detail = journal_entry.get("accounts", {"name": d["voucher_detail_no"]})[0]
 
-	# Update Advance Paid in SO/PO since they might be getting unlinked
-	if jv_detail.get("reference_type") in ("Sales Order", "Purchase Order"):
-		frappe.get_doc(jv_detail.reference_type, jv_detail.reference_name).set_total_advance_paid()
-
 	if flt(d["unadjusted_amount"]) - flt(d["allocated_amount"]) != 0:
 		# adjust the unreconciled balance
 		amount_in_account_currency = flt(d["unadjusted_amount"]) - flt(d["allocated_amount"])
@@ -600,13 +596,6 @@ def update_reference_in_payment_entry(d, payment_entry, do_not_save=False):
 
 	if d.voucher_detail_no:
 		existing_row = payment_entry.get("references", {"name": d["voucher_detail_no"]})[0]
-
-		# Update Advance Paid in SO/PO since they are getting unlinked
-		if existing_row.get("reference_doctype") in ("Sales Order", "Purchase Order"):
-			frappe.get_doc(
-				existing_row.reference_doctype, existing_row.reference_name
-			).set_total_advance_paid()
-
 		original_row = existing_row.as_dict().copy()
 		existing_row.update(reference_details)
 
@@ -821,7 +810,7 @@ def get_held_invoices(party_type, party):
 
 	if party_type == "Supplier":
 		held_invoices = frappe.db.sql(
-			"select name from `tabPurchase Invoice` where on_hold = 1 and release_date IS NOT NULL and release_date > CURDATE()",
+			"select name from `tabPurchase Invoice` where release_date IS NOT NULL and release_date > CURDATE()",
 			as_dict=1,
 		)
 		held_invoices = set(d["name"] for d in held_invoices)
@@ -846,12 +835,15 @@ def remove_return_pos_invoices(party_type, party, invoice_list):
 			else:
 				return invoice_list
 
-			invoice_list = [x for x in invoice_list if x.voucher_no not in return_pos]
+			# remove pos return invoices from invoice_list
+			for idx, inv in enumerate(invoice_list, 0):
+				if inv.voucher_no in return_pos:
+					del invoice_list[idx]
 
 	return invoice_list
 
 
-def get_outstanding_invoices(party_type, party, account, company, condition=None, filters=None):
+def get_outstanding_invoices(party_type, party, account, condition=None, filters=None):
 	outstanding_invoices = []
 	precision = frappe.get_precision("Sales Invoice", "outstanding_amount") or 2
 
@@ -903,73 +895,61 @@ def get_outstanding_invoices(party_type, party, account, company, condition=None
 
 	invoice_list = remove_return_pos_invoices(party_type, party, invoice_list)
 
-	if invoice_list:
-		invoices = [d.voucher_no for d in invoice_list]
-		payment_entries = frappe.db.sql(
-			"""
-			select against_voucher_type, against_voucher,
-				ifnull(sum({payment_dr_or_cr}), 0) as payment_amount
-			from `tabGL Entry`
-			where
-				company = %(company)s
-				and party_type = %(party_type)s and party = %(party)s
-				and account = %(account)s
-				and {payment_dr_or_cr} > 0
-				and ifnull(against_voucher, '') != ''
-				and is_cancelled=0
-				and against_voucher in %(invoices)s
-			group by against_voucher_type, against_voucher
-		""".format(
-				payment_dr_or_cr=payment_dr_or_cr,
-			),
-			{
-				"company": company,
-				"party_type": party_type,
-				"party": party,
-				"account": account,
-				"invoices": invoices,
-			},
-			as_dict=True,
-		)
+	payment_entries = frappe.db.sql(
+		"""
+		select against_voucher_type, against_voucher,
+			ifnull(sum({payment_dr_or_cr}), 0) as payment_amount
+		from `tabGL Entry`
+		where party_type = %(party_type)s and party = %(party)s
+			and account = %(account)s
+			and {payment_dr_or_cr} > 0
+			and against_voucher is not null and against_voucher != ''
+			and is_cancelled=0
+		group by against_voucher_type, against_voucher
+	""".format(
+			payment_dr_or_cr=payment_dr_or_cr
+		),
+		{"party_type": party_type, "party": party, "account": account},
+		as_dict=True,
+	)
 
-		pe_map = frappe._dict()
-		for d in payment_entries:
-			pe_map.setdefault((d.against_voucher_type, d.against_voucher), d.payment_amount)
+	pe_map = frappe._dict()
+	for d in payment_entries:
+		pe_map.setdefault((d.against_voucher_type, d.against_voucher), d.payment_amount)
 
-		for d in invoice_list:
-			payment_amount = pe_map.get((d.voucher_type, d.voucher_no), 0)
-			outstanding_amount = flt(d.invoice_amount - payment_amount, precision)
-			if outstanding_amount > 0.5 / (10**precision):
-				if (
-					filters
-					and filters.get("outstanding_amt_greater_than")
-					and not (
-						outstanding_amount >= filters.get("outstanding_amt_greater_than")
-						and outstanding_amount <= filters.get("outstanding_amt_less_than")
+	for d in invoice_list:
+		payment_amount = pe_map.get((d.voucher_type, d.voucher_no), 0)
+		outstanding_amount = flt(d.invoice_amount - payment_amount, precision)
+		if outstanding_amount > 0.5 / (10**precision):
+			if (
+				filters
+				and filters.get("outstanding_amt_greater_than")
+				and not (
+					outstanding_amount >= filters.get("outstanding_amt_greater_than")
+					and outstanding_amount <= filters.get("outstanding_amt_less_than")
+				)
+			):
+				continue
+
+			if not d.voucher_type == "Purchase Invoice" or d.voucher_no not in held_invoices:
+				outstanding_invoices.append(
+					frappe._dict(
+						{
+							"voucher_no": d.voucher_no,
+							"voucher_type": d.voucher_type,
+							"posting_date": d.posting_date,
+							"invoice_amount": flt(d.invoice_amount),
+							"payment_amount": payment_amount,
+							"outstanding_amount": outstanding_amount,
+							"due_date": d.due_date,
+							"currency": d.currency,
+						}
 					)
-				):
-					continue
-
-				if not d.voucher_type == "Purchase Invoice" or d.voucher_no not in held_invoices:
-					outstanding_invoices.append(
-						frappe._dict(
-							{
-								"voucher_no": d.voucher_no,
-								"voucher_type": d.voucher_type,
-								"posting_date": d.posting_date,
-								"invoice_amount": flt(d.invoice_amount),
-								"payment_amount": payment_amount,
-								"outstanding_amount": outstanding_amount,
-								"due_date": d.due_date,
-								"currency": d.currency,
-							}
-						)
-					)
-
-		outstanding_invoices = sorted(
-			outstanding_invoices, key=lambda k: k["due_date"] or getdate(nowdate())
-		)
+				)
 
+	outstanding_invoices = sorted(
+		outstanding_invoices, key=lambda k: k["due_date"] or getdate(nowdate())
+	)
 	return outstanding_invoices
 
 

erpnext/assets/doctype/asset/asset.js

@@ -132,10 +132,6 @@ frappe.ui.form.on('Asset', {
 				}, __("Manage"));
 			}
 
-			if (frm.doc.depr_entry_posting_status === "Failed") {
-				frm.trigger("set_depr_posting_failure_alert");
-			}
-
 			frm.trigger("setup_chart");
 		}
 
@@ -146,19 +142,6 @@ frappe.ui.form.on('Asset', {
 		}
 	},
 
-	set_depr_posting_failure_alert: function (frm) {
-		const alert = `
-			<div class="row">
-				<div class="col-xs-12 col-sm-6">
-					<span class="indicator whitespace-nowrap red">
-						<span>Failed to post depreciation entries</span>
-					</span>
-				</div>
-			</div>`;
-
-		frm.dashboard.set_headline_alert(alert);
-	},
-
 	toggle_reference_doc: function(frm) {
 		if (frm.doc.purchase_receipt && frm.doc.purchase_invoice && frm.doc.docstatus === 1) {
 			frm.set_df_property('purchase_invoice', 'read_only', 1);
@@ -201,58 +184,39 @@ frappe.ui.form.on('Asset', {
 		})
 	},
 
-	setup_chart: async function(frm) {
-		if(frm.doc.finance_books.length > 1) {
-			return
-		}
-
-		var x_intervals = [frappe.format(frm.doc.purchase_date, { fieldtype: 'Date' })];
+	setup_chart: function(frm) {
+		var x_intervals = [frm.doc.purchase_date];
 		var asset_values = [frm.doc.gross_purchase_amount];
+		var last_depreciation_date = frm.doc.purchase_date;
 
-		if(frm.doc.calculate_depreciation) {
-			if(frm.doc.opening_accumulated_depreciation) {
-				var depreciation_date = frappe.datetime.add_months(
-					frm.doc.finance_books[0].depreciation_start_date,
-					-1 * frm.doc.finance_books[0].frequency_of_depreciation
-				);
-				x_intervals.push(frappe.format(depreciation_date, { fieldtype: 'Date' }));
-				asset_values.push(flt(frm.doc.gross_purchase_amount - frm.doc.opening_accumulated_depreciation, precision('gross_purchase_amount')));
-			}
+		if(frm.doc.opening_accumulated_depreciation) {
+			last_depreciation_date = frappe.datetime.add_months(frm.doc.next_depreciation_date,
+				-1*frm.doc.frequency_of_depreciation);
 
-			$.each(frm.doc.schedules || [], function(i, v) {
-				x_intervals.push(frappe.format(v.schedule_date, { fieldtype: 'Date' }));
-				var asset_value = flt(frm.doc.gross_purchase_amount - v.accumulated_depreciation_amount, precision('gross_purchase_amount'));
-				if(v.journal_entry) {
-					asset_values.push(asset_value);
-				} else {
-					if (in_list(["Scrapped", "Sold"], frm.doc.status)) {
-						asset_values.push(null);
-					} else {
-						asset_values.push(asset_value);
-					}
-				}
-			});
-		} else {
-			if(frm.doc.opening_accumulated_depreciation) {
-				x_intervals.push(frappe.format(frm.doc.creation.split(" ")[0], { fieldtype: 'Date' }));
-				asset_values.push(flt(frm.doc.gross_purchase_amount - frm.doc.opening_accumulated_depreciation, precision('gross_purchase_amount')));
-			}
-
-			let depr_entries = (await frappe.call({
-				method: "get_manual_depreciation_entries",
-				doc: frm.doc,
-			})).message;
-
-			$.each(depr_entries || [], function(i, v) {
-				x_intervals.push(frappe.format(v.posting_date, { fieldtype: 'Date' }));
-				let last_asset_value = asset_values[asset_values.length - 1]
-				asset_values.push(flt(last_asset_value - v.value, precision('gross_purchase_amount')));
-			});
+			x_intervals.push(last_depreciation_date);
+			asset_values.push(flt(frm.doc.gross_purchase_amount) -
+				flt(frm.doc.opening_accumulated_depreciation));
 		}
 
+		$.each(frm.doc.schedules || [], function(i, v) {
+			x_intervals.push(v.schedule_date);
+			var asset_value = flt(frm.doc.gross_purchase_amount) - flt(v.accumulated_depreciation_amount);
+			if(v.journal_entry) {
+				last_depreciation_date = v.schedule_date;
+				asset_values.push(asset_value);
+			} else {
+				if (in_list(["Scrapped", "Sold"], frm.doc.status)) {
+					asset_values.push(null);
+				} else {
+					asset_values.push(asset_value)
+				}
+			}
+		});
+
 		if(in_list(["Scrapped", "Sold"], frm.doc.status)) {
-			x_intervals.push(frappe.format(frm.doc.disposal_date, { fieldtype: 'Date' }));
+			x_intervals.push(frm.doc.disposal_date);
 			asset_values.push(0);
+			last_depreciation_date = frm.doc.disposal_date;
 		}
 
 		frm.dashboard.render_graph({
@@ -296,6 +260,10 @@ frappe.ui.form.on('Asset', {
 		// frm.toggle_reqd("next_depreciation_date", (!frm.doc.is_existing_asset && frm.doc.calculate_depreciation));
 	},
 
+	opening_accumulated_depreciation: function(frm) {
+		erpnext.asset.set_accumulated_depreciation(frm);
+	},
+
 	make_schedules_editable: function(frm) {
 		if (frm.doc.finance_books) {
 			var is_editable = frm.doc.finance_books.filter(d => d.depreciation_method == "Manual").length > 0
@@ -416,14 +384,7 @@ frappe.ui.form.on('Asset', {
 
 	set_values_from_purchase_doc: function(frm, doctype, purchase_doc) {
 		frm.set_value('company', purchase_doc.company);
-		if (purchase_doc.bill_date) {
-			frm.set_value('purchase_date', purchase_doc.bill_date);
-		} else {
-			frm.set_value('purchase_date', purchase_doc.posting_date);
-		}
-		if (!frm.doc.is_existing_asset && !frm.doc.available_for_use_date) {
-			frm.set_value('available_for_use_date', frm.doc.purchase_date);
-		}
+		frm.set_value('purchase_date', purchase_doc.posting_date);
 		const item = purchase_doc.items.find(item => item.item_code === frm.doc.item_code);
 		if (!item) {
 			doctype_field = frappe.scrub(doctype)
@@ -518,23 +479,19 @@ frappe.ui.form.on('Depreciation Schedule', {
 	},
 
 	depreciation_amount: function(frm, cdt, cdn) {
-		erpnext.asset.set_accumulated_depreciation(frm, locals[cdt][cdn].finance_book_id);
+		erpnext.asset.set_accumulated_depreciation(frm);
 	}
 
-});
+})
 
-erpnext.asset.set_accumulated_depreciation = function(frm, finance_book_id) {
-	var depreciation_method = frm.doc.finance_books[Number(finance_book_id) - 1].depreciation_method;
-
-	if(depreciation_method != "Manual") return;
+erpnext.asset.set_accumulated_depreciation = function(frm) {
+	if(frm.doc.depreciation_method != "Manual") return;
 
 	var accumulated_depreciation = flt(frm.doc.opening_accumulated_depreciation);
-
 	$.each(frm.doc.schedules || [], function(i, row) {
-		if (row.finance_book_id === finance_book_id) {
-			accumulated_depreciation  += flt(row.depreciation_amount);
-			frappe.model.set_value(row.doctype, row.name, "accumulated_depreciation_amount", accumulated_depreciation);
-		};
+		accumulated_depreciation  += flt(row.depreciation_amount);
+		frappe.model.set_value(row.doctype, row.name,
+			"accumulated_depreciation_amount", accumulated_depreciation);
 	})
 };