mirror of
https://github.com/frappe/erpnext.git
synced 2026-08-21 18:29:57 +00:00
Conflicts: erpnext/accounts/doctype/journal_voucher/journal_voucher.js erpnext/accounts/doctype/payable_voucher/payable_voucher.js index.html version.num