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 |
|
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 |
|
Diptanil Saha
|
5f41abbdf7
|
Merge pull request #48507 from frappe/mergify/bp/version-15-hotfix/pr-48506
fix: pos adding item multiple times on applying item group filter (backport #48506)
|
2025-07-10 12:42:00 +05:30 |
|
diptanilsaha
|
3a70b5d7fc
|
fix: pos adding item multiple times on item group filter
(cherry picked from commit e9f99e5a3f)
|
2025-07-10 07:09:28 +00:00 |
|
ruthra kumar
|
0a447caa8e
|
Merge pull request #48505 from frappe/mergify/bp/version-15-hotfix/pr-45300
fix: prevent unnecessary db.commit for contact insert (backport #45300)
|
2025-07-10 11:34:12 +05:30 |
|
HarryPaulo
|
5cfeb2978b
|
fix: prevent unnecessary db.commit for contact insert [Linters]
(cherry picked from commit 87de5c7450)
|
2025-07-10 05:43:14 +00:00 |
|
HarryPaulo
|
00d39eb208
|
fix: prevent unnecessary db.commit
(cherry picked from commit 5f15b0b65b)
|
2025-07-10 05:43:14 +00:00 |
|
Mihir Kandoi
|
7ac546333a
|
fix: invalid comparison error in sabb.py
(cherry picked from commit ec1faf02ed)
|
2025-07-10 05:35:48 +00:00 |
|
Mihir Kandoi
|
c1334ea2cb
|
Merge pull request #48501 from frappe/mergify/bp/version-15-hotfix/pr-48499
|
2025-07-09 21:44:35 +05:30 |
|
Mihir Kandoi
|
89660c9070
|
fix: use planned_qty instead of pending_qty to check if WO should be created against PP
(cherry picked from commit b11bf8eb79)
|
2025-07-09 15:56:34 +00:00 |
|
rohitwaghchaure
|
4d10cb2727
|
Merge pull request #48497 from frappe/mergify/bp/version-15-hotfix/pr-48490
feat: update the modified date of the SLE after reposting (backport #48490)
|
2025-07-09 19:45:12 +05:30 |
|
Rohit Waghchaure
|
8c77ea16cf
|
feat: update the modified date of the SLE after reposting
(cherry picked from commit c2cd4934e7)
|
2025-07-09 13:52:15 +00:00 |
|
rohitwaghchaure
|
2c59874fd8
|
Merge pull request #48492 from frappe/mergify/bp/version-15-hotfix/pr-48488
feat: parent item group support in Stock Projected Qty report (backport #48488)
|
2025-07-09 18:59:38 +05:30 |
|
mergify[bot]
|
fdd79c7677
|
feat(BOM): improve tree display with item_name and qty (backport #48176) (#48494)
Co-authored-by: Patrick Eißler <77415730+PatrickDEissler@users.noreply.github.com>
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
|
2025-07-09 14:13:24 +02:00 |
|
Rohit Waghchaure
|
db525c2538
|
feat: parent item group support in Stock Projected Qty report
(cherry picked from commit 6e80d89d13)
|
2025-07-09 11:20:04 +00:00 |
|
rohitwaghchaure
|
142de2e2a7
|
Merge pull request #48489 from frappe/mergify/bp/version-15-hotfix/pr-48487
feat: batch rate (valuation) in Batch-Wise Balance History report (backport #48487)
|
2025-07-09 16:48:05 +05:30 |
|
Rohit Waghchaure
|
facd2027c3
|
feat: batch rate (valuation) in Batch-Wise Balance History report
(cherry picked from commit 8a2a845a16)
|
2025-07-09 10:59:11 +00:00 |
|
rohitwaghchaure
|
90979860cb
|
Merge pull request #48482 from frappe/mergify/bp/version-15-hotfix/pr-48481
fix: stock settings save issue (backport #48481)
|
2025-07-09 14:16:18 +05:30 |
|
Rohit Waghchaure
|
a5c49d1e08
|
fix: stock settings save issue
(cherry picked from commit 64ae1ec367)
|
2025-07-09 06:34:10 +00:00 |
|
mergify[bot]
|
243b533150
|
fix: resolve sql error on dimension-wise accounts balance report (backport #48477) (#48478)
fix: resolve sql error on dimension-wise accounts balance report (#48477)
(cherry picked from commit c714b724da)
Co-authored-by: Diptanil Saha <diptanil@frappe.io>
|
2025-07-08 23:50:20 +05:30 |
|
Mihir Kandoi
|
85cb234376
|
Merge pull request #48476 from frappe/mergify/bp/version-15-hotfix/pr-48475
fix: indicator in material_request_list.js (backport #48475)
|
2025-07-08 23:07:32 +05:30 |
|
Mihir Kandoi
|
4eb9f73a52
|
fix: indicator in material_request_list.js
(cherry picked from commit d10647a592)
|
2025-07-08 16:46:16 +00:00 |
|
mergify[bot]
|
7a4c8d81e2
|
fix: sort available batches based on expiry when merging SLEs with SABB and those without (backport #48471) (#48473)
* fix: sort available batches based on expiry
Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com>
|
2025-07-08 21:23:30 +05:30 |
|
ruthra kumar
|
524619e0b4
|
Merge pull request #48467 from frappe/mergify/bp/version-15-hotfix/pr-48259
fix: add not specified key for None respresented customer_group and t… (backport #48259)
|
2025-07-08 17:48:30 +05:30 |
|
ruthra kumar
|
5f5fa2f8e1
|
Merge pull request #48466 from frappe/mergify/bp/version-15-hotfix/pr-48378
fix: update item reference in quality inspection (backport #48378)
|
2025-07-08 17:48:17 +05:30 |
|
pugazhendhivelu
|
65c277fd27
|
fix: update item reference in quality inspection
(cherry picked from commit 9da5010265)
# Conflicts:
# erpnext/public/js/controllers/transaction.js
|
2025-07-08 17:16:50 +05:30 |
|
l0gesh29
|
8371dafb1a
|
fix: add not specified key for None respresented customer_group and territory
(cherry picked from commit 24cc711a70)
# Conflicts:
# erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py
|
2025-07-08 17:13:30 +05:30 |
|
ruthra kumar
|
f8bc0e47ff
|
Merge pull request #48464 from frappe/mergify/bp/version-15-hotfix/pr-48402
fix: rename journal entry title on update (backport #48402)
|
2025-07-08 17:11:27 +05:30 |
|
ruthra kumar
|
d3a95f04cc
|
Merge pull request #48470 from frappe/mergify/bp/version-15-hotfix/pr-48469
chore: better label for checkbox (backport #48469)
|
2025-07-08 17:10:50 +05:30 |
|
ruthra kumar
|
5f63794739
|
chore: better label for checkbox
(cherry picked from commit 8c2e40e291)
|
2025-07-08 11:40:08 +00:00 |
|
ruthra kumar
|
41bca34f6a
|
Merge pull request #48468 from frappe/mergify/bp/version-15-hotfix/pr-48427
fix: Add company validation to company related fields in Process Statement Of Accounts (backport #48427)
|
2025-07-08 16:23:47 +05:30 |
|
ruthra kumar
|
f4b7093838
|
Merge pull request #48465 from frappe/mergify/bp/version-15-hotfix/pr-48359
fix: get fiscal year based on date (backport #48359)
|
2025-07-08 16:21:03 +05:30 |
|
ljain112
|
536264896e
|
fix: Add company validation to company related fields in Process Statement Of Accounts
(cherry picked from commit 4e45e69247)
|
2025-07-08 10:37:17 +00:00 |
|
l0gesh29
|
177b23c624
|
fix: get fiscal year based on date
(cherry picked from commit efb8e7c0e4)
|
2025-07-08 10:26:26 +00:00 |
|
ravibharathi656
|
f81dba6380
|
chore: add none value
(cherry picked from commit 9e633bddef)
|
2025-07-08 10:25:18 +00:00 |
|
ravibharathi656
|
b7b5f6acf3
|
fix: rename journal entry title on update
(cherry picked from commit acb9829159)
|
2025-07-08 10:25:18 +00:00 |
|
ruthra kumar
|
d60d8a2625
|
Merge pull request #48457 from frappe/mergify/bp/version-15-hotfix/pr-48361
revert: do not convert exchange gain/loss amount to foreign currency (backport #48361)
|
2025-07-08 15:45:34 +05:30 |
|
ruthra kumar
|
e0efe922a6
|
Merge pull request #48459 from frappe/mergify/bp/version-15-hotfix/pr-48328
fix: update condition for blank tree fields in pricing rule (backport #48328)
|
2025-07-08 15:44:42 +05:30 |
|