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

feat: Create GL Entries for discount accounting

Browse Source
This commit is contained in:
GangaManoj
2021-07-06 00:36:06 +05:30
parent 6e0d83d925
commit cf7579e29f
1 changed files with 35 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
erpnext/accounts/doctype/sales_invoice/sales_invoice.py
View File

@@ -845,6 +845,7 @@ class SalesInvoice(SellingController):
self.allocate_advance_taxes(gl_entries) self.allocate_advance_taxes(gl_entries)
self.make_item_gl_entries(gl_entries) self.make_item_gl_entries(gl_entries)
self.make_discount_gl_entries(gl_entries)
# merge gl entries before adding pos entries # merge gl entries before adding pos entries
gl_entries = merge_similar_entries(gl_entries) gl_entries = merge_similar_entries(gl_entries)
@@ -958,6 +959,40 @@ class SalesInvoice(SellingController):
erpnext.is_perpetual_inventory_enabled(self.company): erpnext.is_perpetual_inventory_enabled(self.company):
gl_entries += super(SalesInvoice, self).get_gl_entries() gl_entries += super(SalesInvoice, self).get_gl_entries()
def make_discount_gl_entries(self, gl_entries):
enable_discount_accounting = cint(frappe.db.get_single_value('Accounts Settings', 'enable_discount_accounting'))
if enable_discount_accounting:
for item in self.get("items"):
if item.get('discount_amount') and item.get('discount_account'):
account_currency = get_account_currency(item.discount_account)
gl_entries.append(
self.get_gl_dict({
"account": item.discount_account,
"against": self.customer,
"debit": flt(item.discount_amount),
"debit_in_account_currency": flt(item.discount_amount),
"cost_center": self.cost_center,
"project": self.project
}, account_currency, item=self)
)
income_account = (item.income_account
if (not item.enable_deferred_revenue or self.is_return)
else item.deferred_revenue_account)
account_currency = get_account_currency(income_account)
gl_entries.append(
self.get_gl_dict({
"account": income_account,
"against": self.customer,
"credit": flt(item.discount_amount),
"credit_in_account_currency": flt(item.discount_amount),
"cost_center": item.cost_center,
"project": item.project or self.project
}, account_currency, item=item)
)
def make_loyalty_point_redemption_gle(self, gl_entries): def make_loyalty_point_redemption_gle(self, gl_entries):
if cint(self.redeem_loyalty_points): if cint(self.redeem_loyalty_points):
gl_entries.append( gl_entries.append(