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 |
|
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 |
|
mergify[bot]
|
500972e8aa
|
refactor: remove do_reposting_for_each_stock_transaction feature (backport #48444) (#48452)
* refactor: remove do_reposting_for_each_stock_transaction feature
Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com>
|
2025-07-08 15:05:35 +05:30 |
|
Mihir Kandoi
|
b833dfab9d
|
Merge pull request #48460 from frappe/mergify/bp/version-15-hotfix/pr-48456
fix: duplicate items being created when fetching items from warehouse in stock reco (backport #48456)
|
2025-07-08 15:05:11 +05:30 |
|
Mihir Kandoi
|
818ddc0b8c
|
fix: duplicate items being created when fetching items from warehouse in stock reco
(cherry picked from commit 73f6c29559)
|
2025-07-08 09:01:47 +00:00 |
|
venkat102
|
d0d1d63d31
|
revert: do not convert exchange gain/loss amount to foreign currency
(cherry picked from commit c17ae703c7)
# Conflicts:
# erpnext/accounts/report/general_ledger/test_general_ledger.py
|
2025-07-08 14:30:10 +05:30 |
|
ljain112
|
f2d644ba29
|
fix: update condition for blank tree fields in pricing rule
(cherry picked from commit 7e0e9db4d2)
|
2025-07-08 08:53:35 +00:00 |
|
ruthra kumar
|
9e831bbfc6
|
Merge pull request #48448 from frappe/mergify/bp/version-15-hotfix/pr-48326
fix: cost center for payment entry against advance payment doctypes in accounts payable/rece (backport #48326)
|
2025-07-08 14:06:28 +05:30 |
|
ruthra kumar
|
7690efa4f7
|
Merge pull request #48454 from frappe/mergify/bp/version-15-hotfix/pr-48416
refactor: remove duplicate reconciliation date logic (backport #48416)
|
2025-07-08 13:50:32 +05:30 |
|
ljain112
|
00669661e5
|
chore: resolve conflicts
|
2025-07-08 13:19:03 +05:30 |
|
ljain112
|
2ab1b42033
|
refactor: remove duplicate reconciliation date logic
(cherry picked from commit 398406082a)
|
2025-07-08 07:34:23 +00:00 |
|
ruthra kumar
|
2c156b58f0
|
Merge pull request #48453 from frappe/mergify/bp/version-15-hotfix/pr-48343
fix: consider empty string in previous doc validation (backport #48343)
|
2025-07-08 12:59:52 +05:30 |
|
Diptanil Saha
|
c617b343b3
|
Merge pull request #48449 from frappe/mergify/bp/version-15-hotfix/pr-48403
fix: add selling price validation on update item (backport #48403)
|
2025-07-08 12:41:58 +05:30 |
|
l0gesh29
|
b2de9cdef2
|
fix: consider empty string in previous doc validation
(cherry picked from commit dd43594ad6)
|
2025-07-08 07:11:51 +00:00 |
|
rohitwaghchaure
|
ae59908f0a
|
Merge pull request #48443 from frappe/mergify/bp/version-15-hotfix/pr-48441
Revert "fix: stock reco qty with inventory dimension" (backport #48441)
|
2025-07-08 12:30:40 +05:30 |
|
l0gesh29
|
a10e3948b2
|
fix: add selling price validation on update item
(cherry picked from commit 327d067305)
|
2025-07-08 06:45:18 +00:00 |
|
Mihir Kandoi
|
fbe1f449d8
|
Merge pull request #48447 from frappe/mergify/bp/version-15-hotfix/pr-48332
fix: valuation rate of raw materials in subcontracting receipt (backport #48332)
|
2025-07-08 12:14:53 +05:30 |
|
Mihir Kandoi
|
b3fa0ac596
|
Merge pull request #48446 from frappe/mergify/bp/version-15-hotfix/pr-48445
fix: use default buying price list when price list is falsy (backport #48445)
|
2025-07-08 12:14:36 +05:30 |
|
ljain112
|
82d03e2617
|
refactor: function to fetch advance payment doctypes
(cherry picked from commit 48e8e85617)
# Conflicts:
# erpnext/accounts/doctype/journal_entry/journal_entry.py
# erpnext/accounts/doctype/payment_entry/payment_entry.py
# erpnext/accounts/doctype/payment_request/payment_request.py
# erpnext/accounts/doctype/unreconcile_payment/unreconcile_payment.py
# erpnext/accounts/utils.py
# erpnext/controllers/accounts_controller.py
|
2025-07-08 06:36:06 +00:00 |
|
ljain112
|
3f004db14f
|
fix: cost center for payment entry against advance payment doctypes in accounts Payable/Receivable report
(cherry picked from commit 8f19f14004)
|
2025-07-08 06:36:06 +00:00 |
|
Mihir Kandoi
|
4545213adc
|
fix: valuation rate of raw materials in subcontracting receipt
(cherry picked from commit 84ea6afd01)
|
2025-07-08 06:28:44 +00:00 |
|
Mihir Kandoi
|
a336e19bb8
|
fix: use default buying price list when price list is falsy
(cherry picked from commit 27c73cf9e9)
|
2025-07-08 06:26:09 +00:00 |
|
rohitwaghchaure
|
9a99ccc166
|
Revert "fix: stock reco qty with inventory dimension (#47918)"
This reverts commit 342cebc778.
(cherry picked from commit 8ba66c9833)
|
2025-07-08 05:08:04 +00:00 |
|
ruthra kumar
|
9935f04bde
|
Merge pull request #48440 from frappe/mergify/bp/version-15-hotfix/pr-48324
fix: update payment request outstanding on unreconciliation (backport #48324)
|
2025-07-08 10:33:36 +05:30 |
|
ruthra kumar
|
cc5c4a3f9a
|
chore: resolve conflict
|
2025-07-08 10:17:43 +05:30 |
|
rohitwaghchaure
|
0fefccc128
|
Merge pull request #48434 from frappe/mergify/bp/version-15-hotfix/pr-48432
fix: fetch from parent optional in inventory dimension (backport #48432)
|
2025-07-08 09:58:27 +05:30 |
|
ljain112
|
a8448f9e60
|
chore: fix test case for payment request
(cherry picked from commit 31d12517f0)
|
2025-07-08 04:16:41 +00:00 |
|
ljain112
|
450061c7db
|
fix: update payment request outstanding on unreconciliation
(cherry picked from commit 8098229b55)
# Conflicts:
# erpnext/accounts/doctype/payment_request/test_payment_request.py
|
2025-07-08 04:16:40 +00:00 |
|