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
51,477 Commits 398 Branches 1,698 Tags
a19eece8818fef0f3a7c45ffa2a41fd9e12fca69
Commit Graph

51477 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Abdeali Chharchhoda
a19eece881 refactor: move payment_document query to setup 
(cherry picked from commit 257802aeda)

# Conflicts:
#	erpnext/accounts/doctype/bank_transaction/bank_transaction.js
 2025-04-05 01:35:11 +00:00
Sagar Vora
36aa308bce Merge pull request #46834 from frappe/mergify/bp/version-15-hotfix/pr-46829 
fix: use `grand_total_diff` instead of `rounding_adjustment` in `taxes_and_totals` (backport #46829)
 2025-04-01 14:47:03 +05:30
mergify[bot]
80f144ac22 fix: pos checking opened entry closed or not (backport #46726) (#46830) 
fix: pos checking opened entry closed or not (#46726)

* fix: pos checking opened entry closed or not

* fix: linter issue

* fix: linter issue

(cherry picked from commit 5d5b6acc79)

Co-authored-by: Diptanil Saha <diptanil@frappe.io>
 2025-04-01 13:54:29 +05:30
vishakhdesai
55b17b918f fix: use grand_total_diff instead of rounding_adjustment in taxes_and_totals 
(cherry picked from commit fd252da6b1)
 2025-04-01 13:34:30 +05:30
rohitwaghchaure
27ea95236f Merge pull request #46817 from frappe/mergify/bp/version-15-hotfix/pr-46815 
feat: allow UOMs to select for which conversion rate defined in item (backport #46815)
 2025-04-01 08:31:52 +05:30
rohitwaghchaure
c762a8903b Merge pull request #46824 from frappe/mergify/bp/version-15-hotfix/pr-46808 
fix: condition to update the last purchase rate (backport #46808)
 2025-04-01 08:31:30 +05:30
Rohit Waghchaure
353fa0cbc3 fix: condition to update the last puurchase rate 
(cherry picked from commit bad901e7da)
 2025-03-31 15:15:20 +00:00
rohitwaghchaure
2b854377b1 chore: fix conflicts 2025-03-31 20:43:34 +05:30
Rohit Waghchaure
288aad6f5d feat: allow UOMs to select for which converstion rate defined in item master 
(cherry picked from commit b1dfbbe85e)

# Conflicts:
#	erpnext/stock/doctype/stock_settings/stock_settings.json
 2025-03-31 10:53:11 +00:00
rohitwaghchaure
a60acbc592 Merge pull request #46807 from frappe/mergify/bp/version-15-hotfix/pr-46806 
feat: option to recreate Stock Ledger Entries against stock transactions (backport #46806)
 2025-03-31 16:06:42 +05:30
Sagar Vora
62275d09da Merge pull request #46814 from frappe/mergify/bp/version-15-hotfix/pr-46812 
fix: revert resetting `rounding_adjustment` (backport #46812)
 2025-03-31 15:56:08 +05:30
Vishakh Desai
96af1ccffb Merge pull request #46812 from vishakhdesai/fix-taxes-and-totals 
fix: revert resetting `rounding_adjustment`
(cherry picked from commit 3a9dca0563)
 2025-03-31 10:25:00 +00:00
mergify[bot]
7b864bece8 fix: improved rounding adjustment when applying discount (backport #46720) 
* fix: improved rounding adjustment when applying discount (#46720)

* fix: rounding adjustment in apply_discount_amount taxes_and_totals

* refactor: minor changes

* fix: set the rounding difference while calculating tax total in the last tax row and add test case

* fix: failing test case

* fix: made changes in get_total_for_discount_amount in taxes_and_totals

* fix: failing test cases

* fix: changes as per review

* refactor: remove unnecessary use of flt

* refactor: improve logic

* refactor: minor change

* refactor: minor changes

* fix: add a test case for applying discount with previous row total in taxes

* fix: failing test case

* refactor: flatter code, remove `flt` usage for accuracy

---------

Co-authored-by: Vishakh Desai <78500008+vishakhdesai@users.noreply.github.com>
Co-authored-by: Sagar Vora <sagar@resilient.tech>
 2025-03-31 15:54:42 +05:30
rohitwaghchaure
604b185bd3 chore: fix conflicts 2025-03-31 15:05:10 +05:30
Rohit Waghchaure
64fdcb752d feat: option to recreate Stock Ledger Entries against stock transactions 
(cherry picked from commit 218dbd6911)

# Conflicts:
#	erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.json
 2025-03-31 08:44:38 +00:00
Sagar Vora
37adb9187f Merge pull request #46803 from frappe/mergify/bp/version-15-hotfix/pr-46644 
fix: multiple Bank Reconciliation Tool issues (backport #46644)
 2025-03-31 11:37:36 +05:30
Vishakh Desai
e168483a58 fix: multiple Bank Reconciliation Tool issues (#46644) 
* fix: bank reconciliation tool issue

* refactor: separate Bank Transaction linking from other logic

* fix: delink old pe on update_after_submit in bank transaction

* fix: failing test case fixed

* fix: changes as per review

* refactor: rename `gles` to `gl_entries`

---------

Co-authored-by: Sagar Vora <sagar@resilient.tech>
(cherry picked from commit 646cf54679)
 2025-03-31 05:57:08 +00:00
rohitwaghchaure
5315769b1f Merge pull request #46781 from frappe/mergify/bp/version-15-hotfix/pr-46777 
fix: incorrect condition (backport #46777)
 2025-03-29 12:17:09 +05:30
rohitwaghchaure
9fa5afd215 Merge pull request #46779 from frappe/mergify/bp/version-15-hotfix/pr-46775 
fix: for deadlock issue keep status as In Progress (backport #46775)
 2025-03-29 12:16:55 +05:30
rohitwaghchaure
88ff17f467 Merge pull request #46778 from frappe/mergify/bp/version-15-hotfix/pr-46760 
fix: valuation rate not updating for raw materials (backport #46760)
 2025-03-29 12:16:35 +05:30
Rohit Waghchaure
502b8f25b3 fix: incorrect condition 
(cherry picked from commit 0c1a8e9c58)
 2025-03-28 18:19:53 +00:00
rohitwaghchaure
5079519863 chore: fix conflicts 2025-03-28 23:47:43 +05:30
Rohit Waghchaure
34e66b1b27 fix: for deadlock issue keep status as In Progress 
(cherry picked from commit e6ff7f0e9f)
 2025-03-28 18:16:41 +00:00
Rohit Waghchaure
454dd3a2f1 fix: valuation rate not updating for raw materials 
(cherry picked from commit 5af8378471)

# Conflicts:
#	erpnext/manufacturing/doctype/work_order/test_work_order.py
 2025-03-28 18:15:42 +00:00
rohitwaghchaure
f3cff68713 Merge pull request #46749 from frappe/revert-46647-mergify/bp/version-15-hotfix/pr-46641 
Revert "perf: timeout while renaming cost center (backport #46641)"
 2025-03-27 12:23:13 +05:30
rohitwaghchaure
326126e741 Revert "perf: timeout while renaming cost center (backport #46641)" 2025-03-27 11:58:02 +05:30
ruthra kumar
b22d0a5804 Merge pull request #46746 from frappe/mergify/bp/version-15-hotfix/pr-46719 
fix: do not use self object for setting party and party type  (backport #46719)
 2025-03-27 11:34:17 +05:30
ljain112
d1311e619d fix: do not use self object for setting party and party type 
(cherry picked from commit 80b746d4dd)
 2025-03-27 05:38:38 +00:00
rohitwaghchaure
8b5ed20225 Merge pull request #46740 from frappe/mergify/bp/version-15-hotfix/pr-46739 
fix: slow query (backport #46739)
 2025-03-26 22:38:38 +05:30
rohitwaghchaure
af3b871989 Merge pull request #46734 from frappe/mergify/bp/version-15-hotfix/pr-46733 
fix: decimal values causing incorrect batch picking (backport #46733)
 2025-03-26 22:12:07 +05:30
rohitwaghchaure
41f20a9c64 chore: fix conflicts 2025-03-26 22:11:43 +05:30
Rohit Waghchaure
af0fb131a2 fix: slow query 
(cherry picked from commit 5ddb36af87)

# Conflicts:
#	erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.json
 2025-03-26 16:40:32 +00:00
Rohit Waghchaure
c5efddae16 fix: decimal values causing incorrect batch picking 
(cherry picked from commit 7bfe703b04)
 2025-03-26 10:13:40 +00:00
rohitwaghchaure
2ed29d06d3 Merge pull request #46730 from frappe/mergify/bp/version-15-hotfix/pr-46710 
fix: expense account in the stock entry (backport #46710)
 2025-03-26 12:16:59 +05:30
Rohit Waghchaure
62f342ef8b fix: expense account in the stock entry 
(cherry picked from commit 89569d4b32)
 2025-03-26 06:30:40 +00:00
ruthra kumar
288206bdcd Merge pull request #46634 from frappe/mergify/bp/version-15-hotfix/pr-46627 
fix: date added to wrong patch (backport #46627)
 2025-03-25 18:45:21 +05:30
ruthra kumar
b3c3733286 chore: resolve conflict 2025-03-25 17:53:29 +05:30
ruthra kumar
b2b49446d4 Merge pull request #46713 from frappe/mergify/bp/version-15-hotfix/pr-46616 
fix: do not validate if conversion rate is 1 for different currency (backport #46616)
 2025-03-25 14:29:09 +05:30
ljain112
391b5c4226 fix: do not validate if conversion rate is 1 for different currency 
(cherry picked from commit e8a66d03bc)
 2025-03-25 08:42:31 +00:00
ruthra kumar
ce454d5202 Merge pull request #46707 from frappe/mergify/bp/version-15-hotfix/pr-46617 
refactor: removed redundant message display for each item row cost center update (backport #46617)
 2025-03-25 12:28:43 +05:30
ljain112
f93feb18fb refactor: removed redundant message display for each item row cost center update 
(cherry picked from commit 4376ca5f1d)
 2025-03-25 06:47:13 +00:00
ruthra kumar
0793213981 Merge pull request #46705 from frappe/mergify/bp/version-15-hotfix/pr-46622 
feat: repost accounting ledger for purchase receipt (backport #46622)
 2025-03-25 12:13:56 +05:30
ljain112
4edfc6f125 feat: repost accounting ledger for purchase receipt 
(cherry picked from commit b36e356469)
 2025-03-25 06:19:43 +00:00
mergify[bot]
98df0614ab ci: apply label "skip-release-notes" based on PR title (backport #46694) (#46697) 
ci: apply label "skip-release-notes" based on PR title (#46694)

Workflow copied from frappe/frappe

(cherry picked from commit eb350012b0)

Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
 2025-03-24 16:55:11 +01:00
Sagar Vora
59d0ff493f Merge pull request #46688 from frappe/mergify/bp/version-15-hotfix/pr-46669 
fix: don't filter payment entries on Bank Account in Payment Clearance (backport #46669)
 2025-03-24 18:17:59 +05:30
vishakhdesai
dc3b5e2f3a fix: don't filter payment entries on Bank Account in Payment Clearance 
(cherry picked from commit fa2fd5bf88)
 2025-03-24 12:22:09 +00:00
ruthra kumar
058a2f0c42 Merge pull request #46677 from frappe/mergify/bp/version-15-hotfix/pr-46577 
fix: customer credit limit check based on `bypass_credit_limit_check` in Journal Entry (backport #46577)
 2025-03-24 13:58:10 +05:30
ljain112
6c443bd85a fix: customer credit limit check based on bypass_credit_limit_check in Journal Entry 
(cherry picked from commit 8a84faebed)
 2025-03-24 08:02:17 +00:00
ruthra kumar
a228d1edc5 Merge pull request #46672 from frappe/mergify/bp/version-15-hotfix/pr-46574 
fix: correct invoice order in payment reconcillaiton (backport #46574)
 2025-03-24 13:13:35 +05:30
ruthra kumar
87628835bf Merge pull request #46673 from frappe/mergify/bp/version-15-hotfix/pr-46386 
feat(accounting/regional): allow chart_of_account.get_chart to be whilelist (backport #46386)
 2025-03-24 13:13:06 +05:30