nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-08-14 23:18:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: resolving conflicts

Browse Source
This commit is contained in:
Shllokkk
2026-06-18 17:10:12 +05:30
committed by GitHub
parent c207b8425c
commit a6b56a4dd7
1 changed files with 0 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json
View File

@@ -400,21 +400,6 @@
"fieldtype": "Select",
"label": "Categorize By",
"options": "\nCategorize by Voucher\nCategorize by Voucher (Consolidated)"
<<<<<<< HEAD
=======
},
{
"default": "0",
"depends_on": "eval:(doc.report == 'Accounts Receivable');",
"fieldname": "show_future_payments",
"fieldtype": "Check",
"label": "Show Future Payments"
},
{
"fieldname": "print_format",
"fieldtype": "Link",
"label": "Print Format",
"options": "Print Format"
},
{
"default": "0",
@@ -422,7 +407,6 @@
"fieldname": "show_opening_entries",
"fieldtype": "Check",
"label": "Show Opening Entries"
>>>>>>> d0f1239d2b (fix(accounts): allow process statement of account generation with opening entries)
}
],
"links": [],