tree b85cbdff40b207d8826f60a00c8151efc780cd97
parent 85d1a237ce13d857ebbecd6a7e196c06d9aa3735
parent 34f5283c1773b79463fcf77a037c6ae258e329dc
author Saif Ur Rehman <saifi0102@gmail.com> 1636442237 +0500
committer Saif Ur Rehman <saifi0102@gmail.com> 1636442237 +0500

Merge remote-tracking branch 'upstream/develop' into asset-capitalization

# Conflicts:
#	erpnext/accounts/doctype/sales_invoice/sales_invoice.py