khushi8112
|
d8eddbfd03
|
fix: set status to Draft for auto-created assets from Purchase Receipt
(cherry picked from commit 20c2cb40d1)
# Conflicts:
# erpnext/assets/doctype/asset/asset.py
# erpnext/patches.txt
|
2025-10-23 13:03:17 +00:00 |
|
Deepesh Garg
|
977464e6a7
|
Merge pull request #50206 from frappe/mergify/bp/version-15-hotfix/pr-50204
feat: Add posting date param for reverse GL entries (#50204)
|
2025-10-23 16:02:07 +05:30 |
|
Deepesh Garg
|
db84df0cbd
|
chore: Linting issues
(cherry picked from commit 05e1a737f1)
|
2025-10-23 08:12:31 +00:00 |
|
Deepesh Garg
|
1a7092d7b6
|
feat: Add posting date param for reverse GL entries
(cherry picked from commit 38988bf797)
|
2025-10-23 08:12:30 +00:00 |
|
rohitwaghchaure
|
fcd05bb7e4
|
Merge pull request #50202 from frappe/mergify/bp/version-15-hotfix/pr-50200
fix: stock difference value for adjustment entry (backport #50200)
|
2025-10-23 10:31:00 +05:30 |
|
Rohit Waghchaure
|
6c0694ff17
|
fix: stock difference value for adjustment entry
(cherry picked from commit fb4c7de86c)
|
2025-10-22 17:03:12 +00:00 |
|
mergify[bot]
|
4988ff84df
|
fix(Task): make Timesheet-dependent fields no_copy (backport #50130) (#50196)
* fix(Task): make Timesheet-dependent fields no_copy
(cherry picked from commit 2a2e4b5423)
# Conflicts:
# erpnext/projects/doctype/task/task.json
* chore: resolve conflicts
---------
Co-authored-by: Patrick Eissler <77415730+PatrickDEissler@users.noreply.github.com>
Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com>
|
2025-10-22 08:34:11 +00:00 |
|
Mihir Kandoi
|
e5d0116924
|
Merge pull request #50194 from frappe/mergify/bp/version-15-hotfix/pr-50151
chore: remove print statement (backport #50151)
|
2025-10-22 14:01:04 +05:30 |
|
Mihir Kandoi
|
38d3b17dfe
|
Merge pull request #50195 from frappe/mergify/bp/version-15-hotfix/pr-50153
fix: Address title error when create new transporter on driver (backport #50153)
|
2025-10-22 13:48:31 +05:30 |
|
Kerolles Fathy
|
89d305ac9f
|
Merge pull request #50153 from KerollesFathy/fix-address-error-when-create-transporter
fix: Address title error when create new transporter on driver
(cherry picked from commit 8efcf6cb38)
|
2025-10-22 08:14:25 +00:00 |
|
Abdeali Chharchhoda
|
8b2be43897
|
chore: remove print statement
(cherry picked from commit 1ad4dc9066)
|
2025-10-22 08:14:24 +00:00 |
|
rohitwaghchaure
|
0bd3b5aac2
|
Merge pull request #50192 from frappe/mergify/bp/version-15-hotfix/pr-50191
fix: sabb missed in the incorrect serial no valuation report (backport #50191)
|
2025-10-22 12:17:53 +05:30 |
|
Rohit Waghchaure
|
8a995f28c9
|
fix: sabb missed in the incorrect serial no valuation report
(cherry picked from commit b50bac6788)
|
2025-10-22 06:26:01 +00:00 |
|
mergify[bot]
|
afc2d95736
|
fix: correct monthly sales history (backport #50056) (#50179)
fix: correct monthly sales history (#50056)
* fix: correct monthly sales history
* fix: correct monthly sales history calculation
* chore: remove unrelated file accidentally committed
---------
(cherry picked from commit f51ed30c23)
Co-authored-by: Ahmed AbuKhatwa <82771130+AhmedAbokhatwa@users.noreply.github.com>
Co-authored-by: AhmedAbukhatwa <Ahmedabukhatwa1@gmail.com>
|
2025-10-21 11:06:02 +05:30 |
|
Deepesh Garg
|
1e9ffe351b
|
Merge pull request #50178 from frappe/mergify/bp/version-15-hotfix/pr-50175
perf: Add index for faster queries
|
2025-10-21 09:56:35 +05:30 |
|
Deepesh Garg
|
0571ed0735
|
perf: Add index for faster queries (#50175)
(cherry picked from commit 7a91ec3e33)
|
2025-10-20 18:43:48 +00:00 |
|
mergify[bot]
|
43941ecd5e
|
refactor: simplify expression (backport #50168) (#50170)
Co-authored-by: barredterra <14891507+barredterra@users.noreply.github.com>
|
2025-10-19 23:59:27 +02:00 |
|
rohitwaghchaure
|
2055c4e8d3
|
Merge pull request #50157 from aerele/support-51015
fix(stock-settings): remove duplicate fields
|
2025-10-18 09:19:21 +05:30 |
|
rohitwaghchaure
|
df22902035
|
Merge pull request #50158 from frappe/mergify/bp/version-15-hotfix/pr-50156
fix: internal transfer entry with serial/batch (backport #50156)
|
2025-10-17 21:32:16 +05:30 |
|
Rohit Waghchaure
|
d67a439051
|
fix: internal transfer entry with serial/batch
(cherry picked from commit 9b4e62a758)
|
2025-10-17 15:34:30 +00:00 |
|
Kavin
|
58a1383380
|
fix(stock): remove duplicate fields
|
2025-10-17 18:35:53 +05:30 |
|
rohitwaghchaure
|
f5af5dd8c0
|
Merge pull request #50145 from frappe/mergify/bp/version-15-hotfix/pr-50123
fix: validation for negative batch (backport #50123)
|
2025-10-17 12:34:15 +05:30 |
|
Rohit Waghchaure
|
b9dd05f292
|
fix: validation for negative batch
(cherry picked from commit f9c8f27586)
|
2025-10-17 06:07:37 +00:00 |
|
Diptanil Saha
|
44f39e0b43
|
Merge pull request #50142 from frappe/mergify/bp/version-15-hotfix/pr-50141
fix(point-of-sale): render payment methods only when payment component is visible (backport #50141)
|
2025-10-17 01:46:05 +05:30 |
|
diptanilsaha
|
2b0281c510
|
fix(point-of-sale): render payment methods only payment component is visible
(cherry picked from commit 7dc4306640)
|
2025-10-16 20:13:33 +00:00 |
|
rohitwaghchaure
|
03766e8980
|
Merge pull request #50117 from frappe/mergify/bp/version-15-hotfix/pr-50113
fix: adjustment entry (backport #50113)
|
2025-10-15 21:31:32 +05:30 |
|
Diptanil Saha
|
e7b7377b7e
|
Merge pull request #50120 from frappe/mergify/bp/version-15-hotfix/pr-50096
fix: added exception handling on service level agreement apply hook (backport #50096)
|
2025-10-15 19:51:23 +05:30 |
|
Diptanil Saha
|
a3a6d39436
|
fix: added exception handling on service level agreement apply hook (#50096)
* fix: added exception handling on service level agreement apply hook
* Revert "fix: added exception handling on service level agreement apply hook"
This reverts commit dae93aa96f.
* fix: Ignore missing SLA table during install/uninstall
---------
Co-authored-by: Ankush Menat <ankush@frappe.io>
(cherry picked from commit 182c9fd966)
|
2025-10-15 14:04:17 +00:00 |
|
Rohit Waghchaure
|
76cfa28a42
|
fix: adjustment entry
(cherry picked from commit c0851abaee)
|
2025-10-15 10:30:33 +00:00 |
|
Diptanil Saha
|
afa7d2b595
|
Merge pull request #50109 from frappe/mergify/bp/version-15-hotfix/pr-50095
fix: preview stock ledger for manual serial and batch values (backport #50095)
|
2025-10-15 13:14:13 +05:30 |
|
Kavin
|
c64dcf3423
|
fix: preview stock ledger for manual serial and batch values
(cherry picked from commit c5f68d0b27)
|
2025-10-15 05:47:41 +00:00 |
|
Mihir Kandoi
|
3fa38d0b4e
|
Merge pull request #50106 from frappe/mergify/bp/version-15-hotfix/pr-50078
fix: handle flt conversion for prev_ordered_qty (backport #50078)
|
2025-10-15 00:02:09 +05:30 |
|
mergify[bot]
|
abb210bd18
|
refactor: add supplier filter in buying (backport #50013) (#50107)
* refactor: add supplier filter in buying
(cherry picked from commit 108b108d64)
# Conflicts:
# erpnext/public/js/controllers/buying.js
* chore: resolve conflicts
---------
Co-authored-by: manikandan-s-18 <manikandansundar18@gmail.com>
Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com>
|
2025-10-14 18:22:20 +00:00 |
|
Kavin
|
3d3e116797
|
fix: handle flt conversion for prev_ordered_qty
(cherry picked from commit 77c35ef47f)
|
2025-10-14 18:10:30 +00:00 |
|
mergify[bot]
|
bd3a132868
|
feat: set options for IBAN fields (backport #49377) (#49413)
Co-authored-by: barredterra <14891507+barredterra@users.noreply.github.com>
|
2025-10-14 14:42:08 +00:00 |
|
rohitwaghchaure
|
6f02362765
|
Merge pull request #50098 from frappe/mergify/bp/version-15-hotfix/pr-50089
fix: sanitize projects field in tasks webform (backport #50089)
|
2025-10-14 19:07:50 +05:30 |
|
Akhil Narang
|
432201f634
|
fix: sanitize projects field in tasks webform (#50089)
Signed-off-by: Akhil Narang <me@akhilnarang.dev>
(cherry picked from commit f8b50d3ffa)
|
2025-10-14 13:08:51 +00:00 |
|
rohitwaghchaure
|
f9dc00f8ad
|
Merge pull request #50094 from frappe/mergify/bp/version-15-hotfix/pr-50080
perf: optimize sql query (backport #50080)
|
2025-10-14 18:17:00 +05:30 |
|
rohitwaghchaure
|
0dd79e8c2b
|
Merge pull request #50092 from frappe/mergify/bp/version-15-hotfix/pr-50091
fix: negative error not throw for backdated entry (backport #50091)
|
2025-10-14 18:16:42 +05:30 |
|
Khushi Rawat
|
f70e61ab31
|
Merge pull request #50093 from frappe/mergify/bp/version-15-hotfix/pr-50033
fix: filter sales team to show only active individual salespersons (backport #50033)
|
2025-10-14 17:51:15 +05:30 |
|
mergify[bot]
|
b67b29200c
|
fix: prevent empty Create dropdown when In Process (backport #49891) (#50063)
|
2025-10-14 17:49:27 +05:30 |
|
mergify[bot]
|
fd72b55852
|
Merge pull request #50081 from frappe/mergify/bp/version-15-hotfix/pr-49960
Fix/Support 50220 (backport #49960)
|
2025-10-14 12:12:14 +00:00 |
|
Khushi Rawat
|
dccc561eec
|
fix: resolve conflict
|
2025-10-14 17:25:48 +05:30 |
|
rohitwaghchaure
|
8bf553bbce
|
chore: fix conflicts
|
2025-10-14 17:17:12 +05:30 |
|
Rohit Waghchaure
|
79a8e2656b
|
perf: optimize sql query
(cherry picked from commit e7b64175fd)
# Conflicts:
# erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.json
|
2025-10-14 11:44:04 +00:00 |
|
Rehan Ansari
|
38efd5cb0b
|
fix: filter sales team to show only active individual salespersons
(cherry picked from commit 2fcd406b18)
# Conflicts:
# erpnext/accounts/doctype/sales_invoice/sales_invoice.js
|
2025-10-14 11:40:00 +00:00 |
|
Rohit Waghchaure
|
1fc21d60c6
|
fix: negative error not throw for backdated entry
(cherry picked from commit 88a947ff4e)
|
2025-10-14 11:39:06 +00:00 |
|
Khushi Rawat
|
a777a11919
|
Merge pull request #50088 from khushi8112/composite-component-depr-jv-cancellation-issue
fix: skip auto-cancel of depreciation for components during asset capitalization
|
2025-10-14 16:57:50 +05:30 |
|
Diptanil Saha
|
6cc046362f
|
Merge branch 'version-15' into version-15-hotfix
|
2025-10-14 16:56:32 +05:30 |
|
khushi8112
|
02ebde43bf
|
refactor: Ensure flag cleanup with try-finally to prevent state corruption
|
2025-10-14 16:32:32 +05:30 |
|