Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: minor linting issues (backport #27314) #46180

Closed
wants to merge 1 commit into from
Closed

fix: minor linting issues (backport #27314) #46180

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,11 @@ def on_trash(self):
if frappe.flags.in_test:
delete_accounting_dimension(doc=self)
else:
<<<<<<< HEAD
frappe.enqueue(delete_accounting_dimension, doc=self, queue="long")
=======
frappe.enqueue(delete_accounting_dimension, doc=self, queue='long')
>>>>>>> eec40513be (fix: minor linting issues (#27314))

def set_fieldname_and_label(self):
if not self.label:
Expand Down
12 changes: 12 additions & 0 deletions erpnext/accounts/doctype/payment_entry/payment_entry.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1839,10 +1839,14 @@ def get_reference_details(reference_doctype, reference_name, party_account_curre
}
)

<<<<<<< HEAD

def get_amounts_based_on_reference_doctype(
reference_doctype, ref_doc, party_account_currency, company_currency, reference_name
):
=======
def get_amounts_based_on_reference_doctype(reference_doctype, ref_doc, party_account_currency, company_currency, reference_name):
>>>>>>> eec40513be (fix: minor linting issues (#27314))
total_amount = outstanding_amount = exchange_rate = None
if reference_doctype == "Fees":
total_amount = ref_doc.get("grand_total")
Expand All @@ -1864,10 +1868,14 @@ def get_amounts_based_on_reference_doctype(

return total_amount, outstanding_amount, exchange_rate

<<<<<<< HEAD

def get_amounts_based_on_ref_doc(
reference_doctype, ref_doc, party_account_currency, company_currency
):
=======
def get_amounts_based_on_ref_doc(reference_doctype, ref_doc, party_account_currency, company_currency):
>>>>>>> eec40513be (fix: minor linting issues (#27314))
total_amount = outstanding_amount = exchange_rate = None
if ref_doc.doctype == "Expense Claim":
total_amount = flt(ref_doc.total_sanctioned_amount) + flt(ref_doc.total_taxes_and_charges)
Expand Down Expand Up @@ -1916,10 +1924,14 @@ def get_total_amount_exchange_rate_base_on_currency(

return total_amount, exchange_rate

<<<<<<< HEAD

def get_bill_no_and_update_amounts(
reference_doctype, ref_doc, total_amount, exchange_rate, party_account_currency, company_currency
):
=======
def get_bill_no_and_update_amounts(reference_doctype, ref_doc, total_amount, exchange_rate, party_account_currency, company_currency):
>>>>>>> eec40513be (fix: minor linting issues (#27314))
outstanding_amount = bill_no = None
if reference_doctype in ("Sales Invoice", "Purchase Invoice"):
outstanding_amount = ref_doc.get("outstanding_amount")
Expand Down
4 changes: 4 additions & 0 deletions erpnext/payroll/doctype/gratuity_rule/gratuity_rule.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ class GratuityRule(Document):
def validate(self):
for current_slab in self.gratuity_rule_slabs:
if (current_slab.from_year > current_slab.to_year) and current_slab.to_year != 0:
<<<<<<< HEAD
frappe.throw(
_("Row {0}: From (Year) can not be greater than To (Year)").format(current_slab.idx)
)
Expand All @@ -21,6 +22,9 @@ def validate(self):
frappe.throw(
_("You can not define multiple slabs if you have a slab with no lower and upper limits.")
)
=======
frappe.throw(_("Row {0}: From (Year) can not be greater than To (Year)").format(current_slab.idx))
>>>>>>> eec40513be (fix: minor linting issues (#27314))


def get_gratuity_rule(name, slabs, **args):
Expand Down
Loading