ruthra kumar
|
08d230b3e3
|
Merge pull request #50731 from frappe/mergify/bp/version-15-hotfix/pr-50561
fix(ledger-summary-report): show party group and territory (backport #50561)
|
2025-11-25 12:33:49 +05:30 |
|
Mihir Kandoi
|
f383fafb15
|
Merge pull request #50728 from frappe/mergify/bp/version-15-hotfix/pr-50727
fix: incorrect query filter when selecting primary customer adr (backport #50727)
|
2025-11-25 12:14:17 +05:30 |
|
ruthra kumar
|
38124a7616
|
chore: resolve conflicts
|
2025-11-25 12:01:37 +05:30 |
|
l0gesh29
|
56cf5382f0
|
test: add party_group, territory in json
(cherry picked from commit 8f91919933)
# Conflicts:
# erpnext/accounts/report/customer_ledger_summary/test_customer_ledger_summary.py
|
2025-11-25 05:38:57 +00:00 |
|
l0gesh29
|
56f03aee02
|
fix(ledger-summary-report): show party group and territory
(cherry picked from commit 231479a6e2)
# Conflicts:
# erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py
|
2025-11-25 05:38:57 +00:00 |
|
Mihir Kandoi
|
841f5c24ad
|
chore: resolve conflicts
|
2025-11-25 10:51:39 +05:30 |
|
ruthra kumar
|
e8051ba180
|
Merge pull request #50729 from frappe/mergify/bp/version-15-hotfix/pr-50621
feat(accounting-dimension): add dynamic triggers for custom accounting dimensions (backport #50621)
|
2025-11-25 10:26:47 +05:30 |
|
Logesh Periyasamy
|
2b7d58602d
|
feat(accounting-dimension): add dynamic triggers for custom accounting dimensions (#50621)
* feat: add dynamic triggers for custom accounting dimensions
* feat: add accounting dimension trigger call in setup event
* chore: ignore cur_frm semgrep rules
* chore: move function to transaction.js
(cherry picked from commit 5e58e344b2)
|
2025-11-25 04:51:32 +00:00 |
|
Mihir Kandoi
|
e8e09cf8ea
|
fix: incorrect query filter when selecting primary customer adr (#50727)
(cherry picked from commit c2b8b97d7d)
# Conflicts:
# erpnext/selling/doctype/customer/customer.json
|
2025-11-25 04:49:20 +00:00 |
|
Khushi Rawat
|
188c633d6e
|
Merge pull request #50544 from aerele/asset-repair-pi-status
fix: prevent pi status from changing on asset repair
|
2025-11-24 23:28:33 +05:30 |
|
mergify[bot]
|
1995291194
|
fix: add validation for FG Items as per BOM qty (backport #50579) (#50715)
Co-authored-by: Kavin <78342682+kavin0411@users.noreply.github.com>
Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com>
Co-authored-by: Kavin <78342682+kavin-114@users.noreply.github.com>
fix: add validation for FG Items as per BOM qty (#50579)
|
2025-11-24 11:18:18 +00:00 |
|
Mihir Kandoi
|
bb0d75eb78
|
Merge pull request #50717 from frappe/mergify/bp/version-15-hotfix/pr-50716
fix: add missing translate function (backport #50716)
|
2025-11-24 13:53:48 +05:30 |
|
El-Shafei H.
|
475eada727
|
fix: add missing translate function
(cherry picked from commit 56def01240)
|
2025-11-24 07:39:09 +00:00 |
|
mergify[bot]
|
6cffba9a71
|
Merge pull request #50713 from frappe/mergify/bp/version-15-hotfix/pr-50712
|
2025-11-24 07:17:43 +00:00 |
|
Mihir Kandoi
|
35f9f9f330
|
Merge pull request #50711 from frappe/mergify/bp/version-15-hotfix/pr-50661
fix(manufacturing): apply precision for bom amount and rm_cost_per_qty (backport #50661)
|
2025-11-24 11:02:50 +05:30 |
|
Pugazhendhi Velu
|
5b60fbbd30
|
fix: apply precision for scrap items amount
(cherry picked from commit 9194e6350a)
|
2025-11-24 05:08:42 +00:00 |
|
Pugazhendhi Velu
|
2678694c5f
|
fix(manufacturing): apply precision for bom amount and rm_cost_per_qty
(cherry picked from commit 57f9353d90)
|
2025-11-24 05:08:42 +00:00 |
|
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 |
|