Skip to content

Merge branch 'develop' of https://github.com/frappe/erpnext into asset_purchase_receipt_gl [frappe]

Bot Dokos requested to merge ft-commit-dae66eab367ea9 into develop

From: https://github.com/frappe/erpnext/commit/dae66eab367ea9fc3123414298e1bf7ba8e19653
Date: 2023-10-20 20:12:43+05:30
By: Deepesh Garg

Merge branch 'develop' of https://github.com/frappe/erpnext into asset_purchase_receipt_gl

This is a commit that is not part of any pull request.


Checkout instructions 
# Checkout locally
git fetch upstream
git switch ft-commit-dae66eab367ea9

# Make changes then rebase
git rebase -i upstream/develop --reapply-cherry-picks

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

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

Merge request reports