Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: set against type in deferred revenue

Browse Source
This commit is contained in:
Gursheen Anand 2023-09-25 19:50:47 +05:30
parent 19b220f39c
commit 82774f89b1
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/accounts/deferred_revenue.py
View File

@ -358,9 +358,11 @@ def book_deferred_income_or_expense(doc, deferred_process, posting_date=None):
account_currency = get_account_currency(item.expense_account or item.income_account) account_currency = get_account_currency(item.expense_account or item.income_account)
if doc.doctype == "Sales Invoice": if doc.doctype == "Sales Invoice":
against_type = "Customer"
against, project = doc.customer, doc.project against, project = doc.customer, doc.project
credit_account, debit_account = item.income_account, item.deferred_revenue_account credit_account, debit_account = item.income_account, item.deferred_revenue_account
else: else:
against_type = "Supplier"
against, project = doc.supplier, item.project against, project = doc.supplier, item.project
credit_account, debit_account = item.deferred_expense_account, item.expense_account credit_account, debit_account = item.deferred_expense_account, item.expense_account
@ -413,6 +415,7 @@ def book_deferred_income_or_expense(doc, deferred_process, posting_date=None):
doc, doc,
credit_account, credit_account,
debit_account, debit_account,
against_type,
against, against,
amount, amount,
base_amount, base_amount,
@ -494,6 +497,7 @@ def make_gl_entries(
doc, doc,
credit_account, credit_account,
debit_account, debit_account,
against_type,
against, against,
amount, amount,
base_amount, base_amount,
@ -515,6 +519,7 @@ def make_gl_entries(
doc.get_gl_dict( doc.get_gl_dict(
{ {
"account": credit_account, "account": credit_account,
"against_type": against_type,
"against": against, "against": against,
"credit": base_amount, "credit": base_amount,
"credit_in_account_currency": amount, "credit_in_account_currency": amount,
@ -534,6 +539,7 @@ def make_gl_entries(
doc.get_gl_dict( doc.get_gl_dict(
{ {
"account": debit_account, "account": debit_account,
"against_type": against_type,
"against": against, "against": against,
"debit": base_amount, "debit": base_amount,
"debit_in_account_currency": amount, "debit_in_account_currency": amount,