nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-07 07:02:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: default discount account in company

Browse Source
This commit is contained in:
Saqib Ansari
2021-02-16 11:43:16 +05:30
committed by Deepesh Garg
parent 666af17cfa
commit 2c56ae78a7
2 changed files with 25 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
erpnext/accounts/doctype/payment_entry/payment_entry.py
View File

@@ -1142,7 +1142,7 @@ def get_payment_entry(dt, dn, party_amount=None, bank_account=None, bank_amount=
paid_amount, received_amount = set_paid_amount_and_received_amount( paid_amount, received_amount = set_paid_amount_and_received_amount(
dt, party_account_currency, bank, outstanding_amount, payment_type, bank_amount, doc) dt, party_account_currency, bank, outstanding_amount, payment_type, bank_amount, doc)
paid_amount, received_amount, difference_amount = apply_early_payment_discount(paid_amount, received_amount, doc) paid_amount, received_amount, discount_amount = apply_early_payment_discount(paid_amount, received_amount, doc)
pe = frappe.new_doc("Payment Entry") pe = frappe.new_doc("Payment Entry")
pe.payment_type = payment_type pe.payment_type = payment_type
@@ -1213,11 +1213,20 @@ def get_payment_entry(dt, dn, party_amount=None, bank_account=None, bank_amount=
pe.setup_party_account_field() pe.setup_party_account_field()
pe.set_missing_values() pe.set_missing_values()
if party_account and bank: if party_account and bank:
if dt == "Employee Advance": if dt == "Employee Advance":
reference_doc = doc reference_doc = doc
pe.set_exchange_rate(ref_doc=reference_doc) pe.set_exchange_rate(ref_doc=reference_doc)
pe.set_amounts() pe.set_amounts()
if discount_amount:
pe.set_gain_or_loss(account_details={
'account': frappe.get_cached_value('Company', pe.company, "default_discount_account"),
'cost_center': pe.cost_center or frappe.get_cached_value('Company', pe.company, "cost_center"),
'amount': discount_amount * -1 if payment_type == "Pay" else 1
})
pe.set_difference_amount()
return pe return pe
def get_bank_cash_account(doc, bank_account): def get_bank_cash_account(doc, bank_account):
@@ -1334,8 +1343,8 @@ def set_paid_amount_and_received_amount(dt, party_account_currency, bank, outsta
return paid_amount, received_amount return paid_amount, received_amount
def apply_early_payment_discount(paid_amount, received_amount, doc): def apply_early_payment_discount(paid_amount, received_amount, doc):
difference_amount = 0 total_discount = 0
if doc.doctype in ["Sales Invoice", "Purchase Invoice"] and doc.payment_schedule: if doc.doctype in ['Sales Invoice', 'Purchase Invoice'] and doc.payment_schedule:
for term in doc.payment_schedule: for term in doc.payment_schedule:
if not term.discounted_amount and term.discount and getdate(nowdate()) <= term.discount_date: if not term.discounted_amount and term.discount and getdate(nowdate()) <= term.discount_date:
if term.discount_type == 'Percentage': if term.discount_type == 'Percentage':
@@ -1345,20 +1354,20 @@ def apply_early_payment_discount(paid_amount, received_amount, doc):
discount_amount_in_foreign_currency = discount_amount * doc.get('conversion_rate', 1) discount_amount_in_foreign_currency = discount_amount * doc.get('conversion_rate', 1)
if doc.doctype == "Sales Invoice": if doc.doctype == 'Sales Invoice':
paid_amount -= discount_amount paid_amount -= discount_amount
received_amount -= discount_amount_in_foreign_currency received_amount -= discount_amount_in_foreign_currency
else: else:
received_amount -= discount_amount received_amount -= discount_amount
paid_amount -= discount_amount_in_foreign_currency paid_amount -= discount_amount_in_foreign_currency
difference_amount += discount_amount total_discount += discount_amount
if difference_amount: if total_discount:
money = frappe.utils.fmt_money(difference_amount, currency=doc.get('currency')) money = frappe.utils.fmt_money(total_discount, currency=doc.get('currency'))
frappe.msgprint(_("Discount of {} applied as per Payment Term").format(money), alert=1) frappe.msgprint(_("Discount of {} applied as per Payment Term").format(money), alert=1)
return paid_amount, received_amount, difference_amount return paid_amount, received_amount, total_discount
def get_reference_as_per_payment_terms(payment_schedule, dt, dn, doc, grand_total, outstanding_amount): def get_reference_as_per_payment_terms(payment_schedule, dt, dn, doc, grand_total, outstanding_amount):
references = [] references = []

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

@@ -59,6 +59,7 @@
"default_deferred_expense_account", "default_deferred_expense_account",
"default_payroll_payable_account", "default_payroll_payable_account",
"default_expense_claim_payable_account", "default_expense_claim_payable_account",
"default_discount_account",
"section_break_22", "section_break_22",
"cost_center", "cost_center",
"column_break_26", "column_break_26",
@@ -733,6 +734,12 @@
"fieldtype": "Link", "fieldtype": "Link",
"label": "Unrealized Profit / Loss Account", "label": "Unrealized Profit / Loss Account",
"options": "Account" "options": "Account"
},
{
"fieldname": "default_discount_account",
"fieldtype": "Link",
"label": "Default Payment Discount Account",
"options": "Account"
} }
], ],
"icon": "fa fa-building", "icon": "fa fa-building",
@@ -740,7 +747,7 @@
"image_field": "company_logo", "image_field": "company_logo",
"is_tree": 1, "is_tree": 1,
"links": [], "links": [],
"modified": "2020-12-03 12:27:27.085094", "modified": "2021-02-16 11:12:03.400217",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Setup", "module": "Setup",
"name": "Company", "name": "Company",