Merge branch 'version-13' of https://github.com/frappe/erpnext into enterprise-hotfix

.flake8

@@ -31,7 +31,6 @@ ignore =
     E124, # closing bracket, irritating while writing QB code
     E131, # continuation line unaligned for hanging indent
     E123, # closing bracket does not match indentation of opening bracket's line
-    E101, # ensured by use of black
 
 max-line-length = 200
 exclude=.github/helper/semgrep_rules

.github/helper/.flake8_strict

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

.github/helper/install.sh

@@ -2,16 +2,9 @@
 
 set -e
 
-# Check for merge conflicts before proceeding
-python -m compileall -f "${GITHUB_WORKSPACE}"
-if grep -lr --exclude-dir=node_modules "^<<<<<<< " "${GITHUB_WORKSPACE}"
-    then echo "Found merge conflicts"
-    exit 1
-fi
-
 cd ~ || exit
 
-sudo apt update && sudo apt install redis-server libcups2-dev
+sudo apt-get install redis-server libcups2-dev
 
 pip install frappe-bench
 

.github/workflows/release.yml

@@ -1,31 +0,0 @@
-name: Generate Semantic Release
-on:
-  push:
-    branches:
-      - version-13
-jobs:
-  release:
-    name: Release
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout Entire Repository
-        uses: actions/checkout@v2
-        with:
-          fetch-depth: 0
-          persist-credentials: false
-      - name: Setup Node.js v14
-        uses: actions/setup-node@v2
-        with:
-          node-version: 14
-      - name: Setup dependencies
-        run: |
-          npm install @semantic-release/git @semantic-release/exec --no-save
-      - name: Create Release
-        env:
-          GH_TOKEN: ${{ secrets.RELEASE_TOKEN }}
-          GITHUB_TOKEN: ${{ secrets.RELEASE_TOKEN }}
-          GIT_AUTHOR_NAME: "Frappe PR Bot"
-          GIT_AUTHOR_EMAIL: "developers@frappe.io"
-          GIT_COMMITTER_NAME: "Frappe PR Bot"
-          GIT_COMMITTER_EMAIL: "developers@frappe.io"
-        run: npx semantic-release

.github/workflows/server-tests.yml

@@ -25,7 +25,7 @@ jobs:
       fail-fast: false
 
       matrix:
-        container: [1, 2]
+        container: [1, 2, 3]
 
     name: Python Unit Tests
 
@@ -93,7 +93,7 @@ jobs:
         run: bash ${GITHUB_WORKSPACE}/.github/helper/install.sh
 
       - name: Run Tests
-        run: 'cd ~/frappe-bench/ && bench --site test_site run-parallel-tests --app erpnext --total-builds 2 --build-number ${{ matrix.container }}'
+        run: cd ~/frappe-bench/ && bench --site test_site run-parallel-tests --app erpnext --use-orchestrator
         env:
           TYPE: server
           CI_BUILD_ID: ${{ github.run_id }}

.github/workflows/ui-tests.yml

@@ -0,0 +1,117 @@
+name: UI
+
+on:
+  pull_request:
+    paths-ignore:
+      - '**.md'
+  workflow_dispatch:
+
+concurrency:
+  group: ui-v13-${{ github.event.number }}
+  cancel-in-progress: true
+
+jobs:
+  test:
+    runs-on: ubuntu-18.04
+    timeout-minutes: 60
+
+    strategy:
+      fail-fast: false
+
+    name: UI Tests (Cypress)
+
+    services:
+      mysql:
+        image: mariadb:10.3
+        env:
+          MYSQL_ALLOW_EMPTY_PASSWORD: YES
+        ports:
+          - 3306:3306
+        options: --health-cmd="mysqladmin ping" --health-interval=5s --health-timeout=2s --health-retries=3
+
+    steps:
+      - name: Clone
+        uses: actions/checkout@v2
+
+      - name: Setup Python
+        uses: actions/setup-python@v2
+        with:
+          python-version: 3.7
+
+      - uses: actions/setup-node@v2
+        with:
+          node-version: 14
+          check-latest: true
+
+      - name: Add to Hosts
+        run: |
+          echo "127.0.0.1 test_site" | sudo tee -a /etc/hosts
+
+      - name: Cache pip
+        uses: actions/cache@v2
+        with:
+          path: ~/.cache/pip
+          key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
+          restore-keys: |
+            ${{ runner.os }}-pip-
+            ${{ runner.os }}-
+
+      - name: Cache node modules
+        uses: actions/cache@v2
+        env:
+          cache-name: cache-node-modules
+        with:
+          path: ~/.npm
+          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
+          restore-keys: |
+            ${{ runner.os }}-build-${{ env.cache-name }}-
+            ${{ runner.os }}-build-
+            ${{ runner.os }}-
+
+      - name: Get yarn cache directory path
+        id: yarn-cache-dir-path
+        run: echo "::set-output name=dir::$(yarn cache dir)"
+
+      - uses: actions/cache@v2
+        id: yarn-cache
+        with:
+          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
+          key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-yarn-
+
+      - name: Cache cypress binary
+        uses: actions/cache@v2
+        with:
+          path: ~/.cache
+          key: ${{ runner.os }}-cypress-
+          restore-keys: |
+            ${{ runner.os }}-cypress-
+            ${{ runner.os }}-
+
+      - name: Install
+        run: bash ${GITHUB_WORKSPACE}/.github/helper/install.sh
+        env:
+          DB: mariadb
+          TYPE: ui
+
+      - name: Site Setup
+        run: cd ~/frappe-bench/ && bench --site test_site execute erpnext.setup.utils.before_tests
+
+      - name: cypress pre-requisites
+        run: cd ~/frappe-bench/apps/frappe && yarn add cypress-file-upload@^5 @testing-library/cypress@^8 --no-lockfile
+
+
+      - name: Build Assets
+        run: cd ~/frappe-bench/ && bench build
+        env:
+          CI: Yes
+
+      - name: UI Tests
+        run: cd ~/frappe-bench/ && bench --site test_site run-ui-tests erpnext --headless
+        env:
+          CYPRESS_RECORD_KEY: 60a8e3bf-08f5-45b1-9269-2b207d7d30cd
+
+      - name: Show bench console if tests failed
+        if: ${{ failure() }}
+        run: cat ~/frappe-bench/bench_run_logs.txt

.releaserc

@@ -1,24 +0,0 @@
-{
-	"branches": ["version-13"],
-	"plugins": [
-		"@semantic-release/commit-analyzer", {
-			"preset": "angular",
-			"releaseRules": [
-				{"breaking": true, "release": false}
-			]
-		},
-		"@semantic-release/release-notes-generator",
-		[
-			"@semantic-release/exec", {
-				"prepareCmd": 'sed -ir -E "s/\"[0-9]+\.[0-9]+\.[0-9]+\"/\"${nextRelease.version}\"/" erpnext/__init__.py'
-			}
-		],
-		[
-			"@semantic-release/git", {
-				"assets": ["erpnext/__init__.py"],
-				"message": "chore(release): Bumped to Version ${nextRelease.version}\n\n${nextRelease.notes}"
-			}
-		],
-		"@semantic-release/github"
-	]
-}

CODEOWNERS

@@ -3,31 +3,33 @@
 # These owners will be the default owners for everything in
 # the repo. Unless a later match takes precedence,
 
-erpnext/accounts/               @nextchamp-saqib @deepeshgarg007 @ruthra-kumar
-erpnext/assets/                 @nextchamp-saqib @deepeshgarg007 @ruthra-kumar
+erpnext/accounts/               @nextchamp-saqib @deepeshgarg007
+erpnext/assets/                 @nextchamp-saqib @deepeshgarg007
 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/regional                @nextchamp-saqib @deepeshgarg007
+erpnext/selling                 @nextchamp-saqib @deepeshgarg007
 erpnext/support/                @nextchamp-saqib @deepeshgarg007
 pos*                            @nextchamp-saqib
 
-erpnext/buying/                 @rohitwaghchaure @s-aga-r
-erpnext/maintenance/            @rohitwaghchaure @s-aga-r
-erpnext/manufacturing/          @rohitwaghchaure @s-aga-r
-erpnext/quality_management/     @rohitwaghchaure @s-aga-r
-erpnext/stock/                  @rohitwaghchaure @s-aga-r
+erpnext/buying/                 @marination @rohitwaghchaure @ankush
+erpnext/e_commerce/             @marination
+erpnext/maintenance/            @marination @rohitwaghchaure
+erpnext/manufacturing/          @marination @rohitwaghchaure @ankush
+erpnext/portal/                 @marination
+erpnext/quality_management/     @marination @rohitwaghchaure
+erpnext/shopping_cart/          @marination
+erpnext/stock/                  @marination @rohitwaghchaure @ankush
 
-
-erpnext/healthcare/             @chillaranand
-erpnext/hr/                     @ruchamahabal
+erpnext/crm/                    @ruchamahabal @pateljannat
+erpnext/education/              @ruchamahabal @pateljannat
+erpnext/healthcare/             @ruchamahabal @pateljannat @chillaranand
+erpnext/hr/                     @ruchamahabal @pateljannat
 erpnext/non_profit/             @ruchamahabal
-erpnext/payroll                 @ruchamahabal
-erpnext/projects/               @ruchamahabal
+erpnext/payroll                 @ruchamahabal @pateljannat
+erpnext/projects/               @ruchamahabal @pateljannat
 
 erpnext/controllers             @deepeshgarg007 @nextchamp-saqib @rohitwaghchaure @marination
-erpnext/patches/                @deepeshgarg007 @nextchamp-saqib @rohitwaghchaure
-erpnext/public/                 @nextchamp-saqib @marination
 
-.github/                        @ankush
-requirements.txt                @gavindsouza @ankush
+.github/                        @surajshetty3416 @ankush
+requirements.txt                @gavindsouza

README.md

@@ -65,8 +65,6 @@ GNU/General Public License (see [license.txt](license.txt))
 
 The ERPNext code is licensed as GNU General Public License (v3) and the Documentation is licensed as Creative Commons (CC-BY-SA-3.0) and the copyright is owned by Frappe Technologies Pvt Ltd (Frappe) and Contributors.
 
-By contributing to ERPNext, you agree that your contributions will be licensed under its GNU General Public License (v3).
-
 ---
 
 ## Contributing

erpnext/__init__.py

@@ -4,8 +4,7 @@ import frappe
 
 from erpnext.hooks import regional_overrides
 
-__version__ = "13.36.1"
-
+__version__ = "13.26.0"
 
 def get_default_company(user=None):
 	"""Get default company for user"""
@@ -149,7 +148,6 @@ def allow_regional(fn):
 	return caller
 
 
-@frappe.whitelist()
 def get_last_membership(member):
 	"""Returns last membership if exists"""
 	last_membership = frappe.get_all(

erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py

@@ -99,7 +99,7 @@ def make_dimension_in_accounting_doctypes(doc, doclist=None):
 			if doctype == "Budget":
 				add_dimension_to_budget_doctype(df.copy(), doc)
 			else:
-				create_custom_field(doctype, df, ignore_validate=True)
+				create_custom_field(doctype, df)
 
 		count += 1
 
@@ -115,7 +115,7 @@ def add_dimension_to_budget_doctype(df, doc):
 		}
 	)
 
-	create_custom_field("Budget", df, ignore_validate=True)
+	create_custom_field("Budget", df)
 
 	property_setter = frappe.db.exists("Property Setter", "Budget-budget_against-options")
 
@@ -205,16 +205,10 @@ def get_doctypes_with_dimensions():
 	return frappe.get_hooks("accounting_dimension_doctypes")
 
 
-def get_accounting_dimensions(as_list=True, filters=None):
-
-	if not filters:
-		filters = {"disabled": 0}
-
+def get_accounting_dimensions(as_list=True):
 	if frappe.flags.accounting_dimensions is None:
 		frappe.flags.accounting_dimensions = frappe.get_all(
-			"Accounting Dimension",
-			fields=["label", "fieldname", "disabled", "document_type"],
-			filters=filters,
+			"Accounting Dimension", fields=["label", "fieldname", "disabled", "document_type"]
 		)
 
 	if as_list:
@@ -234,19 +228,17 @@ def get_checks_for_pl_and_bs_accounts():
 	return dimensions
 
 
-def get_dimension_with_children(doctype, dimensions):
+def get_dimension_with_children(doctype, dimension):
 
-	if isinstance(dimensions, str):
-		dimensions = [dimensions]
+	if isinstance(dimension, list):
+		dimension = dimension[0]
 
 	all_dimensions = []
-
-	for dimension in dimensions:
-		lft, rgt = frappe.db.get_value(doctype, dimension, ["lft", "rgt"])
-		children = frappe.get_all(
-			doctype, filters={"lft": [">=", lft], "rgt": ["<=", rgt]}, order_by="lft"
-		)
-		all_dimensions += [c.name for c in children]
+	lft, rgt = frappe.db.get_value(doctype, dimension, ["lft", "rgt"])
+	children = frappe.get_all(
+		doctype, filters={"lft": [">=", lft], "rgt": ["<=", rgt]}, order_by="lft"
+	)
+	all_dimensions += [c.name for c in children]
 
 	return all_dimensions
 

erpnext/accounts/doctype/accounts_settings/accounts_settings.json

@@ -19,7 +19,6 @@
   "book_asset_depreciation_entry_automatically",
   "unlink_advance_payment_on_cancelation_of_order",
   "enable_common_party_accounting",
-  "allow_multi_currency_invoices_against_single_party_account",
   "post_change_gl_entries",
   "enable_discount_accounting",
   "tax_settings_section",
@@ -277,21 +276,14 @@
    "fieldname": "enable_common_party_accounting",
    "fieldtype": "Check",
    "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"
-   }
+  }
  ],
  "icon": "icon-cog",
  "idx": 1,
  "index_web_pages_for_search": 1,
  "issingle": 1,
  "links": [],
- "modified": "2022-07-11 13:37:50.605141",
+ "modified": "2021-10-11 17:42:36.427699",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Accounts Settings",

erpnext/accounts/doctype/bank_clearance/bank_clearance.py

@@ -5,10 +5,7 @@
 import frappe
 from frappe import _, msgprint
 from frappe.model.document import Document
-from frappe.query_builder.custom import ConstantColumn
-from frappe.utils import flt, fmt_money, getdate
-
-import erpnext
+from frappe.utils import flt, fmt_money, getdate, nowdate
 
 form_grid_templates = {"journal_entries": "templates/form_grid/bank_reconciliation_grid.html"}
 
@@ -79,53 +76,6 @@ class BankClearance(Document):
 			as_dict=1,
 		)
 
-		loan_disbursement = frappe.qb.DocType("Loan Disbursement")
-
-		loan_disbursements = (
-			frappe.qb.from_(loan_disbursement)
-			.select(
-				ConstantColumn("Loan Disbursement").as_("payment_document"),
-				loan_disbursement.name.as_("payment_entry"),
-				loan_disbursement.disbursed_amount.as_("credit"),
-				ConstantColumn(0).as_("debit"),
-				loan_disbursement.reference_number.as_("cheque_number"),
-				loan_disbursement.reference_date.as_("cheque_date"),
-				loan_disbursement.disbursement_date.as_("posting_date"),
-				loan_disbursement.applicant.as_("against_account"),
-			)
-			.where(loan_disbursement.docstatus == 1)
-			.where(loan_disbursement.disbursement_date >= self.from_date)
-			.where(loan_disbursement.disbursement_date <= self.to_date)
-			.where(loan_disbursement.clearance_date.isnull())
-			.where(loan_disbursement.disbursement_account.isin([self.bank_account, self.account]))
-			.orderby(loan_disbursement.disbursement_date)
-			.orderby(loan_disbursement.name, frappe.qb.desc)
-		).run(as_dict=1)
-
-		loan_repayment = frappe.qb.DocType("Loan Repayment")
-
-		loan_repayments = (
-			frappe.qb.from_(loan_repayment)
-			.select(
-				ConstantColumn("Loan Repayment").as_("payment_document"),
-				loan_repayment.name.as_("payment_entry"),
-				loan_repayment.amount_paid.as_("debit"),
-				ConstantColumn(0).as_("credit"),
-				loan_repayment.reference_number.as_("cheque_number"),
-				loan_repayment.reference_date.as_("cheque_date"),
-				loan_repayment.applicant.as_("against_account"),
-				loan_repayment.posting_date,
-			)
-			.where(loan_repayment.docstatus == 1)
-			.where(loan_repayment.clearance_date.isnull())
-			.where(loan_repayment.repay_from_salary == 0)
-			.where(loan_repayment.posting_date >= self.from_date)
-			.where(loan_repayment.posting_date <= self.to_date)
-			.where(loan_repayment.payment_account.isin([self.bank_account, self.account]))
-			.orderby(loan_repayment.posting_date)
-			.orderby(loan_repayment.name, frappe.qb.desc)
-		).run(as_dict=1)
-
 		pos_sales_invoices, pos_purchase_invoices = [], []
 		if self.include_pos_transactions:
 			pos_sales_invoices = frappe.db.sql(
@@ -164,29 +114,20 @@ class BankClearance(Document):
 
 		entries = sorted(
 			list(payment_entries)
-			+ list(journal_entries)
-			+ list(pos_sales_invoices)
-			+ list(pos_purchase_invoices)
-			+ list(loan_disbursements)
-			+ list(loan_repayments),
-			key=lambda k: getdate(k["posting_date"]),
+			+ list(journal_entries + list(pos_sales_invoices) + list(pos_purchase_invoices)),
+			key=lambda k: k["posting_date"] or getdate(nowdate()),
 		)
 
 		self.set("payment_entries", [])
 		self.total_amount = 0.0
-		default_currency = erpnext.get_default_currency()
 
 		for d in entries:
 			row = self.append("payment_entries", {})
 
 			amount = flt(d.get("debit", 0)) - flt(d.get("credit", 0))
 
-			if not d.get("account_currency"):
-				d.account_currency = default_currency
-
 			formatted_amount = fmt_money(abs(amount), 2, d.account_currency)
 			d.amount = formatted_amount + " " + (_("Dr") if amount > 0 else _("Cr"))
-			d.posting_date = getdate(d.posting_date)
 
 			d.pop("credit")
 			d.pop("debit")

erpnext/accounts/doctype/bank_clearance/test_bank_clearance.py

@@ -1,96 +1,9 @@
 # Copyright (c) 2020, Frappe Technologies Pvt. Ltd. and Contributors
 # See license.txt
 
+# import frappe
 import unittest
 
-import frappe
-from frappe.utils import add_months, getdate
-
-from erpnext.accounts.doctype.payment_entry.test_payment_entry import get_payment_entry
-from erpnext.accounts.doctype.purchase_invoice.test_purchase_invoice import make_purchase_invoice
-from erpnext.loan_management.doctype.loan.test_loan import (
-	create_loan,
-	create_loan_accounts,
-	create_loan_type,
-	create_repayment_entry,
-	make_loan_disbursement_entry,
-)
-
 
 class TestBankClearance(unittest.TestCase):
-	@classmethod
-	def setUpClass(cls):
-		make_bank_account()
-		create_loan_accounts()
-		create_loan_masters()
-		add_transactions()
-
-	# Basic test case to test if bank clearance tool doesn't break
-	# Detailed test can be added later
-	def test_bank_clearance(self):
-		bank_clearance = frappe.get_doc("Bank Clearance")
-		bank_clearance.account = "_Test Bank Clearance - _TC"
-		bank_clearance.from_date = add_months(getdate(), -1)
-		bank_clearance.to_date = getdate()
-		bank_clearance.get_payment_entries()
-		self.assertEqual(len(bank_clearance.payment_entries), 3)
-
-
-def make_bank_account():
-	if not frappe.db.get_value("Account", "_Test Bank Clearance - _TC"):
-		frappe.get_doc(
-			{
-				"doctype": "Account",
-				"account_type": "Bank",
-				"account_name": "_Test Bank Clearance",
-				"company": "_Test Company",
-				"parent_account": "Bank Accounts - _TC",
-			}
-		).insert()
-
-
-def create_loan_masters():
-	create_loan_type(
-		"Clearance Loan",
-		2000000,
-		13.5,
-		25,
-		0,
-		5,
-		"Cash",
-		"_Test Bank Clearance - _TC",
-		"_Test Bank Clearance - _TC",
-		"Loan Account - _TC",
-		"Interest Income Account - _TC",
-		"Penalty Income Account - _TC",
-	)
-
-
-def add_transactions():
-	make_payment_entry()
-	make_loan()
-
-
-def make_loan():
-	loan = create_loan(
-		"_Test Customer",
-		"Clearance Loan",
-		280000,
-		"Repay Over Number of Periods",
-		20,
-		applicant_type="Customer",
-	)
-	loan.submit()
-	make_loan_disbursement_entry(loan.name, loan.loan_amount, disbursement_date=getdate())
-	repayment_entry = create_repayment_entry(loan.name, "_Test Customer", getdate(), loan.loan_amount)
-	repayment_entry.save()
-	repayment_entry.submit()
-
-
-def make_payment_entry():
-	pi = make_purchase_invoice(supplier="_Test Supplier", qty=1, rate=690)
-	pe = get_payment_entry("Purchase Invoice", pi.name, bank_account="_Test Bank Clearance - _TC")
-	pe.reference_no = "Conrad Oct 18"
-	pe.reference_date = "2018-10-24"
-	pe.insert()
-	pe.submit()
+	pass

erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py

@@ -467,7 +467,6 @@ def get_lr_matching_query(bank_account, amount_condition, filters):
 			loan_repayment.posting_date,
 		)
 		.where(loan_repayment.docstatus == 1)
-		.where(loan_repayment.repay_from_salary == 0)
 		.where(loan_repayment.clearance_date.isnull())
 		.where(loan_repayment.payment_account == bank_account)
 	)

erpnext/accounts/doctype/gl_entry/gl_entry.py

@@ -43,7 +43,7 @@ class GLEntry(Document):
 		self.validate_and_set_fiscal_year()
 		self.pl_must_have_cost_center()
 
-		if not self.flags.from_repost and self.voucher_type != "Period Closing Voucher":
+		if not self.flags.from_repost:
 			self.check_mandatory()
 			self.validate_cost_center()
 			self.check_pl_account()
@@ -52,7 +52,7 @@ class GLEntry(Document):
 
 	def on_update(self):
 		adv_adj = self.flags.adv_adj
-		if not self.flags.from_repost and self.voucher_type != "Period Closing Voucher":
+		if not self.flags.from_repost:
 			self.validate_account_details(adv_adj)
 			self.validate_dimensions_for_pl_and_bs()
 			self.validate_allowed_dimensions()
@@ -358,7 +358,7 @@ def update_outstanding_amt(
 	if against_voucher_type in ["Sales Invoice", "Purchase Invoice", "Fees"]:
 		ref_doc = frappe.get_doc(against_voucher_type, against_voucher)
 
-		# Didn't use db_set for optimization purpose
+		# Didn't use db_set for optimisation 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

@@ -149,6 +149,22 @@ frappe.ui.form.on("Journal Entry", {
 					}
 				});
 			}
+			else if(frm.doc.voucher_type=="Opening Entry") {
+				return frappe.call({
+					type:"GET",
+					method: "erpnext.accounts.doctype.journal_entry.journal_entry.get_opening_accounts",
+					args: {
+						"company": frm.doc.company
+					},
+					callback: function(r) {
+						frappe.model.clear_table(frm.doc, "accounts");
+						if(r.message) {
+							update_jv_details(frm.doc, r.message);
+						}
+						cur_frm.set_value("is_opening", "Yes");
+					}
+				});
+			}
 		}
 	},
 
@@ -173,8 +189,8 @@ frappe.ui.form.on("Journal Entry", {
 var update_jv_details = function(doc, r) {
 	$.each(r, function(i, d) {
 		var row = frappe.model.add_child(doc, "Journal Entry Account", "accounts");
-		frappe.model.set_value(row.doctype, row.name, "account", d.account)
-		frappe.model.set_value(row.doctype, row.name, "balance", d.balance)
+		row.account = d.account;
+		row.balance = d.balance;
 	});
 	refresh_field("accounts");
 }

erpnext/accounts/doctype/journal_entry/journal_entry.json

@@ -137,8 +137,7 @@
    "fieldname": "finance_book",
    "fieldtype": "Link",
    "label": "Finance Book",
-   "options": "Finance Book",
-   "read_only": 1
+   "options": "Finance Book"
   },
   {
    "fieldname": "2_add_edit_gl_entries",
@@ -539,7 +538,7 @@
  "idx": 176,
  "is_submittable": 1,
  "links": [],
- "modified": "2022-06-23 22:01:32.348337",
+ "modified": "2022-04-06 17:18:46.865259",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Journal Entry",

erpnext/accounts/doctype/journal_entry/journal_entry.py

@@ -19,16 +19,14 @@ from erpnext.accounts.doctype.tax_withholding_category.tax_withholding_category
 )
 from erpnext.accounts.party import get_party_account
 from erpnext.accounts.utils import (
+	check_if_stock_and_account_balance_synced,
 	get_account_currency,
 	get_balance_on,
 	get_stock_accounts,
 	get_stock_and_account_balance,
 )
 from erpnext.controllers.accounts_controller import AccountsController
-from erpnext.hr.doctype.expense_claim.expense_claim import (
-	get_outstanding_amount_for_claim,
-	update_reimbursed_amount,
-)
+from erpnext.hr.doctype.expense_claim.expense_claim import update_reimbursed_amount
 
 
 class StockAccountInvalidTransaction(frappe.ValidationError):
@@ -90,6 +88,9 @@ class JournalEntry(AccountsController):
 		self.update_expense_claim()
 		self.update_inter_company_jv()
 		self.update_invoice_discounting()
+		check_if_stock_and_account_balance_synced(
+			self.posting_date, self.company, self.doctype, self.name
+		)
 
 	def on_cancel(self):
 		from erpnext.accounts.utils import unlink_ref_doc_from_payment_entries
@@ -194,9 +195,7 @@ class JournalEntry(AccountsController):
 			}
 		)
 
-		tax_withholding_details, advance_taxes, voucher_wise_amount = get_party_tax_withholding_details(
-			inv, self.tax_withholding_category
-		)
+		tax_withholding_details = get_party_tax_withholding_details(inv, self.tax_withholding_category)
 
 		if not tax_withholding_details:
 			return
@@ -940,12 +939,15 @@ class JournalEntry(AccountsController):
 	def validate_expense_claim(self):
 		for d in self.accounts:
 			if d.reference_type == "Expense Claim":
-				outstanding_amt = get_outstanding_amount_for_claim(d.reference_name)
-				if d.debit > outstanding_amt:
+				sanctioned_amount, reimbursed_amount = frappe.db.get_value(
+					"Expense Claim", d.reference_name, ("total_sanctioned_amount", "total_amount_reimbursed")
+				)
+				pending_amount = flt(sanctioned_amount) - flt(reimbursed_amount)
+				if d.debit > pending_amount:
 					frappe.throw(
 						_(
-							"Row No {0}: Amount cannot be greater than the Outstanding Amount against Expense Claim {1}. Outstanding Amount is {2}"
-						).format(d.idx, d.reference_name, outstanding_amt)
+							"Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2}"
+						).format(d.idx, d.reference_name, pending_amount)
 					)
 
 	def validate_credit_debit_note(self):
@@ -1194,6 +1196,24 @@ def get_payment_entry(ref_doc, args):
 	return je if args.get("journal_entry") else je.as_dict()
 
 
+@frappe.whitelist()
+def get_opening_accounts(company):
+	"""get all balance sheet accounts for opening entry"""
+	accounts = frappe.db.sql_list(
+		"""select
+			name from tabAccount
+		where
+			is_group=0 and report_type='Balance Sheet' and company={0} and
+			name not in (select distinct account from tabWarehouse where
+			account is not null and account != '')
+		order by name asc""".format(
+			frappe.db.escape(company)
+		)
+	)
+
+	return [{"account": a, "balance": get_balance_on(a)} for a in accounts]
+
+
 @frappe.whitelist()
 @frappe.validate_and_sanitize_search_inputs
 def get_against_jv(doctype, txt, searchfield, start, page_len, filters):

erpnext/accounts/doctype/journal_entry_template/journal_entry_template.js

@@ -2,7 +2,7 @@
 // For license information, please see license.txt
 
 frappe.ui.form.on("Journal Entry Template", {
-	refresh: function(frm) {
+	setup: function(frm) {
 		frappe.model.set_default_values(frm.doc);
 
 		frm.set_query("account" ,"accounts", function(){

erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js

@@ -49,15 +49,7 @@ frappe.ui.form.on('Opening Invoice Creation Tool', {
 				doc: frm.doc,
 				btn: $(btn_primary),
 				method: "make_invoices",
-				freeze: 1,
-				freeze_message: __("Creating {0} Invoice", [frm.doc.invoice_type]),
-				callback: function(r) {
-					if (r.message.length == 1) {
-						frappe.msgprint(__("{0} Invoice created successfully.", [frm.doc.invoice_type]));
-					} else if (r.message.length < 50) {
-						frappe.msgprint(__("{0} Invoices created successfully.", [frm.doc.invoice_type]));
-					}
-				}
+				freeze_message: __("Creating {0} Invoice", [frm.doc.invoice_type])
 			});
 		});
 

erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py

@@ -114,13 +114,10 @@ class OpeningInvoiceCreationTool(Document):
 				)
 				or {}
 			)
-
-			default_currency = frappe.db.get_value(row.party_type, row.party, "default_currency")
-
 			if company_details:
 				invoice.update(
 					{
-						"currency": default_currency or company_details.get("default_currency"),
+						"currency": company_details.get("default_currency"),
 						"letter_head": company_details.get("default_letter_head"),
 					}
 				)

erpnext/accounts/doctype/payment_entry/payment_entry.js

@@ -1111,7 +1111,7 @@ frappe.ui.form.on('Payment Entry', {
 
 			$.each(tax_fields, function(i, fieldname) { tax[fieldname] = 0.0; });
 
-			frm.doc.paid_amount_after_tax = frm.doc.base_paid_amount;
+			frm.doc.paid_amount_after_tax = frm.doc.paid_amount;
 		});
 	},
 
@@ -1202,7 +1202,7 @@ frappe.ui.form.on('Payment Entry', {
 			}
 
 			cumulated_tax_fraction += tax.tax_fraction_for_current_item;
-			frm.doc.paid_amount_after_tax = flt(frm.doc.base_paid_amount/(1+cumulated_tax_fraction))
+			frm.doc.paid_amount_after_tax = flt(frm.doc.paid_amount/(1+cumulated_tax_fraction))
 		});
 	},
 
