nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-18 09:05:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
53,473 Commits 399 Branches 1,700 Tags
080e9a3d73d4a9be2e0b4777918058548ccb79ff
Commit Graph

53473 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rohit Waghchaure
080e9a3d73 fix: removed the validation 
(cherry picked from commit 10131333b2)
 2025-11-07 12:33:11 +00:00
Patrick Eißler
29c976e9ae fix(Timesheet): don't use billing_hours for costing amount (#50394) 2025-11-07 13:26:44 +05:30
Diptanil Saha
8e199af118 Merge pull request #50403 from frappe/mergify/bp/version-15-hotfix/pr-50402 
fix: trends report total mismatch with group by filters (backport #50402)
 2025-11-07 12:50:49 +05:30
diptanilsaha
7e3f30baad fix: trends report total mismatch with group filters 
(cherry picked from commit f7d09f8760)
 2025-11-07 07:03:51 +00:00
ruthra kumar
4f02677d6f Merge pull request #50387 from frappe/mergify/bp/version-15-hotfix/pr-50364 
fix: hide total row in general ledger report (backport #50364)
 2025-11-06 16:02:53 +05:30
Pugazhendhi Velu
56bb88d281 fix: hide total row in general ledger report 
(cherry picked from commit ef38b26a73)
 2025-11-06 10:11:46 +00:00
Khushi Rawat
124a0fe45d Merge pull request #50379 from frappe/mergify/bp/version-15-hotfix/pr-50367 
fix: set company before creating asset movement to avoid permission error (backport #50367)
 2025-11-06 10:03:20 +05:30
rehansari26
3fad90ebb9 fix: set company before creating asset movement to avoid permission error 
(cherry picked from commit 8c49c9e500)
 2025-11-05 21:50:22 +00:00
Khushi Rawat
99b6dc508e Merge pull request #50377 from frappe/mergify/bp/version-15-hotfix/pr-50342 
feat: add asset name column (backport #50342)
 2025-11-06 01:29:57 +05:30
Khushi Rawat
7d593dd3db fix: resolve conflict 2025-11-06 00:51:41 +05:30
Rehan Ansari
c48647100f feat: add asset name column 
(cherry picked from commit f3eda02972)

# Conflicts:
#	erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py
 2025-11-05 18:52:50 +00:00
ruthra kumar
c54d995354 Merge pull request #50368 from frappe/mergify/bp/version-15-hotfix/pr-50144 
refactor: period closing voucher to handle large data volumes (backport #50144)
 2025-11-05 17:42:52 +05:30
ruthra kumar
5c6cc1ea2a chore: resolve conflicts 2025-11-05 17:27:14 +05:30
ruthra kumar
e09ee63d32 refactor: add paused to select option 
(cherry picked from commit fca7abf4d6)
 2025-11-05 11:28:44 +00:00
ruthra kumar
d8e5075424 refactor: minor changes on status 
1. set to 'In Progress' on start of both legacy and new controller
2. force delete to avoid permission issues
3. default to 1hr timeout

(cherry picked from commit 9c13edc0b9)
 2025-11-05 11:28:43 +00:00
ruthra kumar
d5a36fe8aa refactor: enable legacy controller by default for pcv 
(cherry picked from commit fe39ce03bb)

# Conflicts:
#	erpnext/accounts/doctype/accounts_settings/accounts_settings.json
#	erpnext/accounts/doctype/period_closing_voucher/test_period_closing_voucher.py
 2025-11-05 11:28:43 +00:00
ruthra kumar
10df192275 chore: progress bar 
(cherry picked from commit 0b88f98a86)
 2025-11-05 11:28:43 +00:00
ruthra kumar
4ebddc591f chore: remove scaffolding 
(cherry picked from commit 191c0e65a1)
 2025-11-05 11:28:42 +00:00
ruthra kumar
5cc6a1771d refactor: abort processing of all tasks upon cancellation 
(cherry picked from commit 090e155fd0)
 2025-11-05 11:28:42 +00:00
ruthra kumar
29e8801b7f refactor: more changes 
1. 'Accounts Manager' has access to submit, cancel and delete
2. cancel and delete operation of PCV is linked with Proces PCV

(cherry picked from commit cae1237859)
 2025-11-05 11:28:42 +00:00
ruthra kumar
d94000fecf refactor: smaller methods 
(cherry picked from commit fa3bd6f5a7)
 2025-11-05 11:28:42 +00:00
ruthra kumar
5071cad161 refactor: utility to consolidate results from all dates 
(cherry picked from commit 7406d83260)
 2025-11-05 11:28:41 +00:00
ruthra kumar
0151f5f191 refactor: utility to convert tuple key to str 
(cherry picked from commit 5b464ae4c1)
 2025-11-05 11:28:41 +00:00
ruthra kumar
d139db296a refactor: cleanup and for better readability 
(cherry picked from commit 653ae84b3e)
 2025-11-05 11:28:41 +00:00
ruthra kumar
3406e44b03 refactor: make Accounts Closing Balance as well 
(cherry picked from commit 6e32769e37)
 2025-11-05 11:28:41 +00:00
ruthra kumar
449fa05d7d refactor: store closing balance for Balnace sheet accounts 
(cherry picked from commit 09e37bc98c)
 2025-11-05 11:28:40 +00:00
ruthra kumar
55222468f9 refactor: calculate both balances from single queue 
(cherry picked from commit 643e1fdce8)
 2025-11-05 11:28:40 +00:00
ruthra kumar
f381b99b14 refactor: populate opening balances calculation table 
(cherry picked from commit 86edacb781)
 2025-11-05 11:28:40 +00:00
ruthra kumar
2c880dd609 chore: rename closing balance field 
(cherry picked from commit cef879bb3b)
 2025-11-05 11:28:39 +00:00
ruthra kumar
87e297e899 refactor: balances for both P&L and Balance sheet accounts 
(cherry picked from commit 324bebfd44)
 2025-11-05 11:28:39 +00:00
ruthra kumar
6c94ca664f refactor: maintain report type on each date 
(cherry picked from commit 186d540502)
 2025-11-05 11:28:39 +00:00
ruthra kumar
d911e1dab2 refactor: more stable pause and resume 
(cherry picked from commit 9e93298f12)
 2025-11-05 11:28:39 +00:00
ruthra kumar
908f8ed462 refactor: process on submit 
(cherry picked from commit c738b6d356)
 2025-11-05 11:28:38 +00:00
ruthra kumar
633ccef2ff refactor: for better readability 
(cherry picked from commit 8ba199016a)
 2025-11-05 11:28:38 +00:00
ruthra kumar
e8f8abd685 refactor: store results as is and convert at the end 
(cherry picked from commit f25ee3c53f)
 2025-11-05 11:28:38 +00:00
ruthra kumar
b6b5524228 refactor: build and post gl entries 
(cherry picked from commit e88074ddec)
 2025-11-05 11:28:38 +00:00
ruthra kumar
76bdf7944c refactor: store daily balances based on dimensions key 
dimensions key is manually converted to string

(cherry picked from commit 1846de0d49)
 2025-11-05 11:28:37 +00:00
ruthra kumar
1999de0b75 refactor: store closing balance as JSON 
(cherry picked from commit 1a31825409)
 2025-11-05 11:28:37 +00:00
ruthra kumar
43acfdff82 refactor: stable start, pause, resume and completion stages 
(cherry picked from commit c839ebf593)
 2025-11-05 11:28:37 +00:00
ruthra kumar
19b911120c refactor: barebones functions 
(cherry picked from commit 1c92b01542)
 2025-11-05 11:28:37 +00:00
ruthra kumar
bc07de8c12 refactor: temporarily save balances in JSON 
(cherry picked from commit f44c908a8d)
 2025-11-05 11:28:36 +00:00
ruthra kumar
b484db3ffd refactor: child table in process pcv 
(cherry picked from commit 0d09d21d2e)
 2025-11-05 11:28:36 +00:00
ruthra kumar
902ce45a36 refactor: more data structure changes 
(cherry picked from commit a15578f8f4)
 2025-11-05 11:28:36 +00:00
ruthra kumar
bfc0044d23 refactor: checkbox for pcv controller 
(cherry picked from commit 4888461be2)

# Conflicts:
#	erpnext/accounts/doctype/accounts_settings/accounts_settings.json
#	erpnext/accounts/doctype/accounts_settings/accounts_settings.py
 2025-11-05 11:28:36 +00:00
ruthra kumar
c8e3da0a71 feat: process period closing voucher 
(cherry picked from commit 7a93630629)
 2025-11-05 11:28:35 +00:00
rohitwaghchaure
2eed8ee343 Merge pull request #50362 from frappe/mergify/bp/version-15-hotfix/pr-50335 
fix(material request): set default buying price list if not exists (backport #50335)
 2025-11-05 14:44:21 +05:30
ravibharathi656
670c6dcdd7 fix(material request): set default buying price list if not exists 
(cherry picked from commit 9c0ff14060)
 2025-11-05 08:42:09 +00:00
rohitwaghchaure
de80215df5 Merge pull request #50338 from frappe/mergify/bp/version-15-hotfix/pr-50332 
feat: option to exclude stand-alone returned sales invoices from the Gross Profit report (backport #50332)
 2025-11-04 17:38:04 +05:30
Rohit Waghchaure
017dc792e6 feat: option to exclude stand-alone returned sales invoices from the Gross Profit report 
(cherry picked from commit 52cf9d4950)
 2025-11-04 11:30:46 +00:00
Mihir Kandoi
d920520843 fix: disallow material transfer if source and target warehouse are same (#50331) 
* fix: disallow material transfer if source and target warehouse are same (#48697)

* fix: disallow material transfer if source and target warehouse are same

* fix: check on child row level instead of parent level

* chore: add docstring to function
 2025-11-04 09:44:18 +00:00