CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-20 02:34:41 +00:00
Code Issues Packages Projects Releases Wiki Activity
53,660 Commits 424 Branches 1,723 Tags
e49e7b621d7b5e9cb0eb87da2ba3068402000653
Commit Graph

53660 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Pugazhendhi Velu
73b8a294cf fix: reset billing and shipping address when company changes 
(cherry picked from commit 0510f7e13f)
 2025-11-10 15:08:13 +00:00
ruthra kumar
b5485dc909 Merge pull request #50393 from frappe/mergify/bp/version-15-hotfix/pr-50340 
fix: ignore Department doctype (backport #50340)
 2025-11-10 16:37:43 +05:30
Frappe PR Bot
292f71bcef chore(release): Bumped to Version 15.87.2 
## [15.87.2](https://github.com/frappe/erpnext/compare/v15.87.1...v15.87.2) (2025-11-10)

### Bug Fixes

* Nonetype error if reserved stock is not present ([cf66b5a](cf66b5aa34))
* **stock:** ignore current voucher in reserved stock validation ([9d2c456](9d2c456668))
v15.87.2 		2025-11-10 10:47:57 +00:00
rohitwaghchaure
1e4acb3703 Merge pull request #50434 from frappe/mergify/bp/version-15/pr-50431 
fix(stock): ignore current voucher in reserved stock validation (backport #50431)
 2025-11-10 16:16:31 +05:30
Kavin
cf66b5aa34 fix: Nonetype error if reserved stock is not present 
(cherry picked from commit b8ec3ae23a)
 2025-11-10 10:29:12 +00:00
Kavin
9d2c456668 fix(stock): ignore current voucher in reserved stock validation 
(cherry picked from commit 0e7f9711e1)
 2025-11-10 10:29:12 +00:00
rohitwaghchaure
5ed4fea3e3 Merge pull request #50431 from aerele/fix/reserved-stock-negative 
fix(stock): ignore current voucher in reserved stock validation
 2025-11-10 15:57:37 +05:30
Kavin
b8ec3ae23a fix: Nonetype error if reserved stock is not present 2025-11-10 14:51:35 +05:30
Kavin
0e7f9711e1 fix(stock): ignore current voucher in reserved stock validation 2025-11-10 14:29:04 +05:30
rohitwaghchaure
3cad1304a0 Merge pull request #50427 from frappe/mergify/bp/version-15-hotfix/pr-50374 
fix: add validation to reject empty readings (backport #50374)
 2025-11-10 14:04:23 +05:30
ruthra kumar
9dc1f5f649 Merge pull request #50405 from frappe/mergify/bp/version-15-hotfix/pr-50326 
fix: validate is_group for parent task (backport #50326)
 2025-11-10 12:58:34 +05:30
ruthra kumar
df6ca3af57 chore: resolve conflicts 2025-11-10 12:43:05 +05:30
ruthra kumar
95db1677e2 Merge pull request #50408 from aerele/support-52573 
fix: check warehouse account before accessing
 2025-11-10 12:39:14 +05:30
ruthra kumar
ca9f1b6c7b Merge pull request #50429 from frappe/mergify/bp/version-15-hotfix/pr-50423 
fix(buying): fetch Cost Center from Project (backport #50423)
 2025-11-10 12:35:29 +05:30
barredterra
e8e26a91bb fix(buying): fetch Cost Center from Project 
(cherry picked from commit bdabcb081a)
 2025-11-10 07:03:04 +00:00
Pugazhendhi Velu
dc88f7b30b refactor: add default reading value when creating a quality inspection 
(cherry picked from commit 63fb9f55e7)
 2025-11-10 05:38:42 +00:00
Pugazhendhi Velu
ac0375fc2e fix: add validation to reject empty readings 
(cherry picked from commit 405d901514)
 2025-11-10 05:38:42 +00:00
Frappe PR Bot
2863b0fe52 chore(release): Bumped to Version 15.87.1 
## [15.87.1](https://github.com/frappe/erpnext/compare/v15.87.0...v15.87.1) (2025-11-07)

### Bug Fixes

* handle partial dn against reserved stock ([7466d91](7466d91e12))
v15.87.1 		2025-11-07 16:36:23 +00:00
rohitwaghchaure
6096b56a10 Merge pull request #50415 from frappe/mergify/bp/version-15/pr-50401 
fix: handle partial dn against reserved stock (backport #50401)
 2025-11-07 22:04:57 +05:30
Kavin
88fdab99a9 test: add test for partial dn against reserved stock 
(cherry picked from commit ef719fe729)
 2025-11-07 15:26:11 +00:00
Kavin
7466d91e12 fix: handle partial dn against reserved stock 
(cherry picked from commit 9d979e34ab)
 2025-11-07 15:26:10 +00:00
rohitwaghchaure
5bb2e8a8ff Merge pull request #50401 from aerele/support-52103 
fix: handle partial dn against reserved stock
 2025-11-07 20:53:43 +05:30
rohitwaghchaure
3989a7ede6 Merge pull request #50412 from frappe/mergify/bp/version-15-hotfix/pr-50411 
fix: removed the validation (backport #50411)
 2025-11-07 19:16:37 +05:30
Kavin
ef719fe729 test: add test for partial dn against reserved stock 2025-11-07 19:09:23 +05:30
Kavin
9d979e34ab fix: handle partial dn against reserved stock 2025-11-07 19:09:11 +05:30
Rohit Waghchaure
080e9a3d73 fix: removed the validation 
(cherry picked from commit 10131333b2)
 2025-11-07 12:33:11 +00:00
Kavin
79b3af6d3e fix: check warehouse account before accessing 2025-11-07 15:49:59 +05:30
Patrick Eißler
29c976e9ae fix(Timesheet): don't use billing_hours for costing amount (#50394) 2025-11-07 13:26:44 +05:30
Pugazhendhi Velu
635fe427fe refactor(task): use get_link_to_form for validation error messages 
(cherry picked from commit 4cf02b4d78)
 2025-11-07 07:28:59 +00:00
Pugazhendhi Velu
dc5b8367c5 test: add test for parent task is_group validation 
(cherry picked from commit 291f0c7161)

# Conflicts:
#	erpnext/projects/doctype/task/test_task.py
 2025-11-07 07:28:59 +00:00
Pugazhendhi Velu
3380deab02 fix: validate is_group for parent task 
(cherry picked from commit ed1a1099cb)

# Conflicts:
#	erpnext/projects/doctype/task/task.py
 2025-11-07 07:28:59 +00:00
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
ravibharathi656
90500f0ffc feat(account settings): add checkbox to show balances in payment entry 2025-11-06 18:35:56 +05:30
rethik
32182d7cc7 fix: ignore Department doctype 
(cherry picked from commit fff6f1fb23)
 2025-11-06 11:14:55 +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
Frappe PR Bot
ad4fe2db9e chore(release): Bumped to Version 15.87.0 
# [15.87.0](https://github.com/frappe/erpnext/compare/v15.86.0...v15.87.0) (2025-11-05)

### Features

* process period closing voucher ([8cdbaac](8cdbaacfff))
v15.87.0 		2025-11-05 12:37:51 +00:00
ruthra kumar
13de175b0f Merge pull request #50370 from frappe/mergify/bp/version-15/pr-50144 
refactor: period closing voucher to handle large data volumes (backport #50144)
 2025-11-05 18:06:29 +05:30
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