@@ -1234,7 +1234,6 @@ frappe.ui.form.on('Payment Entry', {
 		frm.doc.total_taxes_and_charges = 0.0;
 		frm.doc.base_total_taxes_and_charges = 0.0;
 
-		let company_currency = frappe.get_doc(":Company", frm.doc.company).default_currency;
 		let actual_tax_dict = {};
 
 		// maintain actual tax rate based on idx
@@ -1255,8 +1254,8 @@ frappe.ui.form.on('Payment Entry', {
 				}
 			}
 
-			// tax accounts are only in company currency
-			tax.base_tax_amount = current_tax_amount;
+			tax.tax_amount = current_tax_amount;
+			tax.base_tax_amount = tax.tax_amount * frm.doc.source_exchange_rate;
 			current_tax_amount *= (tax.add_deduct_tax == "Deduct") ? -1.0 : 1.0;
 
 			if(i==0) {
@@ -1265,29 +1264,9 @@ frappe.ui.form.on('Payment Entry', {
 				tax.total = flt(frm.doc["taxes"][i-1].total + current_tax_amount, precision("total", tax));
 			}
 
-			// tac accounts are only in company currency
-			tax.base_total = tax.total
-
-			// calculate total taxes and base total taxes
-			if(frm.doc.payment_type == "Pay") {
-				// tax accounts only have company currency
-				if(tax.currency != frm.doc.paid_to_account_currency) {
-					//total_taxes_and_charges has the target currency. so using target conversion rate
-					frm.doc.total_taxes_and_charges += flt(current_tax_amount / frm.doc.target_exchange_rate);
-
-				} else {
-					frm.doc.total_taxes_and_charges += current_tax_amount;
-				}
-			} else if(frm.doc.payment_type == "Receive") {
-				if(tax.currency != frm.doc.paid_from_account_currency) {
-					//total_taxes_and_charges has the target currency. so using source conversion rate
-					frm.doc.total_taxes_and_charges += flt(current_tax_amount / frm.doc.source_exchange_rate);
-				} else {
-					frm.doc.total_taxes_and_charges += current_tax_amount;
-				}
-			}
-
-			frm.doc.base_total_taxes_and_charges += tax.base_tax_amount;
+			tax.base_total = tax.total * frm.doc.source_exchange_rate;
+			frm.doc.total_taxes_and_charges += current_tax_amount;
+			frm.doc.base_total_taxes_and_charges += current_tax_amount * frm.doc.source_exchange_rate;
 
 			frm.refresh_field('taxes');
 			frm.refresh_field('total_taxes_and_charges');

erpnext/accounts/doctype/payment_entry/payment_entry.py

@@ -30,10 +30,7 @@ from erpnext.controllers.accounts_controller import (
 	get_supplier_block_status,
 	validate_taxes_and_charges,
 )
-from erpnext.hr.doctype.expense_claim.expense_claim import (
-	get_outstanding_amount_for_claim,
-	update_reimbursed_amount,
-)
+from erpnext.hr.doctype.expense_claim.expense_claim import update_reimbursed_amount
 from erpnext.setup.utils import get_exchange_rate
 
 
@@ -305,7 +302,7 @@ class PaymentEntry(AccountsController):
 
 	def validate_reference_documents(self):
 		if self.party_type == "Student":
-			valid_reference_doctypes = ("Fees", "Journal Entry")
+			valid_reference_doctypes = "Fees"
 		elif self.party_type == "Customer":
 			valid_reference_doctypes = ("Sales Order", "Sales Invoice", "Journal Entry", "Dunning")
 		elif self.party_type == "Supplier":
@@ -360,12 +357,6 @@ class PaymentEntry(AccountsController):
 								)
 							)
 
-						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 Invoice"),
-							)
-
 					if ref_doc.docstatus != 1:
 						frappe.throw(_("{0} {1} must be submitted").format(d.reference_doctype, d.reference_name))
 
@@ -944,13 +935,6 @@ class PaymentEntry(AccountsController):
 			)
 
 			if not d.included_in_paid_amount:
-				if get_account_currency(payment_account) != self.company_currency:
-					if self.payment_type == "Receive":
-						exchange_rate = self.target_exchange_rate
-					elif self.payment_type in ["Pay", "Internal Transfer"]:
-						exchange_rate = self.source_exchange_rate
-					base_tax_amount = flt((tax_amount / exchange_rate), self.precision("paid_amount"))
-
 				gl_entries.append(
 					self.get_gl_dict(
 						{
@@ -1066,7 +1050,7 @@ class PaymentEntry(AccountsController):
 			for fieldname in tax_fields:
 				tax.set(fieldname, 0.0)
 
-		self.paid_amount_after_tax = self.base_paid_amount
+		self.paid_amount_after_tax = self.paid_amount
 
 	def determine_exclusive_rate(self):
 		if not any((cint(tax.included_in_paid_amount) for tax in self.get("taxes"))):
@@ -1085,7 +1069,7 @@ class PaymentEntry(AccountsController):
 
 			cumulated_tax_fraction += tax.tax_fraction_for_current_item
 
-		self.paid_amount_after_tax = flt(self.base_paid_amount / (1 + cumulated_tax_fraction))
+		self.paid_amount_after_tax = flt(self.paid_amount / (1 + cumulated_tax_fraction))
 
 	def calculate_taxes(self):
 		self.total_taxes_and_charges = 0.0
@@ -1108,7 +1092,7 @@ class PaymentEntry(AccountsController):
 					current_tax_amount += actual_tax_dict[tax.idx]
 
 			tax.tax_amount = current_tax_amount
-			tax.base_tax_amount = current_tax_amount
+			tax.base_tax_amount = tax.tax_amount * self.source_exchange_rate
 
 			if tax.add_deduct_tax == "Deduct":
 				current_tax_amount *= -1.0
@@ -1122,20 +1106,14 @@ class PaymentEntry(AccountsController):
 					self.get("taxes")[i - 1].total + current_tax_amount, self.precision("total", tax)
 				)
 
-			tax.base_total = tax.total
+			tax.base_total = tax.total * self.source_exchange_rate
 
 			if self.payment_type == "Pay":
-				if tax.currency != self.paid_to_account_currency:
-					self.total_taxes_and_charges += flt(current_tax_amount / self.target_exchange_rate)
-				else:
-					self.total_taxes_and_charges += current_tax_amount
-			elif self.payment_type == "Receive":
-				if tax.currency != self.paid_from_account_currency:
-					self.total_taxes_and_charges += flt(current_tax_amount / self.source_exchange_rate)
-				else:
-					self.total_taxes_and_charges += current_tax_amount
-
-			self.base_total_taxes_and_charges += tax.base_tax_amount
+				self.base_total_taxes_and_charges += flt(current_tax_amount / self.source_exchange_rate)
+				self.total_taxes_and_charges += flt(current_tax_amount / self.target_exchange_rate)
+			else:
+				self.base_total_taxes_and_charges += flt(current_tax_amount / self.target_exchange_rate)
+				self.total_taxes_and_charges += flt(current_tax_amount / self.source_exchange_rate)
 
 		if self.get("taxes"):
 			self.paid_amount_after_tax = self.get("taxes")[-1].base_total
@@ -1665,7 +1643,12 @@ def get_reference_details(reference_doctype, reference_name, party_account_curre
 			outstanding_amount = ref_doc.get("outstanding_amount")
 			bill_no = ref_doc.get("bill_no")
 		elif reference_doctype == "Expense Claim":
-			outstanding_amount = get_outstanding_amount_for_claim(ref_doc)
+			outstanding_amount = (
+				flt(ref_doc.get("total_sanctioned_amount"))
+				+ flt(ref_doc.get("total_taxes_and_charges"))
+				- flt(ref_doc.get("total_amount_reimbursed"))
+				- flt(ref_doc.get("total_advance_amount"))
+			)
 		elif reference_doctype == "Employee Advance":
 			outstanding_amount = flt(ref_doc.advance_amount) - flt(ref_doc.paid_amount)
 			if party_account_currency != ref_doc.currency:

erpnext/accounts/doctype/payment_entry/test_payment_entry.py

@@ -4,7 +4,6 @@
 import unittest
 
 import frappe
-from frappe import qb
 from frappe.utils import flt, nowdate
 
 from erpnext.accounts.doctype.payment_entry.payment_entry import (
@@ -744,61 +743,6 @@ class TestPaymentEntry(unittest.TestCase):
 			flt(payment_entry.total_taxes_and_charges, 2), flt(10 / payment_entry.target_exchange_rate, 2)
 		)
 
-	def test_gl_of_multi_currency_payment_with_taxes(self):
-		payment_entry = create_payment_entry(
-			party="_Test Supplier USD", paid_to="_Test Payable USD - _TC", save=True
-		)
-		payment_entry.append(
-			"taxes",
-			{
-				"account_head": "_Test Account Service Tax - _TC",
-				"charge_type": "Actual",
-				"tax_amount": 100,
-				"add_deduct_tax": "Add",
-				"description": "Test",
-			},
-		)
-		payment_entry.target_exchange_rate = 80
-		payment_entry.received_amount = 12.5
-		payment_entry = payment_entry.submit()
-		gle = qb.DocType("GL Entry")
-		gl_entries = (
-			qb.from_(gle)
-			.select(
-				gle.account,
-				gle.debit,
-				gle.credit,
-				gle.debit_in_account_currency,
-				gle.credit_in_account_currency,
-			)
-			.orderby(gle.account)
-			.where(gle.voucher_no == payment_entry.name)
-			.run()
-		)
-
-		expected_gl_entries = (
-			("_Test Account Service Tax - _TC", 100.0, 0.0, 100.0, 0.0),
-			("_Test Bank - _TC", 0.0, 1100.0, 0.0, 1100.0),
-			("_Test Payable USD - _TC", 1000.0, 0.0, 12.5, 0),
-		)
-
-		self.assertEqual(gl_entries, expected_gl_entries)
-
-	def test_payment_entry_against_onhold_purchase_invoice(self):
-		pi = make_purchase_invoice()
-
-		pe = get_payment_entry("Purchase Invoice", pi.name, bank_account="_Test Bank USD - _TC")
-		pe.reference_no = "1"
-		pe.reference_date = "2016-01-01"
-
-		# block invoice after creating payment entry
-		# since `get_payment_entry` will not attach blocked invoice to payment
-		pi.block_invoice()
-		with self.assertRaises(frappe.ValidationError) as err:
-			pe.save()
-
-		self.assertTrue("is on hold" in str(err.exception).lower())
-
 
 def create_payment_entry(**args):
 	payment_entry = frappe.new_doc("Payment Entry")

erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js

@@ -1,4 +1,4 @@
-// Copyright (c) 2022, Frappe Technologies Pvt. Ltd. and Contributors
+// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
 // For license information, please see license.txt
 
 frappe.provide("erpnext.accounts");
@@ -38,15 +38,6 @@ erpnext.accounts.PaymentReconciliationController = frappe.ui.form.Controller.ext
 				]
 			};
 		});
-
-		this.frm.set_query("cost_center", () => {
-			return {
-				"filters": {
-					"company": this.frm.doc.company,
-					"is_group": 0
-				}
-			}
-		});
 	},
 
 	refresh: function() {

erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json

@@ -24,7 +24,6 @@
   "invoice_limit",
   "payment_limit",
   "bank_cash_account",
-  "cost_center",
   "sec_break1",
   "invoices",
   "column_break_15",
@@ -179,19 +178,13 @@
   {
    "fieldname": "column_break_11",
    "fieldtype": "Column Break"
-  },
-  {
-   "fieldname": "cost_center",
-   "fieldtype": "Link",
-   "label": "Cost Center",
-   "options": "Cost Center"
   }
  ],
  "hide_toolbar": 1,
  "icon": "icon-resize-horizontal",
  "issingle": 1,
  "links": [],
- "modified": "2022-04-29 15:37:10.246831",
+ "modified": "2021-10-04 20:27:11.114194",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Payment Reconciliation",
@@ -216,6 +209,5 @@
  ],
  "sort_field": "modified",
  "sort_order": "DESC",
- "states": [],
  "track_changes": 1
 }

erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py

@@ -8,11 +8,7 @@ from frappe.model.document import Document
 from frappe.utils import flt, getdate, nowdate, today
 
 import erpnext
-from erpnext.accounts.utils import (
-	get_outstanding_invoices,
-	reconcile_against_document,
-	update_reference_in_payment_entry,
-)
+from erpnext.accounts.utils import get_outstanding_invoices, reconcile_against_document
 from erpnext.controllers.accounts_controller import get_advance_payment_entries
 
 
@@ -194,23 +190,6 @@ class PaymentReconciliation(Document):
 			inv.currency = entry.get("currency")
 			inv.outstanding_amount = flt(entry.get("outstanding_amount"))
 
-	def get_difference_amount(self, allocated_entry):
-		if allocated_entry.get("reference_type") != "Payment Entry":
-			return
-
-		dr_or_cr = (
-			"credit_in_account_currency"
-			if erpnext.get_party_account_type(self.party_type) == "Receivable"
-			else "debit_in_account_currency"
-		)
-
-		row = self.get_payment_details(allocated_entry, dr_or_cr)
-
-		doc = frappe.get_doc(allocated_entry.reference_type, allocated_entry.reference_name)
-		update_reference_in_payment_entry(row, doc, do_not_save=True)
-
-		return doc.difference_amount
-
 	@frappe.whitelist()
 	def allocate_entries(self, args):
 		self.validate_entries()
@@ -226,16 +205,12 @@ class PaymentReconciliation(Document):
 					res = self.get_allocated_entry(pay, inv, pay["amount"])
 					inv["outstanding_amount"] = flt(inv.get("outstanding_amount")) - flt(pay.get("amount"))
 					pay["amount"] = 0
-
-				res.difference_amount = self.get_difference_amount(res)
-
 				if pay.get("amount") == 0:
 					entries.append(res)
 					break
 				elif inv.get("outstanding_amount") == 0:
 					entries.append(res)
 					continue
-
 			else:
 				break
 
@@ -357,9 +332,6 @@ class PaymentReconciliation(Document):
 	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))
@@ -378,13 +350,9 @@ class PaymentReconciliation(Document):
 			)
 
 			if self.minimum_invoice_amount:
-				condition += " and {dr_or_cr} >= {amount}".format(
-					dr_or_cr=dr_or_cr, amount=flt(self.minimum_invoice_amount)
-				)
+				condition += " and `{0}` >= {1}".format(dr_or_cr, flt(self.minimum_invoice_amount))
 			if self.maximum_invoice_amount:
-				condition += " and {dr_or_cr} <= {amount}".format(
-					dr_or_cr=dr_or_cr, amount=flt(self.maximum_invoice_amount)
-				)
+				condition += " and `{0}` <= {1}".format(dr_or_cr, flt(self.maximum_invoice_amount))
 
 		elif get_return_invoices:
 			condition = " and doc.company = '{0}' ".format(self.company)
@@ -399,19 +367,15 @@ class PaymentReconciliation(Document):
 				else ""
 			)
 			dr_or_cr = (
-				"debit_in_account_currency"
+				"gl.debit_in_account_currency"
 				if erpnext.get_party_account_type(self.party_type) == "Receivable"
-				else "credit_in_account_currency"
+				else "gl.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)
-				)
+				condition += " and `{0}` >= {1}".format(dr_or_cr, 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)
-				)
+				condition += " and `{0}` <= {1}".format(dr_or_cr, flt(self.maximum_payment_amount))
 
 		else:
 			condition += (

erpnext/accounts/doctype/payment_reconciliation/test_payment_reconciliation.py

@@ -1,96 +1,9 @@
 # Copyright (c) 2021, Frappe Technologies Pvt. Ltd. and Contributors
 # See license.txt
 
+# import frappe
 import unittest
 
-import frappe
-from frappe.utils import add_days, getdate
-
-from erpnext.accounts.doctype.sales_invoice.test_sales_invoice import create_sales_invoice
-
 
 class TestPaymentReconciliation(unittest.TestCase):
-	@classmethod
-	def setUpClass(cls):
-		make_customer()
-		make_invoice_and_payment()
-
-	def test_payment_reconciliation(self):
-		payment_reco = frappe.get_doc("Payment Reconciliation")
-		payment_reco.company = "_Test Company"
-		payment_reco.party_type = "Customer"
-		payment_reco.party = "_Test Payment Reco Customer"
-		payment_reco.receivable_payable_account = "Debtors - _TC"
-		payment_reco.from_invoice_date = add_days(getdate(), -1)
-		payment_reco.to_invoice_date = getdate()
-		payment_reco.from_payment_date = add_days(getdate(), -1)
-		payment_reco.to_payment_date = getdate()
-		payment_reco.maximum_invoice_amount = 1000
-		payment_reco.maximum_payment_amount = 1000
-		payment_reco.invoice_limit = 10
-		payment_reco.payment_limit = 10
-		payment_reco.bank_cash_account = "_Test Bank - _TC"
-		payment_reco.cost_center = "_Test Cost Center - _TC"
-		payment_reco.get_unreconciled_entries()
-
-		self.assertEqual(len(payment_reco.get("invoices")), 1)
-		self.assertEqual(len(payment_reco.get("payments")), 1)
-
-		payment_entry = payment_reco.get("payments")[0].reference_name
-		invoice = payment_reco.get("invoices")[0].invoice_number
-
-		payment_reco.allocate_entries(
-			{
-				"payments": [payment_reco.get("payments")[0].as_dict()],
-				"invoices": [payment_reco.get("invoices")[0].as_dict()],
-			}
-		)
-		payment_reco.reconcile()
-
-		payment_entry_doc = frappe.get_doc("Payment Entry", payment_entry)
-		self.assertEqual(payment_entry_doc.get("references")[0].reference_name, invoice)
-
-
-def make_customer():
-	if not frappe.db.get_value("Customer", "_Test Payment Reco Customer"):
-		frappe.get_doc(
-			{
-				"doctype": "Customer",
-				"customer_name": "_Test Payment Reco Customer",
-				"customer_type": "Individual",
-				"customer_group": "_Test Customer Group",
-				"territory": "_Test Territory",
-			}
-		).insert()
-
-
-def make_invoice_and_payment():
-	si = create_sales_invoice(
-		customer="_Test Payment Reco Customer", qty=1, rate=690, do_not_save=True
-	)
-	si.cost_center = "_Test Cost Center - _TC"
-	si.save()
-	si.submit()
-
-	pe = frappe.get_doc(
-		{
-			"doctype": "Payment Entry",
-			"payment_type": "Receive",
-			"party_type": "Customer",
-			"party": "_Test Payment Reco Customer",
-			"company": "_Test Company",
-			"paid_from_account_currency": "INR",
-			"paid_to_account_currency": "INR",
-			"source_exchange_rate": 1,
-			"target_exchange_rate": 1,
-			"reference_no": "1",
-			"reference_date": getdate(),
-			"received_amount": 690,
-			"paid_amount": 690,
-			"paid_from": "Debtors - _TC",
-			"paid_to": "_Test Bank - _TC",
-			"cost_center": "_Test Cost Center - _TC",
-		}
-	)
-	pe.insert()
-	pe.submit()
+	pass

erpnext/accounts/doctype/payment_request/payment_request.json

@@ -186,10 +186,8 @@
   {
    "fetch_from": "bank_account.bank",
    "fieldname": "bank",
-   "fieldtype": "Link",
-   "label": "Bank",
-   "options": "Bank",
-   "read_only": 1
+   "fieldtype": "Read Only",
+   "label": "Bank"
   },
   {
    "fetch_from": "bank_account.bank_account_no",
@@ -368,11 +366,10 @@
  "index_web_pages_for_search": 1,
  "is_submittable": 1,
  "links": [],
- "modified": "2022-09-30 16:19:43.680025",
+ "modified": "2020-09-18 12:24:14.178853",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Payment Request",
- "naming_rule": "By \"Naming Series\" field",
  "owner": "Administrator",
  "permissions": [
   {
@@ -404,6 +401,5 @@
   }
  ],
  "sort_field": "modified",
- "sort_order": "DESC",
- "states": []
+ "sort_order": "DESC"
 }

erpnext/accounts/doctype/payment_schedule/payment_schedule.json

@@ -39,7 +39,6 @@
   {
    "columns": 2,
    "fetch_from": "payment_term.description",
-   "fetch_if_empty": 1,
    "fieldname": "description",
    "fieldtype": "Small Text",
    "in_list_view": 1,
@@ -160,7 +159,7 @@
  "index_web_pages_for_search": 1,
  "istable": 1,
  "links": [],
- "modified": "2022-09-16 13:57:06.382859",
+ "modified": "2021-04-28 05:41:35.084233",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Payment Schedule",
@@ -169,6 +168,5 @@
  "quick_entry": 1,
  "sort_field": "modified",
  "sort_order": "DESC",
- "states": [],
  "track_changes": 1
 }

erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.json

@@ -10,11 +10,10 @@
   "fiscal_year",
   "amended_from",
   "company",
+  "cost_center_wise_pnl",
   "column_break1",
   "closing_account_head",
-  "remarks",
-  "gle_processing_status",
-  "error_message"
+  "remarks"
  ],
  "fields": [
   {
@@ -87,26 +86,17 @@
    "reqd": 1
   },
   {
-   "depends_on": "eval:doc.docstatus!=0",
-   "fieldname": "gle_processing_status",
-   "fieldtype": "Select",
-   "label": "GL Entry Processing Status",
-   "options": "In Progress\nCompleted\nFailed",
-   "read_only": 1
-  },
-  {
-   "depends_on": "eval:doc.gle_processing_status=='Failed'",
-   "fieldname": "error_message",
-   "fieldtype": "Text",
-   "label": "Error Message",
-   "read_only": 1
+   "default": "0",
+   "fieldname": "cost_center_wise_pnl",
+   "fieldtype": "Check",
+   "label": "Book Cost Center Wise Profit/Loss"
   }
  ],
  "icon": "fa fa-file-text",
  "idx": 1,
  "is_submittable": 1,
  "links": [],
- "modified": "2022-07-20 14:51:04.714154",
+ "modified": "2021-05-20 15:27:37.210458",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Period Closing Voucher",

erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py

@@ -8,6 +8,7 @@ from frappe.utils import flt
 
 from erpnext.accounts.doctype.accounting_dimension.accounting_dimension import (
 	get_accounting_dimensions,
+	get_dimensions,
 )
 from erpnext.accounts.utils import get_account_currency
 from erpnext.controllers.accounts_controller import AccountsController
@@ -19,28 +20,13 @@ class PeriodClosingVoucher(AccountsController):
 		self.validate_posting_date()
 
 	def on_submit(self):
-		self.db_set("gle_processing_status", "In Progress")
 		self.make_gl_entries()
 
 	def on_cancel(self):
-		self.db_set("gle_processing_status", "In Progress")
 		self.ignore_linked_doctypes = ("GL Entry", "Stock Ledger Entry")
-		gle_count = frappe.db.count(
-			"GL Entry",
-			{"voucher_type": "Period Closing Voucher", "voucher_no": self.name, "is_cancelled": 0},
-		)
-		if gle_count > 5000:
-			frappe.enqueue(
-				make_reverse_gl_entries,
-				voucher_type="Period Closing Voucher",
-				voucher_no=self.name,
-				queue="long",
-			)
-			frappe.msgprint(
-				_("The GL Entries will be cancelled in the background, it can take a few minutes."), alert=True
-			)
-		else:
-			make_reverse_gl_entries(voucher_type="Period Closing Voucher", voucher_no=self.name)
+		from erpnext.accounts.general_ledger import make_reverse_gl_entries
+
+		make_reverse_gl_entries(voucher_type="Period Closing Voucher", voucher_no=self.name)
 
 	def validate_account_head(self):
 		closing_account_type = frappe.db.get_value("Account", self.closing_account_head, "root_type")
@@ -68,8 +54,8 @@ class PeriodClosingVoucher(AccountsController):
 
 		pce = frappe.db.sql(
 			"""select name from `tabPeriod Closing Voucher`
-			where posting_date > %s and fiscal_year = %s and docstatus = 1 and company = %s""",
-			(self.posting_date, self.fiscal_year, self.company),
+			where posting_date > %s and fiscal_year = %s and docstatus = 1""",
+			(self.posting_date, self.fiscal_year),
 		)
 		if pce and pce[0][0]:
 			frappe.throw(
@@ -81,80 +67,90 @@ class PeriodClosingVoucher(AccountsController):
 	def make_gl_entries(self):
 		gl_entries = self.get_gl_entries()
 		if gl_entries:
-			if len(gl_entries) > 5000:
-				frappe.enqueue(process_gl_entries, gl_entries=gl_entries, queue="long")
-				frappe.msgprint(
-					_("The GL Entries will be processed in the background, it can take a few minutes."),
-					alert=True,
-				)
-			else:
-				process_gl_entries(gl_entries)
+			from erpnext.accounts.general_ledger import make_gl_entries
+
+			make_gl_entries(gl_entries)
 
 	def get_gl_entries(self):
 		gl_entries = []
+		pl_accounts = self.get_pl_balances()
 
-		# pl account
-		for acc in self.get_pl_balances_based_on_dimensions(group_by_account=True):
+		for acc in pl_accounts:
 			if flt(acc.bal_in_company_currency):
-				gl_entries.append(self.get_gle_for_pl_account(acc))
+				gl_entries.append(
+					self.get_gl_dict(
+						{
+							"account": acc.account,
+							"cost_center": acc.cost_center,
+							"finance_book": acc.finance_book,
+							"account_currency": acc.account_currency,
+							"debit_in_account_currency": abs(flt(acc.bal_in_account_currency))
+							if flt(acc.bal_in_account_currency) < 0
+							else 0,
+							"debit": abs(flt(acc.bal_in_company_currency))
+							if flt(acc.bal_in_company_currency) < 0
+							else 0,
+							"credit_in_account_currency": abs(flt(acc.bal_in_account_currency))
+							if flt(acc.bal_in_account_currency) > 0
+							else 0,
+							"credit": abs(flt(acc.bal_in_company_currency))
+							if flt(acc.bal_in_company_currency) > 0
+							else 0,
+						},
+						item=acc,
+					)
+				)
 
-		# closing liability account
-		for acc in self.get_pl_balances_based_on_dimensions(group_by_account=False):
-			if flt(acc.bal_in_company_currency):
-				gl_entries.append(self.get_gle_for_closing_account(acc))
+		if gl_entries:
+			gle_for_net_pl_bal = self.get_pnl_gl_entry(pl_accounts)
+			gl_entries += gle_for_net_pl_bal
 
 		return gl_entries
 
-	def get_gle_for_pl_account(self, acc):
-		gl_entry = self.get_gl_dict(
-			{
-				"account": acc.account,
-				"cost_center": acc.cost_center,
-				"finance_book": acc.finance_book,
-				"account_currency": acc.account_currency,
-				"debit_in_account_currency": abs(flt(acc.bal_in_account_currency))
-				if flt(acc.bal_in_account_currency) < 0
-				else 0,
-				"debit": abs(flt(acc.bal_in_company_currency)) if flt(acc.bal_in_company_currency) < 0 else 0,
-				"credit_in_account_currency": abs(flt(acc.bal_in_account_currency))
-				if flt(acc.bal_in_account_currency) > 0
-				else 0,
-				"credit": abs(flt(acc.bal_in_company_currency)) if flt(acc.bal_in_company_currency) > 0 else 0,
-			},
-			item=acc,
-		)
-		self.update_default_dimensions(gl_entry, acc)
-		return gl_entry
+	def get_pnl_gl_entry(self, pl_accounts):
+		company_cost_center = frappe.db.get_value("Company", self.company, "cost_center")
+		gl_entries = []
 
-	def get_gle_for_closing_account(self, acc):
-		gl_entry = self.get_gl_dict(
-			{
-				"account": self.closing_account_head,
-				"cost_center": acc.cost_center,
-				"finance_book": acc.finance_book,
-				"account_currency": acc.account_currency,
-				"debit_in_account_currency": abs(flt(acc.bal_in_account_currency))
-				if flt(acc.bal_in_account_currency) > 0
-				else 0,
-				"debit": abs(flt(acc.bal_in_company_currency)) if flt(acc.bal_in_company_currency) > 0 else 0,
-				"credit_in_account_currency": abs(flt(acc.bal_in_account_currency))
-				if flt(acc.bal_in_account_currency) < 0
-				else 0,
-				"credit": abs(flt(acc.bal_in_company_currency)) if flt(acc.bal_in_company_currency) < 0 else 0,
-			},
-			item=acc,
-		)
-		self.update_default_dimensions(gl_entry, acc)
-		return gl_entry
+		for acc in pl_accounts:
+			if flt(acc.bal_in_company_currency):
+				cost_center = acc.cost_center if self.cost_center_wise_pnl else company_cost_center
+				gl_entry = self.get_gl_dict(
+					{
+						"account": self.closing_account_head,
+						"cost_center": cost_center,
+						"finance_book": acc.finance_book,
+						"account_currency": acc.account_currency,
+						"debit_in_account_currency": abs(flt(acc.bal_in_account_currency))
+						if flt(acc.bal_in_account_currency) > 0
+						else 0,
+						"debit": abs(flt(acc.bal_in_company_currency))
+						if flt(acc.bal_in_company_currency) > 0
+						else 0,
+						"credit_in_account_currency": abs(flt(acc.bal_in_account_currency))
+						if flt(acc.bal_in_account_currency) < 0
+						else 0,
+						"credit": abs(flt(acc.bal_in_company_currency))
+						if flt(acc.bal_in_company_currency) < 0
+						else 0,
+					},
+					item=acc,
+				)
 
-	def update_default_dimensions(self, gl_entry, acc):
+				self.update_default_dimensions(gl_entry)
+
+				gl_entries.append(gl_entry)
+
+		return gl_entries
+
+	def update_default_dimensions(self, gl_entry):
 		if not self.accounting_dimensions:
 			self.accounting_dimensions = get_accounting_dimensions()
 
+		_, default_dimensions = get_dimensions()
 		for dimension in self.accounting_dimensions:
-			gl_entry.update({dimension: acc.get(dimension)})
+			gl_entry.update({dimension: default_dimensions.get(self.company, {}).get(dimension)})
 
-	def get_pl_balances_based_on_dimensions(self, group_by_account=False):
+	def get_pl_balances(self):
 		"""Get balance for dimension-wise pl accounts"""
 
 		dimension_fields = ["t1.cost_center", "t1.finance_book"]
@@ -163,56 +159,20 @@ class PeriodClosingVoucher(AccountsController):
 		for dimension in self.accounting_dimensions:
 			dimension_fields.append("t1.{0}".format(dimension))
 
-		if group_by_account:
-			dimension_fields.append("t1.account")
-
 		return frappe.db.sql(
 			"""
 			select
-				t2.account_currency,
-				{dimension_fields},
+				t1.account, 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, `tabAccount` t2
-			where
-				t1.is_cancelled = 0
-				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}
+			where 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 t1.account, {dimension_fields}
 		""".format(
 				dimension_fields=", ".join(dimension_fields)
 			),
 			(self.company, self.get("year_start_date"), self.posting_date),
 			as_dict=1,
 		)
-
-
-def process_gl_entries(gl_entries):
-	from erpnext.accounts.general_ledger import make_gl_entries
-
-	try:
-		make_gl_entries(gl_entries, merge_entries=False)
-		frappe.db.set_value(
-			"Period Closing Voucher", gl_entries[0].get("voucher_no"), "gle_processing_status", "Completed"
-		)
-	except Exception as e:
-		frappe.db.rollback()
-		frappe.log_error(e)
-		frappe.db.set_value(
-			"Period Closing Voucher", gl_entries[0].get("voucher_no"), "gle_processing_status", "Failed"
-		)
-
-
-def make_reverse_gl_entries(voucher_type, voucher_no):
-	from erpnext.accounts.general_ledger import make_reverse_gl_entries
-
-	try:
-		make_reverse_gl_entries(voucher_type=voucher_type, voucher_no=voucher_no)
-		frappe.db.set_value("Period Closing Voucher", voucher_no, "gle_processing_status", "Completed")
-	except Exception as e:
-		frappe.db.rollback()
-		frappe.log_error(e)
-		frappe.db.set_value("Period Closing Voucher", voucher_no, "gle_processing_status", "Failed")

erpnext/accounts/doctype/period_closing_voucher/test_period_closing_voucher.py

@@ -49,7 +49,7 @@ class TestPeriodClosingVoucher(unittest.TestCase):
 
 		expected_gle = (
 			("Cost of Goods Sold - TPC", 0.0, 600.0),
-			(surplus_account, 200.0, 0.0),
+			(surplus_account, 600.0, 400.0),
 			("Sales - TPC", 400.0, 0.0),
 		)
 
@@ -59,8 +59,7 @@ class TestPeriodClosingVoucher(unittest.TestCase):
 		""",
 			(pcv.name),
 		)
