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
47,037 Commits 398 Branches 1,698 Tags
2ebdd93a834ba84bd0ea861806cbc9d1ded60e4b
Commit Graph

47037 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ruthra kumar
2ebdd93a83 test: exc gain/loss journals booking in Payable accounts 
(cherry picked from commit 8821c98625)
 2024-04-16 05:29:49 +00:00
ruthra kumar
50a74ee7fe fix: incorrect exc gain/loss for PE against JE for payable accounts 
(cherry picked from commit 81b574053f)

# Conflicts:
#	erpnext/controllers/accounts_controller.py
 2024-04-16 05:29:49 +00:00
Nabin Hait
da1c317c6c Merge pull request #41006 from frappe/mergify/bp/version-14-hotfix/pr-40858 
fix: Don't set delivery date as today while making SO from Quotation (backport #40858)
 2024-04-15 13:05:21 +05:30
Nabin Hait
79e23dad2c fix: test cases 
(cherry picked from commit 65c74fa3c7)
 2024-04-15 07:03:42 +00:00
Nabin Hait
b47e224a1c fix: Don't set delivery date as today while making SO from Quotation 
(cherry picked from commit fec20decc1)
 2024-04-15 07:03:42 +00:00
Deepesh Garg
3310358d36 Merge pull request #40947 from frappe/mergify/bp/version-14-hotfix/pr-40931 
fix: Don't call get_fiscal_year if setup is not done yet (backport #40931)
 2024-04-15 11:18:06 +05:30
