nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-13 10:11:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
54,753 Commits 469 Branches 1,748 Tags
5a3bc27e2cc9948a1bf39aec7be949bea5114da7
Commit Graph

54753 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
rohitwaghchaure
e511503597 Merge pull request #52700 from rohitwaghchaure/fixed-negative-stock-validation-sle-v15 
fix: consider sle for negative stock validation
 2026-02-16 23:56:18 +05:30
Rohit Waghchaure
ca79f6478a fix: consider sle for negative stock validation 2026-02-16 23:29:59 +05:30
rohitwaghchaure
9ece276e76 Merge pull request #52695 from frappe/mergify/bp/version-15-hotfix/pr-52691 
fix: cancel SABB if SLE cancelled from LCV (backport #52691)
 2026-02-16 21:52:48 +05:30
mergify[bot]
4fe968961a fix(pos_invoice): add correct depends on condition (backport #52689) (#52693) 
* fix(pos_invoice): add correct depends on condition (#52689)

* fix(pos_invoice): add correct depends on condition

* fix: show field in sales order

* refactor: eval condition

(cherry picked from commit 219cf6bc57)

# Conflicts:
#	erpnext/accounts/doctype/sales_invoice_payment/sales_invoice_payment.json

* chore: resolve conflict

---------

Co-authored-by: Soham Kulkarni <77533095+sokumon@users.noreply.github.com>
Co-authored-by: Diptanil Saha <diptanil@frappe.io>
 2026-02-16 16:01:23 +00:00
Rohit Waghchaure
f2a77d178d fix: cancel SABB if SLE cancelled from LCV 
(cherry picked from commit f23a49a25e)
 2026-02-16 15:42:04 +00:00
rohitwaghchaure
dbbba7262b Merge pull request #52683 from frappe/mergify/bp/version-15-hotfix/pr-52681 
fix: better validation for negative batch (backport #52681)
 2026-02-16 16:03:59 +05:30
Rohit Waghchaure
85d18fa7a4 fix: better validation for negative batch 
(cherry picked from commit a8636e4f59)
 2026-02-16 09:46:46 +00:00
Mihir Kandoi
11a6c5b394 Merge pull request #52671 from frappe/mergify/bp/version-15-hotfix/pr-52670 2026-02-15 14:30:17 +05:30
Mihir Kandoi
e12871b408 fix: total weight does not update when updating items 
(cherry picked from commit 63323a2611)
 2026-02-15 08:45:04 +00:00
ruthra kumar
a75c2cb4a0 Merge pull request #52645 from frappe/mergify/bp/version-15-hotfix/pr-52644 
refactor: use query builder for profitability analysis (backport #52644)
 2026-02-12 14:39:35 +05:30
ruthra kumar
c18ed0862e refactor: use query builder for profitability analysis 
(cherry picked from commit 5e34325604)
 2026-02-12 08:54:48 +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
55448b7437 Merge pull request #50911 from Dharanidharan2813/fix/list-index-bp-50860 
fix: Payment Terms auto-fetched in Sales Invoice Without enabling the (automatically_fetch_payment_terms) in Account settings  (backport #50149)
 2026-02-12 12:51:08 +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
ruthra kumar
0a1b532f69 Merge pull request #52637 from frappe/mergify/bp/version-15-hotfix/pr-52619 
feat: show formatted currency symbol on ledger preview (backport #52619)
 2026-02-12 11:46:37 +05:30
Navin-S-R
383648fb59 feat: show formatted currency symbol on ledger preview 
(cherry picked from commit 5c8cb1e7ec)
 2026-02-12 05:58:43 +00:00
Dharanidharan S
13239a9dee fix(accounts-controller): handle empty items list 2026-02-12 11:18:44 +05:30
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)

# Conflicts:
#	erpnext/selling/doctype/sales_order/test_sales_order.py
 2026-02-12 11:18:44 +05:30
ruthra kumar
eedb93b2d6 Merge pull request #52100 from frappe/mergify/bp/version-15-hotfix/pr-51739 
fix(accounts): correct base grand total and rounded total mismatch (backport #51739)
 2026-02-12 11:13:27 +05:30
Diptanil Saha
ea3042bc74 Merge pull request #52614 from frappe/mergify/bp/version-15-hotfix/pr-51155 
fix: allow rename for market segment doctype (backport #51155)
 2026-02-11 14:56:34 +05:30
diptanilsaha
b977366dcd chore: resolve conflict 2026-02-11 14:41:01 +05:30
diptanilsaha
0a4198718b fix: allow rename for market segment doctype 
(cherry picked from commit f3142c4af6)

# Conflicts:
#	erpnext/crm/doctype/market_segment/market_segment.json
 2026-02-11 08:59:24 +00:00
Frappe PR Bot
b340d7c6bb chore(release): Bumped to Version 15.97.0 
# [15.97.0](https://github.com/frappe/erpnext/compare/v15.96.1...v15.97.0) (2026-02-11)

### Bug Fixes

* Added a missing option to the currency field (backport [#52528](https://github.com/frappe/erpnext/issues/52528)) ([#52586](https://github.com/frappe/erpnext/issues/52586)) ([a6f5b88](a6f5b88f9b))
* **buying:** add supplier group link filters in field level ([436cb8d](436cb8dbfc))
* email campaign timeout issue (backport [#51994](https://github.com/frappe/erpnext/issues/51994)) ([#52555](https://github.com/frappe/erpnext/issues/52555)) ([6c9681b](6c9681ba4c))
* enabling skip delivery option for order type maintenance ([a8f05ca](a8f05cadea))
* **gross profit report:** translate column Sales Invoice ([4e910d8](4e910d8a69))
* **gross-profit:** handle item group filters ([7cd9de2](7cd9de211f))
* **gross-profit:** handle returns outside sale period ([303dac2](303dac262c))
* handle gross profit and percentage for return invoices ([bde19ab](bde19ab010))
* **manufacturing:** fix chart period keys ([99f3a7e](99f3a7e4cf))
* **manufacturing:** handle None value for actual_end_date ([f965b35](f965b352c8))
* **map_current_doc:** prevent mutation of query args in get_query (backport [#52202](https://github.com/frappe/erpnext/issues/52202)) ([#52583](https://github.com/frappe/erpnext/issues/52583)) ([9519773](9519773c5c))
* merge taxes in purchase receipt when get items from multiple purchase invoices ([#51422](https://github.com/frappe/erpnext/issues/51422)) ([68338ab](68338abe07))
* **quotation:** ignore zero ordered_qty ([ad92c02](ad92c021f7))
* rate comparison in stock reco ([cacca81](cacca812ed))
* remove incorrect validation from email digest throwing spurious error (backport [#51827](https://github.com/frappe/erpnext/issues/51827)) ([#52582](https://github.com/frappe/erpnext/issues/52582)) ([b034f3d](b034f3d3db))
* resolve conflicts ([36e2cf4](36e2cf49f3))
* return None instead of 0 if valuation rate is falsy ([195f020](195f020636))
* stock balance report issue ([bda7220](bda7220b70))
* **stock:** add is group filter for warehouse fields ([5b7ee0a](5b7ee0af66))
* **stock:** ignore pos reserved batches for stock levels ([635a421](635a421807))
* **stock:** inward stock for pick list test record ([5a42ff0](5a42ff0c3c))
* **stock:** set source warehouse for issue type ([19dca36](19dca36dec))
* **stock:** update target field attribute ([9cfd704](9cfd704eef))
* validate asset movement transaction date (backport [#52340](https://github.com/frappe/erpnext/issues/52340)) ([#52560](https://github.com/frappe/erpnext/issues/52560)) ([eea8cb5](eea8cb5885))

### Features

* allow negative stock for the batch item ([4c094c3](4c094c3d86))
v15.97.0 		2026-02-11 04:58:18 +00:00
ruthra kumar
0bd3c3b566 Merge pull request #52598 from frappe/version-15-hotfix 
chore: release v15
 2026-02-11 10:26:50 +05:30
Dharanidharan S
8bdbb24d73 fix(accounts): correct base grand total and rounded total mismatch (#51739) 
(cherry picked from commit d82c92a237)

# Conflicts:
#	erpnext/public/js/controllers/taxes_and_totals.js
 2026-02-10 19:05:23 +05:30
ruthra kumar
442e46c80f Merge pull request #52603 from frappe/mergify/bp/version-15-hotfix/pr-52017 
fix(gross-profit): handle returns outside the given sale period (backport #52017)
 2026-02-10 18:24:27 +05:30
ruthra kumar
83a72b8b30 Merge pull request #52413 from frappe/mergify/bp/version-15-hotfix/pr-51745 
fix(gross profit report): translate column Sales Invoice (backport #51745)
 2026-02-10 18:23:04 +05:30
ruthra kumar
a50836ab07 Merge pull request #52553 from frappe/mergify/bp/version-15-hotfix/pr-52501 
fix(quotation): ignore zero ordered_qty (backport #52501)
 2026-02-10 18:22:08 +05:30
Kavin
e9c4762309 Merge pull request #52541 from frappe/mergify/bp/version-15-hotfix/pr-52516 
fix(stock): ignore pos reserved batches for stock levels (backport #52516)
 2026-02-10 18:21:21 +05:30
Navin-S-R
7cd9de211f fix(gross-profit): handle item group filters 
(cherry picked from commit 047b278791)
 2026-02-10 12:41:08 +00:00
Navin-S-R
da37fea583 test: fix test assertions to use index-based totals 
(cherry picked from commit fdfa7bc963)
 2026-02-10 12:41:08 +00:00
Navin-S-R
a912b78bb8 test: validate sales person wise gross profit 
(cherry picked from commit 3ab978ab46)
 2026-02-10 12:41:08 +00:00
Navin-S-R
8ba5ef683f test: validate return invoice profit and profit percentage 
(cherry picked from commit 4da3d43013)
 2026-02-10 12:41:08 +00:00
Navin-S-R
bde19ab010 fix: handle gross profit and percentage for return invoices 
(cherry picked from commit 51709f032f)
 2026-02-10 12:41:07 +00:00
Navin-S-R
303dac262c fix(gross-profit): handle returns outside sale period 
(cherry picked from commit 67d8223f73)
 2026-02-10 12:41:07 +00:00
Kavin
3e4bd3040a Merge pull request #52591 from aerele/backport-52527 
fix(stock): correct warehouse mapping for material issue (backport #52527)
 2026-02-10 15:33:53 +05:30
Kavin
ae490804f9 chore: fix failing pre-commit checks 
- Remove empty line with spaces
 2026-02-10 15:02:23 +05:30
ljain112
e57f3fe727 test: update expected values for tax withholding calculations in tests 2026-02-10 14:40:53 +05:30
ljain112
68099a9b5c fix: set base_tax_withholding_net_total for jv in tds report 2026-02-10 13:53:31 +05:30
Kavin
36e2cf49f3 fix: resolve conflicts 
- Remove POS Settings configuration for version 15 backport.
 2026-02-10 13:35:52 +05:30
ljain112
ed42d54989 fix: add base_tax_withholding_net_total to tax withholding report 2026-02-10 13:30:12 +05:30
ljain112
b740846b68 refactor: update labels for tax withholding reports columns to improve clarity 2026-02-10 13:08:35 +05:30
Pandiyan37
5a42ff0c3c fix(stock): inward stock for pick list test record 2026-02-10 12:14:54 +05:30
Pandiyan37
37ca45ea49 test(stock): add test to check from warehouse for issue type 2026-02-10 12:11:59 +05:30
Pandiyan37
19dca36dec fix(stock): set source warehouse for issue type 2026-02-10 12:10:34 +05:30
mergify[bot]
a6f5b88f9b fix: Added a missing option to the currency field (backport #52528) (#52586) 
fix: Added a missing option to the currency field (#52528)

(cherry picked from commit da07f84e44)

Co-authored-by: El-Shafei H. <el.shafei.developer@gmail.com>
 2026-02-09 20:59:58 +00:00
mergify[bot]
6c9681ba4c fix: email campaign timeout issue (backport #51994) (#52555) 
fix: email campaign timeout issue (#51994)

* fix: email campaign timeout issue

* refactor: email campaign backend logic

* refactor: use sendmail instead of manually batching

(cherry picked from commit 22123dd955)

Co-authored-by: Pratik Badhe <badhepd@gmail.com>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
 2026-02-10 02:10:05 +05:30