-		pcv.reload()
-		self.assertEqual(pcv.gle_processing_status, "Completed")
+
 		self.assertEqual(pcv_gle, expected_gle)
 
 	def test_cost_center_wise_posting(self):
@@ -79,10 +78,7 @@ class TestPeriodClosingVoucher(unittest.TestCase):
 			expense_account="Cost of Goods Sold - TPC",
 			rate=400,
 			debit_to="Debtors - TPC",
-			currency="USD",
-			customer="_Test Customer USD",
 		)
-
 		create_sales_invoice(
 			company=company,
 			cost_center=cost_center2,
@@ -90,11 +86,10 @@ class TestPeriodClosingVoucher(unittest.TestCase):
 			expense_account="Cost of Goods Sold - TPC",
 			rate=200,
 			debit_to="Debtors - TPC",
-			currency="USD",
-			customer="_Test Customer USD",
 		)
 
 		pcv = self.make_period_closing_voucher(submit=False)
+		pcv.cost_center_wise_pnl = 1
 		pcv.save()
 		pcv.submit()
 		surplus_account = pcv.closing_account_head
@@ -117,16 +112,6 @@ class TestPeriodClosingVoucher(unittest.TestCase):
 
 		self.assertEqual(pcv_gle, expected_gle)
 
-		pcv.reload()
-		pcv.cancel()
-
-		self.assertFalse(
-			frappe.db.get_value(
-				"GL Entry",
-				{"voucher_type": "Period Closing Voucher", "voucher_no": pcv.name, "is_cancelled": 0},
-			)
-		)
-
 	def test_period_closing_with_finance_book_entries(self):
 		frappe.db.sql("delete from `tabGL Entry` where company='Test PCV Company'")
 
@@ -134,17 +119,14 @@ class TestPeriodClosingVoucher(unittest.TestCase):
 		surplus_account = create_account()
 		cost_center = create_cost_center("Test Cost Center 1")
 
