Mihir Kandoi
|
b6a80da457
|
Merge pull request #50709 from frappe/mergify/bp/version-15-hotfix/pr-50707
fix: unknown column error (backport #50707)
|
2025-11-23 19:54:21 +05:30 |
|
Mihir Kandoi
|
2e9a0cb01c
|
fix: unknown column error
(cherry picked from commit 3b7d7aed4c)
|
2025-11-23 14:08:48 +00:00 |
|
Diptanil Saha
|
60ec7d0fb8
|
Merge pull request #50690 from frappe/mergify/bp/version-15-hotfix/pr-50476
fix: use current_tax_amount value for base_total_taxes_and_charges (backport #50476)
|
2025-11-21 22:31:13 +05:30 |
|
Pugazhendhi Velu
|
7ed3c6d18a
|
fix: use current_tax_amount value for base_total_taxes_and_charges
(cherry picked from commit 5a3fcbedb5)
|
2025-11-21 16:41:52 +00:00 |
|
Mihir Kandoi
|
0a67d20ff8
|
Merge pull request #50671 from frappe/mergify/bp/version-15-hotfix/pr-50667
fix: pricing rule was ignoring time validity (backport #50667)
|
2025-11-21 13:08:25 +05:30 |
|
Mihir Kandoi
|
83c6d861eb
|
Merge pull request #50670 from frappe/mergify/bp/version-15-hotfix/pr-50655
fix: pick list status doesn't update when DN created from it and PL w... (backport #50655)
|
2025-11-21 13:00:31 +05:30 |
|
Mihir Kandoi
|
f62e5e69b8
|
fix: pricing rule was ignoring time validity
(cherry picked from commit ffae7c4175)
|
2025-11-21 07:22:07 +00:00 |
|
Mihir Kandoi
|
45bc218acb
|
fix: tests
(cherry picked from commit d26f8aa629)
|
2025-11-21 07:14:00 +00:00 |
|
Mihir Kandoi
|
2809c46a6e
|
fix: pick list status doesn't update when DN created from it and PL was created from SO
(cherry picked from commit f7b3253683)
|
2025-11-21 07:14:00 +00:00 |
|
Diptanil Saha
|
ff1b83025a
|
Merge pull request #50666 from frappe/mergify/bp/version-15-hotfix/pr-50665
fix(customer): link contact and addresses if created from lead/opportunity/prospect (backport #50665)
|
2025-11-21 07:03:57 +05:30 |
|
diptanilsaha
|
b1d40de87e
|
fix(customer): link contact and addresses if created from lead/opportunity/prospect
(cherry picked from commit 310099f4cd)
|
2025-11-21 01:18:18 +00:00 |
|
Mihir Kandoi
|
532031c21d
|
Merge pull request #50650 from frappe/mergify/bp/version-15-hotfix/pr-50385
fix: remove disabled warehouse in get_warehouses_based_on_account (backport #50385)
|
2025-11-20 17:44:02 +05:30 |
|
Mihir Kandoi
|
cb70efb8ed
|
Merge pull request #50653 from frappe/mergify/bp/version-15-hotfix/pr-50639
fix(product bundle): fields reset if doc is new (backport #50639)
|
2025-11-20 17:43:43 +05:30 |
|
Mihir Kandoi
|
ca0b4696ba
|
Merge pull request #50652 from frappe/mergify/bp/version-15-hotfix/pr-50649
fix: unhide zero val checkbox in stock reco (backport #50649)
|
2025-11-20 17:43:26 +05:30 |
|
Mihir Kandoi
|
4ba4da090d
|
fix(product bundle): fields reset if doc is new
(cherry picked from commit 7faee7edc2)
|
2025-11-20 10:42:53 +00:00 |
|
rohitwaghchaure
|
e3b2cc24b2
|
chore: fix conflicts
|
2025-11-20 16:12:41 +05:30 |
|
Mihir Kandoi
|
a24733791d
|
fix: unhide zero val checkbox
(cherry picked from commit 20e0313a8c)
# Conflicts:
# erpnext/stock/doctype/stock_reconciliation_item/stock_reconciliation_item.json
|
2025-11-20 10:41:55 +00:00 |
|
Mihir Kandoi
|
aa94c91c12
|
fix: remove disabled warehouse in get_warehouses_based_on_account
(cherry picked from commit ff2d9bf4cb)
|
2025-11-20 10:33:54 +00:00 |
|
Mihir Kandoi
|
87ffbdf129
|
Merge pull request #50641 from frappe/mergify/bp/version-15-hotfix/pr-50502
fix(purchase_receipt): add internal_and_external_links field to show … (backport #50502)
|
2025-11-20 15:45:43 +05:30 |
|
rohitwaghchaure
|
5ef7b8c526
|
Merge pull request #50648 from frappe/mergify/bp/version-15-hotfix/pr-50646
fix: serial batch selector shown only once (backport #50646)
|
2025-11-20 15:12:51 +05:30 |
|
Mihir Kandoi
|
25cd230471
|
fix: serial batch selector shown only once
(cherry picked from commit aa6f09e9a9)
|
2025-11-20 09:38:37 +00:00 |
|
rohitwaghchaure
|
f05933e814
|
Merge pull request #50645 from frappe/mergify/bp/version-15-hotfix/pr-50644
fix: validation for SABB deletion (backport #50644)
|
2025-11-20 14:33:05 +05:30 |
|
Diptanil Saha
|
8df2612694
|
Merge pull request #50643 from frappe/mergify/bp/version-15-hotfix/pr-50289
|
2025-11-20 13:58:58 +05:30 |
|
Rohit Waghchaure
|
0bc98b609f
|
fix: validation for SABB deletion
(cherry picked from commit dd4bef0706)
|
2025-11-20 08:19:48 +00:00 |
|
l0gesh29
|
02a1f815da
|
feat(reports): preserve accounting dimension filters while navigating between reports
(cherry picked from commit fcfcaa76c6)
|
2025-11-20 07:46:55 +00:00 |
|
l0gesh29
|
6b6e017e36
|
feat: modify accounting dimension as multiselect field
(cherry picked from commit 3fcd8d84ac)
|
2025-11-20 07:46:55 +00:00 |
|
Karuppasamy B
|
89fcdbf56b
|
fix(purchase_receipt): add internal_and_external_links field to show purchase invoice connection count
(cherry picked from commit 6c1620ab8c)
|
2025-11-20 07:03:55 +00:00 |
|
rohitwaghchaure
|
eb2571492f
|
Merge pull request #50612 from aerele/fix/validate-reserved-stock
fix: ignore reserved batches from total available batches
|
2025-11-19 22:16:00 +05:30 |
|
Kavin
|
55f2f1c515
|
test: add unit test for reserved stock validation
|
2025-11-19 17:51:10 +05:30 |
|
Kavin
|
673b893942
|
fix: ignore reserved batches from total available batches
|
2025-11-19 17:51:10 +05:30 |
|
mergify[bot]
|
c85ce55f27
|
Merge pull request #50631 from frappe/mergify/bp/version-15-hotfix/pr-50629
fix: process loss % can be negative (backport #50629)
|
2025-11-19 11:30:39 +00:00 |
|
Mihir Kandoi
|
a19252e3b3
|
Merge pull request #50628 from frappe/mergify/bp/version-15-hotfix/pr-50627
fix: show current company warehouse only in get material from bom MR (backport #50627)
|
2025-11-19 16:29:17 +05:30 |
|
Mihir Kandoi
|
7ece6fd558
|
Merge pull request #50626 from frappe/mergify/bp/version-15-hotfix/pr-50625
fix: add filter company and status to job card employee (backport #50625)
|
2025-11-19 16:24:08 +05:30 |
|
Mihir Kandoi
|
1d6e3e4e7d
|
fix: show current company warehouse only in get material from bom MR
(cherry picked from commit 3271eaaf0e)
|
2025-11-19 10:46:47 +00:00 |
|
Mihir Kandoi
|
015f946a14
|
fix: add filter company and status to job card employee
(cherry picked from commit 3ca3a6d9bb)
|
2025-11-19 10:42:32 +00:00 |
|
rohitwaghchaure
|
533a2dbc32
|
Merge pull request #50607 from frappe/mergify/bp/version-15-hotfix/pr-50512
fix: add return status for purchase receipt (backport #50512)
|
2025-11-19 14:18:12 +05:30 |
|
rohitwaghchaure
|
99aeb8ecd1
|
Merge pull request #50606 from frappe/mergify/bp/version-15-hotfix/pr-50486
fix: validate sabb autocreation when disabled (backport #50486)
|
2025-11-19 14:18:00 +05:30 |
|
Mihir Kandoi
|
371030f8d4
|
Merge pull request #50615 from frappe/mergify/bp/version-15-hotfix/pr-50614
fix: redundant message on bom save (backport #50614)
|
2025-11-19 12:53:50 +05:30 |
|
Mihir Kandoi
|
2550b44db8
|
chore: resolve conflicts
|
2025-11-19 12:38:47 +05:30 |
|
Mihir Kandoi
|
5b1674018b
|
fix: redundant message on bom save
(cherry picked from commit 074f07694f)
# Conflicts:
# erpnext/manufacturing/doctype/bom/bom.py
|
2025-11-19 07:06:11 +00:00 |
|
ruthra kumar
|
b4fd4812cd
|
Merge pull request #50527 from aerele/default-report-fiscal-year-v15
fix(financial reports): set fiscal year associated with the default company
|
2025-11-18 18:12:21 +05:30 |
|
rohitwaghchaure
|
876dec5077
|
chore: fix conflicts
|
2025-11-18 18:05:08 +05:30 |
|
rohitwaghchaure
|
36e9aae9d0
|
chore: fix conflicts
|
2025-11-18 18:04:29 +05:30 |
|
Pugazhendhi Velu
|
8ccb9a5ad2
|
fix: add return status for purchase receipt
(cherry picked from commit 3a0e1e8ef9)
|
2025-11-18 12:33:18 +00:00 |
|
Kavin
|
85c0c16964
|
fix: validate sabb autocreation when disabled
(cherry picked from commit 3ca1940881)
# Conflicts:
# erpnext/stock/doctype/stock_entry/stock_entry.py
|
2025-11-18 12:29:01 +00:00 |
|
ruthra kumar
|
6a46045804
|
Merge pull request #50603 from frappe/mergify/bp/version-15-hotfix/pr-50524
fix: use dynamic account type to get average ratio balance (backport #50524)
|
2025-11-18 17:44:31 +05:30 |
|
ruthra kumar
|
befa4bef0d
|
Merge pull request #50601 from frappe/mergify/bp/version-15-hotfix/pr-50516
fix(general_ledger): add translation for accounting dimension (backport #50516)
|
2025-11-18 17:13:34 +05:30 |
|
mergify[bot]
|
f8294f1754
|
feat(Company): allow setting default sales contact, fetch into sales transaction (backport #50159) (#50599)
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
Co-authored-by: Diptanil Saha <diptanil@frappe.io>
|
2025-11-18 17:05:58 +05:30 |
|
mergify[bot]
|
2d6640ac61
|
fix: add condition for allow negative stock in pos (backport #50369) (#50600)
Co-authored-by: Logesh Periyasamy <logeshperiyasamy24@gmail.com>
fix: add condition for allow negative stock in pos (#50369)
|
2025-11-18 17:05:47 +05:30 |
|
Navin-S-R
|
627b34a120
|
fix: correct profit after tax calculation by reducing expenses from income
(cherry picked from commit f420371a7e)
|
2025-11-18 11:22:38 +00:00 |
|