Diptanil Saha
|
ad33735541
|
Merge pull request #50245 from frappe/mergify/bp/version-15-hotfix/pr-50213
fix(Bank Transaction)!: make transaction ID non-unique (backport #50213)
|
2025-10-28 10:20:49 +05:30 |
|
Diptanil Saha
|
977f385006
|
chore: resolve conflict
|
2025-10-28 09:07:14 +05:30 |
|
barredterra
|
b52b04a10c
|
fix(Bank Transaction): make transaction ID non-unique
(cherry picked from commit a2a41a0eaa)
# Conflicts:
# erpnext/accounts/doctype/bank_transaction/bank_transaction.json
|
2025-10-28 02:45:52 +00:00 |
|
Diptanil Saha
|
05b89b4121
|
Merge pull request #50243 from frappe/mergify/bp/version-15-hotfix/pr-49599
fix(accounts): reference get_payment_mode_account correctly in Sales Invoice (backport #49599)
|
2025-10-28 08:08:36 +05:30 |
|
Diptanil Saha
|
36983c97cb
|
chore: resolve conflict
|
2025-10-28 08:06:10 +05:30 |
|
KerollesFathy
|
23006601b2
|
fix(accounts): update payment mode account retrieval to use namespaced function
(cherry picked from commit 0af74aef00)
# Conflicts:
# erpnext/public/js/controllers/accounts.js
|
2025-10-27 16:50:10 +00:00 |
|
rohitwaghchaure
|
37e9461ece
|
Merge pull request #50239 from frappe/mergify/bp/version-15-hotfix/pr-50233
fix: optimized the slow query to get the batch-wise available qty (backport #50233)
|
2025-10-27 17:31:15 +05:30 |
|
Mihir Kandoi
|
126d79dcd2
|
Merge pull request #50241 from frappe/mergify/bp/version-15-hotfix/pr-50221
fix: Pass uom field name to update existing item qty (backport #50221)
|
2025-10-27 17:29:29 +05:30 |
|
Kavin
|
93b2786865
|
fix: Pass uom field name to update existing item qty
(cherry picked from commit 23d69389ec)
|
2025-10-27 11:48:44 +00:00 |
|
rohitwaghchaure
|
2680f85430
|
chore: fix linters issue
|
2025-10-27 17:06:45 +05:30 |
|
rohitwaghchaure
|
2d7fde024d
|
chore: fix conflicts
|
2025-10-27 16:57:00 +05:30 |
|
Rohit Waghchaure
|
85bf9366b0
|
fix: optimized the slow query to get the batchwise available qty
(cherry picked from commit 9c21567309)
# Conflicts:
# erpnext/stock/serial_batch_bundle.py
|
2025-10-27 11:19:24 +00:00 |
|
Khushi Rawat
|
86f507bb6e
|
Merge pull request #50238 from frappe/mergify/bp/version-15-hotfix/pr-50222
fix(asset depreciations and balances): showing opening entries (backport #50222)
|
2025-10-27 16:35:46 +05:30 |
|
ravibharathi656
|
81f19b950d
|
fix(asset depreciations and balances): showing opening entries
(cherry picked from commit d3afa67be3)
|
2025-10-27 10:48:36 +00:00 |
|
Mihir Kandoi
|
7b4eac2294
|
Merge pull request #50236 from Abdeali099/fix-msg
fix: add message for missing purchase orders in production plan
|
2025-10-27 15:54:09 +05:30 |
|
Diptanil Saha
|
aff4b62258
|
Merge pull request #50234 from frappe/mergify/bp/version-15-hotfix/pr-50039
fix(journal-entry): allow copy account currency when duplicating JV (backport #50039)
|
2025-10-27 15:36:40 +05:30 |
|
Abdeali Chharchhoda
|
5798409f69
|
fix: add message for missing purchase orders in production plan
|
2025-10-27 15:09:22 +05:30 |
|
Bhavan23
|
1b227b8b4f
|
fix(journal-entry): allow copy account currency when duplicating JV
(cherry picked from commit 76748e4573)
|
2025-10-27 08:45:01 +00:00 |
|
Diptanil Saha
|
4eca7f0524
|
Merge pull request #50230 from frappe/mergify/bp/version-15-hotfix/pr-50103
fix: fiscal year overlap validation for company-specific years (backport #50103)
|
2025-10-27 11:01:57 +05:30 |
|
rehansari26
|
4bb66179ab
|
test: replace get_doc with new_doc in fiscal year tests
(cherry picked from commit d59e55fb08)
|
2025-10-27 05:08:36 +00:00 |
|
Rehan Ansari
|
d84a29e1a1
|
test: fiscal year overlap validation for company-specific years
(cherry picked from commit 94ae098854)
|
2025-10-27 05:08:36 +00:00 |
|
Rehan Ansari
|
482a796212
|
fix: fiscal year overlap validation for company-specific years
(cherry picked from commit 57aaf34d3e)
|
2025-10-27 05:08:36 +00:00 |
|
Diptanil Saha
|
41694d3751
|
Merge pull request #50223 from frappe/mergify/bp/version-15-hotfix/pr-49889
feat: add project filter to Delayed Tasks Summary report (backport #49889)
|
2025-10-24 22:27:54 +05:30 |
|
Rehan Ansari
|
82ca729e2b
|
feat: add project filter to Delayed Tasks Summary report
(cherry picked from commit 88097e78d2)
|
2025-10-24 16:42:15 +00:00 |
|
rohitwaghchaure
|
e67361257e
|
Merge pull request #50216 from frappe/mergify/bp/version-15-hotfix/pr-50215
fix: get valuation rate based of previous SLEs for material receipt (backport #50215)
|
2025-10-24 00:05:12 +05:30 |
|
Rohit Waghchaure
|
e9f4a34d8d
|
fix: get valuation rate based of previous SLEs for material receipt
(cherry picked from commit fa9ef6708f)
|
2025-10-23 18:30:20 +00:00 |
|
Khushi Rawat
|
c6c4e31b32
|
Merge pull request #50211 from frappe/mergify/bp/version-15-hotfix/pr-50209
fix: set status to Draft for auto-created assets from Purchase Receipt (backport #50209)
|
2025-10-23 23:33:42 +05:30 |
|
khushi8112
|
ee5e4eccec
|
fix: set default value for as zero for additional asset cost
|
2025-10-23 22:51:30 +05:30 |
|
khushi8112
|
a82fa8c26b
|
fix: use correct field name
|
2025-10-23 20:45:08 +05:30 |
|
khushi8112
|
97147a484d
|
fix: resolve conflicts
|
2025-10-23 19:09:30 +05:30 |
|
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 |
|