-		si = create_sales_invoice(
+		create_sales_invoice(
 			company=company,
 			income_account="Sales - TPC",
 			expense_account="Cost of Goods Sold - TPC",
 			cost_center=cost_center,
 			rate=400,
 			debit_to="Debtors - TPC",
-			currency="USD",
-			customer="_Test Customer USD",
 		)
-
 		jv = make_journal_entry(
 			account1="Cash - TPC",
 			account2="Sales - TPC",

erpnext/accounts/doctype/pos_closing_entry/pos_closing_entry.js

@@ -36,15 +36,6 @@ frappe.ui.form.on('POS Closing Entry', {
 		});
 
 		set_html_data(frm);
-
-		if (frm.doc.docstatus == 1) {
-			if (!frm.doc.posting_date) {
-				frm.set_value("posting_date", frappe.datetime.nowdate());
-			}
-			if (!frm.doc.posting_time) {
-				frm.set_value("posting_time", frappe.datetime.now_time());
-			}
-		}
 	},
 
 	refresh: function(frm) {
@@ -73,15 +64,13 @@ frappe.ui.form.on('POS Closing Entry', {
 	pos_opening_entry(frm) {
 		if (frm.doc.pos_opening_entry && frm.doc.period_start_date && frm.doc.period_end_date && frm.doc.user) {
 			reset_values(frm);
-			frappe.run_serially([
-				() => frm.trigger("set_opening_amounts"),
-				() => frm.trigger("get_pos_invoices")
-			]);
+			frm.trigger("set_opening_amounts");
+			frm.trigger("get_pos_invoices");
 		}
 	},
 
 	set_opening_amounts(frm) {
-		return frappe.db.get_doc("POS Opening Entry", frm.doc.pos_opening_entry)
+		frappe.db.get_doc("POS Opening Entry", frm.doc.pos_opening_entry)
 			.then(({ balance_details }) => {
 				balance_details.forEach(detail => {
 					frm.add_child("payment_reconciliation", {
@@ -94,7 +83,7 @@ frappe.ui.form.on('POS Closing Entry', {
 	},
 
 	get_pos_invoices(frm) {
-		return frappe.call({
+		frappe.call({
 			method: 'erpnext.accounts.doctype.pos_closing_entry.pos_closing_entry.get_pos_invoices',
 			args: {
 				start: frappe.datetime.get_datetime_as_string(frm.doc.period_start_date),
@@ -111,9 +100,7 @@ frappe.ui.form.on('POS Closing Entry', {
 		});
 	},
 
-	before_save: async function(frm) {
-		frappe.dom.freeze(__('Processing Sales! Please Wait...'));
-
+	before_save: function(frm) {
 		frm.set_value("grand_total", 0);
 		frm.set_value("net_total", 0);
 		frm.set_value("total_quantity", 0);
@@ -123,23 +110,17 @@ frappe.ui.form.on('POS Closing Entry', {
 			row.expected_amount = row.opening_amount;
 		}
 
-		const pos_inv_promises = frm.doc.pos_transactions.map(
-			row => frappe.db.get_doc("POS Invoice", row.pos_invoice)
-		);
-
-		const pos_invoices = await Promise.all(pos_inv_promises);
-
-		for (let doc of pos_invoices) {
-			frm.doc.grand_total += flt(doc.grand_total);
-			frm.doc.net_total += flt(doc.net_total);
-			frm.doc.total_quantity += flt(doc.total_qty);
-			refresh_payments(doc, frm);
-			refresh_taxes(doc, frm);
-			refresh_fields(frm);
-			set_html_data(frm);
+		for (let row of frm.doc.pos_transactions) {
+			frappe.db.get_doc("POS Invoice", row.pos_invoice).then(doc => {
+				frm.doc.grand_total += flt(doc.grand_total);
+				frm.doc.net_total += flt(doc.net_total);
+				frm.doc.total_quantity += flt(doc.total_qty);
+				refresh_payments(doc, frm);
+				refresh_taxes(doc, frm);
+				refresh_fields(frm);
+				set_html_data(frm);
+			});
 		}
-
-		frappe.dom.unfreeze();
 	}
 });
 

erpnext/accounts/doctype/pos_closing_entry/pos_closing_entry.json

@@ -11,7 +11,6 @@
   "period_end_date",
   "column_break_3",
   "posting_date",
-  "posting_time",
   "pos_opening_entry",
   "status",
   "section_break_5",
@@ -52,6 +51,7 @@
    "fieldtype": "Datetime",
    "in_list_view": 1,
    "label": "Period End Date",
+   "read_only": 1,
    "reqd": 1
   },
   {
@@ -219,13 +219,6 @@
    "fieldtype": "Small Text",
    "label": "Error",
    "read_only": 1
-  },
-  {
-   "fieldname": "posting_time",
-   "fieldtype": "Time",
-   "label": "Posting Time",
-   "no_copy": 1,
-   "reqd": 1
   }
  ],
  "is_submittable": 1,
@@ -235,11 +228,10 @@
    "link_fieldname": "pos_closing_entry"
   }
  ],
- "modified": "2022-08-01 11:37:14.991228",
+ "modified": "2021-10-20 16:19:25.340565",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "POS Closing Entry",
- "naming_rule": "Expression (old style)",
  "owner": "Administrator",
  "permissions": [
   {
@@ -286,6 +278,5 @@
  ],
  "sort_field": "modified",
  "sort_order": "DESC",
- "states": [],
  "track_changes": 1
 }

erpnext/accounts/doctype/pos_closing_entry/pos_closing_entry.py

@@ -15,9 +15,6 @@ from erpnext.controllers.status_updater import StatusUpdater
 
 class POSClosingEntry(StatusUpdater):
 	def validate(self):
-		self.posting_date = self.posting_date or frappe.utils.nowdate()
-		self.posting_time = self.posting_time or frappe.utils.nowtime()
-
 		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"))
 

erpnext/accounts/doctype/pos_invoice/pos_invoice.json

@@ -1572,7 +1572,7 @@
  "icon": "fa fa-file-text",
  "is_submittable": 1,
  "links": [],
- "modified": "2022-09-27 13:00:24.166684",
+ "modified": "2022-03-22 13:00:24.166684",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "POS Invoice",

erpnext/accounts/doctype/pos_invoice/pos_invoice.py

@@ -222,6 +222,9 @@ class POSInvoice(SalesInvoice):
 		allow_negative_stock = frappe.db.get_single_value("Stock Settings", "allow_negative_stock")
 
 		for d in self.get("items"):
+			is_service_item = not (frappe.db.get_value("Item", d.get("item_code"), "is_stock_item"))
+			if is_service_item:
+				return
 			if d.serial_no:
 				self.validate_pos_reserved_serial_nos(d)
 				self.validate_delivered_serial_nos(d)
@@ -239,14 +242,14 @@ class POSInvoice(SalesInvoice):
 					frappe.bold(d.warehouse),
 					frappe.bold(d.qty),
 				)
-				if is_stock_item and flt(available_stock) <= 0:
+				if flt(available_stock) <= 0:
 					frappe.throw(
 						_("Row #{}: Item Code: {} is not available under warehouse {}.").format(
 							d.idx, item_code, warehouse
 						),
 						title=_("Item Unavailable"),
 					)
-				elif is_stock_item and flt(available_stock) < flt(d.qty):
+				elif flt(available_stock) < flt(d.qty):
 					frappe.throw(
 						_(
 							"Row #{}: Stock quantity not enough for Item Code: {} under warehouse {}. Available quantity {}."
@@ -634,12 +637,11 @@ def get_stock_availability(item_code, warehouse):
 		pos_sales_qty = get_pos_reserved_qty(item_code, warehouse)
 		return bin_qty - pos_sales_qty, is_stock_item
 	else:
-		is_stock_item = True
+		is_stock_item = False
 		if frappe.db.exists("Product Bundle", item_code):
 			return get_bundle_availability(item_code, warehouse), is_stock_item
 		else:
-			is_stock_item = False
-			# Is a service item or non_stock item
+			# Is a service item
 			return 0, is_stock_item
 
 
@@ -653,9 +655,7 @@ def get_bundle_availability(bundle_item_code, warehouse):
 		available_qty = item_bin_qty - item_pos_reserved_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"
-		):
+		if bundle_bin_qty > max_available_bundles:
 			bundle_bin_qty = max_available_bundles
 
 	pos_sales_qty = get_pos_reserved_qty(bundle_item_code, warehouse)
@@ -747,7 +747,3 @@ 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.json

@@ -6,7 +6,6 @@
  "engine": "InnoDB",
  "field_order": [
   "posting_date",
-  "posting_time",
   "merge_invoices_based_on",
   "column_break_3",
   "pos_closing_entry",
@@ -106,19 +105,12 @@
    "label": "Customer Group",
    "mandatory_depends_on": "eval:doc.merge_invoices_based_on == 'Customer Group'",
    "options": "Customer Group"
-  },
-  {
-   "fieldname": "posting_time",
-   "fieldtype": "Time",
-   "label": "Posting Time",
-   "no_copy": 1,
-   "reqd": 1
   }
  ],
  "index_web_pages_for_search": 1,
  "is_submittable": 1,
  "links": [],
- "modified": "2022-08-01 11:36:42.456429",
+ "modified": "2021-09-14 11:17:19.001142",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "POS Invoice Merge Log",
@@ -181,6 +173,5 @@
  ],
  "sort_field": "modified",
  "sort_order": "DESC",
- "states": [],
  "track_changes": 1
 }

erpnext/accounts/doctype/pos_invoice_merge_log/pos_invoice_merge_log.py

@@ -9,7 +9,7 @@ from frappe import _
 from frappe.core.page.background_jobs.background_jobs import get_info
 from frappe.model.document import Document
 from frappe.model.mapper import map_child_doc, map_doc
-from frappe.utils import cint, flt, get_time, getdate, nowdate, nowtime
+from frappe.utils import flt, getdate, nowdate
 from frappe.utils.background_jobs import enqueue
 from frappe.utils.scheduler import is_scheduler_inactive
 
@@ -79,7 +79,6 @@ class POSInvoiceMergeLog(Document):
 		if sales:
 			sales_invoice = self.process_merging_into_sales_invoice(sales)
 
-		self.flags.ignore_validate_update_after_submit = True
 		self.save()  # save consolidated_sales_invoice & consolidated_credit_note ref in merge log
 
 		self.update_pos_invoices(pos_invoice_docs, sales_invoice, credit_note)
@@ -100,7 +99,6 @@ class POSInvoiceMergeLog(Document):
 		sales_invoice.is_consolidated = 1
 		sales_invoice.set_posting_time = 1
 		sales_invoice.posting_date = getdate(self.posting_date)
-		sales_invoice.posting_time = get_time(self.posting_time)
 		sales_invoice.save()
 		sales_invoice.submit()
 
@@ -117,7 +115,6 @@ class POSInvoiceMergeLog(Document):
 		credit_note.is_consolidated = 1
 		credit_note.set_posting_time = 1
 		credit_note.posting_date = getdate(self.posting_date)
-		credit_note.posting_time = get_time(self.posting_time)
 		# TODO: return could be against multiple sales invoice which could also have been consolidated?
 		# credit_note.return_against = self.consolidated_invoice
 		credit_note.save()
@@ -222,9 +219,6 @@ class POSInvoiceMergeLog(Document):
 		invoice.taxes_and_charges = None
 		invoice.ignore_pricing_rule = 1
 		invoice.customer = self.customer
-		invoice.disable_rounded_total = cint(
-			frappe.db.get_value("POS Profile", invoice.pos_profile, "disable_rounded_total")
-		)
 
 		if self.merge_invoices_based_on == "Customer Group":
 			invoice.flags.ignore_pos_profile = True
@@ -405,9 +399,6 @@ def create_merge_logs(invoice_by_customer, closing_entry=None):
 				merge_log.posting_date = (
 					getdate(closing_entry.get("posting_date")) if closing_entry else nowdate()
 				)
-				merge_log.posting_time = (
-					get_time(closing_entry.get("posting_time")) if closing_entry else nowtime()
-				)
 				merge_log.customer = customer
 				merge_log.pos_closing_entry = closing_entry.get("name") if closing_entry else None
 

erpnext/accounts/doctype/pos_profile/pos_profile.json

@@ -43,9 +43,7 @@
   "currency",
   "write_off_account",
   "write_off_cost_center",
-  "write_off_limit",
   "account_for_change_amount",
-  "disable_rounded_total",
   "column_break_23",
   "income_account",
   "expense_account",
@@ -360,21 +358,6 @@
    "fieldname": "validate_stock_on_save",
    "fieldtype": "Check",
    "label": "Validate Stock on Save"
-  },
-  {
-   "default": "1",
-   "description": "Auto write off precision loss while consolidation",
-   "fieldname": "write_off_limit",
-   "fieldtype": "Currency",
-   "label": "Write Off Limit",
-   "reqd": 1
-  },
-  {
-   "default": "0",
-   "description": "If enabled, the consolidated invoices will have rounded total disabled",
-   "fieldname": "disable_rounded_total",
-   "fieldtype": "Check",
-   "label": "Disable Rounded Total"
   }
  ],
  "icon": "icon-cog",
@@ -402,7 +385,7 @@
    "link_fieldname": "pos_profile"
   }
  ],
- "modified": "2022-08-10 12:57:06.241439",
+ "modified": "2022-03-21 13:29:28.480533",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "POS Profile",

erpnext/accounts/doctype/pricing_rule/pricing_rule.py

@@ -36,15 +36,10 @@ class PricingRule(Document):
 			self.margin_rate_or_amount = 0.0
 
 	def validate_duplicate_apply_on(self):
-		if self.apply_on != "Transaction":
-			apply_on_table = apply_on_dict.get(self.apply_on)
-			if not apply_on_table:
-				return
-
-			apply_on_field = frappe.scrub(self.apply_on)
-			values = [d.get(apply_on_field) for d in self.get(apply_on_table) if d.get(apply_on_field)]
-			if len(values) != len(set(values)):
-				frappe.throw(_("Duplicate {0} found in the table").format(self.apply_on))
+		field = apply_on_dict.get(self.apply_on)
+		values = [d.get(frappe.scrub(self.apply_on)) for d in self.get(field) if field]
+		if len(values) != len(set(values)):
+			frappe.throw(_("Duplicate {0} found in the table").format(self.apply_on))
 
 	def validate_mandatory(self):
 		for apply_on, field in apply_on_dict.items():
@@ -269,18 +264,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 +320,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 +434,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,121 +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_pricing_rule_for_different_currency(self):
 		make_item("Test Sanitizer Item")
 
@@ -827,7 +712,7 @@ class TestPricingRule(unittest.TestCase):
 			title="_Test Pricing Rule with Min Qty - 2",
 		)
 
-		si = create_sales_invoice(do_not_submit=True, customer="_Test Customer 1", qty=1)
+		si = create_sales_invoice(do_not_submit=True, customer="_Test Customer 1", qty=1, currency="USD")
 		item = si.items[0]
 		item.stock_qty = 1
 		si.save()

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")
 

erpnext/accounts/doctype/process_deferred_accounting/process_deferred_accounting.py

@@ -34,4 +34,4 @@ class ProcessDeferredAccounting(Document):
 			filters={"against_voucher_type": self.doctype, "against_voucher": self.name},
 		)
 
-		make_gl_entries(gl_map=gl_entries, cancel=1)
+		make_gl_entries(gl_entries=gl_entries, cancel=1)

erpnext/accounts/doctype/process_deferred_accounting/test_process_deferred_accounting.py

@@ -57,16 +57,3 @@ class TestProcessDeferredAccounting(unittest.TestCase):
 		]
 
 		check_gl_entries(self, si.name, expected_gle, "2019-01-10")
-
-	def test_pda_submission_and_cancellation(self):
-		pda = frappe.get_doc(
-			dict(
-				doctype="Process Deferred Accounting",
-				posting_date="2019-01-01",
-				start_date="2019-01-01",
-				end_date="2019-01-31",
-				type="Income",
-			)
-		)
-		pda.submit()
-		pda.cancel()

erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.html

@@ -25,7 +25,7 @@
 	</div>
 	<br>
 
-	<table class="table table-bordered" style="font-size: 10px">
+	<table class="table table-bordered">
 		<thead>
 			<tr>
 				<th style="width: 12%">{{ _("Date") }}</th>

erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.py

@@ -34,9 +34,8 @@ class ProcessStatementOfAccounts(Document):
 			frappe.throw(_("Customers not selected."))
 
 		if self.enable_auto_email:
-			if self.start_date and getdate(self.start_date) >= getdate(today()):
-				self.to_date = self.start_date
-				self.from_date = add_months(self.to_date, -1 * self.filter_duration)
+			self.to_date = self.start_date
+			self.from_date = add_months(self.to_date, -1 * self.filter_duration)
 
 
 def get_report_pdf(doc, consolidated=True):

erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js

@@ -30,9 +30,6 @@ erpnext.accounts.PurchaseInvoice = erpnext.buying.BuyingController.extend({
 	onload: function() {
 		this._super();
 
-		// Ignore linked advances
-		this.frm.ignore_doctypes_on_cancel_all = ['Journal Entry', 'Payment Entry', 'Purchase Invoice'];
-
 		if(!this.frm.doc.__islocal) {
 			// show credit_to in print format
 			if(!this.frm.doc.supplier && this.frm.doc.credit_to) {
@@ -45,6 +42,8 @@ erpnext.accounts.PurchaseInvoice = erpnext.buying.BuyingController.extend({
 		if (this.frm.doc.supplier && this.frm.doc.__islocal) {
 			this.frm.trigger('supplier');
 		}
+
+		erpnext.accounts.dimensions.setup_dimension_filters(this.frm, this.frm.doctype);
 	},
 
 	refresh: function(doc) {
@@ -539,7 +538,7 @@ frappe.ui.form.on("Purchase Invoice", {
 	},
 
 	add_custom_buttons: function(frm) {
-		if (frm.doc.docstatus == 1 && frm.doc.per_received < 100) {
+		if (frm.doc.per_received < 100) {
 			frm.add_custom_button(__('Purchase Receipt'), () => {
 				frm.events.make_purchase_receipt(frm);
 			}, __('Create'));
@@ -569,10 +568,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.json

@@ -83,8 +83,6 @@
   "section_break_51",
   "taxes_and_charges",
   "taxes",
-  "tax_withheld_vouchers_section",
-  "tax_withheld_vouchers",
   "sec_tax_breakup",
   "other_charges_calculation",
   "totals",
@@ -513,6 +511,7 @@
    "fieldname": "ignore_pricing_rule",
    "fieldtype": "Check",
    "label": "Ignore Pricing Rule",
+   "no_copy": 1,
    "permlevel": 1,
    "print_hide": 1
   },
@@ -1418,26 +1417,13 @@
    "label": "Advance Tax",
    "options": "Advance Tax",
    "read_only": 1
-  },
-  {
-   "fieldname": "tax_withheld_vouchers_section",
-   "fieldtype": "Section Break",
-   "label": "Tax Withheld Vouchers"
-  },
-  {
-   "fieldname": "tax_withheld_vouchers",
-   "fieldtype": "Table",
-   "label": "Tax Withheld Vouchers",
-   "no_copy": 1,
-   "options": "Tax Withheld Vouchers",
-   "read_only": 1
   }
  ],
  "icon": "fa fa-file-text",
  "idx": 204,
  "is_submittable": 1,
  "links": [],
- "modified": "2022-10-07 14:19:14.214157",
+ "modified": "2021-11-25 13:31:02.716727",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Purchase Invoice",
@@ -1497,8 +1483,7 @@
  "show_name_in_global_search": 1,
  "sort_field": "modified",
  "sort_order": "DESC",
- "states": [],
  "timeline_field": "supplier",
  "title_field": "title",
  "track_changes": 1
-}
+}

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 = ""
@@ -161,10 +158,20 @@ class PurchaseInvoice(BuyingController):
 		if tds_category and not for_validate:
 			self.apply_tds = 1
 			self.tax_withholding_category = tds_category
-			self.set_onload("supplier_tds", tds_category)
 
 		super(PurchaseInvoice, self).set_missing_values(for_validate)
 
+	def check_conversion_rate(self):
+		default_currency = erpnext.get_company_currency(self.company)
+		if not default_currency:
+			throw(_("Please enter default currency in Company Master"))
+		if (
+			(self.currency == default_currency and flt(self.conversion_rate) != 1.00)
+			or not self.conversion_rate
+			or (self.currency != default_currency and flt(self.conversion_rate) == 1.00)
+		):
+			throw(_("Conversion rate cannot be 0 or 1"))
+
 	def validate_credit_to_acc(self):
 		if not self.credit_to:
 			self.credit_to = get_party_account("Supplier", self.supplier, self.company)
@@ -533,16 +540,7 @@ class PurchaseInvoice(BuyingController):
 					from_repost=from_repost,
 				)
 			elif self.docstatus == 2:
-				provisional_entries = [a for a in gl_entries if a.voucher_type == "Purchase Receipt"]
 				make_reverse_gl_entries(voucher_type=self.doctype, voucher_no=self.name)
-				if provisional_entries:
-					for entry in provisional_entries:
-						frappe.db.set_value(
-							"GL Entry",
-							{"voucher_type": "Purchase Receipt", "voucher_detail_no": entry.voucher_detail_no},
-							"is_cancelled",
-							1,
-						)
 
 			if update_outstanding == "No":
 				update_outstanding_amt(
@@ -570,6 +568,7 @@ class PurchaseInvoice(BuyingController):
 
 		self.make_supplier_gl_entry(gl_entries)
 		self.make_item_gl_entries(gl_entries)
+		self.make_discount_gl_entries(gl_entries)
 
 		if self.check_asset_cwip_enabled():
 			self.get_asset_gl_entry(gl_entries)
@@ -698,10 +697,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 +706,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,
@@ -800,15 +795,13 @@ class PurchaseInvoice(BuyingController):
 					)
 
 					if not item.is_fixed_asset:
-						dummy, amount = self.get_amount_and_base_amount(item, None)
+						dummy, amount = self.get_amount_and_base_amount(item, self.enable_discount_accounting)
 					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:
-							provisional_account = frappe.db.get_value(
-								"Purchase Receipt Item", item.pr_detail, "provisional_expense_account"
-							) or self.get_company_default("default_provisional_account")
+							provisional_account = self.get_company_default("default_provisional_account")
 							purchase_receipt_doc = purchase_receipt_doc_map.get(item.purchase_receipt)
 
 							if not purchase_receipt_doc:
@@ -831,7 +824,7 @@ class PurchaseInvoice(BuyingController):
 							if expense_booked_in_pr:
 								# Intentionally passing purchase invoice item to handle partial billing
 								purchase_receipt_doc.add_provisional_gl_entry(
-									item, gl_entries, self.posting_date, provisional_account, reverse=1
+									item, gl_entries, self.posting_date, reverse=1
 								)
 
 					if not self.is_internal_transfer():
@@ -1083,7 +1076,7 @@ class PurchaseInvoice(BuyingController):
 		# Stock ledger value is not matching with the warehouse amount
 		if (
 			self.update_stock
-			and voucher_wise_stock_value.get((item.name, item.warehouse))
+			and voucher_wise_stock_value.get(item.name)
 			and warehouse_debit_amount
 			!= flt(voucher_wise_stock_value.get((item.name, item.warehouse)), net_amt_precision)
 		):
@@ -1116,7 +1109,7 @@ class PurchaseInvoice(BuyingController):
 		valuation_tax = {}
 
 		for tax in self.get("taxes"):
-			amount, base_amount = self.get_tax_amounts(tax, None)
+			amount, base_amount = self.get_tax_amounts(tax, self.enable_discount_accounting)
 			if tax.category in ("Total", "Valuation and Total") and flt(base_amount):
 				account_currency = get_account_currency(tax.account_head)
 
@@ -1322,9 +1315,7 @@ class PurchaseInvoice(BuyingController):
 		if (
 			not self.is_internal_transfer() and self.rounding_adjustment and self.base_rounding_adjustment
 		):
-			round_off_account, round_off_cost_center = get_round_off_account_and_cost_center(
-				self.company, "Purchase Invoice", self.name
-			)
+			round_off_account, round_off_cost_center = get_round_off_account_and_cost_center(self.company)
 
 			gl_entries.append(
 				self.get_gl_dict(
@@ -1371,14 +1362,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):
@@ -1471,7 +1455,7 @@ class PurchaseInvoice(BuyingController):
 		if not self.tax_withholding_category:
 			return
 
-		tax_withholding_details, advance_taxes, voucher_wise_amount = get_party_tax_withholding_details(
+		tax_withholding_details, advance_taxes = get_party_tax_withholding_details(
 			self, self.tax_withholding_category
 		)
 
@@ -1500,19 +1484,6 @@ class PurchaseInvoice(BuyingController):
 		for d in to_remove:
 			self.remove(d)
 
-		## Add pending vouchers on which tax was withheld
-		self.set("tax_withheld_vouchers", [])
-
-		for voucher_no, voucher_details in voucher_wise_amount.items():
-			self.append(
-				"tax_withheld_vouchers",
-				{
-					"voucher_name": voucher_no,
-					"voucher_type": voucher_details.get("voucher_type"),
-					"taxable_amount": voucher_details.get("amount"),
-				},
-			)
-
 		# calculate totals again after applying TDS
 		self.calculate_taxes_and_totals()
 
@@ -1715,6 +1686,4 @@ def make_purchase_receipt(source_name, target_doc=None):
 		target_doc,
 	)
 
-	doc.set_onload("ignore_price_list", True)
-
 	return doc

erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py

@@ -26,13 +26,12 @@ from erpnext.stock.doctype.purchase_receipt.test_purchase_receipt import (
 	make_purchase_receipt,
 )
 from erpnext.stock.doctype.stock_entry.test_stock_entry import get_qty_after_transaction
-from erpnext.stock.tests.test_utils import StockTestMixin
 
 test_dependencies = ["Item", "Cost Center", "Payment Term", "Payment Terms Template"]
 test_ignore = ["Serial No"]
 
 
-class TestPurchaseInvoice(unittest.TestCase, StockTestMixin):
+class TestPurchaseInvoice(unittest.TestCase):
 	@classmethod
 	def setUpClass(self):
 		unlink_payment_on_cancel_of_invoice()
@@ -304,6 +303,59 @@ class TestPurchaseInvoice(unittest.TestCase, StockTestMixin):
 			self.assertEqual(expected_values[gle.account][1], gle.debit)
 			self.assertEqual(expected_values[gle.account][2], gle.credit)
 
+	def test_purchase_invoice_with_discount_accounting_enabled(self):
+		enable_discount_accounting()
+
+		discount_account = create_account(
+			account_name="Discount Account",
+			parent_account="Indirect Expenses - _TC",
+			company="_Test Company",
+		)
+		pi = make_purchase_invoice(discount_account=discount_account, rate=45)
+
+		expected_gle = [
+			["_Test Account Cost for Goods Sold - _TC", 250.0, 0.0, nowdate()],
+			["Creditors - _TC", 0.0, 225.0, nowdate()],
+			["Discount Account - _TC", 0.0, 25.0, nowdate()],
+		]
+
+		check_gl_entries(self, pi.name, expected_gle, nowdate())
+		enable_discount_accounting(enable=0)
+
+	def test_additional_discount_for_purchase_invoice_with_discount_accounting_enabled(self):
+		enable_discount_accounting()
+		additional_discount_account = create_account(
+			account_name="Discount Account",
+			parent_account="Indirect Expenses - _TC",
+			company="_Test Company",
+		)
+
+		pi = make_purchase_invoice(do_not_save=1, parent_cost_center="Main - _TC")
+		pi.apply_discount_on = "Grand Total"
+		pi.additional_discount_account = additional_discount_account
+		pi.additional_discount_percentage = 10
+		pi.disable_rounded_total = 1
+		pi.append(
+			"taxes",
+			{
+				"charge_type": "On Net Total",
+				"account_head": "_Test Account VAT - _TC",
+				"cost_center": "Main - _TC",
+				"description": "Test",
+				"rate": 10,
+			},
+		)
+		pi.submit()
+
+		expected_gle = [
+			["_Test Account Cost for Goods Sold - _TC", 250.0, 0.0, nowdate()],
+			["_Test Account VAT - _TC", 25.0, 0.0, nowdate()],
+			["Creditors - _TC", 0.0, 247.5, nowdate()],
+			["Discount Account - _TC", 0.0, 27.5, nowdate()],
+		]
+
+		check_gl_entries(self, pi.name, expected_gle, nowdate())
+
 	def test_purchase_invoice_change_naming_series(self):
 		pi = frappe.copy_doc(test_records[1])
 		pi.insert()
@@ -607,80 +659,6 @@ class TestPurchaseInvoice(unittest.TestCase, StockTestMixin):
 			self.assertEqual(expected_values[gle.account][0], gle.debit)
 			self.assertEqual(expected_values[gle.account][1], gle.credit)
 
-	def test_standalone_return_using_pi(self):
-		from erpnext.stock.doctype.stock_entry.test_stock_entry import make_stock_entry
-
-		item = self.make_item().name
-		company = "_Test Company with perpetual inventory"
-		warehouse = "Stores - TCP1"
-
-		make_stock_entry(item_code=item, target=warehouse, qty=50, rate=120)
-
-		return_pi = make_purchase_invoice(
-			is_return=1,
-			item=item,
-			qty=-10,
-			update_stock=1,
-			rate=100,
-			company=company,
-			warehouse=warehouse,
-			cost_center="Main - TCP1",
-		)
-
-		# assert that stock consumption is with actual rate
-		self.assertGLEs(
-			return_pi,
-			[{"credit": 1200, "debit": 0}],
-			gle_filters={"account": "Stock In Hand - TCP1"},
-		)
-
-		# assert loss booked in COGS
-		self.assertGLEs(
-			return_pi,
-			[{"credit": 0, "debit": 200}],
-			gle_filters={"account": "Cost of Goods Sold - TCP1"},
-		)
-
-	def test_return_with_lcv(self):
-		from erpnext.controllers.sales_and_purchase_return import make_return_doc
-		from erpnext.stock.doctype.landed_cost_voucher.test_landed_cost_voucher import (
-			create_landed_cost_voucher,
-		)
-
-		item = self.make_item().name
-		company = "_Test Company with perpetual inventory"
-		warehouse = "Stores - TCP1"
-		cost_center = "Main - TCP1"
-
-		pi = make_purchase_invoice(
-			item=item,
-			company=company,
-			warehouse=warehouse,
-			cost_center=cost_center,
-			update_stock=1,
-			qty=10,
-			rate=100,
-		)
-
-		# Create landed cost voucher - will increase valuation of received item by 10
-		create_landed_cost_voucher("Purchase Invoice", pi.name, pi.company, charges=100)
-		return_pi = make_return_doc(pi.doctype, pi.name)
-		return_pi.save().submit()
-
-		# assert that stock consumption is with actual in rate
-		self.assertGLEs(
-			return_pi,
-			[{"credit": 1100, "debit": 0}],
-			gle_filters={"account": "Stock In Hand - TCP1"},
-		)
-
-		# assert loss booked in COGS
-		self.assertGLEs(
-			return_pi,
-			[{"credit": 0, "debit": 100}],
-			gle_filters={"account": "Cost of Goods Sold - TCP1"},
-		)
-
 	def test_multi_currency_gle(self):
 		pi = make_purchase_invoice(
 			supplier="_Test Supplier USD",
@@ -1471,8 +1449,7 @@ class TestPurchaseInvoice(unittest.TestCase, StockTestMixin):
 		self.assertEqual(payment_entry.taxes[0].allocated_amount, 0)
 
 	def test_provisional_accounting_entry(self):
-		create_item("_Test Non Stock Item", is_stock_item=0)
-
+		item = create_item("_Test Non Stock Item", is_stock_item=0)
 		provisional_account = create_account(
 			account_name="Provision Account",
 			parent_account="Current Liabilities - _TC",
@@ -1495,8 +1472,6 @@ class TestPurchaseInvoice(unittest.TestCase, StockTestMixin):
 		pi.save()
 		pi.submit()
 
-		self.assertEquals(pr.items[0].provisional_expense_account, "Provision Account - _TC")
-
 		# Check GLE for Purchase Invoice
 		expected_gle = [
 			["Cost of Goods Sold - _TC", 250, 0, add_days(pr.posting_date, -1)],
@@ -1514,72 +1489,9 @@ class TestPurchaseInvoice(unittest.TestCase, StockTestMixin):
 
 		check_gl_entries(self, pr.name, expected_gle_for_purchase_receipt, pr.posting_date)
 
-		# Cancel purchase invoice to check reverse provisional entry cancellation
-		pi.cancel()
-
-		expected_gle_for_purchase_receipt_post_pi_cancel = [
-			["Provision Account - _TC", 0, 250, pi.posting_date],
-			["_Test Account Cost for Goods Sold - _TC", 250, 0, pi.posting_date],
-		]
-
-		check_gl_entries(
-			self, pr.name, expected_gle_for_purchase_receipt_post_pi_cancel, pr.posting_date
-		)
-
 		company.enable_provisional_accounting_for_non_stock_items = 0
 		company.save()
 
-	def test_item_less_defaults(self):
-
-		pi = frappe.new_doc("Purchase Invoice")
-		pi.supplier = "_Test Supplier"
-		pi.company = "_Test Company"
-		pi.append(
-			"items",
-			{
-				"item_name": "Opening item",
-				"qty": 1,
-				"uom": "Tonne",
-				"stock_uom": "Kg",
-				"rate": 1000,
-				"expense_account": "Stock Received But Not Billed - _TC",
-			},
-		)
-
-		pi.save()
-		self.assertEqual(pi.items[0].conversion_factor, 1000)
-
-	def test_batch_expiry_for_purchase_invoice(self):
-		from erpnext.controllers.sales_and_purchase_return import make_return_doc
-
-		item = self.make_item(
-			"_Test Batch Item For Return Check",
-			{
-				"is_purchase_item": 1,
-				"is_stock_item": 1,
-				"has_batch_no": 1,
-				"create_new_batch": 1,
-				"batch_number_series": "TBIRC.#####",
-			},
-		)
-
-		pi = make_purchase_invoice(
-			qty=1,
-			item_code=item.name,
-			update_stock=True,
-		)
-
-		pi.load_from_db()
-		batch_no = pi.items[0].batch_no
-		self.assertTrue(batch_no)
-
-		frappe.db.set_value("Batch", batch_no, "expiry_date", add_days(nowdate(), -1))
-
-		return_pi = make_return_doc(pi.doctype, pi.name)
-		return_pi.save().submit()
-
-		self.assertTrue(return_pi.docstatus == 1)
-
 
 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

@@ -706,7 +706,6 @@
    "label": "Valuation Rate",
    "no_copy": 1,
    "options": "Company:company:default_currency",
-   "precision": "6",
    "print_hide": 1,
    "read_only": 1
   },
@@ -872,7 +871,7 @@
  "idx": 1,
  "istable": 1,
  "links": [],
- "modified": "2022-10-12 03:37:29.032732",
+ "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

@@ -34,9 +34,7 @@ erpnext.accounts.SalesInvoiceController = erpnext.selling.SellingController.exte
 		var me = this;
 		this._super();
 
-		this.frm.ignore_doctypes_on_cancel_all = ['POS Invoice', 'Timesheet', 'POS Invoice Merge Log',
-			'POS Closing Entry', 'Journal Entry', 'Payment Entry'];
-
+		this.frm.ignore_doctypes_on_cancel_all = ['POS Invoice', 'Timesheet', 'POS Invoice Merge Log', 'POS Closing Entry'];
 		if(!this.frm.doc.__islocal && !this.frm.doc.customer && this.frm.doc.debit_to) {
 			// show debit_to in print format
 			this.frm.set_df_property("debit_to", "print_hide", 0);
@@ -53,6 +51,7 @@ erpnext.accounts.SalesInvoiceController = erpnext.selling.SellingController.exte
 			me.frm.refresh_fields();
 		}
 		erpnext.queries.setup_warehouse_query(this.frm);
+		erpnext.accounts.dimensions.setup_dimension_filters(this.frm, this.frm.doctype);
 	},
 
 	refresh: function(doc, dt, dn) {
@@ -474,21 +473,9 @@ erpnext.accounts.SalesInvoiceController = erpnext.selling.SellingController.exte
 				let row = frappe.get_doc(d.doctype, d.name)
 				set_timesheet_detail_rate(row.doctype, row.name, me.frm.doc.currency, row.timesheet_detail)
 			});
-			this.frm.trigger("calculate_timesheet_totals");
+			frm.trigger("calculate_timesheet_totals");
 		}
-	},
-
-	is_cash_or_non_trade_discount() {
-		this.frm.set_df_property("additional_discount_account", "hidden", 1 - this.frm.doc.is_cash_or_non_trade_discount);
-		this.frm.set_df_property("additional_discount_account", "reqd", this.frm.doc.is_cash_or_non_trade_discount);
-
-		if (!this.frm.doc.is_cash_or_non_trade_discount) {
-			this.frm.set_value("additional_discount_account", "");
-		}
-
-		this.calculate_taxes_and_totals();
 	}
-
 });
 
 // for backward compatibility: combine new and previous states
@@ -896,44 +883,27 @@ frappe.ui.form.on('Sales Invoice', {
 
 	set_timesheet_data: function(frm, timesheets) {
 		frm.clear_table("timesheets")
-		timesheets.forEach(async (timesheet) => {
+		timesheets.forEach(timesheet => {
 			if (frm.doc.currency != timesheet.currency) {
-				const exchange_rate = await frm.events.get_exchange_rate(
-					frm, timesheet.currency, frm.doc.currency
-				)
-				frm.events.append_time_log(frm, timesheet, exchange_rate)
+				frappe.call({
+					method: "erpnext.setup.utils.get_exchange_rate",
+					args: {
+						from_currency: timesheet.currency,
+						to_currency: frm.doc.currency
+					},
+					callback: function(r) {
+						if (r.message) {
+							exchange_rate = r.message;
+							frm.events.append_time_log(frm, timesheet, exchange_rate);
+						}
+					}
+				});
 			} else {
 				frm.events.append_time_log(frm, timesheet, 1.0);
 			}
 		});
 	},
 
-	async get_exchange_rate(frm, from_currency, to_currency) {
-		if (
-			frm.exchange_rates
-			&& frm.exchange_rates[from_currency]
-			&& frm.exchange_rates[from_currency][to_currency]
-		) {
-			return frm.exchange_rates[from_currency][to_currency];
-		}
-
-		return frappe.call({
-			method: "erpnext.setup.utils.get_exchange_rate",
-			args: {
-				from_currency,
-				to_currency
-			},
-			callback: function(r) {
-				if (r.message) {
-					// cache exchange rates
-					frm.exchange_rates = frm.exchange_rates || {};
-					frm.exchange_rates[from_currency] = frm.exchange_rates[from_currency] || {};
-					frm.exchange_rates[from_currency][to_currency] = r.message;
-				}
-			}
-		});
-	},
-
 	append_time_log: function(frm, time_log, exchange_rate) {
 		const row = frm.add_child("timesheets");
 		row.activity_type = time_log.activity_type;
@@ -944,7 +914,7 @@ frappe.ui.form.on('Sales Invoice', {
 		row.billing_hours = time_log.billing_hours;
 		row.billing_amount = flt(time_log.billing_amount) * flt(exchange_rate);
 		row.timesheet_detail = time_log.name;
-		row.project_name = time_log.project_name;
+    row.project_name = time_log.project_name;
 
 		frm.refresh_field("timesheets");
 		frm.trigger("calculate_timesheet_totals");

erpnext/accounts/doctype/sales_invoice/sales_invoice.json

@@ -106,7 +106,6 @@
   "loyalty_redemption_cost_center",
   "section_break_49",
   "apply_discount_on",
-  "is_cash_or_non_trade_discount",
   "base_discount_amount",
   "additional_discount_account",
   "column_break_51",
@@ -414,7 +413,7 @@
   },
   {
    "default": "0",
-   "depends_on": "eval: doc.is_return",
+   "depends_on": "eval: doc.is_return && doc.return_against",
    "fieldname": "update_billed_amount_in_sales_order",
    "fieldtype": "Check",
    "hide_days": 1,
@@ -651,6 +650,7 @@
    "hide_days": 1,
    "hide_seconds": 1,
    "label": "Ignore Pricing Rule",
+   "no_copy": 1,
    "print_hide": 1
   },
   {
@@ -1988,7 +1988,7 @@
   {
    "fieldname": "additional_discount_account",
    "fieldtype": "Link",
-   "label": "Discount Account",
+   "label": "Additional Discount Account",
    "options": "Account"
   },
   {
@@ -2026,13 +2026,6 @@
    "fieldtype": "Currency",
    "label": "Amount Eligible for Commission",
    "read_only": 1
-  },
-  {
-   "default": "0",
-   "depends_on": "eval: doc.apply_discount_on == \"Grand Total\"",
-   "fieldname": "is_cash_or_non_trade_discount",
-   "fieldtype": "Check",
-   "label": "Is Cash or Non Trade Discount"
   }
  ],
  "icon": "fa fa-file-text",
@@ -2045,7 +2038,7 @@
    "link_fieldname": "consolidated_invoice"
   }
  ],
- "modified": "2022-09-16 17:44:22.227332",
+ "modified": "2022-03-08 16:08:53.517903",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Sales Invoice",

erpnext/accounts/doctype/sales_invoice/sales_invoice.py

@@ -116,7 +116,6 @@ class SalesInvoice(SellingController):
 		self.set_income_account_for_fixed_assets()
 		self.validate_item_cost_centers()
 		self.validate_income_account()
-		self.check_conversion_rate()
 
 		validate_inter_company_party(
 			self.doctype, self.customer, self.company, self.inter_company_invoice_reference
@@ -1040,7 +1039,7 @@ class SalesInvoice(SellingController):
 		)
 
 		if grand_total and not self.is_internal_transfer():
-			# Did not use base_grand_total to book rounding loss gle
+			# Didnot use base_grand_total to book rounding loss gle
 			gl_entries.append(
 				self.get_gl_dict(
 					{
@@ -1114,24 +1113,24 @@ 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
 						)
 						asset.db_set("disposal_date", None)
 
-					else:
 						if asset.calculate_depreciation:
-							self.depreciate_asset(asset)
+							self.reverse_depreciation_entry_made_after_sale(asset)
+							self.reset_depreciation_schedule(asset)
 
+					else:
 						fixed_asset_gl_entries = get_gl_entries_on_asset_disposal(
 							asset, item.base_net_amount, item.finance_book
 						)
 						asset.db_set("disposal_date", self.posting_date)
 
+						if asset.calculate_depreciation:
+							self.depreciate_asset(asset)
+
 					for gle in fixed_asset_gl_entries:
 						gle["against"] = self.customer
 						gl_entries.append(self.get_gl_dict(gle, item=item))
@@ -1199,7 +1198,6 @@ class SalesInvoice(SellingController):
 		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
@@ -1209,7 +1207,6 @@ class SalesInvoice(SellingController):
 
 		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(
@@ -1476,9 +1473,7 @@ class SalesInvoice(SellingController):
 			and self.base_rounding_adjustment
 			and not self.is_internal_transfer()
 		):
-			round_off_account, round_off_cost_center = get_round_off_account_and_cost_center(
-				self.company, "Sales Invoice", self.name
-			)
+			round_off_account, round_off_cost_center = get_round_off_account_and_cost_center(self.company)
 
 			gl_entries.append(
 				self.get_gl_dict(
@@ -2157,13 +2152,11 @@ def make_inter_company_transaction(doctype, source_name, target_doc=None):
 		target_detail_field = "sales_invoice_item" if doctype == "Sales Invoice" else "sales_order_item"
 		source_document_warehouse_field = "target_warehouse"
 		target_document_warehouse_field = "from_warehouse"
-		received_items = get_received_items(source_name, target_doctype, target_detail_field)
 	else:
 		source_doc = frappe.get_doc(doctype, source_name)
 		target_doctype = "Sales Invoice" if doctype == "Purchase Invoice" else "Sales Order"
 		source_document_warehouse_field = "from_warehouse"
 		target_document_warehouse_field = "target_warehouse"
-		received_items = {}
 
 	validate_inter_company_transaction(source_doc, doctype)
 	details = get_inter_company_details(source_doc, doctype)
@@ -2187,9 +2180,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
@@ -2232,17 +2222,12 @@ def make_inter_company_transaction(doctype, source_name, target_doc=None):
 				shipping_address_name=target_doc.shipping_address_name,
 			)
 
-	def update_item(source, target, source_parent):
-		target.qty = flt(source.qty) - received_items.get(source.name, 0.0)
-
 	item_field_map = {
 		"doctype": target_doctype + " Item",
 		"field_no_map": ["income_account", "expense_account", "cost_center", "warehouse"],
 		"field_map": {
 			"rate": "rate",
 		},
-		"postprocess": update_item,
-		"condition": lambda doc: doc.qty > 0,
 	}
 
 	if doctype in ["Sales Invoice", "Sales Order"]:
@@ -2280,28 +2265,6 @@ def make_inter_company_transaction(doctype, source_name, target_doc=None):
 	return doclist
 
 
-def get_received_items(reference_name, doctype, reference_fieldname):
-	target_doctypes = frappe.get_all(
-		doctype,
-		filters={"inter_company_invoice_reference": reference_name, "docstatus": 1},
-		as_list=True,
-	)
-
-	if target_doctypes:
-		target_doctypes = list(target_doctypes[0])
-
-	received_items_map = frappe._dict(
-		frappe.get_all(
-			doctype + " Item",
-			filters={"parent": ("in", target_doctypes)},
-			fields=[reference_fieldname, "qty"],
-			as_list=1,
-		)
-	)
-
-	return received_items_map
-
-
 def set_purchase_references(doc):
 	# add internal PO or PR links if any
 	if doc.is_internal_transfer():

erpnext/accounts/doctype/sales_invoice/sales_invoice_dashboard.py

@@ -11,12 +11,8 @@ def get_data():
 			"Payment Request": "reference_name",
 			"Sales Invoice": "return_against",
 			"Auto Repeat": "reference_document",
-			"Purchase Invoice": "inter_company_invoice_reference",
-		},
-		"internal_links": {
-			"Sales Order": ["items", "sales_order"],
-			"Timesheet": ["timesheets", "time_sheet"],
 		},
+		"internal_links": {"Sales Order": ["items", "sales_order"]},
 		"transactions": [
 			{
 				"label": _("Payment"),
@@ -31,6 +27,5 @@ def get_data():
 			{"label": _("Reference"), "items": ["Timesheet", "Delivery Note", "Sales Order"]},
 			{"label": _("Returns"), "items": ["Sales Invoice"]},
 			{"label": _("Subscription"), "items": ["Auto Repeat"]},
-			{"label": _("Internal Transfers"), "items": ["Purchase Invoice"]},
 		],
 	}

erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py

@@ -7,7 +7,7 @@ import unittest
 import frappe
 from frappe.model.dynamic_links import get_dynamic_link_map
 from frappe.model.naming import make_autoname
-from frappe.utils import add_days, flt, getdate, nowdate, today
+from frappe.utils import add_days, flt, getdate, nowdate
 from six import iteritems
 
 from erpnext.accounts.doctype.account.test_account import create_account, get_inventory_account
@@ -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(
@@ -1623,17 +1612,6 @@ class TestSalesInvoice(unittest.TestCase):
 
 		self.assertTrue(gle)
 
-	def test_invoice_exchange_rate(self):
-		si = create_sales_invoice(
-			customer="_Test Customer USD",
-			debit_to="_Test Receivable USD - _TC",
-			currency="USD",
-			conversion_rate=1,
-			do_not_save=1,
-		)
-
-		self.assertRaises(frappe.ValidationError, si.save)
-
 	def test_invalid_currency(self):
 		# Customer currency = USD
 
@@ -1698,7 +1676,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,
 		)
@@ -1742,7 +1720,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):
+	def test_outstanding_amount_after_advance_payment_entry_cancelation(self):
 		pe = frappe.get_doc(
 			{
 				"doctype": "Payment Entry",
@@ -2029,13 +2007,6 @@ class TestSalesInvoice(unittest.TestCase):
 			self.assertEqual(expected_values[gle.account][2], gle.credit)
 
 	def test_rounding_adjustment_3(self):
-		from erpnext.accounts.doctype.accounting_dimension.test_accounting_dimension import (
-			create_dimension,
-			disable_dimension,
-		)
-
-		create_dimension()
-
 		si = create_sales_invoice(do_not_save=True)
 		si.items = []
 		for d in [(1122, 2), (1122.01, 1), (1122.01, 1)]:
@@ -2063,10 +2034,6 @@ class TestSalesInvoice(unittest.TestCase):
 					"included_in_print_rate": 1,
 				},
 			)
-
-		si.cost_center = "_Test Cost Center 2 - _TC"
-		si.location = "Block 1"
-
 		si.save()
 		si.submit()
 		self.assertEqual(si.net_total, 4007.16)
@@ -2102,18 +2069,6 @@ class TestSalesInvoice(unittest.TestCase):
 
 		self.assertEqual(debit_credit_diff, 0)
 
-		round_off_gle = frappe.db.get_value(
-			"GL Entry",
-			{"voucher_type": "Sales Invoice", "voucher_no": si.name, "account": "Round Off - _TC"},
-			["cost_center", "location"],
-			as_dict=1,
-		)
-
-		self.assertEqual(round_off_gle.cost_center, "_Test Cost Center 2 - _TC")
-		self.assertEqual(round_off_gle.location, "Block 1")
-
-		disable_dimension()
-
 	def test_sales_invoice_with_shipping_rule(self):
 		from erpnext.accounts.doctype.shipping_rule.test_shipping_rule import create_shipping_rule
 
@@ -2380,6 +2335,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",
@@ -2439,9 +2417,34 @@ class TestSalesInvoice(unittest.TestCase):
 		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",
@@ -2455,7 +2458,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
 		)
@@ -2559,7 +2562,6 @@ class TestSalesInvoice(unittest.TestCase):
 		# reset
 		einvoice_settings = frappe.get_doc("E Invoice Settings")
 		einvoice_settings.enable = 0
-		einvoice_settings.save()
 		frappe.flags.country = country
 
 	def test_einvoice_json(self):
@@ -2583,287 +2585,6 @@ class TestSalesInvoice(unittest.TestCase):
 		einvoice = make_einvoice(si)
 		validate_totals(einvoice)
 
-	def test_einvoice_discounts(self):
-		from erpnext.regional.india.e_invoice.utils import make_einvoice, validate_totals
-
-		frappe.db.set_single_value("E Invoice Settings", "dont_show_discounts_in_e_invoice", False)
-
-		# Normal Itemized Discount
-		si = get_sales_invoice_for_e_invoice()
-		si.apply_discount_on = ""
-		si.items[0].price_list_rate = 12
-		si.items[0].discount_percentage = 16.6666666667
-		si.items[0].rate = 10
-
-		si.items[1].price_list_rate = 15
-		si.items[1].discount_amount = 5
-		si.items[1].rate = 10
-		si.save()
-
-		einvoice = make_einvoice(si)
-		validate_totals(einvoice)
-
-		self.assertEqual(einvoice["ItemList"][0]["Discount"], 4000)
-		self.assertEqual(einvoice["ItemList"][1]["Discount"], 2100)
-		self.assertEqual(einvoice["ItemList"][2]["Discount"], 222)
-		self.assertEqual(einvoice["ItemList"][3]["Discount"], 5555)
-		self.assertEqual(einvoice["ValDtls"]["Discount"], 0)
-
-		self.assertEqual(einvoice["ItemList"][0]["UnitPrice"], 12)
-		self.assertEqual(einvoice["ItemList"][1]["UnitPrice"], 15)
-		self.assertEqual(einvoice["ItemList"][2]["UnitPrice"], 20)
-		self.assertEqual(einvoice["ItemList"][3]["UnitPrice"], 10)
-
-		# Invoice Discount on net total
-		si = get_sales_invoice_for_e_invoice()
-		si.apply_discount_on = "Net Total"
-		si.discount_amount = 400
-		si.save()
-
-		einvoice = make_einvoice(si)
-		validate_totals(einvoice)
-
-		self.assertEqual(einvoice["ItemList"][0]["Discount"], 253.61)
-		self.assertEqual(einvoice["ItemList"][1]["Discount"], 66.57)
-		self.assertEqual(einvoice["ItemList"][2]["Discount"], 243.11)
-		self.assertEqual(einvoice["ItemList"][3]["Discount"], 5613.71)
-		self.assertEqual(einvoice["ValDtls"]["Discount"], 0)
-
-		self.assertEqual(einvoice["ItemList"][0]["UnitPrice"], 12)
-		self.assertEqual(einvoice["ItemList"][1]["UnitPrice"], 15)
-		self.assertEqual(einvoice["ItemList"][2]["UnitPrice"], 20)
-		self.assertEqual(einvoice["ItemList"][3]["UnitPrice"], 10)
-
-		# Invoice Discount on grand total (Itemized Discount)
-		si = get_sales_invoice_for_e_invoice()
-		si.apply_discount_on = "Grand Total"
-		si.discount_amount = 400
-		si.save()
-
-		einvoice = make_einvoice(si)
-		validate_totals(einvoice)
-
-		self.assertEqual(einvoice["ItemList"][0]["Discount"], 214.93)
-		self.assertEqual(einvoice["ItemList"][1]["Discount"], 56.42)
-		self.assertEqual(einvoice["ItemList"][2]["Discount"], 239.89)
-		self.assertEqual(einvoice["ItemList"][3]["Discount"], 5604.75)
-		self.assertEqual(einvoice["ValDtls"]["Discount"], 0)
-
-		self.assertEqual(einvoice["ItemList"][0]["UnitPrice"], 12)
-		self.assertEqual(einvoice["ItemList"][1]["UnitPrice"], 15)
-		self.assertEqual(einvoice["ItemList"][2]["UnitPrice"], 20)
-		self.assertEqual(einvoice["ItemList"][3]["UnitPrice"], 10)
-
-		# Invoice Discount on grand total (Cash/Non-Trade Discount)
-		si = get_sales_invoice_for_e_invoice()
-		si.apply_discount_on = "Grand Total"
-		si.is_cash_or_non_trade_discount = 1
-		si.discount_amount = 400
-		si.save()
-
-		einvoice = make_einvoice(si)
-		validate_totals(einvoice)
-
-		self.assertEqual(einvoice["ItemList"][0]["Discount"], 0)
-		self.assertEqual(einvoice["ItemList"][1]["Discount"], 0)
-		self.assertEqual(einvoice["ItemList"][2]["Discount"], 222.0)
-		self.assertEqual(einvoice["ItemList"][3]["Discount"], 5555.0)
-		self.assertEqual(einvoice["ValDtls"]["Discount"], 400)
-
-		self.assertEqual(einvoice["ItemList"][0]["UnitPrice"], 12)
-		self.assertEqual(einvoice["ItemList"][1]["UnitPrice"], 15)
-		self.assertEqual(einvoice["ItemList"][2]["UnitPrice"], 20)
-		self.assertEqual(einvoice["ItemList"][3]["UnitPrice"], 10)
-
-		si = get_sales_invoice_for_e_invoice()
-		si.apply_discount_on = ""
-		si.items[1].price_list_rate = 15
-		si.items[1].discount_amount = -5
-		si.items[1].rate = 20
-		si.save()
-
-		einvoice = make_einvoice(si)
-		validate_totals(einvoice)
-
-		self.assertEqual(einvoice["ItemList"][1]["Discount"], 0)
-		self.assertEqual(einvoice["ItemList"][1]["UnitPrice"], 20)
-
-	def test_einvoice_without_discounts(self):
-		from erpnext.regional.india.e_invoice.utils import make_einvoice, validate_totals
-
-		frappe.db.set_single_value("E Invoice Settings", "dont_show_discounts_in_e_invoice", True)
-
-		# Normal Itemized Discount
-		si = get_sales_invoice_for_e_invoice()
-		si.apply_discount_on = ""
-		si.items[0].price_list_rate = 12
-		si.items[0].discount_percentage = 16.6666666667
-		si.items[0].rate = 10
-
-		si.items[1].price_list_rate = 15
-		si.items[1].discount_amount = 5
-		si.items[1].rate = 10
-		si.save()
-
-		einvoice = make_einvoice(si)
-		validate_totals(einvoice)
-
-		self.assertEqual(einvoice["ItemList"][0]["Discount"], 0)
-		self.assertEqual(einvoice["ItemList"][1]["Discount"], 0)
-		self.assertEqual(einvoice["ItemList"][2]["Discount"], 0)
-		self.assertEqual(einvoice["ItemList"][3]["Discount"], 0)
-		self.assertEqual(einvoice["ValDtls"]["Discount"], 0)
-
-		self.assertEqual(einvoice["ItemList"][0]["UnitPrice"], 10)
-		self.assertEqual(einvoice["ItemList"][1]["UnitPrice"], 10)
-		self.assertEqual(einvoice["ItemList"][2]["UnitPrice"], 18)
-		self.assertEqual(einvoice["ItemList"][3]["UnitPrice"], 5)
-
-		# Invoice Discount on net total
-		si = get_sales_invoice_for_e_invoice()
-		si.apply_discount_on = "Net Total"
-		si.discount_amount = 400
-		si.save()
-
-		einvoice = make_einvoice(si)
-		validate_totals(einvoice)
-
-		self.assertEqual(einvoice["ItemList"][0]["Discount"], 0)
-		self.assertEqual(einvoice["ItemList"][1]["Discount"], 0)
-		self.assertEqual(einvoice["ItemList"][2]["Discount"], 0)
-		self.assertEqual(einvoice["ItemList"][3]["Discount"], 0)
-		self.assertEqual(einvoice["ValDtls"]["Discount"], 0)
-
-		self.assertEqual(einvoice["ItemList"][0]["UnitPrice"], 11.87)
-		self.assertEqual(einvoice["ItemList"][1]["UnitPrice"], 14.84)
-		self.assertEqual(einvoice["ItemList"][2]["UnitPrice"], 17.81)
-		self.assertEqual(einvoice["ItemList"][3]["UnitPrice"], 4.95)
-
-		# Invoice Discount on grand total (Itemized Discount)
-		si = get_sales_invoice_for_e_invoice()
-		si.apply_discount_on = "Grand Total"
-		si.discount_amount = 400
-		si.save()
-
-		einvoice = make_einvoice(si)
-		validate_totals(einvoice)
-
-		self.assertEqual(einvoice["ItemList"][0]["Discount"], 0)
-		self.assertEqual(einvoice["ItemList"][1]["Discount"], 0)
-		self.assertEqual(einvoice["ItemList"][2]["Discount"], 0)
-		self.assertEqual(einvoice["ItemList"][3]["Discount"], 0)
-		self.assertEqual(einvoice["ValDtls"]["Discount"], 0)
-
-		self.assertEqual(einvoice["ItemList"][0]["UnitPrice"], 11.89)
-		self.assertEqual(einvoice["ItemList"][1]["UnitPrice"], 14.87)
-		self.assertEqual(einvoice["ItemList"][2]["UnitPrice"], 17.84)
-		self.assertEqual(einvoice["ItemList"][3]["UnitPrice"], 4.96)
-
-		# Invoice Discount on grand total (Cash/Non-Trade Discount)
-		si = get_sales_invoice_for_e_invoice()
-		si.apply_discount_on = "Grand Total"
-		si.is_cash_or_non_trade_discount = 1
-		si.discount_amount = 400
-		si.save()
-
-		einvoice = make_einvoice(si)
-		validate_totals(einvoice)
-
-		self.assertEqual(einvoice["ItemList"][0]["Discount"], 0)
-		self.assertEqual(einvoice["ItemList"][1]["Discount"], 0)
-		self.assertEqual(einvoice["ItemList"][2]["Discount"], 0)
-		self.assertEqual(einvoice["ItemList"][3]["Discount"], 0)
-		self.assertEqual(einvoice["ValDtls"]["Discount"], 400)
-
-		self.assertEqual(einvoice["ItemList"][0]["UnitPrice"], 12)
-		self.assertEqual(einvoice["ItemList"][1]["UnitPrice"], 15)
-		self.assertEqual(einvoice["ItemList"][2]["UnitPrice"], 18)
-		self.assertEqual(einvoice["ItemList"][3]["UnitPrice"], 5)
-
-		si = get_sales_invoice_for_e_invoice()
-		si.apply_discount_on = ""
-		si.items[1].price_list_rate = 15
-		si.items[1].discount_amount = -5
-		si.items[1].rate = 20
-		si.save()
-
-		einvoice = make_einvoice(si)
-		validate_totals(einvoice)
-
-		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")
 
@@ -3312,7 +3033,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
@@ -3341,126 +3062,6 @@ class TestSalesInvoice(unittest.TestCase):
 		si.reload()
 		self.assertTrue(si.items[0].serial_no)
 
-	def test_sales_invoice_with_disabled_account(self):
-		try:
-			account = frappe.get_doc("Account", "VAT 5% - _TC")
-			account.disabled = 1
-			account.save()
-
-			si = create_sales_invoice(do_not_save=True)
-			si.posting_date = add_days(getdate(), 1)
-			si.taxes = []
-
-			si.append(
-				"taxes",
-				{
-					"charge_type": "On Net Total",
-					"account_head": "VAT 5% - _TC",
-					"cost_center": "Main - _TC",
-					"description": "VAT @ 5.0",
-					"rate": 9,
-				},
-			)
-			si.save()
-
-			with self.assertRaises(frappe.ValidationError) as err:
-				si.submit()
-
-			self.assertTrue(
-				"Cannot create accounting entries against disabled accounts" in str(err.exception)
-			)
-
-		finally:
-			account.disabled = 0
-			account.save()
-
-	def test_gain_loss_with_advance_entry(self):
-		from erpnext.accounts.doctype.journal_entry.test_journal_entry import make_journal_entry
-
-		unlink_enabled = frappe.db.get_value(
-			"Accounts Settings", "Accounts Settings", "unlink_payment_on_cancel_of_invoice"
-		)
-
-		frappe.db.set_value(
-			"Accounts Settings", "Accounts Settings", "unlink_payment_on_cancel_of_invoice", 1
-		)
-
-		jv = make_journal_entry("_Test Receivable USD - _TC", "_Test Bank - _TC", -7000, save=False)
-
-		jv.accounts[0].exchange_rate = 70
-		jv.accounts[0].credit_in_account_currency = 100
-		jv.accounts[0].party_type = "Customer"
-		jv.accounts[0].party = "_Test Customer USD"
-
-		jv.save()
-		jv.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=100,
-		)
-
-		si.append(
-			"advances",
-			{
-				"reference_type": "Journal Entry",
-				"reference_name": jv.name,
-				"reference_row": jv.accounts[0].name,
-				"advance_amount": 100,
-				"allocated_amount": 100,
-				"ref_exchange_rate": 70,
-			},
-		)
-		si.save()
-		si.submit()
-
-		expected_gle = [
-			["_Test Receivable USD - _TC", 7500.0, 500],
-			["Exchange Gain/Loss - _TC", 500.0, 0.0],
-			["Sales - _TC", 0.0, 7500.0],
-		]
-
-		check_gl_entries(self, si.name, expected_gle, nowdate())
-
-		frappe.db.set_value(
-			"Accounts Settings", "Accounts Settings", "unlink_payment_on_cancel_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
-
-		item = make_item(
-			"_Test Batch Item For Return Check",
-			{
-				"is_purchase_item": 1,
-				"is_stock_item": 1,
-				"has_batch_no": 1,
-				"create_new_batch": 1,
-				"batch_number_series": "TBIRC.#####",
-			},
-		)
-
-		pr = make_purchase_receipt(qty=1, item_code=item.name)
-
-		batch_no = pr.items[0].batch_no
-		si = create_sales_invoice(qty=1, item_code=item.name, update_stock=1, batch_no=batch_no)
-
-		si.load_from_db()
-		batch_no = si.items[0].batch_no
-		self.assertTrue(batch_no)
-
-		frappe.db.set_value("Batch", batch_no, "expiry_date", add_days(today(), -1))
-
-		return_si = make_return_doc(si.doctype, si.name)
-		return_si.save().submit()
-
-		self.assertTrue(return_si.docstatus == 1)
-
 
 def get_sales_invoice_for_e_invoice():
 	si = make_sales_invoice_for_ewaybill()
@@ -3494,36 +3095,6 @@ def get_sales_invoice_for_e_invoice():
 		},
 	)
 
-	si.append(
-		"items",
-		{
-			"item_code": "_Test Item",
-			"uom": "Nos",
-			"warehouse": "_Test Warehouse - _TC",
-			"qty": 111,
-			"price_list_rate": 20,
-			"discount_percentage": 10,
-			"income_account": "Sales - _TC",
-			"expense_account": "Cost of Goods Sold - _TC",
-			"cost_center": "_Test Cost Center - _TC",
-		},
-	)
-
-	si.append(
-		"items",
-		{
-			"item_code": "_Test Item 2",
-			"uom": "Nos",
-			"warehouse": "_Test Warehouse - _TC",
-			"qty": 1111,
-			"price_list_rate": 10,
-			"rate": 5,
-			"income_account": "Sales - _TC",
-			"expense_account": "Cost of Goods Sold - _TC",
-			"cost_center": "_Test Cost Center - _TC",
-		},
-	)
-
 	return si
 
 
@@ -3717,7 +3288,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",
@@ -3730,9 +3300,8 @@ 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,
 		},
 	)
 
@@ -3844,34 +3413,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(
@@ -3894,19 +3435,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

@@ -279,6 +279,7 @@
    "label": "Discount (%) on Price List Rate with Margin",
    "oldfieldname": "adj_rate",
    "oldfieldtype": "Float",
+   "precision": "2",
    "print_hide": 1
   },
   {
@@ -812,8 +813,6 @@
    "fieldtype": "Currency",
    "label": "Incoming Rate (Costing)",
    "no_copy": 1,
-   "options": "Company:company:default_currency",
-   "precision": "6",
    "print_hide": 1
   },
   {
@@ -843,7 +842,7 @@
  "idx": 1,
  "istable": 1,
  "links": [],
- "modified": "2022-10-10 20:57:38.340026",
+ "modified": "2022-02-24 14:41:36.392560",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Sales Invoice Item",

erpnext/accounts/doctype/tax_withheld_vouchers/tax_withheld_vouchers.json

@@ -1,49 +0,0 @@
-{
- "actions": [],
- "autoname": "autoincrement",
- "creation": "2022-09-13 16:18:59.404842",
- "doctype": "DocType",
- "editable_grid": 1,
- "engine": "InnoDB",
- "field_order": [
-  "voucher_type",
-  "voucher_name",
-  "taxable_amount"
- ],
- "fields": [
-  {
-   "fieldname": "voucher_type",
-   "fieldtype": "Link",
-   "in_list_view": 1,
-   "label": "Voucher Type",
-   "options": "DocType"
-  },
-  {
-   "fieldname": "voucher_name",
-   "fieldtype": "Dynamic Link",
-   "in_list_view": 1,
-   "label": "Voucher Name",
-   "options": "voucher_type"
-  },
-  {
-   "fieldname": "taxable_amount",
-   "fieldtype": "Currency",
-   "in_list_view": 1,
-   "label": "Taxable Amount",
-   "options": "Company:company:default_currency"
-  }
- ],
- "index_web_pages_for_search": 1,
- "istable": 1,
- "links": [],
- "modified": "2022-09-13 23:40:41.479208",
- "modified_by": "Administrator",
- "module": "Accounts",
- "name": "Tax Withheld Vouchers",
- "naming_rule": "Autoincrement",
- "owner": "Administrator",
- "permissions": [],
- "sort_field": "modified",
- "sort_order": "DESC",
- "states": []
-}

erpnext/accounts/doctype/tax_withheld_vouchers/tax_withheld_vouchers.py

@@ -1,9 +0,0 @@
-# Copyright (c) 2022, Frappe Technologies Pvt. Ltd. and contributors
-# For license information, please see license.txt
-
-# import frappe
-from frappe.model.document import Document
-
-
-class TaxWithheldVouchers(Document):
-	pass

erpnext/accounts/doctype/tax_withholding_category/tax_withholding_category.py

@@ -100,7 +100,7 @@ def get_party_tax_withholding_details(inv, tax_withholding_category=None):
 			).format(tax_withholding_category, inv.company, party)
 		)
 
-	tax_amount, tax_deducted, tax_deducted_on_advances, voucher_wise_amount = get_tax_amount(
+	tax_amount, tax_deducted, tax_deducted_on_advances = get_tax_amount(
 		party_type, parties, inv, tax_details, posting_date, pan_no
 	)
 
@@ -110,7 +110,7 @@ def get_party_tax_withholding_details(inv, tax_withholding_category=None):
 		tax_row = get_tax_row_for_tcs(inv, tax_details, tax_amount, tax_deducted)
 
 	if inv.doctype == "Purchase Invoice":
-		return tax_row, tax_deducted_on_advances, voucher_wise_amount
+		return tax_row, tax_deducted_on_advances
 	else:
 		return tax_row
 
@@ -208,9 +208,7 @@ def get_lower_deduction_certificate(tax_details, pan_no):
 
 
 def get_tax_amount(party_type, parties, inv, tax_details, posting_date, pan_no=None):
-	vouchers, voucher_wise_amount = get_invoice_vouchers(
-		parties, tax_details, inv.company, party_type=party_type
-	)
+	vouchers = get_invoice_vouchers(parties, tax_details, inv.company, party_type=party_type)
 	advance_vouchers = get_advance_vouchers(
 		parties,
 		company=inv.company,
@@ -229,7 +227,6 @@ def get_tax_amount(party_type, parties, inv, tax_details, posting_date, pan_no=N
 		tax_deducted = get_deducted_tax(taxable_vouchers, tax_details)
 
 	tax_amount = 0
-
 	if party_type == "Supplier":
 		ldc = get_lower_deduction_certificate(tax_details, pan_no)
 		if tax_deducted:
@@ -240,9 +237,6 @@ def get_tax_amount(party_type, parties, inv, tax_details, posting_date, pan_no=N
 				)
 			else:
 				tax_amount = net_total * tax_details.rate / 100 if net_total > 0 else 0
-
-			# once tds is deducted, not need to add vouchers in the invoice
-			voucher_wise_amount = {}
 		else:
 			tax_amount = get_tds_amount(ldc, parties, inv, tax_details, tax_deducted, vouchers)
 
@@ -258,13 +252,12 @@ def get_tax_amount(party_type, parties, inv, tax_details, posting_date, pan_no=N
 	if cint(tax_details.round_off_tax_amount):
 		tax_amount = round(tax_amount)
 
-	return tax_amount, tax_deducted, tax_deducted_on_advances, voucher_wise_amount
+	return tax_amount, tax_deducted, tax_deducted_on_advances
 
 
 def get_invoice_vouchers(parties, tax_details, company, party_type="Supplier"):
+	dr_or_cr = "credit" if party_type == "Supplier" else "debit"
 	doctype = "Purchase Invoice" if party_type == "Supplier" else "Sales Invoice"
-	voucher_wise_amount = {}
-	vouchers = []
 
 	filters = {
 		"company": company,
@@ -279,40 +272,29 @@ def get_invoice_vouchers(parties, tax_details, company, party_type="Supplier"):
 			{"apply_tds": 1, "tax_withholding_category": tax_details.get("tax_withholding_category")}
 		)
 
-	invoices_details = frappe.get_all(doctype, filters=filters, fields=["name", "base_net_total"])
+	invoices = frappe.get_all(doctype, filters=filters, pluck="name") or [""]
 
-	for d in invoices_details:
-		vouchers.append(d.name)
-		voucher_wise_amount.update({d.name: {"amount": d.base_net_total, "voucher_type": doctype}})
-
-	journal_entries_details = frappe.db.sql(
+	journal_entries = frappe.db.sql(
 		"""
-		SELECT j.name, ja.credit - ja.debit AS amount
+		SELECT j.name
 			FROM `tabJournal Entry` j, `tabJournal Entry Account` ja
 		WHERE
-			j.name = ja.parent
-			AND j.docstatus = 1
+			j.docstatus = 1
 			AND j.is_opening = 'No'
 			AND j.posting_date between %s and %s
+			AND ja.{dr_or_cr} > 0
 			AND ja.party in %s
-			AND j.apply_tds = 1
-			AND j.tax_withholding_category = %s
-	""",
-		(
-			tax_details.from_date,
-			tax_details.to_date,
-			tuple(parties),
-			tax_details.get("tax_withholding_category"),
+	""".format(
+			dr_or_cr=dr_or_cr
 		),
-		as_dict=1,
+		(tax_details.from_date, tax_details.to_date, tuple(parties)),
+		as_list=1,
 	)
 
-	if journal_entries_details:
-		for d in journal_entries_details:
-			vouchers.append(d.name)
-			voucher_wise_amount.update({d.name: {"amount": d.amount, "voucher_type": "Journal Entry"}})
+	if journal_entries:
+		journal_entries = journal_entries[0]
 
-	return vouchers, voucher_wise_amount
+	return invoices + journal_entries
 
 
 def get_advance_vouchers(
@@ -327,11 +309,9 @@ def get_advance_vouchers(
 		"is_cancelled": 0,
 		"party_type": party_type,
 		"party": ["in", parties],
+		"against_voucher": ["is", "not set"],
 	}
 
-	if party_type == "Customer":
-		filters.update({"against_voucher": ["is", "not set"]})
-
 	if company:
 		filters["company"] = company
 	if from_date and to_date:
@@ -341,25 +321,23 @@ def get_advance_vouchers(
 
 
 def get_taxes_deducted_on_advances_allocated(inv, tax_details):
+	advances = [d.reference_name for d in inv.get("advances")]
 	tax_info = []
 
-	if inv.get("advances"):
-		advances = [d.reference_name for d in inv.get("advances")]
+	if advances:
+		pe = frappe.qb.DocType("Payment Entry").as_("pe")
+		at = frappe.qb.DocType("Advance Taxes and Charges").as_("at")
 
-		if advances:
-			pe = frappe.qb.DocType("Payment Entry").as_("pe")
-			at = frappe.qb.DocType("Advance Taxes and Charges").as_("at")
-
-			tax_info = (
-				frappe.qb.from_(at)
-				.inner_join(pe)
-				.on(pe.name == at.parent)
-				.select(at.parent, at.name, at.tax_amount, at.allocated_amount)
-				.where(pe.tax_withholding_category == tax_details.get("tax_withholding_category"))
-				.where(at.parent.isin(advances))
-				.where(at.account_head == tax_details.account_head)
-				.run(as_dict=True)
-			)
+		tax_info = (
+			frappe.qb.from_(at)
+			.inner_join(pe)
+			.on(pe.name == at.parent)
+			.select(at.parent, at.name, at.tax_amount, at.allocated_amount)
+			.where(pe.tax_withholding_category == tax_details.get("tax_withholding_category"))
+			.where(at.parent.isin(advances))
+			.where(at.account_head == tax_details.account_head)
+			.run(as_dict=True)
+		)
 
 	return tax_info
 
@@ -381,9 +359,6 @@ def get_deducted_tax(taxable_vouchers, tax_details):
 
 def get_tds_amount(ldc, parties, inv, tax_details, tax_deducted, vouchers):
 	tds_amount = 0
-	supp_credit_amt = 0.0
-	supp_jv_credit_amt = 0.0
-
 	invoice_filters = {"name": ("in", vouchers), "docstatus": 1, "apply_tds": 1}
 
 	field = "sum(net_total)"
@@ -392,25 +367,30 @@ def get_tds_amount(ldc, parties, inv, tax_details, tax_deducted, vouchers):
 		invoice_filters.pop("apply_tds", None)
 		field = "sum(grand_total)"
 
-	if vouchers:
-		supp_credit_amt = frappe.db.get_value("Purchase Invoice", invoice_filters, field) or 0.0
+	supp_credit_amt = frappe.db.get_value("Purchase Invoice", invoice_filters, field) or 0.0
 
-		supp_jv_credit_amt = (
-			frappe.db.get_value(
-				"Journal Entry Account",
-				{
-					"parent": ("in", vouchers),
-					"docstatus": 1,
-					"party": ("in", parties),
-					"reference_type": ("!=", "Purchase Invoice"),
-				},
-				"sum(credit_in_account_currency)",
-			)
-		) or 0.0
+	supp_jv_credit_amt = (
+		frappe.db.get_value(
+			"Journal Entry Account",
+			{
+				"parent": ("in", vouchers),
+				"docstatus": 1,
+				"party": ("in", parties),
+				"reference_type": ("!=", "Purchase Invoice"),
+			},
+			"sum(credit_in_account_currency)",
+		)
+		or 0.0
+	)
 
 	supp_credit_amt += supp_jv_credit_amt
 	supp_credit_amt += inv.net_total
 
+	debit_note_amount = get_debit_note_amount(
+		parties, tax_details.from_date, tax_details.to_date, inv.company
+	)
+	supp_credit_amt -= debit_note_amount
+
 	threshold = tax_details.get("threshold", 0)
 	cumulative_threshold = tax_details.get("cumulative_threshold", 0)
 
@@ -422,10 +402,7 @@ def get_tds_amount(ldc, parties, inv, tax_details, tax_deducted, vouchers):
 		):
 			# Get net total again as TDS is calculated on net total
 			# Grand is used to just check for threshold breach
-			net_total = 0
-			if vouchers:
-				net_total = frappe.db.get_value("Purchase Invoice", invoice_filters, "sum(net_total)")
-
+			net_total = frappe.db.get_value("Purchase Invoice", invoice_filters, "sum(net_total)") or 0.0
 			net_total += inv.net_total
 			supp_credit_amt = net_total - cumulative_threshold
 
@@ -446,40 +423,36 @@ def get_tds_amount(ldc, parties, inv, tax_details, tax_deducted, vouchers):
 
 def get_tcs_amount(parties, inv, tax_details, vouchers, adv_vouchers):
 	tcs_amount = 0
-	invoiced_amt = 0
-	advance_amt = 0
 
 	# sum of debit entries made from sales invoices
-	if vouchers:
-		invoiced_amt = (
-			frappe.db.get_value(
-				"GL Entry",
-				{
-					"is_cancelled": 0,
-					"party": ["in", parties],
-					"company": inv.company,
-					"voucher_no": ["in", vouchers],
-				},
-				"sum(debit)",
-			)
-			or 0.0
+	invoiced_amt = (
+		frappe.db.get_value(
+			"GL Entry",
+			{
+				"is_cancelled": 0,
+				"party": ["in", parties],
+				"company": inv.company,
+				"voucher_no": ["in", vouchers],
+			},
+			"sum(debit)",
 		)
+		or 0.0
+	)
 
 	# sum of credit entries made from PE / JV with unset 'against voucher'
-	if advance_amt:
-		advance_amt = (
-			frappe.db.get_value(
-				"GL Entry",
-				{
-					"is_cancelled": 0,
-					"party": ["in", parties],
-					"company": inv.company,
-					"voucher_no": ["in", adv_vouchers],
-				},
-				"sum(credit)",
-			)
-			or 0.0
+	advance_amt = (
+		frappe.db.get_value(
+			"GL Entry",
+			{
+				"is_cancelled": 0,
+				"party": ["in", parties],
+				"company": inv.company,
+				"voucher_no": ["in", adv_vouchers],
+			},
+			"sum(credit)",
 		)
+		or 0.0
+	)
 
 	# sum of credit entries made from sales invoice
 	credit_note_amt = sum(
@@ -534,6 +507,22 @@ def get_tds_amount_from_ldc(ldc, parties, pan_no, tax_details, posting_date, net
 	return tds_amount
 
 
+def get_debit_note_amount(suppliers, from_date, to_date, company=None):
+
+	filters = {
+		"supplier": ["in", suppliers],
+		"is_return": 1,
+		"docstatus": 1,
+		"posting_date": ["between", (from_date, to_date)],
+	}
+	fields = ["abs(sum(net_total)) as net_total"]
+
+	if company:
+		filters["company"] = company
+
+	return frappe.get_all("Purchase Invoice", filters, fields)[0].get("net_total") or 0.0
+
+
 def get_ltds_amount(current_amount, deducted_amount, certificate_limit, rate, tax_details):
 	if current_amount < (certificate_limit - deducted_amount):
 		return current_amount * rate / 100

erpnext/accounts/doctype/tax_withholding_category/test_tax_withholding_category.py

@@ -52,7 +52,7 @@ class TestTaxWithholdingCategory(unittest.TestCase):
 		invoices.append(pi)
 
 		# delete invoices to avoid clashing
-		for d in reversed(invoices):
+		for d in invoices:
 			d.cancel()
 
 	def test_single_threshold_tds(self):
@@ -88,7 +88,7 @@ class TestTaxWithholdingCategory(unittest.TestCase):
 		self.assertEqual(pi.taxes_and_charges_deducted, 1000)
 
 		# delete invoices to avoid clashing
-		for d in reversed(invoices):
+		for d in invoices:
 			d.cancel()
 
 	def test_tax_withholding_category_checks(self):
@@ -114,7 +114,7 @@ class TestTaxWithholdingCategory(unittest.TestCase):
 		# TDS should be applied only on 1000
 		self.assertEqual(pi1.taxes[0].tax_amount, 1000)
 
-		for d in reversed(invoices):
+		for d in invoices:
 			d.cancel()
 
 	def test_cumulative_threshold_tcs(self):
@@ -148,8 +148,8 @@ class TestTaxWithholdingCategory(unittest.TestCase):
 		self.assertEqual(tcs_charged, 500)
 		invoices.append(si)
 
-		# cancel invoices to avoid clashing
-		for d in reversed(invoices):
+		# delete invoices to avoid clashing
+		for d in invoices:
 			d.cancel()
 
 	def test_tds_calculation_on_net_total(self):
@@ -182,8 +182,8 @@ class TestTaxWithholdingCategory(unittest.TestCase):
 
 		self.assertEqual(pi1.taxes[0].tax_amount, 4000)
 
-		# cancel invoices to avoid clashing
-		for d in reversed(invoices):
+		# delete invoices to avoid clashing
+		for d in invoices:
 			d.cancel()
 
 	def test_multi_category_single_supplier(self):
@@ -207,50 +207,8 @@ class TestTaxWithholdingCategory(unittest.TestCase):
 
 		self.assertEqual(pi1.taxes[0].tax_amount, 250)
 
-		# cancel invoices to avoid clashing
-		for d in reversed(invoices):
-			d.cancel()
-
-	def test_tax_withholding_category_voucher_display(self):
-		frappe.db.set_value(
-			"Supplier", "Test TDS Supplier6", "tax_withholding_category", "Test Multi Invoice Category"
-		)
-		invoices = []
-
-		pi = create_purchase_invoice(supplier="Test TDS Supplier6", rate=4000, do_not_save=True)
-		pi.apply_tds = 1
-		pi.tax_withholding_category = "Test Multi Invoice Category"
-		pi.save()
-		pi.submit()
-		invoices.append(pi)
-
-		pi1 = create_purchase_invoice(supplier="Test TDS Supplier6", rate=2000, do_not_save=True)
-		pi1.apply_tds = 1
-		pi1.is_return = 1
-		pi1.items[0].qty = -1
-		pi1.tax_withholding_category = "Test Multi Invoice Category"
-		pi1.save()
-		pi1.submit()
-		invoices.append(pi1)
-
-		pi2 = create_purchase_invoice(supplier="Test TDS Supplier6", rate=9000, do_not_save=True)
-		pi2.apply_tds = 1
-		pi2.tax_withholding_category = "Test Multi Invoice Category"
-		pi2.save()
-		pi2.submit()
-		invoices.append(pi2)
-
-		pi2.load_from_db()
-
-		self.assertTrue(pi2.taxes[0].tax_amount, 1100)
-
-		self.assertTrue(pi2.tax_withheld_vouchers[0].voucher_name == pi1.name)
-		self.assertTrue(pi2.tax_withheld_vouchers[0].taxable_amount == pi1.net_total)
-		self.assertTrue(pi2.tax_withheld_vouchers[1].voucher_name == pi.name)
-		self.assertTrue(pi2.tax_withheld_vouchers[1].taxable_amount == pi.net_total)
-
-		# cancel invoices to avoid clashing
-		for d in reversed(invoices):
+		# delete invoices to avoid clashing
+		for d in invoices:
 			d.cancel()
 
 
@@ -350,7 +308,6 @@ def create_records():
 		"Test TDS Supplier3",
 		"Test TDS Supplier4",
 		"Test TDS Supplier5",
-		"Test TDS Supplier6",
 	]:
 		if frappe.db.exists("Supplier", name):
 			continue
@@ -541,22 +498,3 @@ def create_tax_with_holding_category():
 				"accounts": [{"company": "_Test Company", "account": "TDS - _TC"}],
 			}
 		).insert()
-
-	if not frappe.db.exists("Tax Withholding Category", "Test Multi Invoice Category"):
-		frappe.get_doc(
-			{
-				"doctype": "Tax Withholding Category",
-				"name": "Test Multi Invoice Category",
-				"category_name": "Test Multi Invoice Category",
-				"rates": [
-					{
-						"from_date": fiscal_year[1],
-						"to_date": fiscal_year[2],
-						"tax_withholding_rate": 10,
-						"single_threshold": 5000,
-						"cumulative_threshold": 10000,
-					}
-				],
-				"accounts": [{"company": "_Test Company", "account": "TDS - _TC"}],
-			}
-		).insert()

erpnext/accounts/general_ledger.py

@@ -29,7 +29,6 @@ def make_gl_entries(
 	if gl_map:
 		if not cancel:
 			validate_accounting_period(gl_map)
-			validate_disabled_accounts(gl_map)
 			gl_map = process_gl_map(gl_map, merge_entries)
 			if gl_map and len(gl_map) > 1:
 				save_entries(gl_map, adv_adj, update_outstanding, from_repost)
@@ -44,26 +43,6 @@ def make_gl_entries(
 			make_reverse_gl_entries(gl_map, adv_adj=adv_adj, update_outstanding=update_outstanding)
 
 
-def validate_disabled_accounts(gl_map):
-	accounts = [d.account for d in gl_map if d.account]
-
-	Account = frappe.qb.DocType("Account")
-
-	disabled_accounts = (
-		frappe.qb.from_(Account)
-		.where(Account.name.isin(accounts) & Account.disabled == 1)
-		.select(Account.name, Account.disabled)
-	).run(as_dict=True)
-
-	if disabled_accounts:
-		account_list = "<br>"
-		account_list += ", ".join([frappe.bold(d.name) for d in disabled_accounts])
-		frappe.throw(
-			_("Cannot create accounting entries against disabled accounts: {0}").format(account_list),
-			title=_("Disabled Account Selected"),
-		)
-
-
 def validate_accounting_period(gl_map):
 	accounting_periods = frappe.db.sql(
 		""" SELECT
@@ -148,7 +127,6 @@ def update_net_values(entry):
 def merge_similar_entries(gl_map, precision=None):
 	merged_gl_map = []
 	accounting_dimensions = get_accounting_dimensions()
-
 	for entry in gl_map:
 		# if there is already an entry in this account then just add it
 		# to that entry
@@ -230,10 +208,9 @@ def make_entry(args, adv_adj, update_outstanding, from_repost=False):
 	gle.flags.from_repost = from_repost
 	gle.flags.adv_adj = adv_adj
 	gle.flags.update_outstanding = update_outstanding or "Yes"
-	gle.flags.notify_update = False
 	gle.submit()
 
-	if not from_repost and gle.voucher_type != "Period Closing Voucher":
+	if not from_repost:
 		validate_expense_against_budget(args)
 
 
@@ -296,7 +273,7 @@ def round_off_debit_credit(gl_map):
 
 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
+		gl_map[0].company
 	)
 	round_off_account_exists = False
 	round_off_gle = frappe._dict()
@@ -333,43 +310,14 @@ 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)
 
 
-def update_accounting_dimensions(round_off_gle):
-	dimensions = get_accounting_dimensions()
-	meta = frappe.get_meta(round_off_gle["voucher_type"])
-	has_all_dimensions = True
-
-	for dimension in dimensions:
-		if not meta.has_field(dimension):
-			has_all_dimensions = False
-
-	if dimensions and has_all_dimensions:
-		dimension_values = frappe.db.get_value(
-			round_off_gle["voucher_type"], round_off_gle["voucher_no"], dimensions, as_dict=1
-		)
-
-		for dimension in dimensions:
-			round_off_gle[dimension] = dimension_values.get(dimension)
-
-
-def get_round_off_account_and_cost_center(company, voucher_type, voucher_no):
+def get_round_off_account_and_cost_center(company):
 	round_off_account, round_off_cost_center = frappe.get_cached_value(
 		"Company", company, ["round_off_account", "round_off_cost_center"]
 	) or [None, None]
-
-	meta = frappe.get_meta(voucher_type)
-
-	# Give first preference to parent cost center for round off GLE
-	if meta.has_field("cost_center"):
-		parent_cost_center = frappe.db.get_value(voucher_type, voucher_no, "cost_center")
-		if parent_cost_center:
-			round_off_cost_center = parent_cost_center
-
 	if not round_off_account:
 		frappe.throw(_("Please mention Round Off Account in Company"))
 

erpnext/accounts/party.py

@@ -208,11 +208,11 @@ def set_address_details(
 			)
 
 	if company_address:
-		party_details.company_address = company_address
+		party_details.update({"company_address": company_address})
 	else:
 		party_details.update(get_company_address(company))
 
-	if doctype and doctype in ["Delivery Note", "Sales Invoice", "Sales Order", "Quotation"]:
+	if doctype and doctype in ["Delivery Note", "Sales Invoice", "Sales Order"]:
 		if party_details.company_address:
 			party_details.update(
 				get_fetch_values(doctype, "company_address", party_details.company_address)
@@ -220,37 +220,12 @@ def set_address_details(
 		get_regional_address_details(party_details, doctype, company)
 
 	elif doctype and doctype in ["Purchase Invoice", "Purchase Order", "Purchase Receipt"]:
-		if shipping_address:
-			party_details.update(
-				{
-					"shipping_address": shipping_address,
-					"shipping_address_display": get_address_display(shipping_address),
-					**get_fetch_values(doctype, "shipping_address", shipping_address),
-				}
-			)
-
 		if party_details.company_address:
-			# billing address
+			party_details["shipping_address"] = shipping_address or party_details["company_address"]
+			party_details.shipping_address_display = get_address_display(party_details["shipping_address"])
 			party_details.update(
-				{
-					"billing_address": party_details.company_address,
-					"billing_address_display": (
-						party_details.company_address_display or get_address_display(party_details.company_address)
-					),
-					**get_fetch_values(doctype, "billing_address", party_details.company_address),
-				}
+				get_fetch_values(doctype, "shipping_address", party_details.shipping_address)
 			)
-
-			# shipping address - if not already set
-			if not party_details.shipping_address:
-				party_details.update(
-					{
-						"shipping_address": party_details.billing_address,
-						"shipping_address_display": party_details.billing_address_display,
-						**get_fetch_values(doctype, "shipping_address", party_details.billing_address),
-					}
-				)
-
 		get_regional_address_details(party_details, doctype, company)
 
 	return party_details.get(billing_address_field), party_details.shipping_address_name
@@ -923,18 +898,3 @@ def get_default_contact(doctype, name):
 			return None
 	else:
 		return None
-
-
-def add_party_account(party_type, party, company, account):
-	doc = frappe.get_doc(party_type, party)
-	account_exists = False
-	for d in doc.get("accounts"):
-		if d.account == account:
-			account_exists = True
-
-	if not account_exists:
-		accounts = {"company": company, "account": account}
-
-		doc.append("accounts", accounts)
-
-		doc.save()

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.html

@@ -42,7 +42,7 @@
 
 	{% if(filters.show_future_payments) { %}
 		{% var balance_row = data.slice(-1).pop();
-			var start = report.columns.findIndex((elem) => (elem.fieldname == 'age'));
+			var start = filters.based_on_payment_terms ? 13 : 11;
 			var range1 = report.columns[start].label;
 			var range2 = report.columns[start+1].label;
 			var range3 = report.columns[start+2].label;

erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py

@@ -43,7 +43,7 @@ def get_columns():
 			"options": "Account",
 			"width": 170,
 		},
-		{"label": _("Amount"), "fieldname": "amount", "fieldtype": "Currency", "width": 120},
+		{"label": _("Amount"), "fieldname": "amount", "width": 120},
 	]
 
 	return columns

erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py

@@ -198,14 +198,12 @@ def get_loan_entries(filters):
 			amount_field = (loan_doc.disbursed_amount).as_("credit")
 			posting_date = (loan_doc.disbursement_date).as_("posting_date")
 			account = loan_doc.disbursement_account
-			salary_condition = loan_doc.docstatus == 1
 		else:
 			amount_field = (loan_doc.amount_paid).as_("debit")
 			posting_date = (loan_doc.posting_date).as_("posting_date")
 			account = loan_doc.payment_account
-			salary_condition = loan_doc.repay_from_salary == 0
 
-		query = (
+		entries = (
 			frappe.qb.from_(loan_doc)
 			.select(
 				ConstantColumn(doctype).as_("payment_document"),
@@ -216,13 +214,12 @@ def get_loan_entries(filters):
 				posting_date,
 			)
 			.where(loan_doc.docstatus == 1)
-			.where(salary_condition)
 			.where(account == filters.get("account"))
 			.where(posting_date <= getdate(filters.get("report_date")))
 			.where(ifnull(loan_doc.clearance_date, "4000-01-01") > getdate(filters.get("report_date")))
+			.run(as_dict=1)
 		)
 
-		entries = query.run(as_dict=1)
 		loan_docs.extend(entries)
 
 	return loan_docs
@@ -267,17 +264,15 @@ def get_loan_amount(filters):
 			amount_field = Sum(loan_doc.disbursed_amount)
 			posting_date = (loan_doc.disbursement_date).as_("posting_date")
 			account = loan_doc.disbursement_account
-			salary_condition = loan_doc.docstatus == 1
 		else:
 			amount_field = Sum(loan_doc.amount_paid)
 			posting_date = (loan_doc.posting_date).as_("posting_date")
 			account = loan_doc.payment_account
-			salary_condition = loan_doc.repay_from_salary == 0
+
 		amount = (
 			frappe.qb.from_(loan_doc)
 			.select(amount_field)
 			.where(loan_doc.docstatus == 1)
-			.where(salary_condition)
 			.where(account == filters.get("account"))
 			.where(posting_date > getdate(filters.get("report_date")))
 			.where(ifnull(loan_doc.clearance_date, "4000-01-01") <= getdate(filters.get("report_date")))

erpnext/accounts/report/cash_flow/cash_flow.py

@@ -263,10 +263,7 @@ def get_report_summary(summary_data, currency):
 def get_chart_data(columns, data):
 	labels = [d.get("label") for d in columns[2:]]
 	datasets = [
-		{
-			"name": account.get("account").replace("'", ""),
-			"values": [account.get(d.get("fieldname")) for d in columns[2:]],
-		}
+		{"name": account.get("account").replace("'", ""), "values": [account.get("total")]}
 		for account in data
 		if account.get("parent_account") == None and account.get("currency")
 	]

erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.py

@@ -535,11 +535,7 @@ def get_accounts(root_type, companies):
 		):
 			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)
+				added_accounts.append(account.account_name)
 
 	return accounts
 

erpnext/accounts/report/financial_statements.py

@@ -539,7 +539,7 @@ def get_additional_conditions(from_date, ignore_closing_entries, filters):
 					)
 					additional_conditions.append("{0} in %({0})s".format(dimension.fieldname))
 				else:
-					additional_conditions.append("{0} in %({0})s".format(dimension.fieldname))
+					additional_conditions.append("{0} in (%({0})s)".format(dimension.fieldname))
 
 	return " and {}".format(" and ".join(additional_conditions)) if additional_conditions else ""
 

erpnext/accounts/report/general_ledger/general_ledger.py

@@ -280,9 +280,9 @@ def get_conditions(filters):
 		or filters.get("party")
 		or filters.get("group_by") in ["Group by Account", "Group by Party"]
 	):
-		conditions.append("(posting_date >=%(from_date)s or is_opening = 'Yes')")
+		conditions.append("posting_date >=%(from_date)s")
 
-	conditions.append("(posting_date <=%(to_date)s)")
+	conditions.append("(posting_date <=%(to_date)s or is_opening = 'Yes')")
 
 	if filters.get("project"):
 		conditions.append("project in %(project)s")
@@ -318,7 +318,7 @@ def get_conditions(filters):
 							)
 							conditions.append("{0} in %({0})s".format(dimension.fieldname))
 						else:
-							conditions.append("{0} in %({0})s".format(dimension.fieldname))
+							conditions.append("{0} in (%({0})s)".format(dimension.fieldname))
 
 	return "and {}".format(" and ".join(conditions)) if conditions else ""
 
@@ -468,7 +468,7 @@ def get_accountwise_gle(filters, accounting_dimensions, gl_entries, gle_map):
 			update_value_in_dict(totals, "opening", gle)
 			update_value_in_dict(totals, "closing", gle)
 
-		elif gle.posting_date <= to_date or (cstr(gle.is_opening) == "Yes" and show_opening_entries):
+		elif gle.posting_date <= to_date:
 			if not group_by_voucher_consolidated:
 				update_value_in_dict(gle_map[group_by_value].totals, "total", gle)
 				update_value_in_dict(gle_map[group_by_value].totals, "closing", gle)
@@ -478,13 +478,7 @@ def get_accountwise_gle(filters, accounting_dimensions, gl_entries, gle_map):
 				gle_map[group_by_value].entries.append(gle)
 
 			elif group_by_voucher_consolidated:
-				keylist = [
-					gle.get("voucher_type"),
-					gle.get("voucher_no"),
-					gle.get("account"),
-					gle.get("party_type"),
-					gle.get("party"),
-				]
+				keylist = [gle.get("voucher_type"), gle.get("voucher_no"), gle.get("account")]
 				if filters.get("include_dimensions"):
 					for dim in accounting_dimensions:
 						keylist.append(gle.get(dim))

erpnext/accounts/report/gross_and_net_profit_report/gross_and_net_profit_report.py

@@ -155,6 +155,7 @@ def adjust_account(data, period_list, consolidated=False):
 	for d in data:
 		for period in period_list:
 			key = period if consolidated else period.key
+			d[key] = totals[d["account"]]
 			d["total"] = totals[d["account"]]
 	return data
 

erpnext/accounts/report/gross_profit/gross_profit.js

@@ -44,14 +44,14 @@ frappe.query_reports["Gross Profit"] = {
 	"parent_field": "parent_invoice",
 	"initial_depth": 3,
 	"formatter": function(value, row, column, data, default_formatter) {
-		if (column.fieldname == "sales_invoice" && column.options == "Item" && data && data.indent == 0) {
+		if (column.fieldname == "sales_invoice" && column.options == "Item" && data.indent == 0) {
 			column._options = "Sales Invoice";
 		} else {
 			column._options = "Item";
 		}
 		value = default_formatter(value, row, column, data);
 
-		if (data && (data.indent == 0.0 || (row[1] && row[1].content == "Total"))) {
+		if (data && (data.indent == 0.0 || row[1].content == "Total")) {
 			value = $(`<span>${value}</span>`);
 			var $value = $(value).css("font-weight", "bold");
 			value = $value.wrap("<p></p>").parent().html();

erpnext/accounts/report/gross_profit/gross_profit.py

@@ -561,7 +561,7 @@ class GrossProfitGenerator(object):
 						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))
+							return (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:

erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py

@@ -19,19 +19,14 @@ def execute(filters=None):
 	return _execute(filters)
 
 
-def _execute(
-	filters=None,
-	additional_table_columns=None,
-	additional_query_columns=None,
-	additional_conditions=None,
-):
+def _execute(filters=None, additional_table_columns=None, additional_query_columns=None):
 	if not filters:
 		filters = {}
 	columns = get_columns(additional_table_columns, filters)
 
 	company_currency = frappe.get_cached_value("Company", filters.get("company"), "default_currency")
 
-	item_list = get_items(filters, additional_query_columns, additional_conditions)
+	item_list = get_items(filters, additional_query_columns)
 	if item_list:
 		itemised_tax, tax_columns = get_tax_accounts(item_list, columns, company_currency)
 
@@ -102,7 +97,6 @@ def _execute(
 			row.update({"rate": d.base_net_rate, "amount": d.base_net_amount})
 
 		total_tax = 0
-		total_other_charges = 0
 		for tax in tax_columns:
 			item_tax = itemised_tax.get(d.name, {}).get(tax, {})
 			row.update(
@@ -111,18 +105,10 @@ def _execute(
 					frappe.scrub(tax + " Amount"): item_tax.get("tax_amount", 0),
 				}
 			)
-			if item_tax.get("is_other_charges"):
-				total_other_charges += flt(item_tax.get("tax_amount"))
-			else:
-				total_tax += flt(item_tax.get("tax_amount"))
+			total_tax += flt(item_tax.get("tax_amount"))
 
 		row.update(
-			{
-				"total_tax": total_tax,
-				"total_other_charges": total_other_charges,
-				"total": d.base_net_amount + total_tax,
-				"currency": company_currency,
-			}
+			{"total_tax": total_tax, "total": d.base_net_amount + total_tax, "currency": company_currency}
 		)
 
 		if filters.get("group_by"):
@@ -333,7 +319,7 @@ def get_columns(additional_table_columns, filters):
 	return columns
 
 
-def get_conditions(filters, additional_conditions=None):
+def get_conditions(filters):
 	conditions = ""
 
 	for opts in (
@@ -346,9 +332,6 @@ def get_conditions(filters, additional_conditions=None):
 		if filters.get(opts[0]):
 			conditions += opts[1]
 
-	if additional_conditions:
-		conditions += additional_conditions
-
 	if filters.get("mode_of_payment"):
 		conditions += """ and exists(select name from `tabSales Invoice Payment`
 			where parent=`tabSales Invoice`.name
@@ -384,8 +367,8 @@ def get_group_by_conditions(filters, doctype):
 		return "ORDER BY `tab{0}`.{1}".format(doctype, frappe.scrub(filters.get("group_by")))
 
 
-def get_items(filters, additional_query_columns, additional_conditions=None):
-	conditions = get_conditions(filters, additional_conditions)
+def get_items(filters, additional_query_columns):
+	conditions = get_conditions(filters)
 
 	if additional_query_columns:
 		additional_query_columns = ", " + ", ".join(additional_query_columns)
@@ -460,6 +443,12 @@ def get_grand_total(filters, doctype):
 	]  # nosec
 
 
+def get_deducted_taxes():
+	return frappe.db.sql_list(
+		"select name from `tabPurchase Taxes and Charges` where add_deduct_tax = 'Deduct'"
+	)
+
+
 def get_tax_accounts(
 	item_list,
 	columns,
@@ -473,7 +462,6 @@ def get_tax_accounts(
 	tax_columns = []
 	invoice_item_row = {}
 	itemised_tax = {}
-	add_deduct_tax = "charge_type"
 
 	tax_amount_precision = (
 		get_field_precision(
@@ -489,13 +477,13 @@ def get_tax_accounts(
 	conditions = ""
 	if doctype == "Purchase Invoice":
 		conditions = " and category in ('Total', 'Valuation and Total') and base_tax_amount_after_discount_amount != 0"
-		add_deduct_tax = "add_deduct_tax"
 
+	deducted_tax = get_deducted_taxes()
 	tax_details = frappe.db.sql(
 		"""
 		select
-			name, parent, description, item_wise_tax_detail, account_head,
-			charge_type, {add_deduct_tax}, base_tax_amount_after_discount_amount
+			name, parent, description, item_wise_tax_detail,
+			charge_type, base_tax_amount_after_discount_amount
 		from `tab%s`
 		where
 			parenttype = %s and docstatus = 1
@@ -503,33 +491,12 @@ def get_tax_accounts(
 			and parent in (%s)
 			%s
 		order by description
-	""".format(
-			add_deduct_tax=add_deduct_tax
-		)
+	"""
 		% (tax_doctype, "%s", ", ".join(["%s"] * len(invoice_item_row)), conditions),
 		tuple([doctype] + list(invoice_item_row)),
 	)
 
-	account_doctype = frappe.qb.DocType("Account")
-
-	query = (
-		frappe.qb.from_(account_doctype)
-		.select(account_doctype.name)
-		.where((account_doctype.account_type == "Tax"))
-	)
-
-	tax_accounts = query.run()
-
-	for (
-		name,
-		parent,
-		description,
-		item_wise_tax_detail,
-		account_head,
-		charge_type,
-		add_deduct_tax,
-		tax_amount,
-	) in tax_details:
+	for name, parent, description, item_wise_tax_detail, charge_type, tax_amount in tax_details:
 		description = handle_html(description)
 		if description not in tax_columns and tax_amount:
 			# as description is text editor earlier and markup can break the column convention in reports
@@ -562,17 +529,11 @@ def get_tax_accounts(
 						if item_tax_amount:
 							tax_value = flt(item_tax_amount, tax_amount_precision)
 							tax_value = (
-								tax_value * -1
-								if (doctype == "Purchase Invoice" and add_deduct_tax == "Deduct")
-								else tax_value
+								tax_value * -1 if (doctype == "Purchase Invoice" and name in deducted_tax) else tax_value
 							)
 
 							itemised_tax.setdefault(d.name, {})[description] = frappe._dict(
-								{
-									"tax_rate": tax_rate,
-									"tax_amount": tax_value,
-									"is_other_charges": 0 if tuple([account_head]) in tax_accounts else 1,
-								}
+								{"tax_rate": tax_rate, "tax_amount": tax_value}
 							)
 
 			except ValueError:
@@ -615,13 +576,6 @@ def get_tax_accounts(
 			"options": "currency",
 			"width": 100,
 		},
-		{
-			"label": _("Total Other Charges"),
-			"fieldname": "total_other_charges",
-			"fieldtype": "Currency",
-			"options": "currency",
-			"width": 100,
-		},
 		{
 			"label": _("Total"),
 			"fieldname": "total",

erpnext/accounts/report/pos_register/pos_register.py

@@ -62,7 +62,7 @@ def get_pos_entries(filters, group_by_field):
 		"""
 		SELECT
 			p.posting_date, p.name as pos_invoice, p.pos_profile,
-			p.owner, p.base_grand_total as grand_total, p.base_paid_amount - p.change_amount  as paid_amount,
+			p.owner, p.base_grand_total as grand_total, p.base_paid_amount as paid_amount,
 			p.customer, p.is_return {select_mop_field}
 		FROM
 			`tabPOS Invoice` p {from_sales_invoice_payment}

erpnext/accounts/report/profitability_analysis/profitability_analysis.py

@@ -228,7 +228,6 @@ def set_gl_entries_by_account(
 		{additional_conditions}
 		and posting_date <= %(to_date)s
 		and {based_on} is not null
-		and is_cancelled = 0
 		order by {based_on}, posting_date""".format(
 			additional_conditions="\n".join(additional_conditions), based_on=based_on
 		),

erpnext/accounts/report/purchase_register/purchase_register.py

@@ -237,7 +237,7 @@ def get_conditions(filters):
 				else:
 					conditions += (
 						common_condition
-						+ "and ifnull(`tabPurchase Invoice Item`.{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

@@ -346,13 +346,9 @@ def get_columns(invoice_list, additional_table_columns):
 def get_conditions(filters):
 	conditions = ""
 
-	accounting_dimensions = get_accounting_dimensions(as_list=False) or []
-	accounting_dimensions_list = [d.fieldname for d in accounting_dimensions]
-
 	if filters.get("company"):
 		conditions += " and company=%(company)s"
-
-	if filters.get("customer") and "customer" not in accounting_dimensions_list:
+	if filters.get("customer"):
 		conditions += " and customer = %(customer)s"
 
 	if filters.get("from_date"):
@@ -363,18 +359,32 @@ def get_conditions(filters):
 	if filters.get("owner"):
 		conditions += " and owner = %(owner)s"
 
-	def get_sales_invoice_item_field_condition(field, table="Sales Invoice Item") -> str:
-		if not filters.get(field) or field in accounting_dimensions_list:
-			return ""
-		return f""" and exists(select name from `tab{table}`
-				where parent=`tabSales Invoice`.name
-					and ifnull(`tab{table}`.{field}, '') = %({field})s)"""
+	if filters.get("mode_of_payment"):
+		conditions += """ and exists(select name from `tabSales Invoice Payment`
+			 where parent=`tabSales Invoice`.name
+			 	and ifnull(`tabSales Invoice Payment`.mode_of_payment, '') = %(mode_of_payment)s)"""
 
-	conditions += get_sales_invoice_item_field_condition("mode_of_payment", "Sales Invoice Payment")
-	conditions += get_sales_invoice_item_field_condition("cost_center")
-	conditions += get_sales_invoice_item_field_condition("warehouse")
-	conditions += get_sales_invoice_item_field_condition("brand")
-	conditions += get_sales_invoice_item_field_condition("item_group")
+	if filters.get("cost_center"):
+		conditions += """ and exists(select name from `tabSales Invoice Item`
+			 where parent=`tabSales Invoice`.name
+			 	and ifnull(`tabSales Invoice Item`.cost_center, '') = %(cost_center)s)"""
+
+	if filters.get("warehouse"):
+		conditions += """ and exists(select name from `tabSales Invoice Item`
+			 where parent=`tabSales Invoice`.name
+			 	and ifnull(`tabSales Invoice Item`.warehouse, '') = %(warehouse)s)"""
+
+	if filters.get("brand"):
+		conditions += """ and exists(select name from `tabSales Invoice Item`
+			 where parent=`tabSales Invoice`.name
+			 	and ifnull(`tabSales Invoice Item`.brand, '') = %(brand)s)"""
+
+	if filters.get("item_group"):
+		conditions += """ and exists(select name from `tabSales Invoice Item`
+			 where parent=`tabSales Invoice`.name
+			 	and ifnull(`tabSales Invoice Item`.item_group, '') = %(item_group)s)"""
+
+	accounting_dimensions = get_accounting_dimensions(as_list=False)
 
 	if accounting_dimensions:
 		common_condition = """
@@ -395,7 +405,7 @@ def get_conditions(filters):
 				else:
 					conditions += (
 						common_condition
-						+ "and ifnull(`tabSales Invoice Item`.{0}, '') in %({0})s)".format(dimension.fieldname)
+						+ "and ifnull(`tabSales Invoice Item`.{0}, '') in (%({0})s))".format(dimension.fieldname)
 					)
 
 	return conditions

erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py

@@ -14,9 +14,9 @@ def execute(filters=None):
 	filters.naming_series = frappe.db.get_single_value("Buying Settings", "supp_master_name")
 
 	columns = get_columns(filters)
-	tds_docs, tds_accounts, tax_category_map, journal_entry_party_map = get_tds_docs(filters)
+	tds_docs, tds_accounts, tax_category_map = get_tds_docs(filters)
 
-	res = get_result(filters, tds_docs, tds_accounts, tax_category_map, journal_entry_party_map)
+	res = get_result(filters, tds_docs, tds_accounts, tax_category_map)
 	final_result = group_by_supplier_and_category(res)
 
 	return columns, final_result

erpnext/accounts/report/tds_payable_monthly/tds_payable_monthly.py

@@ -8,11 +8,11 @@ from frappe import _
 
 def execute(filters=None):
 	validate_filters(filters)
-	tds_docs, tds_accounts, tax_category_map, journal_entry_party_map = get_tds_docs(filters)
+	tds_docs, tds_accounts, tax_category_map = get_tds_docs(filters)
 
 	columns = get_columns(filters)
 
-	res = get_result(filters, tds_docs, tds_accounts, tax_category_map, journal_entry_party_map)
+	res = get_result(filters, tds_docs, tds_accounts, tax_category_map)
 	return columns, res
 
 
@@ -22,7 +22,7 @@ def validate_filters(filters):
 		frappe.throw(_("From Date must be before To Date"))
 
 
-def get_result(filters, tds_docs, tds_accounts, tax_category_map, journal_entry_party_map):
+def get_result(filters, tds_docs, tds_accounts, tax_category_map):
 	supplier_map = get_supplier_pan_map()
 	tax_rate_map = get_tax_rate_map(filters)
 	gle_map = get_gle_map(tds_docs)
@@ -38,11 +38,6 @@ def get_result(filters, tds_docs, tds_accounts, tax_category_map, journal_entry_
 			posting_date = entry.posting_date
 			voucher_type = entry.voucher_type
 
-			if voucher_type == "Journal Entry":
-				suppliers = journal_entry_party_map.get(name)
-				if suppliers:
-					supplier = suppliers[0]
-
 			if not tax_withholding_category:
 				tax_withholding_category = supplier_map.get(supplier, {}).get("tax_withholding_category")
 				rate = tax_rate_map.get(tax_withholding_category)
@@ -181,7 +176,6 @@ def get_tds_docs(filters):
 	journal_entries = []
 	tax_category_map = {}
 	or_filters = {}
-	journal_entry_party_map = {}
 	bank_accounts = frappe.get_all("Account", {"is_group": 0, "account_type": "Bank"}, pluck="name")
 
 	tds_accounts = frappe.get_all(
@@ -224,24 +218,9 @@ def get_tds_docs(filters):
 		get_tax_category_map(payment_entries, "Payment Entry", tax_category_map)
 
 	if journal_entries:
-		journal_entry_party_map = get_journal_entry_party_map(journal_entries)
 		get_tax_category_map(journal_entries, "Journal Entry", tax_category_map)
 
-	return tds_documents, tds_accounts, tax_category_map, journal_entry_party_map
-
-
-def get_journal_entry_party_map(journal_entries):
-	journal_entry_party_map = {}
-	for d in frappe.db.get_all(
-		"Journal Entry Account",
-		{"parent": ("in", journal_entries), "party_type": "Supplier", "party": ("is", "set")},
-		["parent", "party"],
-	):
-		if d.parent not in journal_entry_party_map:
-			journal_entry_party_map[d.parent] = []
-		journal_entry_party_map[d.parent].append(d.party)
-
-	return journal_entry_party_map
+	return tds_documents, tds_accounts, tax_category_map
 
 
 def get_tax_category_map(vouchers, doctype, tax_category_map):

erpnext/accounts/report/trial_balance/trial_balance.py

@@ -160,19 +160,20 @@ def get_rootwise_opening_balances(filters, report_type):
 	if filters.project:
 		additional_conditions += " and project = %(project)s"
 
-	if filters.get("include_default_book_entries"):
-		additional_conditions += (
-			" AND (finance_book in (%(finance_book)s, %(company_fb)s, '') OR finance_book IS NULL)"
-		)
-	else:
-		additional_conditions += " AND (finance_book in (%(finance_book)s, '') OR finance_book IS NULL)"
+	if filters.finance_book:
+		fb_conditions = " AND finance_book = %(finance_book)s"
+		if filters.include_default_book_entries:
+			fb_conditions = (
+				" AND (finance_book in (%(finance_book)s, %(company_fb)s, '') OR finance_book IS NULL)"
+			)
+
+		additional_conditions += fb_conditions
 
 	accounting_dimensions = get_accounting_dimensions(as_list=False)
 
 	query_filters = {
 		"company": filters.company,
 		"from_date": filters.from_date,
-		"to_date": filters.to_date,
 		"report_type": report_type,
 		"year_start_date": filters.year_start_date,
 		"project": filters.project,
@@ -187,9 +188,9 @@ def get_rootwise_opening_balances(filters, report_type):
 					filters[dimension.fieldname] = get_dimension_with_children(
 						dimension.document_type, filters.get(dimension.fieldname)
 					)
-					additional_conditions += " and {0} in %({0})s".format(dimension.fieldname)
+					additional_conditions += "and {0} in %({0})s".format(dimension.fieldname)
 				else:
-					additional_conditions += " and {0} in %({0})s".format(dimension.fieldname)
+					additional_conditions += "and {0} in (%({0})s)".format(dimension.fieldname)
 
 				query_filters.update({dimension.fieldname: filters.get(dimension.fieldname)})
 
@@ -201,7 +202,7 @@ def get_rootwise_opening_balances(filters, report_type):
 		where
 			company=%(company)s
 			{additional_conditions}
-			and (posting_date < %(from_date)s or (ifnull(is_opening, 'No') = 'Yes' and posting_date <= %(to_date)s))
+			and (posting_date < %(from_date)s or ifnull(is_opening, 'No') = 'Yes')
 			and account in (select name from `tabAccount` where report_type=%(report_type)s)
 			and is_cancelled = 0
 		group by account""".format(

erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py

@@ -106,17 +106,12 @@ def get_opening_balances(filters):
 		where company=%(company)s
 			and is_cancelled=0
 			and ifnull(party_type, '') = %(party_type)s and ifnull(party, '') != ''
-			and (posting_date < %(from_date)s or (ifnull(is_opening, 'No') = 'Yes' and posting_date <= %(to_date)s))
+			and (posting_date < %(from_date)s or ifnull(is_opening, 'No') = 'Yes')
 			{account_filter}
 		group by party""".format(
 			account_filter=account_filter
 		),
-		{
-			"company": filters.company,
-			"from_date": filters.from_date,
-			"to_date": filters.to_date,
-			"party_type": filters.party_type,
-		},
+		{"company": filters.company, "from_date": filters.from_date, "party_type": filters.party_type},
 		as_dict=True,
 	)
 

erpnext/accounts/test/test_reports.py

@@ -1,49 +0,0 @@
-import unittest
-from typing import List, Tuple
-
-from erpnext.tests.utils import ReportFilters, ReportName, execute_script_report
-
-DEFAULT_FILTERS = {
-	"company": "_Test Company",
-	"from_date": "2010-01-01",
-	"to_date": "2030-01-01",
-	"period_start_date": "2010-01-01",
-	"period_end_date": "2030-01-01",
-}
-
-
-REPORT_FILTER_TEST_CASES: List[Tuple[ReportName, ReportFilters]] = [
-	("General Ledger", {"group_by": "Group by Voucher (Consolidated)"}),
-	("General Ledger", {"group_by": "Group by Voucher (Consolidated)", "include_dimensions": 1}),
-	("Accounts Payable", {"range1": 30, "range2": 60, "range3": 90, "range4": 120}),
-	("Accounts Receivable", {"range1": 30, "range2": 60, "range3": 90, "range4": 120}),
-	("Consolidated Financial Statement", {"report": "Balance Sheet"}),
-	("Consolidated Financial Statement", {"report": "Profit and Loss Statement"}),
-	("Consolidated Financial Statement", {"report": "Cash Flow"}),
-	("Gross Profit", {"group_by": "Invoice"}),
-	("Gross Profit", {"group_by": "Item Code"}),
-	("Gross Profit", {"group_by": "Item Group"}),
-	("Gross Profit", {"group_by": "Customer"}),
-	("Gross Profit", {"group_by": "Customer Group"}),
-	("Item-wise Sales Register", {}),
-	("Item-wise Purchase Register", {}),
-	("Sales Register", {}),
-	("Sales Register", {"item_group": "All Item Groups"}),
-	("Purchase Register", {}),
-]
-
-OPTIONAL_FILTERS = {}
-
-
-class TestReports(unittest.TestCase):
-	def test_execute_all_accounts_reports(self):
-		"""Test that all script report in stock modules are executable with supported filters"""
-		for report, filter in REPORT_FILTER_TEST_CASES:
-			with self.subTest(report=report):
-				execute_script_report(
-					report_name=report,
-					module="Accounts",
-					filters=filter,
-					default_filters=DEFAULT_FILTERS,
-					optional_filters=OPTIONAL_FILTERS if filter.get("_optional") else None,
-				)

erpnext/accounts/test/test_utils.py

@@ -1,17 +1,10 @@
 import unittest
 
-import frappe
 from frappe.test_runner import make_test_objects
 
 from erpnext.accounts.party import get_party_shipping_address
-from erpnext.accounts.utils import (
-	get_future_stock_vouchers,
-	get_voucherwise_gl_entries,
-	sort_stock_vouchers_by_posting_date,
-)
-from erpnext.stock.doctype.item.test_item import make_item
+from erpnext.accounts.utils import get_future_stock_vouchers, get_voucherwise_gl_entries
 from erpnext.stock.doctype.purchase_receipt.test_purchase_receipt import make_purchase_receipt
-from erpnext.stock.doctype.stock_entry.stock_entry_utils import make_stock_entry
 
 
 class TestUtils(unittest.TestCase):
@@ -54,25 +47,6 @@ class TestUtils(unittest.TestCase):
 			msg="get_voucherwise_gl_entries not returning expected GLes",
 		)
 
-	def test_stock_voucher_sorting(self):
-		vouchers = []
-
-		item = make_item().name
-
-		stock_entry = {"item": item, "to_warehouse": "_Test Warehouse - _TC", "qty": 1, "rate": 10}
-
-		se1 = make_stock_entry(posting_date="2022-01-01", **stock_entry)
-		se3 = make_stock_entry(posting_date="2022-03-01", **stock_entry)
-		se2 = make_stock_entry(posting_date="2022-02-01", **stock_entry)
-
-		for doc in (se1, se2, se3):
-			vouchers.append((doc.doctype, doc.name))
-
-		vouchers.append(("Stock Entry", "Wat"))
-
-		sorted_vouchers = sort_stock_vouchers_by_posting_date(list(reversed(vouchers)))
-		self.assertEqual(sorted_vouchers, vouchers)
-
 
 ADDRESS_RECORDS = [
 	{

erpnext/accounts/utils.py

@@ -3,23 +3,12 @@
 
 
 from json import loads
-from typing import TYPE_CHECKING, List, Optional, Tuple
 
 import frappe
 import frappe.defaults
 from frappe import _, throw
 from frappe.model.meta import get_field_precision
-from frappe.utils import (
-	cint,
-	create_batch,
-	cstr,
-	flt,
-	formatdate,
-	get_number_format_info,
-	getdate,
-	now,
-	nowdate,
-)
+from frappe.utils import cint, cstr, flt, formatdate, get_number_format_info, getdate, now, nowdate
 from six import string_types
 
 import erpnext
@@ -29,8 +18,9 @@ from erpnext.accounts.doctype.account.account import get_account_currency  # noq
 from erpnext.stock import get_warehouse_account_map
 from erpnext.stock.utils import get_stock_value_on
 
-if TYPE_CHECKING:
-	from erpnext.stock.doctype.repost_item_valuation.repost_item_valuation import RepostItemValuation
+
+class StockValueAndAccountBalanceOutOfSync(frappe.ValidationError):
+	pass
 
 
 class FiscalYearError(frappe.ValidationError):
@@ -41,9 +31,6 @@ class PaymentEntryUnlinkError(frappe.ValidationError):
 	pass
 
 
-GL_REPOSTING_CHUNK = 100
-
-
 @frappe.whitelist()
 def get_fiscal_year(
 	date=None, fiscal_year=None, label="Date", verbose=1, company=None, as_dict=False
@@ -818,28 +805,6 @@ def get_held_invoices(party_type, party):
 	return held_invoices
 
 
-def remove_return_pos_invoices(party_type, party, invoice_list):
-	if invoice_list:
-
-		if party_type == "Customer":
-			sinv = frappe.qb.DocType("Sales Invoice")
-			return_pos = (
-				frappe.qb.from_(sinv)
-				.select(sinv.name)
-				.where((sinv.is_pos == 1) & (sinv.docstatus == 1) & (sinv.is_return == 1))
-				.run()
-			)
-
-			if return_pos:
-				return_pos = [x[0] for x in return_pos]
-			else:
-				return invoice_list
-
-			invoice_list = [x for x in invoice_list if x.voucher_no not in return_pos]
-
-	return invoice_list
-
-
 def get_outstanding_invoices(party_type, party, account, condition=None, filters=None):
 	outstanding_invoices = []
 	precision = frappe.get_precision("Sales Invoice", "outstanding_amount") or 2
@@ -890,8 +855,6 @@ def get_outstanding_invoices(party_type, party, account, condition=None, filters
 		as_dict=True,
 	)
 
-	invoice_list = remove_return_pos_invoices(party_type, party, invoice_list)
-
 	payment_entries = frappe.db.sql(
 		"""
 		select against_voucher_type, against_voucher,
@@ -1162,79 +1125,33 @@ def update_gl_entries_after(
 
 
 def repost_gle_for_stock_vouchers(
-	stock_vouchers: List[Tuple[str, str]],
-	posting_date: str,
-	company: Optional[str] = None,
-	warehouse_account=None,
-	repost_doc: Optional["RepostItemValuation"] = None,
+	stock_vouchers, posting_date, company=None, warehouse_account=None
 ):
-	if not stock_vouchers:
-		return
+	def _delete_gl_entries(voucher_type, voucher_no):
+		frappe.db.sql(
+			"""delete from `tabGL Entry`
+			where voucher_type=%s and voucher_no=%s""",
+			(voucher_type, voucher_no),
+		)
 
 	if not warehouse_account:
 		warehouse_account = get_warehouse_account_map(company)
 
 	precision = get_field_precision(frappe.get_meta("GL Entry").get_field("debit")) or 2
 
-	stock_vouchers = sort_stock_vouchers_by_posting_date(stock_vouchers)
-	if repost_doc and repost_doc.gl_reposting_index:
-		# Restore progress
-		stock_vouchers = stock_vouchers[cint(repost_doc.gl_reposting_index) :]
-
-	for stock_vouchers_chunk in create_batch(stock_vouchers, GL_REPOSTING_CHUNK):
-		gle = get_voucherwise_gl_entries(stock_vouchers_chunk, posting_date)
-		for voucher_type, voucher_no in stock_vouchers_chunk:
-			existing_gle = gle.get((voucher_type, voucher_no), [])
-			voucher_obj = frappe.get_doc(voucher_type, voucher_no)
-			expected_gle = voucher_obj.get_gl_entries(warehouse_account)
-			if expected_gle:
-				if not existing_gle or not compare_existing_and_expected_gle(
-					existing_gle, expected_gle, precision
-				):
-					_delete_gl_entries(voucher_type, voucher_no)
-					voucher_obj.make_gl_entries(gl_entries=expected_gle, from_repost=True)
-			else:
+	gle = get_voucherwise_gl_entries(stock_vouchers, posting_date)
+	for voucher_type, voucher_no in stock_vouchers:
+		existing_gle = gle.get((voucher_type, voucher_no), [])
+		voucher_obj = frappe.get_cached_doc(voucher_type, voucher_no)
+		expected_gle = voucher_obj.get_gl_entries(warehouse_account)
+		if expected_gle:
+			if not existing_gle or not compare_existing_and_expected_gle(
+				existing_gle, expected_gle, precision
+			):
 				_delete_gl_entries(voucher_type, voucher_no)
-
-		if not frappe.flags.in_test:
-			frappe.db.commit()
-
-		if repost_doc:
-			repost_doc.db_set(
-				"gl_reposting_index", cint(repost_doc.gl_reposting_index) + len(stock_vouchers_chunk)
-			)
-
-
-def _delete_gl_entries(voucher_type, voucher_no):
-	frappe.db.sql(
-		"""delete from `tabGL Entry`
-		where voucher_type=%s and voucher_no=%s""",
-		(voucher_type, voucher_no),
-	)
-
-
-def sort_stock_vouchers_by_posting_date(
-	stock_vouchers: List[Tuple[str, str]]
-) -> List[Tuple[str, str]]:
-	sle = frappe.qb.DocType("Stock Ledger Entry")
-	voucher_nos = [v[1] for v in stock_vouchers]
-
-	sles = (
-		frappe.qb.from_(sle)
-		.select(sle.voucher_type, sle.voucher_no, sle.posting_date, sle.posting_time, sle.creation)
-		.where((sle.is_cancelled == 0) & (sle.voucher_no.isin(voucher_nos)))
-		.groupby(sle.voucher_type, sle.voucher_no)
-		.orderby(sle.posting_date)
-		.orderby(sle.posting_time)
-		.orderby(sle.creation)
-	).run(as_dict=True)
-	sorted_vouchers = [(sle.voucher_type, sle.voucher_no) for sle in sles]
-
-	unknown_vouchers = set(stock_vouchers) - set(sorted_vouchers)
-	if unknown_vouchers:
-		sorted_vouchers.extend(unknown_vouchers)
-
-	return sorted_vouchers
+				voucher_obj.make_gl_entries(gl_entries=expected_gle, from_repost=True)
+		else:
+			_delete_gl_entries(voucher_type, voucher_no)
 
 
 def get_future_stock_vouchers(
@@ -1330,6 +1247,47 @@ def compare_existing_and_expected_gle(existing_gle, expected_gle, precision):
 	return matched
 
 
+def check_if_stock_and_account_balance_synced(
+	posting_date, company, voucher_type=None, voucher_no=None
+):
+	if not cint(erpnext.is_perpetual_inventory_enabled(company)):
+		return
+
+	accounts = get_stock_accounts(company, voucher_type, voucher_no)
+	stock_adjustment_account = frappe.db.get_value("Company", company, "stock_adjustment_account")
+
+	for account in accounts:
+		account_bal, stock_bal, warehouse_list = get_stock_and_account_balance(
+			account, posting_date, company
+		)
+
+		if abs(account_bal - stock_bal) > 0.1:
+			precision = get_field_precision(
+				frappe.get_meta("GL Entry").get_field("debit"),
+				currency=frappe.get_cached_value("Company", company, "default_currency"),
+			)
+
+			diff = flt(stock_bal - account_bal, precision)
+
+			error_reason = _(
+				"Stock Value ({0}) and Account Balance ({1}) are out of sync for account {2} and it's linked warehouses as on {3}."
+			).format(stock_bal, account_bal, frappe.bold(account), posting_date)
+			error_resolution = _("Please create an adjustment Journal Entry for amount {0} on {1}").format(
+				frappe.bold(diff), frappe.bold(posting_date)
+			)
+
+			frappe.msgprint(
+				msg="""{0}<br></br>{1}<br></br>""".format(error_reason, error_resolution),
+				raise_exception=StockValueAndAccountBalanceOutOfSync,
+				title=_("Values Out Of Sync"),
+				primary_action={
+					"label": _("Make Journal Entry"),
+					"client_action": "erpnext.route_to_adjustment_jv",
+					"args": get_journal_entry(account, stock_adjustment_account, diff),
+				},
+			)
+
+
 def get_stock_accounts(company, voucher_type=None, voucher_no=None):
 	stock_accounts = [
 		d.name

erpnext/assets/doctype/asset/asset.js

@@ -108,6 +108,10 @@ frappe.ui.form.on('Asset', {
 				frm.trigger("create_asset_repair");
 			}, __("Manage"));
 
+			frm.add_custom_button(__("Split Asset"), function() {
+				frm.trigger("split_asset");
+			}, __("Manage"));
+
 			if (frm.doc.status != 'Fully Depreciated') {
 				frm.add_custom_button(__("Adjust Asset Value"), function() {
 					frm.trigger("create_asset_value_adjustment");
@@ -322,6 +326,43 @@ frappe.ui.form.on('Asset', {
 		});
 	},
 
+	split_asset: function(frm) {
+		const title = __('Split Asset');
+
+		const fields = [
+			{
+				fieldname: 'split_qty',
+				fieldtype: 'Int',
+				label: __('Split Qty'),
+				reqd: 1
+			}
+		];
+
+		let dialog = new frappe.ui.Dialog({
+			title: title,
+			fields: fields
+		});
+
+		dialog.set_primary_action(__('Split'), function() {
+			const dialog_data = dialog.get_values();
+			frappe.call({
+				args: {
+					"asset_name": frm.doc.name,
+					"split_qty": cint(dialog_data.split_qty)
+				},
+				method: "erpnext.assets.doctype.asset.asset.split_asset",
+				callback: function(r) {
+					let doclist = frappe.model.sync(r.message);
+					frappe.set_route("Form", doclist[0].doctype, doclist[0].name);
+				}
+			});
+
+			dialog.hide();
+		});
+
+		dialog.show();
+	},
+
 	create_asset_value_adjustment: function(frm) {
 		frappe.call({
 			args: {
@@ -384,11 +425,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);
-		}
+		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)

erpnext/assets/doctype/asset/asset.json

@@ -3,7 +3,7 @@
  "allow_import": 1,
  "allow_rename": 1,
  "autoname": "naming_series:",
- "creation": "2016-03-01 17:01:27.920130",
+ "creation": "2022-01-18 02:26:55.975005",
  "doctype": "DocType",
  "document_type": "Document",
  "engine": "InnoDB",
@@ -23,6 +23,7 @@
   "asset_name",
   "asset_category",
   "location",
+  "split_from",
   "custodian",
   "department",
   "disposal_date",
@@ -35,9 +36,11 @@
   "available_for_use_date",
   "column_break_23",
   "gross_purchase_amount",
+  "asset_quantity",
   "purchase_date",
   "section_break_23",
   "calculate_depreciation",
+  "allow_monthly_depreciation",
   "column_break_33",
   "opening_accumulated_depreciation",
   "number_of_depreciations_booked",
@@ -453,6 +456,13 @@
    "fieldname": "dimension_col_break",
    "fieldtype": "Column Break"
   },
+  {
+   "default": "0",
+   "depends_on": "calculate_depreciation",
+   "fieldname": "allow_monthly_depreciation",
+   "fieldtype": "Check",
+   "label": "Allow Monthly Depreciation"
+  },
   {
    "collapsible": 1,
    "collapsible_depends_on": "is_existing_asset",
@@ -473,6 +483,18 @@
    "fieldname": "section_break_36",
    "fieldtype": "Section Break",
    "label": "Finance Books"
+  },
+  {
+   "fieldname": "split_from",
+   "fieldtype": "Link",
+   "label": "Split From",
+   "options": "Asset",
+   "read_only": 1
+  },
+  {
+   "fieldname": "asset_quantity",
+   "fieldtype": "Int",
+   "label": "Asset Quantity"
   }
  ],
  "idx": 72,
@@ -495,10 +517,11 @@
    "link_fieldname": "asset"
   }
  ],
- "modified": "2022-07-20 16:22:44.437579",
+ "modified": "2022-01-30 20:19:24.680027",
  "modified_by": "Administrator",
  "module": "Assets",
  "name": "Asset",
+ "naming_rule": "By \"Naming Series\" field",
  "owner": "Administrator",
  "permissions": [
   {
@@ -535,6 +558,7 @@
  "show_name_in_global_search": 1,
  "sort_field": "modified",
  "sort_order": "DESC",
+ "states": [],
  "title_field": "asset_name",
  "track_changes": 1
-}
+}

erpnext/assets/doctype/asset/asset.py

@@ -39,7 +39,8 @@ class Asset(AccountsController):
 		self.validate_item()
 		self.validate_cost_center()
 		self.set_missing_values()
-		self.prepare_depreciation_data()
+		if not self.split_from:
+			self.prepare_depreciation_data()
 		self.validate_gross_and_purchase_amount()
 		if self.get("schedules"):
 			self.validate_expected_value_after_useful_life()
@@ -235,135 +236,181 @@ class Asset(AccountsController):
 		start = self.clear_depreciation_schedule()
 
 		for finance_book in self.get("finance_books"):
-			self.validate_asset_finance_books(finance_book)
+			self._make_depreciation_schedule(finance_book, start, date_of_sale)
 
-			# value_after_depreciation - current Asset value
-			if self.docstatus == 1 and finance_book.value_after_depreciation:
-				value_after_depreciation = flt(finance_book.value_after_depreciation)
-			else:
-				value_after_depreciation = flt(self.gross_purchase_amount) - flt(
-					self.opening_accumulated_depreciation
+	def _make_depreciation_schedule(self, finance_book, start, date_of_sale):
+		self.validate_asset_finance_books(finance_book)
+
+		value_after_depreciation = self._get_value_after_depreciation(finance_book)
+		finance_book.value_after_depreciation = value_after_depreciation
+
+		number_of_pending_depreciations = cint(finance_book.total_number_of_depreciations) - cint(
+			self.number_of_depreciations_booked
+		)
+
+		has_pro_rata = self.check_is_pro_rata(finance_book)
+		if has_pro_rata:
+			number_of_pending_depreciations += 1
+
+		skip_row = False
+
+		for n in range(start[finance_book.idx - 1], number_of_pending_depreciations):
+			# If depreciation is already completed (for double declining balance)
+			if skip_row:
+				continue
+
+			depreciation_amount = get_depreciation_amount(self, value_after_depreciation, finance_book)
+
+			if not has_pro_rata or n < cint(number_of_pending_depreciations) - 1:
+				schedule_date = add_months(
+					finance_book.depreciation_start_date, n * cint(finance_book.frequency_of_depreciation)
 				)
 
-			finance_book.value_after_depreciation = value_after_depreciation
+				# schedule date will be a year later from start date
+				# so monthly schedule date is calculated by removing 11 months from it
+				monthly_schedule_date = add_months(schedule_date, -finance_book.frequency_of_depreciation + 1)
 
-			number_of_pending_depreciations = cint(finance_book.total_number_of_depreciations) - cint(
-				self.number_of_depreciations_booked
-			)
-
-			has_pro_rata = self.check_is_pro_rata(finance_book)
-
-			if has_pro_rata:
-				number_of_pending_depreciations += 1
-
-			skip_row = False
-			should_get_last_day = is_last_day_of_the_month(finance_book.depreciation_start_date)
-
-			for n in range(start[finance_book.idx - 1], number_of_pending_depreciations):
-				# If depreciation is already completed (for double declining balance)
-				if skip_row:
-					continue
-
-				depreciation_amount = get_depreciation_amount(self, value_after_depreciation, finance_book)
-
-				if not has_pro_rata or n < cint(number_of_pending_depreciations) - 1:
-					schedule_date = add_months(
-						finance_book.depreciation_start_date, n * cint(finance_book.frequency_of_depreciation)
-					)
-
-					if should_get_last_day:
-						schedule_date = get_last_day(schedule_date)
-
-					# schedule date will be a year later from start date
-					# so monthly schedule date is calculated by removing 11 months from it
-					monthly_schedule_date = add_months(schedule_date, -finance_book.frequency_of_depreciation + 1)
-
-				# if asset is being sold
-				if date_of_sale:
-					from_date = self.get_from_date(finance_book.finance_book)
-					depreciation_amount, days, months = self.get_pro_rata_amt(
-						finance_book, depreciation_amount, from_date, date_of_sale
-					)
-
-					if depreciation_amount > 0:
-						self.append(
-							"schedules",
-							{
-								"schedule_date": date_of_sale,
-								"depreciation_amount": depreciation_amount,
-								"depreciation_method": finance_book.depreciation_method,
-								"finance_book": finance_book.finance_book,
-								"finance_book_id": finance_book.idx,
-							},
-						)
-
-					break
-
-				# For first row
-				if has_pro_rata and not self.opening_accumulated_depreciation and n == 0:
-					from_date = add_days(
-						self.available_for_use_date, -1
-					)  # needed to calc depr amount for available_for_use_date too
-					depreciation_amount, days, months = self.get_pro_rata_amt(
-						finance_book, depreciation_amount, from_date, finance_book.depreciation_start_date
-					)
-
-					# For first depr schedule date will be the start date
-					# so monthly schedule date is calculated by removing month difference between use date and start date
-					monthly_schedule_date = add_months(finance_book.depreciation_start_date, -months + 1)
-
-				# For last row
-				elif has_pro_rata and n == cint(number_of_pending_depreciations) - 1:
-					if not self.flags.increase_in_asset_life:
-						# In case of increase_in_asset_life, the self.to_date is already set on asset_repair submission
-						self.to_date = add_months(
-							self.available_for_use_date,
-							(n + self.number_of_depreciations_booked) * cint(finance_book.frequency_of_depreciation),
-						)
-
-					depreciation_amount_without_pro_rata = depreciation_amount
-
-					depreciation_amount, days, months = self.get_pro_rata_amt(
-						finance_book, depreciation_amount, schedule_date, self.to_date
-					)
-
-					depreciation_amount = self.get_adjusted_depreciation_amount(
-						depreciation_amount_without_pro_rata, depreciation_amount, finance_book.finance_book
-					)
-
-					monthly_schedule_date = add_months(schedule_date, 1)
-					schedule_date = add_days(schedule_date, days)
-					last_schedule_date = schedule_date
-
-				if not depreciation_amount:
-					continue
-				value_after_depreciation -= flt(depreciation_amount, self.precision("gross_purchase_amount"))
-
-				# Adjust depreciation amount in the last period based on the expected value after useful life
-				if finance_book.expected_value_after_useful_life and (
-					(
-						n == cint(number_of_pending_depreciations) - 1
-						and value_after_depreciation != finance_book.expected_value_after_useful_life
-					)
-					or value_after_depreciation < finance_book.expected_value_after_useful_life
-				):
-					depreciation_amount += (
-						value_after_depreciation - finance_book.expected_value_after_useful_life
-					)
-					skip_row = True
+			# if asset is being sold
+			if date_of_sale:
+				from_date = self.get_from_date(finance_book.finance_book)
+				depreciation_amount, days, months = self.get_pro_rata_amt(
+					finance_book, depreciation_amount, from_date, date_of_sale
+				)
 
 				if depreciation_amount > 0:
-					self.append(
-						"schedules",
-						{
-							"schedule_date": schedule_date,
-							"depreciation_amount": depreciation_amount,
-							"depreciation_method": finance_book.depreciation_method,
-							"finance_book": finance_book.finance_book,
-							"finance_book_id": finance_book.idx,
-						},
+					self._add_depreciation_row(
+						date_of_sale,
+						depreciation_amount,
+						finance_book.depreciation_method,
+						finance_book.finance_book,
+						finance_book.idx,
 					)
 
+				break
+
+			# For first row
+			if has_pro_rata and not self.opening_accumulated_depreciation and n == 0:
+				from_date = add_days(
+					self.available_for_use_date, -1
+				)  # needed to calc depr amount for available_for_use_date too
+				depreciation_amount, days, months = self.get_pro_rata_amt(
+					finance_book, depreciation_amount, from_date, finance_book.depreciation_start_date
+				)
+
+				# For first depr schedule date will be the start date
+				# so monthly schedule date is calculated by removing month difference between use date and start date
+				monthly_schedule_date = add_months(finance_book.depreciation_start_date, -months + 1)
+
+			# For last row
+			elif has_pro_rata and n == cint(number_of_pending_depreciations) - 1:
+				if not self.flags.increase_in_asset_life:
+					# In case of increase_in_asset_life, the self.to_date is already set on asset_repair submission
+					self.to_date = add_months(
+						self.available_for_use_date,
+						(n + self.number_of_depreciations_booked) * cint(finance_book.frequency_of_depreciation),
+					)
+
+				depreciation_amount_without_pro_rata = depreciation_amount
+
+				depreciation_amount, days, months = self.get_pro_rata_amt(
+					finance_book, depreciation_amount, schedule_date, self.to_date
+				)
+
+				depreciation_amount = self.get_adjusted_depreciation_amount(
+					depreciation_amount_without_pro_rata, depreciation_amount, finance_book.finance_book
+				)
+
+				monthly_schedule_date = add_months(schedule_date, 1)
+				schedule_date = add_days(schedule_date, days)
+				last_schedule_date = schedule_date
+
+			if not depreciation_amount:
+				continue
+			value_after_depreciation -= flt(depreciation_amount, self.precision("gross_purchase_amount"))
+
+			# Adjust depreciation amount in the last period based on the expected value after useful life
+			if finance_book.expected_value_after_useful_life and (
+				(
+					n == cint(number_of_pending_depreciations) - 1
+					and value_after_depreciation != finance_book.expected_value_after_useful_life
+				)
+				or value_after_depreciation < finance_book.expected_value_after_useful_life
+			):
+				depreciation_amount += value_after_depreciation - finance_book.expected_value_after_useful_life
+				skip_row = True
+
+			if depreciation_amount > 0:
+				# With monthly depreciation, each depreciation is divided by months remaining until next date
+				if self.allow_monthly_depreciation:
+					# month range is 1 to 12
+					# In pro rata case, for first and last depreciation, month range would be different
+					month_range = (
+						months
+						if (has_pro_rata and n == 0)
+						or (has_pro_rata and n == cint(number_of_pending_depreciations) - 1)
+						else finance_book.frequency_of_depreciation
+					)
+
+					for r in range(month_range):
+						if has_pro_rata and n == 0:
+							# For first entry of monthly depr
+							if r == 0:
+								days_until_first_depr = date_diff(monthly_schedule_date, self.available_for_use_date)
+								per_day_amt = depreciation_amount / days
+								depreciation_amount_for_current_month = per_day_amt * days_until_first_depr
+								depreciation_amount -= depreciation_amount_for_current_month
+								date = monthly_schedule_date
+								amount = depreciation_amount_for_current_month
+							else:
+								date = add_months(monthly_schedule_date, r)
+								amount = depreciation_amount / (month_range - 1)
+						elif (has_pro_rata and n == cint(number_of_pending_depreciations) - 1) and r == cint(
+							month_range
+						) - 1:
+							# For last entry of monthly depr
+							date = last_schedule_date
+							amount = depreciation_amount / month_range
+						else:
+							date = add_months(monthly_schedule_date, r)
+							amount = depreciation_amount / month_range
+
+						self._add_depreciation_row(
+							date, amount, finance_book.depreciation_method, finance_book.finance_book, finance_book.idx
+						)
+				else:
+					self._add_depreciation_row(
+						schedule_date,
+						depreciation_amount,
+						finance_book.depreciation_method,
+						finance_book.finance_book,
+						finance_book.idx,
+					)
+
+	def _add_depreciation_row(
+		self, schedule_date, depreciation_amount, depreciation_method, finance_book, finance_book_id
+	):
+		self.append(
+			"schedules",
+			{
+				"schedule_date": schedule_date,
+				"depreciation_amount": depreciation_amount,
+				"depreciation_method": depreciation_method,
+				"finance_book": finance_book,
+				"finance_book_id": finance_book_id,
+			},
+		)
+
+	def _get_value_after_depreciation(self, finance_book):
+		# value_after_depreciation - current Asset value
+		if self.docstatus == 1 and finance_book.value_after_depreciation:
+			value_after_depreciation = flt(finance_book.value_after_depreciation)
+		else:
+			value_after_depreciation = flt(self.gross_purchase_amount) - flt(
+				self.opening_accumulated_depreciation
+			)
+
+		return value_after_depreciation
+
 	# depreciation schedules need to be cleared before modification due to increase in asset life/asset sales
 	# JE: Journal Entry, FB: Finance Book
 	def clear_depreciation_schedule(self):
@@ -372,7 +419,6 @@ class Asset(AccountsController):
 		depr_schedule = []
 
 		for schedule in self.get("schedules"):
-
 			# to update start when there are JEs linked with all the schedule rows corresponding to an FB
 			if len(start) == (int(schedule.finance_book_id) - 2):
 				start.append(num_of_depreciations_completed)
@@ -587,7 +633,7 @@ class Asset(AccountsController):
 
 				asset_value_after_full_schedule = flt(
 					flt(self.gross_purchase_amount) - flt(accumulated_depreciation_after_full_schedule),
-					row.precision("expected_value_after_useful_life"),
+					self.precision("gross_purchase_amount"),
 				)
 
 				if (
@@ -804,11 +850,16 @@ class Asset(AccountsController):
 			if args.get("rate_of_depreciation") and on_validate:
 				return args.get("rate_of_depreciation")
 
+			no_of_years = (
+				flt(args.get("total_number_of_depreciations") * flt(args.get("frequency_of_depreciation")))
+				/ 12
+			)
 			value = flt(args.get("expected_value_after_useful_life")) / flt(self.gross_purchase_amount)
 
-			depreciation_rate = math.pow(value, 1.0 / flt(args.get("total_number_of_depreciations"), 2))
+			# square root of flt(salvage_value) / flt(asset_cost)
+			depreciation_rate = math.pow(value, 1.0 / flt(no_of_years, 2))
 
-			return flt((100 * (1 - depreciation_rate)), float_precision)
+			return 100 * (1 - flt(depreciation_rate, float_precision))
 
 	def get_pro_rata_amt(self, row, depreciation_amount, from_date, to_date):
 		days = date_diff(to_date, from_date)
@@ -819,9 +870,7 @@ class Asset(AccountsController):
 
 
 def update_maintenance_status():
-	assets = frappe.get_all(
-		"Asset", filters={"docstatus": 1, "maintenance_required": 1, "disposal_date": ("is", "not set")}
-	)
+	assets = frappe.get_all("Asset", filters={"docstatus": 1, "maintenance_required": 1})
 
 	for asset in assets:
 		asset = frappe.get_doc("Asset", asset.name)
@@ -1059,18 +1108,9 @@ def is_cwip_accounting_enabled(asset_category):
 def get_total_days(date, frequency):
 	period_start_date = add_months(date, cint(frequency) * -1)
 
-	if is_last_day_of_the_month(date):
-		period_start_date = get_last_day(period_start_date)
-
 	return date_diff(date, period_start_date)
 
 
-def is_last_day_of_the_month(date):
-	last_day_of_the_month = get_last_day(date)
-
-	return getdate(last_day_of_the_month) == getdate(date)
-
-
 @erpnext.allow_regional
 def get_depreciation_amount(asset, depreciable_value, row):
 	if row.depreciation_method in ("Straight Line", "Manual"):
@@ -1089,3 +1129,150 @@ def get_depreciation_amount(asset, depreciable_value, row):
 		depreciation_amount = flt(depreciable_value * (flt(row.rate_of_depreciation) / 100))
 
 	return depreciation_amount
+
+
+@frappe.whitelist()
+def split_asset(asset_name, split_qty):
+	asset = frappe.get_doc("Asset", asset_name)
+	split_qty = cint(split_qty)
+
+	if split_qty >= asset.asset_quantity:
+		frappe.throw(_("Split qty cannot be grater than or equal to asset qty"))
+
+	remaining_qty = asset.asset_quantity - split_qty
+
+	new_asset = create_new_asset_after_split(asset, split_qty)
+	update_existing_asset(asset, remaining_qty)
+
+	return new_asset
+
+
+def update_existing_asset(asset, remaining_qty):
+	remaining_gross_purchase_amount = flt(
+		(asset.gross_purchase_amount * remaining_qty) / asset.asset_quantity
+	)
+	opening_accumulated_depreciation = flt(
+		(asset.opening_accumulated_depreciation * remaining_qty) / asset.asset_quantity
+	)
+
+	frappe.db.set_value(
+		"Asset",
+		asset.name,
+		{
+			"opening_accumulated_depreciation": opening_accumulated_depreciation,
+			"gross_purchase_amount": remaining_gross_purchase_amount,
+			"asset_quantity": remaining_qty,
+		},
+	)
+
+	for finance_book in asset.get("finance_books"):
+		value_after_depreciation = flt(
+			(finance_book.value_after_depreciation * remaining_qty) / asset.asset_quantity
+		)
+		expected_value_after_useful_life = flt(
+			(finance_book.expected_value_after_useful_life * remaining_qty) / asset.asset_quantity
+		)
+		frappe.db.set_value(
+			"Asset Finance Book", finance_book.name, "value_after_depreciation", value_after_depreciation
+		)
+		frappe.db.set_value(
+			"Asset Finance Book",
+			finance_book.name,
+			"expected_value_after_useful_life",
+			expected_value_after_useful_life,
+		)
+
+	accumulated_depreciation = 0
+
+	for term in asset.get("schedules"):
+		depreciation_amount = flt((term.depreciation_amount * remaining_qty) / asset.asset_quantity)
+		frappe.db.set_value(
+			"Depreciation Schedule", term.name, "depreciation_amount", depreciation_amount
+		)
+		accumulated_depreciation += depreciation_amount
+		frappe.db.set_value(
+			"Depreciation Schedule", term.name, "accumulated_depreciation_amount", accumulated_depreciation
+		)
+
+
+def create_new_asset_after_split(asset, split_qty):
+	new_asset = frappe.copy_doc(asset)
+	new_gross_purchase_amount = flt((asset.gross_purchase_amount * split_qty) / asset.asset_quantity)
+	opening_accumulated_depreciation = flt(
+		(asset.opening_accumulated_depreciation * split_qty) / asset.asset_quantity
+	)
+
+	new_asset.gross_purchase_amount = new_gross_purchase_amount
+	new_asset.opening_accumulated_depreciation = opening_accumulated_depreciation
+	new_asset.asset_quantity = split_qty
+	new_asset.split_from = asset.name
+	accumulated_depreciation = 0
+
+	for finance_book in new_asset.get("finance_books"):
+		finance_book.value_after_depreciation = flt(
+			(finance_book.value_after_depreciation * split_qty) / asset.asset_quantity
+		)
+		finance_book.expected_value_after_useful_life = flt(
+			(finance_book.expected_value_after_useful_life * split_qty) / asset.asset_quantity
+		)
+
+	for term in new_asset.get("schedules"):
+		depreciation_amount = flt((term.depreciation_amount * split_qty) / asset.asset_quantity)
+		term.depreciation_amount = depreciation_amount
+		accumulated_depreciation += depreciation_amount
+		term.accumulated_depreciation_amount = accumulated_depreciation
+
+	new_asset.submit()
+	new_asset.set_status()
+
+	for term in new_asset.get("schedules"):
+		# Update references in JV
+		if term.journal_entry:
+			add_reference_in_jv_on_split(
+				term.journal_entry, new_asset.name, asset.name, term.depreciation_amount
+			)
+
+	return new_asset
+
+
+def add_reference_in_jv_on_split(entry_name, new_asset_name, old_asset_name, depreciation_amount):
+	journal_entry = frappe.get_doc("Journal Entry", entry_name)
+	entries_to_add = []
+	idx = len(journal_entry.get("accounts")) + 1
+
+	for account in journal_entry.get("accounts"):
+		if account.reference_name == old_asset_name:
+			entries_to_add.append(frappe.copy_doc(account).as_dict())
+			if account.credit:
+				account.credit = account.credit - depreciation_amount
+				account.credit_in_account_currency = (
+					account.credit_in_account_currency - account.exchange_rate * depreciation_amount
+				)
+			elif account.debit:
+				account.debit = account.debit - depreciation_amount
+				account.debit_in_account_currency = (
+					account.debit_in_account_currency - account.exchange_rate * depreciation_amount
+				)
+
+	for entry in entries_to_add:
+		entry.reference_name = new_asset_name
+		if entry.credit:
+			entry.credit = depreciation_amount
+			entry.credit_in_account_currency = entry.exchange_rate * depreciation_amount
+		elif entry.debit:
+			entry.debit = depreciation_amount
+			entry.debit_in_account_currency = entry.exchange_rate * depreciation_amount
+
+		entry.idx = idx
+		idx += 1
+
+		journal_entry.append("accounts", entry)
+
+	journal_entry.flags.ignore_validate_update_after_submit = True
+	journal_entry.save()
+
+	# Repost GL Entries
+	journal_entry.docstatus = 2
+	journal_entry.make_gl_entries(1)
+	journal_entry.docstatus = 1
+	journal_entry.make_gl_entries()

erpnext/assets/doctype/asset/test_asset.py

@@ -7,7 +7,7 @@ import frappe
 from frappe.utils import add_days, add_months, cstr, flt, get_last_day, getdate, nowdate
 
 from erpnext.accounts.doctype.purchase_invoice.test_purchase_invoice import make_purchase_invoice
-from erpnext.assets.doctype.asset.asset import make_sales_invoice, update_maintenance_status
+from erpnext.assets.doctype.asset.asset import make_sales_invoice, split_asset
 from erpnext.assets.doctype.asset.depreciation import (
 	post_depreciation_entries,
 	restore_asset,
@@ -145,7 +145,6 @@ class TestAsset(AssetSetup):
 	def test_is_fixed_asset_set(self):
 		asset = create_asset(is_existing_asset=1)
 		doc = frappe.new_doc("Purchase Invoice")
-		doc.company = "_Test Company"
 		doc.supplier = "_Test Supplier"
 		doc.append("items", {"item_code": "Macbook Pro", "qty": 1, "asset": asset.name})
 
@@ -202,54 +201,6 @@ class TestAsset(AssetSetup):
 			depreciation_start_date="2020-12-31",
 			submit=1,
 		)
-		post_depreciation_entries(date="2021-01-01")
-
-		si = make_sales_invoice(asset=asset.name, item_code="Macbook Pro", company="_Test Company")
-		si.customer = "_Test Customer"
-		si.set_posting_time = 1
-		si.posting_date = "2021-10-31"
-		si.due_date = "2021-10-31"
-		si.get("items")[0].rate = 75000
-		si.submit()
-
-		self.assertEqual(frappe.db.get_value("Asset", asset.name, "status"), "Sold")
-
-		expected_gle = (
-			("_Test Accumulated Depreciations - _TC", 50490.2, 0.0),
-			("_Test Fixed Asset - _TC", 0.0, 100000.0),
-			("_Test Gain/Loss on Asset Disposal - _TC", 0.0, 25490.2),
-			("Debtors - _TC", 75000.0, 0.0),
-		)
-
-		gle = frappe.db.sql(
-			"""select account, debit, credit from `tabGL Entry`
-			where voucher_type='Sales Invoice' and voucher_no = %s
-			order by account""",
-			si.name,
-		)
-
-		for i, gle_entry in enumerate(gle):
-			self.assertEqual(gle_entry[0], expected_gle[i][0])
-			self.assertEqual(flt(gle_entry[1], 1), flt(expected_gle[i][1], 1))
-			self.assertEqual(flt(gle_entry[2], 1), flt(expected_gle[i][2], 1))
-
-		si.load_from_db()
-		si.cancel()
-
-		self.assertEqual(frappe.db.get_value("Asset", asset.name, "status"), "Partially Depreciated")
-
-	def test_asset_with_maintenance_required_status_after_sale(self):
-		asset = create_asset(
-			calculate_depreciation=1,
-			available_for_use_date="2020-06-06",
-			purchase_date="2020-01-01",
-			expected_value_after_useful_life=10000,
-			total_number_of_depreciations=3,
-			frequency_of_depreciation=10,
-			maintenance_required=1,
-			depreciation_start_date="2020-12-31",
-			submit=1,
-		)
 
 		post_depreciation_entries(date="2021-01-01")
 
@@ -262,9 +213,75 @@ class TestAsset(AssetSetup):
 
 		self.assertEqual(frappe.db.get_value("Asset", asset.name, "status"), "Sold")
 
-		update_maintenance_status()
+		expected_gle = (
+			("_Test Accumulated Depreciations - _TC", 20490.2, 0.0),
+			("_Test Fixed Asset - _TC", 0.0, 100000.0),
+			("_Test Gain/Loss on Asset Disposal - _TC", 54509.8, 0.0),
+			("Debtors - _TC", 25000.0, 0.0),
+		)
 
-		self.assertEqual(frappe.db.get_value("Asset", asset.name, "status"), "Sold")
+		gle = frappe.db.sql(
+			"""select account, debit, credit from `tabGL Entry`
+			where voucher_type='Sales Invoice' and voucher_no = %s
+			order by account""",
+			si.name,
+		)
+
+		self.assertEqual(gle, expected_gle)
+
+		si.cancel()
+		self.assertEqual(frappe.db.get_value("Asset", asset.name, "status"), "Partially Depreciated")
+
+	def test_asset_splitting(self):
+		asset = create_asset(
+			calculate_depreciation=1,
+			asset_quantity=10,
+			available_for_use_date="2020-01-01",
+			purchase_date="2020-01-01",
+			expected_value_after_useful_life=0,
+			total_number_of_depreciations=6,
+			number_of_depreciations_booked=1,
+			frequency_of_depreciation=10,
+			depreciation_start_date="2021-01-01",
+			opening_accumulated_depreciation=20000,
+			gross_purchase_amount=120000,
+			submit=1,
+		)
+
+		post_depreciation_entries(date="2021-01-01")
+
+		self.assertEqual(asset.asset_quantity, 10)
+		self.assertEqual(asset.gross_purchase_amount, 120000)
+		self.assertEqual(asset.opening_accumulated_depreciation, 20000)
+
+		new_asset = split_asset(asset.name, 2)
+		asset.load_from_db()
+
+		self.assertEqual(new_asset.asset_quantity, 2)
+		self.assertEqual(new_asset.gross_purchase_amount, 24000)
+		self.assertEqual(new_asset.opening_accumulated_depreciation, 4000)
+		self.assertEqual(new_asset.split_from, asset.name)
+		self.assertEqual(new_asset.schedules[0].depreciation_amount, 4000)
+		self.assertEqual(new_asset.schedules[1].depreciation_amount, 4000)
+
+		self.assertEqual(asset.asset_quantity, 8)
+		self.assertEqual(asset.gross_purchase_amount, 96000)
+		self.assertEqual(asset.opening_accumulated_depreciation, 16000)
+		self.assertEqual(asset.schedules[0].depreciation_amount, 16000)
+		self.assertEqual(asset.schedules[1].depreciation_amount, 16000)
+
+		journal_entry = asset.schedules[0].journal_entry
+
+		jv = frappe.get_doc("Journal Entry", journal_entry)
+		self.assertEqual(jv.accounts[0].credit_in_account_currency, 16000)
+		self.assertEqual(jv.accounts[1].debit_in_account_currency, 16000)
+		self.assertEqual(jv.accounts[2].credit_in_account_currency, 4000)
+		self.assertEqual(jv.accounts[3].debit_in_account_currency, 4000)
+
+		self.assertEqual(jv.accounts[0].reference_name, asset.name)
+		self.assertEqual(jv.accounts[1].reference_name, asset.name)
+		self.assertEqual(jv.accounts[2].reference_name, new_asset.name)
+		self.assertEqual(jv.accounts[3].reference_name, new_asset.name)
 
 	def test_expense_head(self):
 		pr = make_purchase_receipt(
@@ -730,41 +747,6 @@ class TestDepreciationMethods(AssetSetup):
 		asset.reload()
 		self.assertEquals(asset.finance_books[0].value_after_depreciation, 98000.0)
 
-	def test_monthly_depreciation_by_wdv_method(self):
-		existing_precision = frappe.db.get_default("float_precision")
-		frappe.db.set_default("float_precision", 3)
-		asset = create_asset(
-			calculate_depreciation=1,
-			available_for_use_date="2022-02-15",
-			purchase_date="2022-02-15",
-			depreciation_method="Written Down Value",
-			gross_purchase_amount=10000,
-			expected_value_after_useful_life=5000,
-			depreciation_start_date="2022-02-28",
-			total_number_of_depreciations=5,
-			frequency_of_depreciation=1,
-		)
-
-		expected_schedules = [
-			["2022-02-28", 647.25, 647.25],
-			["2022-03-31", 1210.71, 1857.96],
-			["2022-04-30", 1053.99, 2911.95],
-			["2022-05-31", 917.55, 3829.5],
-			["2022-06-30", 798.77, 4628.27],
-			["2022-07-15", 371.73, 5000.0],
-		]
-
-		schedules = [
-			[
-				cstr(d.schedule_date),
-				flt(d.depreciation_amount, 2),
-				flt(d.accumulated_depreciation_amount, 2),
-			]
-			for d in asset.get("schedules")
-		]
-		self.assertEqual(schedules, expected_schedules)
-		frappe.db.set_default("float_precision", existing_precision)
-
 
 class TestDepreciationBasics(AssetSetup):
 	def test_depreciation_without_pro_rata(self):
@@ -851,7 +833,7 @@ class TestDepreciationBasics(AssetSetup):
 		expected_values = [["2020-12-31", 30000.0], ["2021-12-31", 30000.0], ["2022-12-31", 30000.0]]
 
 		for i, schedule in enumerate(asset.schedules):
-			self.assertEqual(getdate(expected_values[i][0]), schedule.schedule_date)
+			self.assertEqual(expected_values[i][0], schedule.schedule_date)
 			self.assertEqual(expected_values[i][1], schedule.depreciation_amount)
 
 	def test_set_accumulated_depreciation(self):
@@ -1325,32 +1307,6 @@ class TestDepreciationBasics(AssetSetup):
 		asset.cost_center = "Main - _TC"
 		asset.submit()
 
-	def test_depreciation_on_final_day_of_the_month(self):
-		"""Tests if final day of the month is picked each time, if the depreciation start date is the last day of the month."""
-
-		asset = create_asset(
-			item_code="Macbook Pro",
-			calculate_depreciation=1,
-			purchase_date="2020-01-30",
-			available_for_use_date="2020-02-15",
-			depreciation_start_date="2020-02-29",
-			frequency_of_depreciation=1,
-			total_number_of_depreciations=5,
-			submit=1,
-		)
-
-		expected_dates = [
-			"2020-02-29",
-			"2020-03-31",
-			"2020-04-30",
-			"2020-05-31",
-			"2020-06-30",
-			"2020-07-15",
-		]
-
-		for i, schedule in enumerate(asset.schedules):
-			self.assertEqual(getdate(expected_dates[i]), getdate(schedule.schedule_date))
-
 
 def create_asset_data():
 	if not frappe.db.exists("Asset Category", "Computers"):
@@ -1381,12 +1337,12 @@ def create_asset(**args):
 			"number_of_depreciations_booked": args.number_of_depreciations_booked or 0,
 			"gross_purchase_amount": args.gross_purchase_amount or 100000,
 			"purchase_receipt_amount": args.purchase_receipt_amount or 100000,
-			"maintenance_required": args.maintenance_required or 0,
 			"warehouse": args.warehouse or "_Test Warehouse - _TC",
 			"available_for_use_date": args.available_for_use_date or "2020-06-06",
 			"location": args.location or "Test Location",
 			"asset_owner": args.asset_owner or "Company",
 			"is_existing_asset": args.is_existing_asset or 1,
+			"asset_quantity": args.get("asset_quantity") or 1,
 		}
 	)
 

erpnext/assets/doctype/asset_repair/asset_repair.py

@@ -41,46 +41,40 @@ class AssetRepair(AccountsController):
 
 		if self.get("stock_consumption") or self.get("capitalize_repair_cost"):
 			self.increase_asset_value()
+		if self.get("stock_consumption"):
+			self.check_for_stock_items_and_warehouse()
+			self.decrease_stock_quantity()
+		if self.get("capitalize_repair_cost"):
+			self.make_gl_entries()
+			if (
+				frappe.db.get_value("Asset", self.asset, "calculate_depreciation")
+				and self.increase_in_asset_life
+			):
+				self.modify_depreciation_schedule()
 
-			if self.get("stock_consumption"):
-				self.check_for_stock_items_and_warehouse()
-				self.decrease_stock_quantity()
-
-			if self.get("capitalize_repair_cost"):
-				self.make_gl_entries()
-
-				if (
-					frappe.db.get_value("Asset", self.asset, "calculate_depreciation")
-					and self.increase_in_asset_life
-				):
-					self.modify_depreciation_schedule()
-
-			self.asset_doc.flags.ignore_validate_update_after_submit = True
-			self.asset_doc.prepare_depreciation_data()
-			self.asset_doc.save()
+		self.asset_doc.flags.ignore_validate_update_after_submit = True
+		self.asset_doc.prepare_depreciation_data()
+		self.asset_doc.save()
 
 	def before_cancel(self):
 		self.asset_doc = frappe.get_doc("Asset", self.asset)
 
 		if self.get("stock_consumption") or self.get("capitalize_repair_cost"):
 			self.decrease_asset_value()
+		if self.get("stock_consumption"):
+			self.increase_stock_quantity()
+		if self.get("capitalize_repair_cost"):
+			self.ignore_linked_doctypes = ("GL Entry", "Stock Ledger Entry")
+			self.make_gl_entries(cancel=True)
+			if (
+				frappe.db.get_value("Asset", self.asset, "calculate_depreciation")
+				and self.increase_in_asset_life
+			):
+				self.revert_depreciation_schedule_on_cancellation()
 
-			if self.get("stock_consumption"):
-				self.increase_stock_quantity()
-
-			if self.get("capitalize_repair_cost"):
-				self.ignore_linked_doctypes = ("GL Entry", "Stock Ledger Entry")
-				self.make_gl_entries(cancel=True)
-
-				if (
-					frappe.db.get_value("Asset", self.asset, "calculate_depreciation")
-					and self.increase_in_asset_life
-				):
-					self.revert_depreciation_schedule_on_cancellation()
-
-			self.asset_doc.flags.ignore_validate_update_after_submit = True
-			self.asset_doc.prepare_depreciation_data()
-			self.asset_doc.save()
+		self.asset_doc.flags.ignore_validate_update_after_submit = True
+		self.asset_doc.prepare_depreciation_data()
+		self.asset_doc.save()
 
 	def check_repair_status(self):
 		if self.repair_status == "Pending":

erpnext/buying/doctype/purchase_order/purchase_order.js

@@ -44,10 +44,7 @@ frappe.ui.form.on("Purchase Order", {
 			return erpnext.queries.warehouse(frm.doc);
 		});
 
-		// On cancel and amending a purchase order with advance payment, reset advance paid amount
-		if (frm.is_new()) {
-			frm.set_value("advance_paid", 0)
-		}
+		erpnext.accounts.dimensions.setup_dimension_filters(frm, frm.doctype);
 	},
 
 	apply_tds: function(frm) {
@@ -430,7 +427,7 @@ erpnext.buying.PurchaseOrderController = erpnext.buying.BuyingController.extend(
 						company: me.frm.doc.company
 					},
 					allow_child_item_selection: true,
-					child_fieldname: "items",
+					child_fielname: "items",
 					child_columns: ["item_code", "qty"]
 				})
 			}, __("Get Items From"));

erpnext/buying/doctype/purchase_order/purchase_order.json

@@ -23,10 +23,6 @@
   "order_confirmation_no",
   "order_confirmation_date",
   "amended_from",
-  "accounting_dimensions_section",
-  "cost_center",
-  "dimension_col_break",
-  "project",
   "drop_ship",
   "customer",
   "customer_name",
@@ -439,6 +435,7 @@
    "fieldname": "ignore_pricing_rule",
    "fieldtype": "Check",
    "label": "Ignore Pricing Rule",
+   "no_copy": 1,
    "permlevel": 1,
    "print_hide": 1
   },
@@ -1141,39 +1138,16 @@
    "fieldtype": "Link",
    "label": "Tax Withholding Category",
    "options": "Tax Withholding Category"
-  },
-  {
-   "collapsible": 1,
-   "fieldname": "accounting_dimensions_section",
-   "fieldtype": "Section Break",
-   "label": "Accounting Dimensions "
-  },
-  {
-   "fieldname": "cost_center",
-   "fieldtype": "Link",
-   "label": "Cost Center",
-   "options": "Cost Center"
-  },
-  {
-   "fieldname": "dimension_col_break",
-   "fieldtype": "Column Break"
-  },
-  {
-   "fieldname": "project",
-   "fieldtype": "Link",
-   "label": "Project",
-   "options": "Project"
   }
  ],
  "icon": "fa fa-file-text",
  "idx": 105,
  "is_submittable": 1,
  "links": [],
- "modified": "2022-09-16 17:45:04.954055",
+ "modified": "2021-09-28 13:10:47.955401",
  "modified_by": "Administrator",
  "module": "Buying",
  "name": "Purchase Order",
- "naming_rule": "By \"Naming Series\" field",
  "owner": "Administrator",
  "permissions": [
   {
@@ -1220,7 +1194,6 @@
  "show_name_in_global_search": 1,
  "sort_field": "modified",
  "sort_order": "DESC",
- "states": [],
  "timeline_field": "supplier",
  "title_field": "supplier_name",
  "track_changes": 1

erpnext/buying/doctype/purchase_order/purchase_order.py

@@ -18,7 +18,7 @@ from erpnext.accounts.doctype.sales_invoice.sales_invoice import (
 from erpnext.accounts.doctype.tax_withholding_category.tax_withholding_category import (
 	get_party_tax_withholding_details,
 )
-from erpnext.accounts.party import get_party_account, get_party_account_currency
+from erpnext.accounts.party import get_party_account_currency
 from erpnext.buying.utils import check_on_hold_or_closed_status, validate_for_items
 from erpnext.controllers.buying_controller import BuyingController
 from erpnext.setup.doctype.item_group.item_group import get_item_group_defaults
@@ -323,7 +323,6 @@ class PurchaseOrder(BuyingController):
 		update_linked_doc(self.doctype, self.name, self.inter_company_order_reference)
 
 	def on_cancel(self):
-		self.ignore_linked_doctypes = ("GL Entry", "Payment Ledger Entry")
 		super(PurchaseOrder, self).on_cancel()
 
 		if self.is_against_so():
@@ -533,7 +532,6 @@ def get_mapped_purchase_invoice(source_name, target_doc=None, ignore_permissions
 			target.set_advances()
 
 		target.set_payment_schedule()
-		target.credit_to = get_party_account("Supplier", source.supplier, source.company)
 
 	def update_item(obj, target, source_parent):
 		target.amount = flt(obj.amount) - flt(obj.billed_amt)
@@ -639,8 +637,6 @@ def make_rm_stock_entry(purchase_order, rm_items):
 						}
 					}
 					stock_entry.add_to_stock_entry_detail(items_dict)
-
-		stock_entry.set_missing_values()
 		return stock_entry.as_dict()
 	else:
 		frappe.throw(_("No Items selected for transfer"))
@@ -728,7 +724,7 @@ def make_return_stock_entry_for_subcontract(available_materials, po_doc, po_deta
 			add_items_in_ste(ste_doc, value, value.qty, po_details)
 
 	ste_doc.set_stock_entry_type()
-	ste_doc.set_missing_values()
+	ste_doc.calculate_rate_and_amount()
 
 	return ste_doc
 

erpnext/buying/doctype/purchase_order/test_purchase_order.py

@@ -140,43 +140,6 @@ class TestPurchaseOrder(FrappeTestCase):
 		# ordered qty decreases as ordered qty is 0 (deleted row)
 		self.assertEqual(get_ordered_qty(), existing_ordered_qty - 10)  # 0
 
-	def test_supplied_items_validations_on_po_update_after_submit(self):
-		po = create_purchase_order(item_code="_Test FG Item", is_subcontracted="Yes", qty=5, rate=100)
-		item = po.items[0]
-
-		original_supplied_items = {po.name: po.required_qty for po in po.supplied_items}
-
-		# Just update rate
-		trans_item = [
-			{
-				"item_code": "_Test FG Item",
-				"rate": 20,
-				"qty": 5,
-				"conversion_factor": 1.0,
-				"docname": item.name,
-			}
-		]
-		update_child_qty_rate("Purchase Order", json.dumps(trans_item), po.name)
-		po.reload()
-
-		new_supplied_items = {po.name: po.required_qty for po in po.supplied_items}
-		self.assertEqual(set(original_supplied_items.keys()), set(new_supplied_items.keys()))
-
-		# Update qty to 2x
-		trans_item[0]["qty"] *= 2
-		update_child_qty_rate("Purchase Order", json.dumps(trans_item), po.name)
-		po.reload()
-
-		new_supplied_items = {po.name: po.required_qty for po in po.supplied_items}
-		self.assertEqual(2 * sum(original_supplied_items.values()), sum(new_supplied_items.values()))
-
-		# Set transfer qty and attempt to update qty, shouldn't be allowed
-		po.supplied_items[0].supplied_qty = 2
-		po.supplied_items[0].db_update()
-		trans_item[0]["qty"] *= 2
-		with self.assertRaises(frappe.ValidationError):
-			update_child_qty_rate("Purchase Order", json.dumps(trans_item), po.name)
-
 	def test_update_child(self):
 		mr = make_material_request(qty=10)
 		po = make_purchase_order(mr.name)