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 |
|
rohitwaghchaure
|
0f9af4b82c
|
Merge pull request #40888 from frappe/mergify/bp/version-14-hotfix/pr-40887
fix: query_report.trigger_refresh is not a function (backport #40887)
|
2024-04-07 12:02:16 +05:30 |
|
Rohit Waghchaure
|
a6145fa13c
|
fix: query_report.trigger_refresh is not a function
(cherry picked from commit 30bbb58ca1)
|
2024-04-07 06:27:49 +00:00 |
|
ruthra kumar
|
cc2f861bca
|
Merge pull request #40868 from frappe/mergify/bp/version-14-hotfix/pr-40856
fix: unwanted Exc Gain/Loss journals on Payment against Journal entry (backport #40856)
|
2024-04-05 11:01:48 +05:30 |
|
ruthra kumar
|
8f2fd5dec9
|
test: payment against JE reconciliation with different rates
(cherry picked from commit fe84558b77)
|
2024-04-05 05:03:56 +00:00 |
|
ruthra kumar
|
09cda60bdf
|
fix: use reference type name to update exc rate
(cherry picked from commit c15690e475)
|
2024-04-05 05:03:56 +00:00 |
|
Rohit Waghchaure
|
9dea6d3393
|
fix: group warehouse added in the stock reconciliation
(cherry picked from commit 8f53bc0096)
|
2024-04-04 10:09:55 +00:00 |
|
Raffael Meyer
|
b55d8597e8
|
fix: translatable web footer (#40834)
(cherry picked from commit f3bcdbe5bd)
|
2024-04-02 15:16:18 +00:00 |
|
Nabin Hait
|
81081663c4
|
Merge pull request #40826 from frappe/mergify/bp/version-14-hotfix/pr-40584
fix: show currency symbol in base currency in fixed asset register report (backport #40584)
|
2024-04-02 18:29:58 +05:30 |
|
rohitwaghchaure
|
2f66542d71
|
Merge pull request #40824 from rohitwaghchaure/fixed-remove-enqueue-submit-cancel
chore: remove enqueue submit and cancel from the stock entry
|
2024-04-02 16:34:57 +05:30 |
|
Rohit Waghchaure
|
abc0294cbf
|
chore: remove enqueue submit and cancel from stock entry
|
2024-04-02 16:10:28 +05:30 |
|
Nabin Hait
|
515f933362
|
fix: linter issues
(cherry picked from commit 21a40a2236)
|
2024-04-02 10:27:57 +00:00 |
|
Nabin Hait
|
cfe5f009f6
|
fix: show currency symbol in base currency in fixed asset register report
(cherry picked from commit 8b6220efd8)
|
2024-04-02 10:27:56 +00:00 |
|
ruthra kumar
|
cf74f8312e
|
Merge pull request #40803 from frappe/mergify/bp/version-14-hotfix/pr-40181
fix: show future payments consider allocated sales returns (backport #40181)
|
2024-04-01 14:13:59 +05:30 |
|
Devin Slauenwhite
|
803ed904a9
|
fix: show future payments allocated sales returns is considered as payment
(cherry picked from commit 3381d0d945)
|
2024-04-01 07:34:41 +00:00 |
|
Devin Slauenwhite
|
72db656054
|
test: show future payments allocated sales returns is considered as payment
(cherry picked from commit daaa00bd4a)
|
2024-04-01 07:34:40 +00:00 |
|