mirror of
https://github.com/frappe/erpnext.git
synced 2026-06-02 19:59:12 +00:00
Conflicts: erpnext/accounts/doctype/sales_invoice/sales_invoice.py erpnext/patches/patch_list.py public/js/report-legacy.js
Conflicts: erpnext/accounts/doctype/sales_invoice/sales_invoice.py erpnext/patches/patch_list.py public/js/report-legacy.js