mergify[bot]
c2c4548cc0 fix: Subcontracting Receipt GL Entries (backport #40773) (#40978) 
* fix: Subcontracting Receipt GL Entries

(cherry picked from commit 9808ae92a4)

* chore: linter

---------

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2024-04-12 14:50:12 +05:30
Deepesh Garg
cc925ae938 fix: Resolve merge conflicts 2024-04-12 12:10:55 +05:30
Akhil Narang
f0ecc627fb Merge pull request #40943 from akhilnarang/v14-ruff 
chore: backport ruff linting/formatting
 2024-04-12 11:01:43 +05:30
Akhil Narang
cf3c26d80c chore: gitignore ruff format 
Signed-off-by: Akhil Narang <me@akhilnarang.dev>
 2024-04-12 11:01:32 +05:30
Corentin Flr
59cea9f4dd fix: Don't call get_fiscal_year if setup is not done yet 
(cherry picked from commit c203fafb1b)

# Conflicts:
#	erpnext/public/js/utils.js
 2024-04-10 15:17:44 +00:00
ruthra kumar
b4ed2d2c16 fix: use 'eq' and isnull() on qb conditions 
(cherry picked from commit eee86d2e4b)
(cherry picked from commit 22689958da)
Signed-off-by: Akhil Narang <me@akhilnarang.dev>
 2024-04-10 17:13:31 +05:30
Akhil Narang
2425119b5e fix: exclude some query builder lines from ruff rules 
`== None` and `== True` are intentional here

(cherry picked from commit ac69513f60)
(cherry picked from commit 41d7c03cbb)
Signed-off-by: Akhil Narang <me@akhilnarang.dev>
 2024-04-10 17:13:31 +05:30
Akhil Narang
b087fb3d54 fix(treewide): manual ruff fixes 
(cherry picked from commit f63396ef47)
(cherry picked from commit 7828eee014)
Signed-off-by: Akhil Narang <me@akhilnarang.dev>
 2024-04-10 17:13:31 +05:30
Akhil Narang
4d34b1ead7 refactor(treewide): formatting and ruff fixes, + manually enabled F401 
Signed-off-by: Akhil Narang <me@akhilnarang.dev>
 2024-04-10 17:13:31 +05:30
barredterra
c28d19cf7f chore: switch to ruff for python formatting/linting 
(cherry picked from commit 8afb7790de)
(cherry picked from commit 9eeedd8515)
Signed-off-by: Akhil Narang <me@akhilnarang.dev>
 2024-04-10 17:07:51 +05:30
ruthra kumar
73d2595aa6 Merge pull request #40937 from frappe/mergify/bp/version-14-hotfix/pr-40936 
fix: ignore dimension validation for cancelled entries (backport #40936)
 2024-04-10 15:28:00 +05:30
ruthra kumar
9745724d41 fix: ignore dimension validation for cancelled entries 
(cherry picked from commit 971c867f29)
 2024-04-10 08:28:35 +00:00
ruthra kumar
a31b2e17f5 Merge pull request #40929 from frappe/mergify/bp/version-14-hotfix/pr-40695 
feat: Periodically monitor ledger health (backport #40695)
 2024-04-10 07:17:29 +05:30
ruthra kumar
46c76b166d chore: resolve conflicts 2024-04-09 19:59:09 +05:30
ruthra kumar
6079c5636e Merge pull request #40927 from frappe/mergify/bp/version-14-hotfix/pr-40926 
fix: incorrect currency symbol in General Ledger print (backport #40926)
 2024-04-09 19:54:29 +05:30
ruthra kumar
5808feaccf chore: use super() instead of super(__class__, self) 
(cherry picked from commit 24d37d22a3)
 2024-04-09 12:25:55 +00:00
ruthra kumar
98ad034b21 chore: make ledger health doctype read_only 
(cherry picked from commit dc79213bb3)
 2024-04-09 12:25:55 +00:00
ruthra kumar
277717a2e0 test: ledger monitoring function 
(cherry picked from commit 4776d660b5)
 2024-04-09 12:25:55 +00:00
ruthra kumar
0591f72e01 chore: schedule job to run daily 
(cherry picked from commit f96cf111ed)
 2024-04-09 12:25:54 +00:00
ruthra kumar
1af6b4256f chore: permission and UI changes 
(cherry picked from commit 1a43ed763b)
 2024-04-09 12:25:53 +00:00
ruthra kumar
6273a31b8c refactor: only run checks on specified companies 
(cherry picked from commit 00eeacd06a)

# Conflicts:
#	erpnext/accounts/utils.py
 2024-04-09 12:25:53 +00:00
ruthra kumar
f86c035f88 refactor: make health check configurable for companies 
(cherry picked from commit 704925549b)
 2024-04-09 12:25:52 +00:00
ruthra kumar
9981a900b2 refactor: control monitoring through settings page 
(cherry picked from commit a42482ce35)

# Conflicts:
#	erpnext/accounts/utils.py
 2024-04-09 12:25:52 +00:00
ruthra kumar
7a6ffccecc chore: settings page for health monitor 
(cherry picked from commit b2fb7843d1)
 2024-04-09 12:25:47 +00:00
ruthra kumar
58698c9aa4 refactor: barebones method to run checks 
(cherry picked from commit 8c8d9be810)

# Conflicts:
#	erpnext/accounts/utils.py
 2024-04-09 12:25:47 +00:00
ruthra kumar
bbe4ca7d74 refactor: flag for general and payment ledger mismatch 
(cherry picked from commit d620b9eae8)
 2024-04-09 12:25:46 +00:00
ruthra kumar
153fc91478 refactor: date on which vouchers was reported 
(cherry picked from commit 402ffc6d27)
 2024-04-09 12:25:45 +00:00
ruthra kumar
b667a02470 feat: ledger health doctype 
(cherry picked from commit 9ed74dd8cc)
 2024-04-09 12:25:45 +00:00
ruthra kumar
5896e755bf fix: incorrect currency symbol in General Ledger print 
(cherry picked from commit 429e036e8c)
 2024-04-09 12:16:41 +00:00
rohitwaghchaure
dd6c53df96 Merge pull request #40910 from rohitwaghchaure/fixed-perf-issue-for-batchwise-balance-history 
perf: memory consumption for the Batch-Wise Balance History report
 2024-04-09 17:36:43 +05:30
Rohit Waghchaure
3165682d7a perf: memory consumption for the Batch-Wise Balance History report 2024-04-08 19:03:48 +05:30
ruthra kumar
aff71970e5 Merge pull request #40904 from frappe/mergify/bp/version-14-hotfix/pr-40878 
refactor: merge taxes from delivery note to Sales Invoice (backport #40878)
 2024-04-08 16:18:48 +05:30
Sagar Vora
2b5ae1dbae Merge pull request #40906 from frappe/mergify/bp/version-14-hotfix/pr-40831 2024-04-08 10:22:43 +00:00
Sagar Vora
24709ab400 chore: fix conflict 2024-04-08 15:50:58 +05:30
Smit Vora
0172880fd3 feat: new hook fields_for_group_similar_items to group additional fields for print formats (#40831) 
(cherry picked from commit f7c9e1538b)

# Conflicts:
#	erpnext/hooks.py
 2024-04-08 10:18:15 +00:00
ruthra kumar
b76c00de68 chore: resolve conflict 2024-04-08 15:44:13 +05:30
ruthra kumar
ae1858f465 test: tax merging from 2 Delivery Note to Sales Invoice 
(cherry picked from commit 39a48a2e2a)

# Conflicts:
#	erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py
 2024-04-08 09:09:36 +00:00
ruthra kumar
22b16a6b0e refactor: merge taxes from delivery note to Sales Invoice 
(cherry picked from commit 550cbbd91c)
 2024-04-08 09:09:34 +00:00
Nabin Hait
1eb720a7b0 Merge pull request #40897 from nabinhait/pro-rata-depr-fix 
fix: Get pro-rata depr amount based on correct days
 2024-04-07 15:23:42 +05:30
rohitwaghchaure
c4e950f6b5 Merge pull request #40835 from frappe/mergify/bp/version-14-hotfix/pr-40834 
fix: translatable web footer (backport #40834)
 2024-04-07 14:35:45 +05:30
rohitwaghchaure
d4313f7109 Merge pull request #40859 from frappe/mergify/bp/version-14-hotfix/pr-40848 
fix: group warehouse added in the stock reconciliation (backport #40848)
 2024-04-07 14:34:33 +05:30
rohitwaghchaure
26d7354973 Merge pull request #40893 from frappe/mergify/bp/version-14-hotfix/pr-40883 
fix: incorrect operator causing incorrect validation (backport #40883)
 2024-04-07 14:33:10 +05:30
Nabin Hait
10d760089e fix: Get pro-rata depr amount based on correct days 2024-04-07 14:08:45 +05:30
Rohit Waghchaure
7e1ab75b38 fix: incorrect operator causing incorrect validation 
(cherry picked from commit 6b317b0c0d)
 2024-04-07 06:34:07 +00:00