Parameshwari Palanisamy
|
ef6fd7dcb5
|
Update production_plan.py
(cherry picked from commit 39e68a9ce7)
|
2026-03-11 08:49:06 +00:00 |
|
creative-paramu
|
e3e9d7b19e
|
fix: update item description in Production Plan Assembly Items table
(cherry picked from commit 19533551f4)
|
2026-03-11 08:49:06 +00:00 |
|
NaviN
|
a4aaf67b2b
|
Merge pull request #52964 from ljain112/fix-tds-party
fix(tds-report): correct party type filtering and refactor
|
2026-03-11 11:41:44 +05:30 |
|
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 |
|
NaviN
|
8c7100df04
|
Merge pull request #53279 from frappe/mergify/bp/version-15-hotfix/pr-53203
fix: update user status depends on employee status (backport #53203)
|
2026-03-10 22:41:20 +05:30 |
|
Navin-S-R
|
55a0603356
|
chore: resolve conflict
|
2026-03-10 17:58:57 +05:30 |
|
ruthra kumar
|
abe433cfa7
|
Merge pull request #53296 from frappe/mergify/bp/version-15-hotfix/pr-53071
fix(gross-profit): apply precision-based rounding to grouped totals (backport #53071)
|
2026-03-10 16:55:44 +05:30 |
|
Khushi Rawat
|
49648b5c6e
|
Merge pull request #53258 from ljain112/backport-50804
fix: correct logic for repair cost in asset repair
|
2026-03-10 16:46:53 +05:30 |
|
Navin-S-R
|
b59dc173b8
|
fix(gross-profit): apply precision-based rounding to grouped totals
(cherry picked from commit 52dd7665e7)
|
2026-03-10 11:08:07 +00:00 |
|
rohitwaghchaure
|
7454db2b3e
|
Merge pull request #53288 from frappe/mergify/bp/version-15-hotfix/pr-53283
fix: removed non existent patch (backport #53283)
|
2026-03-10 14:48:11 +05:30 |
|
mergify[bot]
|
fcfadf9dea
|
Merge pull request #53286 from frappe/mergify/bp/version-15-hotfix/pr-53282
fix: allow user to make QI after submission not working (backport #53282)
|
2026-03-10 09:12:20 +00:00 |
|
rohitwaghchaure
|
098f6fd0d2
|
Merge pull request #53284 from frappe/mergify/bp/version-15-hotfix/pr-53281
fix: better validation message for Purchase Invoice with Update Stock (backport #53281)
|
2026-03-10 14:29:44 +05:30 |
|
Rohit Waghchaure
|
fd8fac7d40
|
fix: removed non existent patch
(cherry picked from commit c4b3080eae)
|
2026-03-10 08:56:16 +00:00 |
|
Rohit Waghchaure
|
b7fd9aea6a
|
fix: better validation message for Purchase Invoice with Update Stock
(cherry picked from commit cfb06cf247)
|
2026-03-10 08:33:50 +00:00 |
|
Poovitha Palanivelu
|
c5796fed4a
|
fix: update user status depends on employee status
(cherry picked from commit 194d060f13)
# Conflicts:
# erpnext/setup/doctype/employee/employee.py
|
2026-03-10 07:39:56 +00:00 |
|
Mihir Kandoi
|
2b25059315
|
Merge pull request #53276 from frappe/mergify/bp/version-15-hotfix/pr-53235
fix: update item row delivery dates when header delivery date changes in sales order (backport #53235)
|
2026-03-10 13:09:31 +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 |
|
ruthra kumar
|
ee22347d64
|
Merge pull request #53243 from frappe/mergify/bp/version-15-hotfix/pr-53239
fix: validation for cancellation (backport #53239)
|
2026-03-10 12:23:14 +05:30 |
|
ruthra kumar
|
4d418d40db
|
Merge pull request #52995 from frappe/mergify/bp/version-15-hotfix/pr-52630
fix(account): compute tax net_amount in JS controller (backport #52630)
|
2026-03-09 20:26:44 +05:30 |
|
ljain112
|
a6dd07802a
|
fix: enforce permission check for purchase invoice and update test to use service expense account
|
2026-03-09 19:53:57 +05:30 |
|
ljain112
|
94972da845
|
fix: correct function syntax in TDS Computation Report
|
2026-03-09 19:25:38 +05:30 |
|
ljain112
|
c2e67599f5
|
fix: refactor GL entry mapping to include voucher type
|
2026-03-09 19:14:21 +05:30 |
|
ljain112
|
bcc542b1f9
|
fix(test): include warehouse parameter in asset repair test case
|
2026-03-09 19:11:02 +05:30 |
|
ljain112
|
ed428ceb1c
|
fix(test): ensure warehouse is consistently referenced in asset repair tests
|
2026-03-09 18:54:43 +05:30 |
|
ljain112
|
93ebec90ef
|
fix: enhance sorting and optimize GL entry retrieval
|
2026-03-09 18:50:42 +05:30 |
|
ljain112
|
0b1746a4c8
|
fix: set default repair cost to 0 if no value is returned
|
2026-03-09 18:34:46 +05:30 |
|
ljain112
|
c71557f432
|
fix: correct logic for repair cost in asset repair
|
2026-03-09 18:03:59 +05:30 |
|
Rohit Waghchaure
|
c142a2be9c
|
fix: validation for cancellation
(cherry picked from commit 8de272a8a1)
|
2026-03-09 07:49:22 +00:00 |
|
Mihir Kandoi
|
3c77653508
|
Merge pull request #53240 from frappe/mergify/bp/version-15-hotfix/pr-53234
fix(manufacturing): show returned qty in progress bar (backport #53234)
|
2026-03-09 12:42:04 +05:30 |
|
Sudharsanan11
|
c572a019b4
|
feat(manufacturing): show disassembled qty in progress bar
(cherry picked from commit ae9ff767fa)
|
2026-03-09 07:04:32 +00:00 |
|
Sudharsanan11
|
260d87a80c
|
fix(manufacturing): show returned qty in progress bar
(cherry picked from commit 8027f5aafd)
|
2026-03-09 07:04:31 +00:00 |
|
ruthra kumar
|
e0f5ae2d4c
|
Merge pull request #53228 from frappe/mergify/bp/version-15-hotfix/pr-53227
refactor: party type and party filter for comparison report (backport #53227)
|
2026-03-08 05:49:51 +05:30 |
|
ruthra kumar
|
37e750e877
|
refactor: party type and party filter for comparison report
(cherry picked from commit b6f9c0844e)
|
2026-03-07 12:49:44 +00:00 |
|
Jatin3128
|
3148816451
|
fix: correct payment terms fetching and recalculation logic
|
2026-03-06 15:08:35 +05:30 |
|
rohitwaghchaure
|
5764f5ec80
|
Merge pull request #53207 from frappe/mergify/bp/version-15-hotfix/pr-53200
fix: stock balance report qty (backport #53200)
|
2026-03-06 13:08:11 +05:30 |
|
mergify[bot]
|
e9ae156323
|
refactor: use postprocess in mapped_doc to update items in subcontracting controller (backport #52724) (#52936)
* refactor: use postprocess in mapped_doc to update items in subcontracting controller
(cherry picked from commit 1d3d09f48c)
# Conflicts:
# erpnext/controllers/subcontracting_controller.py
* chore: resolve conflicts
* chore: resolve conflicts
---------
Co-authored-by: ljain112 <ljain112@gmail.com>
|
2026-03-06 12:59:15 +05:30 |
|
rohitwaghchaure
|
54fdce648e
|
chore: fix conflicts
|
2026-03-06 12:47:18 +05:30 |
|
Rohit Waghchaure
|
180e232eb0
|
fix: stock balance report qty
(cherry picked from commit a15e5fdc4e)
# Conflicts:
# erpnext/stock/report/stock_balance/stock_balance.py
|
2026-03-06 07:15:30 +00:00 |
|
mergify[bot]
|
ba4a99b22c
|
fix(help): escape query (backport #53192) (#53194)
fix(help): escape query (#53192)
(cherry picked from commit 702adda000)
Signed-off-by: Akhil Narang <me@akhilnarang.dev>
Co-authored-by: Akhil Narang <me@akhilnarang.dev>
|
2026-03-05 18:40:49 +05:30 |
|
Mihir Kandoi
|
9100428f1b
|
Merge pull request #53176 from frappe/resolve/version-15-hotfix/pr-53084
|
2026-03-05 17:36:47 +05:30 |
|
rohitwaghchaure
|
1950e82d1e
|
Merge pull request #53180 from frappe/mergify/bp/version-15-hotfix/pr-52745
fix: balance qty for inv dimension (backport #52745)
|
2026-03-05 14:27:27 +05:30 |
|
Rohit Waghchaure
|
6898d70382
|
fix: balance qty for inv dimension
(cherry picked from commit a3eafe5b18)
|
2026-03-05 08:20:02 +00:00 |
|
Sudharsanan11
|
624d1d4759
|
fix(manufacturing): ignore sales order validation for subassembly item
(cherry picked from commit 6b1aac4aee)
|
2026-03-05 12:50:27 +05:30 |
|
Mihir Kandoi
|
bf6b5b7b7f
|
Merge pull request #53164 from frappe/mergify/bp/version-15-hotfix/pr-53157
fix: disallow all actions on job card if work order is closed (backport #53157)
|
2026-03-04 17:09:17 +05:30 |
|
Khushi Rawat
|
24d9e2c5a9
|
Merge pull request #53162 from frappe/mergify/bp/version-15-hotfix/pr-53154
fix: skip asset sale processing for internal transfer invoices (backport #53154)
|
2026-03-04 17:00:56 +05:30 |
|
Mihir Kandoi
|
7b2e4832aa
|
fix: disallow all actions on job card if work order is closed
(cherry picked from commit ee19c32c3a)
|
2026-03-04 11:21:34 +00:00 |
|
khushi8112
|
a7e8f31f56
|
fix: skip asset sale processing for internal transfer invoices
(cherry picked from commit 9cb3dad079)
|
2026-03-04 11:07:05 +00:00 |
|
Nishka Gosalia
|
d5a250a254
|
Merge pull request #53158 from frappe/mergify/bp/version-15-hotfix/pr-53156
fix: updating costing based on employee change in timesheet (backport #53156)
|
2026-03-04 16:35:06 +05:30 |
|
Nishka Gosalia
|
be598108b6
|
fix: updating costing based on employee change in timesheet
(cherry picked from commit e37d4a6f7c)
|
2026-03-04 10:42:50 +00:00 |
|