CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-20 10:45:29 +00:00
Code Issues Packages Projects Releases Wiki Activity
53,478 Commits 425 Branches 1,723 Tags
a333ec28e9effa0fc8ef9f5c1148192eaf5ed7a4
Commit Graph

53478 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ruthra kumar
a333ec28e9 chore: resolve conflicts 2025-11-05 17:46:59 +05:30
ruthra kumar
e6d38d009f refactor: add paused to select option 
(cherry picked from commit fca7abf4d6)
 2025-11-05 12:15:04 +00:00
ruthra kumar
178eded259 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 12:15:04 +00:00
ruthra kumar
5db7888a8d 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 12:15:04 +00:00
ruthra kumar
83e0ce4020 chore: progress bar 
(cherry picked from commit 0b88f98a86)
 2025-11-05 12:15:03 +00:00
ruthra kumar
6f58614ef2 chore: remove scaffolding 
(cherry picked from commit 191c0e65a1)
 2025-11-05 12:15:03 +00:00
ruthra kumar
a3068c8bf6 refactor: abort processing of all tasks upon cancellation 
(cherry picked from commit 090e155fd0)
 2025-11-05 12:15:03 +00:00
ruthra kumar
bdeee94c18 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 12:15:02 +00:00
ruthra kumar
db5013fca1 refactor: smaller methods 
(cherry picked from commit fa3bd6f5a7)
 2025-11-05 12:15:02 +00:00
ruthra kumar
2712310c0a refactor: utility to consolidate results from all dates 
(cherry picked from commit 7406d83260)
 2025-11-05 12:15:02 +00:00
ruthra kumar
a624ae07f0 refactor: utility to convert tuple key to str 
(cherry picked from commit 5b464ae4c1)
 2025-11-05 12:15:02 +00:00
ruthra kumar
347a7e3b1f refactor: cleanup and for better readability 
(cherry picked from commit 653ae84b3e)
 2025-11-05 12:15:01 +00:00
ruthra kumar
df4347a6cb refactor: make Accounts Closing Balance as well 
(cherry picked from commit 6e32769e37)
 2025-11-05 12:15:01 +00:00
ruthra kumar
7edbf25e60 refactor: store closing balance for Balnace sheet accounts 
(cherry picked from commit 09e37bc98c)
 2025-11-05 12:15:01 +00:00
ruthra kumar
7c85d7f163 refactor: calculate both balances from single queue 
(cherry picked from commit 643e1fdce8)
 2025-11-05 12:15:01 +00:00
ruthra kumar
6216547027 refactor: populate opening balances calculation table 
(cherry picked from commit 86edacb781)
 2025-11-05 12:15:00 +00:00
ruthra kumar
ac0a837bf3 chore: rename closing balance field 
(cherry picked from commit cef879bb3b)
 2025-11-05 12:15:00 +00:00
ruthra kumar
8be8a73a36 refactor: balances for both P&L and Balance sheet accounts 
(cherry picked from commit 324bebfd44)
 2025-11-05 12:15:00 +00:00
ruthra kumar
f49f60b5f4 refactor: maintain report type on each date 
(cherry picked from commit 186d540502)
 2025-11-05 12:15:00 +00:00
ruthra kumar
3a13c04a71 refactor: more stable pause and resume 
(cherry picked from commit 9e93298f12)
 2025-11-05 12:14:59 +00:00
ruthra kumar
62e8d4753e refactor: process on submit 
(cherry picked from commit c738b6d356)
 2025-11-05 12:14:59 +00:00
ruthra kumar
18c7121230 refactor: for better readability 
(cherry picked from commit 8ba199016a)
 2025-11-05 12:14:59 +00:00
ruthra kumar
37c1d665e3 refactor: store results as is and convert at the end 
(cherry picked from commit f25ee3c53f)
 2025-11-05 12:14:59 +00:00
ruthra kumar
0d9c711b6d refactor: build and post gl entries 
(cherry picked from commit e88074ddec)
 2025-11-05 12:14:58 +00:00
ruthra kumar
3b0a1bce3d refactor: store daily balances based on dimensions key 
dimensions key is manually converted to string

(cherry picked from commit 1846de0d49)
 2025-11-05 12:14:58 +00:00
ruthra kumar
efd90f554f refactor: store closing balance as JSON 
(cherry picked from commit 1a31825409)
 2025-11-05 12:14:58 +00:00
ruthra kumar
5992ce533e refactor: stable start, pause, resume and completion stages 
(cherry picked from commit c839ebf593)
 2025-11-05 12:14:58 +00:00
ruthra kumar
1c044759ac refactor: barebones functions 
(cherry picked from commit 1c92b01542)
 2025-11-05 12:14:57 +00:00
ruthra kumar
86a36b3ef4 refactor: temporarily save balances in JSON 
(cherry picked from commit f44c908a8d)
 2025-11-05 12:14:57 +00:00
ruthra kumar
cd830a6b6c refactor: child table in process pcv 
(cherry picked from commit 0d09d21d2e)
 2025-11-05 12:14:57 +00:00
ruthra kumar
dc1147d504 refactor: more data structure changes 
(cherry picked from commit a15578f8f4)
 2025-11-05 12:14:56 +00:00
ruthra kumar
797b418af4 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 12:14:56 +00:00
ruthra kumar
8cdbaacfff feat: process period closing voucher 
(cherry picked from commit 7a93630629)
 2025-11-05 12:14:56 +00:00
Frappe PR Bot
09d12f2f9f chore(release): Bumped to Version 15.86.0 
# [15.86.0](https://github.com/frappe/erpnext/compare/v15.85.1...v15.86.0) (2025-11-04)

### Bug Fixes

* **accounts-receivable:** ensure report data with party account currency ([164333a](164333a730))
* **accounts-receivable:** ensure report data with party account currency (backport [#50035](https://github.com/frappe/erpnext/issues/50035)) ([#50311](https://github.com/frappe/erpnext/issues/50311)) ([ae23cdd](ae23cdd8e9))
* **accounts:** populate correct fields on GL Entry during discount accounting ([4076798](4076798707))
* added validation for default accounts on company ([d9d9230](d9d9230d4a))
* allow bulk edit for bill of material items ([afe42ee](afe42ee3e9))
* create GL entries via hooks only for submitted assets ([3d78277](3d7827731b))
* disallow material transfer if source and target warehouse are same ([#50331](https://github.com/frappe/erpnext/issues/50331)) ([d920520](d920520843)), closes [#48697](https://github.com/frappe/erpnext/issues/48697)
* handle None in last_valuation_rate check ([e3110b3](e3110b3993))
* job card timer ([053765a](053765a466))
* **pos:** order pos invoices by timestamp ([12903b1](12903b11ed))
* Respect allowed zero qty in SO and PO based on Buying/Selling settings when update items ([#49673](https://github.com/frappe/erpnext/issues/49673)) ([5d4da9c](5d4da9c68f))
* set valuation rate for rejected serial/batch item ([f72d14b](f72d14b1ca))

### Features

* option to exclude stand-alone returned sales invoices from the Gross Profit report ([017dc79](017dc792e6))

### Reverts

* Revert "refactor: add supplier filter in buying (backport [#50013](https://github.com/frappe/erpnext/issues/50013)) ([#50107](https://github.com/frappe/erpnext/issues/50107))" ([288570a](288570acde))
v15.86.0 		2025-11-04 12:32:53 +00:00
Diptanil Saha
19f66c6018 Merge pull request #50333 from frappe/version-15-hotfix 
chore: release v15
 2025-11-04 18:01:18 +05:30
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