nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-08-26 05:15:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
51,987 Commits 608 Branches 1,804 Tags
8d7be8a5365483acb6c6db3f147d963c931b1c2e
Commit Graph

40935 Commits

Author SHA1 Message Date
Mihir Kandoi
b99f8fd021 fix: zero division error in purchase receipt 
(cherry picked from commit 32229fb646)
 2025-06-03 13:09:28 +00:00
rohitwaghchaure
5bac652b5f fix: GL entries for rejected returned materials (#47612) 
(cherry picked from commit 3e098da01f)
 2025-06-03 10:57:14 +00:00
mergify[bot]
3582b32f03 feat: allow to set valuation rate for Rejected Materials (backport #47582) (#47869) 
feat: allow to set valuation rate for Rejected Materials (#47582)

(cherry picked from commit ca0e53dd78)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2025-06-03 16:25:53 +05:30
Ayush Marhatta
7d828dc17e fix: use user default for company instead of global default in purchase order analysis report 
(cherry picked from commit 49f23513e0)
 2025-06-03 07:48:19 +00:00
mergify[bot]
01dd7337a2 feat: specify expense account and cost center for raw materials in Su… (backport #47756) (#47861) 2025-06-03 12:28:12 +05:30
Marc Ramser
470534af78 fix(Timesheet): Only update to_time if it's more than 1 second off (#47702) 
* Fix: Only update to_time if it's more than 1 second off

Before, to_time was updated even when it was almost the same as the expected time (like 17:20 vs 17:19:59.998). This causes problems because of small rounding errors and caused valid times like 17:20 to be reset. Now, to_time is only updated if the difference is greater than 1 second.

To reproduce the current error:
* From Time 09:00:00
* To Time 17:20:00
Save 
To Time is 17:19:59

* Update erpnext/projects/doctype/timesheet/timesheet.py

Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>

* Update timesheet.py

---------

Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
 2025-06-03 11:59:13 +05:30
Lakshit Jain
4a1966c680 fix: cash flow report fixes 
(cherry picked from commit 20b87512d1)
 2025-06-03 05:53:23 +00:00
Karuppasamy923
3c697e90a3 fix: add internal link field in Sales Order connections for internal transactions 
(cherry picked from commit e3e6503076)
 2025-06-02 11:17:45 +00:00
ruthra kumar
6dde327713 Merge pull request #47849 from frappe/mergify/bp/version-15-hotfix/pr-47502 
fix: Handle duplicate Items qty in Quotation (backport #47502)
 2025-06-02 15:11:46 +05:30
ruthra kumar
16b10274cf Merge pull request #47840 from frappe/mergify/bp/version-15-hotfix/pr-47839 
fix: decimal issue (backport #47839)
 2025-06-02 14:51:08 +05:30
Abdeali Chharchhodawala
4c1b415b9d fix: Handle duplicate Items qty in Quotation 
fix: Handle duplicate Items qty in Quotation
(cherry picked from commit 39f6d8ffb6)
 2025-06-02 09:20:41 +00:00
ruthra kumar
d7124779bf Merge pull request #47842 from frappe/mergify/bp/version-15-hotfix/pr-47821 
Accounts receivable show delivery note (backport #47821)
 2025-06-02 14:02:05 +05:30
l0gesh29
9f5cfdd65b fix: Accounts receivable shouldn't fetch DN for employees 
* fix: reorder function call

* fix: Add condition to fetch return entries for specific party types

(cherry picked from commit c8e052f3c6)
 2025-06-02 13:40:20 +05:30
ljain112
5ebf1b9cc4 fix: add company filter to cost center and project in process statement of accounts 
(cherry picked from commit 14313b162a)
 2025-06-02 08:08:42 +00:00
rohitwaghchaure
34b62d226c fix: decimal issue (#47839) 
(cherry picked from commit 0dbd9efc91)
 2025-06-02 07:55:28 +00:00
Mihir Kandoi
ba8a316b06 fix: calculate discount percentage if discount amount is specified (#47806) 
(cherry picked from commit bb474f4f42)
 2025-05-31 15:23:21 +00:00
mergify[bot]
3879cbd86d fix: improved indexing for SLE queries. (backport #47194) (#47822) 
* fix: improved indexing for SLE queries. (#47194)

(cherry picked from commit b49a835b4c)

# Conflicts:
#	erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json

* chore: fix conflicts

---------

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2025-05-30 15:36:51 +05:30
mergify[bot]
9df3b9b059 fix: incorrect actual qty in product bundle balance report (backport #47791) (#47814) 
fix: incorrect actual qty in product bundle balance report (#47791)

(cherry picked from commit c544c3e018)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2025-05-30 14:01:32 +05:30
ljain112
2e3ebec53c fix: use query.walk() for escaping special chars in receiable/payable report 
(cherry picked from commit a0a51b5074)
 2025-05-29 08:21:18 +00:00
mergify[bot]
ef9ccd7a57 chore: removed orphaned function (backport #47796) (#47804) 
chore: removed orphaned function (#47796)

(cherry picked from commit cb9e6f6655)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2025-05-29 12:25:08 +05:30
Mihir Kandoi
0c612be6fe feat: show item name for raw materials in BOM creator 
(cherry picked from commit 90ba4ad1e1)
 2025-05-28 14:23:24 +00:00
Sanket322
5a23d7cdca fix: ensure backend response is awaited before saving 
(cherry picked from commit c48db0b7c0)
 2025-05-28 03:56:00 +00:00
Sanket322
8623a5650b fix: check return_against exists before api call 
(cherry picked from commit 00b6b97197)
 2025-05-28 03:56:00 +00:00
mergify[bot]
73bc57f53e Revert "fix: translate_pos_buttons" (backport #47773) (#47774) 
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
fix: translate_pos_buttons" (#47773)
 2025-05-27 21:11:49 +02:00
mergify[bot]
9192913832 feat: add column "Item Name" to "BOM Stock Report" (backport #47116) (#47485) 
Co-authored-by: Patrick Eißler <77415730+PatrickDEissler@users.noreply.github.com>
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
 2025-05-27 19:21:41 +02:00
ljain112
f783bf60a4 fix: handle multiselect filters for tree doctypes in Customer Ledger Summary Report 
(cherry picked from commit 536f7d5ff8)
 2025-05-27 14:24:08 +00:00
ruthra kumar
4c49ab19d6 Merge pull request #47769 from frappe/mergify/bp/version-15-hotfix/pr-47765 
fix: use pypika object `LiteralValue` for adding match conditions (backport #47765)
 2025-05-27 19:52:20 +05:30
l0gesh29
db97dbd394 fix: add no_copy for lost reasons 
(cherry picked from commit 98e889a516)
 2025-05-27 12:33:50 +00:00
ljain112
fb2df77da2 fix: use pypika object LiteralValue for adding match conditions 
(cherry picked from commit 9093e5e363)
 2025-05-27 12:31:16 +00:00
Karuppasamy923
92d5e91e1f feat: add validation for Item Tax Template on rate change 
(cherry picked from commit a9a957edc7)
 2025-05-27 11:30:15 +00:00
mergify[bot]
4fd1af2118 fix: patch to set status cancelled for already cancelled pos invoices (backport #47725) (#47759) 
* fix: patch to set status cancelled for already cancelled pos invoices (#47725)

(cherry picked from commit 4d1d66e579)

# Conflicts:
#	erpnext/patches.txt

* chore: resolve conflict

---------

Co-authored-by: Diptanil Saha <diptanil@frappe.io>
 2025-05-27 15:55:40 +05:30
Khushi Rawat
5997e37454 Merge pull request #47754 from khushi8112/asset-value-adjustment-of-zero-cost 
fix: updated value after depreciation after value adjustment
 2025-05-27 15:28:11 +05:30
Khushi Rawat
63ba27e359 fix: do not update same field twice 2025-05-27 15:10:51 +05:30
ruthra kumar
fd19f284c4 Merge pull request #47755 from frappe/mergify/bp/version-15-hotfix/pr-47679 
fix: setting paid amount to 0 when is_paid is unchecked in purchase invoice (backport #47679)
 2025-05-27 14:37:21 +05:30
Khushi Rawat
74e29f1218 fix: made changes specifically for value adjustment entry 2025-05-27 14:14:30 +05:30
ruthra kumar
5dee1d40ac Merge pull request #47753 from frappe/mergify/bp/version-15-hotfix/pr-47736 
fix: only include advances within the tcs period (backport #47736)
 2025-05-27 14:11:01 +05:30
ljain112
895231a8a7 fix: setting paid amount to 0 when is_paid is unchecked in purchase invoice 
(cherry picked from commit e358a9e53f)
 2025-05-27 08:32:33 +00:00
Khushi Rawat
8ed6e98565 fix: updated value after depreciation after value adjustment 2025-05-27 13:34:03 +05:30
ljain112
a2f5975133 fix: only include advances within the tcs period 
(cherry picked from commit 477ec9fdcc)
 2025-05-27 07:49:19 +00:00
ljain112
d3d22f699e fix: party account based on party type's account type 
(cherry picked from commit 19b1650522)
 2025-05-27 07:44:13 +00:00
mergify[bot]
60dfe36195 fix: create Quality Inspection button not showing (backport #47746) (#47750) 
fix: create Quality Inspection button not showing (#47746)

(cherry picked from commit d8cb073eaf)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2025-05-27 13:06:32 +05:30
ruthra kumar
b9698366c3 Merge pull request #47747 from frappe/mergify/bp/version-15-hotfix/pr-47654 
fix: show general ledger in doc currency in Process Statement Of Accounts (backport #47654)
 2025-05-27 12:01:48 +05:30
mahsem
0f2264658f fix: prettier 
(cherry picked from commit 2839fc9460)
 2025-05-27 06:12:19 +00:00
mahsem
fe78bb60c4 fix: space 
(cherry picked from commit 50a5b51909)
 2025-05-27 06:12:19 +00:00
mahsem
194e41a2d9 fix: space 
(cherry picked from commit a442ec4e80)
 2025-05-27 06:12:19 +00:00
mahsem
2c8db092a0 fix: prettier 
(cherry picked from commit 1953c8489c)
 2025-05-27 06:12:19 +00:00
mahsem
c44493fd7e fix: linter 
(cherry picked from commit 4a6b5b9993)
 2025-05-27 06:12:18 +00:00
mahsem
01b0d1057e fix: translate_pos_buttons 
(cherry picked from commit ce45d1664d)
 2025-05-27 06:12:18 +00:00
ljain112
9d2f396d75 chore: update test case because currency is auto set to system currency 
(cherry picked from commit 22a94d6817)
 2025-05-27 06:11:09 +00:00
ljain112
b3cbbf2ce3 fix: show general ledger in doc currency in Process Statement Of Accounts 
(cherry picked from commit 998f6a29a4)
 2025-05-27 06:11:09 +00:00