mergify[bot]
2f5b93e308
fix(cheque_print_template): print format creation from cheque print template requires system manager (backport #55708 ) ( #55711 )
...
Co-authored-by: Diptanil Saha <diptanil@frappe.io >
fix(cheque_print_template): print format creation from cheque print template requires system manager (#55708 )
2026-06-09 13:01:40 +05:30
mergify[bot]
7852ea65af
fix: update items respects workflow "Only Allow Edit For" role (backport #55667 ) ( #55705 )
...
* fix: update items respects workflow "Only Allow Edit For" role (#55667 )
(cherry picked from commit 76b9b6a34e64089478+kaulith@users.noreply.github.com >
Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com >
2026-06-08 06:59:05 +00:00
khushi8112
bde46cffd0
fix: correct field order in Address and Contacts report
2026-06-05 15:33:39 +05:30
khushi8112
08f3cf98f9
fix: correct field order in Address and Contacts report
2026-06-05 15:31:43 +05:30
mergify[bot]
013bd1a566
fix: duplicating a Customer/Supplier shouldn't inherit the source's primary contact and address (backport #55421 ) ( #55608 )
...
Co-authored-by: Nabin Hait <nabinhait@gmail.com >
Co-authored-by: Antoine Maas <antoine.maas@okte.io >
Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com >
fix: duplicating a Customer/Supplier shouldn't inherit the source's primary contact and address (#55421 )
2026-06-03 16:04:25 +00:00
mergify[bot]
e8267e3237
fix(selling): consider delivered qty (backport #55597 ) ( #55606 )
...
Co-authored-by: Pandiyan P <pandiyanpalani37@gmail.com >
fix(selling): consider delivered qty (#55597 )
2026-06-03 15:37:00 +00:00
Khushi Rawat
35b4ada3e2
Merge pull request #55358 from frappe/mergify/bp/version-15-hotfix/pr-55137
...
fix: use get_query instead of get_all for data fetching (backport #55137 )
2026-06-02 13:19:11 +05:30
khushi8112
ad511b80c0
fix: replace get_query with get_list for permission-aware queries in v15
2026-06-02 12:17:37 +05:30
Diptanil Saha
689a3f50ae
fix(pos): escape html output in pos page templates (backport #55527 ) ( #55528 )
...
Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com >
2026-06-02 00:42:59 +05:30
Diptanil Saha
96bd97dd6d
fix(pos): escape item data on pos item selector (backport #55503 ) ( #55523 )
2026-06-01 22:17:44 +05:30
mergify[bot]
03532624b8
fix(pos): preserve contacts and enforce permissions in set_customer_info (backport #55463 ) ( #55465 )
...
Co-authored-by: Diptanil Saha <diptanil@frappe.io >
fix(pos): preserve contacts and enforce permissions in set_customer_info (#55463 )
2026-06-01 05:18:34 +05:30
mergify[bot]
a2d924c48f
fix(quotation): made customer contact column visible (backport #55433 ) ( #55434 )
...
* fix(quotation): made customer contact column visible (#55433 )
(cherry picked from commit 9758eb868ddiptanil@frappe.io >
2026-05-30 14:20:40 +00:00
khushi8112
264433b23d
fix: use get_query instead of get_all for data fetching
...
(cherry picked from commit 1fd99337b3
2026-05-27 19:17:02 +00:00
mergify[bot]
04e28f9556
fix: incorrect error message string in sales order (backport #55090 ) ( #55094 )
...
Co-authored-by: Shllokkk <140623894+Shllokkk@users.noreply.github.com >
fix: incorrect error message string in sales order (#55090 )
2026-05-20 09:31:21 +00:00
sudarsan2001
603700aa0e
fix: correct payment request function call in si and so
2026-05-12 13:47:32 +05:30
mergify[bot]
910fe9ef55
fix: validate variant values (backport #54831 ) ( #54838 )
...
fix: validate variant values (#54831 )
(cherry picked from commit 95705f18aakandoimihir@gmail.com >
2026-05-11 21:23:24 +05:30
mergify[bot]
9c9ecc77f8
fix: hide payment and payment request buttons based on permissions in invoices and orders (backport #53920 ) ( #54735 )
...
Co-authored-by: ravibharathi656 <ravibharathi656@gmail.com >
Co-authored-by: Sakthivel Murugan S <129778327+ssakthivelmurugan@users.noreply.github.com >
Co-authored-by: diptanilsaha <diptanil@frappe.io >
fix: hide payment and payment request buttons based on permissions in invoices and orders (#53920 )
2026-05-05 12:25:18 +05:30
mergify[bot]
809feb9c04
fix: error when creating quotation from CRM (backport #54722 ) ( #54724 )
...
fix: error when creating quotation from CRM (#54722 )
(cherry picked from commit 2d3190effbkandoimihir@gmail.com >
2026-05-04 21:30:02 +05:30
mergify[bot]
d07d7feb3f
refactor: Sales Partner Commission Summary and Sales Partner Transaction Summary report (backport #54268 ) ( #54430 )
...
Co-authored-by: diptanilsaha <diptanil@frappe.io >
2026-05-04 11:22:32 +05:30
mergify[bot]
29282a80cf
feat: copy terms attachments to transactions (backport #53403 ) ( #54660 )
...
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com >
2026-05-01 13:04:07 +00:00
mergify[bot]
d64b19416e
fix(selling): blanket order ordered qty recalculation on sales order status change (backport #54593 ) ( #54622 )
...
fix(selling): blanket order ordered qty recalculation on sales order status change (#54593 )
(cherry picked from commit d68801e73apandiyanpalani37@gmail.com >
2026-04-29 06:45:18 +00:00
mergify[bot]
698b087997
fix: copy project from first row to new rows (backport #53295 ) ( #54619 )
...
fix: copy project to new item row from parent
(cherry picked from commit 68cc518497ravibharathi656@gmail.com >
2026-04-29 11:55:36 +05:30
mergify[bot]
44af175556
refactor(sms_center): replaced raw SQL queries with Query Builder (backport #54600 ) ( #54602 )
...
Co-authored-by: diptanilsaha <diptanil@frappe.io >
2026-04-28 15:31:58 +00:00
mergify[bot]
1a8dc7e332
fix: update status of quotation in patch (backport #54577 ) ( #54579 )
...
fix: update status of quotation in patch (#54577 )
(cherry picked from commit 2088a01c19kandoimihir@gmail.com >
2026-04-28 15:13:16 +05:30
mergify[bot]
1ccbc9f621
fix: changed qty validation from qty field to stock_qty (backport #54352 ) ( #54356 )
...
fix: changed qty validation from qty field to stock_qty (#54352 )
(cherry picked from commit ba01d66c24140256508+Jatin3128@users.noreply.github.com >
2026-04-20 10:53:44 +05:30
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
