mirror of
https://github.com/frappe/erpnext.git
synced 2026-03-01 17:45:56 +00:00
Conflicts: accounts/doctype/account/account.py erpnext/accounts/doctype/journal_voucher/journal_voucher.py patches/patch_list.py startup/event_handlers.py