nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-13 10:11:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #42462 from ruthra-kumar/monthly_err_revaluation

Browse Source 
refactor: provision for re-evaluating Exchange Rates in monthly frequency
This commit is contained in:
ruthra kumar
2024-07-24 18:44:04 +05:30
committed by GitHub
parent 06e2d7265c fc4e5f165c
commit e062ec38b0
4 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
erpnext/accounts/utils.py
View File

@@ -1614,6 +1614,18 @@ def auto_create_exchange_rate_revaluation_weekly() -> None:
create_err_and_its_journals(companies) create_err_and_its_journals(companies)
def auto_create_exchange_rate_revaluation_monthly() -> None:
"""
Executed by background job
"""
companies = frappe.db.get_all(
"Company",
filters={"auto_exchange_rate_revaluation": 1, "auto_err_frequency": "Montly"},
fields=["name", "submit_err_jv"],
)
create_err_and_its_journals(companies)
def get_payment_ledger_entries(gl_entries, cancel=0): def get_payment_ledger_entries(gl_entries, cancel=0):
ple_map = [] ple_map = []
if gl_entries: if gl_entries:

1
erpnext/hooks.py
View File

@@ -449,6 +449,7 @@ scheduler_events = {
], ],
"monthly_long": [ "monthly_long": [
"erpnext.accounts.deferred_revenue.process_deferred_accounting", "erpnext.accounts.deferred_revenue.process_deferred_accounting",
"erpnext.accounts.utils.auto_create_exchange_rate_revaluation_monthly",
], ],
} }

4
erpnext/setup/doctype/company/company.json
View File

@@ -738,7 +738,7 @@
"fieldname": "auto_err_frequency", "fieldname": "auto_err_frequency",
"fieldtype": "Select", "fieldtype": "Select",
"label": "Frequency", "label": "Frequency",
"options": "Daily\nWeekly" "options": "Daily\nWeekly\nMonthly"
}, },
{ {
"default": "0", "default": "0",
@@ -792,7 +792,7 @@
"image_field": "company_logo", "image_field": "company_logo",
"is_tree": 1, "is_tree": 1,
"links": [], "links": [],
"modified": "2024-06-21 17:46:25.567565", "modified": "2024-07-24 18:17:56.413971",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Setup", "module": "Setup",
"name": "Company", "name": "Company",

2
erpnext/setup/doctype/company/company.py
View File

@@ -31,7 +31,7 @@ class Company(NestedSet):
accumulated_depreciation_account: DF.Link | None accumulated_depreciation_account: DF.Link | None
allow_account_creation_against_child_company: DF.Check allow_account_creation_against_child_company: DF.Check
asset_received_but_not_billed: DF.Link | None asset_received_but_not_billed: DF.Link | None
auto_err_frequency: DF.Literal["Daily", "Weekly"] auto_err_frequency: DF.Literal["Daily", "Weekly", "Monthly"]
auto_exchange_rate_revaluation: DF.Check auto_exchange_rate_revaluation: DF.Check
book_advance_payments_in_separate_party_account: DF.Check book_advance_payments_in_separate_party_account: DF.Check
capital_work_in_progress_account: DF.Link | None capital_work_in_progress_account: DF.Link | None