Sagar Vora
|
6b68a50cc4
|
Merge pull request #48608 from frappe/mergify/bp/version-15-hotfix/pr-48607
fix: fix party account field access (backport #48607)
|
2025-07-15 11:28:24 +00:00 |
|
ljain112
|
54275dbe38
|
fix: fix party account field access
(cherry picked from commit 0da8ed2daa)
|
2025-07-15 11:25:17 +00:00 |
|
rohitwaghchaure
|
9070c4302d
|
Merge pull request #48598 from frappe/mergify/bp/version-15-hotfix/pr-48595
fix: system was allowing credit notes with serial numbers for any customer (backport #48595)
|
2025-07-15 16:35:29 +05:30 |
|
Khushi Rawat
|
47878758fc
|
Merge pull request #48589 from khushi8112/update-value-after-depreciation-when-asset-splitting
fix: update value after depreciation when asset splitting
|
2025-07-15 15:54:08 +05:30 |
|
khushi8112
|
c57ca1ae29
|
fix: incorrect test
|
2025-07-15 15:36:13 +05:30 |
|
ruthra kumar
|
0a9f45aacf
|
Merge pull request #48600 from frappe/mergify/bp/version-15-hotfix/pr-48535
fix: handle cases where distributed discount amount is not set (backport #48535)
|
2025-07-15 15:34:45 +05:30 |
|
ljain112
|
78df52606f
|
fix: handle cases where distributed discount amount is not set
(cherry picked from commit 816b84be02)
|
2025-07-15 09:38:01 +00:00 |
|
rohitwaghchaure
|
3100099cfa
|
chore: fix conflicts
|
2025-07-15 15:04:18 +05:30 |
|
rohitwaghchaure
|
9aeb08f968
|
chore: fix conflicts
|
2025-07-15 15:03:41 +05:30 |
|
Rohit Waghchaure
|
4b6444e93b
|
fix: system was allowing credit notes with serial numbers for any customer
(cherry picked from commit e073075834)
# Conflicts:
# erpnext/stock/doctype/delivery_note/delivery_note.py
# erpnext/stock/doctype/serial_no/serial_no.json
|
2025-07-15 09:28:35 +00:00 |
|
rohitwaghchaure
|
0151733a25
|
Merge pull request #48596 from frappe/mergify/bp/version-15-hotfix/pr-48588
perf: optimize code for subcontracting (backport #48588)
|
2025-07-15 14:55:57 +05:30 |
|
khushi8112
|
4383d29d7b
|
fix: set value after depreciation when creating test asset
|
2025-07-15 14:34:00 +05:30 |
|
Mihir Kandoi
|
9aef3058a6
|
perf: optimize code for subcontracting
(cherry picked from commit bc6f69ad54)
|
2025-07-15 08:45:36 +00:00 |
|
khushi8112
|
68162f79a1
|
chore: run pre-commit
|
2025-07-15 13:40:00 +05:30 |
|
khushi8112
|
f35fd9842e
|
fix: updated test
|
2025-07-15 13:30:35 +05:30 |
|
ruthra kumar
|
ba63f27e3c
|
Merge pull request #48587 from frappe/mergify/bp/version-15-hotfix/pr-48582
fix: make labels in serial_batch_prompt translatable (backport #48582)
|
2025-07-15 12:23:51 +05:30 |
|
khushi8112
|
3488ba05eb
|
fix: split and set value after depreciation
|
2025-07-15 12:22:50 +05:30 |
|
barredterra
|
c20a5b01b4
|
fix: make labels in serial_batch_prompt translatable
(cherry picked from commit 8757800888)
|
2025-07-15 06:25:37 +00:00 |
|
ruthra kumar
|
c20c9031f4
|
Merge pull request #48574 from frappe/mergify/bp/version-15-hotfix/pr-47892
refactor: use sql for building voucher balance in Receivable report (backport #47892)
|
2025-07-15 07:20:37 +05:30 |
|
Mihir Kandoi
|
16cb147d86
|
Merge pull request #48569 from frappe/mergify/bp/version-15-hotfix/pr-48542
fix: field name of price_list in material request (backport #48542)
|
2025-07-14 21:31:54 +05:30 |
|
mergify[bot]
|
0e67487508
|
fix(Employee): add context to status in List View (backport #48576) (#48577)
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
fix(Employee): add context to status in List View (#48576)
|
2025-07-14 15:42:30 +02:00 |
|
rohitwaghchaure
|
2a8b8aa71d
|
Merge pull request #48570 from frappe/mergify/bp/version-15-hotfix/pr-48568
fix: recalculate qty issue for stock reco (backport #48568)
|
2025-07-14 18:16:48 +05:30 |
|
ruthra kumar
|
3b38c6708c
|
chore: rename method
(cherry picked from commit fc8ca7d82c)
|
2025-07-14 12:33:08 +00:00 |
|
ruthra kumar
|
72b9684742
|
refactor: build and pass match conditions as qb criterion
(cherry picked from commit 7efeed54de)
|
2025-07-14 12:33:08 +00:00 |
|
ruthra kumar
|
1d18a3b1a3
|
chore: drop unused utility method
(cherry picked from commit 52c0df24e3)
|
2025-07-14 12:33:08 +00:00 |
|
ruthra kumar
|
0bf5d3dae3
|
refactor: dynamic DB field types
(cherry picked from commit 9d0ebe3427)
|
2025-07-14 12:33:07 +00:00 |
|
ruthra kumar
|
d9b36ea37c
|
refactor: better variable name
(cherry picked from commit 1a90c0d031)
|
2025-07-14 12:33:07 +00:00 |
|
ruthra kumar
|
2d2ca049fa
|
refactor: prefix-ed names for easy distinction
(cherry picked from commit c5e35cc330)
|
2025-07-14 12:33:07 +00:00 |
|
ruthra kumar
|
1afb27231c
|
refactor: utility to drop existing procedures and include cost center
(cherry picked from commit da32bb5f51)
|
2025-07-14 12:33:06 +00:00 |
|
ruthra kumar
|
a173c77859
|
refactor: order by posting date
(cherry picked from commit 7b7440d44a)
|
2025-07-14 12:33:06 +00:00 |
|
ruthra kumar
|
5d0d0c3102
|
refactor: call procedures based on config
(cherry picked from commit e90c6a33bd)
|
2025-07-14 12:33:06 +00:00 |
|
ruthra kumar
|
92d58a4e4c
|
refactor: introduce sql option for data fetch
(cherry picked from commit 8cf8f6abad)
|
2025-07-14 12:33:05 +00:00 |
|
ruthra kumar
|
fee646fbe2
|
refactor: better readability
(cherry picked from commit 097e74979f)
|
2025-07-14 12:33:05 +00:00 |
|
ruthra kumar
|
c6d82b241e
|
refactor: using sql procedures for AR report
- dynamic filters are passed
(cherry picked from commit e5920c57aa)
|
2025-07-14 12:33:04 +00:00 |
|
Mihir Kandoi
|
e3f7915c38
|
Merge pull request #48571 from frappe/mergify/bp/version-15-hotfix/pr-48526
fix: gross margin not set in project on submission of stock entry (backport #48526)
|
2025-07-14 17:31:46 +05:30 |
|
Mihir Kandoi
|
c39993a3ba
|
chore: resolve conflicts
|
2025-07-14 17:22:00 +05:30 |
|
Mihir Kandoi
|
d8212d98ca
|
chore: resolve conflicts
|
2025-07-14 17:20:28 +05:30 |
|
Mihir Kandoi
|
e3ba4320d6
|
chore: resolve conflicts
|
2025-07-14 17:19:40 +05:30 |
|
Mihir Kandoi
|
81e244be55
|
fix: gross margin not set in project on submission of stock entry
(cherry picked from commit ec578ba231)
|
2025-07-14 11:43:16 +00:00 |
|
Mihir Kandoi
|
a195152cc8
|
fix: incorrect if condition
(cherry picked from commit 668574e4f0)
|
2025-07-14 11:38:10 +00:00 |
|
Mihir Kandoi
|
1322cc1378
|
fix: incorrect stock reco sle
(cherry picked from commit 597d5aff02)
|
2025-07-14 11:38:09 +00:00 |
|
Mihir Kandoi
|
ee6ef03e24
|
fix: field name of price_list in material request
(cherry picked from commit adb9a6bc15)
# Conflicts:
# erpnext/patches.txt
# erpnext/stock/doctype/material_request/material_request.py
# erpnext/stock/doctype/packed_item/packed_item.py
|
2025-07-14 11:14:53 +00:00 |
|
ruthra kumar
|
6e10b53e24
|
Merge pull request #48567 from frappe/mergify/bp/version-15-hotfix/pr-48321
fix: fetch item tax template after setting `base_net_rate` (backport #48321)
|
2025-07-14 15:06:32 +05:30 |
|
ljain112
|
b5c4f61fef
|
fix: fetch item tax template after setting base_net_rate
(cherry picked from commit db654d5e59)
|
2025-07-14 09:32:56 +00:00 |
|
ruthra kumar
|
9750eba9db
|
Merge pull request #48566 from frappe/mergify/bp/version-15-hotfix/pr-48435
fix: prevent creation of root accounts in account tree view (backport #48435)
|
2025-07-14 14:51:17 +05:30 |
|
ljain112
|
817bcc78a0
|
fix: prevent creation of root accounts in account tree view
(cherry picked from commit 3600f2f91b)
|
2025-07-14 09:15:45 +00:00 |
|
ruthra kumar
|
69f2d751a2
|
Merge pull request #48562 from frappe/mergify/bp/version-15-hotfix/pr-48540
feat: add calculate_ageing_with option in summary reports (backport #48540)
|
2025-07-14 11:42:13 +05:30 |
|
ruthra kumar
|
9287e9a2ca
|
Merge pull request #48556 from frappe/mergify/bp/version-15-hotfix/pr-48550
chore: fix flacky test and remove redundant code (backport #48550)
|
2025-07-14 11:41:36 +05:30 |
|
l0gesh29
|
72e154fbb7
|
feat: add calculate_ageing_with option in summary reports
(cherry picked from commit a3834eef46)
|
2025-07-14 06:08:52 +00:00 |
|
Sagar Vora
|
d5faae3e7c
|
Merge pull request #48081 from frappe/mergify/bp/version-15-hotfix/pr-48048
fix: use `flt` value of bin qty (backport #48048)
|
2025-07-14 05:17:07 +00:00 |
|