nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-17 16:45:02 +00:00
Code Issues Packages Projects Releases Wiki Activity
48,214 Commits 401 Branches 1,700 Tags
0ec1f01b00a3eec9865f0cbadb2d60b249241494
Commit Graph

48214 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
mergify[bot]
0ec1f01b00 Merge branch 'version-15-hotfix' into mergify/bp/version-15-hotfix/pr-40584 2024-04-10 15:57:49 +00:00
Deepesh Garg
87e30a2981 Merge pull request #40950 from frappe/mergify/bp/version-15-hotfix/pr-40863 
fix: Show amount in transaction currency in general ledger report (#40863)
 2024-04-10 21:24:39 +05:30
Deepesh Garg
0e1c7e8788 Merge pull request #40946 from frappe/mergify/bp/version-15-hotfix/pr-40844 
fix: notify update when update outstanding amount (#40844)
 2024-04-10 21:22:42 +05:30
Deepesh Garg
21454e4dfb Merge pull request #40948 from frappe/mergify/bp/version-15-hotfix/pr-40931 
fix: Don't call get_fiscal_year if setup is not done yet (backport #40931)
 2024-04-10 21:22:22 +05:30
Deepesh Garg
18700c26f9 Merge pull request #40945 from frappe/mergify/bp/version-15-hotfix/pr-40849 
fix: Values in transaction currency (backport #40849)
 2024-04-10 21:22:06 +05:30
Nabin Hait
67bac41df4 fix: Show amount in transaction currency in general ledger report 
(cherry picked from commit d868122f12)
 2024-04-10 15:26:25 +00:00
Corentin Flr
9beaf65d19 fix: Don't call get_fiscal_year if setup is not done yet 
(cherry picked from commit c203fafb1b)
 2024-04-10 15:18:26 +00:00
HarryPaulo
f51481983d fix: notify update when update outstanding amount - Linters 
(cherry picked from commit 198b90eb01)
 2024-04-10 15:17:17 +00:00
HarryPaulo
b10d3c4da2 fix: notify update when update outstanding amount 
(cherry picked from commit f67f163e7d)
 2024-04-10 15:17:16 +00:00
Deepesh Garg
3b179bad89 fix: Values in transaciton currency 
(cherry picked from commit a3c9fd6567)
 2024-04-10 15:16:39 +00:00
Akhil Narang
29e3a400f9 Merge pull request #40935 from akhilnarang/v15-ruff 
chore: backport ruff linting/formatting
 2024-04-10 16:36:13 +05:30
Akhil Narang
3141a1702c chore: gitignore ruff format 
Signed-off-by: Akhil Narang <me@akhilnarang.dev>
 2024-04-10 16:11:12 +05:30
ruthra kumar
22689958da fix: use 'eq' and isnull() on qb conditions 
(cherry picked from commit eee86d2e4b)
Signed-off-by: Akhil Narang <me@akhilnarang.dev>
 2024-04-10 16:11:12 +05:30
Akhil Narang
41d7c03cbb fix: exclude some query builder lines from ruff rules 
`== None` and `== True` are intentional here

(cherry picked from commit ac69513f60)
Signed-off-by: Akhil Narang <me@akhilnarang.dev>
 2024-04-10 16:11:10 +05:30
Akhil Narang
7828eee014 fix(treewide): manual ruff fixes 
(cherry picked from commit f63396ef47)
Signed-off-by: Akhil Narang <me@akhilnarang.dev>
 2024-04-10 16:11:10 +05:30
ruthra kumar
9b1e36ebf0 Merge pull request #40938 from frappe/mergify/bp/version-15-hotfix/pr-40936 
fix: ignore dimension validation for cancelled entries (backport #40936)
 2024-04-10 15:28:16 +05:30
Akhil Narang
960ef14b7a refactor(treewide): formatting and ruff fixes, + manually enabled F401 
Signed-off-by: Akhil Narang <me@akhilnarang.dev>
 2024-04-10 14:15:58 +05:30
ruthra kumar
b288c73437 fix: ignore dimension validation for cancelled entries 
(cherry picked from commit 971c867f29)
 2024-04-10 08:29:25 +00:00
barredterra
9eeedd8515 chore: switch to ruff for python formatting/linting 
(cherry picked from commit 8afb7790de)
Signed-off-by: Akhil Narang <me@akhilnarang.dev>
 2024-04-10 13:10:19 +05:30
ruthra kumar
0f58a3918a Merge pull request #40930 from frappe/mergify/bp/version-15-hotfix/pr-40695 
feat: Periodically monitor ledger health (backport #40695)
 2024-04-09 20:00:23 +05:30
ruthra kumar
501c88ca3a Merge pull request #40928 from frappe/mergify/bp/version-15-hotfix/pr-40926 
fix: incorrect currency symbol in General Ledger print (backport #40926)
 2024-04-09 19:54:48 +05:30
ruthra kumar
b22784878f chore: use super() instead of super(__class__, self) 
(cherry picked from commit 24d37d22a3)
 2024-04-09 12:25:56 +00:00
ruthra kumar
d8f627a9d7 chore: make ledger health doctype read_only 
(cherry picked from commit dc79213bb3)
 2024-04-09 12:25:55 +00:00
ruthra kumar
711a6eaaaf test: ledger monitoring function 
(cherry picked from commit 4776d660b5)
 2024-04-09 12:25:55 +00:00
ruthra kumar
9834e3ab7f chore: schedule job to run daily 
(cherry picked from commit f96cf111ed)
 2024-04-09 12:25:55 +00:00
ruthra kumar
a331eadf29 chore: permission and UI changes 
(cherry picked from commit 1a43ed763b)
 2024-04-09 12:25:55 +00:00
ruthra kumar
bf0cfae9c9 refactor: only run checks on specified companies 
(cherry picked from commit 00eeacd06a)
 2024-04-09 12:25:54 +00:00
ruthra kumar
522cfd0c9a refactor: make health check configurable for companies 
(cherry picked from commit 704925549b)
 2024-04-09 12:25:54 +00:00
ruthra kumar
9bae5e37cd refactor: control monitoring through settings page 
(cherry picked from commit a42482ce35)
 2024-04-09 12:25:53 +00:00
ruthra kumar
9fbb4f676b chore: settings page for health monitor 
(cherry picked from commit b2fb7843d1)
 2024-04-09 12:25:53 +00:00
ruthra kumar
0f927f99a4 refactor: barebones method to run checks 
(cherry picked from commit 8c8d9be810)
 2024-04-09 12:25:53 +00:00
ruthra kumar
6bf997ee96 refactor: flag for general and payment ledger mismatch 
(cherry picked from commit d620b9eae8)
 2024-04-09 12:25:52 +00:00
ruthra kumar
b8bcae9252 refactor: date on which vouchers was reported 
(cherry picked from commit 402ffc6d27)
 2024-04-09 12:25:51 +00:00
ruthra kumar
5d978c2729 feat: ledger health doctype 
(cherry picked from commit 9ed74dd8cc)
 2024-04-09 12:25:51 +00:00
ruthra kumar
9f4663b4d0 fix: incorrect currency symbol in General Ledger print 
(cherry picked from commit 429e036e8c)
 2024-04-09 12:16:47 +00:00
rohitwaghchaure
8cc5b99986 Merge pull request #40922 from frappe/mergify/bp/version-15-hotfix/pr-40909 
fix: pick list validation didn't consider existing draft pick list (backport #40909)
 2024-04-09 17:28:18 +05:30
rohitwaghchaure
7a0e313895 chore: fix conflicts 2024-04-09 16:57:02 +05:30
Rohit Waghchaure
722abf1b6b fix: pick list validation didn't consider existing draft pick list 
(cherry picked from commit 3bce4d92f6)

# Conflicts:
#	erpnext/stock/doctype/pick_list/pick_list.py
 2024-04-09 11:25:22 +00:00
Sagar Vora
566d4fa76e Merge pull request #40907 from frappe/mergify/bp/version-15-hotfix/pr-40831 2024-04-08 10:19:31 +00:00
Smit Vora
4ef4466e67 feat: new hook fields_for_group_similar_items to group additional fields for print formats (#40831) 
(cherry picked from commit f7c9e1538b)
 2024-04-08 10:18:24 +00:00
ruthra kumar
6cefe45e5b Merge pull request #40905 from frappe/mergify/bp/version-15-hotfix/pr-40878 
refactor: merge taxes from delivery note to Sales Invoice (backport #40878)
 2024-04-08 15:47:11 +05:30
ruthra kumar
d4a74923c1 test: tax merging from 2 Delivery Note to Sales Invoice 
(cherry picked from commit 39a48a2e2a)
 2024-04-08 09:09:46 +00:00
ruthra kumar
e9b87fdd42 refactor: merge taxes from delivery note to Sales Invoice 
(cherry picked from commit 550cbbd91c)
 2024-04-08 09:09:46 +00:00
ruthra kumar
7f790ca908 Merge pull request #40903 from frappe/mergify/bp/version-15-hotfix/pr-40876 
fix: ledger entries for Payment against reverse payment reconciliation (backport #40876)
 2024-04-08 09:11:33 +05:30
ruthra kumar
2373dd9b95 chore: resolve conflicts 2024-04-08 08:52:41 +05:30
ruthra kumar
67df5ae0ec refactor(test): include new fields in assertion 
(cherry picked from commit 64b7f624a5)
 2024-04-08 01:59:13 +00:00
ruthra kumar
7c0d46409f test: advance payment against reverse payment reconciliation 
(cherry picked from commit 141f462368)
 2024-04-08 01:59:13 +00:00
ruthra kumar
4ad423b1b9 test: reverse payment against payment for supplier 
(cherry picked from commit 248cc6105b)
 2024-04-08 01:59:12 +00:00
ruthra kumar
3668de7cb7 fix(test): for reverse payments, only advance acc should have effect 
This applies for Payments against Reverse-Payment reconcilition

(cherry picked from commit 74bc38e0af)
 2024-04-08 01:59:12 +00:00
ruthra kumar
d9826e3dfc refactor: supplementary field to better handle reverse payments 
(cherry picked from commit bdd36b0001)

# Conflicts:
#	erpnext/accounts/doctype/payment_entry_reference/payment_entry_reference.json
 2024-04-08 01:59:12 +00:00