nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-07 07:20:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
54,683 Commits 460 Branches 1,746 Tags
c6e7cf13b5bfa616c2bcbd5d13f5f46d838411f7
Commit Graph

54683 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ruthra kumar
c6e7cf13b5 Merge pull request #53293 from frappe/version-15-hotfix 
chore: release v15
 2026-03-10 20:16:23 +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
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
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
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
Frappe PR Bot
1ee03f41f2 chore(release): Bumped to Version 15.100.2 
## [15.100.2](https://github.com/frappe/erpnext/compare/v15.100.1...v15.100.2) (2026-03-06)

### Bug Fixes

* stock balance report qty ([9b49a27](9b49a27af6))
v15.100.2 		2026-03-06 08:35:24 +00:00
rohitwaghchaure
c2f2331d49 Merge pull request #53209 from frappe/mergify/bp/version-15/pr-53207 
fix: stock balance report qty (backport #53200) (backport #53207)
 2026-03-06 14:04:01 +05:30
rohitwaghchaure
5af5de3315 chore: fix conflicts 
(cherry picked from commit 54fdce648e)
 2026-03-06 07:38:33 +00:00
Rohit Waghchaure
9b49a27af6 fix: stock balance report qty 
(cherry picked from commit a15e5fdc4e)

# Conflicts:
#	erpnext/stock/report/stock_balance/stock_balance.py
(cherry picked from commit 180e232eb0)
 2026-03-06 07:38:32 +00:00
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
Frappe PR Bot
bcc52090c9 chore(release): Bumped to Version 15.100.1 
## [15.100.1](https://github.com/frappe/erpnext/compare/v15.100.0...v15.100.1) (2026-03-05)

### Bug Fixes

* balance qty for inv dimension ([68c79a4](68c79a4a79))
v15.100.1 		2026-03-05 09:43:52 +00:00
rohitwaghchaure
2ca9b75aa6 Merge pull request #53183 from frappe/mergify/bp/version-15/pr-53180 
fix: balance qty for inv dimension (backport #52745) (backport #53180)
 2026-03-05 14:59:14 +05:30
Rohit Waghchaure
68c79a4a79 fix: balance qty for inv dimension 
(cherry picked from commit a3eafe5b18)
(cherry picked from commit 6898d70382)
 2026-03-05 08:58:30 +00:00
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
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
Frappe PR Bot
2574c4c18c chore(release): Bumped to Version 15.100.0 
# [15.100.0](https://github.com/frappe/erpnext/compare/v15.99.1...v15.100.0) (2026-03-03)

### Bug Fixes

* **accounts receivable:** include invoice payment terms template (backport [#51940](https://github.com/frappe/erpnext/issues/51940)) ([#53105](https://github.com/frappe/erpnext/issues/53105)) ([f5f40db](f5f40dbcc3))
* allow allowed roles to bypass over billing validation ([8e59fe9](8e59fe90cc))
* correct sle voucher_type comparison in get_ref_doctype ([a587b6a](a587b6a57c))
* ensure cache is cleared on fiscal year update and trash ([7278166](7278166b2c))
* ensure contacts are processed only if present in create_prospect_against_crm_deal ([e2b6179](e2b6179b17))
* handle html email template separately in RFQ to avoid jinja context error ([90169a3](90169a39bb))
* item description html validation error ([3c6a120](3c6a120c5c))
* old stock reco entries causing issue in the stock balance report ([b712467](b712467049))
* opening qty in stock balance ([470a9b3](470a9b38b1))
* **payment entry:** round unallocated amount ([76a1907](76a19076bf))
* populate mr owner and set po owner as fallback ([c1f2991](c1f2991694))
* **pricing_rule:** strict validation of `transaction_type` ([5f82db2](5f82db200e))
* resolve conflicts ([6846f02](6846f02cea))
* **selling:** handle selling price validation for FG item ([d5cc51b](d5cc51b426))
* serial no status for Disassemble entry ([8ce541b](8ce541bf46))
* set company based expense account ([74e71f3](74e71f3868))
* **stock:** validate company for receipt documents and expense accounts ([4462088](44620884c1))
* **trial-balance:** totals with filter  `show_group_accounts` enabled ([eabaef2](eabaef2f0b))
* use conversion factor when creating stock entry from pick list ([f2e1482](f2e1482f63))
* use stock qty instead of qty when creating stock entry from MR ([2984f79](2984f79a69))
* use the correct precision value in stock reco ([6d726e4](6d726e4b64))
* validate warehouse of SABB for draft entry ([d5e2515](d5e25153f8))
* Variant Items, List View Enabled to Variant Status Change ([#38468](https://github.com/frappe/erpnext/issues/38468)) ([25b1690](25b169059d))
* voucher detail no in SABB ([6e5738e](6e5738e95c))

### Features

* UOM query filter for opportunity items ([f6a05ec](f6a05ec85e))

### Performance Improvements

* add index on reference_purchase_receipt column ([0766c0e](0766c0ea43))
v15.100.0 		2026-03-03 17:57:48 +00:00
diptanilsaha
bc9f3a38ce Merge pull request #53142 from frappe/version-15-hotfix 2026-03-03 23:26:05 +05:30