khushi8112
ea3fcc214b
fix(test): use non-group customer group in test setup
2026-04-06 16:09:05 +05:30
khushi8112
7a227e048e
fix: prevent selection of group type customer group in customer master
...
(cherry picked from commit 6068dc959f
2026-04-06 12:57:49 +05:30
mergify[bot]
a71d32e668
fix: update min date based on transaction_date (backport #53803 ) ( #54024 )
...
Co-authored-by: Vishnu Priya Baskaran <145791817+ervishnucs@users.noreply.github.com >
fix: update min date based on transaction_date (#53803 )
2026-04-05 21:16:48 +05:30
mergify[bot]
d9cd09b24a
fix: flaky currency exchange test (backport #53813 ) ( #53816 )
2026-03-26 12:38:36 +00:00
diptanilsaha
46e784d094
fix: check for submit permissions instead of write permissions when updating status (backport #53697 ) ( #53702 )
2026-03-23 16:03:50 +05:30
mergify[bot]
defa1d4a76
fix: validate permission before updating status (backport #53651 ) ( #53652 )
...
* fix: validate permission before updating status (#53651 )
(cherry picked from commit 8e17c722fbdiptanil@frappe.io >
2026-03-19 20:49:53 +05:30
mergify[bot]
526ffc1176
fix: Creating new item price incase of changes in expired item price (backport #53534 ) ( #53544 )
...
Co-authored-by: Nishka Gosalia <nishkagosalia@Nishkas-MacBook-Air.local >
Co-authored-by: Nishka Gosalia <58264710+nishkagosalia@users.noreply.github.com >
fix: Creating new item price incase of changes in expired item price (#53534 )
2026-03-17 14:51:13 +00:00
mergify[bot]
a6cf31edad
fix: sales order indicator should be based on available qty rather th… (backport #53456 ) ( #53457 )
2026-03-15 09:46:07 +05:30
ruthra kumar
56ffd52335
refactor: disable total row in trends report
...
(cherry picked from commit 4dbc72b301
2026-03-13 12:32:55 +00:00
Jatin3128
d425e90ef7
Merge pull request #53213 from Jatin3128/fix-53173
...
fix: correct payment terms fetching and recalculation logic
2026-03-11 02:56:03 +05:30
Jatin3128
79b04826d9
fix: correct payment terms fetching and recalculation logic
2026-03-11 02:55:40 +05:30
Pandiyan37
dfbb3e97a8
fix(selling): update delivery date in line items
...
(cherry picked from commit 77367b5517
2026-03-10 07:23:38 +00:00
Jatin3128
3148816451
fix: correct payment terms fetching and recalculation logic
2026-03-06 15:08:35 +05:30
mergify[bot]
68bac20198
Merge pull request #53095 from frappe/mergify/bp/version-15-hotfix/pr-52838
...
fix: correct fields being updated on material request and purchase or… (backport #52838 )
2026-03-04 07:33:02 +00:00
mergify[bot]
072ab8d5f3
feat: allowing rate modification in update item in quotation (backport #53147 ) ( #53150 )
...
Co-authored-by: Nishka Gosalia <nishkagosalia@Nishkas-MacBook-Air.local >
2026-03-04 07:29:46 +00:00
kavin-114
dced21faf2
test: add unit test for FG Item selling price validation
...
(cherry picked from commit 723993fdf6
2026-03-03 15:40:19 +00:00
Sowmya
2420122f0e
fix(sales-order): update quotation status while cancelling sales order ( #52822 )
...
* fix(sales-order): update quotation status while cancelling sales order
* test: validate quotation status
* chore: remove submit
(cherry picked from commit d638f3e033
2026-02-24 06:18:23 +00:00
Mihir Kandoi
58d9694173
chore: resolve conflicts
2026-02-20 17:01:17 +05:30
Mihir Kandoi
1bf608f835
fix: inconsistent label name between parent and child
...
(cherry picked from commit d6e1ca0f10
2026-02-20 11:28:35 +00:00
mergify[bot]
800e38453b
feat: update item button addition for quotation (backport #50976 ) ( #52810 )
...
* feat: update item button addition for quotation (#50976 )
* feat: update item button addition for quotation
* feat: update item button addition for supplier quotation
* fix: test case
---------
Co-authored-by: Nishka Gosalia <nishkagosalia@Nishkas-MacBook-Air.local >
Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com >
(cherry picked from commit f4c0611cc558264710+nishkagosalia@users.noreply.github.com >
Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com >
2026-02-19 23:11:32 +05:30
Mihir Kandoi
656b1bcede
Revert "feat: update item button addition for quotation (backport #50976 ) (#5…"
...
This reverts commit e2a1a7a36d
2026-02-19 20:22:25 +05:30
mergify[bot]
e2a1a7a36d
feat: update item button addition for quotation (backport #50976 ) ( #52810 )
...
* feat: update item button addition for quotation (#50976 )
* feat: update item button addition for quotation
* feat: update item button addition for supplier quotation
* fix: test case
---------
Co-authored-by: Nishka Gosalia <nishkagosalia@Nishkas-MacBook-Air.local >
Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com >
(cherry picked from commit f4c0611cc558264710+nishkagosalia@users.noreply.github.com >
Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com >
2026-02-19 14:41:01 +00:00
ruthra kumar
8bddefb18b
Merge pull request #52641 from frappe/mergify/bp/version-15-hotfix/pr-52640
...
refactor: use query builder for sales person commission summary (backport #52640 )
2026-02-12 12:52:37 +05:30
ruthra kumar
ac02af476a
refactor: use query builder for sales person commission summary
...
(cherry picked from commit 7105e3fb69
2026-02-12 07:07:25 +00:00
diptanilsaha
2c13b2cc22
test: fixed test_make_sales_invoice_with_terms
2026-02-12 11:18:44 +05:30
Diptanil Saha
4da44e2c3f
chore: resolve linter issue
2026-02-12 11:18:44 +05:30
Diptanil Saha
a503460bd5
chore: resolve conflict
2026-02-12 11:18:44 +05:30
dharanidharan2813
78a3701f4c
fix: Payment Terms auto-fetched in Sales Invoice even when automatically_fetch_payment_terms is disabled
...
(cherry picked from commit cf1d892d60
2026-02-12 11:18:44 +05:30
ravibharathi656
ad92c021f7
fix(quotation): ignore zero ordered_qty
...
(cherry picked from commit 32ea37035e
2026-02-09 10:38:44 +00:00
Mihir Kandoi
292f17b1b0
chore: resolve conflicts
2026-02-06 12:12:59 +05:30
Mihir Kandoi
740dd878e9
chore: resolve conflicts
2026-02-06 12:12:24 +05:30
Nishka Gosalia
a8f05cadea
fix: enabling skip delivery option for order type maintenance
...
(cherry picked from commit 1a22e3cb61
2026-02-06 06:39:47 +00:00
Mihir Kandoi
78f8922a9c
fix: populate contact fields when creating quotation from customer
...
(cherry picked from commit 75b2c2c83d
2026-02-02 14:46:21 +00:00
Mihir Kandoi
528a482240
fix: imports
2026-02-02 10:51:27 +05:30
Mihir Kandoi
d9d4b9b117
test: over ordering of quotation items
...
(cherry picked from commit 53e58f6678
2026-02-02 10:51:27 +05:30
Mihir Kandoi
42f94f1aba
chore: remove incorrect import
2026-01-31 20:36:46 +05:30
Mihir Kandoi
4017936bef
chore: resolve conflicts
2026-01-31 20:19:07 +05:30
Mihir Kandoi
6cecae288c
chore: resolve conflicts
2026-01-31 20:18:22 +05:30
Mihir Kandoi
2c74491eb6
fix: test cases
...
(cherry picked from commit 36f1e3572c
2026-01-30 14:00:29 +00:00
Mihir Kandoi
0e60750bd8
fix: validate over ordering of quotation
...
(cherry picked from commit 4cc306d2d8
2026-01-30 14:00:28 +00:00
mergify[bot]
ad8c8cb0e8
Merge pull request #52140 from frappe/mergify/bp/version-15-hotfix/pr-52007
...
Fix: Set Zero Rate for Standalone Credit Note with Expired Batch (backport #52007 )
2026-01-29 14:30:22 +05:30
Shankarv19bcr
853facad96
fix: strip whitespace in customer_name
...
(cherry picked from commit e5ba0e6401
2026-01-26 09:46:51 +00:00
mergify[bot]
f7770c3225
Merge pull request #51979 from frappe/mergify/bp/version-15-hotfix/pr-51966
...
fix(customer): add customer group filters (backport #51966 )
2026-01-22 05:16:45 +00:00
Mihir Kandoi
091272409e
Merge pull request #51674 from aerele/v15-sales-analytics-curve-filter
2026-01-20 13:26:31 +05:30
ravibharathi656
c2995f6800
fix(sales analytics): add curve filter
2026-01-20 13:01:59 +05:30
Sudharsanan11
4418fb48a9
fix(manufacturing): consider process loss qty while validating the work order
...
(cherry picked from commit e6366e830c
2026-01-19 16:18:35 +00:00
ravibharathi656
75b4a0a89c
fix(pos): reapply set warehouse during cart update
...
(cherry picked from commit 5a53c45321
2026-01-19 10:07:47 +00:00
mergify[bot]
d83365734e
Merge pull request #51624 from frappe/mergify/bp/version-15-hotfix/pr-50869
...
fix: do cancellation procedures on WO close (backport #50869 )
2026-01-09 09:48:28 +00:00
Nabin Hait
1c40a61d23
fix: validate party's existing transaction currency before merging
...
(cherry picked from commit f48b90c600
2025-12-30 04:52:39 +00:00
ravibharathi656
5d5dff9103
fix: prevent dispatch address copying on drop ship
2025-12-16 13:10:38 +05:30
