ravibharathi656
76a19076bf
fix(payment entry): round unallocated amount
...
(cherry picked from commit b0d6751777
2026-02-26 07:38:07 +00:00
ljain112
7278166b2c
fix: ensure cache is cleared on fiscal year update and trash
...
(cherry picked from commit 39b0e3522a
2026-02-25 14:35:48 +00:00
mergify[bot]
9657c6431d
Merge pull request #52932 from frappe/mergify/bp/version-15-hotfix/pr-52824
...
refactor: separate construction of chart related data from `get_columns()` (backport #52824 )
2026-02-25 15:11:46 +05:30
Mihir Kandoi
b37fc6676e
chore: clearer description for internal transfer at arms length
...
(cherry picked from commit bd9e5e97d7
2026-02-25 04:43:07 +00:00
ljain112
61ac18069b
fix: prevent precision errors in discount distribution with inclusive tax
...
(cherry picked from commit 2068299766
2026-02-24 11:28:44 +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
ravibharathi656
09ba9808de
fix: skip empty dimension values in exchange gain loss
...
(cherry picked from commit 7df9d951c6
2026-02-23 15:36:29 +00:00
Imesha Sudasingha
71248ff40b
Merge pull request #52544 from one-highflyer/fix/improve-reserved-serial-no-error-message
...
fix(stock): improve error message when serial no is reserved via SRE
2026-02-23 15:12:08 +00:00
Diptanil Saha
bfe0443530
Merge pull request #52899 from frappe/mergify/bp/version-15-hotfix/pr-50301
2026-02-23 20:38:49 +05:30
mergify[bot]
eda4462e5f
Merge pull request #52722 from frappe/mergify/bp/version-15-hotfix/pr-52720
...
fix: wrong display_depends_on condition for item group and brand chil… (backport #52720 )
2026-02-23 15:04:41 +00:00
diptanilsaha
0ba965aae6
fix: restore missing has_permission import
2026-02-23 20:07:27 +05:30
mergify[bot]
07eb5c714a
Merge pull request #52897 from frappe/mergify/bp/version-15-hotfix/pr-52878
...
fix: standalone sales invoice return should not fallback to item mast… (backport #52878 )
2026-02-23 13:54:53 +00:00
Mihir Kandoi
245bc7d2fb
Merge pull request #52886 from frappe/mergify/bp/version-15-hotfix/pr-52840
...
fix(manufacturing): remove delete query of job card & batch and serial no (backport #52840 )
2026-02-23 19:16:45 +05:30
Abdeali Chharchhoda
773e56808a
refactor: method to get employee contact without permission check
...
(cherry picked from commit 58cdb9503b
2026-02-23 13:33:39 +00:00
Abdeali Chharchhoda
cb17dbd616
refactor: use common method to get employee contacts
...
(cherry picked from commit ec1eb6d222
2026-02-23 13:33:39 +00:00
Abdeali Chharchhoda
943e2c00bc
fix: get employee email with priority if preferred is not set
...
(cherry picked from commit 7b89c12470
2026-02-23 13:33:39 +00:00
Abdeali Chharchhoda
0866c03e20
refactor: add validation for missing employee parameter
...
(cherry picked from commit b8e06b9636
2026-02-23 13:33:38 +00:00
Abdeali Chharchhoda
4078e252c2
refactor: fetch employee contact details in realtime
...
(cherry picked from commit 2ea6508fa5
2026-02-23 13:33:38 +00:00
Abdeali Chharchhoda
caa03efbe1
feat: retrieve employee contact details
...
(cherry picked from commit a41297d841
2026-02-23 13:33:37 +00:00
Abdeali Chharchhoda
4b2ac626c5
feat: retrieve employee basic contact information
...
(cherry picked from commit 4ad1474e32
2026-02-23 13:33:37 +00:00
Abdeali Chharchhoda
ae733cd7ad
chore: Removing unused import
...
(cherry picked from commit 87c59f471c
2026-02-23 13:33:37 +00:00
ervishnucs
6b286ae03d
fix: check gl account of an associated bank account in bank transaction
...
(cherry picked from commit 8fe0bf4ba3
2026-02-23 12:36:25 +00:00
Sudharsanan Ashok
e30b2f1d04
fix(manufacturing): remove delete query of job card & batch and serial no ( #52840 )
...
* fix(manufacturing): remove delete query of batch and serial no
* fix(manufacturing): remove delete query of job card
* fix: remove delete function call for work order
(cherry picked from commit 8b2a971019
2026-02-23 11:29:18 +00:00
Mihir Kandoi
d59d30c50a
Merge pull request #52882 from frappe/mergify/bp/version-15-hotfix/pr-52880
...
fix(work_order): update returned qty on work order (backport #52880 )
2026-02-23 15:48:35 +05:30
mergify[bot]
946c3554b1
fix: avoid duplicate taxes and charges rows in payment entry (backport #52178 ) ( #52318 )
...
Co-authored-by: Dharanidharan S <dharanidharans1328@gmail.com >
fix: avoid duplicate taxes and charges rows in payment entry (#52178 )
2026-02-23 10:15:00 +00:00
Pandiyan37
bb1a655efb
fix(work_order): update returned qty
...
(cherry picked from commit b7f45e6963
2026-02-23 10:03:53 +00:00
mergify[bot]
dada7c4aa8
Merge pull request #52873 from frappe/mergify/bp/version-15-hotfix/pr-52871
...
fix: use stock qty instead of qty when updating transferred qty in WO (backport #52871 )
2026-02-23 09:43:11 +00:00
Sudharsanan11
76760c2ee3
test(manufacturing): add test to validate the planned qty
...
(cherry picked from commit cfbdfcf515
2026-02-23 02:01:23 +00:00
Sudharsanan11
b3bcfd5a64
fix(manufacturing): update status for work order before calculating planned qty
...
(cherry picked from commit 4d40c84a31
2026-02-23 02:01:22 +00:00
diptanilsaha
82bcb62b21
fix: update_stock behaviour on selling invoices
2026-02-22 04:20:31 +05:30
mergify[bot]
7032197f97
feat(Journal Entry Account): add Bank Transaction as Reference Type (backport #52760 ) ( #52815 )
...
* feat: add Bank Transaction as Reference Type to Journal Entry Account (#52760 )
* feat: add Bank Transaction as Reference Type to Journal Entry Account
* fix: take care of existing property setters
* fix: cancelling Bank Transactions should still be possible
* fix: handle blank options in patch
* fix: hide Reference Due Date for Bank Transaction
(cherry picked from commit 387fb1b20214891507+barredterra@users.noreply.github.com >
2026-02-21 15:43:26 +01:00
diptanilsaha
bb8e5adadc
chore: resolve conflicts
2026-02-21 16:36:58 +05:30
diptanilsaha
397f39e271
fix(fiscal_year): Fiscal Year auto-generation and notification
...
(cherry picked from commit 4c76786ce4
2026-02-21 07:41:21 +00:00
diptanilsaha
2fffc9448b
fix(fiscal_year_company): made company field mandatory
...
(cherry picked from commit 94fb7e11b4
2026-02-21 07:41:21 +00:00
diptanilsaha
5a1c61f4d9
refactor: Fiscal Year DocType cleanup
...
(cherry picked from commit 74ac28fc70
2026-02-21 07:41:20 +00:00
Mihir Kandoi
dcf4ac66bb
fix: remove supplier invoice date/posting date validation
...
(cherry picked from commit 7cff0ba626
2026-02-21 06:55:08 +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
Mihir Kandoi
5eb4baccd6
Merge pull request #52826 from frappe/mergify/bp/version-15-hotfix/pr-52821
...
fix: sensible insufficient stock message in pick list (backport #52821 )
2026-02-20 14:39:00 +05:30
Mihir Kandoi
97a4a5f1cc
fix: update items fetches wrong item code
...
(cherry picked from commit ba96d37c11
2026-02-20 08:54:14 +00:00
Mihir Kandoi
3bafa360b2
fix: sensible insufficient stock message in pick list
...
(cherry picked from commit 1352dc79bb
2026-02-20 08:53:36 +00:00
Mihir Kandoi
de571c9266
Merge pull request #52817 from mihir-kandoi/gh52069
...
feat: update item button addition for quotation (backport #50976 )
2026-02-19 23:30:52 +05:30
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
38939005ca
fix: typo
...
(cherry picked from commit 732c98b72f
2026-02-19 17:28:31 +00:00
Mihir Kandoi
bce77b6117
fix: ignore permissions instead of saving parent
...
(cherry picked from commit 6342e9a3e2
2026-02-19 17:28:31 +00:00
Nishka Gosalia
5a3c027432
fix: permission issue for quotation item during update item
...
(cherry picked from commit 58b8af0fa8
2026-02-19 17:28:30 +00:00
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
Marc Ramser
fd48fb49b9
fix(Purchase Receipt): copy project from first row when adding items
...
Adds `items_add` method to copy expense_account, cost_center and project from first row to newly added items, matching Purchase Invoice behavior.
(cherry picked from commit 21423676c9
2026-02-19 08:31:59 +00:00
Mihir Kandoi
a57a9d7548
Merge pull request #52795 from frappe/mergify/bp/version-15-hotfix/pr-52794
...
fix: reservation based on field should be read only in SRE (backport #52794 )
2026-02-19 12:56:57 +05:30
