refactor: merge taxes from delivery note to Sales Invoice by ruthra-kumar [frappe] PR#40878

From: https://github.com/frappe/erpnext/pull/40878
Date: 2024-04-08 14:37:44+05:30

• Merge pull request #40878 from ruthra-kumar/merge_taxes_from_DN_to_sales_invoice
• test: tax merging from 2 Delivery Note to Sales Invoice
• refactor: merge taxes from delivery note to Sales Invoice

---

Diagnostics

pre-commit failed for source commit: 503687a224869a860116a9c9a2b88b615753a0e0
flake8...................................................................Failed
- hook id: flake8
- exit code: 1

erpnext/controllers/accounts_controller.py:3768:1: F811 redefinition of unused 'validate_regional' from line 3763


Suspicious merge commit detected: 503687a224869a860116a9c9a2b88b615753a0e0

---

Checkout instructions

# Checkout locally
git fetch upstream
git switch ft-pr-40878

# Alternatively, re-take the changes
git switch develop
ft take ft-pr-40878

# Make changes then rebase
git rebase -i develop

# Fix or ignore conflicts
git checkout --theirs .
git rebase --continue

# Force-push changes
git push --force-with-lease