schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #40627 from deepeshgarg007/da_code_cleanup

Browse Source 
chore: Discount accounting code cleanup
This commit is contained in:
Deepesh Garg
2024-03-25 19:06:26 +05:30
committed by GitHub
parent 7d7d10e422 aaa1df6a1f
commit e04a3b107a
1 changed files with 18 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
erpnext/controllers/accounts_controller.py
View File

@@ -1649,37 +1649,15 @@ class AccountsController(TransactionBase):
return amount, base_amount return amount, base_amount
def make_discount_gl_entries(self, gl_entries): def make_discount_gl_entries(self, gl_entries):
if self.doctype == "Purchase Invoice":
enable_discount_accounting = cint(
frappe.db.get_single_value("Buying Settings", "enable_discount_accounting")
)
elif self.doctype == "Sales Invoice":
enable_discount_accounting = cint( enable_discount_accounting = cint(
frappe.db.get_single_value("Selling Settings", "enable_discount_accounting") frappe.db.get_single_value("Selling Settings", "enable_discount_accounting")
) )
if self.doctype == "Purchase Invoice":
dr_or_cr = "credit"
rev_dr_cr = "debit"
supplier_or_customer = self.supplier
else:
dr_or_cr = "debit"
rev_dr_cr = "credit"
supplier_or_customer = self.customer
if enable_discount_accounting: if enable_discount_accounting:
for item in self.get("items"): for item in self.get("items"):
if item.get("discount_amount") and item.get("discount_account"): if item.get("discount_amount") and item.get("discount_account"):
discount_amount = item.discount_amount * item.qty discount_amount = item.discount_amount * item.qty
if self.doctype == "Purchase Invoice": income_account = (
income_or_expense_account = (
item.expense_account
if (not item.enable_deferred_expense or self.is_return)
else item.deferred_expense_account
)
else:
income_or_expense_account = (
item.income_account item.income_account
if (not item.enable_deferred_revenue or self.is_return) if (not item.enable_deferred_revenue or self.is_return)
else item.deferred_revenue_account else item.deferred_revenue_account
@@ -1690,11 +1668,11 @@ class AccountsController(TransactionBase):
self.get_gl_dict( self.get_gl_dict(
{ {
"account": item.discount_account, "account": item.discount_account,
"against": supplier_or_customer, "against": self.customer,
dr_or_cr: flt( "debit": flt(
discount_amount * self.get("conversion_rate"), item.precision("discount_amount") discount_amount * self.get("conversion_rate"), item.precision("discount_amount")
), ),
dr_or_cr + "_in_account_currency": flt(discount_amount, item.precision("discount_amount")), "debit_in_account_currency": flt(discount_amount, item.precision("discount_amount")),
"cost_center": item.cost_center, "cost_center": item.cost_center,
"project": item.project, "project": item.project,
}, },
@@ -1703,17 +1681,16 @@ class AccountsController(TransactionBase):
) )
) )
account_currency = get_account_currency(income_or_expense_account) account_currency = get_account_currency(income_account)
gl_entries.append( gl_entries.append(
self.get_gl_dict( self.get_gl_dict(
{ {
"account": income_or_expense_account, "account": income_account,
"against": supplier_or_customer, "against": self.customer,
rev_dr_cr: flt( "credit": flt(
discount_amount * self.get("conversion_rate"), item.precision("discount_amount") discount_amount * self.get("conversion_rate"), item.precision("discount_amount")
), ),
rev_dr_cr "credit_in_account_currency": flt(discount_amount, item.precision("discount_amount")),
+ "_in_account_currency": flt(discount_amount, item.precision("discount_amount")),
"cost_center": item.cost_center, "cost_center": item.cost_center,
"project": item.project or self.project, "project": item.project or self.project,
}, },
@@ -1731,8 +1708,8 @@ class AccountsController(TransactionBase):
self.get_gl_dict( self.get_gl_dict(
{ {
"account": self.additional_discount_account, "account": self.additional_discount_account,
"against": supplier_or_customer, "against": self.customer,
dr_or_cr: self.base_discount_amount, "debit": self.base_discount_amount,
"cost_center": self.cost_center or erpnext.get_default_cost_center(self.company), "cost_center": self.cost_center or erpnext.get_default_cost_center(self.company),
}, },
item=self, item=self,