rohitwaghchaure
|
34ed9b455f
|
Merge pull request #50491 from frappe/mergify/bp/version-15-hotfix/pr-50487
fix: current qty in stock reconciliation (backport #50487)
|
2025-11-12 22:49:44 +05:30 |
|
Diptanil Saha
|
2ba1731d3f
|
Merge pull request #50484 from frappe/mergify/bp/version-15-hotfix/pr-50409
|
2025-11-12 15:14:53 +05:30 |
|
Rohit Waghchaure
|
b4b8459f2c
|
fix: current qty in stock reco
(cherry picked from commit 58315bc963)
|
2025-11-12 08:26:01 +00:00 |
|
Diptanil Saha
|
d5160c4c86
|
test: delete outdated pos opening entry
|
2025-11-12 12:26:26 +05:30 |
|
Diptanil Saha
|
af19b81343
|
chore: resolve conflict
|
2025-11-12 11:35:02 +05:30 |
|
Diptanil Saha
|
650d2f74ba
|
chore: resolve conflict
|
2025-11-12 11:33:56 +05:30 |
|
diptanilsaha
|
68747b5818
|
fix: prevent pos opening entry creation for disabled pos profile
(cherry picked from commit e35e8968f0)
# Conflicts:
# erpnext/accounts/doctype/pos_opening_entry/test_pos_opening_entry.py
|
2025-11-12 05:44:01 +00:00 |
|
diptanilsaha
|
38848ff43b
|
test: added test to validate disabled pos profile
(cherry picked from commit 69016a284f)
# Conflicts:
# erpnext/accounts/doctype/pos_profile/test_pos_profile.py
|
2025-11-12 05:44:00 +00:00 |
|
diptanilsaha
|
87e8305753
|
feat(pos): prevent disabling POS Profile when open POS sessions exist
(cherry picked from commit c5219278fb)
|
2025-11-12 05:44:00 +00:00 |
|
Diptanil Saha
|
a2345d467e
|
Merge pull request #50483 from frappe/mergify/bp/version-15-hotfix/pr-50323
fix(payment entry): on changes of paid from/to account fetch company bank account (backport #50323)
|
2025-11-12 11:11:37 +05:30 |
|
Abdeali Chharchhoda
|
3d8a344173
|
fix: on changes of paid from/to account fetch company bank account
(cherry picked from commit 4901dc2531)
|
2025-11-12 05:38:56 +00:00 |
|
rohitwaghchaure
|
0023476500
|
Merge pull request #50470 from frappe/mergify/bp/version-15-hotfix/pr-50187
fix: Update pick list locations quantity (backport #50187)
|
2025-11-11 16:11:03 +05:30 |
|
ruthra kumar
|
0c4295fb6f
|
Merge pull request #50472 from frappe/mergify/bp/version-15-hotfix/pr-50469
fix: automatically append taxes if taxes_and_charges is set in Buying controller (backport #50469)
|
2025-11-11 15:57:52 +05:30 |
|
Sagar Vora
|
13371275db
|
Merge pull request #50471 from frappe/mergify/bp/version-15-hotfix/pr-50155
fix: ensure that additional discount amount is not mapped repeatedly (backport #50155)
|
2025-11-11 15:13:48 +05:30 |
|
Sagar Vora
|
313e6af528
|
chore: resolve conflicts
|
2025-11-11 15:11:52 +05:30 |
|
ljain112
|
e2a0d6e5f6
|
test: add automatic tax addition for buying controller
(cherry picked from commit 3d0a668c50)
|
2025-11-11 09:34:16 +00:00 |
|
ljain112
|
25f5fb7637
|
fix: automatically append taxes if taxes_and_charges is set in Buying controller
(cherry picked from commit d171dc7328)
|
2025-11-11 09:34:16 +00:00 |
|
Sagar Vora
|
22848eb4da
|
chore: remove unused import
(cherry picked from commit 81ab15351e)
# Conflicts:
# erpnext/controllers/taxes_and_totals.py
|
2025-11-11 09:32:59 +00:00 |
|
Sagar Vora
|
b4df87e545
|
refactor: simplify logic
(cherry picked from commit 95f604457d)
|
2025-11-11 09:32:56 +00:00 |
|
Sagar Vora
|
9ed40cc17d
|
fix: handle returns as well
(cherry picked from commit 0e026b9ccd)
|
2025-11-11 09:32:56 +00:00 |
|
Sagar Vora
|
22b6760164
|
test: some tests to ensure correct discount mapping
(cherry picked from commit 0968f435d2)
|
2025-11-11 09:32:56 +00:00 |
|
Sagar Vora
|
e559fafa83
|
fix: validate that discount amount cannot exceed total before discount
(cherry picked from commit f4f79d99e4)
# Conflicts:
# erpnext/controllers/taxes_and_totals.py
|
2025-11-11 09:32:56 +00:00 |
|
Sagar Vora
|
44539f0944
|
fix: ensure that additional discount amount is not mapped repeatedly
(cherry picked from commit feb62102d9)
|
2025-11-11 09:32:55 +00:00 |
|
Kavin
|
a0d94c38c1
|
test: add test for pending qty calculation in Pick List
(cherry picked from commit 3f7a60d56c)
|
2025-11-11 09:24:34 +00:00 |
|
Kavin
|
95ea9ca66b
|
fix: Pass stock_qty and picked_qty in transfer entry
(cherry picked from commit 6db605c443)
|
2025-11-11 09:24:34 +00:00 |
|
Kavin
|
ce7ab8df9a
|
fix: Update pick list locations quantity
(cherry picked from commit bd9e240ca5)
|
2025-11-11 09:24:34 +00:00 |
|
rohitwaghchaure
|
798858bd4f
|
Merge pull request #50467 from aerele/fix/update-uom-value
fix: update uom when item changes
|
2025-11-11 13:43:01 +05:30 |
|
ruthra kumar
|
c6774e35f2
|
Merge pull request #50465 from frappe/mergify/bp/version-15-hotfix/pr-50366
refactor: enqueue exchange rate revaluation per company (backport #50366)
|
2025-11-11 13:29:25 +05:30 |
|
Kavin
|
2a2ae9a20c
|
fix: update uom when item changes
|
2025-11-11 13:17:21 +05:30 |
|
ravibharathi656
|
f039bfe35a
|
refactor: enqueue exchange rate revaluation per company
(cherry picked from commit b10e7bf7b5)
|
2025-11-11 07:34:57 +00:00 |
|
mergify[bot]
|
1747e83cb1
|
feat: make material transfer warehouse validation optional (backport #50461) (#50462)
Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com>
|
2025-11-11 07:18:41 +00:00 |
|
rohitwaghchaure
|
de14c0838c
|
Merge pull request #50445 from frappe/mergify/bp/version-15-hotfix/pr-50436
perf: serial no creation (backport #50436)
|
2025-11-11 11:45:59 +05:30 |
|
ruthra kumar
|
3788d0f4f0
|
Merge pull request #50396 from aerele/show-party-and-account-balances
feat(account settings): add checkbox to show balances in payment entry
|
2025-11-11 11:14:25 +05:30 |
|
Mihir Kandoi
|
ba98a00c6c
|
Merge pull request #50459 from frappe/mergify/bp/version-15-hotfix/pr-50418
fix: show only stock items in delivered items to be billed and received items to be billed reports (backport #50418)
|
2025-11-11 10:57:58 +05:30 |
|
Mihir Kandoi
|
2c4510ed1e
|
Merge pull request #50458 from frappe/mergify/bp/version-15-hotfix/pr-50244
fix: state_to_state_province for translation (backport #50244)
|
2025-11-11 10:52:26 +05:30 |
|
rohitwaghchaure
|
87f3ba5794
|
chore: fix linters issue
|
2025-11-11 10:51:19 +05:30 |
|
Mihir Kandoi
|
197d09b90a
|
Merge pull request #50460 from frappe/mergify/bp/version-15-hotfix/pr-50446
fix: add company filter for default warehouse for sales return (backport #50446)
|
2025-11-11 10:49:48 +05:30 |
|
Pugazhendhi Velu
|
32d3fbf1e8
|
fix: add company filter for default warehouse for sales return
(cherry picked from commit 0b614007bb)
|
2025-11-11 05:17:53 +00:00 |
|
rohitwaghchaure
|
4ec25ac82e
|
chore: fix conflicts
Removed unused voucher_no and posting_date retrieval.
|
2025-11-11 10:47:06 +05:30 |
|
ravibharathi656
|
3dbc90a0b4
|
fix: show only stock items in delivered items to be billed and received items to be billed reports
(cherry picked from commit 1b2e5c9706)
|
2025-11-11 05:12:50 +00:00 |
|
Mihir Kandoi
|
f00236e669
|
Merge pull request #50456 from frappe/mergify/bp/version-15-hotfix/pr-50322
fix typo "show_disables_items" to "show_disabled_items" (backport #50322)
|
2025-11-11 10:41:20 +05:30 |
|
mahsem
|
d4f6ca3564
|
fix: state_to_state_province for translation (#50244)
Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com>
(cherry picked from commit e148a38353)
|
2025-11-11 05:08:42 +00:00 |
|
Mihir Kandoi
|
10e7ae4dd3
|
Merge pull request #50457 from frappe/mergify/bp/version-15-hotfix/pr-50320
fix: add is_group filter in task for timesheet (backport #50320)
|
2025-11-11 10:37:44 +05:30 |
|
Pugazhendhi Velu
|
0f00581f83
|
fix: add is_group filter in task for timesheet
(cherry picked from commit 5bac896329)
|
2025-11-11 04:58:38 +00:00 |
|
Mihir Kandoi
|
a3ddc9533a
|
fix: change fieldtype from link to data for document_type in producti… (backport #50443) (#50455)
Co-authored-by: Pugazhendhi Velu <pugazhendhi720@gmail.com>
|
2025-11-11 10:26:47 +05:30 |
|
rethik
|
2b766bca97
|
chore: fix typo "show_disables_items" to "show_disabled_items"
(cherry picked from commit d26c598daa)
|
2025-11-11 04:56:33 +00:00 |
|
Mihir Kandoi
|
38c2633594
|
Merge pull request #50454 from frappe/mergify/bp/version-15-hotfix/pr-50399
fix: mr item quantity validation against so over-receipt allowance (backport #50399)
|
2025-11-11 10:25:45 +05:30 |
|
Pugazhendhi Velu
|
9012a72185
|
fix: change fieldtype from link to data for document_type in production plan summary
(cherry picked from commit 462deb3755)
|
2025-11-11 04:41:26 +00:00 |
|
Pugazhendhi Velu
|
249d14b072
|
test: add test for validate mr item qty against so with over-receipt allowance
(cherry picked from commit 55f531bad6)
|
2025-11-11 04:40:25 +00:00 |
|
Pugazhendhi Velu
|
f2fef54b83
|
fix: material request item quantity validation against sales order with over-receipt allowance
(cherry picked from commit 8d7e31e3f2)
|
2025-11-11 04:40:25 +00:00 |
|