khushi8112
|
f35fd9842e
|
fix: updated test
|
2025-07-15 13:30:35 +05:30 |
|
khushi8112
|
3488ba05eb
|
fix: split and set value after depreciation
|
2025-07-15 12:22:50 +05:30 |
|
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 |
|
Sagar Vora
|
f4a79bb760
|
Merge pull request #48537 from frappe/mergify/bp/version-15-hotfix/pr-48495
|
2025-07-14 05:15:01 +00:00 |
|
ljain112
|
153df4eca5
|
chore: resolve conflicts
|
2025-07-13 18:16:49 +05:30 |
|
ljain112
|
8f6cd40c7b
|
chore: return doc if item already exists for test
(cherry picked from commit e6b9e82b2f)
|
2025-07-13 11:51:32 +00:00 |
|
ljain112
|
567f7b4d71
|
chore: fix flacky test and remove redundant code
(cherry picked from commit de8c3ba968)
# Conflicts:
# erpnext/accounts/doctype/pos_invoice/test_pos_invoice.py
|
2025-07-13 11:51:32 +00:00 |
|
ljain112
|
f1cdd76fc1
|
perf: use cached_doc for Account Settings
(cherry picked from commit 751f3abd95)
|
2025-07-11 09:15:52 +00:00 |
|
Asmita Hase
|
715f4025cc
|
Merge pull request #48531 from frappe/mergify/bp/version-15-hotfix/pr-48395
fix: employee_exit_translatability (backport #48395)
|
2025-07-11 12:37:17 +05:30 |
|
mahsem
|
c894b18165
|
fix: employee_exit_translatability
(cherry picked from commit 80d6779210)
|
2025-07-11 06:33:22 +00:00 |
|
rohitwaghchaure
|
43e4c00e1c
|
Merge pull request #48525 from frappe/mergify/bp/version-15-hotfix/pr-48512
fix: incorrect last sle for no batch wise valuation (backport #48512)
|
2025-07-11 11:18:09 +05:30 |
|
Rohit Waghchaure
|
f2af2fe63b
|
fix: incorrect last sle for no batch wise valuation
(cherry picked from commit 93d3eb662f)
|
2025-07-11 05:33:01 +00:00 |
|
Mihir Kandoi
|
76fe861281
|
Merge pull request #48516 from frappe/mergify/bp/version-15-hotfix/pr-48514
fix: no attribute error in old subcontracting flow (backport #48514)
|
2025-07-11 10:23:39 +05:30 |
|
Mihir Kandoi
|
39e2c87955
|
Merge pull request #48515 from frappe/mergify/bp/version-15-hotfix/pr-48513
fix: error in available serial no report if no serial no present in company (backport #48513)
|
2025-07-11 10:23:10 +05:30 |
|
Mihir Kandoi
|
5fce8191f9
|
fix: no attribute error in old subcontracting flow
(cherry picked from commit 51751a7a05)
|
2025-07-10 17:33:10 +00:00 |
|
Mihir Kandoi
|
f1ff5a39ae
|
fix: error in available serial no report is no serial no present in company
(cherry picked from commit 0ae60b8b61)
|
2025-07-10 17:21:58 +00:00 |
|
Mihir Kandoi
|
f70ce62f2a
|
Merge pull request #48504 from frappe/mergify/bp/version-15-hotfix/pr-48503
fix: invalid comparison error in sabb.py (backport #48503)
|
2025-07-10 21:36:56 +05:30 |
|
Mihir Kandoi
|
36af50b2ce
|
Merge pull request #48511 from frappe/mergify/bp/version-15-hotfix/pr-48510
fix: missing parameter in precision function (backport #48510)
|
2025-07-10 21:36:08 +05:30 |
|
Mihir Kandoi
|
f80ad4ee58
|
fix: missing parameter in precision function
(cherry picked from commit 3886641887)
|
2025-07-10 13:39:28 +00:00 |
|