nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-16 16:15:02 +00:00
Code Issues Packages Projects Releases Wiki Activity
53,072 Commits 398 Branches 1,698 Tags
366bb8269ca1ce91f493f5ade2bcffa58d4a4e69
Commit Graph

53072 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ljain112
366bb8269c fix: do not validate cost center in cancelled gl entry 
(cherry picked from commit 29cbddbc77)
 2025-09-30 09:04:24 +00:00
ruthra kumar
a30c481ca1 Merge pull request #49787 from frappe/mergify/bp/version-15-hotfix/pr-49773 
fix(bank transaction): change reference number to small text (backport #49773)
 2025-09-29 17:15:06 +05:30
ravibharathi656
5a0bf7a5e1 fix(bank transaction): change reference number to small text 
(cherry picked from commit 90f399d0fc)

# Conflicts:
#	erpnext/accounts/doctype/bank_transaction/bank_transaction.json
 2025-09-29 16:59:31 +05:30
ruthra kumar
f135954944 Merge pull request #49784 from frappe/mergify/bp/version-15-hotfix/pr-49708 
feat: add show zero value filter in profit and loss and balance sheet (backport #49708)
 2025-09-29 16:47:54 +05:30
ravibharathi656
c32ad9711f feat: add show zero value filter in profit and loss and balance sheet 
(cherry picked from commit 33ab24943c)

# Conflicts:
#	erpnext/accounts/report/balance_sheet/balance_sheet.js
#	erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.js
 2025-09-29 16:32:21 +05:30
ruthra kumar
f6842041c9 Merge pull request #49782 from frappe/mergify/bp/version-15-hotfix/pr-49718 
fix: set cost center in taxes if not set (backport #49718)
 2025-09-29 16:26:35 +05:30
ravibharathi656
4dcd502b76 fix: set cost center in taxes if not set 
(cherry picked from commit b75940bf0e)

# Conflicts:
#	erpnext/public/js/controllers/transaction.js
 2025-09-29 15:53:19 +05:30
ruthra kumar
19f81c9204 Merge pull request #49777 from frappe/mergify/bp/version-15-hotfix/pr-49735 
fix(payment entry): trigger currency on account set (backport #49735)
 2025-09-29 14:56:14 +05:30
ruthra kumar
67b6b3779d Merge pull request #49775 from frappe/mergify/bp/version-15-hotfix/pr-49618 
fix: add date filter for getting return invoice items (backport #49618)
 2025-09-29 14:31:45 +05:30
ruthra kumar
c836016358 Merge pull request #49774 from frappe/mergify/bp/version-15-hotfix/pr-49640 
fix: include precision in validation (backport #49640)
 2025-09-29 14:29:45 +05:30
ravibharathi656
84a2596ce5 fix(payment entry): trigger currency on account set 
(cherry picked from commit 096e74b1ee)
 2025-09-29 08:58:03 +00:00
Navin-S-R
98bc7b41fc test: validate profit values for later period returns 
(cherry picked from commit d5c457b8c5)

# Conflicts:
#	erpnext/accounts/report/gross_profit/test_gross_profit.py
 2025-09-29 14:16:52 +05:30
l0gesh29
abffbcad99 fix: include precision in validation 
(cherry picked from commit 1de0c46c51)
 2025-09-29 08:44:29 +00:00
Navin-S-R
bc77704462 fix: add date filter for getting return invoice items 
(cherry picked from commit 2abb011816)
 2025-09-29 08:44:28 +00:00
rohitwaghchaure
5abb2d510d Merge pull request #49772 from frappe/mergify/bp/version-15-hotfix/pr-49770 
chore: removed print statement (backport #49770)
 2025-09-29 13:06:44 +05:30
Rohit Waghchaure
ae040024af chore: removed print statement 
(cherry picked from commit 324bdcb177)
 2025-09-29 06:32:32 +00:00
rohitwaghchaure
fe1247dd4b Merge pull request #49758 from frappe/mergify/bp/version-15-hotfix/pr-49757 
feat: service expense account in the subcontracting receipt (backport #49757)
 2025-09-27 10:20:23 +05:30
rohitwaghchaure
84789daf59 Merge pull request #49756 from frappe/mergify/bp/version-15-hotfix/pr-49741 
fix(stock entry): set expense account from company for manufacture (backport #49741)
 2025-09-27 10:04:06 +05:30
rohitwaghchaure
cecd177286 chore: fix conflicts 
Removed fields related to job card and landed cost voucher amount from subcontracting receipt item.
 2025-09-27 10:03:27 +05:30
rohitwaghchaure
c26ed80d67 chore: fix conflicts 2025-09-27 10:02:40 +05:30
rohitwaghchaure
15f0c28cda chore: fix conflicts 2025-09-27 10:01:53 +05:30
Rohit Waghchaure
ba9b63af49 feat: service expense account in the subcontracting receipt 
(cherry picked from commit 6e597b9c42)

# Conflicts:
#	erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py
#	erpnext/subcontracting/doctype/subcontracting_receipt/test_subcontracting_receipt.py
#	erpnext/subcontracting/doctype/subcontracting_receipt_item/subcontracting_receipt_item.json
 2025-09-26 15:44:26 +00:00
ravibharathi656
9c81f448c8 fix: use stock adjustment account if no expense account 
(cherry picked from commit b2e109318f)
 2025-09-26 13:28:43 +00:00
ravibharathi656
50f9521feb fix(stock entry): set expense account from company for manufacture 
(cherry picked from commit 06177ffaff)
 2025-09-26 13:28:43 +00:00
ruthra kumar
0ff32ac554 Merge pull request #49738 from frappe/mergify/bp/version-15-hotfix/pr-49717 
refactor: improve trial balance performance (backport #49717)
 2025-09-26 11:58:26 +05:30
rohitwaghchaure
fe72ea6d6b Merge pull request #49739 from frappe/mergify/bp/version-15-hotfix/pr-49734 
fix: auto batch not set for raw materials in subcontracting receipt (backport #49734)
 2025-09-26 11:43:04 +05:30
rohitwaghchaure
62959e5a70 chore: fix conflicts 2025-09-26 11:21:16 +05:30
Rohit Waghchaure
6c8e8384d5 fix: auto batch not set for raw materials in subcontracting receipt 
(cherry picked from commit 23f9d4c600)

# Conflicts:
#	erpnext/controllers/subcontracting_controller.py
 2025-09-26 05:07:12 +00:00
ruthra kumar
0c8004530a refactor: improve trial balance performance 
(cherry picked from commit cee3813ced)
 2025-09-26 04:46:00 +00:00
Raffael Meyer
b18afa8bdd chore(Bank Guarante): move to leaner doctype definition (#49737) 2025-09-25 22:05:59 +00:00
rohitwaghchaure
6b3bb45900 Merge pull request #49728 from frappe/mergify/bp/version-15-hotfix/pr-49725 
fix: remove item name in get_item_details (backport #49725)
 2025-09-25 19:52:28 +05:30
Kavin
d0e511fd2f fix: remove item name to avoid overriding item row name 
(cherry picked from commit 47055901c0)
 2025-09-25 13:23:29 +00:00
rohitwaghchaure
d50538dbf7 Merge pull request #49724 from frappe/mergify/bp/version-15-hotfix/pr-49720 
perf: reposting for backdated transactions (backport #49720)
 2025-09-25 18:52:32 +05:30
Rohit Waghchaure
cd5a836685 perf: reposting for backdated transactions 
(cherry picked from commit 1b0fc0541b)
 2025-09-25 12:16:41 +00:00
ruthra kumar
e9b29ed544 feat: add filters option in print view (backport #49631) (#49700) 
fix: only show filters in print view if 'Include filters' is enabled

(cherry picked from commit 1979879b07)

# Conflicts:
#	erpnext/accounts/report/general_ledger/general_ledger.html

Co-authored-by: Nareshkanna S <nareshkannashanmugam@gmail.com>
 2025-09-23 16:40:11 +05:30
Nareshkanna S
79d4731fe7 fix: only show filters in print view if 'Include filters' is enabled 
(cherry picked from commit 1979879b07)

# Conflicts:
#	erpnext/accounts/report/general_ledger/general_ledger.html
 2025-09-23 16:29:18 +05:30
ruthra kumar
e4997af1c0 Merge pull request #49695 from frappe/mergify/bp/version-15-hotfix/pr-49694 
chore: update sales_data from site_info (backport #49694)
 2025-09-23 15:11:22 +05:30
Jannat Patel
ff08ee6ada test: activation with site_info 
(cherry picked from commit 5a26d593e4)
 2025-09-23 09:22:03 +00:00
Jannat Patel
ac55028f6b chore: update sales_data from site_info 
(cherry picked from commit 866b252309)
 2025-09-23 09:22:03 +00:00
rohitwaghchaure
7402549b4b Merge pull request #49691 from frappe/mergify/bp/version-15-hotfix/pr-49648 
fix: Consider non SABB batch qty in reserved batch validation (backport #49648)
 2025-09-23 12:09:11 +05:30
rohitwaghchaure
f4cef8a417 Merge pull request #49690 from frappe/mergify/bp/version-15-hotfix/pr-49684 
feat: populate available qty in pick list locations (backport #49684)
 2025-09-23 12:07:00 +05:30
rohitwaghchaure
dc6d4f2620 Merge pull request #49688 from frappe/mergify/bp/version-15-hotfix/pr-49687 
fix: warehouse for batch validation (backport #49687)
 2025-09-23 12:06:31 +05:30
Kavin
7ed97e47cc fix: Consider non SABB batch qty in reserved batch validation 
(cherry picked from commit ae8b34e03c)
 2025-09-23 06:21:00 +00:00
Kavin
a463f4a419 refactor: fetching qty on warehouse trigger 
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
(cherry picked from commit e3ab0e7c67)
 2025-09-23 06:20:23 +00:00
Kavin
bc7f884ae1 feat: populate available qty in pick list locations 
(cherry picked from commit d8756fc7de)
 2025-09-23 06:20:23 +00:00
Kavin
056d51937b chore: rename stock qty label 
(cherry picked from commit fc967fceb2)
 2025-09-23 06:20:22 +00:00
Rohit Waghchaure
cb94c4b5f1 fix: warehouse for batch validation 
(cherry picked from commit 381072170a)
 2025-09-23 06:12:44 +00:00
Diptanil Saha
868987e46e Merge pull request #49686 from frappe/mergify/bp/version-15-hotfix/pr-49676 
fix: auto commit if too many writes reached (backport #49676)
 2025-09-23 11:20:36 +05:30
Kavin
53207821aa fix: restore auto_commit_on_many_writes flag 
(cherry picked from commit 66712fa8b5)
 2025-09-23 05:31:28 +00:00
Kavin
0310172338 fix: auto commit if too many writes reached 
(cherry picked from commit 99a0ba0b45)
 2025-09-23 05:31:27 +00:00