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
51,336 Commits 460 Branches 1,746 Tags
08f47b626cfe8fb34bd51b5d32e8fd7892bfdeca
Commit Graph

51336 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
rohitwaghchaure
5b69445294 Merge pull request #46420 from frappe/mergify/bp/version-15-hotfix/pr-46418 
fix: stock balance in and out value (backport #46418)
 2025-03-10 23:13:37 +05:30
Raffael Meyer
9c703765a1 fix: backport translations from develop (#46428) 2025-03-10 14:32:19 +01:00
rohitwaghchaure
043539fcdb chore: fix conflicts 2025-03-10 17:37:29 +05:30
ruthra kumar
54a76d8932 Merge pull request #46425 from frappe/mergify/bp/version-15-hotfix/pr-46407 
fix: typo in sales_invoice_print (backport #46407)
 2025-03-10 16:55:28 +05:30
mahsem
b6106212c1 fix: typo in sales_invoice_print 
(cherry picked from commit f7bcae83e4)
 2025-03-10 11:18:23 +00:00
Rohit Waghchaure
c2001e9c67 fix: stock balance in and out value 
(cherry picked from commit e917bd5334)

# Conflicts:
#	erpnext/stock/report/stock_balance/stock_balance.py
 2025-03-10 10:06:09 +00:00
Frappe PR Bot
47429095a2 chore(release): Bumped to Version 15.54.3 
## [15.54.3](https://github.com/frappe/erpnext/compare/v15.54.2...v15.54.3) (2025-03-09)

### Bug Fixes

* consider account freeze date in recalculate_amount_difference_field patch ([34f03d6](34f03d608a))
* consider stock freeze date in recalculate_amount_difference_field patch ([a18721d](a18721d21c))
v15.54.3 		2025-03-09 11:04:11 +00:00
rohitwaghchaure
2f3f87fe7e Merge pull request #46403 from frappe/mergify/bp/version-15/pr-46402 
fix: consider account freeze date in recalculate_amount_difference_fi… (backport #46395) (backport #46402)
 2025-03-09 16:32:52 +05:30
Mihir Kandoi
2b4dfca3ff chore: resolve conflicts 
(cherry picked from commit 985fb5dfdc)
 2025-03-08 17:16:43 +00:00
Mihir Kandoi
a18721d21c fix: consider stock freeze date in recalculate_amount_difference_field patch 
(cherry picked from commit cd72532789)
(cherry picked from commit 8264d42cd9)
 2025-03-08 17:16:43 +00:00
Mihir Kandoi
34f03d608a fix: consider account freeze date in recalculate_amount_difference_field patch 
(cherry picked from commit 696f931678)

# Conflicts:
#	erpnext/patches/v15_0/recalculate_amount_difference_field.py
(cherry picked from commit 8b67527900)
 2025-03-08 17:16:43 +00:00
rohitwaghchaure
b786cd30e6 Merge pull request #46402 from frappe/mergify/bp/version-15-hotfix/pr-46395 
fix: consider account freeze date in recalculate_amount_difference_fi… (backport #46395)
 2025-03-08 22:45:06 +05:30
Mihir Kandoi
985fb5dfdc chore: resolve conflicts 2025-03-08 22:22:12 +05:30
Mihir Kandoi
8264d42cd9 fix: consider stock freeze date in recalculate_amount_difference_field patch 
(cherry picked from commit cd72532789)
 2025-03-08 16:28:33 +00:00
Mihir Kandoi
8b67527900 fix: consider account freeze date in recalculate_amount_difference_field patch 
(cherry picked from commit 696f931678)

# Conflicts:
#	erpnext/patches/v15_0/recalculate_amount_difference_field.py
 2025-03-08 16:28:32 +00:00
Frappe PR Bot
2ce8299bc8 chore(release): Bumped to Version 15.54.2 
## [15.54.2](https://github.com/frappe/erpnext/compare/v15.54.1...v15.54.2) (2025-03-08)

### Bug Fixes

* incorrect category in list ([3bdd4ce](3bdd4ce116))
* **test:** incorrect transaction exchange rate in test case ([3015628](3015628519))
v15.54.2 		2025-03-08 07:42:44 +00:00
ruthra kumar
84b03485d6 Merge pull request #46397 from frappe/mergify/bp/version-15/pr-46064 
fix: Debit and Credit mismatch on transaction currency debit and credit values (backport #46064)
 2025-03-08 13:11:25 +05:30
ruthra kumar
d0b14f1907 chore: resolve conflict 2025-03-08 12:28:49 +05:30
ruthra kumar
cd1803a74d refactor: internal transfer gl 
(cherry picked from commit f1d8feec15)
 2025-03-08 06:56:37 +00:00
ruthra kumar
a1cf27ec17 test: assert total debit and credit for trx currency 
(cherry picked from commit 55d0636123)
 2025-03-08 06:56:37 +00:00
ruthra kumar
61880a311a refactor: handle rounding diff for trx currency dr and cr 
(cherry picked from commit 455a55b2ce)
 2025-03-08 06:56:37 +00:00
ruthra kumar
2d290b153d refactor: trx currency dr and cr for tax rows and item rows 
(cherry picked from commit 4cd3f3531c)
 2025-03-08 06:56:36 +00:00
ruthra kumar
cacb720556 refactor: convert tax amount using exchange rate 
(cherry picked from commit 7528ef147a)
 2025-03-08 06:56:36 +00:00
ruthra kumar
3bdd4ce116 fix: incorrect category in list 
(cherry picked from commit 6545467aec)
 2025-03-08 06:56:36 +00:00
ruthra kumar
c479998cd6 chore: typo 
(cherry picked from commit bc792c61e9)
 2025-03-08 06:56:36 +00:00
ruthra kumar
501e388186 refactor: isolate to specific doctypes 
(cherry picked from commit b348aa3b37)
 2025-03-08 06:56:35 +00:00
ruthra kumar
af45ec0d6d refactor(test): save first to let the tax table populate 
(cherry picked from commit 23d465805b)
 2025-03-08 06:56:35 +00:00
ruthra kumar
3015628519 fix(test): incorrect transaction exchange rate in test case 
(cherry picked from commit a31770d122)
 2025-03-08 06:56:35 +00:00
ruthra kumar
8b6eea6349 refactor: set transaction currency and rate before gl map 
(cherry picked from commit ceca5b4c72)
 2025-03-08 06:56:34 +00:00
ruthra kumar
81c29e8f8c refactor: handle payment entry 
(cherry picked from commit 5c86e3ce85)
 2025-03-08 06:56:34 +00:00
ruthra kumar
04758d3de3 refactor: handle Journal entries 
(cherry picked from commit 9f3847c0f8)
 2025-03-08 06:56:34 +00:00
ruthra kumar
615b0c40a3 refactor: move utility method to controller 
(cherry picked from commit d1d06885dc)
 2025-03-08 06:56:34 +00:00
ruthra kumar
231abab321 refactor: set transaction currency dr/cr in sales invoice 
(cherry picked from commit 3e292ef2cb)

# Conflicts:
#	erpnext/accounts/doctype/sales_invoice/sales_invoice.py
 2025-03-08 06:56:33 +00:00
ruthra kumar
fff3b1e84e refactor: handle stocked items 
(cherry picked from commit ee93ed8c97)
 2025-03-08 06:56:33 +00:00
ruthra kumar
5299a1032b refactor: handle stocked items 
(cherry picked from commit 7ff3977394)
 2025-03-08 06:56:33 +00:00
ruthra kumar
1e5fbc0a48 refactor: set tr currency dr & cr directly on parent document 
(cherry picked from commit e9af567033)
 2025-03-08 06:56:32 +00:00
ruthra kumar
5c47c35a0f refactor: use highest precision for storing exc rate 
(cherry picked from commit b115bf2e2a)
 2025-03-08 06:56:32 +00:00
ruthra kumar
2bf910a786 Merge pull request #46396 from frappe/mergify/bp/version-15-hotfix/pr-46064 
fix: Debit and Credit mismatch on transaction currency debit and credit values (backport #46064)
 2025-03-08 12:25:57 +05:30
ruthra kumar
0b8673777a chore: resolve conflict 2025-03-08 12:11:54 +05:30
ruthra kumar
8f4c1e7169 refactor: internal transfer gl 
(cherry picked from commit f1d8feec15)
 2025-03-08 06:36:37 +00:00
ruthra kumar
f303245fae test: assert total debit and credit for trx currency 
(cherry picked from commit 55d0636123)
 2025-03-08 06:36:37 +00:00
ruthra kumar
cd21e5c652 refactor: handle rounding diff for trx currency dr and cr 
(cherry picked from commit 455a55b2ce)
 2025-03-08 06:36:37 +00:00
ruthra kumar
57e0f73595 refactor: trx currency dr and cr for tax rows and item rows 
(cherry picked from commit 4cd3f3531c)
 2025-03-08 06:36:37 +00:00
ruthra kumar
2c73e31742 refactor: convert tax amount using exchange rate 
(cherry picked from commit 7528ef147a)
 2025-03-08 06:36:36 +00:00
ruthra kumar
002685fc89 fix: incorrect category in list 
(cherry picked from commit 6545467aec)
 2025-03-08 06:36:36 +00:00
ruthra kumar
38a3a43ba5 chore: typo 
(cherry picked from commit bc792c61e9)
 2025-03-08 06:36:36 +00:00
ruthra kumar
07f938cc10 refactor: isolate to specific doctypes 
(cherry picked from commit b348aa3b37)
 2025-03-08 06:36:35 +00:00
ruthra kumar
5c013172f9 refactor(test): save first to let the tax table populate 
(cherry picked from commit 23d465805b)
 2025-03-08 06:36:35 +00:00
ruthra kumar
b76c96820e fix(test): incorrect transaction exchange rate in test case 
(cherry picked from commit a31770d122)
 2025-03-08 06:36:35 +00:00
ruthra kumar
1d56931050 refactor: set transaction currency and rate before gl map 
(cherry picked from commit ceca5b4c72)
 2025-03-08 06:36:34 +00:00