nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-13 12:08:46 +00:00
Code Issues Packages Projects Releases Wiki Activity
52,857 Commits 416 Branches 1,717 Tags
0cd45a0022440d404b7a6f9a94de804569782f13
Commit Graph

52857 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
rohitwaghchaure
8f7dc827ea Merge pull request #46459 from frappe/mergify/bp/version-15-hotfix/pr-46452 
fix: sla fields patch (backport #46452)
 2025-03-12 00:01:35 +05:30
Mihir Kandoi
0d044bc5bb fix: sla fields patch 
(cherry picked from commit d653899372)
 2025-03-11 18:08:24 +00:00
rohitwaghchaure
14ee2d239a Merge pull request #46441 from frappe/mergify/bp/version-15-hotfix/pr-46436 
fix: filter batches that going to be zero (backport #46436)
 2025-03-11 23:38:21 +05:30
Raffael Meyer
fc8eeaf4f6 Merge pull request #46457 from frappe/mergify/bp/version-15-hotfix/pr-46453 
ci: ignore PRs labeled with "skip-release-notes" when generating release notes (backport #46453)
 2025-03-11 17:51:58 +01:00
barredterra
aad8c88532 ci: ignore PRs labeled with "skip-release-notes" when generating release notes 
(cherry picked from commit 57007bf937)
 2025-03-11 16:35:20 +00:00
ruthra kumar
e783536ba0 Merge pull request #46450 from frappe/mergify/bp/version-15-hotfix/pr-46398 
chore: rename print and stationery account (backport #46398)
 2025-03-11 18:12:19 +05:30
chethank1407
ee3feba386 chore: rename print and stationery account 
(cherry picked from commit 615997b774)
 2025-03-11 12:03:42 +00:00
ruthra kumar
cb9be11448 Merge pull request #46447 from frappe/mergify/bp/version-15-hotfix/pr-46344 
fix: make 'company_tax_id' and 'company_fiscal_code' as mandatory (backport #46344)
 2025-03-11 17:31:19 +05:30
ruthra kumar
31dc6021e2 chore: translatable strings 
(cherry picked from commit 121798ba85)
 2025-03-11 11:42:30 +00:00
Bhavan23
229f4d3d92 fix: make 'company_tax_id' and 'company_fiscal_code' as mandatory 
(cherry picked from commit abd044eb0d)
 2025-03-11 11:42:19 +00:00
ruthra kumar
c25862a85f Merge pull request #46446 from frappe/mergify/bp/version-15-hotfix/pr-45818 
fix: set correct account currency for deferred expense account (backport #45818)
 2025-03-11 16:50:55 +05:30
vishakhdesai
f96848a3b9 fix: set correct account currency for deferred expence account in PI 
(cherry picked from commit 398083853c)
 2025-03-11 11:06:14 +00:00
Rohit Waghchaure
ac97489a32 fix: filter batches that going to be zero 
(cherry picked from commit aba512c1c6)
 2025-03-11 08:02:49 +00:00
ruthra kumar
02ff406b7c Merge pull request #46439 from frappe/mergify/bp/version-15-hotfix/pr-46372 
fix(account): update account number from parent company (backport #46372)
 2025-03-11 11:19:33 +05:30
venkat102
428aedc29c fix(account): update account number from parent company 
(cherry picked from commit 4a4894bc01)
 2025-03-11 05:32:15 +00:00
ruthra kumar
6af24dca6e Merge pull request #46432 from frappe/mergify/bp/version-15-hotfix/pr-46427 
fix: not able to save work order with alternative item (backport #46414) (backport #46427)
 2025-03-11 11:02:04 +05:30
ruthra kumar
8980eb9b9d Merge pull request #46437 from frappe/mergify/bp/version-15-hotfix/pr-46426 
fix: clear cashe on employee hierarchy change (backport #46426)
 2025-03-11 10:58:50 +05:30
Asmita Hase
4dfdb2b0a1 fix: clear cashe on employee hierarchy change to reflect updated permissions 
(cherry picked from commit 6789578b27)
 2025-03-11 05:13:04 +00:00
Rohit Waghchaure
9554a49bbd fix: not able to save work order with alternative item 
(cherry picked from commit 6ca1f9bc73)
(cherry picked from commit ac7fc608aa)
 2025-03-10 17:44:57 +00:00
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