nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-18 17:15:04 +00:00
Code Issues Packages Projects Releases Wiki Activity
53,456 Commits 402 Branches 1,700 Tags
4ebddc591f0e2e40ba0bc0100864705a8ea256a4
Commit Graph

53456 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
mergify[bot]
ac901dee3c Add support for subcontract return from rejected warehouse (backport #50299) (#50330) 
* Merge pull request #50299 from saadchaudharry/feature-subcontract-return-rejected

Add support for subcontract return from rejected warehouse

(cherry picked from commit 8854db51dd)

# Conflicts:
#	erpnext/subcontracting/doctype/subcontracting_receipt/test_subcontracting_receipt.py

* chore: resolve conflicts

---------

Co-authored-by: Saad Chaudhary <47004596+saadchaudharry@users.noreply.github.com>
Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com>
 2025-11-04 09:09:41 +00:00
ruthra kumar
eed1abd272 Merge pull request #50313 from frappe/mergify/bp/version-15-hotfix/pr-49673 
fix: Respect allowed zero qty in SO and PO based on Buying/Selling settings when update items (backport #49673)
 2025-11-03 15:39:39 +05:30
ruthra kumar
ae23cdd8e9 fix(accounts-receivable): ensure report data with party account currency (backport #50035) (#50311) 
* fix(accounts-receivable): ensure report data with party account currency

(cherry picked from commit 752ea7ee7d)

* test(accounts-receivable): add test case to validate report data with party account currency

(cherry picked from commit 3e4846ea3d)

---------

Co-authored-by: Bhavan23 <bhavan@aerele.in>
 2025-11-03 15:30:24 +05:30
Kerolles Fathy
5d4da9c68f fix: Respect allowed zero qty in SO and PO based on Buying/Selling settings when update items (#49673) 
* fix: respect allowed zero qty in SO and PO based on buying/selling settings

* refactor: remove parent_doctype param due to it's already avaliable

* refactor: rename is_allowed_zero_qty_for to is_allowed_zero_qty

* fix: prevent rate change for unit price items

* fix: unboundlocal variable rate_unchanged

* refactor: only throw on 'zero' qty items

---------

Co-authored-by: ruthra kumar <ruthra@erpnext.com>
(cherry picked from commit 44363c069e)
 2025-11-03 09:47:30 +00:00
Khushi Rawat
990ada1656 Merge pull request #50312 from frappe/mergify/bp/version-15-hotfix/pr-50260 
fix: create GL entries via hooks only for submitted assets (backport #50260)
 2025-11-03 15:13:42 +05:30
Bhavan23
1e40fb00f5 test(accounts-receivable): add test case to validate report data with party account currency 
(cherry picked from commit 3e4846ea3d)
 2025-11-03 15:13:29 +05:30
khushi8112
3d7827731b fix: create GL entries via hooks only for submitted assets 
(cherry picked from commit 33690975f6)
 2025-11-03 09:21:58 +00:00
Bhavan23
164333a730 fix(accounts-receivable): ensure report data with party account currency 
(cherry picked from commit 752ea7ee7d)
 2025-11-03 09:12:44 +00:00
ruthra kumar
e1afcb39db Merge pull request #50309 from frappe/mergify/bp/version-15-hotfix/pr-50297 
chore:there is no company field in bank (backport #50297)
 2025-11-03 14:04:42 +05:30
Nihal Roshan
65e37756f6 refactor: remove company filter 
'Bank' doctype has no 'company' field.

(cherry picked from commit f1682ea90e)
 2025-11-03 08:31:56 +00:00
Diptanil Saha
c897220535 Merge pull request #50307 from frappe/mergify/bp/version-15-hotfix/pr-50305 
fix(accounts): populate correct fields on GL Entry during discount accounting (backport #50305)
 2025-11-03 13:58:28 +05:30
Diptanil Saha
b04c06e034 chore: resolve conflict 2025-11-03 13:22:33 +05:30
diptanilsaha
4076798707 fix(accounts): populate correct fields on GL Entry during discount accounting 
(cherry picked from commit e41a7b8cd7)

# Conflicts:
#	erpnext/controllers/accounts_controller.py
 2025-11-03 07:49:36 +00:00
rohitwaghchaure
8b8427cbf5 Merge pull request #50303 from frappe/mergify/bp/version-15-hotfix/pr-50300 
fix: handle None in last_valuation_rate check (backport #50300)
 2025-11-03 10:13:57 +05:30
Kavin
e3110b3993 fix: handle None in last_valuation_rate check 
(cherry picked from commit a3058bf8cc)
 2025-11-02 07:25:34 +00:00
Diptanil Saha
b5f8f2b6fa Merge pull request #50292 from frappe/mergify/bp/version-15-hotfix/pr-50291 
fix: added validation for default accounts on company (backport #50291)
 2025-11-01 10:04:59 +05:30
Diptanil Saha
1a3652bee1 chore: resolve conflict 2025-10-31 17:34:15 +05:30