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

fix: Codacy

Browse Source
This commit is contained in:
Charles-Henri Decultot
2019-04-26 20:52:12 +02:00
parent f83514418e
commit 1aa5462f36
1 changed files with 31 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
erpnext/accounts/doctype/bank_transaction/bank_transaction.py
View File

@@ -40,9 +40,8 @@ class BankTransaction(StatusUpdater):
def clear_linked_payment_entries(self): def clear_linked_payment_entries(self):
for payment_entry in self.payment_entries: for payment_entry in self.payment_entries:
allocated_amount = self.get_total_allocated_amount(payment_entry) allocated_amount = get_total_allocated_amount(payment_entry)
print(allocated_amount) paid_amount = get_paid_amount(payment_entry)
paid_amount = self.get_paid_amount(payment_entry)
if paid_amount and allocated_amount: if paid_amount and allocated_amount:
if flt(allocated_amount[0]["allocated_amount"]) > flt(paid_amount): if flt(allocated_amount[0]["allocated_amount"]) > flt(paid_amount):
@@ -54,7 +53,14 @@ class BankTransaction(StatusUpdater):
elif payment_entry.payment_document == "Sales Invoice": elif payment_entry.payment_document == "Sales Invoice":
self.clear_sales_invoice(payment_entry) self.clear_sales_invoice(payment_entry)
def get_total_allocated_amount(self, payment_entry): def clear_simple_entry(self, payment_entry):
frappe.db.set_value(payment_entry.payment_document, payment_entry.payment_entry, "clearance_date", self.date)
def clear_sales_invoice(self, payment_entry):
frappe.db.set_value("Sales Invoice Payment", dict(parenttype=payment_entry.payment_document,
parent=payment_entry.payment_entry), "clearance_date", self.date)
def get_total_allocated_amount(payment_entry):
return frappe.db.sql(""" return frappe.db.sql("""
SELECT SELECT
SUM(btp.allocated_amount) as allocated_amount, SUM(btp.allocated_amount) as allocated_amount,
@@ -70,7 +76,7 @@ class BankTransaction(StatusUpdater):
AND AND
bt.docstatus = 1""", (payment_entry.payment_document, payment_entry.payment_entry), as_dict=True) bt.docstatus = 1""", (payment_entry.payment_document, payment_entry.payment_entry), as_dict=True)
def get_paid_amount(self, payment_entry): def get_paid_amount(payment_entry):
if payment_entry.payment_document in ["Payment Entry", "Sales Invoice", "Purchase Invoice"]: if payment_entry.payment_document in ["Payment Entry", "Sales Invoice", "Purchase Invoice"]:
return frappe.db.get_value(payment_entry.payment_document, payment_entry.payment_entry, "paid_amount") return frappe.db.get_value(payment_entry.payment_document, payment_entry.payment_entry, "paid_amount")
@@ -83,13 +89,6 @@ class BankTransaction(StatusUpdater):
else: else:
frappe.throw("Please reconcile {0}: {1} manually".format(payment_entry.payment_document, payment_entry.payment_entry)) frappe.throw("Please reconcile {0}: {1} manually".format(payment_entry.payment_document, payment_entry.payment_entry))
def clear_simple_entry(self, payment_entry):
frappe.db.set_value(payment_entry.payment_document, payment_entry.payment_entry, "clearance_date", self.date)
def clear_sales_invoice(self, payment_entry):
frappe.db.set_value("Sales Invoice Payment", dict(parenttype=payment_entry.payment_document,
parent=payment_entry.payment_entry), "clearance_date", self.date)
@frappe.whitelist() @frappe.whitelist()
def unclear_reference_payment(doctype, docname): def unclear_reference_payment(doctype, docname):
if frappe.db.exists(doctype, docname): if frappe.db.exists(doctype, docname):