Commit Graph

53529 Commits

Author SHA1 Message Date
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
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
Mihir Kandoi
1b1e4e4688 Merge pull request #50453 from frappe/mergify/bp/version-15-hotfix/pr-50135
fix: add missing stock entry UOM filtering based on item master (backport #50135)
2025-11-11 10:05:05 +05:30
Rehan Ansari
8f2002d419 fix: add missing stock entry UOM filtering based on item master (#50135)
Co-authored-by: rehansari26 <rehan.ansari@cloverinfotech.com>
(cherry picked from commit 7baf6ec3d6)
2025-11-11 04:29:34 +00:00
Assem Bahnasy
5b643433e5 Fix: Product Bundle Purchase Order Creation Logic (#49831)
Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com>
2025-11-11 09:53:25 +05:30
Diptanil Saha
e02aaa9f1b Merge pull request #50449 from frappe/mergify/bp/version-15-hotfix/pr-50339
fix: include cost_center and project upon accounting dimension fetch (backport #50339)
2025-11-11 00:10:52 +05:30
l0gesh29
b1816864de fix: apply company,is_group filter for cost center
(cherry picked from commit dcdc1c6a89)
2025-11-10 17:47:08 +00:00
l0gesh29
3f490f11d5 fix: include cost_center and project upon accounting dimension fetch
(cherry picked from commit 4680295303)
2025-11-10 17:47:07 +00:00
Diptanil Saha
b545b69e4b Merge pull request #50444 from frappe/mergify/bp/version-15-hotfix/pr-50361
fix: reset billing and shipping address when company changes (backport #50361)
2025-11-10 20:59:05 +05:30
Rohit Waghchaure
6ba24912c3 perf: serial no creation
(cherry picked from commit 19a9497273)

# Conflicts:
#	erpnext/stock/serial_batch_bundle.py
2025-11-10 15:11:27 +00:00
Pugazhendhi Velu
73b8a294cf fix: reset billing and shipping address when company changes
(cherry picked from commit 0510f7e13f)
2025-11-10 15:08:13 +00:00
ruthra kumar
b5485dc909 Merge pull request #50393 from frappe/mergify/bp/version-15-hotfix/pr-50340
fix: ignore Department doctype (backport #50340)
2025-11-10 16:37:43 +05:30
rohitwaghchaure
5ed4fea3e3 Merge pull request #50431 from aerele/fix/reserved-stock-negative
fix(stock): ignore current voucher in reserved stock validation
2025-11-10 15:57:37 +05:30
Kavin
b8ec3ae23a fix: Nonetype error if reserved stock is not present 2025-11-10 14:51:35 +05:30
Kavin
0e7f9711e1 fix(stock): ignore current voucher in reserved stock validation 2025-11-10 14:29:04 +05:30
rohitwaghchaure
3cad1304a0 Merge pull request #50427 from frappe/mergify/bp/version-15-hotfix/pr-50374
fix: add validation to reject empty readings (backport #50374)
2025-11-10 14:04:23 +05:30
ruthra kumar
9dc1f5f649 Merge pull request #50405 from frappe/mergify/bp/version-15-hotfix/pr-50326
fix: validate is_group for parent task (backport #50326)
2025-11-10 12:58:34 +05:30
ruthra kumar
df6ca3af57 chore: resolve conflicts 2025-11-10 12:43:05 +05:30
ruthra kumar
95db1677e2 Merge pull request #50408 from aerele/support-52573
fix: check warehouse account before accessing
2025-11-10 12:39:14 +05:30
ruthra kumar
ca9f1b6c7b Merge pull request #50429 from frappe/mergify/bp/version-15-hotfix/pr-50423
fix(buying): fetch Cost Center from Project (backport #50423)
2025-11-10 12:35:29 +05:30
barredterra
e8e26a91bb fix(buying): fetch Cost Center from Project
(cherry picked from commit bdabcb081a)
2025-11-10 07:03:04 +00:00
Pugazhendhi Velu
dc88f7b30b refactor: add default reading value when creating a quality inspection
(cherry picked from commit 63fb9f55e7)
2025-11-10 05:38:42 +00:00
Pugazhendhi Velu
ac0375fc2e fix: add validation to reject empty readings
(cherry picked from commit 405d901514)
2025-11-10 05:38:42 +00:00
rohitwaghchaure
5bb2e8a8ff Merge pull request #50401 from aerele/support-52103
fix: handle partial dn against reserved stock
2025-11-07 20:53:43 +05:30
rohitwaghchaure
3989a7ede6 Merge pull request #50412 from frappe/mergify/bp/version-15-hotfix/pr-50411
fix: removed the validation (backport #50411)
2025-11-07 19:16:37 +05:30
Kavin
ef719fe729 test: add test for partial dn against reserved stock 2025-11-07 19:09:23 +05:30
Kavin
9d979e34ab fix: handle partial dn against reserved stock 2025-11-07 19:09:11 +05:30