"
@@ -1886,7 +1888,6 @@ class AccountsController(TransactionBase):
and party_account_currency != self.company_currency
and self.currency != party_account_currency
):
-
frappe.throw(
_("Accounting Entry for {0}: {1} can only be made in currency: {2}").format(
party_type, party, party_account_currency
@@ -1907,9 +1908,7 @@ class AccountsController(TransactionBase):
party_type, party = self.get_party()
party_gle_currency = get_party_gle_currency(party_type, party, self.company)
- party_account = (
- self.get("debit_to") if self.doctype == "Sales Invoice" else self.get("credit_to")
- )
+ party_account = self.get("debit_to") if self.doctype == "Sales Invoice" else self.get("credit_to")
party_account_currency = get_account_currency(party_account)
allow_multi_currency_invoices_against_single_party_account = frappe.db.get_singles_value(
"Accounts Settings", "allow_multi_currency_invoices_against_single_party_account"
@@ -1932,10 +1931,8 @@ class AccountsController(TransactionBase):
consider_for_total_advance = True
if adv.reference_name == linked_doc_name:
frappe.db.sql(
- """delete from `tab{0} Advance`
- where name = %s""".format(
- self.doctype
- ),
+ f"""delete from `tab{self.doctype} Advance`
+ where name = %s""",
adv.name,
)
consider_for_total_advance = False
@@ -2152,7 +2149,9 @@ class AccountsController(TransactionBase):
for d in self.get("payment_schedule"):
if self.doctype == "Sales Order" and getdate(d.due_date) < getdate(self.transaction_date):
frappe.throw(
- _("Row {0}: Due Date in the Payment Terms table cannot be before Posting Date").format(d.idx)
+ _("Row {0}: Due Date in the Payment Terms table cannot be before Posting Date").format(
+ d.idx
+ )
)
elif d.due_date in dates:
li.append(_("{0} in row {1}").format(d.due_date, d.idx))
@@ -2160,9 +2159,7 @@ class AccountsController(TransactionBase):
if li:
duplicates = "
" + "
".join(li)
- frappe.throw(
- _("Rows with duplicate due dates in other rows were found: {0}").format(duplicates)
- )
+ frappe.throw(_("Rows with duplicate due dates in other rows were found: {0}").format(duplicates))
def validate_payment_schedule_amount(self):
if self.doctype == "Sales Invoice" and self.is_pos:
@@ -2285,7 +2282,7 @@ class AccountsController(TransactionBase):
jv.voucher_type = "Journal Entry"
jv.posting_date = self.posting_date
jv.company = self.company
- jv.remark = "Adjustment for {} {}".format(self.doctype, self.name)
+ jv.remark = f"Adjustment for {self.doctype} {self.name}"
reconcilation_entry = frappe._dict()
advance_entry = frappe._dict()
@@ -2295,9 +2292,7 @@ class AccountsController(TransactionBase):
reconcilation_entry.party = secondary_party
reconcilation_entry.reference_type = self.doctype
reconcilation_entry.reference_name = self.name
- reconcilation_entry.cost_center = self.cost_center or erpnext.get_default_cost_center(
- self.company
- )
+ reconcilation_entry.cost_center = self.cost_center or erpnext.get_default_cost_center(self.company)
advance_entry.account = primary_account
advance_entry.party_type = primary_party_type
@@ -2343,7 +2338,7 @@ class AccountsController(TransactionBase):
def check_if_fields_updated(self, fields_to_check, child_tables):
# Check if any field affecting accounting entry is altered
doc_before_update = self.get_doc_before_save()
- accounting_dimensions = get_accounting_dimensions() + ["cost_center", "project"]
+ accounting_dimensions = [*get_accounting_dimensions(), "cost_center", "project"]
# Check if opening entry check updated
needs_repost = doc_before_update.get("is_opening") != self.is_opening
@@ -2383,9 +2378,7 @@ class AccountsController(TransactionBase):
@frappe.whitelist()
def get_tax_rate(account_head):
- return frappe.get_cached_value(
- "Account", account_head, ["tax_rate", "account_name"], as_dict=True
- )
+ return frappe.get_cached_value("Account", account_head, ["tax_rate", "account_name"], as_dict=True)
@frappe.whitelist()
@@ -2415,7 +2408,7 @@ def get_taxes_and_charges(master_doctype, master_name):
tax_master = frappe.get_doc(master_doctype, master_name)
taxes_and_charges = []
- for i, tax in enumerate(tax_master.get("taxes")):
+ for _i, tax in enumerate(tax_master.get("taxes")):
tax = tax.as_dict()
for fieldname in default_fields + child_table_fields:
@@ -2534,9 +2527,7 @@ def set_balance_in_account_currency(
):
if (not conversion_rate) and (account_currency != company_currency):
frappe.throw(
- _("Account: {0} with currency: {1} can not be selected").format(
- gl_dict.account, account_currency
- )
+ _("Account: {0} with currency: {1} can not be selected").format(gl_dict.account, account_currency)
)
gl_dict["account_currency"] = (
@@ -2546,9 +2537,7 @@ def set_balance_in_account_currency(
# set debit/credit in account currency if not provided
if flt(gl_dict.debit) and not flt(gl_dict.debit_in_account_currency):
gl_dict.debit_in_account_currency = (
- gl_dict.debit
- if account_currency == company_currency
- else flt(gl_dict.debit / conversion_rate, 2)
+ gl_dict.debit if account_currency == company_currency else flt(gl_dict.debit / conversion_rate, 2)
)
if flt(gl_dict.credit) and not flt(gl_dict.credit_in_account_currency):
@@ -2568,9 +2557,7 @@ def get_advance_journal_entries(
order_list,
include_unallocated=True,
):
- dr_or_cr = (
- "credit_in_account_currency" if party_type == "Customer" else "debit_in_account_currency"
- )
+ dr_or_cr = "credit_in_account_currency" if party_type == "Customer" else "debit_in_account_currency"
conditions = []
if include_unallocated:
@@ -2579,7 +2566,7 @@ def get_advance_journal_entries(
if order_list:
order_condition = ", ".join(["%s"] * len(order_list))
conditions.append(
- " (t2.reference_type = '{0}' and ifnull(t2.reference_name, '') in ({1}))".format(
+ " (t2.reference_type = '{}' and ifnull(t2.reference_name, '') in ({}))".format(
order_doctype, order_condition
)
)
@@ -2588,10 +2575,10 @@ def get_advance_journal_entries(
# nosemgrep
journal_entries = frappe.db.sql(
- """
+ f"""
select
'Journal Entry' as reference_type, t1.name as reference_name,
- t1.remark as remarks, t2.{0} as amount, t2.name as reference_row,
+ t1.remark as remarks, t2.{amount_field} as amount, t2.name as reference_row,
t2.reference_name as against_order, t2.exchange_rate
from
`tabJournal Entry` t1, `tabJournal Entry Account` t2
@@ -2599,11 +2586,9 @@ def get_advance_journal_entries(
t1.name = t2.parent and t2.account = %s
and t2.party_type = %s and t2.party = %s
and t2.is_advance = 'Yes' and t1.docstatus = 1
- and {1} > 0 {2}
- order by t1.posting_date""".format(
- amount_field, dr_or_cr, reference_condition
- ),
- [party_account, party_type, party] + order_list,
+ and {dr_or_cr} > 0 {reference_condition}
+ order by t1.posting_date""",
+ [party_account, party_type, party, *order_list],
as_dict=1,
)
@@ -2631,13 +2616,9 @@ def get_advance_payment_entries(
per = qb.DocType("Payment Entry Reference")
party_account_field = "paid_from" if party_type == "Customer" else "paid_to"
- currency_field = (
- "paid_from_account_currency" if party_type == "Customer" else "paid_to_account_currency"
- )
+ currency_field = "paid_from_account_currency" if party_type == "Customer" else "paid_to_account_currency"
payment_type = "Receive" if party_type == "Customer" else "Pay"
- exchange_rate_field = (
- "source_exchange_rate" if payment_type == "Receive" else "target_exchange_rate"
- )
+ exchange_rate_field = "source_exchange_rate" if payment_type == "Receive" else "target_exchange_rate"
payment_entries_against_order, unallocated_payment_entries = [], []
@@ -2783,9 +2764,7 @@ def get_payment_terms(
schedule = []
for d in terms_doc.get("terms"):
- term_details = get_payment_term_details(
- d, posting_date, grand_total, base_grand_total, bill_date
- )
+ term_details = get_payment_term_details(d, posting_date, grand_total, base_grand_total, bill_date)
schedule.append(term_details)
return schedule
@@ -2903,9 +2882,7 @@ def add_taxes_from_tax_template(child_item, parent_doc, db_insert=True):
tax_row.db_insert()
-def set_order_defaults(
- parent_doctype, parent_doctype_name, child_doctype, child_docname, trans_item
-):
+def set_order_defaults(parent_doctype, parent_doctype_name, child_doctype, child_docname, trans_item):
"""
Returns a Sales/Purchase Order Item child item containing the default values
"""
@@ -2921,9 +2898,7 @@ def set_order_defaults(
child_item.stock_uom = item.stock_uom
child_item.uom = trans_item.get("uom") or item.stock_uom
child_item.warehouse = get_item_warehouse(item, p_doc, overwrite_warehouse=True)
- conversion_factor = flt(
- get_conversion_factor(item.item_code, child_item.uom).get("conversion_factor")
- )
+ conversion_factor = flt(get_conversion_factor(item.item_code, child_item.uom).get("conversion_factor"))
child_item.conversion_factor = flt(trans_item.get("conversion_factor")) or conversion_factor
if child_doctype == "Purchase Order Item":
@@ -3070,9 +3045,7 @@ def update_child_qty_rate(parent_doctype, trans_items, parent_doctype_name, chil
def get_new_child_item(item_row):
child_doctype = "Sales Order Item" if parent_doctype == "Sales Order" else "Purchase Order Item"
- return set_order_defaults(
- parent_doctype, parent_doctype_name, child_doctype, child_docname, item_row
- )
+ return set_order_defaults(parent_doctype, parent_doctype_name, child_doctype, child_docname, item_row)
def validate_quantity(child_item, new_data):
if not flt(new_data.get("qty")):
@@ -3086,9 +3059,7 @@ def update_child_qty_rate(parent_doctype, trans_items, parent_doctype_name, chil
if parent_doctype == "Sales Order" and flt(new_data.get("qty")) < flt(child_item.delivered_qty):
frappe.throw(_("Cannot set quantity less than delivered quantity"))
- if parent_doctype == "Purchase Order" and flt(new_data.get("qty")) < flt(
- child_item.received_qty
- ):
+ if parent_doctype == "Purchase Order" and flt(new_data.get("qty")) < flt(child_item.received_qty):
frappe.throw(_("Cannot set quantity less than received quantity"))
def should_update_supplied_items(doc) -> bool:
@@ -3103,9 +3074,7 @@ def update_child_qty_rate(parent_doctype, trans_items, parent_doctype_name, chil
item.supplied_qty or item.consumed_qty or item.returned_qty for item in doc.supplied_items
)
- update_supplied_items = (
- any_qty_changed or items_added_or_removed or any_conversion_factor_changed
- )
+ update_supplied_items = any_qty_changed or items_added_or_removed or any_conversion_factor_changed
if update_supplied_items and supplied_items_processed:
frappe.throw(_("Item qty can not be updated as raw materials are already processed."))
@@ -3142,8 +3111,9 @@ def update_child_qty_rate(parent_doctype, trans_items, parent_doctype_name, chil
prev_rate, new_rate = flt(child_item.get("rate")), flt(d.get("rate"))
prev_qty, new_qty = flt(child_item.get("qty")), flt(d.get("qty"))
- prev_con_fac, new_con_fac = flt(child_item.get("conversion_factor")), flt(
- d.get("conversion_factor")
+ prev_con_fac, new_con_fac = (
+ flt(child_item.get("conversion_factor")),
+ flt(d.get("conversion_factor")),
)
prev_uom, new_uom = child_item.get("uom"), d.get("uom")
@@ -3222,7 +3192,8 @@ def update_child_qty_rate(parent_doctype, trans_items, parent_doctype_name, chil
if parent_doctype in sales_doctypes:
child_item.margin_type = "Amount"
child_item.margin_rate_or_amount = flt(
- child_item.rate - child_item.price_list_rate, child_item.precision("margin_rate_or_amount")
+ child_item.rate - child_item.price_list_rate,
+ child_item.precision("margin_rate_or_amount"),
)
child_item.rate_with_margin = child_item.rate
else:
@@ -3302,10 +3273,8 @@ def update_child_qty_rate(parent_doctype, trans_items, parent_doctype_name, chil
parent.set_status()
-def check_if_child_table_updated(
- child_table_before_update, child_table_after_update, fields_to_check
-):
- accounting_dimensions = get_accounting_dimensions() + ["cost_center", "project"]
+def check_if_child_table_updated(child_table_before_update, child_table_after_update, fields_to_check):
+ accounting_dimensions = [*get_accounting_dimensions(), "cost_center", "project"]
# Check if any field affecting accounting entry is altered
for index, item in enumerate(child_table_after_update):
for field in fields_to_check:
diff --git a/erpnext/controllers/buying_controller.py b/erpnext/controllers/buying_controller.py
index 1abf95f5953..89226453b7f 100644
--- a/erpnext/controllers/buying_controller.py
+++ b/erpnext/controllers/buying_controller.py
@@ -33,7 +33,7 @@ class BuyingController(SubcontractingController):
def validate(self):
self.set_rate_for_standalone_debit_note()
- super(BuyingController, self).validate()
+ super().validate()
if getattr(self, "supplier", None) and not self.supplier_name:
self.supplier_name = frappe.db.get_value("Supplier", self.supplier, "supplier_name")
@@ -49,9 +49,7 @@ class BuyingController(SubcontractingController):
if self.doctype == "Purchase Invoice":
self.validate_purchase_receipt_if_update_stock()
- if self.doctype == "Purchase Receipt" or (
- self.doctype == "Purchase Invoice" and self.update_stock
- ):
+ if self.doctype == "Purchase Receipt" or (self.doctype == "Purchase Invoice" and self.update_stock):
# self.validate_purchase_return()
self.validate_rejected_warehouse()
self.validate_accepted_rejected_qty()
@@ -67,12 +65,10 @@ class BuyingController(SubcontractingController):
self.update_valuation_rate()
def onload(self):
- super(BuyingController, self).onload()
+ super().onload()
self.set_onload(
"backflush_based_on",
- frappe.db.get_single_value(
- "Buying Settings", "backflush_raw_materials_of_subcontract_based_on"
- ),
+ frappe.db.get_single_value("Buying Settings", "backflush_raw_materials_of_subcontract_based_on"),
)
def set_rate_for_standalone_debit_note(self):
@@ -101,7 +97,7 @@ class BuyingController(SubcontractingController):
row.margin_rate_or_amount = 0.0
def set_missing_values(self, for_validate=False):
- super(BuyingController, self).set_missing_values(for_validate)
+ super().set_missing_values(for_validate)
self.set_supplier_from_item_default()
self.set_price_list_currency("Buying")
@@ -161,9 +157,7 @@ class BuyingController(SubcontractingController):
if self.doctype not in ["Purchase Receipt", "Purchase Invoice"] or not self.is_return:
return
- purchase_doc_field = (
- "purchase_receipt" if self.doctype == "Purchase Receipt" else "purchase_invoice"
- )
+ purchase_doc_field = "purchase_receipt" if self.doctype == "Purchase Receipt" else "purchase_invoice"
not_cancelled_asset = []
if self.return_against:
not_cancelled_asset = [
@@ -494,7 +488,6 @@ class BuyingController(SubcontractingController):
pr_qty = flt(flt(d.qty) * flt(d.conversion_factor), d.precision("stock_qty"))
if pr_qty:
-
if d.from_warehouse and (
(not cint(self.is_return) and self.docstatus == 1)
or (cint(self.is_return) and self.docstatus == 2)
@@ -559,7 +552,8 @@ class BuyingController(SubcontractingController):
or (cint(self.is_return) and self.docstatus == 1)
):
from_warehouse_sle = self.get_sl_entries(
- d, {"actual_qty": -1 * pr_qty, "warehouse": d.from_warehouse, "recalculate_rate": 1}
+ d,
+ {"actual_qty": -1 * pr_qty, "warehouse": d.from_warehouse, "recalculate_rate": 1},
)
if flt(rejected_qty) != 0:
@@ -631,7 +625,7 @@ class BuyingController(SubcontractingController):
update_last_purchase_rate(self, is_submit=1)
def on_cancel(self):
- super(BuyingController, self).on_cancel()
+ super().on_cancel()
if self.get("is_return"):
return
@@ -656,7 +650,9 @@ class BuyingController(SubcontractingController):
"doctype": self.doctype,
"company": self.company,
"posting_date": (
- self.schedule_date if self.doctype == "Material Request" else self.transaction_date
+ self.schedule_date
+ if self.doctype == "Material Request"
+ else self.transaction_date
),
}
)
@@ -688,17 +684,21 @@ class BuyingController(SubcontractingController):
asset = self.make_asset(d, is_grouped_asset=True)
created_assets.append(asset)
else:
- for qty in range(cint(d.qty)):
+ for _qty in range(cint(d.qty)):
asset = self.make_asset(d)
created_assets.append(asset)
if len(created_assets) > 5:
# dont show asset form links if more than 5 assets are created
messages.append(
- _("{} Assets created for {}").format(len(created_assets), frappe.bold(d.item_code))
+ _("{} Assets created for {}").format(
+ len(created_assets), frappe.bold(d.item_code)
+ )
)
else:
- assets_link = list(map(lambda d: frappe.utils.get_link_to_form("Asset", d), created_assets))
+ assets_link = list(
+ map(lambda d: frappe.utils.get_link_to_form("Asset", d), created_assets)
+ )
assets_link = frappe.bold(",".join(assets_link))
is_plural = "s" if len(created_assets) != 1 else ""
@@ -709,9 +709,9 @@ class BuyingController(SubcontractingController):
)
else:
frappe.throw(
- _("Row {}: Asset Naming Series is mandatory for the auto creation for item {}").format(
- d.idx, frappe.bold(d.item_code)
- )
+ _(
+ "Row {}: Asset Naming Series is mandatory for the auto creation for item {}"
+ ).format(d.idx, frappe.bold(d.item_code))
)
else:
messages.append(
@@ -874,11 +874,9 @@ def validate_item_type(doc, fieldname, message):
invalid_items = [
d[0]
for d in frappe.db.sql(
- """
- select item_code from tabItem where name in ({0}) and {1}=0
- """.format(
- item_list, fieldname
- ),
+ f"""
+ select item_code from tabItem where name in ({item_list}) and {fieldname}=0
+ """,
as_list=True,
)
]
diff --git a/erpnext/controllers/item_variant.py b/erpnext/controllers/item_variant.py
index 1ba10259a8e..2a1a00c5214 100644
--- a/erpnext/controllers/item_variant.py
+++ b/erpnext/controllers/item_variant.py
@@ -56,9 +56,7 @@ def make_variant_based_on_manufacturer(template, manufacturer, manufacturer_part
variant.flags.ignore_mandatory = True
variant.save()
- if not frappe.db.exists(
- "Item Manufacturer", {"item_code": variant.name, "manufacturer": manufacturer}
- ):
+ if not frappe.db.exists("Item Manufacturer", {"item_code": variant.name, "manufacturer": manufacturer}):
manufacturer_doc = frappe.new_doc("Item Manufacturer")
manufacturer_doc.update(
{
@@ -122,9 +120,7 @@ def validate_is_incremental(numeric_attribute, attribute, value, item):
)
-def validate_item_attribute_value(
- attributes_list, attribute, attribute_value, item, from_variant=True
-):
+def validate_item_attribute_value(attributes_list, attribute, attribute_value, item, from_variant=True):
allow_rename_attribute_value = frappe.db.get_single_value(
"Item Variant Settings", "allow_rename_attribute_value"
)
@@ -172,7 +168,7 @@ def get_attribute_values(item):
def find_variant(template, args, variant_item_code=None):
conditions = [
- """(iv_attribute.attribute={0} and iv_attribute.attribute_value={1})""".format(
+ """(iv_attribute.attribute={} and iv_attribute.attribute_value={})""".format(
frappe.db.escape(key), frappe.db.escape(cstr(value))
)
for key, value in args.items()
@@ -182,9 +178,7 @@ def find_variant(template, args, variant_item_code=None):
from erpnext.e_commerce.variant_selector.utils import get_item_codes_by_attributes
- possible_variants = [
- i for i in get_item_codes_by_attributes(args, template) if i != variant_item_code
- ]
+ possible_variants = [i for i in get_item_codes_by_attributes(args, template) if i != variant_item_code]
for variant in possible_variants:
variant = frappe.get_doc("Item", variant)
@@ -360,7 +354,9 @@ def copy_attributes_to_variant(item, variant):
if variant.attributes:
attributes_description = item.description + " "
for d in variant.attributes:
- attributes_description += "" + d.attribute + ": " + cstr(d.attribute_value) + "
"
+ attributes_description += (
+ "" + d.attribute + ": " + cstr(d.attribute_value) + "
"
+ )
if attributes_description not in variant.description:
variant.description = attributes_description
@@ -394,8 +390,8 @@ def make_variant_item_code(template_item_code, template_item_name, variant):
abbreviations.append(abbr_or_value)
if abbreviations:
- variant.item_code = "{0}-{1}".format(template_item_code, "-".join(abbreviations))
- variant.item_name = "{0}-{1}".format(template_item_name, "-".join(abbreviations))
+ variant.item_code = "{}-{}".format(template_item_code, "-".join(abbreviations))
+ variant.item_name = "{}-{}".format(template_item_name, "-".join(abbreviations))
@frappe.whitelist()
diff --git a/erpnext/controllers/print_settings.py b/erpnext/controllers/print_settings.py
index b906a8a7987..629404d3c82 100644
--- a/erpnext/controllers/print_settings.py
+++ b/erpnext/controllers/print_settings.py
@@ -39,7 +39,7 @@ def set_print_templates_for_taxes(doc, settings):
def format_columns(display_columns, compact_fields):
- compact_fields = compact_fields + ["image", "item_code", "item_name"]
+ compact_fields = [*compact_fields, "image", "item_code", "item_name"]
final_columns = []
for column in display_columns:
if column not in compact_fields:
diff --git a/erpnext/controllers/queries.py b/erpnext/controllers/queries.py
index 0e5f6724777..be965e41b3e 100644
--- a/erpnext/controllers/queries.py
+++ b/erpnext/controllers/queries.py
@@ -162,7 +162,7 @@ def tax_account_query(doctype, txt, searchfield, start, page_len, filters):
account_type_condition = "AND account_type in %(account_types)s"
accounts = frappe.db.sql(
- """
+ f"""
SELECT name, parent_account
FROM `tabAccount`
WHERE `tabAccount`.docstatus!=2
@@ -172,20 +172,16 @@ def tax_account_query(doctype, txt, searchfield, start, page_len, filters):
AND disabled = %(disabled)s
AND (account_currency = %(currency)s or ifnull(account_currency, '') = '')
AND `{searchfield}` LIKE %(txt)s
- {mcond}
+ {get_match_cond(doctype)}
ORDER BY idx DESC, name
LIMIT %(limit)s offset %(offset)s
- """.format(
- account_type_condition=account_type_condition,
- searchfield=searchfield,
- mcond=get_match_cond(doctype),
- ),
+ """,
dict(
account_types=filters.get("account_type"),
company=filters.get("company"),
disabled=filters.get("disabled", 0),
currency=company_currency,
- txt="%{}%".format(txt),
+ txt=f"%{txt}%",
offset=start,
limit=page_len,
),
@@ -215,7 +211,7 @@ def item_query(doctype, txt, searchfield, start, page_len, filters, as_dict=Fals
searchfields = meta.get_search_fields()
columns = ""
- extra_searchfields = [field for field in searchfields if not field in ["name", "description"]]
+ extra_searchfields = [field for field in searchfields if field not in ["name", "description"]]
if extra_searchfields:
columns += ", " + ", ".join(extra_searchfields)
@@ -227,7 +223,7 @@ def item_query(doctype, txt, searchfield, start, page_len, filters, as_dict=Fals
searchfields = searchfields + [
field
for field in [searchfield or "name", "item_code", "item_group", "item_name"]
- if not field in searchfields
+ if field not in searchfields
]
searchfields = " or ".join([field + " like %(txt)s" for field in searchfields])
@@ -235,7 +231,9 @@ def item_query(doctype, txt, searchfield, start, page_len, filters, as_dict=Fals
if filters.get("customer") or filters.get("supplier"):
party = filters.get("customer") or filters.get("supplier")
item_rules_list = frappe.get_all(
- "Party Specific Item", filters={"party": party}, fields=["restrict_based_on", "based_on_value"]
+ "Party Specific Item",
+ filters={"party": party},
+ fields=["restrict_based_on", "based_on_value"],
)
filters_dict = {}
@@ -384,11 +382,11 @@ def get_delivery_notes_to_be_billed(doctype, txt, searchfield, start, page_len,
return frappe.db.sql(
"""
- select %(fields)s
+ select {fields}
from `tabDelivery Note`
- where `tabDelivery Note`.`%(key)s` like %(txt)s and
+ where `tabDelivery Note`.`{key}` like {txt} and
`tabDelivery Note`.docstatus = 1
- and status not in ('Stopped', 'Closed') %(fcond)s
+ and status not in ('Stopped', 'Closed') {fcond}
and (
(`tabDelivery Note`.is_return = 0 and `tabDelivery Note`.per_billed < 100)
or (`tabDelivery Note`.grand_total = 0 and `tabDelivery Note`.per_billed < 100)
@@ -397,17 +395,16 @@ def get_delivery_notes_to_be_billed(doctype, txt, searchfield, start, page_len,
and return_against in (select name from `tabDelivery Note` where per_billed < 100)
)
)
- %(mcond)s order by `tabDelivery Note`.`%(key)s` asc limit %(page_len)s offset %(start)s
- """
- % {
- "fields": ", ".join(["`tabDelivery Note`.{0}".format(f) for f in fields]),
- "key": searchfield,
- "fcond": get_filters_cond(doctype, filters, []),
- "mcond": get_match_cond(doctype),
- "start": start,
- "page_len": page_len,
- "txt": "%(txt)s",
- },
+ {mcond} order by `tabDelivery Note`.`{key}` asc limit {page_len} offset {start}
+ """.format(
+ fields=", ".join([f"`tabDelivery Note`.{f}" for f in fields]),
+ key=searchfield,
+ fcond=get_filters_cond(doctype, filters, []),
+ mcond=get_match_cond(doctype),
+ start=start,
+ page_len=page_len,
+ txt="%(txt)s",
+ ),
{"txt": ("%%%s%%" % txt)},
as_dict=as_dict,
)
@@ -426,7 +423,7 @@ def get_batch_no(doctype, txt, searchfield, start, page_len, filters):
"item_code": filters.get("item_code"),
"warehouse": filters.get("warehouse"),
"posting_date": filters.get("posting_date"),
- "txt": "%{0}%".format(txt),
+ "txt": f"%{txt}%",
"start": start,
"page_len": page_len,
}
@@ -452,7 +449,7 @@ def get_batch_no(doctype, txt, searchfield, start, page_len, filters):
search_cond = " or " + " or ".join([field + " like %(txt)s" for field in searchfields])
batch_nos = frappe.db.sql(
- """select sle.batch_no, round(sum(sle.actual_qty),2), sle.stock_uom,
+ f"""select sle.batch_no, round(sum(sle.actual_qty),2), sle.stock_uom,
concat('MFG-',batch.manufacturing_date), concat('EXP-',batch.expiry_date)
{search_columns}
from `tabStock Ledger Entry` sle
@@ -468,23 +465,17 @@ def get_batch_no(doctype, txt, searchfield, start, page_len, filters):
{search_cond})
and batch.docstatus < 2
{cond}
- {match_conditions}
+ {get_match_cond(doctype)}
group by batch_no {having_clause}
order by batch.expiry_date, sle.batch_no desc
- limit %(page_len)s offset %(start)s""".format(
- search_columns=search_columns,
- cond=cond,
- match_conditions=get_match_cond(doctype),
- having_clause=having_clause,
- search_cond=search_cond,
- ),
+ limit %(page_len)s offset %(start)s""",
args,
)
return batch_nos
else:
return frappe.db.sql(
- """select name, concat('MFG-', manufacturing_date), concat('EXP-',expiry_date)
+ f"""select name, concat('MFG-', manufacturing_date), concat('EXP-',expiry_date)
{search_columns}
from `tabBatch` batch
where batch.disabled = 0
@@ -494,16 +485,11 @@ def get_batch_no(doctype, txt, searchfield, start, page_len, filters):
or manufacturing_date like %(txt)s
{search_cond})
and docstatus < 2
- {0}
- {match_conditions}
+ {cond}
+ {get_match_cond(doctype)}
order by expiry_date, name desc
- limit %(page_len)s offset %(start)s""".format(
- cond,
- search_columns=search_columns,
- search_cond=search_cond,
- match_conditions=get_match_cond(doctype),
- ),
+ limit %(page_len)s offset %(start)s""",
args,
)
@@ -516,7 +502,7 @@ def get_account_list(doctype, txt, searchfield, start, page_len, filters):
if isinstance(filters, dict):
for key, val in filters.items():
- if isinstance(val, (list, tuple)):
+ if isinstance(val, list | tuple):
filter_list.append([doctype, key, val[0], val[1]])
else:
filter_list.append([doctype, key, "=", val])
@@ -577,24 +563,20 @@ def get_income_account(doctype, txt, searchfield, start, page_len, filters):
condition += f"and tabAccount.disabled = {filters.get('disabled', 0)}"
return frappe.db.sql(
- """select tabAccount.name from `tabAccount`
+ f"""select tabAccount.name from `tabAccount`
where (tabAccount.report_type = "Profit and Loss"
or tabAccount.account_type in ("Income Account", "Temporary"))
and tabAccount.is_group=0
- and tabAccount.`{key}` LIKE %(txt)s
- {condition} {match_condition}
- order by idx desc, name""".format(
- condition=condition, match_condition=get_match_cond(doctype), key=searchfield
- ),
+ and tabAccount.`{searchfield}` LIKE %(txt)s
+ {condition} {get_match_cond(doctype)}
+ order by idx desc, name""",
{"txt": "%" + txt + "%", "company": filters.get("company", "")},
)
@frappe.whitelist()
@frappe.validate_and_sanitize_search_inputs
-def get_filtered_dimensions(
- doctype, txt, searchfield, start, page_len, filters, reference_doctype=None
-):
+def get_filtered_dimensions(doctype, txt, searchfield, start, page_len, filters, reference_doctype=None):
from erpnext.accounts.doctype.accounting_dimension_filter.accounting_dimension_filter import (
get_dimension_filter_map,
)
@@ -660,15 +642,13 @@ def get_expense_account(doctype, txt, searchfield, start, page_len, filters):
condition += "and tabAccount.company = %(company)s"
return frappe.db.sql(
- """select tabAccount.name from `tabAccount`
+ f"""select tabAccount.name from `tabAccount`
where (tabAccount.report_type = "Profit and Loss"
or tabAccount.account_type in ("Expense Account", "Fixed Asset", "Temporary", "Asset Received But Not Billed", "Capital Work in Progress"))
and tabAccount.is_group=0
and tabAccount.docstatus!=2
- and tabAccount.{key} LIKE %(txt)s
- {condition} {match_condition}""".format(
- condition=condition, key=searchfield, match_condition=get_match_cond(doctype)
- ),
+ and tabAccount.{searchfield} LIKE %(txt)s
+ {condition} {get_match_cond(doctype)}""",
{"company": filters.get("company", ""), "txt": "%" + txt + "%"},
)
@@ -707,7 +687,7 @@ def warehouse_query(doctype, txt, searchfield, start, page_len, filters):
mcond=get_match_cond(doctype),
start=start,
page_len=page_len,
- txt=frappe.db.escape("%{0}%".format(txt)),
+ txt=frappe.db.escape(f"%{txt}%"),
)
return frappe.db.sql(query)
@@ -727,9 +707,7 @@ def get_batch_numbers(doctype, txt, searchfield, start, page_len, filters):
query = """select batch_id from `tabBatch`
where disabled = 0
and (expiry_date >= CURRENT_DATE or expiry_date IS NULL)
- and name like {txt}""".format(
- txt=frappe.db.escape("%{0}%".format(txt))
- )
+ and name like {txt}""".format(txt=frappe.db.escape(f"%{txt}%"))
if filters and filters.get("item"):
query += " and item = {item}".format(item=frappe.db.escape(filters.get("item")))
@@ -763,9 +741,7 @@ def get_purchase_receipts(doctype, txt, searchfield, start, page_len, filters):
select pr.name
from `tabPurchase Receipt` pr, `tabPurchase Receipt Item` pritem
where pr.docstatus = 1 and pritem.parent = pr.name
- and pr.name like {txt}""".format(
- txt=frappe.db.escape("%{0}%".format(txt))
- )
+ and pr.name like {txt}""".format(txt=frappe.db.escape(f"%{txt}%"))
if filters and filters.get("item_code"):
query += " and pritem.item_code = {item_code}".format(
@@ -782,9 +758,7 @@ def get_purchase_invoices(doctype, txt, searchfield, start, page_len, filters):
select pi.name
from `tabPurchase Invoice` pi, `tabPurchase Invoice Item` piitem
where pi.docstatus = 1 and piitem.parent = pi.name
- and pi.name like {txt}""".format(
- txt=frappe.db.escape("%{0}%".format(txt))
- )
+ and pi.name like {txt}""".format(txt=frappe.db.escape(f"%{txt}%"))
if filters and filters.get("item_code"):
query += " and piitem.item_code = {item_code}".format(
@@ -806,7 +780,6 @@ def get_doctypes_for_closing(doctype, txt, searchfield, start, page_len, filters
@frappe.whitelist()
@frappe.validate_and_sanitize_search_inputs
def get_tax_template(doctype, txt, searchfield, start, page_len, filters):
-
item_doc = frappe.get_cached_doc("Item", filters.get("item_code"))
item_group = filters.get("item_group")
company = filters.get("company")
@@ -818,9 +791,7 @@ def get_tax_template(doctype, txt, searchfield, start, page_len, filters):
item_group = item_group_doc.parent_item_group
if not taxes:
- return frappe.get_all(
- "Item Tax Template", filters={"disabled": 0, "company": company}, as_list=True
- )
+ return frappe.get_all("Item Tax Template", filters={"disabled": 0, "company": company}, as_list=True)
else:
valid_from = filters.get("valid_from")
valid_from = valid_from[1] if isinstance(valid_from, list) else valid_from
@@ -842,7 +813,7 @@ def get_fields(doctype, fields=None):
meta = frappe.get_meta(doctype)
fields.extend(meta.get_search_fields())
- if meta.title_field and not meta.title_field.strip() in fields:
+ if meta.title_field and meta.title_field.strip() not in fields:
fields.insert(1, meta.title_field.strip())
return unique(fields)
diff --git a/erpnext/controllers/sales_and_purchase_return.py b/erpnext/controllers/sales_and_purchase_return.py
index f1d1e7eaebd..eca751f76bc 100644
--- a/erpnext/controllers/sales_and_purchase_return.py
+++ b/erpnext/controllers/sales_and_purchase_return.py
@@ -26,9 +26,7 @@ def validate_return(doc):
def validate_return_against(doc):
if not frappe.db.exists(doc.doctype, doc.return_against):
- frappe.throw(
- _("Invalid {0}: {1}").format(doc.meta.get_label("return_against"), doc.return_against)
- )
+ frappe.throw(_("Invalid {0}: {1}").format(doc.meta.get_label("return_against"), doc.return_against))
else:
ref_doc = frappe.get_doc(doc.doctype, doc.return_against)
@@ -40,8 +38,8 @@ def validate_return_against(doc):
and ref_doc.docstatus.is_submitted()
):
# validate posting date time
- return_posting_datetime = "%s %s" % (doc.posting_date, doc.get("posting_time") or "00:00:00")
- ref_posting_datetime = "%s %s" % (
+ return_posting_datetime = "{} {}".format(doc.posting_date, doc.get("posting_time") or "00:00:00")
+ ref_posting_datetime = "{} {}".format(
ref_doc.posting_date,
ref_doc.get("posting_time") or "00:00:00",
)
@@ -81,7 +79,7 @@ def validate_returned_items(doc):
select_fields += ",rejected_qty, received_qty"
for d in frappe.db.sql(
- """select {0} from `tab{1} Item` where parent = %s""".format(select_fields, doc.doctype),
+ f"""select {select_fields} from `tab{doc.doctype} Item` where parent = %s""",
doc.return_against,
as_dict=1,
):
@@ -249,17 +247,15 @@ def get_already_returned_items(doc):
sum(abs(child.received_qty) * child.conversion_factor) as received_qty"""
data = frappe.db.sql(
- """
- select {0}
+ f"""
+ select {column}
from
- `tab{1} Item` child, `tab{2}` par
+ `tab{doc.doctype} Item` child, `tab{doc.doctype}` par
where
child.parent = par.name and par.docstatus = 1
and par.is_return = 1 and par.return_against = %s
group by item_code
- """.format(
- column, doc.doctype, doc.doctype
- ),
+ """,
doc.return_against,
as_dict=1,
)
@@ -292,22 +288,22 @@ def get_returned_qty_map_for_row(return_against, party, row_name, doctype):
party_type = "customer"
fields = [
- "sum(abs(`tab{0}`.qty)) as qty".format(child_doctype),
+ f"sum(abs(`tab{child_doctype}`.qty)) as qty",
]
if doctype != "Subcontracting Receipt":
fields += [
- "sum(abs(`tab{0}`.stock_qty)) as stock_qty".format(child_doctype),
+ f"sum(abs(`tab{child_doctype}`.stock_qty)) as stock_qty",
]
if doctype in ("Purchase Receipt", "Purchase Invoice", "Subcontracting Receipt"):
fields += [
- "sum(abs(`tab{0}`.rejected_qty)) as rejected_qty".format(child_doctype),
- "sum(abs(`tab{0}`.received_qty)) as received_qty".format(child_doctype),
+ f"sum(abs(`tab{child_doctype}`.rejected_qty)) as rejected_qty",
+ f"sum(abs(`tab{child_doctype}`.received_qty)) as received_qty",
]
if doctype == "Purchase Receipt":
- fields += ["sum(abs(`tab{0}`.received_stock_qty)) as received_stock_qty".format(child_doctype)]
+ fields += [f"sum(abs(`tab{child_doctype}`.received_stock_qty)) as received_stock_qty"]
# Used retrun against and supplier and is_retrun because there is an index added for it
data = frappe.get_all(
@@ -523,8 +519,7 @@ def make_return_doc(doctype: str, source_name: str, target_doc=None):
"docstatus": ["=", 1],
},
},
- doctype
- + " Item": {
+ doctype + " Item": {
"doctype": doctype + " Item",
"field_map": {"serial_no": "serial_no", "batch_no": "batch_no", "bom": "bom"},
"postprocess": update_item,
@@ -623,11 +618,7 @@ def get_filters(
if reference_voucher_detail_no:
filters["voucher_detail_no"] = reference_voucher_detail_no
- if (
- voucher_type in ["Purchase Receipt", "Purchase Invoice"]
- and item_row
- and item_row.get("warehouse")
- ):
+ if voucher_type in ["Purchase Receipt", "Purchase Invoice"] and item_row and item_row.get("warehouse"):
filters["warehouse"] = item_row.get("warehouse")
return filters
diff --git a/erpnext/controllers/selling_controller.py b/erpnext/controllers/selling_controller.py
index 34abe9f764f..5c38d7bef3a 100644
--- a/erpnext/controllers/selling_controller.py
+++ b/erpnext/controllers/selling_controller.py
@@ -23,13 +23,13 @@ class SellingController(StockController):
return _("To {0} | {1} {2}").format(self.customer_name, self.currency, self.grand_total)
def onload(self):
- super(SellingController, self).onload()
+ super().onload()
if self.doctype in ("Sales Order", "Delivery Note", "Sales Invoice"):
for item in self.get("items") + (self.get("packed_items") or []):
item.update(get_bin_details(item.item_code, item.warehouse, include_child_warehouses=True))
def validate(self):
- super(SellingController, self).validate()
+ super().validate()
self.validate_items()
if not self.get("is_debit_note"):
self.validate_max_discount()
@@ -44,7 +44,7 @@ class SellingController(StockController):
self.validate_auto_repeat_subscription_dates()
def set_missing_values(self, for_validate=False):
- super(SellingController, self).set_missing_values(for_validate)
+ super().set_missing_values(for_validate)
# set contact and address details for customer, if they are not mentioned
self.set_missing_lead_customer_details(for_validate=for_validate)
@@ -284,7 +284,10 @@ class SellingController(StockController):
if flt(item.base_net_rate) < flt(last_valuation_rate_in_sales_uom):
throw_message(
- item.idx, item.item_name, last_valuation_rate_in_sales_uom, "valuation rate (Moving Average)"
+ item.idx,
+ item.item_name,
+ last_valuation_rate_in_sales_uom,
+ "valuation rate (Moving Average)",
)
def get_item_list(self):
@@ -412,7 +415,8 @@ class SellingController(StockController):
"Cancelled"
]:
frappe.throw(
- _("{0} {1} is cancelled or closed").format(_("Sales Order"), so), frappe.InvalidStatusError
+ _("{0} {1} is cancelled or closed").format(_("Sales Order"), so),
+ frappe.InvalidStatusError,
)
sales_order.update_reserved_qty(so_item_rows)
@@ -587,7 +591,8 @@ class SellingController(StockController):
if self.doctype in ["Sales Order", "Quotation"]:
for item in self.items:
item.gross_profit = flt(
- ((item.base_rate - flt(item.valuation_rate)) * item.stock_qty), self.precision("amount", item)
+ ((item.base_rate - flt(item.valuation_rate)) * item.stock_qty),
+ self.precision("amount", item),
)
def set_customer_address(self):
@@ -664,9 +669,9 @@ class SellingController(StockController):
if d.get("target_warehouse") and d.get("warehouse") == d.get("target_warehouse"):
warehouse = frappe.bold(d.get("target_warehouse"))
frappe.throw(
- _("Row {0}: Delivery Warehouse ({1}) and Customer Warehouse ({2}) can not be same").format(
- d.idx, warehouse, warehouse
- )
+ _(
+ "Row {0}: Delivery Warehouse ({1}) and Customer Warehouse ({2}) can not be same"
+ ).format(d.idx, warehouse, warehouse)
)
if not self.get("is_internal_customer") and any(d.get("target_warehouse") for d in items):
diff --git a/erpnext/controllers/status_updater.py b/erpnext/controllers/status_updater.py
index 04d0dd36775..dd3fab05ce6 100644
--- a/erpnext/controllers/status_updater.py
+++ b/erpnext/controllers/status_updater.py
@@ -253,9 +253,7 @@ class StatusUpdater(Document):
"""select item_code, `{target_ref_field}`,
`{target_field}`, parenttype, parent from `tab{target_dt}`
where `{target_ref_field}` < `{target_field}`
- and name=%s and docstatus=1""".format(
- **args
- ),
+ and name=%s and docstatus=1""".format(**args),
args["name"],
as_dict=1,
)
@@ -300,9 +298,7 @@ class StatusUpdater(Document):
role_allowed_to_over_bill = frappe.db.get_single_value(
"Accounts Settings", "role_allowed_to_over_bill"
)
- role = (
- role_allowed_to_over_deliver_receive if qty_or_amount == "qty" else role_allowed_to_over_bill
- )
+ role = role_allowed_to_over_deliver_receive if qty_or_amount == "qty" else role_allowed_to_over_bill
overflow_percent = (
(item[args["target_field"]] - item[args["target_ref_field"]]) / item[args["target_ref_field"]]
@@ -413,12 +409,11 @@ class StatusUpdater(Document):
args["second_source_extra_cond"] = ""
args["second_source_condition"] = frappe.db.sql(
- """ select ifnull((select sum(%(second_source_field)s)
- from `tab%(second_source_dt)s`
- where `%(second_join_field)s`='%(detail_id)s'
- and (`tab%(second_source_dt)s`.docstatus=1)
- %(second_source_extra_cond)s), 0) """
- % args
+ """ select ifnull((select sum({second_source_field})
+ from `tab{second_source_dt}`
+ where `{second_join_field}`='{detail_id}'
+ and (`tab{second_source_dt}`.docstatus=1)
+ {second_source_extra_cond}), 0) """.format(**args)
)[0][0]
if args["detail_id"]:
@@ -428,11 +423,10 @@ class StatusUpdater(Document):
args["source_dt_value"] = (
frappe.db.sql(
"""
- (select ifnull(sum(%(source_field)s), 0)
- from `tab%(source_dt)s` where `%(join_field)s`='%(detail_id)s'
- and (docstatus=1 %(cond)s) %(extra_cond)s)
- """
- % args
+ (select ifnull(sum({source_field}), 0)
+ from `tab{source_dt}` where `{join_field}`='{detail_id}'
+ and (docstatus=1 {cond}) {extra_cond})
+ """.format(**args)
)[0][0]
or 0.0
)
@@ -441,10 +435,9 @@ class StatusUpdater(Document):
args["source_dt_value"] += flt(args["second_source_condition"])
frappe.db.sql(
- """update `tab%(target_dt)s`
- set %(target_field)s = %(source_dt_value)s %(update_modified)s
- where name='%(detail_id)s'"""
- % args
+ """update `tab{target_dt}`
+ set {target_field} = {source_dt_value} {update_modified}
+ where name='{detail_id}'""".format(**args)
)
def _update_percent_field_in_targets(self, args, update_modified=True):
@@ -471,26 +464,24 @@ class StatusUpdater(Document):
if args.get("target_parent_field"):
frappe.db.sql(
- """update `tab%(target_parent_dt)s`
- set %(target_parent_field)s = round(
+ """update `tab{target_parent_dt}`
+ set {target_parent_field} = round(
ifnull((select
- ifnull(sum(case when abs(%(target_ref_field)s) > abs(%(target_field)s) then abs(%(target_field)s) else abs(%(target_ref_field)s) end), 0)
- / sum(abs(%(target_ref_field)s)) * 100
- from `tab%(target_dt)s` where parent='%(name)s' and parenttype='%(target_parent_dt)s' having sum(abs(%(target_ref_field)s)) > 0), 0), 6)
- %(update_modified)s
- where name='%(name)s'"""
- % args
+ ifnull(sum(case when abs({target_ref_field}) > abs({target_field}) then abs({target_field}) else abs({target_ref_field}) end), 0)
+ / sum(abs({target_ref_field})) * 100
+ from `tab{target_dt}` where parent='{name}' and parenttype='{target_parent_dt}' having sum(abs({target_ref_field})) > 0), 0), 6)
+ {update_modified}
+ where name='{name}'""".format(**args)
)
# update field
if args.get("status_field"):
frappe.db.sql(
- """update `tab%(target_parent_dt)s`
- set %(status_field)s = (case when %(target_parent_field)s<0.001 then 'Not %(keyword)s'
- else case when %(target_parent_field)s>=99.999999 then 'Fully %(keyword)s'
- else 'Partly %(keyword)s' end end)
- where name='%(name)s'"""
- % args
+ """update `tab{target_parent_dt}`
+ set {status_field} = (case when {target_parent_field}<0.001 then 'Not {keyword}'
+ else case when {target_parent_field}>=99.999999 then 'Fully {keyword}'
+ else 'Partly {keyword}' end end)
+ where name='{name}'""".format(**args)
)
if update_modified:
@@ -503,21 +494,19 @@ class StatusUpdater(Document):
args["update_modified"] = ""
return
- args["update_modified"] = ", modified = {0}, modified_by = {1}".format(
+ args["update_modified"] = ", modified = {}, modified_by = {}".format(
frappe.db.escape(now()), frappe.db.escape(frappe.session.user)
)
def update_billing_status_for_zero_amount_refdoc(self, ref_dt):
ref_fieldname = frappe.scrub(ref_dt)
- ref_docs = [
- item.get(ref_fieldname) for item in (self.get("items") or []) if item.get(ref_fieldname)
- ]
+ ref_docs = [item.get(ref_fieldname) for item in (self.get("items") or []) if item.get(ref_fieldname)]
if not ref_docs:
return
zero_amount_refdocs = frappe.db.sql_list(
- """
+ f"""
SELECT
name
from
@@ -526,9 +515,7 @@ class StatusUpdater(Document):
docstatus = 1
and base_net_total = 0
and name in %(ref_docs)s
- """.format(
- ref_dt=ref_dt
- ),
+ """,
{"ref_docs": ref_docs},
)
@@ -539,9 +526,8 @@ class StatusUpdater(Document):
for ref_dn in zero_amount_refdoc:
ref_doc_qty = flt(
frappe.db.sql(
- """select ifnull(sum(qty), 0) from `tab%s Item`
- where parent=%s"""
- % (ref_dt, "%s"),
+ """select ifnull(sum(qty), 0) from `tab{} Item`
+ where parent={}""".format(ref_dt, "%s"),
(ref_dn),
)[0][0]
)
@@ -549,8 +535,7 @@ class StatusUpdater(Document):
billed_qty = flt(
frappe.db.sql(
"""select ifnull(sum(qty), 0)
- from `tab%s Item` where %s=%s and docstatus=1"""
- % (self.doctype, ref_fieldname, "%s"),
+ from `tab{} Item` where {}={} and docstatus=1""".format(self.doctype, ref_fieldname, "%s"),
(ref_dn),
)[0][0]
)
@@ -608,13 +593,13 @@ def get_allowance_for(
)
if qty_or_amount == "qty" and not qty_allowance:
- if global_qty_allowance == None:
+ if global_qty_allowance is None:
global_qty_allowance = flt(
frappe.get_cached_value("Stock Settings", None, "over_delivery_receipt_allowance")
)
qty_allowance = global_qty_allowance
elif qty_or_amount == "amount" and not over_billing_allowance:
- if global_amount_allowance == None:
+ if global_amount_allowance is None:
global_amount_allowance = flt(
frappe.get_cached_value("Accounts Settings", None, "over_billing_allowance")
)
diff --git a/erpnext/controllers/stock_controller.py b/erpnext/controllers/stock_controller.py
index 8d7d888c2c9..15a79c8efb4 100644
--- a/erpnext/controllers/stock_controller.py
+++ b/erpnext/controllers/stock_controller.py
@@ -3,7 +3,6 @@
import json
from collections import defaultdict
-from typing import List, Tuple
import frappe
from frappe import _, bold
@@ -42,7 +41,7 @@ class BatchExpiredError(frappe.ValidationError):
class StockController(AccountsController):
def validate(self):
- super(StockController, self).validate()
+ super().validate()
if not self.get("is_return"):
self.validate_inspection()
self.validate_serialized_batch()
@@ -126,10 +125,7 @@ class StockController(AccountsController):
# remove extra whitespace and store one serial no on each line
row.serial_no = clean_serial_no_string(row.serial_no)
- def get_gl_entries(
- self, warehouse_account=None, default_expense_account=None, default_cost_center=None
- ):
-
+ def get_gl_entries(self, warehouse_account=None, default_expense_account=None, default_cost_center=None):
if not warehouse_account:
warehouse_account = get_warehouse_account_map(self.company)
@@ -167,7 +163,9 @@ class StockController(AccountsController):
"project": item_row.project or self.get("project"),
"remarks": self.get("remarks") or _("Accounting Entry for Stock"),
"debit": flt(sle.stock_value_difference, precision),
- "is_opening": item_row.get("is_opening") or self.get("is_opening") or "No",
+ "is_opening": item_row.get("is_opening")
+ or self.get("is_opening")
+ or "No",
},
warehouse_account[sle.warehouse]["account_currency"],
item=item_row,
@@ -183,7 +181,9 @@ class StockController(AccountsController):
"remarks": self.get("remarks") or _("Accounting Entry for Stock"),
"debit": -1 * flt(sle.stock_value_difference, precision),
"project": item_row.get("project") or self.get("project"),
- "is_opening": item_row.get("is_opening") or self.get("is_opening") or "No",
+ "is_opening": item_row.get("is_opening")
+ or self.get("is_opening")
+ or "No",
},
item=item_row,
)
@@ -250,9 +250,7 @@ class StockController(AccountsController):
def get_debit_field_precision(self):
if not frappe.flags.debit_field_precision:
- frappe.flags.debit_field_precision = frappe.get_precision(
- "GL Entry", "debit_in_account_currency"
- )
+ frappe.flags.debit_field_precision = frappe.get_precision("GL Entry", "debit_in_account_currency")
return frappe.flags.debit_field_precision
@@ -285,7 +283,7 @@ class StockController(AccountsController):
return details
- def get_items_and_warehouses(self) -> Tuple[List[str], List[str]]:
+ def get_items_and_warehouses(self) -> tuple[list[str], list[str]]:
"""Get list of items and warehouses affected by a transaction"""
if not (hasattr(self, "items") or hasattr(self, "packed_items")):
@@ -395,9 +393,7 @@ class StockController(AccountsController):
if not d.batch_no:
continue
- frappe.db.set_value(
- "Serial No", {"batch_no": d.batch_no, "status": "Inactive"}, "batch_no", None
- )
+ frappe.db.set_value("Serial No", {"batch_no": d.batch_no, "status": "Inactive"}, "batch_no", None)
d.batch_no = None
d.db_set("batch_no", None)
@@ -520,9 +516,7 @@ class StockController(AccountsController):
if item_codes:
serialized_items = frappe.db.sql_list(
"""select name from `tabItem`
- where has_serial_no=1 and name in ({})""".format(
- ", ".join(["%s"] * len(item_codes))
- ),
+ where has_serial_no=1 and name in ({})""".format(", ".join(["%s"] * len(item_codes))),
tuple(item_codes),
)
@@ -610,16 +604,12 @@ class StockController(AccountsController):
def validate_qi_submission(self, row):
"""Check if QI is submitted on row level, during submission"""
- action = frappe.db.get_single_value(
- "Stock Settings", "action_if_quality_inspection_is_not_submitted"
- )
+ action = frappe.db.get_single_value("Stock Settings", "action_if_quality_inspection_is_not_submitted")
qa_docstatus = frappe.db.get_value("Quality Inspection", row.quality_inspection, "docstatus")
if not qa_docstatus == 1:
link = frappe.utils.get_link_to_form("Quality Inspection", row.quality_inspection)
- msg = (
- f"Row #{row.idx}: Quality Inspection {link} is not submitted for the item: {row.item_code}"
- )
+ msg = f"Row #{row.idx}: Quality Inspection {link} is not submitted for the item: {row.item_code}"
if action == "Stop":
frappe.throw(_(msg), title=_("Inspection Submission"), exc=QualityInspectionNotSubmittedError)
else:
@@ -683,9 +673,7 @@ class StockController(AccountsController):
row.from_warehouse = None
def validate_in_transit_warehouses(self):
- if (
- self.doctype == "Sales Invoice" and self.get("update_stock")
- ) or self.doctype == "Delivery Note":
+ if (self.doctype == "Sales Invoice" and self.get("update_stock")) or self.doctype == "Delivery Note":
for item in self.get("items"):
if not item.target_warehouse:
frappe.throw(
@@ -854,7 +842,9 @@ class StockController(AccountsController):
if self.doctype == "Stock Reconciliation":
stock_qty = flt(item.qty)
else:
- stock_qty = flt(item.transfer_qty) if self.doctype == "Stock Entry" else flt(item.stock_qty)
+ stock_qty = (
+ flt(item.transfer_qty) if self.doctype == "Stock Entry" else flt(item.stock_qty)
+ )
rule_name = rule.get("name")
if not rule_map[rule_name]:
@@ -870,9 +860,7 @@ class StockController(AccountsController):
frappe.throw(msg=message, title=_("Over Receipt"))
def prepare_over_receipt_message(self, rule, values):
- message = _(
- "{0} qty of Item {1} is being received into Warehouse {2} with capacity {3}."
- ).format(
+ message = _("{0} qty of Item {1} is being received into Warehouse {2} with capacity {3}.").format(
frappe.bold(values["qty_put"]),
frappe.bold(values["item"]),
frappe.bold(values["warehouse"]),
@@ -923,7 +911,6 @@ class StockController(AccountsController):
item=None,
posting_date=None,
):
-
gl_entry = {
"account": account,
"cost_center": cost_center,
@@ -1050,9 +1037,7 @@ def future_sle_exists(args, sl_entries=None):
and is_cancelled = 0
GROUP BY
item_code, warehouse
- """.format(
- " or ".join(or_conditions)
- ),
+ """.format(" or ".join(or_conditions)),
args,
as_dict=1,
)
diff --git a/erpnext/controllers/subcontracting_controller.py b/erpnext/controllers/subcontracting_controller.py
index 5c069b1e275..6c9f066ff55 100644
--- a/erpnext/controllers/subcontracting_controller.py
+++ b/erpnext/controllers/subcontracting_controller.py
@@ -17,7 +17,7 @@ from erpnext.stock.utils import get_incoming_rate
class SubcontractingController(StockController):
def __init__(self, *args, **kwargs):
- super(SubcontractingController, self).__init__(*args, **kwargs)
+ super().__init__(*args, **kwargs)
if self.get("is_old_subcontracting_flow"):
self.subcontract_data = frappe._dict(
{
@@ -49,7 +49,7 @@ class SubcontractingController(StockController):
self.validate_items()
self.create_raw_materials_supplied()
else:
- super(SubcontractingController, self).validate()
+ super().validate()
def remove_empty_rows(self):
for key in ["service_items", "items", "supplied_items"]:
@@ -85,11 +85,15 @@ class SubcontractingController(StockController):
bom = frappe.get_doc("BOM", item.bom)
if not bom.is_active:
frappe.throw(
- _("Row {0}: Please select an active BOM for Item {1}.").format(item.idx, item.item_name)
+ _("Row {0}: Please select an active BOM for Item {1}.").format(
+ item.idx, item.item_name
+ )
)
if bom.item != item.item_code:
frappe.throw(
- _("Row {0}: Please select an valid BOM for Item {1}.").format(item.idx, item.item_name)
+ _("Row {0}: Please select an valid BOM for Item {1}.").format(
+ item.idx, item.item_name
+ )
)
else:
frappe.throw(_("Row {0}: Please select a BOM for Item {1}.").format(item.idx, item.item_name))
@@ -165,7 +169,6 @@ class SubcontractingController(StockController):
fields=["item_code", "(qty - received_qty) as qty", "parent", "name"],
filters={"docstatus": 1, "parent": ("in", self.subcontract_orders)},
):
-
self.qty_to_be_received[(row.item_code, row.parent)] += row.qty
def __get_transferred_items(self):
@@ -253,9 +256,7 @@ class SubcontractingController(StockController):
if not receipt_items:
return ([], {}) if return_consumed_items else None
- receipt_items = {
- item.name: item.get(self.subcontract_data.order_field) for item in receipt_items
- }
+ receipt_items = {item.name: item.get(self.subcontract_data.order_field) for item in receipt_items}
consumed_materials = self.__get_consumed_items(doctype, receipt_items.keys())
if return_consumed_items:
@@ -370,9 +371,7 @@ class SubcontractingController(StockController):
[doctype, "sourced_by_supplier", "=", 0],
]
- return (
- frappe.get_all("BOM", fields=fields, filters=filters, order_by=f"`tab{doctype}`.`idx`") or []
- )
+ return frappe.get_all("BOM", fields=fields, filters=filters, order_by=f"`tab{doctype}`.`idx`") or []
def __update_reserve_warehouse(self, row, item):
if self.doctype == self.subcontract_data.order_doctype:
@@ -809,7 +808,8 @@ class SubcontractingController(StockController):
if mr_obj.status in ["Stopped", "Cancelled"]:
frappe.throw(
- _("Material Request {0} is cancelled or stopped").format(mr), frappe.InvalidStatusError
+ _("Material Request {0} is cancelled or stopped").format(mr),
+ frappe.InvalidStatusError,
)
mr_obj.update_requested_qty(mr_item_rows)
@@ -892,8 +892,10 @@ def make_rm_stock_entry(
for fg_item_code in fg_item_code_list:
for rm_item in rm_items:
-
- if rm_item.get("main_item_code") == fg_item_code or rm_item.get("item_code") == fg_item_code:
+ if (
+ rm_item.get("main_item_code") == fg_item_code
+ or rm_item.get("item_code") == fg_item_code
+ ):
rm_item_code = rm_item.get("rm_item_code")
items_dict = {
@@ -904,13 +906,16 @@ def make_rm_stock_entry(
"description": item_wh.get(rm_item_code, {}).get("description", ""),
"qty": rm_item.get("qty")
or max(rm_item.get("required_qty") - rm_item.get("total_supplied_qty"), 0),
- "from_warehouse": rm_item.get("warehouse") or rm_item.get("reserve_warehouse"),
+ "from_warehouse": rm_item.get("warehouse")
+ or rm_item.get("reserve_warehouse"),
"to_warehouse": subcontract_order.supplier_warehouse,
"stock_uom": rm_item.get("stock_uom"),
"serial_no": rm_item.get("serial_no"),
"batch_no": rm_item.get("batch_no"),
"main_item_code": fg_item_code,
- "allow_alternative_item": item_wh.get(rm_item_code, {}).get("allow_alternative_item"),
+ "allow_alternative_item": item_wh.get(rm_item_code, {}).get(
+ "allow_alternative_item"
+ ),
}
}
@@ -924,9 +929,7 @@ def make_rm_stock_entry(
frappe.throw(_("No Items selected for transfer."))
-def add_items_in_ste(
- ste_doc, row, qty, rm_details, rm_detail_field="sco_rm_detail", batch_no=None
-):
+def add_items_in_ste(ste_doc, row, qty, rm_details, rm_detail_field="sco_rm_detail", batch_no=None):
item = ste_doc.append("items", row.item_details)
rm_detail = list(set(row.get(f"{rm_detail_field}s")).intersection(rm_details))
@@ -971,7 +974,7 @@ def make_return_stock_entry_for_subcontract(
ste_doc.company = order_doc.company
ste_doc.is_return = 1
- for key, value in available_materials.items():
+ for _key, value in available_materials.items():
if not value.qty:
continue
@@ -989,9 +992,7 @@ def make_return_stock_entry_for_subcontract(
@frappe.whitelist()
-def get_materials_from_supplier(
- subcontract_order, rm_details, order_doctype="Subcontracting Order"
-):
+def get_materials_from_supplier(subcontract_order, rm_details, order_doctype="Subcontracting Order"):
if isinstance(rm_details, str):
rm_details = json.loads(rm_details)
@@ -1005,6 +1006,4 @@ def get_materials_from_supplier(
_("Materials are already received against the {0} {1}").format(order_doctype, subcontract_order)
)
- return make_return_stock_entry_for_subcontract(
- doc.available_materials, doc, rm_details, order_doctype
- )
+ return make_return_stock_entry_for_subcontract(doc.available_materials, doc, rm_details, order_doctype)
diff --git a/erpnext/controllers/taxes_and_totals.py b/erpnext/controllers/taxes_and_totals.py
index 2881c15a14d..e92356e30a8 100644
--- a/erpnext/controllers/taxes_and_totals.py
+++ b/erpnext/controllers/taxes_and_totals.py
@@ -21,7 +21,7 @@ from erpnext.stock.get_item_details import _get_item_tax_template
from erpnext.utilities.regional import temporary_flag
-class calculate_taxes_and_totals(object):
+class calculate_taxes_and_totals:
def __init__(self, doc: Document):
self.doc = doc
frappe.flags.round_off_applicable_accounts = []
@@ -155,7 +155,8 @@ class calculate_taxes_and_totals(object):
elif item.price_list_rate:
if not item.rate or (item.pricing_rules and item.discount_percentage > 0):
item.rate = flt(
- item.price_list_rate * (1.0 - (item.discount_percentage / 100.0)), item.precision("rate")
+ item.price_list_rate * (1.0 - (item.discount_percentage / 100.0)),
+ item.precision("rate"),
)
item.discount_amount = item.price_list_rate * (item.discount_percentage / 100.0)
@@ -176,7 +177,8 @@ class calculate_taxes_and_totals(object):
item.rate_with_margin, item.base_rate_with_margin = self.calculate_margin(item)
if flt(item.rate_with_margin) > 0:
item.rate = flt(
- item.rate_with_margin * (1.0 - (item.discount_percentage / 100.0)), item.precision("rate")
+ item.rate_with_margin * (1.0 - (item.discount_percentage / 100.0)),
+ item.precision("rate"),
)
if item.discount_amount and not item.discount_percentage:
@@ -192,7 +194,9 @@ class calculate_taxes_and_totals(object):
item.net_rate = item.rate
if (
- not item.qty and self.doc.get("is_return") and self.doc.get("doctype") != "Purchase Receipt"
+ not item.qty
+ and self.doc.get("is_return")
+ and self.doc.get("doctype") != "Purchase Receipt"
):
item.amount = flt(-1 * item.rate, item.precision("amount"))
elif not item.qty and self.doc.get("is_debit_note"):
@@ -278,7 +282,9 @@ class calculate_taxes_and_totals(object):
item.net_amount = flt(amount / (1 + cumulated_tax_fraction))
item.net_rate = flt(item.net_amount / item.qty, item.precision("net_rate"))
- item.discount_percentage = flt(item.discount_percentage, item.precision("discount_percentage"))
+ item.discount_percentage = flt(
+ item.discount_percentage, item.precision("discount_percentage")
+ )
self._set_in_company_currency(item, ["net_rate", "net_amount"])
@@ -339,7 +345,6 @@ class calculate_taxes_and_totals(object):
self.doc.round_floats_in(self.doc, ["total", "base_total", "net_total", "base_net_total"])
def calculate_shipping_charges(self):
-
# Do not apply shipping rule for POS
if self.doc.get("is_pos"):
return
@@ -351,9 +356,7 @@ class calculate_taxes_and_totals(object):
self._calculate()
def calculate_taxes(self):
- rounding_adjustment_computed = self.doc.get("is_consolidated") and self.doc.get(
- "rounding_adjustment"
- )
+ rounding_adjustment_computed = self.doc.get("is_consolidated") and self.doc.get("rounding_adjustment")
if not rounding_adjustment_computed:
self.doc.rounding_adjustment = 0
@@ -391,7 +394,9 @@ class calculate_taxes_and_totals(object):
# set tax after discount
tax.tax_amount_after_discount_amount += current_tax_amount
- current_tax_amount = self.get_tax_amount_if_for_valuation_or_deduction(current_tax_amount, tax)
+ current_tax_amount = self.get_tax_amount_if_for_valuation_or_deduction(
+ current_tax_amount, tax
+ )
# note: grand_total_for_current_item contains the contribution of
# item's amount, previously applied tax and the current tax on that item
@@ -455,9 +460,7 @@ class calculate_taxes_and_totals(object):
if tax.charge_type == "Actual":
# distribute the tax amount proportionally to each item row
actual = flt(tax.tax_amount, tax.precision("tax_amount"))
- current_tax_amount = (
- item.net_amount * actual / self.doc.net_total if self.doc.net_total else 0.0
- )
+ current_tax_amount = item.net_amount * actual / self.doc.net_total if self.doc.net_total else 0.0
elif tax.charge_type == "On Net Total":
current_tax_amount = (tax_rate / 100.0) * item.net_amount
@@ -571,9 +574,7 @@ class calculate_taxes_and_totals(object):
else self.doc.base_net_total
)
- self._set_in_company_currency(
- self.doc, ["taxes_and_charges_added", "taxes_and_charges_deducted"]
- )
+ self._set_in_company_currency(self.doc, ["taxes_and_charges_added", "taxes_and_charges_deducted"])
self.doc.round_floats_in(self.doc, ["grand_total", "base_grand_total"])
@@ -627,12 +628,11 @@ class calculate_taxes_and_totals(object):
frappe.throw(_("Please select Apply Discount On"))
self.doc.base_discount_amount = flt(
- self.doc.discount_amount * self.doc.conversion_rate, self.doc.precision("base_discount_amount")
+ self.doc.discount_amount * self.doc.conversion_rate,
+ self.doc.precision("base_discount_amount"),
)
- if self.doc.apply_discount_on == "Grand Total" and self.doc.get(
- "is_cash_or_non_trade_discount"
- ):
+ if self.doc.apply_discount_on == "Grand Total" and self.doc.get("is_cash_or_non_trade_discount"):
self.discount_amount_applied = True
return
@@ -657,12 +657,17 @@ class calculate_taxes_and_totals(object):
or total_for_discount_amount == self.doc.net_total
) and i == len(self._items) - 1:
discount_amount_loss = flt(
- self.doc.net_total - net_total - self.doc.discount_amount, self.doc.precision("net_total")
+ self.doc.net_total - net_total - self.doc.discount_amount,
+ self.doc.precision("net_total"),
)
- item.net_amount = flt(item.net_amount + discount_amount_loss, item.precision("net_amount"))
+ item.net_amount = flt(
+ item.net_amount + discount_amount_loss, item.precision("net_amount")
+ )
- item.net_rate = flt(item.net_amount / item.qty, item.precision("net_rate")) if item.qty else 0
+ item.net_rate = (
+ flt(item.net_amount / item.qty, item.precision("net_rate")) if item.qty else 0
+ )
self._set_in_company_currency(item, ["net_rate", "net_amount"])
@@ -818,7 +823,6 @@ class calculate_taxes_and_totals(object):
self.calculate_paid_amount()
def calculate_paid_amount(self):
-
paid_amount = base_paid_amount = 0.0
if self.doc.is_pos:
@@ -918,7 +922,9 @@ class calculate_taxes_and_totals(object):
total_paid_amount = 0
for payment in self.doc.get("payments"):
total_paid_amount += (
- payment.amount if self.doc.party_account_currency == self.doc.currency else payment.base_amount
+ payment.amount
+ if self.doc.party_account_currency == self.doc.currency
+ else payment.base_amount
)
pending_amount = total_amount_to_pay - total_paid_amount
@@ -992,7 +998,7 @@ def update_itemised_tax_data(doc):
@erpnext.allow_regional
def get_itemised_tax_breakup_header(item_doctype, tax_accounts):
- return [_("Item"), _("Taxable Amount")] + tax_accounts
+ return [_("Item"), _("Taxable Amount"), *tax_accounts]
@erpnext.allow_regional
@@ -1060,7 +1066,7 @@ def get_rounded_tax_amount(itemised_tax, precision):
row["tax_amount"] = flt(row["tax_amount"], precision)
-class init_landed_taxes_and_totals(object):
+class init_landed_taxes_and_totals:
def __init__(self, doc):
self.doc = doc
self.tax_field = "taxes" if self.doc.doctype == "Landed Cost Voucher" else "additional_costs"
diff --git a/erpnext/controllers/tests/test_accounts_controller.py b/erpnext/controllers/tests/test_accounts_controller.py
index e348d296cd7..5bfed8cddeb 100644
--- a/erpnext/controllers/tests/test_accounts_controller.py
+++ b/erpnext/controllers/tests/test_accounts_controller.py
@@ -1,18 +1,15 @@
# Copyright (c) 2022, Frappe Technologies Pvt. Ltd. and contributors
# For license information, please see license.txt
-import unittest
import frappe
from frappe import qb
from frappe.query_builder.functions import Sum
-from frappe.tests.utils import FrappeTestCase, change_settings
-from frappe.utils import add_days, flt, getdate, nowdate
+from frappe.tests.utils import FrappeTestCase
+from frappe.utils import add_days, getdate, nowdate
-from erpnext import get_default_cost_center
from erpnext.accounts.doctype.payment_entry.payment_entry import get_payment_entry
from erpnext.accounts.doctype.payment_entry.test_payment_entry import create_payment_entry
-from erpnext.accounts.doctype.purchase_invoice.test_purchase_invoice import make_purchase_invoice
from erpnext.accounts.doctype.sales_invoice.test_sales_invoice import create_sales_invoice
from erpnext.accounts.party import get_party_account
from erpnext.stock.doctype.item.test_item import create_item
@@ -174,9 +171,7 @@ class TestAccountsController(FrappeTestCase):
)
return sinv
- def create_payment_entry(
- self, amount=1, source_exc_rate=75, posting_date=nowdate(), customer=None
- ):
+ def create_payment_entry(self, amount=1, source_exc_rate=75, posting_date=nowdate(), customer=None):
"""
Helper function to populate default values in payment entry
"""
@@ -294,9 +289,7 @@ class TestAccountsController(FrappeTestCase):
.run(as_dict=True)[0]
)
self.assertEqual(outstanding, current_outstanding.outstanding)
- self.assertEqual(
- outstanding_in_account_currency, current_outstanding.outstanding_in_account_currency
- )
+ self.assertEqual(outstanding_in_account_currency, current_outstanding.outstanding_in_account_currency)
def test_10_payment_against_sales_invoice(self):
# Sales Invoice in Foreign Currency
@@ -402,7 +395,6 @@ class TestAccountsController(FrappeTestCase):
adv.reload()
# sales invoice with advance(partial amount)
- rate = 80
rate_in_account_currency = 1
si = self.create_sales_invoice(
qty=2, conversion_rate=80, rate=rate_in_account_currency, do_not_submit=True
@@ -789,7 +781,9 @@ class TestAccountsController(FrappeTestCase):
self.assert_ledger_outstanding(si.doctype, si.name, 0.0, 0.0)
# Exchange Gain/Loss Journal should've been created.
- exc_je_for_si = [x for x in self.get_journals_for(si.doctype, si.name) if x.parent != adv.name]
+ exc_je_for_si = [
+ x for x in self.get_journals_for(si.doctype, si.name) if x.parent != adv.name
+ ]
exc_je_for_adv = self.get_journals_for(adv.doctype, adv.name)
self.assertNotEqual(exc_je_for_si, [])
self.assertEqual(len(exc_je_for_si), 1)
@@ -1254,7 +1248,9 @@ class TestAccountsController(FrappeTestCase):
with self.subTest(x=x):
self.assertEqual(
[self.cost_center, self.cost_center],
- frappe.db.get_all("Journal Entry Account", filters={"parent": x.parent}, pluck="cost_center"),
+ frappe.db.get_all(
+ "Journal Entry Account", filters={"parent": x.parent}, pluck="cost_center"
+ ),
)
frappe.db.set_value("Company", self.company, "cost_center", cc)
@@ -1419,14 +1415,15 @@ class TestAccountsController(FrappeTestCase):
with self.subTest(x=x):
self.assertEqual(
[cr_note.department, cr_note.department],
- frappe.db.get_all("Journal Entry Account", filters={"parent": x.parent}, pluck="department"),
+ frappe.db.get_all(
+ "Journal Entry Account", filters={"parent": x.parent}, pluck="department"
+ ),
)
self.disable_dimensions()
def test_92_dimension_inhertiance_exc_gain_loss(self):
# Sales Invoice in Foreign Currency
self.setup_dimensions()
- rate = 80
rate_in_account_currency = 1
dpt = "Research & Development"
diff --git a/erpnext/controllers/tests/test_mapper.py b/erpnext/controllers/tests/test_mapper.py
index 919bcdab660..9dbcf6cafd2 100644
--- a/erpnext/controllers/tests/test_mapper.py
+++ b/erpnext/controllers/tests/test_mapper.py
@@ -29,7 +29,6 @@ class TestMapper(unittest.TestCase):
self.assertEqual(set(d for d in src_items), set(d.item_code for d in updated_so.items))
def make_quotation(self, item_list, customer):
-
qtn = frappe.get_doc(
{
"doctype": "Quotation",
diff --git a/erpnext/controllers/tests/test_qty_based_taxes.py b/erpnext/controllers/tests/test_qty_based_taxes.py
index 2e9dfd2faa0..e7896b57f23 100644
--- a/erpnext/controllers/tests/test_qty_based_taxes.py
+++ b/erpnext/controllers/tests/test_qty_based_taxes.py
@@ -25,7 +25,7 @@ class TestTaxes(unittest.TestCase):
"account_name": uuid4(),
"account_type": "Tax",
"company": self.company.name,
- "parent_account": "Duties and Taxes - {self.company.abbr}".format(self=self),
+ "parent_account": f"Duties and Taxes - {self.company.abbr}",
}
).insert()
self.item_group = frappe.get_doc(
diff --git a/erpnext/controllers/tests/test_queries.py b/erpnext/controllers/tests/test_queries.py
index 3a3bc1cd725..904f75f64de 100644
--- a/erpnext/controllers/tests/test_queries.py
+++ b/erpnext/controllers/tests/test_queries.py
@@ -7,13 +7,10 @@ from erpnext.controllers import queries
def add_default_params(func, doctype):
- return partial(
- func, doctype=doctype, txt="", searchfield="name", start=0, page_len=20, filters=None
- )
+ return partial(func, doctype=doctype, txt="", searchfield="name", start=0, page_len=20, filters=None)
class TestQueries(unittest.TestCase):
-
# All tests are based on doctype/test_records.json
def assert_nested_in(self, item, container):
diff --git a/erpnext/controllers/tests/test_subcontracting_controller.py b/erpnext/controllers/tests/test_subcontracting_controller.py
index 68af142afcb..c7cda2dea98 100644
--- a/erpnext/controllers/tests/test_subcontracting_controller.py
+++ b/erpnext/controllers/tests/test_subcontracting_controller.py
@@ -423,7 +423,7 @@ class TestSubcontractingController(FrappeTestCase):
scr1.set_missing_values()
scr1.submit()
- for key, value in get_supplied_items(scr1).items():
+ for _key, value in get_supplied_items(scr1).items():
self.assertEqual(value.qty, 4)
scr2 = make_subcontracting_receipt(sco.name)
@@ -434,7 +434,7 @@ class TestSubcontractingController(FrappeTestCase):
scr2.set_missing_values()
scr2.submit()
- for key, value in get_supplied_items(scr2).items():
+ for _key, value in get_supplied_items(scr2).items():
self.assertEqual(value.qty, 4)
scr3 = make_subcontracting_receipt(sco.name)
@@ -444,7 +444,7 @@ class TestSubcontractingController(FrappeTestCase):
scr3.set_missing_values()
scr3.submit()
- for key, value in get_supplied_items(scr3).items():
+ for _key, value in get_supplied_items(scr3).items():
self.assertEqual(value.qty, 2)
def test_item_with_batch_based_on_material_transfer(self):
@@ -729,7 +729,7 @@ class TestSubcontractingController(FrappeTestCase):
scr1.load_from_db()
scr1.supplied_items[0].consumed_qty = 5
- scr1.supplied_items[0].batch_no = list(transferred_batch_no.keys())[0]
+ scr1.supplied_items[0].batch_no = next(iter(transferred_batch_no.keys()))
scr1.save()
scr1.submit()
@@ -872,9 +872,7 @@ def make_stock_in_entry(**args):
def update_item_details(child_row, details):
details.qty += (
- child_row.get("qty")
- if child_row.doctype == "Stock Entry Detail"
- else child_row.get("consumed_qty")
+ child_row.get("qty") if child_row.doctype == "Stock Entry Detail" else child_row.get("consumed_qty")
)
if child_row.serial_no:
@@ -967,7 +965,9 @@ def make_raw_materials():
make_item(item, properties)
-def make_service_item(item, properties={}):
+def make_service_item(item, properties=None):
+ if properties is None:
+ properties = {}
if not frappe.db.exists("Item", item):
properties.update({"is_stock_item": 0})
make_item(item, properties)
@@ -1015,9 +1015,7 @@ def make_bom_for_subcontracted_items():
def set_backflush_based_on(based_on):
- frappe.db.set_value(
- "Buying Settings", None, "backflush_raw_materials_of_subcontract_based_on", based_on
- )
+ frappe.db.set_value("Buying Settings", None, "backflush_raw_materials_of_subcontract_based_on", based_on)
def get_subcontracting_order(**args):
diff --git a/erpnext/controllers/tests/test_transaction_base.py b/erpnext/controllers/tests/test_transaction_base.py
index 1471543f1b2..ab5525a7f06 100644
--- a/erpnext/controllers/tests/test_transaction_base.py
+++ b/erpnext/controllers/tests/test_transaction_base.py
@@ -44,7 +44,10 @@ class TestUtils(unittest.TestCase):
item_code="_Test Item", qty=1, basic_rate=200, s_warehouse="_Test Warehouse - _TC"
),
frappe._dict(
- item_code="_Test FG Item", qty=4, t_warehouse="_Test Warehouse 1 - _TC", is_finished_item=1
+ item_code="_Test FG Item",
+ qty=4,
+ t_warehouse="_Test Warehouse 1 - _TC",
+ is_finished_item=1,
),
],
)
diff --git a/erpnext/controllers/trends.py b/erpnext/controllers/trends.py
index 1fb722e1123..18fe7767c5d 100644
--- a/erpnext/controllers/trends.py
+++ b/erpnext/controllers/trends.py
@@ -100,12 +100,11 @@ def get_data(filters, conditions):
else:
inc = 1
data1 = frappe.db.sql(
- """ select %s from `tab%s` t1, `tab%s Item` t2 %s
- where t2.parent = t1.name and t1.company = %s and %s between %s and %s and
- t1.docstatus = 1 %s %s
- group by %s
- """
- % (
+ """ select {} from `tab{}` t1, `tab{} Item` t2 {}
+ where t2.parent = t1.name and t1.company = {} and {} between {} and {} and
+ t1.docstatus = 1 {} {}
+ group by {}
+ """.format(
query_details,
conditions["trans"],
conditions["trans"],
@@ -130,11 +129,10 @@ def get_data(filters, conditions):
# to get distinct value of col specified by group_by in filter
row = frappe.db.sql(
- """select DISTINCT(%s) from `tab%s` t1, `tab%s Item` t2 %s
- where t2.parent = t1.name and t1.company = %s and %s between %s and %s
- and t1.docstatus = 1 and %s = %s %s %s
- """
- % (
+ """select DISTINCT({}) from `tab{}` t1, `tab{} Item` t2 {}
+ where t2.parent = t1.name and t1.company = {} and {} between {} and {}
+ and t1.docstatus = 1 and {} = {} {} {}
+ """.format(
sel_col,
conditions["trans"],
conditions["trans"],
@@ -157,11 +155,10 @@ def get_data(filters, conditions):
# get data for group_by filter
row1 = frappe.db.sql(
- """ select %s , %s from `tab%s` t1, `tab%s Item` t2 %s
- where t2.parent = t1.name and t1.company = %s and %s between %s and %s
- and t1.docstatus = 1 and %s = %s and %s = %s %s %s
- """
- % (
+ """ select {} , {} from `tab{}` t1, `tab{} Item` t2 {}
+ where t2.parent = t1.name and t1.company = {} and {} between {} and {}
+ and t1.docstatus = 1 and {} = {} and {} = {} {} {}
+ """.format(
sel_col,
conditions["period_wise_select"],
conditions["trans"],
@@ -190,12 +187,11 @@ def get_data(filters, conditions):
data.append(des)
else:
data = frappe.db.sql(
- """ select %s from `tab%s` t1, `tab%s Item` t2 %s
- where t2.parent = t1.name and t1.company = %s and %s between %s and %s and
- t1.docstatus = 1 %s %s
- group by %s
- """
- % (
+ """ select {} from `tab{}` t1, `tab{} Item` t2 {}
+ where t2.parent = t1.name and t1.company = {} and {} between {} and {} and
+ t1.docstatus = 1 {} {}
+ group by {}
+ """.format(
query_details,
conditions["trans"],
conditions["trans"],
@@ -260,13 +256,13 @@ def get_period_wise_columns(bet_dates, period, pwc):
def get_period_wise_query(bet_dates, trans_date, query_details):
- query_details += """SUM(IF(t1.%(trans_date)s BETWEEN '%(sd)s' AND '%(ed)s', t2.stock_qty, NULL)),
- SUM(IF(t1.%(trans_date)s BETWEEN '%(sd)s' AND '%(ed)s', t2.base_net_amount, NULL)),
- """ % {
- "trans_date": trans_date,
- "sd": bet_dates[0],
- "ed": bet_dates[1],
- }
+ query_details += """SUM(IF(t1.{trans_date} BETWEEN '{sd}' AND '{ed}', t2.stock_qty, NULL)),
+ SUM(IF(t1.{trans_date} BETWEEN '{sd}' AND '{ed}', t2.base_net_amount, NULL)),
+ """.format(
+ trans_date=trans_date,
+ sd=bet_dates[0],
+ ed=bet_dates[1],
+ )
return query_details
@@ -282,7 +278,7 @@ def get_period_date_ranges(period, fiscal_year=None, year_start_date=None):
increment = {"Monthly": 1, "Quarterly": 3, "Half-Yearly": 6, "Yearly": 12}.get(period)
period_date_ranges = []
- for i in range(1, 13, increment):
+ for _i in range(1, 13, increment):
period_end_date = getdate(year_start_date) + relativedelta(months=increment, days=-1)
if period_end_date > getdate(year_end_date):
period_end_date = year_end_date
@@ -331,9 +327,7 @@ def based_wise_columns_query(based_on, trans):
"Territory:Link/Territory:120",
]
based_on_details["based_on_select"] = "t1.customer_name, t1.territory, "
- based_on_details["based_on_group_by"] = (
- "t1.party_name" if trans == "Quotation" else "t1.customer"
- )
+ based_on_details["based_on_group_by"] = "t1.party_name" if trans == "Quotation" else "t1.customer"
based_on_details["addl_tables"] = ""
elif based_on == "Customer Group":
diff --git a/erpnext/controllers/website_list_for_contact.py b/erpnext/controllers/website_list_for_contact.py
index 7c3c38706dc..22c68dd3632 100644
--- a/erpnext/controllers/website_list_for_contact.py
+++ b/erpnext/controllers/website_list_for_contact.py
@@ -81,9 +81,7 @@ def get_transaction_list(
filters["docstatus"] = ["<", "2"] if doctype in ["Supplier Quotation", "Purchase Invoice"] else 1
if (user != "Guest" and is_website_user()) or doctype == "Request for Quotation":
- parties_doctype = (
- "Request for Quotation Supplier" if doctype == "Request for Quotation" else doctype
- )
+ parties_doctype = "Request for Quotation Supplier" if doctype == "Request for Quotation" else doctype
# find party for this contact
customers, suppliers = get_customers_suppliers(parties_doctype, user)
diff --git a/erpnext/crm/doctype/appointment/appointment.py b/erpnext/crm/doctype/appointment/appointment.py
index bd49bdc925c..03ef9c9f2e0 100644
--- a/erpnext/crm/doctype/appointment/appointment.py
+++ b/erpnext/crm/doctype/appointment/appointment.py
@@ -178,7 +178,9 @@ class Appointment(Document):
"starts_on": self.scheduled_time,
"status": "Open",
"type": "Public",
- "send_reminder": frappe.db.get_single_value("Appointment Booking Settings", "email_reminders"),
+ "send_reminder": frappe.db.get_single_value(
+ "Appointment Booking Settings", "email_reminders"
+ ),
"event_participants": [
dict(reference_doctype=self.appointment_with, reference_docname=self.party)
],
@@ -231,9 +233,7 @@ def _get_agent_list_as_strings():
def _check_agent_availability(agent_email, scheduled_time):
- appointemnts_at_scheduled_time = frappe.get_all(
- "Appointment", filters={"scheduled_time": scheduled_time}
- )
+ appointemnts_at_scheduled_time = frappe.get_all("Appointment", filters={"scheduled_time": scheduled_time})
for appointment in appointemnts_at_scheduled_time:
if appointment._assign == agent_email:
return False
diff --git a/erpnext/crm/doctype/appointment_booking_settings/appointment_booking_settings.py b/erpnext/crm/doctype/appointment_booking_settings/appointment_booking_settings.py
index e43f4601e9c..57e80f9abc8 100644
--- a/erpnext/crm/doctype/appointment_booking_settings/appointment_booking_settings.py
+++ b/erpnext/crm/doctype/appointment_booking_settings/appointment_booking_settings.py
@@ -19,13 +19,13 @@ class AppointmentBookingSettings(Document):
def save(self):
self.number_of_agents = len(self.agent_list)
- super(AppointmentBookingSettings, self).save()
+ super().save()
def validate_availability_of_slots(self):
for record in self.availability_of_slots:
from_time = datetime.datetime.strptime(self.min_date + record.from_time, self.format_string)
to_time = datetime.datetime.strptime(self.min_date + record.to_time, self.format_string)
- timedelta = to_time - from_time
+ to_time - from_time
self.validate_from_and_to_time(from_time, to_time, record)
self.duration_is_divisible(from_time, to_time)
@@ -39,6 +39,4 @@ class AppointmentBookingSettings(Document):
def duration_is_divisible(self, from_time, to_time):
timedelta = to_time - from_time
if timedelta.total_seconds() % (self.appointment_duration * 60):
- frappe.throw(
- _("The difference between from time and To Time must be a multiple of Appointment")
- )
+ frappe.throw(_("The difference between from time and To Time must be a multiple of Appointment"))
diff --git a/erpnext/crm/doctype/contract/contract.py b/erpnext/crm/doctype/contract/contract.py
index 1c2470b6e4e..db23d570644 100644
--- a/erpnext/crm/doctype/contract/contract.py
+++ b/erpnext/crm/doctype/contract/contract.py
@@ -13,12 +13,12 @@ class Contract(Document):
name = self.party_name
if self.contract_template:
- name += " - {} Agreement".format(self.contract_template)
+ name += f" - {self.contract_template} Agreement"
# If identical, append contract name with the next number in the iteration
if frappe.db.exists("Contract", name):
- count = len(frappe.get_all("Contract", filters={"name": ["like", "%{}%".format(name)]}))
- name = "{} - {}".format(name, count)
+ count = len(frappe.get_all("Contract", filters={"name": ["like", f"%{name}%"]}))
+ name = f"{name} - {count}"
self.name = _(name)
diff --git a/erpnext/crm/doctype/lead/lead.py b/erpnext/crm/doctype/lead/lead.py
index cbef699ce61..3135bcff049 100644
--- a/erpnext/crm/doctype/lead/lead.py
+++ b/erpnext/crm/doctype/lead/lead.py
@@ -19,7 +19,7 @@ from erpnext.selling.doctype.customer.customer import parse_full_name
class Lead(SellingController, CRMNote):
def get_feed(self):
- return "{0}: {1}".format(_(self.status), self.lead_name)
+ return f"{_(self.status)}: {self.lead_name}"
def onload(self):
customer = frappe.db.get_value("Customer", {"lead_name": self.name})
@@ -122,9 +122,7 @@ class Lead(SellingController, CRMNote):
self.contact_doc.save()
def update_prospect(self):
- lead_row_name = frappe.db.get_value(
- "Prospect Lead", filters={"lead": self.name}, fieldname="name"
- )
+ lead_row_name = frappe.db.get_value("Prospect Lead", filters={"lead": self.name}, fieldname="name")
if lead_row_name:
lead_row = frappe.get_doc("Prospect Lead", lead_row_name)
lead_row.update(
@@ -174,9 +172,7 @@ class Lead(SellingController, CRMNote):
)
def has_lost_quotation(self):
- return frappe.db.get_value(
- "Quotation", {"party_name": self.name, "docstatus": 1, "status": "Lost"}
- )
+ return frappe.db.get_value("Quotation", {"party_name": self.name, "docstatus": 1, "status": "Lost"})
@frappe.whitelist()
def create_prospect_and_contact(self, data):
@@ -448,8 +444,8 @@ def get_lead_with_phone_number(number):
leads = frappe.get_all(
"Lead",
or_filters={
- "phone": ["like", "%{}".format(number)],
- "mobile_no": ["like", "%{}".format(number)],
+ "phone": ["like", f"%{number}"],
+ "mobile_no": ["like", f"%{number}"],
},
limit=1,
order_by="creation DESC",
@@ -476,9 +472,7 @@ def add_lead_to_prospect(lead, prospect):
link_open_events("Lead", lead, prospect)
frappe.msgprint(
- _("Lead {0} has been added to prospect {1}.").format(
- frappe.bold(lead), frappe.bold(prospect.name)
- ),
+ _("Lead {0} has been added to prospect {1}.").format(frappe.bold(lead), frappe.bold(prospect.name)),
title=_("Lead -> Prospect"),
indicator="green",
)
diff --git a/erpnext/crm/doctype/lead/test_lead.py b/erpnext/crm/doctype/lead/test_lead.py
index 8fe688de46d..bab9947b333 100644
--- a/erpnext/crm/doctype/lead/test_lead.py
+++ b/erpnext/crm/doctype/lead/test_lead.py
@@ -134,9 +134,7 @@ class TestLead(unittest.TestCase):
self.assertEqual(event.event_participants[1].reference_docname, opportunity.name)
self.assertTrue(
- frappe.db.get_value(
- "ToDo", {"reference_type": "Opportunity", "reference_name": opportunity.name}
- )
+ frappe.db.get_value("ToDo", {"reference_type": "Opportunity", "reference_name": opportunity.name})
)
def test_copy_events_from_lead_to_prospect(self):
@@ -194,7 +192,7 @@ def make_lead(**args):
"doctype": "Lead",
"first_name": args.first_name or "_Test",
"last_name": args.last_name or "Lead",
- "email_id": args.email_id or "new_lead_{}@example.com".format(random_string(5)),
+ "email_id": args.email_id or f"new_lead_{random_string(5)}@example.com",
"company_name": args.company_name or "_Test Company",
}
).insert()
diff --git a/erpnext/crm/doctype/linkedin_settings/linkedin_settings.py b/erpnext/crm/doctype/linkedin_settings/linkedin_settings.py
index 64b3a017b46..1b535e14c46 100644
--- a/erpnext/crm/doctype/linkedin_settings/linkedin_settings.py
+++ b/erpnext/crm/doctype/linkedin_settings/linkedin_settings.py
@@ -19,14 +19,14 @@ class LinkedInSettings(Document):
{
"response_type": "code",
"client_id": self.consumer_key,
- "redirect_uri": "{0}/api/method/erpnext.crm.doctype.linkedin_settings.linkedin_settings.callback?".format(
+ "redirect_uri": "{}/api/method/erpnext.crm.doctype.linkedin_settings.linkedin_settings.callback?".format(
frappe.utils.get_url()
),
"scope": "r_emailaddress w_organization_social r_basicprofile r_liteprofile r_organization_social rw_organization_admin w_member_social",
}
)
- url = "https://www.linkedin.com/oauth/v2/authorization?{}".format(params)
+ url = f"https://www.linkedin.com/oauth/v2/authorization?{params}"
return url
@@ -37,7 +37,7 @@ class LinkedInSettings(Document):
"code": code,
"client_id": self.consumer_key,
"client_secret": self.get_password(fieldname="consumer_secret"),
- "redirect_uri": "{0}/api/method/erpnext.crm.doctype.linkedin_settings.linkedin_settings.callback?".format(
+ "redirect_uri": "{}/api/method/erpnext.crm.doctype.linkedin_settings.linkedin_settings.callback?".format(
frappe.utils.get_url()
),
}
@@ -80,7 +80,7 @@ class LinkedInSettings(Document):
body = {
"registerUploadRequest": {
"recipes": ["urn:li:digitalmediaRecipe:feedshare-image"],
- "owner": "urn:li:organization:{0}".format(self.company_id),
+ "owner": f"urn:li:organization:{self.company_id}",
"serviceRelationships": [
{"relationshipType": "OWNER", "identifier": "urn:li:userGeneratedContent"}
],
@@ -100,7 +100,7 @@ class LinkedInSettings(Document):
if response.status_code < 200 and response.status_code > 299:
frappe.throw(
_("Error While Uploading Image"),
- title="{0} {1}".format(response.status_code, response.reason),
+ title=f"{response.status_code} {response.reason}",
)
return None
return asset
@@ -115,7 +115,7 @@ class LinkedInSettings(Document):
body = {
"distribution": {"linkedInDistributionTarget": {}},
- "owner": "urn:li:organization:{0}".format(self.company_id),
+ "owner": f"urn:li:organization:{self.company_id}",
"subject": title,
"text": {"text": text},
}
@@ -136,13 +136,13 @@ class LinkedInSettings(Document):
if response.status_code not in [201, 200]:
raise
- except Exception as e:
+ except Exception:
self.api_error(response)
return response
def get_headers(self):
- return {"Authorization": "Bearer {}".format(self.access_token)}
+ return {"Authorization": f"Bearer {self.access_token}"}
def get_reference_url(self, text):
import re
@@ -155,7 +155,7 @@ class LinkedInSettings(Document):
def delete_post(self, post_id):
try:
response = requests.delete(
- url="https://api.linkedin.com/v2/shares/urn:li:share:{0}".format(post_id),
+ url=f"https://api.linkedin.com/v2/shares/urn:li:share:{post_id}",
headers=self.get_headers(),
)
if response.status_code != 200:
@@ -164,7 +164,7 @@ class LinkedInSettings(Document):
self.api_error(response)
def get_post(self, post_id):
- url = "https://api.linkedin.com/v2/organizationalEntityShareStatistics?q=organizationalEntity&organizationalEntity=urn:li:organization:{0}&shares[0]=urn:li:share:{1}".format(
+ url = "https://api.linkedin.com/v2/organizationalEntityShareStatistics?q=organizationalEntity&organizationalEntity=urn:li:organization:{}&shares[0]=urn:li:share:{}".format(
self.company_id, post_id
)
diff --git a/erpnext/crm/doctype/opportunity/opportunity.py b/erpnext/crm/doctype/opportunity/opportunity.py
index 2a8d65f4866..a0301f9ea0a 100644
--- a/erpnext/crm/doctype/opportunity/opportunity.py
+++ b/erpnext/crm/doctype/opportunity/opportunity.py
@@ -304,9 +304,7 @@ def make_quotation(source_name, target_doc=None):
quotation.conversion_rate = exchange_rate
# get default taxes
- taxes = get_default_taxes_and_charges(
- "Sales Taxes and Charges Template", company=quotation.company
- )
+ taxes = get_default_taxes_and_charges("Sales Taxes and Charges Template", company=quotation.company)
if taxes.get("taxes"):
quotation.update(taxes)
@@ -412,9 +410,7 @@ def set_multiple_status(names, status):
def auto_close_opportunity():
"""auto close the `Replied` Opportunities after 7 days"""
- auto_close_after_days = (
- frappe.db.get_single_value("CRM Settings", "close_opportunity_after_days") or 15
- )
+ auto_close_after_days = frappe.db.get_single_value("CRM Settings", "close_opportunity_after_days") or 15
table = frappe.qb.DocType("Opportunity")
opportunities = (
diff --git a/erpnext/crm/doctype/opportunity/test_opportunity.py b/erpnext/crm/doctype/opportunity/test_opportunity.py
index 1ff3267e719..79aca1b0033 100644
--- a/erpnext/crm/doctype/opportunity/test_opportunity.py
+++ b/erpnext/crm/doctype/opportunity/test_opportunity.py
@@ -4,7 +4,7 @@
import unittest
import frappe
-from frappe.utils import add_days, now_datetime, random_string, today
+from frappe.utils import now_datetime, random_string, today
from erpnext.crm.doctype.lead.lead import make_customer
from erpnext.crm.doctype.lead.test_lead import make_lead
@@ -32,9 +32,7 @@ class TestOpportunity(unittest.TestCase):
self.assertTrue(opp_doc.party_name)
self.assertEqual(opp_doc.opportunity_from, "Lead")
- self.assertEqual(
- frappe.db.get_value("Lead", opp_doc.party_name, "email_id"), opp_doc.contact_email
- )
+ self.assertEqual(frappe.db.get_value("Lead", opp_doc.party_name, "email_id"), opp_doc.contact_email)
# create new customer and create new contact against 'new.opportunity@example.com'
customer = make_customer(opp_doc.party_name).insert(ignore_permissions=True)
@@ -53,9 +51,7 @@ class TestOpportunity(unittest.TestCase):
self.assertEqual(opportunity_doc.total, 2200)
def test_carry_forward_of_email_and_comments(self):
- frappe.db.set_value(
- "CRM Settings", "CRM Settings", "carry_forward_communication_and_comments", 1
- )
+ frappe.db.set_value("CRM Settings", "CRM Settings", "carry_forward_communication_and_comments", 1)
lead_doc = make_lead()
lead_doc.add_comment("Comment", text="Test Comment 1")
lead_doc.add_comment("Comment", text="Test Comment 2")
@@ -66,9 +62,7 @@ class TestOpportunity(unittest.TestCase):
opportunity_comment_count = frappe.db.count(
"Comment", {"reference_doctype": opp_doc.doctype, "reference_name": opp_doc.name}
)
- opportunity_communication_count = len(
- get_linked_communication_list(opp_doc.doctype, opp_doc.name)
- )
+ opportunity_communication_count = len(get_linked_communication_list(opp_doc.doctype, opp_doc.name))
self.assertEqual(opportunity_comment_count, 2)
self.assertEqual(opportunity_communication_count, 2)
@@ -79,7 +73,7 @@ class TestOpportunity(unittest.TestCase):
def make_opportunity_from_lead():
- new_lead_email_id = "new{}@example.com".format(random_string(5))
+ new_lead_email_id = f"new{random_string(5)}@example.com"
args = {
"doctype": "Opportunity",
"contact_email": new_lead_email_id,
@@ -128,9 +122,7 @@ def make_opportunity(**args):
return opp_doc
-def create_communication(
- reference_doctype, reference_name, sender, sent_or_received=None, creation=None
-):
+def create_communication(reference_doctype, reference_name, sender, sent_or_received=None, creation=None):
communication = frappe.get_doc(
{
"doctype": "Communication",
diff --git a/erpnext/crm/doctype/prospect/test_prospect.py b/erpnext/crm/doctype/prospect/test_prospect.py
index 874f84ca843..c3930ee6c93 100644
--- a/erpnext/crm/doctype/prospect/test_prospect.py
+++ b/erpnext/crm/doctype/prospect/test_prospect.py
@@ -34,7 +34,7 @@ def make_prospect(**args):
prospect_doc = frappe.get_doc(
{
"doctype": "Prospect",
- "company_name": args.company_name or "_Test Company {}".format(random_string(3)),
+ "company_name": args.company_name or f"_Test Company {random_string(3)}",
}
).insert()
diff --git a/erpnext/crm/doctype/social_media_post/social_media_post.py b/erpnext/crm/doctype/social_media_post/social_media_post.py
index 55db29a627a..5822f3cc51a 100644
--- a/erpnext/crm/doctype/social_media_post/social_media_post.py
+++ b/erpnext/crm/doctype/social_media_post/social_media_post.py
@@ -26,7 +26,7 @@ class SocialMediaPost(Document):
def submit(self):
if self.scheduled_time:
self.post_status = "Scheduled"
- super(SocialMediaPost, self).submit()
+ super().submit()
def on_cancel(self):
self.db_set("post_status", "Cancelled")
diff --git a/erpnext/crm/doctype/twitter_settings/twitter_settings.py b/erpnext/crm/doctype/twitter_settings/twitter_settings.py
index 42874ddeea5..c3a0177c487 100644
--- a/erpnext/crm/doctype/twitter_settings/twitter_settings.py
+++ b/erpnext/crm/doctype/twitter_settings/twitter_settings.py
@@ -16,10 +16,8 @@ from tweepy.error import TweepError
class TwitterSettings(Document):
@frappe.whitelist()
def get_authorize_url(self):
- callback_url = (
- "{0}/api/method/erpnext.crm.doctype.twitter_settings.twitter_settings.callback?".format(
- frappe.utils.get_url()
- )
+ callback_url = "{}/api/method/erpnext.crm.doctype.twitter_settings.twitter_settings.callback?".format(
+ frappe.utils.get_url()
)
auth = tweepy.OAuthHandler(
self.consumer_key, self.get_password(fieldname="consumer_secret"), callback_url
@@ -27,10 +25,12 @@ class TwitterSettings(Document):
try:
redirect_url = auth.get_authorization_url()
return redirect_url
- except tweepy.TweepError as e:
+ except tweepy.TweepError:
frappe.msgprint(_("Error! Failed to get request token."))
frappe.throw(
- _("Invalid {0} or {1}").format(frappe.bold("Consumer Key"), frappe.bold("Consumer Secret Key"))
+ _("Invalid {0} or {1}").format(
+ frappe.bold("Consumer Key"), frappe.bold("Consumer Secret Key")
+ )
)
def get_access_token(self, oauth_token, oauth_verifier):
@@ -59,7 +59,7 @@ class TwitterSettings(Document):
frappe.local.response["type"] = "redirect"
frappe.local.response["location"] = get_url_to_form("Twitter Settings", "Twitter Settings")
- except TweepError as e:
+ except TweepError:
frappe.msgprint(_("Error! Failed to get access token."))
frappe.throw(_("Invalid Consumer Key or Consumer Secret Key"))
diff --git a/erpnext/crm/doctype/utils.py b/erpnext/crm/doctype/utils.py
index 6bcfcb7e626..cacc5a16607 100644
--- a/erpnext/crm/doctype/utils.py
+++ b/erpnext/crm/doctype/utils.py
@@ -3,7 +3,6 @@ import frappe
@frappe.whitelist()
def get_last_interaction(contact=None, lead=None):
-
if not contact and not lead:
return
@@ -23,16 +22,14 @@ def get_last_interaction(contact=None, lead=None):
# remove extra appended 'OR'
query_condition = query_condition[:-2]
last_communication = frappe.db.sql(
- """
+ f"""
SELECT `name`, `content`
FROM `tabCommunication`
WHERE `sent_or_received`='Received'
- AND ({})
+ AND ({query_condition})
ORDER BY `modified`
LIMIT 1
- """.format(
- query_condition
- ),
+ """,
values,
as_dict=1,
) # nosec
diff --git a/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py b/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py
index be7f5ca29b3..6d01bd289d3 100644
--- a/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py
+++ b/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py
@@ -33,13 +33,11 @@ def get_lead_data(filters, based_on):
conditions = get_filter_conditions(filters)
lead_details = frappe.db.sql(
- """
+ f"""
select {based_on_field}, name
from `tabLead`
where {based_on_field} is not null and {based_on_field} != '' {conditions}
- """.format(
- based_on_field=based_on_field, conditions=conditions
- ),
+ """,
filters,
as_dict=1,
)
@@ -82,9 +80,7 @@ def get_lead_quotation_count(leads):
where quotation_to = 'Lead' and party_name in (%s)"""
% ", ".join(["%s"] * len(leads)),
tuple(leads),
- )[0][
- 0
- ] # nosec
+ )[0][0] # nosec
def get_lead_opp_count(leads):
diff --git a/erpnext/crm/report/lost_opportunity/lost_opportunity.py b/erpnext/crm/report/lost_opportunity/lost_opportunity.py
index b37cfa449fe..eb09711667a 100644
--- a/erpnext/crm/report/lost_opportunity/lost_opportunity.py
+++ b/erpnext/crm/report/lost_opportunity/lost_opportunity.py
@@ -67,7 +67,7 @@ def get_columns():
def get_data(filters):
return frappe.db.sql(
- """
+ f"""
SELECT
`tabOpportunity`.name,
`tabOpportunity`.opportunity_from,
@@ -79,17 +79,15 @@ def get_data(filters):
`tabOpportunity`.territory
FROM
`tabOpportunity`
- {join}
+ {get_join(filters)}
WHERE
`tabOpportunity`.status = 'Lost' and `tabOpportunity`.company = %(company)s
AND DATE(`tabOpportunity`.modified) BETWEEN %(from_date)s AND %(to_date)s
- {conditions}
+ {get_conditions(filters)}
GROUP BY
`tabOpportunity`.name
ORDER BY
- `tabOpportunity`.creation asc """.format(
- conditions=get_conditions(filters), join=get_join(filters)
- ),
+ `tabOpportunity`.creation asc """,
filters,
as_dict=1,
)
@@ -119,9 +117,7 @@ def get_join(filters):
join = """JOIN `tabOpportunity Lost Reason Detail`
ON `tabOpportunity Lost Reason Detail`.parenttype = 'Opportunity' and
`tabOpportunity Lost Reason Detail`.parent = `tabOpportunity`.name and
- `tabOpportunity Lost Reason Detail`.lost_reason = '{0}'
- """.format(
- filters.get("lost_reason")
- )
+ `tabOpportunity Lost Reason Detail`.lost_reason = '{}'
+ """.format(filters.get("lost_reason"))
return join
diff --git a/erpnext/crm/report/opportunity_summary_by_sales_stage/opportunity_summary_by_sales_stage.py b/erpnext/crm/report/opportunity_summary_by_sales_stage/opportunity_summary_by_sales_stage.py
index 809311777b7..5a36c999747 100644
--- a/erpnext/crm/report/opportunity_summary_by_sales_stage/opportunity_summary_by_sales_stage.py
+++ b/erpnext/crm/report/opportunity_summary_by_sales_stage/opportunity_summary_by_sales_stage.py
@@ -14,7 +14,7 @@ def execute(filters=None):
return OpportunitySummaryBySalesStage(filters).run()
-class OpportunitySummaryBySalesStage(object):
+class OpportunitySummaryBySalesStage:
def __init__(self, filters=None):
self.filters = frappe._dict(filters or {})
@@ -199,7 +199,6 @@ class OpportunitySummaryBySalesStage(object):
return filters
def get_chart_data(self):
- labels = []
datasets = []
values = [0] * len(self.sales_stage_list)
diff --git a/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py b/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py
index 50c42efe3c5..39b49b20f51 100644
--- a/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py
+++ b/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py
@@ -62,9 +62,7 @@ def get_data(filters):
lead_details = []
lead_filters = get_lead_filters(filters)
- for lead in frappe.get_all(
- "Lead", fields=["name", "lead_name", "company_name"], filters=lead_filters
- ):
+ for lead in frappe.get_all("Lead", fields=["name", "lead_name", "company_name"], filters=lead_filters):
data = frappe.db.sql(
"""
select
@@ -90,7 +88,7 @@ def get_data(filters):
)
for lead_info in data:
- lead_data = [lead.name, lead.lead_name, lead.company_name] + list(lead_info)
+ lead_data = [lead.name, lead.lead_name, lead.company_name, *list(lead_info)]
lead_details.append(lead_data)
return lead_details
diff --git a/erpnext/crm/report/sales_pipeline_analytics/sales_pipeline_analytics.py b/erpnext/crm/report/sales_pipeline_analytics/sales_pipeline_analytics.py
index 4f7436ff9e4..9cc69d24a2b 100644
--- a/erpnext/crm/report/sales_pipeline_analytics/sales_pipeline_analytics.py
+++ b/erpnext/crm/report/sales_pipeline_analytics/sales_pipeline_analytics.py
@@ -17,7 +17,7 @@ def execute(filters=None):
return SalesPipelineAnalytics(filters).run()
-class SalesPipelineAnalytics(object):
+class SalesPipelineAnalytics:
def __init__(self, filters=None):
self.filters = frappe._dict(filters or {})
@@ -98,7 +98,7 @@ class SalesPipelineAnalytics(object):
"Opportunity",
filters=self.get_conditions(),
fields=[self.based_on, self.data_based_on, self.duration],
- group_by="{},{}".format(self.group_by_based_on, self.group_by_period),
+ group_by=f"{self.group_by_based_on},{self.group_by_period}",
order_by=self.group_by_period,
)
@@ -230,7 +230,7 @@ class SalesPipelineAnalytics(object):
current_date = date.today()
month_number = date.today().month
- for month in range(month_number, 13):
+ for _month in range(month_number, 13):
month_list.append(current_date.strftime("%B"))
current_date = current_date + relativedelta(months=1)
diff --git a/erpnext/crm/utils.py b/erpnext/crm/utils.py
index 737452021c0..c543c387c03 100644
--- a/erpnext/crm/utils.py
+++ b/erpnext/crm/utils.py
@@ -94,9 +94,7 @@ def get_linked_prospect(reference_doctype, reference_name):
"Opportunity", reference_name, ["opportunity_from", "party_name"]
)
if opportunity_from == "Lead":
- prospect = frappe.db.get_value(
- "Prospect Opportunity", {"opportunity": reference_name}, "parent"
- )
+ prospect = frappe.db.get_value("Prospect Opportunity", {"opportunity": reference_name}, "parent")
if opportunity_from == "Prospect":
prospect = party_name
diff --git a/erpnext/e_commerce/api.py b/erpnext/e_commerce/api.py
index bfada0faa7a..e2cccda2ba6 100644
--- a/erpnext/e_commerce/api.py
+++ b/erpnext/e_commerce/api.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
# Copyright (c) 2021, Frappe Technologies Pvt. Ltd. and contributors
# For license information, please see license.txt
diff --git a/erpnext/e_commerce/doctype/e_commerce_settings/e_commerce_settings.py b/erpnext/e_commerce/doctype/e_commerce_settings/e_commerce_settings.py
index c27d29a62cd..14798e0d3cd 100644
--- a/erpnext/e_commerce/doctype/e_commerce_settings/e_commerce_settings.py
+++ b/erpnext/e_commerce/doctype/e_commerce_settings/e_commerce_settings.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
# Copyright (c) 2021, Frappe Technologies Pvt. Ltd. and contributors
# For license information, please see license.txt
diff --git a/erpnext/e_commerce/doctype/item_review/item_review.py b/erpnext/e_commerce/doctype/item_review/item_review.py
index 3e540e38853..5fe7d4d8fdb 100644
--- a/erpnext/e_commerce/doctype/item_review/item_review.py
+++ b/erpnext/e_commerce/doctype/item_review/item_review.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
# Copyright (c) 2021, Frappe Technologies Pvt. Ltd. and contributors
# For license information, please see license.txt
diff --git a/erpnext/e_commerce/doctype/item_review/test_item_review.py b/erpnext/e_commerce/doctype/item_review/test_item_review.py
index 6147a9153e6..c3f76623c9c 100644
--- a/erpnext/e_commerce/doctype/item_review/test_item_review.py
+++ b/erpnext/e_commerce/doctype/item_review/test_item_review.py
@@ -1,7 +1,5 @@
-# -*- coding: utf-8 -*-
# Copyright (c) 2021, Frappe Technologies Pvt. Ltd. and Contributors
# See license.txt
-import unittest
import frappe
from frappe.core.doctype.user_permission.test_user_permission import create_user
diff --git a/erpnext/e_commerce/doctype/website_item/test_website_item.py b/erpnext/e_commerce/doctype/website_item/test_website_item.py
index 8dffb4364e1..86ca1f2cb61 100644
--- a/erpnext/e_commerce/doctype/website_item/test_website_item.py
+++ b/erpnext/e_commerce/doctype/website_item/test_website_item.py
@@ -1,8 +1,6 @@
-# -*- coding: utf-8 -*-
# Copyright (c) 2021, Frappe Technologies Pvt. Ltd. and Contributors
# See license.txt
-import unittest
import frappe
@@ -347,9 +345,7 @@ class TestWebsiteItem(FrappeTestCase):
)
# stock up item
- stock_entry = make_stock_entry(
- item_code=item_code, target="_Test Warehouse - _TC", qty=2, rate=100
- )
+ stock_entry = make_stock_entry(item_code=item_code, target="_Test Warehouse - _TC", qty=2, rate=100)
# check if stock details are fetched and item is in stock with warehouse set
data = get_product_info_for_website(item_code, skip_quotation_creation=True)
@@ -429,9 +425,7 @@ class TestWebsiteItem(FrappeTestCase):
web_item = create_regular_web_item(item_code)
# price visible to guests
- setup_e_commerce_settings(
- {"enable_recommendations": 1, "show_price": 1, "hide_price_for_guest": 0}
- )
+ setup_e_commerce_settings({"enable_recommendations": 1, "show_price": 1, "hide_price_for_guest": 0})
# create recommended web item and price for it
recommended_web_item = create_regular_web_item("Test Mobile Phone 1")
diff --git a/erpnext/e_commerce/doctype/website_item/website_item.py b/erpnext/e_commerce/doctype/website_item/website_item.py
index 81b8ecab48e..f7637cb3553 100644
--- a/erpnext/e_commerce/doctype/website_item/website_item.py
+++ b/erpnext/e_commerce/doctype/website_item/website_item.py
@@ -1,9 +1,8 @@
-# -*- coding: utf-8 -*-
# Copyright (c) 2022, Frappe Technologies Pvt. Ltd. and contributors
# For license information, please see license.txt
import json
-from typing import TYPE_CHECKING, List, Union
+from typing import TYPE_CHECKING, Union
if TYPE_CHECKING:
from erpnext.stock.doctype.item.item import Item
@@ -45,10 +44,10 @@ class WebsiteItem(WebsiteGenerator):
self.name = make_autoname(naming_series, doc=self)
def onload(self):
- super(WebsiteItem, self).onload()
+ super().onload()
def validate(self):
- super(WebsiteItem, self).validate()
+ super().validate()
if not self.item_code:
frappe.throw(_("Item Code is required"), title=_("Mandatory"))
@@ -78,7 +77,7 @@ class WebsiteItem(WebsiteGenerator):
self.update_template_item()
def on_trash(self):
- super(WebsiteItem, self).on_trash()
+ super().on_trash()
delete_item_from_index(self)
self.publish_unpublish_desk_item(publish=False)
@@ -197,7 +196,7 @@ class WebsiteItem(WebsiteGenerator):
}
).save()
- except IOError:
+ except OSError:
self.website_image = None
if file_doc:
@@ -234,9 +233,7 @@ class WebsiteItem(WebsiteGenerator):
context.reviews = context.reviews[:4]
context.wished = False
- if frappe.db.exists(
- "Wishlist Item", {"item_code": self.item_code, "parent": frappe.session.user}
- ):
+ if frappe.db.exists("Wishlist Item", {"item_code": self.item_code, "parent": frappe.session.user}):
context.wished = True
context.user_is_customer = check_if_user_is_customer()
@@ -256,9 +253,7 @@ class WebsiteItem(WebsiteGenerator):
)
# make an attribute-value map for easier access in templates
- variant.attribute_map = frappe._dict(
- {attr.attribute: attr.value for attr in variant.attributes}
- )
+ variant.attribute_map = frappe._dict({attr.attribute: attr.value for attr in variant.attributes})
for attr in variant.attributes:
values = attribute_values_available.setdefault(attr.attribute, [])
@@ -283,7 +278,6 @@ class WebsiteItem(WebsiteGenerator):
filters={"parent": attr.attribute},
order_by="idx asc",
):
-
if attr_value.attribute_value in attribute_values_available.get(attr.attribute, []):
values.append(attr_value.attribute_value)
@@ -311,9 +305,7 @@ class WebsiteItem(WebsiteGenerator):
def set_shopping_cart_data(self, context):
from erpnext.e_commerce.shopping_cart.product_info import get_product_info_for_website
- context.shopping_cart = get_product_info_for_website(
- self.item_code, skip_quotation_creation=True
- )
+ context.shopping_cart = get_product_info_for_website(self.item_code, skip_quotation_creation=True)
@frappe.whitelist()
def copy_specification_from_item_group(self):
@@ -425,7 +417,7 @@ def check_if_user_is_customer(user=None):
@frappe.whitelist()
-def make_website_item(doc: "Item", save: bool = True) -> Union["WebsiteItem", List[str]]:
+def make_website_item(doc: "Item", save: bool = True) -> Union["WebsiteItem", list[str]]:
"Make Website Item from Item. Used via Form UI or patch."
if not doc:
diff --git a/erpnext/e_commerce/doctype/website_item_tabbed_section/website_item_tabbed_section.py b/erpnext/e_commerce/doctype/website_item_tabbed_section/website_item_tabbed_section.py
index 91148b8b048..ebe016cfab2 100644
--- a/erpnext/e_commerce/doctype/website_item_tabbed_section/website_item_tabbed_section.py
+++ b/erpnext/e_commerce/doctype/website_item_tabbed_section/website_item_tabbed_section.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
# Copyright (c) 2021, Frappe Technologies Pvt. Ltd. and contributors
# For license information, please see license.txt
diff --git a/erpnext/e_commerce/doctype/website_offer/website_offer.py b/erpnext/e_commerce/doctype/website_offer/website_offer.py
index 8c92f75a1e9..d64254ac9bd 100644
--- a/erpnext/e_commerce/doctype/website_offer/website_offer.py
+++ b/erpnext/e_commerce/doctype/website_offer/website_offer.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
# Copyright (c) 2021, Frappe Technologies Pvt. Ltd. and contributors
# For license information, please see license.txt
diff --git a/erpnext/e_commerce/doctype/wishlist/test_wishlist.py b/erpnext/e_commerce/doctype/wishlist/test_wishlist.py
index 9d27126fdb2..b551f923dac 100644
--- a/erpnext/e_commerce/doctype/wishlist/test_wishlist.py
+++ b/erpnext/e_commerce/doctype/wishlist/test_wishlist.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
# Copyright (c) 2021, Frappe Technologies Pvt. Ltd. and Contributors
# See license.txt
import unittest
@@ -42,17 +41,13 @@ class TestWishlist(unittest.TestCase):
# add second item to wishlist
add_to_wishlist("Test Phone Series Y")
- wishlist_length = frappe.db.get_value(
- "Wishlist Item", {"parent": frappe.session.user}, "count(*)"
- )
+ wishlist_length = frappe.db.get_value("Wishlist Item", {"parent": frappe.session.user}, "count(*)")
self.assertEqual(wishlist_length, 2)
remove_from_wishlist("Test Phone Series X")
remove_from_wishlist("Test Phone Series Y")
- wishlist_length = frappe.db.get_value(
- "Wishlist Item", {"parent": frappe.session.user}, "count(*)"
- )
+ wishlist_length = frappe.db.get_value("Wishlist Item", {"parent": frappe.session.user}, "count(*)")
self.assertIsNone(frappe.db.exists("Wishlist Item", {"parent": frappe.session.user}))
self.assertEqual(wishlist_length, 0)
@@ -75,9 +70,7 @@ class TestWishlist(unittest.TestCase):
# check wishlist and its content for users
self.assertTrue(frappe.db.exists("Wishlist", {"user": test_user.name}))
self.assertTrue(
- frappe.db.exists(
- "Wishlist Item", {"item_code": "Test Phone Series X", "parent": test_user.name}
- )
+ frappe.db.exists("Wishlist Item", {"item_code": "Test Phone Series X", "parent": test_user.name})
)
self.assertTrue(frappe.db.exists("Wishlist", {"user": test_user_1.name}))
@@ -97,18 +90,14 @@ class TestWishlist(unittest.TestCase):
)
)
self.assertTrue(
- frappe.db.exists(
- "Wishlist Item", {"item_code": "Test Phone Series X", "parent": test_user.name}
- )
+ frappe.db.exists("Wishlist Item", {"item_code": "Test Phone Series X", "parent": test_user.name})
)
# remove item for first user
frappe.set_user(test_user.name)
remove_from_wishlist("Test Phone Series X")
self.assertFalse(
- frappe.db.exists(
- "Wishlist Item", {"item_code": "Test Phone Series X", "parent": test_user.name}
- )
+ frappe.db.exists("Wishlist Item", {"item_code": "Test Phone Series X", "parent": test_user.name})
)
# tear down
diff --git a/erpnext/e_commerce/doctype/wishlist/wishlist.py b/erpnext/e_commerce/doctype/wishlist/wishlist.py
index eb74027d77d..86672c91d7a 100644
--- a/erpnext/e_commerce/doctype/wishlist/wishlist.py
+++ b/erpnext/e_commerce/doctype/wishlist/wishlist.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
# Copyright (c) 2021, Frappe Technologies Pvt. Ltd. and contributors
# For license information, please see license.txt
diff --git a/erpnext/e_commerce/doctype/wishlist_item/wishlist_item.py b/erpnext/e_commerce/doctype/wishlist_item/wishlist_item.py
index 75ebccbc1b7..99f0fcd3475 100644
--- a/erpnext/e_commerce/doctype/wishlist_item/wishlist_item.py
+++ b/erpnext/e_commerce/doctype/wishlist_item/wishlist_item.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
# Copyright (c) 2021, Frappe Technologies Pvt. Ltd. and contributors
# For license information, please see license.txt
diff --git a/erpnext/e_commerce/legacy_search.py b/erpnext/e_commerce/legacy_search.py
index ef8e86d4428..9d36bfd5851 100644
--- a/erpnext/e_commerce/legacy_search.py
+++ b/erpnext/e_commerce/legacy_search.py
@@ -114,9 +114,7 @@ class ProductSearch(FullTextSearch):
def get_all_published_items():
- return frappe.get_all(
- "Website Item", filters={"variant_of": "", "published": 1}, pluck="item_code"
- )
+ return frappe.get_all("Website Item", filters={"variant_of": "", "published": 1}, pluck="item_code")
def update_index_for_path(path):
diff --git a/erpnext/e_commerce/product_data_engine/filters.py b/erpnext/e_commerce/product_data_engine/filters.py
index e5e5e97f86a..7e2904793e2 100644
--- a/erpnext/e_commerce/product_data_engine/filters.py
+++ b/erpnext/e_commerce/product_data_engine/filters.py
@@ -24,9 +24,7 @@ class ProductFiltersBuilder:
# filter valid field filters i.e. those that exist in Website Item
web_item_meta = frappe.get_meta("Website Item", cached=True)
- fields = [
- web_item_meta.get_field(field) for field in filter_fields if web_item_meta.has_field(field)
- ]
+ fields = [web_item_meta.get_field(field) for field in filter_fields if web_item_meta.has_field(field)]
for df in fields:
item_filters, item_or_filters = {"published": 1}, []
@@ -41,14 +39,24 @@ class ProductFiltersBuilder:
item_or_filters.extend(
[
["item_group", "in", include_groups],
- ["Website Item Group", "item_group", "=", self.item_group], # consider website item groups
+ [
+ "Website Item Group",
+ "item_group",
+ "=",
+ self.item_group,
+ ], # consider website item groups
]
)
else:
item_or_filters.extend(
[
["item_group", "=", self.item_group],
- ["Website Item Group", "item_group", "=", self.item_group], # consider website item groups
+ [
+ "Website Item Group",
+ "item_group",
+ "=",
+ self.item_group,
+ ], # consider website item groups
]
)
diff --git a/erpnext/e_commerce/product_data_engine/query.py b/erpnext/e_commerce/product_data_engine/query.py
index 975f87608a6..1c1275051e2 100644
--- a/erpnext/e_commerce/product_data_engine/query.py
+++ b/erpnext/e_commerce/product_data_engine/query.py
@@ -56,7 +56,7 @@ class ProductQuery:
"""
# track if discounts included in field filters
self.filter_with_discount = bool(fields.get("discount"))
- result, discount_list, website_item_groups, cart_items, count = [], [], [], [], 0
+ result, discount_list, _website_item_groups, cart_items, count = [], [], [], [], 0
if fields:
self.build_fields_filters(fields)
@@ -215,7 +215,7 @@ class ProductQuery:
search_fields.discard("web_long_description")
# Build or filters for query
- search = "%{}%".format(search_term)
+ search = f"%{search_term}%"
for field in search_fields:
self.or_filters.append([field, "like", search])
diff --git a/erpnext/e_commerce/product_data_engine/test_product_data_engine.py b/erpnext/e_commerce/product_data_engine/test_product_data_engine.py
index c3b6ed5da25..76cabfffc87 100644
--- a/erpnext/e_commerce/product_data_engine/test_product_data_engine.py
+++ b/erpnext/e_commerce/product_data_engine/test_product_data_engine.py
@@ -136,9 +136,7 @@ class TestProductDataEngine(unittest.TestCase):
field_filters = {"item_group": "Raw Material"}
engine = ProductQuery()
- result = engine.query(
- attributes={}, fields=field_filters, search_term=None, start=0, item_group=None
- )
+ result = engine.query(attributes={}, fields=field_filters, search_term=None, start=0, item_group=None)
items = result.get("items")
# check if only 'Raw Material' are fetched in the right order
@@ -229,9 +227,7 @@ class TestProductDataEngine(unittest.TestCase):
frappe.local.shopping_cart_settings = None
engine = ProductQuery()
- result = engine.query(
- attributes={}, fields=field_filters, search_term=None, start=0, item_group=None
- )
+ result = engine.query(attributes={}, fields=field_filters, search_term=None, start=0, item_group=None)
items = result.get("items")
# check if only product with 10% and below discount are fetched
@@ -293,12 +289,8 @@ class TestProductDataEngine(unittest.TestCase):
),
)
- frappe.db.set_value(
- "Website Item", {"item_code": "Test 11I Laptop"}, "supplier", "_Test Supplier"
- )
- frappe.db.set_value(
- "Website Item", {"item_code": "Test 12I Laptop"}, "supplier", "_Test Supplier 1"
- )
+ frappe.db.set_value("Website Item", {"item_code": "Test 11I Laptop"}, "supplier", "_Test Supplier")
+ frappe.db.set_value("Website Item", {"item_code": "Test 12I Laptop"}, "supplier", "_Test Supplier 1")
settings = frappe.get_doc("E Commerce Settings")
settings.append("filter_fields", {"fieldname": "supplier"})
@@ -316,9 +308,7 @@ class TestProductDataEngine(unittest.TestCase):
# test if custom filter works in query
field_filters = {"supplier": "_Test Supplier 1"}
engine = ProductQuery()
- result = engine.query(
- attributes={}, fields=field_filters, search_term=None, start=0, item_group=None
- )
+ result = engine.query(attributes={}, fields=field_filters, search_term=None, start=0, item_group=None)
items = result.get("items")
# check if only 'Raw Material' are fetched in the right order
diff --git a/erpnext/e_commerce/redisearch_utils.py b/erpnext/e_commerce/redisearch_utils.py
index 1f649c7b486..e096208c9fd 100644
--- a/erpnext/e_commerce/redisearch_utils.py
+++ b/erpnext/e_commerce/redisearch_utils.py
@@ -38,7 +38,7 @@ def is_search_module_loaded():
out = cache.execute_command("MODULE LIST")
parsed_output = " ".join(
- (" ".join([frappe.as_unicode(s) for s in o if not isinstance(s, int)]) for o in out)
+ " ".join([frappe.as_unicode(s) for s in o if not isinstance(s, int)]) for o in out
)
return "search" in parsed_output
except Exception:
@@ -58,7 +58,7 @@ def if_redisearch_enabled(function):
def make_key(key):
- return "{0}|{1}".format(frappe.conf.db_name, key).encode("utf-8")
+ return f"{frappe.conf.db_name}|{key}".encode()
@if_redisearch_enabled
@@ -89,7 +89,7 @@ def create_website_items_index():
idx_fields = list(map(to_search_field, idx_fields))
client.create_index(
- [TextField("web_item_name", sortable=True)] + idx_fields,
+ [TextField("web_item_name", sortable=True), *idx_fields],
definition=idx_def,
)
@@ -187,9 +187,7 @@ def define_autocomplete_dictionary():
@if_redisearch_enabled
def create_items_autocomplete_dict(autocompleter):
"Add items as suggestions in Autocompleter."
- items = frappe.get_all(
- "Website Item", fields=["web_item_name", "item_group"], filters={"published": 1}
- )
+ items = frappe.get_all("Website Item", fields=["web_item_name", "item_group"], filters={"published": 1})
for item in items:
autocompleter.add_suggestions(Suggestion(item.web_item_name))
@@ -248,6 +246,4 @@ def raise_redisearch_error():
log = frappe.log_error("Redisearch Error")
log_link = frappe.utils.get_link_to_form("Error Log", log.name)
- frappe.throw(
- msg=_("Something went wrong. Check {0}").format(log_link), title=_("Redisearch Error")
- )
+ frappe.throw(msg=_("Something went wrong. Check {0}").format(log_link), title=_("Redisearch Error"))
diff --git a/erpnext/e_commerce/shopping_cart/cart.py b/erpnext/e_commerce/shopping_cart/cart.py
index 029506b7a1e..c168b4f5a95 100644
--- a/erpnext/e_commerce/shopping_cart/cart.py
+++ b/erpnext/e_commerce/shopping_cart/cart.py
@@ -150,9 +150,7 @@ def update_cart(item_code, qty, additional_notes=None, with_items=False):
empty_card = True
else:
- warehouse = frappe.get_cached_value(
- "Website Item", {"item_code": item_code}, "website_warehouse"
- )
+ warehouse = frappe.get_cached_value("Website Item", {"item_code": item_code}, "website_warehouse")
quotation_items = quotation.get("items", {"item_code": item_code})
if not quotation_items:
@@ -243,14 +241,12 @@ def create_lead_for_item_inquiry(lead, subject, message):
lead_doc.add_comment(
"Comment",
- text="""
+ text=f"""
- """.format(
- subject=subject, message=message
- ),
+ """,
)
return lead_doc
@@ -276,9 +272,7 @@ def update_cart_address(address_type, address_name):
quotation.shipping_address_name = address_name
quotation.shipping_address = address_display
quotation.customer_address = quotation.customer_address or address_name
- address_doc = next(
- (doc for doc in get_shipping_addresses() if doc["name"] == address_name), None
- )
+ address_doc = next((doc for doc in get_shipping_addresses() if doc["name"] == address_name), None)
apply_cart_settings(quotation=quotation)
quotation.flags.ignore_permissions = True
@@ -300,9 +294,7 @@ def guess_territory():
territory = frappe.db.get_value("Territory", geoip_country)
return (
- territory
- or frappe.db.get_value("E Commerce Settings", None, "territory")
- or get_root_of("Territory")
+ territory or frappe.db.get_value("E Commerce Settings", None, "territory") or get_root_of("Territory")
)
@@ -591,9 +583,7 @@ def get_debtors_account(cart_settings):
return debtors_account_name
-def get_address_docs(
- doctype=None, txt=None, filters=None, limit_start=0, limit_page_length=20, party=None
-):
+def get_address_docs(doctype=None, txt=None, filters=None, limit_start=0, limit_page_length=20, party=None):
if not party:
party = get_party()
diff --git a/erpnext/e_commerce/shopping_cart/product_info.py b/erpnext/e_commerce/shopping_cart/product_info.py
index 0248ca73d7f..b1966dd33c6 100644
--- a/erpnext/e_commerce/shopping_cart/product_info.py
+++ b/erpnext/e_commerce/shopping_cart/product_info.py
@@ -29,9 +29,7 @@ def get_product_info_for_website(item_code, skip_quotation_creation=False):
cart_quotation = _get_cart_quotation()
selling_price_list = (
- cart_quotation.get("selling_price_list")
- if cart_quotation
- else _set_price_list(cart_settings, None)
+ cart_quotation.get("selling_price_list") if cart_quotation else _set_price_list(cart_settings, None)
)
price = {}
diff --git a/erpnext/e_commerce/shopping_cart/test_shopping_cart.py b/erpnext/e_commerce/shopping_cart/test_shopping_cart.py
index 363a80545b0..1dcd494a545 100644
--- a/erpnext/e_commerce/shopping_cart/test_shopping_cart.py
+++ b/erpnext/e_commerce/shopping_cart/test_shopping_cart.py
@@ -44,9 +44,7 @@ class TestShoppingCart(unittest.TestCase):
frappe.db.sql("delete from `tabTax Rule`")
def test_get_cart_new_user(self):
- self.login_as_customer(
- "test_contact_two_customer@example.com", "_Test Contact 2 For _Test Customer"
- )
+ self.login_as_customer("test_contact_two_customer@example.com", "_Test Contact 2 For _Test Customer")
create_address_and_contact(
address_title="_Test Address for Customer 2",
first_name="_Test Contact for Customer 2",
@@ -79,9 +77,7 @@ class TestShoppingCart(unittest.TestCase):
return quotation
def test_add_to_cart(self):
- self.login_as_customer(
- "test_contact_two_customer@example.com", "_Test Contact 2 For _Test Customer"
- )
+ self.login_as_customer("test_contact_two_customer@example.com", "_Test Contact 2 For _Test Customer")
create_address_and_contact(
address_title="_Test Address for Customer 2",
first_name="_Test Contact for Customer 2",
@@ -140,9 +136,7 @@ class TestShoppingCart(unittest.TestCase):
def test_tax_rule(self):
self.create_tax_rule()
- self.login_as_customer(
- "test_contact_two_customer@example.com", "_Test Contact 2 For _Test Customer"
- )
+ self.login_as_customer("test_contact_two_customer@example.com", "_Test Contact 2 For _Test Customer")
create_address_and_contact(
address_title="_Test Address for Customer 2",
first_name="_Test Contact for Customer 2",
diff --git a/erpnext/e_commerce/shopping_cart/utils.py b/erpnext/e_commerce/shopping_cart/utils.py
index 3d48c28dd1c..d6461767dc1 100644
--- a/erpnext/e_commerce/shopping_cart/utils.py
+++ b/erpnext/e_commerce/shopping_cart/utils.py
@@ -6,10 +6,7 @@ from erpnext.e_commerce.doctype.e_commerce_settings.e_commerce_settings import i
def show_cart_count():
- if (
- is_cart_enabled()
- and frappe.db.get_value("User", frappe.session.user, "user_type") == "Website User"
- ):
+ if is_cart_enabled() and frappe.db.get_value("User", frappe.session.user, "user_type") == "Website User":
return True
return False
diff --git a/erpnext/e_commerce/variant_selector/utils.py b/erpnext/e_commerce/variant_selector/utils.py
index 88356f5e909..ea7221ed674 100644
--- a/erpnext/e_commerce/variant_selector/utils.py
+++ b/erpnext/e_commerce/variant_selector/utils.py
@@ -35,7 +35,7 @@ def get_item_codes_by_attributes(attribute_filters, template_item_code=None):
else:
variant_of_query = ""
- query = """
+ query = f"""
SELECT
t1.parent
FROM
@@ -58,9 +58,7 @@ def get_item_codes_by_attributes(attribute_filters, template_item_code=None):
t1.parent
ORDER BY
NULL
- """.format(
- attribute_query=attribute_query, variant_of_query=variant_of_query
- )
+ """
item_codes = set([r[0] for r in frappe.db.sql(query, query_values)]) # nosemgrep
items.append(item_codes)
@@ -175,12 +173,10 @@ def get_next_attribute_and_values(item_code, selected_attributes):
if exact_match and len(exact_match) == 1:
product_id = exact_match[0]
elif filtered_items_count == 1:
- product_id = list(filtered_items)[0]
+ product_id = next(iter(filtered_items))
if product_id:
- warehouse = frappe.get_cached_value(
- "Website Item", {"item_code": product_id}, "website_warehouse"
- )
+ warehouse = frappe.get_cached_value("Website Item", {"item_code": product_id}, "website_warehouse")
available_qty = 0.0
if warehouse and frappe.get_cached_value("Warehouse", warehouse, "is_group") == 1:
diff --git a/erpnext/erpnext_integrations/connectors/woocommerce_connection.py b/erpnext/erpnext_integrations/connectors/woocommerce_connection.py
index 6d977e022ff..0298373ba88 100644
--- a/erpnext/erpnext_integrations/connectors/woocommerce_connection.py
+++ b/erpnext/erpnext_integrations/connectors/woocommerce_connection.py
@@ -11,15 +11,10 @@ from frappe.utils import cstr
def verify_request():
woocommerce_settings = frappe.get_doc("Woocommerce Settings")
sig = base64.b64encode(
- hmac.new(
- woocommerce_settings.secret.encode("utf8"), frappe.request.data, hashlib.sha256
- ).digest()
+ hmac.new(woocommerce_settings.secret.encode("utf8"), frappe.request.data, hashlib.sha256).digest()
)
- if (
- frappe.request.data
- and not sig == frappe.get_request_header("X-Wc-Webhook-Signature", "").encode()
- ):
+ if frappe.request.data and not sig == frappe.get_request_header("X-Wc-Webhook-Signature", "").encode():
frappe.throw(_("Unverified Webhook Data"))
frappe.set_user(woocommerce_settings.creation_user)
diff --git a/erpnext/erpnext_integrations/doctype/exotel_settings/exotel_settings.py b/erpnext/erpnext_integrations/doctype/exotel_settings/exotel_settings.py
index 4879cb56239..a9d6db4222f 100644
--- a/erpnext/erpnext_integrations/doctype/exotel_settings/exotel_settings.py
+++ b/erpnext/erpnext_integrations/doctype/exotel_settings/exotel_settings.py
@@ -15,7 +15,7 @@ class ExotelSettings(Document):
def verify_credentials(self):
if self.enabled:
response = requests.get(
- "https://api.exotel.com/v1/Accounts/{sid}".format(sid=self.account_sid),
+ f"https://api.exotel.com/v1/Accounts/{self.account_sid}",
auth=(self.api_key, self.api_token),
)
if response.status_code != 200:
diff --git a/erpnext/erpnext_integrations/doctype/gocardless_settings/__init__.py b/erpnext/erpnext_integrations/doctype/gocardless_settings/__init__.py
index 65be5993ffc..d8f8a3d3d91 100644
--- a/erpnext/erpnext_integrations/doctype/gocardless_settings/__init__.py
+++ b/erpnext/erpnext_integrations/doctype/gocardless_settings/__init__.py
@@ -34,7 +34,7 @@ def set_status(event):
def set_mandate_status(event):
mandates = []
- if isinstance(event["links"], (list,)):
+ if isinstance(event["links"], list):
for link in event["links"]:
mandates.append(link["mandate"])
else:
diff --git a/erpnext/erpnext_integrations/doctype/gocardless_settings/gocardless_settings.py b/erpnext/erpnext_integrations/doctype/gocardless_settings/gocardless_settings.py
index 4a29a6a21de..93cab9e4e4a 100644
--- a/erpnext/erpnext_integrations/doctype/gocardless_settings/gocardless_settings.py
+++ b/erpnext/erpnext_integrations/doctype/gocardless_settings/gocardless_settings.py
@@ -23,9 +23,7 @@ class GoCardlessSettings(Document):
def initialize_client(self):
self.environment = self.get_environment()
try:
- self.client = gocardless_pro.Client(
- access_token=self.access_token, environment=self.environment
- )
+ self.client = gocardless_pro.Client(access_token=self.access_token, environment=self.environment)
return self.client
except Exception as e:
frappe.throw(e)
@@ -67,7 +65,6 @@ class GoCardlessSettings(Document):
return True
def check_mandate_validity(self, data):
-
if frappe.db.exists("GoCardless Mandate", dict(customer=data.get("payer_name"), disabled=0)):
registered_mandate = frappe.db.get_value(
"GoCardless Mandate", dict(customer=data.get("payer_name"), disabled=0), "mandate"
@@ -102,7 +99,7 @@ class GoCardlessSettings(Document):
)
def get_payment_url(self, **kwargs):
- return get_url("./integrations/gocardless_checkout?{0}".format(urlencode(kwargs)))
+ return get_url(f"./integrations/gocardless_checkout?{urlencode(kwargs)}")
def create_payment_request(self, data):
self.data = frappe._dict(data)
@@ -127,9 +124,7 @@ class GoCardlessSettings(Document):
redirect_to = self.data.get("redirect_to") or None
redirect_message = self.data.get("redirect_message") or None
- reference_doc = frappe.get_doc(
- self.data.get("reference_doctype"), self.data.get("reference_docname")
- )
+ reference_doc = frappe.get_doc(self.data.get("reference_doctype"), self.data.get("reference_docname"))
self.initialize_client()
try:
@@ -175,7 +170,7 @@ class GoCardlessSettings(Document):
frappe.log_error("Gocardless payment failed")
self.integration_request.db_set("error", payment.status, update_modified=False)
- except Exception as e:
+ except Exception:
frappe.log_error("GoCardless Payment Error")
if self.flags.status_changed_to == "Completed":
diff --git a/erpnext/erpnext_integrations/doctype/mpesa_settings/mpesa_connector.py b/erpnext/erpnext_integrations/doctype/mpesa_settings/mpesa_connector.py
index a577e7fa692..ce6df833b38 100644
--- a/erpnext/erpnext_integrations/doctype/mpesa_settings/mpesa_connector.py
+++ b/erpnext/erpnext_integrations/doctype/mpesa_settings/mpesa_connector.py
@@ -32,7 +32,7 @@ class MpesaConnector:
access_token (str): This token is to be used with the Bearer header for further API calls to Mpesa.
"""
authenticate_uri = "/oauth/v1/generate?grant_type=client_credentials"
- authenticate_url = "{0}{1}".format(self.base_url, authenticate_uri)
+ authenticate_url = f"{self.base_url}{authenticate_uri}"
r = requests.get(authenticate_url, auth=HTTPBasicAuth(self.app_key, self.app_secret))
self.authentication_token = r.json()["access_token"]
return r.json()["access_token"]
@@ -77,10 +77,10 @@ class MpesaConnector:
"ResultURL": result_url,
}
headers = {
- "Authorization": "Bearer {0}".format(self.authentication_token),
+ "Authorization": f"Bearer {self.authentication_token}",
"Content-Type": "application/json",
}
- saf_url = "{0}{1}".format(self.base_url, "/mpesa/accountbalance/v1/query")
+ saf_url = "{}{}".format(self.base_url, "/mpesa/accountbalance/v1/query")
r = requests.post(saf_url, headers=headers, json=payload)
return r.json()
@@ -119,10 +119,8 @@ class MpesaConnector:
errorMessage(str): This is a predefined code that indicates the reason for request failure.
"""
- time = (
- str(datetime.datetime.now()).split(".")[0].replace("-", "").replace(" ", "").replace(":", "")
- )
- password = "{0}{1}{2}".format(str(business_shortcode), str(passcode), time)
+ time = str(datetime.datetime.now()).split(".")[0].replace("-", "").replace(" ", "").replace(":", "")
+ password = f"{business_shortcode!s}{passcode!s}{time}"
encoded = base64.b64encode(bytes(password, encoding="utf8"))
payload = {
"BusinessShortCode": business_shortcode,
@@ -135,15 +133,13 @@ class MpesaConnector:
"CallBackURL": callback_url,
"AccountReference": reference_code,
"TransactionDesc": description,
- "TransactionType": "CustomerPayBillOnline"
- if self.env == "sandbox"
- else "CustomerBuyGoodsOnline",
+ "TransactionType": "CustomerPayBillOnline" if self.env == "sandbox" else "CustomerBuyGoodsOnline",
}
headers = {
- "Authorization": "Bearer {0}".format(self.authentication_token),
+ "Authorization": f"Bearer {self.authentication_token}",
"Content-Type": "application/json",
}
- saf_url = "{0}{1}".format(self.base_url, "/mpesa/stkpush/v1/processrequest")
+ saf_url = "{}{}".format(self.base_url, "/mpesa/stkpush/v1/processrequest")
r = requests.post(saf_url, headers=headers, json=payload)
return r.json()
diff --git a/erpnext/erpnext_integrations/doctype/mpesa_settings/mpesa_settings.py b/erpnext/erpnext_integrations/doctype/mpesa_settings/mpesa_settings.py
index a298e11eaf5..d4211299178 100644
--- a/erpnext/erpnext_integrations/doctype/mpesa_settings/mpesa_settings.py
+++ b/erpnext/erpnext_integrations/doctype/mpesa_settings/mpesa_settings.py
@@ -51,7 +51,7 @@ class MpesaSettings(Document):
args = frappe._dict(kwargs)
request_amounts = self.split_request_amount_according_to_transaction_limit(args)
- for i, amount in enumerate(request_amounts):
+ for _i, amount in enumerate(request_amounts):
args.request_amount = amount
if frappe.flags.in_test:
from erpnext.erpnext_integrations.doctype.mpesa_settings.test_mpesa_settings import (
@@ -104,8 +104,8 @@ class MpesaSettings(Document):
def handle_api_response(self, global_id, request_dict, response):
"""Response received from API calls returns a global identifier for each transaction, this code is returned during the callback."""
# check error response
- if getattr(response, "requestId"):
- req_name = getattr(response, "requestId")
+ if response.requestId:
+ req_name = response.requestId
error = response
else:
# global checkout id used as request name
@@ -116,7 +116,7 @@ class MpesaSettings(Document):
create_request_log(request_dict, "Host", "Mpesa", req_name, error)
if error:
- frappe.throw(_(getattr(response, "errorMessage")), title=_("Transaction Error"))
+ frappe.throw(_(response.errorMessage), title=_("Transaction Error"))
def generate_stk_push(**kwargs):
@@ -197,7 +197,7 @@ def verify_transaction(**kwargs):
)
total_paid = amount + sum(completed_payments)
- mpesa_receipts = ", ".join(mpesa_receipts + [mpesa_receipt])
+ mpesa_receipts = ", ".join([*mpesa_receipts, mpesa_receipt])
if total_paid >= pr.grand_total:
pr.run_method("on_payment_authorized", "Completed")
@@ -318,9 +318,7 @@ def process_balance_info(**kwargs):
)
except Exception:
request.handle_failure(account_balance_response)
- frappe.log_error(
- title="Mpesa Account Balance Processing Error", message=account_balance_response
- )
+ frappe.log_error(title="Mpesa Account Balance Processing Error", message=account_balance_response)
else:
request.handle_failure(account_balance_response)
diff --git a/erpnext/erpnext_integrations/doctype/mpesa_settings/test_mpesa_settings.py b/erpnext/erpnext_integrations/doctype/mpesa_settings/test_mpesa_settings.py
index b52662421d3..4218e03b91d 100644
--- a/erpnext/erpnext_integrations/doctype/mpesa_settings/test_mpesa_settings.py
+++ b/erpnext/erpnext_integrations/doctype/mpesa_settings/test_mpesa_settings.py
@@ -90,9 +90,7 @@ class TestMpesaSettings(unittest.TestCase):
pluck="name",
)
- callback_response = get_payment_callback_payload(
- Amount=500, CheckoutRequestID=integration_req_ids[0]
- )
+ callback_response = get_payment_callback_payload(Amount=500, CheckoutRequestID=integration_req_ids[0])
verify_transaction(**callback_response)
# test creation of integration request
integration_request = frappe.get_doc("Integration Request", integration_req_ids[0])
diff --git a/erpnext/erpnext_integrations/doctype/plaid_settings/plaid_settings.py b/erpnext/erpnext_integrations/doctype/plaid_settings/plaid_settings.py
index af1052a3700..4f14143a9a0 100644
--- a/erpnext/erpnext_integrations/doctype/plaid_settings/plaid_settings.py
+++ b/erpnext/erpnext_integrations/doctype/plaid_settings/plaid_settings.py
@@ -127,7 +127,9 @@ def add_bank_accounts(response, bank, company):
result.append(new_account.name)
except frappe.UniqueValidationError:
frappe.msgprint(
- _("Bank account {0} already exists and could not be created again").format(account["name"])
+ _("Bank account {0} already exists and could not be created again").format(
+ account["name"]
+ )
)
except Exception:
frappe.log_error("Plaid Link Error")
@@ -205,9 +207,7 @@ def sync_transactions(bank, bank_account):
f"Plaid added {len(result)} new Bank Transactions from '{bank_account}' between {start_date} and {end_date}"
)
- frappe.db.set_value(
- "Bank Account", bank_account, "last_integration_date", last_transaction_date
- )
+ frappe.db.set_value("Bank Account", bank_account, "last_integration_date", last_transaction_date)
except Exception:
frappe.log_error(frappe.get_traceback(), _("Plaid transactions sync error"))
@@ -229,9 +229,7 @@ def get_transactions(bank, bank_account=None, start_date=None, end_date=None):
transactions = []
try:
- transactions = plaid.get_transactions(
- start_date=start_date, end_date=end_date, account_id=account_id
- )
+ transactions = plaid.get_transactions(start_date=start_date, end_date=end_date, account_id=account_id)
except ItemError as e:
if e.code == "ITEM_LOGIN_REQUIRED":
msg = _("There was an error syncing transactions.") + " "
diff --git a/erpnext/erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.py b/erpnext/erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.py
index da5699776fd..b3229ab19dd 100644
--- a/erpnext/erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.py
+++ b/erpnext/erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.py
@@ -35,10 +35,8 @@ def callback(*args, **kwargs):
class QuickBooksMigrator(Document):
def __init__(self, *args, **kwargs):
- super(QuickBooksMigrator, self).__init__(*args, **kwargs)
- self.oauth = OAuth2Session(
- client_id=self.client_id, redirect_uri=self.redirect_url, scope=self.scope
- )
+ super().__init__(*args, **kwargs)
+ self.oauth = OAuth2Session(client_id=self.client_id, redirect_uri=self.redirect_url, scope=self.scope)
if not self.authorization_url and self.authorization_endpoint:
self.authorization_url = self.oauth.authorization_url(self.authorization_endpoint)[0]
@@ -46,9 +44,7 @@ class QuickBooksMigrator(Document):
if self.company:
# We need a Cost Center corresponding to the selected erpnext Company
self.default_cost_center = frappe.db.get_value("Company", self.company, "cost_center")
- company_warehouses = frappe.get_all(
- "Warehouse", filters={"company": self.company, "is_group": 0}
- )
+ company_warehouses = frappe.get_all("Warehouse", filters={"company": self.company, "is_group": 0})
if company_warehouses:
self.default_warehouse = company_warehouses[0].name
if self.authorization_endpoint:
@@ -196,14 +192,14 @@ class QuickBooksMigrator(Document):
if not frappe.db.exists(
{
"doctype": "Account",
- "name": encode_company_abbr("{} - QB".format(root), self.company),
+ "name": encode_company_abbr(f"{root} - QB", self.company),
"company": self.company,
}
):
frappe.get_doc(
{
"doctype": "Account",
- "account_name": "{} - QB".format(root),
+ "account_name": f"{root} - QB",
"root_type": root,
"is_group": "1",
"company": self.company,
@@ -215,13 +211,10 @@ class QuickBooksMigrator(Document):
def _migrate_entries(self, entity):
try:
- query_uri = "{}/company/{}/query".format(
- self.api_endpoint,
- self.quickbooks_company_id,
- )
+ query_uri = f"{self.api_endpoint}/company/{self.quickbooks_company_id}/query"
max_result_count = 1000
# Count number of entries
- response = self._get(query_uri, params={"query": """SELECT COUNT(*) FROM {}""".format(entity)})
+ response = self._get(query_uri, params={"query": f"""SELECT COUNT(*) FROM {entity}"""})
entry_count = response.json()["QueryResponse"]["totalCount"]
# fetch pages and accumulate
@@ -243,9 +236,7 @@ class QuickBooksMigrator(Document):
def _fetch_general_ledger(self):
try:
- query_uri = "{}/company/{}/reports/GeneralLedger".format(
- self.api_endpoint, self.quickbooks_company_id
- )
+ query_uri = f"{self.api_endpoint}/company/{self.quickbooks_company_id}/reports/GeneralLedger"
response = self._get(
query_uri,
params={
@@ -574,7 +565,9 @@ class QuickBooksMigrator(Document):
"is_stock_item": 0,
"item_group": "All Item Groups",
"company": self.company,
- "item_defaults": [{"company": self.company, "default_warehouse": self.default_warehouse}],
+ "item_defaults": [
+ {"company": self.company, "default_warehouse": self.default_warehouse}
+ ],
}
if "ExpenseAccountRef" in item:
expense_account = self._get_account_name_by_id(item["ExpenseAccountRef"]["value"])
@@ -614,7 +607,9 @@ class QuickBooksMigrator(Document):
try:
if preference["SalesFormsPrefs"]["AllowShipping"]:
default_shipping_account_id = preference["SalesFormsPrefs"]["DefaultShippingAccount"]
- self.default_shipping_account = self._get_account_name_by_id(self, default_shipping_account_id)
+ self.default_shipping_account = self._get_account_name_by_id(
+ self, default_shipping_account_id
+ )
self.save()
except Exception as e:
self._log_error(e, preference)
@@ -722,7 +717,9 @@ class QuickBooksMigrator(Document):
"item_code": item["name"],
"conversion_factor": 1,
"uom": item["stock_uom"],
- "description": line.get("Description", line["SalesItemLineDetail"]["ItemRef"]["name"]),
+ "description": line.get(
+ "Description", line["SalesItemLineDetail"]["ItemRef"]["name"]
+ ),
"qty": line["SalesItemLineDetail"]["Qty"],
"price_list_rate": line["SalesItemLineDetail"]["UnitPrice"],
"cost_center": self.default_cost_center,
@@ -994,7 +991,11 @@ class QuickBooksMigrator(Document):
si_quickbooks_id = "Invoice - {}".format(linked_transaction["TxnId"])
# Invoice could have been saved as a Sales Invoice or a Journal Entry
if frappe.db.exists(
- {"doctype": "Sales Invoice", "quickbooks_id": si_quickbooks_id, "company": self.company}
+ {
+ "doctype": "Sales Invoice",
+ "quickbooks_id": si_quickbooks_id,
+ "company": self.company,
+ }
):
sales_invoice = frappe.get_all(
"Sales Invoice",
@@ -1010,7 +1011,11 @@ class QuickBooksMigrator(Document):
party_account = sales_invoice["debit_to"]
if frappe.db.exists(
- {"doctype": "Journal Entry", "quickbooks_id": si_quickbooks_id, "company": self.company}
+ {
+ "doctype": "Journal Entry",
+ "quickbooks_id": si_quickbooks_id,
+ "company": self.company,
+ }
):
journal_entry = frappe.get_doc(
"Journal Entry",
@@ -1020,9 +1025,9 @@ class QuickBooksMigrator(Document):
},
)
# Invoice saved as a Journal Entry must have party and party_type set on line containing Receivable Account
- customer_account_line = list(
+ customer_account_line = next(
filter(lambda acc: acc.party_type == "Customer", journal_entry.accounts)
- )[0]
+ )
reference_type = "Journal Entry"
reference_name = journal_entry.name
@@ -1064,7 +1069,11 @@ class QuickBooksMigrator(Document):
if linked_transaction["TxnType"] == "Bill":
pi_quickbooks_id = "Bill - {}".format(linked_transaction["TxnId"])
if frappe.db.exists(
- {"doctype": "Purchase Invoice", "quickbooks_id": pi_quickbooks_id, "company": self.company}
+ {
+ "doctype": "Purchase Invoice",
+ "quickbooks_id": pi_quickbooks_id,
+ "company": self.company,
+ }
):
purchase_invoice = frappe.get_all(
"Purchase Invoice",
@@ -1199,7 +1208,9 @@ class QuickBooksMigrator(Document):
else:
accounts.append(
{
- "account": self._get_account_name_by_id(line["DepositLineDetail"]["AccountRef"]["value"]),
+ "account": self._get_account_name_by_id(
+ line["DepositLineDetail"]["AccountRef"]["value"]
+ ),
"credit_in_account_currency": line["Amount"],
"cost_center": self.default_cost_center,
}
@@ -1254,7 +1265,7 @@ class QuickBooksMigrator(Document):
return taxes
for line in entry["TxnTaxDetail"]["TaxLine"]:
tax_rate = line["TaxLineDetail"]["TaxRateRef"]["value"]
- account_head = self._get_account_name_by_id("TaxRate - {}".format(tax_rate))
+ account_head = self._get_account_name_by_id(f"TaxRate - {tax_rate}")
tax_type_applicable = self._get_tax_type(tax_rate)
if tax_type_applicable == "TaxOnAmount":
taxes.append(
@@ -1303,7 +1314,7 @@ class QuickBooksMigrator(Document):
return tax_rate_detail["TaxRateRef"]["value"]
def _get_parent_row_id(self, tax_rate, taxes):
- tax_account = self._get_account_name_by_id("TaxRate - {}".format(tax_rate))
+ tax_account = self._get_account_name_by_id(f"TaxRate - {tax_rate}")
for index, tax in enumerate(taxes):
if tax["account_head"] == tax_account:
return index + 1
@@ -1328,7 +1339,7 @@ class QuickBooksMigrator(Document):
def _get(self, *args, **kwargs):
kwargs["headers"] = {
"Accept": "application/json",
- "Authorization": "Bearer {}".format(self.access_token),
+ "Authorization": f"Bearer {self.access_token}",
}
response = requests.get(*args, **kwargs)
# HTTP Status code 401 here means that the access_token is expired
@@ -1340,18 +1351,18 @@ class QuickBooksMigrator(Document):
return response
def _get_account_name_by_id(self, quickbooks_id):
- return frappe.get_all(
- "Account", filters={"quickbooks_id": quickbooks_id, "company": self.company}
- )[0]["name"]
+ return frappe.get_all("Account", filters={"quickbooks_id": quickbooks_id, "company": self.company})[
+ 0
+ ]["name"]
def _publish(self, *args, **kwargs):
frappe.publish_realtime("quickbooks_progress_update", *args, **kwargs, user=self.modified_by)
def _get_unique_account_name(self, quickbooks_name, number=0):
if number:
- quickbooks_account_name = "{} - {} - QB".format(quickbooks_name, number)
+ quickbooks_account_name = f"{quickbooks_name} - {number} - QB"
else:
- quickbooks_account_name = "{} - QB".format(quickbooks_name)
+ quickbooks_account_name = f"{quickbooks_name} - QB"
company_encoded_account_name = encode_company_abbr(quickbooks_account_name, self.company)
if frappe.db.exists(
{"doctype": "Account", "name": company_encoded_account_name, "company": self.company}
diff --git a/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.py b/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.py
index e6840f505be..0a27a647129 100644
--- a/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.py
+++ b/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.py
@@ -96,9 +96,7 @@ class TallyMigration(Document):
self.default_cost_center, self.default_round_off_account = frappe.db.get_value(
"Company", self.erpnext_company, ["cost_center", "round_off_account"]
)
- self.default_warehouse = frappe.db.get_value(
- "Stock Settings", "Stock Settings", "default_warehouse"
- )
+ self.default_warehouse = frappe.db.get_value("Stock Settings", "Stock Settings", "default_warehouse")
def _process_master_data(self):
def get_company_name(collection):
@@ -159,7 +157,7 @@ class TallyMigration(Document):
def get_children_and_parent_dict(accounts):
children, parents = {}, {}
- for parent, account, is_group in accounts:
+ for parent, account, _is_group in accounts:
children.setdefault(parent, set()).add(account)
parents.setdefault(account, set()).add(parent)
parents[account].update(parents.get(parent, []))
@@ -204,7 +202,9 @@ class TallyMigration(Document):
{
"doctype": party_type,
"customer_name": account.NAME.string.strip(),
- "tax_id": account.INCOMETAXNUMBER.string.strip() if account.INCOMETAXNUMBER else None,
+ "tax_id": account.INCOMETAXNUMBER.string.strip()
+ if account.INCOMETAXNUMBER
+ else None,
"customer_group": "All Customer Groups",
"territory": "All Territories",
"customer_type": "Individual",
@@ -218,7 +218,9 @@ class TallyMigration(Document):
{
"doctype": party_type,
"supplier_name": account.NAME.string.strip(),
- "pan": account.INCOMETAXNUMBER.string.strip() if account.INCOMETAXNUMBER else None,
+ "pan": account.INCOMETAXNUMBER.string.strip()
+ if account.INCOMETAXNUMBER
+ else None,
"supplier_group": "All Supplier Groups",
"supplier_type": "Individual",
}
@@ -234,7 +236,9 @@ class TallyMigration(Document):
"address_line2": address[140:].strip(),
"country": account.COUNTRYNAME.string.strip() if account.COUNTRYNAME else None,
"state": account.LEDSTATENAME.string.strip() if account.LEDSTATENAME else None,
- "gst_state": account.LEDSTATENAME.string.strip() if account.LEDSTATENAME else None,
+ "gst_state": account.LEDSTATENAME.string.strip()
+ if account.LEDSTATENAME
+ else None,
"pin_code": account.PINCODE.string.strip() if account.PINCODE else None,
"mobile": account.LEDGERPHONE.string.strip() if account.LEDGERPHONE else None,
"phone": account.LEDGERPHONE.string.strip() if account.LEDGERPHONE else None,
@@ -576,7 +580,7 @@ class TallyMigration(Document):
if new_year.year_start_date.year == new_year.year_end_date.year:
new_year.year = new_year.year_start_date.year
else:
- new_year.year = "{}-{}".format(new_year.year_start_date.year, new_year.year_end_date.year)
+ new_year.year = f"{new_year.year_start_date.year}-{new_year.year_end_date.year}"
new_year.save()
oldest_year = new_year
diff --git a/erpnext/erpnext_integrations/doctype/taxjar_settings/taxjar_settings.py b/erpnext/erpnext_integrations/doctype/taxjar_settings/taxjar_settings.py
index 2148863c556..e649707c806 100644
--- a/erpnext/erpnext_integrations/doctype/taxjar_settings/taxjar_settings.py
+++ b/erpnext/erpnext_integrations/doctype/taxjar_settings/taxjar_settings.py
@@ -23,9 +23,7 @@ class TaxJarSettings(Document):
"Custom Field",
{"dt": ("in", ["Item", "Sales Invoice Item"]), "fieldname": "product_tax_category"},
)
- fields_hidden = frappe.get_value(
- "Custom Field", {"dt": ("in", ["Sales Invoice Item"])}, "hidden"
- )
+ fields_hidden = frappe.get_value("Custom Field", {"dt": ("in", ["Sales Invoice Item"])}, "hidden")
if TAXJAR_CREATE_TRANSACTIONS or TAXJAR_CALCULATE_TAX or TAXJAR_SANDBOX_MODE:
if not fields_already_exist:
@@ -70,13 +68,11 @@ def toggle_tax_category_fields(hidden):
"hidden",
hidden,
)
- frappe.set_value(
- "Custom Field", {"dt": "Item", "fieldname": "product_tax_category"}, "hidden", hidden
- )
+ frappe.set_value("Custom Field", {"dt": "Item", "fieldname": "product_tax_category"}, "hidden", hidden)
def add_product_tax_categories():
- with open(os.path.join(os.path.dirname(__file__), "product_tax_category_data.json"), "r") as f:
+ with open(os.path.join(os.path.dirname(__file__), "product_tax_category_data.json")) as f:
tax_categories = json.loads(f.read())
create_tax_categories(tax_categories["categories"])
diff --git a/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.py b/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.py
index 4aa98aab56b..99a39d7da88 100644
--- a/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.py
+++ b/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.py
@@ -67,7 +67,7 @@ class WoocommerceSettings(Document):
# for CI Test to work
url = "http://localhost:8000"
- server_url = "{uri.scheme}://{uri.netloc}".format(uri=urlparse(url))
+ server_url = f"{urlparse(url).scheme}://{urlparse(url).netloc}"
delivery_url = server_url + endpoint
self.endpoint = delivery_url
diff --git a/erpnext/erpnext_integrations/exotel_integration.py b/erpnext/erpnext_integrations/exotel_integration.py
index fd0f7835759..a7b7c3ee306 100644
--- a/erpnext/erpnext_integrations/exotel_integration.py
+++ b/erpnext/erpnext_integrations/exotel_integration.py
@@ -23,7 +23,7 @@ def handle_incoming_call(**kwargs):
create_call_log(call_payload)
else:
update_call_log(call_payload, call_log=call_log)
- except Exception as e:
+ except Exception:
frappe.db.rollback()
exotel_settings.log_error("Error in Exotel incoming call")
frappe.db.commit()
@@ -86,7 +86,7 @@ def create_call_log(call_payload):
@frappe.whitelist()
def get_call_status(call_id):
- endpoint = get_exotel_endpoint("Calls/{call_id}.json".format(call_id=call_id))
+ endpoint = get_exotel_endpoint(f"Calls/{call_id}.json")
response = requests.get(endpoint)
status = response.json().get("Call", {}).get("Status")
return status
@@ -95,9 +95,7 @@ def get_call_status(call_id):
@frappe.whitelist()
def make_a_call(from_number, to_number, caller_id):
endpoint = get_exotel_endpoint("Calls/connect.json?details=true")
- response = requests.post(
- endpoint, data={"From": from_number, "To": to_number, "CallerId": caller_id}
- )
+ response = requests.post(endpoint, data={"From": from_number, "To": to_number, "CallerId": caller_id})
return response.json()
diff --git a/erpnext/erpnext_integrations/taxjar_integration.py b/erpnext/erpnext_integrations/taxjar_integration.py
index 2d9093b6e92..0535fc9e4ae 100644
--- a/erpnext/erpnext_integrations/taxjar_integration.py
+++ b/erpnext/erpnext_integrations/taxjar_integration.py
@@ -113,9 +113,7 @@ def get_client():
def create_transaction(doc, method):
- TAXJAR_CREATE_TRANSACTIONS = frappe.db.get_single_value(
- "TaxJar Settings", "taxjar_create_transactions"
- )
+ TAXJAR_CREATE_TRANSACTIONS = frappe.db.get_single_value("TaxJar Settings", "taxjar_create_transactions")
"""Create an order transaction in TaxJar"""
@@ -156,9 +154,7 @@ def create_transaction(doc, method):
def delete_transaction(doc, method):
"""Delete an existing TaxJar order transaction"""
- TAXJAR_CREATE_TRANSACTIONS = frappe.db.get_single_value(
- "TaxJar Settings", "taxjar_create_transactions"
- )
+ TAXJAR_CREATE_TRANSACTIONS = frappe.db.get_single_value("TaxJar Settings", "taxjar_create_transactions")
if not TAXJAR_CREATE_TRANSACTIONS:
return
@@ -258,7 +254,7 @@ def set_sales_tax(doc, method):
if not tax_dict:
# Remove existing tax rows if address is changed from a taxable state/country
- setattr(doc, "taxes", [tax for tax in doc.taxes if tax.account_head != TAX_ACCOUNT_HEAD])
+ doc.taxes = [tax for tax in doc.taxes if tax.account_head != TAX_ACCOUNT_HEAD]
return
# check if delivering within a nexus
@@ -267,7 +263,7 @@ def set_sales_tax(doc, method):
tax_data = validate_tax_request(tax_dict)
if tax_data is not None:
if not tax_data.amount_to_collect:
- setattr(doc, "taxes", [tax for tax in doc.taxes if tax.account_head != TAX_ACCOUNT_HEAD])
+ doc.taxes = [tax for tax in doc.taxes if tax.account_head != TAX_ACCOUNT_HEAD]
elif tax_data.amount_to_collect > 0:
# Loop through tax rows for existing Sales Tax entry
# If none are found, add a row with the tax amount
diff --git a/erpnext/erpnext_integrations/utils.py b/erpnext/erpnext_integrations/utils.py
index 981486eb309..55316f588ac 100644
--- a/erpnext/erpnext_integrations/utils.py
+++ b/erpnext/erpnext_integrations/utils.py
@@ -15,7 +15,9 @@ def validate_webhooks_request(doctype, hmac_key, secret_key="secret"):
if frappe.request and settings and settings.get(secret_key) and not frappe.flags.in_test:
sig = base64.b64encode(
- hmac.new(settings.get(secret_key).encode("utf8"), frappe.request.data, hashlib.sha256).digest()
+ hmac.new(
+ settings.get(secret_key).encode("utf8"), frappe.request.data, hashlib.sha256
+ ).digest()
)
if frappe.request.data and not sig == bytes(frappe.get_request_header(hmac_key).encode()):
@@ -28,7 +30,7 @@ def validate_webhooks_request(doctype, hmac_key, secret_key="secret"):
def get_webhook_address(connector_name, method, exclude_uri=False, force_https=False):
- endpoint = "erpnext.erpnext_integrations.connectors.{0}.{1}".format(connector_name, method)
+ endpoint = f"erpnext.erpnext_integrations.connectors.{connector_name}.{method}"
if exclude_uri:
return endpoint
diff --git a/erpnext/hooks.py b/erpnext/hooks.py
index da4c1974247..021cf4deb63 100644
--- a/erpnext/hooks.py
+++ b/erpnext/hooks.py
@@ -253,9 +253,7 @@ sounds = [
{"name": "call-disconnect", "src": "/assets/erpnext/sounds/call-disconnect.mp3", "volume": 0.2},
]
-has_upload_permission = {
- "Employee": "erpnext.setup.doctype.employee.employee.has_upload_permission"
-}
+has_upload_permission = {"Employee": "erpnext.setup.doctype.employee.employee.has_upload_permission"}
has_website_permission = {
"Sales Order": "erpnext.controllers.website_list_for_contact.has_website_permission",
@@ -479,9 +477,7 @@ default_mail_footer = """
"""
-get_translated_dict = {
- ("doctype", "Global Defaults"): "frappe.geo.country_info.get_translated_dict"
-}
+get_translated_dict = {("doctype", "Global Defaults"): "frappe.geo.country_info.get_translated_dict"}
bot_parsers = [
"erpnext.utilities.bot.FindItemBot",
@@ -562,9 +558,7 @@ get_matching_queries = (
)
regional_overrides = {
- "France": {
- "erpnext.tests.test_regional.test_method": "erpnext.regional.france.utils.test_method"
- },
+ "France": {"erpnext.tests.test_regional.test_method": "erpnext.regional.france.utils.test_method"},
"United Arab Emirates": {
"erpnext.controllers.taxes_and_totals.update_itemised_tax_data": "erpnext.regional.united_arab_emirates.utils.update_itemised_tax_data",
"erpnext.accounts.doctype.purchase_invoice.purchase_invoice.make_regional_gl_entries": "erpnext.regional.united_arab_emirates.utils.make_regional_gl_entries",
@@ -635,9 +629,7 @@ global_search_doctypes = {
],
}
-additional_timeline_content = {
- "*": ["erpnext.telephony.doctype.call_log.call_log.get_linked_call_logs"]
-}
+additional_timeline_content = {"*": ["erpnext.telephony.doctype.call_log.call_log.get_linked_call_logs"]}
extend_bootinfo = [
diff --git a/erpnext/loan_management/dashboard_chart_source/top_10_pledged_loan_securities/top_10_pledged_loan_securities.py b/erpnext/loan_management/dashboard_chart_source/top_10_pledged_loan_securities/top_10_pledged_loan_securities.py
index aab3d8ccb57..52734375107 100644
--- a/erpnext/loan_management/dashboard_chart_source/top_10_pledged_loan_securities/top_10_pledged_loan_securities.py
+++ b/erpnext/loan_management/dashboard_chart_source/top_10_pledged_loan_securities/top_10_pledged_loan_securities.py
@@ -45,16 +45,14 @@ def get_data(
unpledges = frappe._dict(
frappe.db.sql(
- """
+ f"""
SELECT u.loan_security, sum(u.qty) as qty
FROM `tabLoan Security Unpledge` up, `tabUnpledge` u
WHERE u.parent = up.name
AND up.status = 'Approved'
{conditions}
GROUP BY u.loan_security
- """.format(
- conditions=conditions
- ),
+ """,
filters,
as_list=1,
)
@@ -62,16 +60,14 @@ def get_data(
pledges = frappe._dict(
frappe.db.sql(
- """
+ f"""
SELECT p.loan_security, sum(p.qty) as qty
FROM `tabLoan Security Pledge` lp, `tabPledge`p
WHERE p.parent = lp.name
AND lp.status = 'Pledged'
{conditions}
GROUP BY p.loan_security
- """.format(
- conditions=conditions
- ),
+ """,
filters,
as_list=1,
)
diff --git a/erpnext/loan_management/doctype/loan/loan.py b/erpnext/loan_management/doctype/loan/loan.py
index 4a333df5a59..eb90cf3b826 100644
--- a/erpnext/loan_management/doctype/loan/loan.py
+++ b/erpnext/loan_management/doctype/loan/loan.py
@@ -336,7 +336,6 @@ def get_sanctioned_amount_limit(applicant_type, applicant, company):
def validate_repayment_method(
repayment_method, loan_amount, monthly_repayment_amount, repayment_periods, is_term_loan
):
-
if is_term_loan and not repayment_method:
frappe.throw(_("Repayment Method is mandatory for term loans"))
diff --git a/erpnext/loan_management/doctype/loan/test_loan.py b/erpnext/loan_management/doctype/loan/test_loan.py
index 388e65d9e58..1f4b44e7690 100644
--- a/erpnext/loan_management/doctype/loan/test_loan.py
+++ b/erpnext/loan_management/doctype/loan/test_loan.py
@@ -184,7 +184,6 @@ class TestLoan(unittest.TestCase):
self.assertEqual(flt(loan.total_payment, 0), 302712)
def test_loan_with_security(self):
-
pledge = [
{
"loan_security": "Test Security 1",
@@ -266,13 +265,9 @@ class TestLoan(unittest.TestCase):
# Make First Loan
pledge = [{"loan_security": "Test Security 1", "qty": 4000.00}]
- loan_application = create_loan_application(
- "_Test Company", self.applicant3, "Demand Loan", pledge
- )
+ loan_application = create_loan_application("_Test Company", self.applicant3, "Demand Loan", pledge)
create_pledge(loan_application)
- loan = create_demand_loan(
- self.applicant3, "Demand Loan", loan_application, posting_date="2019-10-01"
- )
+ loan = create_demand_loan(self.applicant3, "Demand Loan", loan_application, posting_date="2019-10-01")
loan.submit()
# Make second loan greater than the sanctioned amount
@@ -284,14 +279,10 @@ class TestLoan(unittest.TestCase):
def test_regular_loan_repayment(self):
pledge = [{"loan_security": "Test Security 1", "qty": 4000.00}]
- loan_application = create_loan_application(
- "_Test Company", self.applicant2, "Demand Loan", pledge
- )
+ loan_application = create_loan_application("_Test Company", self.applicant2, "Demand Loan", pledge)
create_pledge(loan_application)
- loan = create_demand_loan(
- self.applicant2, "Demand Loan", loan_application, posting_date="2019-10-01"
- )
+ loan = create_demand_loan(self.applicant2, "Demand Loan", loan_application, posting_date="2019-10-01")
loan.submit()
self.assertEqual(loan.loan_amount, 1000000)
@@ -311,18 +302,14 @@ class TestLoan(unittest.TestCase):
process_loan_interest_accrual_for_demand_loans(posting_date=last_date)
- repayment_entry = create_repayment_entry(
- loan.name, self.applicant2, add_days(last_date, 10), 111119
- )
+ repayment_entry = create_repayment_entry(loan.name, self.applicant2, add_days(last_date, 10), 111119)
repayment_entry.save()
repayment_entry.submit()
penalty_amount = (accrued_interest_amount * 5 * 25) / 100
self.assertEqual(flt(repayment_entry.penalty_amount, 0), flt(penalty_amount, 0))
- amounts = frappe.db.get_all(
- "Loan Interest Accrual", {"loan": loan.name}, ["paid_interest_amount"]
- )
+ amounts = frappe.db.get_all("Loan Interest Accrual", {"loan": loan.name}, ["paid_interest_amount"])
loan.load_from_db()
@@ -344,14 +331,10 @@ class TestLoan(unittest.TestCase):
def test_loan_closure(self):
pledge = [{"loan_security": "Test Security 1", "qty": 4000.00}]
- loan_application = create_loan_application(
- "_Test Company", self.applicant2, "Demand Loan", pledge
- )
+ loan_application = create_loan_application("_Test Company", self.applicant2, "Demand Loan", pledge)
create_pledge(loan_application)
- loan = create_demand_loan(
- self.applicant2, "Demand Loan", loan_application, posting_date="2019-10-01"
- )
+ loan = create_demand_loan(self.applicant2, "Demand Loan", loan_application, posting_date="2019-10-01")
loan.submit()
self.assertEqual(loan.loan_amount, 1000000)
@@ -415,15 +398,11 @@ class TestLoan(unittest.TestCase):
loan.submit()
- make_loan_disbursement_entry(
- loan.name, loan.loan_amount, disbursement_date=add_months(nowdate(), -1)
- )
+ make_loan_disbursement_entry(loan.name, loan.loan_amount, disbursement_date=add_months(nowdate(), -1))
process_loan_interest_accrual_for_term_loans(posting_date=nowdate())
- repayment_entry = create_repayment_entry(
- loan.name, self.applicant2, add_days(nowdate(), 5), 89768.75
- )
+ repayment_entry = create_repayment_entry(loan.name, self.applicant2, add_days(nowdate(), 5), 89768.75)
repayment_entry.submit()
@@ -511,14 +490,10 @@ class TestLoan(unittest.TestCase):
def test_loan_security_unpledge(self):
pledge = [{"loan_security": "Test Security 1", "qty": 4000.00}]
- loan_application = create_loan_application(
- "_Test Company", self.applicant2, "Demand Loan", pledge
- )
+ loan_application = create_loan_application("_Test Company", self.applicant2, "Demand Loan", pledge)
create_pledge(loan_application)
- loan = create_demand_loan(
- self.applicant2, "Demand Loan", loan_application, posting_date="2019-10-01"
- )
+ loan = create_demand_loan(self.applicant2, "Demand Loan", loan_application, posting_date="2019-10-01")
loan.submit()
self.assertEqual(loan.loan_amount, 1000000)
@@ -571,14 +546,10 @@ class TestLoan(unittest.TestCase):
{"loan_security": "Test Security 2", "qty": 4000.00},
]
- loan_application = create_loan_application(
- "_Test Company", self.applicant2, "Demand Loan", pledge
- )
+ loan_application = create_loan_application("_Test Company", self.applicant2, "Demand Loan", pledge)
create_pledge(loan_application)
- loan = create_demand_loan(
- self.applicant2, "Demand Loan", loan_application, posting_date="2019-10-01"
- )
+ loan = create_demand_loan(self.applicant2, "Demand Loan", loan_application, posting_date="2019-10-01")
loan.submit()
self.assertEqual(loan.loan_amount, 1000000)
@@ -589,9 +560,7 @@ class TestLoan(unittest.TestCase):
make_loan_disbursement_entry(loan.name, loan.loan_amount, disbursement_date=first_date)
process_loan_interest_accrual_for_demand_loans(posting_date=last_date)
- repayment_entry = create_repayment_entry(
- loan.name, self.applicant2, add_days(last_date, 5), 600000
- )
+ repayment_entry = create_repayment_entry(loan.name, self.applicant2, add_days(last_date, 5), 600000)
repayment_entry.submit()
unpledge_map = {"Test Security 2": 2000}
@@ -607,14 +576,10 @@ class TestLoan(unittest.TestCase):
def test_sanctioned_loan_security_unpledge(self):
pledge = [{"loan_security": "Test Security 1", "qty": 4000.00}]
- loan_application = create_loan_application(
- "_Test Company", self.applicant2, "Demand Loan", pledge
- )
+ loan_application = create_loan_application("_Test Company", self.applicant2, "Demand Loan", pledge)
create_pledge(loan_application)
- loan = create_demand_loan(
- self.applicant2, "Demand Loan", loan_application, posting_date="2019-10-01"
- )
+ loan = create_demand_loan(self.applicant2, "Demand Loan", loan_application, posting_date="2019-10-01")
loan.submit()
self.assertEqual(loan.loan_amount, 1000000)
@@ -693,14 +658,10 @@ class TestLoan(unittest.TestCase):
def test_pending_loan_amount_after_closure_request(self):
pledge = [{"loan_security": "Test Security 1", "qty": 4000.00}]
- loan_application = create_loan_application(
- "_Test Company", self.applicant2, "Demand Loan", pledge
- )
+ loan_application = create_loan_application("_Test Company", self.applicant2, "Demand Loan", pledge)
create_pledge(loan_application)
- loan = create_demand_loan(
- self.applicant2, "Demand Loan", loan_application, posting_date="2019-10-01"
- )
+ loan = create_demand_loan(self.applicant2, "Demand Loan", loan_application, posting_date="2019-10-01")
loan.submit()
self.assertEqual(loan.loan_amount, 1000000)
@@ -743,14 +704,10 @@ class TestLoan(unittest.TestCase):
def test_partial_unaccrued_interest_payment(self):
pledge = [{"loan_security": "Test Security 1", "qty": 4000.00}]
- loan_application = create_loan_application(
- "_Test Company", self.applicant2, "Demand Loan", pledge
- )
+ loan_application = create_loan_application("_Test Company", self.applicant2, "Demand Loan", pledge)
create_pledge(loan_application)
- loan = create_demand_loan(
- self.applicant2, "Demand Loan", loan_application, posting_date="2019-10-01"
- )
+ loan = create_demand_loan(self.applicant2, "Demand Loan", loan_application, posting_date="2019-10-01")
loan.submit()
self.assertEqual(loan.loan_amount, 1000000)
@@ -807,12 +764,9 @@ class TestLoan(unittest.TestCase):
loan, dummy = create_loan_scenario_for_penalty(self)
amounts = calculate_amounts(loan.name, "2019-11-30 00:00:00")
- first_penalty = 10000
second_penalty = amounts["penalty_amount"] - 10000
- repayment_entry = create_repayment_entry(
- loan.name, self.applicant2, "2019-11-30 00:00:00", 10000
- )
+ repayment_entry = create_repayment_entry(loan.name, self.applicant2, "2019-11-30 00:00:00", 10000)
repayment_entry.submit()
amounts = calculate_amounts(loan.name, "2019-11-30 00:00:01")
@@ -829,14 +783,10 @@ class TestLoan(unittest.TestCase):
def test_loan_write_off_limit(self):
pledge = [{"loan_security": "Test Security 1", "qty": 4000.00}]
- loan_application = create_loan_application(
- "_Test Company", self.applicant2, "Demand Loan", pledge
- )
+ loan_application = create_loan_application("_Test Company", self.applicant2, "Demand Loan", pledge)
create_pledge(loan_application)
- loan = create_demand_loan(
- self.applicant2, "Demand Loan", loan_application, posting_date="2019-10-01"
- )
+ loan = create_demand_loan(self.applicant2, "Demand Loan", loan_application, posting_date="2019-10-01")
loan.submit()
self.assertEqual(loan.loan_amount, 1000000)
@@ -881,14 +831,10 @@ class TestLoan(unittest.TestCase):
def test_loan_repayment_against_partially_disbursed_loan(self):
pledge = [{"loan_security": "Test Security 1", "qty": 4000.00}]
- loan_application = create_loan_application(
- "_Test Company", self.applicant2, "Demand Loan", pledge
- )
+ loan_application = create_loan_application("_Test Company", self.applicant2, "Demand Loan", pledge)
create_pledge(loan_application)
- loan = create_demand_loan(
- self.applicant2, "Demand Loan", loan_application, posting_date="2019-10-01"
- )
+ loan = create_demand_loan(self.applicant2, "Demand Loan", loan_application, posting_date="2019-10-01")
loan.submit()
first_date = "2019-10-01"
@@ -899,21 +845,15 @@ class TestLoan(unittest.TestCase):
loan.load_from_db()
self.assertEqual(loan.status, "Partially Disbursed")
- create_repayment_entry(
- loan.name, self.applicant2, add_days(last_date, 5), flt(loan.loan_amount / 3)
- )
+ create_repayment_entry(loan.name, self.applicant2, add_days(last_date, 5), flt(loan.loan_amount / 3))
def test_loan_amount_write_off(self):
pledge = [{"loan_security": "Test Security 1", "qty": 4000.00}]
- loan_application = create_loan_application(
- "_Test Company", self.applicant2, "Demand Loan", pledge
- )
+ loan_application = create_loan_application("_Test Company", self.applicant2, "Demand Loan", pledge)
create_pledge(loan_application)
- loan = create_demand_loan(
- self.applicant2, "Demand Loan", loan_application, posting_date="2019-10-01"
- )
+ loan = create_demand_loan(self.applicant2, "Demand Loan", loan_application, posting_date="2019-10-01")
loan.submit()
self.assertEqual(loan.loan_amount, 1000000)
@@ -1026,9 +966,7 @@ def create_loan_scenario_for_penalty(doc):
loan_application = create_loan_application("_Test Company", doc.applicant2, "Demand Loan", pledge)
create_pledge(loan_application)
- loan = create_demand_loan(
- doc.applicant2, "Demand Loan", loan_application, posting_date="2019-10-01"
- )
+ loan = create_demand_loan(doc.applicant2, "Demand Loan", loan_application, posting_date="2019-10-01")
loan.submit()
first_date = "2019-10-01"
@@ -1040,9 +978,7 @@ def create_loan_scenario_for_penalty(doc):
amounts = calculate_amounts(loan.name, add_days(last_date, 1))
paid_amount = amounts["interest_amount"] / 2
- repayment_entry = create_repayment_entry(
- loan.name, doc.applicant2, add_days(last_date, 5), paid_amount
- )
+ repayment_entry = create_repayment_entry(loan.name, doc.applicant2, add_days(last_date, 5), paid_amount)
repayment_entry.submit()
@@ -1154,7 +1090,6 @@ def create_loan_type(
repayment_schedule_type=None,
repayment_date_on=None,
):
-
if not frappe.db.exists("Loan Type", loan_name):
loan_type = frappe.get_doc(
{
@@ -1228,7 +1163,6 @@ def create_loan_security():
def create_loan_security_pledge(applicant, pledges, loan_application=None, loan=None):
-
lsp = frappe.new_doc("Loan Security Pledge")
lsp.applicant_type = "Customer"
lsp.applicant = applicant
@@ -1248,7 +1182,6 @@ def create_loan_security_pledge(applicant, pledges, loan_application=None, loan=
def make_loan_disbursement_entry(loan, amount, disbursement_date=None):
-
loan_disbursement_entry = frappe.get_doc(
{
"doctype": "Loan Disbursement",
@@ -1267,14 +1200,12 @@ def make_loan_disbursement_entry(loan, amount, disbursement_date=None):
def create_loan_security_price(loan_security, loan_security_price, uom, from_date, to_date):
-
if not frappe.db.get_value(
"Loan Security Price",
{"loan_security": loan_security, "valid_from": ("<=", from_date), "valid_upto": (">=", to_date)},
"name",
):
-
- lsp = frappe.get_doc(
+ frappe.get_doc(
{
"doctype": "Loan Security Price",
"loan_security": loan_security,
@@ -1287,7 +1218,6 @@ def create_loan_security_price(loan_security, loan_security_price, uom, from_dat
def create_repayment_entry(loan, applicant, posting_date, paid_amount):
-
lr = frappe.get_doc(
{
"doctype": "Loan Repayment",
@@ -1350,7 +1280,6 @@ def create_loan(
repayment_start_date=None,
posting_date=None,
):
-
loan = frappe.get_doc(
{
"doctype": "Loan",
@@ -1408,7 +1337,6 @@ def create_loan_with_security(
def create_demand_loan(applicant, loan_type, loan_application, posting_date=None):
-
loan = frappe.get_doc(
{
"doctype": "Loan",
diff --git a/erpnext/loan_management/doctype/loan_application/loan_application.py b/erpnext/loan_management/doctype/loan_application/loan_application.py
index 5f040e22c97..c7dfb3e92bb 100644
--- a/erpnext/loan_management/doctype/loan_application/loan_application.py
+++ b/erpnext/loan_management/doctype/loan_application/loan_application.py
@@ -53,9 +53,7 @@ class LoanApplication(Document):
maximum_loan_limit = frappe.db.get_value("Loan Type", self.loan_type, "maximum_loan_amount")
if maximum_loan_limit and self.loan_amount > maximum_loan_limit:
- frappe.throw(
- _("Loan Amount cannot exceed Maximum Loan Amount of {0}").format(maximum_loan_limit)
- )
+ frappe.throw(_("Loan Amount cannot exceed Maximum Loan Amount of {0}").format(maximum_loan_limit))
if self.maximum_loan_amount and self.loan_amount > self.maximum_loan_amount:
frappe.throw(
@@ -83,7 +81,6 @@ class LoanApplication(Document):
def set_pledge_amount(self):
for proposed_pledge in self.proposed_pledges:
-
if not proposed_pledge.qty and not proposed_pledge.amount:
frappe.throw(_("Qty or Amount is mandatroy for loan security"))
@@ -98,7 +95,6 @@ class LoanApplication(Document):
)
def get_repayment_details(self):
-
if self.is_term_loan:
if self.repayment_method == "Repay Over Number of Periods":
self.repayment_amount = get_monthly_repayment_amount(
@@ -110,9 +106,14 @@ class LoanApplication(Document):
if monthly_interest_rate:
min_repayment_amount = self.loan_amount * monthly_interest_rate
if self.repayment_amount - min_repayment_amount <= 0:
- frappe.throw(_("Repayment Amount must be greater than " + str(flt(min_repayment_amount, 2))))
+ frappe.throw(
+ _("Repayment Amount must be greater than " + str(flt(min_repayment_amount, 2)))
+ )
self.repayment_periods = math.ceil(
- (math.log(self.repayment_amount) - math.log(self.repayment_amount - min_repayment_amount))
+ (
+ math.log(self.repayment_amount)
+ - math.log(self.repayment_amount - min_repayment_amount)
+ )
/ (math.log(1 + monthly_interest_rate))
)
else:
@@ -206,7 +207,6 @@ def create_pledge(loan_application, loan=None):
lsp.loan = loan
for pledge in loan_application_doc.proposed_pledges:
-
lsp.append(
"securities",
{
diff --git a/erpnext/loan_management/doctype/loan_balance_adjustment/loan_balance_adjustment.py b/erpnext/loan_management/doctype/loan_balance_adjustment/loan_balance_adjustment.py
index 0a576d69692..9099292c4fa 100644
--- a/erpnext/loan_management/doctype/loan_balance_adjustment/loan_balance_adjustment.py
+++ b/erpnext/loan_management/doctype/loan_balance_adjustment/loan_balance_adjustment.py
@@ -97,9 +97,9 @@ class LoanBalanceAdjustment(AccountsController):
def make_gl_entries(self, cancel=0, adv_adj=0):
gle_map = []
loan_account = frappe.db.get_value("Loan", self.loan, "loan_account")
- remarks = "{} against loan {}".format(self.adjustment_type.capitalize(), self.loan)
+ remarks = f"{self.adjustment_type.capitalize()} against loan {self.loan}"
if self.reference_number:
- remarks += "with reference no. {}".format(self.reference_number)
+ remarks += f"with reference no. {self.reference_number}"
loan_entry = {
"account": loan_account,
diff --git a/erpnext/loan_management/doctype/loan_disbursement/loan_disbursement.py b/erpnext/loan_management/doctype/loan_disbursement/loan_disbursement.py
index ec117a12ad0..3d649f3613d 100644
--- a/erpnext/loan_management/doctype/loan_disbursement/loan_disbursement.py
+++ b/erpnext/loan_management/doctype/loan_disbursement/loan_disbursement.py
@@ -182,18 +182,14 @@ def get_total_pledged_security_value(loan):
)
)
- hair_cut_map = frappe._dict(
- frappe.get_all("Loan Security", fields=["name", "haircut"], as_list=1)
- )
+ hair_cut_map = frappe._dict(frappe.get_all("Loan Security", fields=["name", "haircut"], as_list=1))
security_value = 0.0
pledged_securities = get_pledged_security_qty(loan)
for security, qty in pledged_securities.items():
after_haircut_percentage = 100 - hair_cut_map.get(security)
- security_value += (
- loan_security_price_map.get(security, 0) * qty * after_haircut_percentage
- ) / 100
+ security_value += (loan_security_price_map.get(security, 0) * qty * after_haircut_percentage) / 100
return security_value
@@ -241,10 +237,7 @@ def get_disbursal_amount(loan, on_current_security_price=0):
disbursal_amount = flt(security_value) - flt(pending_principal_amount)
- if (
- loan_details.is_term_loan
- and (disbursal_amount + loan_details.loan_amount) > loan_details.loan_amount
- ):
+ if loan_details.is_term_loan and (disbursal_amount + loan_details.loan_amount) > loan_details.loan_amount:
disbursal_amount = loan_details.loan_amount - loan_details.disbursed_amount
return disbursal_amount
diff --git a/erpnext/loan_management/doctype/loan_disbursement/test_loan_disbursement.py b/erpnext/loan_management/doctype/loan_disbursement/test_loan_disbursement.py
index 9cc6ec9d4b4..6df4ad23352 100644
--- a/erpnext/loan_management/doctype/loan_disbursement/test_loan_disbursement.py
+++ b/erpnext/loan_management/doctype/loan_disbursement/test_loan_disbursement.py
@@ -8,7 +8,6 @@ from frappe.utils import (
add_days,
add_to_date,
date_diff,
- flt,
get_datetime,
get_first_day,
get_last_day,
@@ -76,9 +75,7 @@ class TestLoanDisbursement(unittest.TestCase):
def test_loan_topup(self):
pledge = [{"loan_security": "Test Security 1", "qty": 4000.00}]
- loan_application = create_loan_application(
- "_Test Company", self.applicant, "Demand Loan", pledge
- )
+ loan_application = create_loan_application("_Test Company", self.applicant, "Demand Loan", pledge)
create_pledge(loan_application)
loan = create_demand_loan(
@@ -92,18 +89,14 @@ class TestLoanDisbursement(unittest.TestCase):
no_of_days = date_diff(last_date, first_date) + 1
- accrued_interest_amount = (loan.loan_amount * loan.rate_of_interest * no_of_days) / (
- days_in_year(get_datetime().year) * 100
- )
+ (loan.loan_amount * loan.rate_of_interest * no_of_days) / (days_in_year(get_datetime().year) * 100)
make_loan_disbursement_entry(loan.name, loan.loan_amount, disbursement_date=first_date)
process_loan_interest_accrual_for_demand_loans(posting_date=add_days(last_date, 1))
# Should not be able to create loan disbursement entry before repayment
- self.assertRaises(
- frappe.ValidationError, make_loan_disbursement_entry, loan.name, 500000, first_date
- )
+ self.assertRaises(frappe.ValidationError, make_loan_disbursement_entry, loan.name, 500000, first_date)
repayment_entry = create_repayment_entry(
loan.name, self.applicant, add_days(get_last_day(nowdate()), 5), 611095.89
@@ -125,14 +118,10 @@ class TestLoanDisbursement(unittest.TestCase):
def test_loan_topup_with_additional_pledge(self):
pledge = [{"loan_security": "Test Security 1", "qty": 4000.00}]
- loan_application = create_loan_application(
- "_Test Company", self.applicant, "Demand Loan", pledge
- )
+ loan_application = create_loan_application("_Test Company", self.applicant, "Demand Loan", pledge)
create_pledge(loan_application)
- loan = create_demand_loan(
- self.applicant, "Demand Loan", loan_application, posting_date="2019-10-01"
- )
+ loan = create_demand_loan(self.applicant, "Demand Loan", loan_application, posting_date="2019-10-01")
loan.submit()
self.assertEqual(loan.loan_amount, 1000000)
@@ -145,7 +134,7 @@ class TestLoanDisbursement(unittest.TestCase):
process_loan_interest_accrual_for_demand_loans(posting_date=last_date)
amounts = calculate_amounts(loan.name, add_days(last_date, 1))
- previous_interest = amounts["interest_amount"]
+ amounts["interest_amount"]
pledge1 = [{"loan_security": "Test Security 1", "qty": 2000.00}]
@@ -157,6 +146,6 @@ class TestLoanDisbursement(unittest.TestCase):
amounts = calculate_amounts(loan.name, add_days(last_date, 15))
per_day_interest = get_per_day_interest(1500000, 13.5, "2019-10-30")
- interest = per_day_interest * 15
+ per_day_interest * 15
self.assertEqual(amounts["pending_principal_amount"], 1500000)
diff --git a/erpnext/loan_management/doctype/loan_interest_accrual/loan_interest_accrual.py b/erpnext/loan_management/doctype/loan_interest_accrual/loan_interest_accrual.py
index e72d694b0f1..a219aaefb16 100644
--- a/erpnext/loan_management/doctype/loan_interest_accrual/loan_interest_accrual.py
+++ b/erpnext/loan_management/doctype/loan_interest_accrual/loan_interest_accrual.py
@@ -72,7 +72,7 @@ class LoanInterestAccrual(AccountsController):
"credit_in_account_currency": self.interest_amount,
"against_voucher_type": "Loan",
"against_voucher": self.loan,
- "remarks": ("Interest accrued from {0} to {1} against loan: {2}").format(
+ "remarks": ("Interest accrued from {} to {} against loan: {}").format(
self.last_accrual_date, self.posting_date, self.loan
),
"cost_center": cost_center,
@@ -88,9 +88,7 @@ class LoanInterestAccrual(AccountsController):
# For Eg: If Loan disbursement date is '01-09-2019' and disbursed amount is 1000000 and
# rate of interest is 13.5 then first loan interest accural will be on '01-10-2019'
# which means interest will be accrued for 30 days which should be equal to 11095.89
-def calculate_accrual_amount_for_demand_loans(
- loan, posting_date, process_loan_interest, accrual_type
-):
+def calculate_accrual_amount_for_demand_loans(loan, posting_date, process_loan_interest, accrual_type):
from erpnext.loan_management.doctype.loan_repayment.loan_repayment import (
calculate_amounts,
get_pending_principal_amount,
@@ -104,9 +102,7 @@ def calculate_accrual_amount_for_demand_loans(
pending_principal_amount = get_pending_principal_amount(loan)
- interest_per_day = get_per_day_interest(
- pending_principal_amount, loan.rate_of_interest, posting_date
- )
+ interest_per_day = get_per_day_interest(pending_principal_amount, loan.rate_of_interest, posting_date)
payable_interest = interest_per_day * no_of_days
pending_amounts = calculate_amounts(loan.name, posting_date, payment_type="Loan Closure")
@@ -170,9 +166,7 @@ def make_accrual_interest_entry_for_demand_loans(
)
for loan in open_loans:
- calculate_accrual_amount_for_demand_loans(
- loan, posting_date, process_loan_interest, accrual_type
- )
+ calculate_accrual_amount_for_demand_loans(loan, posting_date, process_loan_interest, accrual_type)
def make_accrual_interest_entry_for_term_loans(
@@ -223,7 +217,7 @@ def get_term_loans(date, term_loan=None, loan_type=None):
condition += " AND l.loan_type = %s" % frappe.db.escape(loan_type)
term_loans = frappe.db.sql(
- """SELECT l.name, l.total_payment, l.total_amount_paid, l.loan_account,
+ f"""SELECT l.name, l.total_payment, l.total_amount_paid, l.loan_account,
l.interest_income_account, l.is_term_loan, l.disbursement_date, l.applicant_type, l.applicant,
l.rate_of_interest, l.total_interest_payable, l.repayment_start_date, rs.name as payment_entry,
rs.payment_date, rs.principal_amount, rs.interest_amount, rs.is_accrued , rs.balance_loan_amount
@@ -232,12 +226,10 @@ def get_term_loans(date, term_loan=None, loan_type=None):
AND l.docstatus=1
AND l.is_term_loan =1
AND rs.payment_date <= %s
- AND rs.is_accrued=0 {0}
+ AND rs.is_accrued=0 {condition}
AND rs.principal_amount > 0
AND l.status = 'Disbursed'
- ORDER BY rs.payment_date""".format(
- condition
- ),
+ ORDER BY rs.payment_date""",
(getdate(date)),
as_dict=1,
)
@@ -256,9 +248,7 @@ def make_loan_interest_accrual_entry(args):
loan_interest_accrual.loan_account = args.loan_account
loan_interest_accrual.pending_principal_amount = flt(args.pending_principal_amount, precision)
loan_interest_accrual.interest_amount = flt(args.interest_amount, precision)
- loan_interest_accrual.total_pending_interest_amount = flt(
- args.total_pending_interest_amount, precision
- )
+ loan_interest_accrual.total_pending_interest_amount = flt(args.total_pending_interest_amount, precision)
loan_interest_accrual.penalty_amount = flt(args.penalty_amount, precision)
loan_interest_accrual.posting_date = args.posting_date or nowdate()
loan_interest_accrual.process_loan_interest_accrual = args.process_loan_interest
@@ -323,6 +313,4 @@ def get_per_day_interest(principal_amount, rate_of_interest, posting_date=None):
if not posting_date:
posting_date = getdate()
- return flt(
- (principal_amount * rate_of_interest) / (days_in_year(get_datetime(posting_date).year) * 100)
- )
+ return flt((principal_amount * rate_of_interest) / (days_in_year(get_datetime(posting_date).year) * 100))
diff --git a/erpnext/loan_management/doctype/loan_interest_accrual/test_loan_interest_accrual.py b/erpnext/loan_management/doctype/loan_interest_accrual/test_loan_interest_accrual.py
index fd59393b827..ef209d340fa 100644
--- a/erpnext/loan_management/doctype/loan_interest_accrual/test_loan_interest_accrual.py
+++ b/erpnext/loan_management/doctype/loan_interest_accrual/test_loan_interest_accrual.py
@@ -60,9 +60,7 @@ class TestLoanInterestAccrual(unittest.TestCase):
def test_loan_interest_accural(self):
pledge = [{"loan_security": "Test Security 1", "qty": 4000.00}]
- loan_application = create_loan_application(
- "_Test Company", self.applicant, "Demand Loan", pledge
- )
+ loan_application = create_loan_application("_Test Company", self.applicant, "Demand Loan", pledge)
create_pledge(loan_application)
loan = create_demand_loan(
self.applicant, "Demand Loan", loan_application, posting_date=get_first_day(nowdate())
@@ -86,9 +84,7 @@ class TestLoanInterestAccrual(unittest.TestCase):
def test_accumulated_amounts(self):
pledge = [{"loan_security": "Test Security 1", "qty": 4000.00}]
- loan_application = create_loan_application(
- "_Test Company", self.applicant, "Demand Loan", pledge
- )
+ loan_application = create_loan_application("_Test Company", self.applicant, "Demand Loan", pledge)
create_pledge(loan_application)
loan = create_demand_loan(
self.applicant, "Demand Loan", loan_application, posting_date=get_first_day(nowdate())
diff --git a/erpnext/loan_management/doctype/loan_repayment/loan_repayment.py b/erpnext/loan_management/doctype/loan_repayment/loan_repayment.py
index 0b057f85aa3..e11e3052983 100644
--- a/erpnext/loan_management/doctype/loan_repayment/loan_repayment.py
+++ b/erpnext/loan_management/doctype/loan_repayment/loan_repayment.py
@@ -70,7 +70,9 @@ class LoanRepayment(AccountsController):
shortfall_amount = flt(
frappe.db.get_value(
- "Loan Security Shortfall", {"loan": self.against_loan, "status": "Pending"}, "shortfall_amount"
+ "Loan Security Shortfall",
+ {"loan": self.against_loan, "status": "Pending"},
+ "shortfall_amount",
)
)
@@ -94,10 +96,10 @@ class LoanRepayment(AccountsController):
)
if future_repayment_date:
- frappe.throw("Repayment already made till date {0}".format(get_datetime(future_repayment_date)))
+ frappe.throw(f"Repayment already made till date {get_datetime(future_repayment_date)}")
def validate_amount(self):
- precision = cint(frappe.db.get_default("currency_precision")) or 2
+ cint(frappe.db.get_default("currency_precision")) or 2
if not self.amount_paid:
frappe.throw(_("Amount paid cannot be zero"))
@@ -115,7 +117,9 @@ class LoanRepayment(AccountsController):
)
no_of_days = (
- flt(flt(self.total_interest_paid - self.interest_payable, precision) / per_day_interest, 0)
+ flt(
+ flt(self.total_interest_paid - self.interest_payable, precision) / per_day_interest, 0
+ )
- 1
)
@@ -139,7 +143,9 @@ class LoanRepayment(AccountsController):
"repayment_details",
{
"loan_interest_accrual": lia.name,
- "paid_interest_amount": flt(self.total_interest_paid - self.interest_payable, precision),
+ "paid_interest_amount": flt(
+ self.total_interest_paid - self.interest_payable, precision
+ ),
"paid_principal_amount": 0.0,
"accrual_type": "Repayment",
},
@@ -263,9 +269,7 @@ class LoanRepayment(AccountsController):
if future_accrual_date:
frappe.throw(
- "Cannot cancel. Interest accruals already processed till {0}".format(
- get_datetime(future_accrual_date)
- )
+ f"Cannot cancel. Interest accruals already processed till {get_datetime(future_accrual_date)}"
)
def update_repayment_schedule(self, cancel=0):
@@ -337,9 +341,7 @@ class LoanRepayment(AccountsController):
return interest_paid, updated_entries
- def allocate_principal_amount_for_term_loans(
- self, interest_paid, repayment_details, updated_entries
- ):
+ def allocate_principal_amount_for_term_loans(self, interest_paid, repayment_details, updated_entries):
if interest_paid > 0:
for lia, amounts in repayment_details.get("pending_accrual_entries", []).items():
paid_principal = 0
@@ -396,18 +398,16 @@ class LoanRepayment(AccountsController):
def make_gl_entries(self, cancel=0, adv_adj=0):
gle_map = []
if self.shortfall_amount and self.amount_paid > self.shortfall_amount:
- remarks = "Shortfall repayment of {0}.
Repayment against loan {1}".format(
+ remarks = "Shortfall repayment of {}.
Repayment against loan {}".format(
self.shortfall_amount, self.against_loan
)
elif self.shortfall_amount:
- remarks = "Shortfall repayment of {0} against loan {1}".format(
- self.shortfall_amount, self.against_loan
- )
+ remarks = f"Shortfall repayment of {self.shortfall_amount} against loan {self.against_loan}"
else:
remarks = "Repayment against loan " + self.against_loan
if self.reference_number:
- remarks += "with reference no. {}".format(self.reference_number)
+ remarks += f"with reference no. {self.reference_number}"
if hasattr(self, "repay_from_salary") and self.repay_from_salary:
payment_account = self.payroll_payable_account
@@ -513,7 +513,6 @@ def create_repayment_entry(
payroll_payable_account=None,
process_payroll_accounting_entry_based_on_employee=0,
):
-
lr = frappe.get_doc(
{
"doctype": "Loan Repayment",
@@ -617,9 +616,7 @@ def regenerate_repayment_schedule(loan, cancel=0):
balance_amount = get_pending_principal_amount(loan_doc)
if loan_doc.repayment_method == "Repay Fixed Amount per Period":
- monthly_repayment_amount = flt(
- balance_amount / (original_repayment_schedule_len - accrued_entries)
- )
+ monthly_repayment_amount = flt(balance_amount / (original_repayment_schedule_len - accrued_entries))
else:
repayment_period = loan_doc.repayment_periods - accrued_entries
if not cancel and repayment_period > 0:
@@ -718,9 +715,7 @@ def get_amounts(amounts, against_loan, posting_date):
if (
no_of_late_days > 0
- and (
- not (hasattr(against_loan_doc, "repay_from_salary") and against_loan_doc.repay_from_salary)
- )
+ and (not (hasattr(against_loan_doc, "repay_from_salary") and against_loan_doc.repay_from_salary))
and entry.accrual_type == "Regular"
):
penalty_amount += (
diff --git a/erpnext/loan_management/doctype/loan_security_pledge/loan_security_pledge.py b/erpnext/loan_management/doctype/loan_security_pledge/loan_security_pledge.py
index f0d59542753..238a9c9e571 100644
--- a/erpnext/loan_management/doctype/loan_security_pledge/loan_security_pledge.py
+++ b/erpnext/loan_management/doctype/loan_security_pledge/loan_security_pledge.py
@@ -74,7 +74,6 @@ class LoanSecurityPledge(Document):
maximum_loan_value = 0
for pledge in self.securities:
-
if not pledge.qty and not pledge.amount:
frappe.throw(_("Qty or Amount is mandatory for loan security!"))
diff --git a/erpnext/loan_management/doctype/loan_security_price/loan_security_price.py b/erpnext/loan_management/doctype/loan_security_price/loan_security_price.py
index 45c4459ac3f..3bee111aab1 100644
--- a/erpnext/loan_management/doctype/loan_security_price/loan_security_price.py
+++ b/erpnext/loan_management/doctype/loan_security_price/loan_security_price.py
@@ -13,7 +13,6 @@ class LoanSecurityPrice(Document):
self.validate_dates()
def validate_dates(self):
-
if self.valid_from > self.valid_upto:
frappe.throw(_("Valid From Time must be lesser than Valid Upto Time."))
diff --git a/erpnext/loan_management/doctype/loan_security_shortfall/loan_security_shortfall.py b/erpnext/loan_management/doctype/loan_security_shortfall/loan_security_shortfall.py
index b901e626b43..f3bcc60fc5b 100644
--- a/erpnext/loan_management/doctype/loan_security_shortfall/loan_security_shortfall.py
+++ b/erpnext/loan_management/doctype/loan_security_shortfall/loan_security_shortfall.py
@@ -47,9 +47,7 @@ def update_shortfall_status(loan, security_value, on_cancel=0):
@frappe.whitelist()
def add_security(loan):
- loan_details = frappe.db.get_value(
- "Loan", loan, ["applicant", "company", "applicant_type"], as_dict=1
- )
+ loan_details = frappe.db.get_value("Loan", loan, ["applicant", "company", "applicant_type"], as_dict=1)
loan_security_pledge = frappe.new_doc("Loan Security Pledge")
loan_security_pledge.loan = loan
@@ -61,7 +59,6 @@ def add_security(loan):
def check_for_ltv_shortfall(process_loan_security_shortfall):
-
update_time = get_datetime()
loan_security_price_map = frappe._dict(
@@ -93,8 +90,6 @@ def check_for_ltv_shortfall(process_loan_security_shortfall):
)
)
- loan_security_map = {}
-
for loan in loans:
if loan.status == "Disbursed":
outstanding_amount = (
diff --git a/erpnext/loan_management/doctype/loan_security_unpledge/loan_security_unpledge.py b/erpnext/loan_management/doctype/loan_security_unpledge/loan_security_unpledge.py
index 0ab7beb0fc7..b24a48b6521 100644
--- a/erpnext/loan_management/doctype/loan_security_unpledge/loan_security_unpledge.py
+++ b/erpnext/loan_management/doctype/loan_security_unpledge/loan_security_unpledge.py
@@ -39,9 +39,7 @@ class LoanSecurityUnpledge(Document):
pledge_qty_map = get_pledged_security_qty(self.loan)
- ltv_ratio_map = frappe._dict(
- frappe.get_all("Loan Security Type", fields=["name", "loan_to_value_ratio"], as_list=1)
- )
+ frappe._dict(frappe.get_all("Loan Security Type", fields=["name", "loan_to_value_ratio"], as_list=1))
loan_security_price_map = frappe._dict(
frappe.get_all(
@@ -129,7 +127,7 @@ class LoanSecurityUnpledge(Document):
pledged_qty = 0
current_pledges = get_pledged_security_qty(self.loan)
- for security, qty in current_pledges.items():
+ for _security, qty in current_pledges.items():
pledged_qty += qty
if not pledged_qty:
@@ -138,7 +136,6 @@ class LoanSecurityUnpledge(Document):
@frappe.whitelist()
def get_pledged_security_qty(loan):
-
current_pledges = {}
unpledges = frappe._dict(
diff --git a/erpnext/loan_management/doctype/process_loan_interest_accrual/process_loan_interest_accrual.py b/erpnext/loan_management/doctype/process_loan_interest_accrual/process_loan_interest_accrual.py
index 25c72d91a7c..a1d9abdd35c 100644
--- a/erpnext/loan_management/doctype/process_loan_interest_accrual/process_loan_interest_accrual.py
+++ b/erpnext/loan_management/doctype/process_loan_interest_accrual/process_loan_interest_accrual.py
@@ -56,7 +56,6 @@ def process_loan_interest_accrual_for_demand_loans(
def process_loan_interest_accrual_for_term_loans(posting_date=None, loan_type=None, loan=None):
-
if not term_loan_accrual_pending(posting_date or nowdate(), loan=loan):
return
diff --git a/erpnext/loan_management/report/applicant_wise_loan_security_exposure/applicant_wise_loan_security_exposure.py b/erpnext/loan_management/report/applicant_wise_loan_security_exposure/applicant_wise_loan_security_exposure.py
index 02da8109ca9..2f1bcb1d8a7 100644
--- a/erpnext/loan_management/report/applicant_wise_loan_security_exposure/applicant_wise_loan_security_exposure.py
+++ b/erpnext/loan_management/report/applicant_wise_loan_security_exposure/applicant_wise_loan_security_exposure.py
@@ -188,16 +188,14 @@ def get_applicant_wise_total_loan_security_qty(filters, loan_security_details):
conditions = "AND company = %(company)s"
unpledges = frappe.db.sql(
- """
+ f"""
SELECT up.applicant, u.loan_security, sum(u.qty) as qty
FROM `tabLoan Security Unpledge` up, `tabUnpledge` u
WHERE u.parent = up.name
AND up.status = 'Approved'
{conditions}
GROUP BY up.applicant, u.loan_security
- """.format(
- conditions=conditions
- ),
+ """,
filters,
as_dict=1,
)
@@ -206,16 +204,14 @@ def get_applicant_wise_total_loan_security_qty(filters, loan_security_details):
applicant_wise_unpledges.setdefault((unpledge.applicant, unpledge.loan_security), unpledge.qty)
pledges = frappe.db.sql(
- """
+ f"""
SELECT lp.applicant_type, lp.applicant, p.loan_security, sum(p.qty) as qty
FROM `tabLoan Security Pledge` lp, `tabPledge`p
WHERE p.parent = lp.name
AND lp.status = 'Pledged'
{conditions}
GROUP BY lp.applicant, p.loan_security
- """.format(
- conditions=conditions
- ),
+ """,
filters,
as_dict=1,
)
diff --git a/erpnext/loan_management/report/loan_interest_report/loan_interest_report.py b/erpnext/loan_management/report/loan_interest_report/loan_interest_report.py
index 58a7880a459..9e1c496779c 100644
--- a/erpnext/loan_management/report/loan_interest_report/loan_interest_report.py
+++ b/erpnext/loan_management/report/loan_interest_report/loan_interest_report.py
@@ -219,9 +219,7 @@ def get_active_loan_details(filters):
def get_sanctioned_amount_map():
return frappe._dict(
- frappe.get_all(
- "Sanctioned Loan Amount", fields=["applicant", "sanctioned_amount_limit"], as_list=1
- )
+ frappe.get_all("Sanctioned Loan Amount", fields=["applicant", "sanctioned_amount_limit"], as_list=1)
)
@@ -309,9 +307,7 @@ def get_interest_accruals(loans, filters):
def get_penal_interest_rate_map():
- return frappe._dict(
- frappe.get_all("Loan Type", fields=["name", "penalty_interest_rate"], as_list=1)
- )
+ return frappe._dict(frappe.get_all("Loan Type", fields=["name", "penalty_interest_rate"], as_list=1))
def get_loan_wise_pledges(filters):
@@ -324,16 +320,14 @@ def get_loan_wise_pledges(filters):
conditions = "AND company = %(company)s"
unpledges = frappe.db.sql(
- """
+ f"""
SELECT up.loan, u.loan_security, sum(u.qty) as qty
FROM `tabLoan Security Unpledge` up, `tabUnpledge` u
WHERE u.parent = up.name
AND up.status = 'Approved'
{conditions}
GROUP BY up.loan, u.loan_security
- """.format(
- conditions=conditions
- ),
+ """,
filters,
as_dict=1,
)
@@ -342,16 +336,14 @@ def get_loan_wise_pledges(filters):
loan_wise_unpledges.setdefault((unpledge.loan, unpledge.loan_security), unpledge.qty)
pledges = frappe.db.sql(
- """
+ f"""
SELECT lp.loan, p.loan_security, sum(p.qty) as qty
FROM `tabLoan Security Pledge` lp, `tabPledge`p
WHERE p.parent = lp.name
AND lp.status = 'Pledged'
{conditions}
GROUP BY lp.loan, p.loan_security
- """.format(
- conditions=conditions
- ),
+ """,
filters,
as_dict=1,
)
diff --git a/erpnext/loan_management/report/loan_security_status/loan_security_status.py b/erpnext/loan_management/report/loan_security_status/loan_security_status.py
index 9a5a18001ea..acec5271ad1 100644
--- a/erpnext/loan_management/report/loan_security_status/loan_security_status.py
+++ b/erpnext/loan_management/report/loan_security_status/loan_security_status.py
@@ -61,12 +61,11 @@ def get_columns(filters):
def get_data(filters):
-
data = []
conditions = get_conditions(filters)
loan_security_pledges = frappe.db.sql(
- """
+ f"""
SELECT
p.name, p.applicant, p.loan, p.status, p.pledge_time,
c.loan_security, c.qty, c.loan_security_price, c.amount
@@ -77,9 +76,7 @@ def get_data(filters):
AND c.parent = p.name
AND p.company = %(company)s
{conditions}
- """.format(
- conditions=conditions
- ),
+ """,
(filters),
as_dict=1,
) # nosec
diff --git a/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py b/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py
index 8e4af3ac172..08e56e06c73 100644
--- a/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py
+++ b/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py
@@ -126,7 +126,7 @@ class MaintenanceSchedule(TransactionBase):
date_diff = (getdate(end_date) - getdate(start_date)).days
add_by = date_diff / no_of_visit
- for visit in range(cint(no_of_visit)):
+ for _visit in range(cint(no_of_visit)):
if getdate(start_date_copy) < getdate(end_date):
start_date_copy = add_days(start_date_copy, add_by)
if len(schedule_list) < no_of_visit:
@@ -153,9 +153,8 @@ class MaintenanceSchedule(TransactionBase):
)
if not validated and holidays:
-
# max iterations = len(holidays)
- for i in range(len(holidays)):
+ for _i in range(len(holidays)):
if schedule_date in holidays:
schedule_date = add_days(schedule_date, -1)
else:
@@ -214,7 +213,7 @@ class MaintenanceSchedule(TransactionBase):
doc_before_save = self.get_doc_before_save()
if not doc_before_save:
return
- for prev_item, item in zip(doc_before_save.items, self.items):
+ for prev_item, item in zip(doc_before_save.items, self.items, strict=False):
fields = [
"item_code",
"start_date",
@@ -279,9 +278,7 @@ class MaintenanceSchedule(TransactionBase):
)
)
- if sr_details.amc_expiry_date and getdate(sr_details.amc_expiry_date) >= getdate(
- amc_start_date
- ):
+ if sr_details.amc_expiry_date and getdate(sr_details.amc_expiry_date) >= getdate(amc_start_date):
throw(
_("Serial No {0} is under maintenance contract upto {1}").format(
serial_no, sr_details.amc_expiry_date
diff --git a/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py b/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py
index a0974e99040..2254eb66f04 100644
--- a/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py
+++ b/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py
@@ -36,13 +36,17 @@ class MaintenanceVisit(TransactionBase):
self.mntc_date
) > get_datetime(end_date):
frappe.throw(
- _("Date must be between {0} and {1}").format(format_date(start_date), format_date(end_date))
+ _("Date must be between {0} and {1}").format(
+ format_date(start_date), format_date(end_date)
+ )
)
else:
for purpose in self.purposes:
if purpose.maintenance_schedule_detail:
item_ref = frappe.db.get_value(
- "Maintenance Schedule Detail", purpose.maintenance_schedule_detail, "item_reference"
+ "Maintenance Schedule Detail",
+ purpose.maintenance_schedule_detail,
+ "item_reference",
)
if item_ref:
start_date, end_date = frappe.db.get_value(
diff --git a/erpnext/manufacturing/doctype/blanket_order/blanket_order.py b/erpnext/manufacturing/doctype/blanket_order/blanket_order.py
index 83629092fa4..aaa127591fe 100644
--- a/erpnext/manufacturing/doctype/blanket_order/blanket_order.py
+++ b/erpnext/manufacturing/doctype/blanket_order/blanket_order.py
@@ -161,7 +161,7 @@ def validate_against_blanket_order(order_doc):
allowed_qty = remaining_qty + (remaining_qty * (allowance / 100))
if allowed_qty < item_data[item.item_code]:
frappe.throw(
- _("Item {0} cannot be ordered more than {1} against Blanket Order {2}.").format(
- item.item_code, allowed_qty, bo_name
- )
+ _(
+ "Item {0} cannot be ordered more than {1} against Blanket Order {2}."
+ ).format(item.item_code, allowed_qty, bo_name)
)
diff --git a/erpnext/manufacturing/doctype/blanket_order/test_blanket_order.py b/erpnext/manufacturing/doctype/blanket_order/test_blanket_order.py
index 3f3b6f092c0..a6eb18f47bc 100644
--- a/erpnext/manufacturing/doctype/blanket_order/test_blanket_order.py
+++ b/erpnext/manufacturing/doctype/blanket_order/test_blanket_order.py
@@ -98,9 +98,7 @@ class TestBlanketOrder(FrappeTestCase):
customer = "_Test Customer"
supplier = "_Test Supplier"
- if not frappe.db.exists(
- "Item Customer Detail", {"customer_name": customer, "parent": item_code}
- ):
+ if not frappe.db.exists("Item Customer Detail", {"customer_name": customer, "parent": item_code}):
item_doc.append("customer_items", {"customer_name": customer, "ref_code": "CUST-REF-1"})
item_doc.save()
diff --git a/erpnext/manufacturing/doctype/bom/bom.py b/erpnext/manufacturing/doctype/bom/bom.py
index 03190e7b965..f18ca1f796a 100644
--- a/erpnext/manufacturing/doctype/bom/bom.py
+++ b/erpnext/manufacturing/doctype/bom/bom.py
@@ -5,7 +5,6 @@ import functools
import re
from collections import deque
from operator import itemgetter
-from typing import Dict, List
import frappe
from frappe import _
@@ -33,11 +32,9 @@ class BOMTree:
# ref: https://docs.python.org/3/reference/datamodel.html#slots
__slots__ = ["name", "child_items", "is_bom", "item_code", "qty", "exploded_qty", "bom_qty"]
- def __init__(
- self, name: str, is_bom: bool = True, exploded_qty: float = 1.0, qty: float = 1
- ) -> None:
+ def __init__(self, name: str, is_bom: bool = True, exploded_qty: float = 1.0, qty: float = 1) -> None:
self.name = name # name of node, BOM number if is_bom else item_code
- self.child_items: List["BOMTree"] = [] # list of child items
+ self.child_items: list["BOMTree"] = [] # list of child items
self.is_bom = is_bom # true if the node is a BOM and not a leaf item
self.item_code: str = None # item_code associated with node
self.qty = qty # required unit quantity to make one unit of parent item.
@@ -63,7 +60,7 @@ class BOMTree:
BOMTree(item.item_code, is_bom=False, exploded_qty=exploded_qty, qty=qty)
)
- def level_order_traversal(self) -> List["BOMTree"]:
+ def level_order_traversal(self) -> list["BOMTree"]:
"""Get level order traversal of tree.
E.g. for following tree the traversal will return list of nodes in order from top to bottom.
BOM:
@@ -152,7 +149,7 @@ class BOM(WebsiteGenerator):
self.name = name
@staticmethod
- def get_next_version_index(existing_boms: List[str]) -> int:
+ def get_next_version_index(existing_boms: list[str]) -> int:
# split by "/" and "-"
delimiters = ["/", "-"]
pattern = "|".join(map(re.escape, delimiters))
@@ -341,10 +338,7 @@ class BOM(WebsiteGenerator):
return ret_item
def validate_bom_currency(self, item):
- if (
- item.get("bom_no")
- and frappe.db.get_value("BOM", item.get("bom_no"), "currency") != self.currency
- ):
+ if item.get("bom_no") and frappe.db.get_value("BOM", item.get("bom_no"), "currency") != self.currency:
frappe.throw(
_("Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2}").format(
item.idx, item.bom_no, self.currency
@@ -361,9 +355,9 @@ class BOM(WebsiteGenerator):
rate = get_valuation_rate(arg)
elif arg:
# Customer Provided parts and Supplier sourced parts will have zero rate
- if not frappe.db.get_value(
- "Item", arg["item_code"], "is_customer_provided_item"
- ) and not arg.get("sourced_by_supplier"):
+ if not frappe.db.get_value("Item", arg["item_code"], "is_customer_provided_item") and not arg.get(
+ "sourced_by_supplier"
+ ):
if arg.get("bom_no") and self.set_rate_of_sub_assembly_item_based_on_bom:
rate = flt(self.get_bom_unitcost(arg["bom_no"])) * (arg.get("conversion_factor") or 1)
else:
@@ -379,7 +373,8 @@ class BOM(WebsiteGenerator):
)
else:
frappe.msgprint(
- _("{0} not found for item {1}").format(self.rm_cost_as_per, arg["item_code"]), alert=True
+ _("{0} not found for item {1}").format(self.rm_cost_as_per, arg["item_code"]),
+ alert=True,
)
return flt(rate) * flt(self.plc_conversion_rate or 1) / (self.conversion_rate or 1)
@@ -727,7 +722,7 @@ class BOM(WebsiteGenerator):
# Only db_update if changed
row.db_update()
- def get_rm_rate_map(self) -> Dict[str, float]:
+ def get_rm_rate_map(self) -> dict[str, float]:
"Create Raw Material-Rate map for Exploded Items. Fetch rate from Items table or Subassembly BOM."
rm_rate_map = {}
@@ -1096,9 +1091,7 @@ def get_bom_items_as_dict(
@frappe.whitelist()
def get_bom_items(bom, company, qty=1, fetch_exploded=1):
- items = get_bom_items_as_dict(
- bom, company, qty, fetch_exploded, include_non_stock_items=True
- ).values()
+ items = get_bom_items_as_dict(bom, company, qty, fetch_exploded, include_non_stock_items=True).values()
items = list(items)
items.sort(key=functools.cmp_to_key(lambda a, b: a.item_code > b.item_code and 1 or -1))
return items
@@ -1230,9 +1223,7 @@ def add_operations_cost(stock_entry, work_order=None, expense_account=None):
)
if work_order and work_order.additional_operating_cost and work_order.qty:
- additional_operating_cost_per_unit = flt(work_order.additional_operating_cost) / flt(
- work_order.qty
- )
+ additional_operating_cost_per_unit = flt(work_order.additional_operating_cost) / flt(work_order.qty)
if additional_operating_cost_per_unit:
stock_entry.append(
@@ -1294,7 +1285,7 @@ def get_bom_diff(bom1, bom2):
# check for deletions
for d in old_value:
- if not d.get(identifier) in new_row_by_identifier:
+ if d.get(identifier) not in new_row_by_identifier:
out.removed.append([df.fieldname, d.as_dict()])
return out
@@ -1309,14 +1300,12 @@ def item_query(doctype, txt, searchfield, start, page_len, filters):
order_by = "idx desc, name, item_name"
fields = ["name", "item_name", "item_group", "description"]
- fields.extend(
- [field for field in searchfields if not field in ["name", "item_group", "description"]]
- )
+ fields.extend([field for field in searchfields if field not in ["name", "item_group", "description"]])
searchfields = searchfields + [
field
for field in [searchfield or "name", "item_code", "item_group", "item_name"]
- if not field in searchfields
+ if field not in searchfields
]
query_filters = {"disabled": 0, "ifnull(end_of_life, '3099-12-31')": (">", today())}
@@ -1324,12 +1313,12 @@ def item_query(doctype, txt, searchfield, start, page_len, filters):
or_cond_filters = {}
if txt:
for s_field in searchfields:
- or_cond_filters[s_field] = ("like", "%{0}%".format(txt))
+ or_cond_filters[s_field] = ("like", f"%{txt}%")
barcodes = frappe.get_all(
"Item Barcode",
fields=["distinct parent as item_code"],
- filters={"barcode": ("like", "%{0}%".format(txt))},
+ filters={"barcode": ("like", f"%{txt}%")},
)
barcodes = [d.item_code for d in barcodes]
@@ -1430,9 +1419,7 @@ def get_scrap_items_from_sub_assemblies(bom_no, company, qty, scrap_items=None):
continue
qty = flt(row.qty) * flt(qty)
- items = get_bom_items_as_dict(
- row.bom_no, company, qty=qty, fetch_exploded=0, fetch_scrap_items=1
- )
+ items = get_bom_items_as_dict(row.bom_no, company, qty=qty, fetch_exploded=0, fetch_scrap_items=1)
scrap_items.update(items)
get_scrap_items_from_sub_assemblies(row.bom_no, company, qty, scrap_items)
diff --git a/erpnext/manufacturing/doctype/bom/test_bom.py b/erpnext/manufacturing/doctype/bom/test_bom.py
index 2debf9191ef..d02b51ca6e7 100644
--- a/erpnext/manufacturing/doctype/bom/test_bom.py
+++ b/erpnext/manufacturing/doctype/bom/test_bom.py
@@ -10,7 +10,6 @@ from frappe.tests.utils import FrappeTestCase, timeout
from frappe.utils import cstr, flt
from erpnext.controllers.tests.test_subcontracting_controller import (
- make_stock_in_entry,
set_backflush_based_on,
)
from erpnext.manufacturing.doctype.bom.bom import BOMRecursionError, item_query, make_variant_bom
@@ -200,9 +199,7 @@ class TestBOM(FrappeTestCase):
reset_item_valuation_rate(
item_code="_Test Item",
- warehouse_list=frappe.get_all(
- "Warehouse", {"is_group": 0, "company": bom.company}, pluck="name"
- ),
+ warehouse_list=frappe.get_all("Warehouse", {"is_group": 0, "company": bom.company}, pluck="name"),
qty=200,
rate=200,
)
@@ -344,7 +341,7 @@ class TestBOM(FrappeTestCase):
self.assertEqual(len(reqd_order), len(created_order))
- for reqd_item, created_item in zip(reqd_order, created_order):
+ for reqd_item, created_item in zip(reqd_order, created_order, strict=False):
self.assertEqual(reqd_item, created_item.item_code)
@timeout
@@ -383,7 +380,7 @@ class TestBOM(FrappeTestCase):
self.assertEqual(len(reqd_order), len(created_order))
- for reqd_item, created_item in zip(reqd_order, created_order):
+ for reqd_item, created_item in zip(reqd_order, created_order, strict=False):
self.assertEqual(reqd_item.item_code, created_item.item_code)
self.assertEqual(reqd_item.qty, created_item.qty)
self.assertEqual(reqd_item.exploded_qty, created_item.exploded_qty)
@@ -452,9 +449,7 @@ class TestBOM(FrappeTestCase):
test_items = query(txt="_Test")
filtered = query(txt="_Test Item 2")
- self.assertNotEqual(
- len(test_items), len(filtered), msg="Item filtering showing excessive results"
- )
+ self.assertNotEqual(len(test_items), len(filtered), msg="Item filtering showing excessive results")
self.assertTrue(0 < len(filtered) <= 3, msg="Item filtering showing excessive results")
@timeout
@@ -516,7 +511,6 @@ class TestBOM(FrappeTestCase):
@timeout
def test_version_index(self):
-
bom = frappe.new_doc("BOM")
version_index_test_cases = [
@@ -571,7 +565,6 @@ class TestBOM(FrappeTestCase):
@timeout
def test_clear_inpection_quality(self):
-
bom = frappe.copy_doc(test_records[2], ignore_no_copy=True)
bom.docstatus = 0
bom.is_default = 0
@@ -686,9 +679,7 @@ class TestBOM(FrappeTestCase):
bom = make_bom(item=fg_item, raw_materials=[rm_item])
- create_stock_reconciliation(
- item_code=rm_item, warehouse="_Test Warehouse - _TC", qty=100, rate=600
- )
+ create_stock_reconciliation(item_code=rm_item, warehouse="_Test Warehouse - _TC", qty=100, rate=600)
bom.load_from_db()
bom.update_cost()
@@ -699,8 +690,6 @@ class TestBOM(FrappeTestCase):
self.assertFalse(bom.flags.cost_updated)
def test_bom_with_service_item_cost(self):
- from erpnext.stock.doctype.stock_entry.test_stock_entry import make_stock_entry
-
rm_item = make_item(properties={"is_stock_item": 1, "valuation_rate": 1000.0}).name
service_item = make_item(properties={"is_stock_item": 0}).name
@@ -793,7 +782,9 @@ def create_nested_bom(tree, prefix="_Test bom "):
for item_code, subtree in bom_tree.items():
bom_item_code = prefix + item_code
if not frappe.db.exists("Item", bom_item_code):
- frappe.get_doc(doctype="Item", item_code=bom_item_code, item_group="_Test Item Group").insert()
+ frappe.get_doc(
+ doctype="Item", item_code=bom_item_code, item_group="_Test Item Group"
+ ).insert()
create_items(subtree)
create_items(tree)
diff --git a/erpnext/manufacturing/doctype/bom_update_log/bom_update_log.py b/erpnext/manufacturing/doctype/bom_update_log/bom_update_log.py
index e9867468f98..02c43a8beff 100644
--- a/erpnext/manufacturing/doctype/bom_update_log/bom_update_log.py
+++ b/erpnext/manufacturing/doctype/bom_update_log/bom_update_log.py
@@ -1,7 +1,7 @@
# Copyright (c) 2022, Frappe Technologies Pvt. Ltd. and contributors
# For license information, please see license.txt
import json
-from typing import Any, Dict, List, Optional, Tuple, Union
+from typing import Any
import frappe
from frappe import _
@@ -30,9 +30,7 @@ class BOMUpdateLog(Document):
table = DocType("BOM Update Log")
frappe.db.delete(
table,
- filters=(
- (table.modified < (Now() - Interval(days=days))) & (table.update_type == "Update Cost")
- ),
+ filters=((table.modified < (Now() - Interval(days=days))) & (table.update_type == "Update Cost")),
)
def validate(self):
@@ -102,7 +100,7 @@ class BOMUpdateLog(Document):
def run_replace_bom_job(
doc: "BOMUpdateLog",
- boms: Optional[Dict[str, str]] = None,
+ boms: dict[str, str] | None = None,
) -> None:
try:
doc.db_set("status", "In Progress")
@@ -125,8 +123,8 @@ def run_replace_bom_job(
def process_boms_cost_level_wise(
- update_doc: "BOMUpdateLog", parent_boms: List[str] = None
-) -> Union[None, Tuple]:
+ update_doc: "BOMUpdateLog", parent_boms: list[str] | None = None
+) -> None | tuple:
"Queue jobs at the start of new BOM Level in 'Update Cost' Jobs."
current_boms = {}
@@ -159,9 +157,7 @@ def process_boms_cost_level_wise(
handle_exception(update_doc)
-def queue_bom_cost_jobs(
- current_boms_list: List[str], update_doc: "BOMUpdateLog", current_level: int
-) -> None:
+def queue_bom_cost_jobs(current_boms_list: list[str], update_doc: "BOMUpdateLog", current_level: int) -> None:
"Queue batches of 20k BOMs of the same level to process parallelly"
batch_no = 0
@@ -245,8 +241,8 @@ def resume_bom_cost_update_jobs():
def get_processed_current_boms(
- log: Dict[str, Any], bom_batches: Dict[str, Any]
-) -> Tuple[List[str], Dict[str, Any]]:
+ log: dict[str, Any], bom_batches: dict[str, Any]
+) -> tuple[list[str], dict[str, Any]]:
"""
Aggregate all BOMs from BOM Update Batch rows into 'processed_boms' field
and into current boms list.
diff --git a/erpnext/manufacturing/doctype/bom_update_log/bom_updation_utils.py b/erpnext/manufacturing/doctype/bom_update_log/bom_updation_utils.py
index f013b88e946..fed7a002e75 100644
--- a/erpnext/manufacturing/doctype/bom_update_log/bom_updation_utils.py
+++ b/erpnext/manufacturing/doctype/bom_update_log/bom_updation_utils.py
@@ -4,7 +4,7 @@
import copy
import json
from collections import defaultdict
-from typing import TYPE_CHECKING, Any, Dict, List, Optional, Union
+from typing import TYPE_CHECKING, Any
if TYPE_CHECKING:
from erpnext.manufacturing.doctype.bom_update_log.bom_update_log import BOMUpdateLog
@@ -13,7 +13,7 @@ import frappe
from frappe import _
-def replace_bom(boms: Dict, log_name: str) -> None:
+def replace_bom(boms: dict, log_name: str) -> None:
"Replace current BOM with new BOM in parent BOMs."
current_bom = boms.get("current_bom")
@@ -43,9 +43,7 @@ def replace_bom(boms: Dict, log_name: str) -> None:
bom_obj.save_version()
-def update_cost_in_level(
- doc: "BOMUpdateLog", bom_list: List[str], batch_name: Union[int, str]
-) -> None:
+def update_cost_in_level(doc: "BOMUpdateLog", bom_list: list[str], batch_name: int | str) -> None:
"Updates Cost for BOMs within a given level. Runs via background jobs."
try:
@@ -69,7 +67,7 @@ def update_cost_in_level(
frappe.db.commit() # nosemgrep
-def get_ancestor_boms(new_bom: str, bom_list: Optional[List] = None) -> List:
+def get_ancestor_boms(new_bom: str, bom_list: list | None = None) -> list:
"Recursively get all ancestors of BOM."
bom_list = bom_list or []
@@ -101,9 +99,7 @@ def update_new_bom_in_bom_items(unit_cost: float, current_bom: str, new_bom: str
.set(bom_item.bom_no, new_bom)
.set(bom_item.rate, unit_cost)
.set(bom_item.amount, (bom_item.stock_qty * unit_cost))
- .where(
- (bom_item.bom_no == current_bom) & (bom_item.docstatus < 2) & (bom_item.parenttype == "BOM")
- )
+ .where((bom_item.bom_no == current_bom) & (bom_item.docstatus < 2) & (bom_item.parenttype == "BOM"))
).run()
@@ -116,7 +112,7 @@ def get_bom_unit_cost(bom_name: str) -> float:
return frappe.utils.flt(new_bom_unitcost[0][0])
-def update_cost_in_boms(bom_list: List[str]) -> None:
+def update_cost_in_boms(bom_list: list[str]) -> None:
"Updates cost in given BOMs. Returns current and total updated BOMs."
for index, bom in enumerate(bom_list):
@@ -128,9 +124,7 @@ def update_cost_in_boms(bom_list: List[str]) -> None:
frappe.db.commit() # nosemgrep
-def get_next_higher_level_boms(
- child_boms: List[str], processed_boms: Dict[str, bool]
-) -> List[str]:
+def get_next_higher_level_boms(child_boms: list[str], processed_boms: dict[str, bool]) -> list[str]:
"Generate immediate higher level dependants with no unresolved dependencies (children)."
def _all_children_are_processed(parent_bom):
@@ -156,7 +150,7 @@ def get_next_higher_level_boms(
return list(resolved_dependants)
-def get_leaf_boms() -> List[str]:
+def get_leaf_boms() -> list[str]:
"Get BOMs that have no dependencies."
bom = frappe.qb.DocType("BOM")
@@ -209,7 +203,7 @@ def _generate_dependence_map() -> defaultdict:
return child_parent_map, parent_child_map
-def set_values_in_log(log_name: str, values: Dict[str, Any], commit: bool = False) -> None:
+def set_values_in_log(log_name: str, values: dict[str, Any], commit: bool = False) -> None:
"Update BOM Update Log record."
if not values:
diff --git a/erpnext/manufacturing/doctype/bom_update_log/test_bom_update_log.py b/erpnext/manufacturing/doctype/bom_update_log/test_bom_update_log.py
index 30e6f5e2091..13bf69f672f 100644
--- a/erpnext/manufacturing/doctype/bom_update_log/test_bom_update_log.py
+++ b/erpnext/manufacturing/doctype/bom_update_log/test_bom_update_log.py
@@ -81,9 +81,7 @@ class TestBOMUpdateLog(FrappeTestCase):
for item_code in items:
remove_bom(item_code)
- bom_tree = {
- "B-Item A": {"B-Item B": {"B-Item C": {}}, "B-Item D": {"B-Item E": {"B-Item F": {}}}}
- }
+ bom_tree = {"B-Item A": {"B-Item B": {"B-Item C": {}}, "B-Item D": {"B-Item E": {"B-Item F": {}}}}}
root_bom = create_nested_bom(bom_tree, prefix="")
diff --git a/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py b/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py
index d16fcd08326..288b7be35ee 100644
--- a/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py
+++ b/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py
@@ -2,7 +2,7 @@
# For license information, please see license.txt
import json
-from typing import TYPE_CHECKING, Dict, Literal, Optional, Union
+from typing import TYPE_CHECKING, Literal
if TYPE_CHECKING:
from erpnext.manufacturing.doctype.bom_update_log.bom_update_log import BOMUpdateLog
@@ -16,9 +16,7 @@ class BOMUpdateTool(Document):
@frappe.whitelist()
-def enqueue_replace_bom(
- boms: Optional[Union[Dict, str]] = None, args: Optional[Union[Dict, str]] = None
-) -> "BOMUpdateLog":
+def enqueue_replace_bom(boms: dict | str | None = None, args: dict | str | None = None) -> "BOMUpdateLog":
"""Returns a BOM Update Log (that queues a job) for BOM Replacement."""
boms = boms or args
if isinstance(boms, str):
@@ -48,7 +46,7 @@ def auto_update_latest_price_in_all_boms() -> None:
def create_bom_update_log(
- boms: Optional[Dict[str, str]] = None,
+ boms: dict[str, str] | None = None,
update_type: Literal["Replace BOM", "Update Cost"] = "Replace BOM",
) -> "BOMUpdateLog":
"""Creates a BOM Update Log that handles the background job."""
diff --git a/erpnext/manufacturing/doctype/job_card/job_card.py b/erpnext/manufacturing/doctype/job_card/job_card.py
index 841055e2783..8c562eff83f 100644
--- a/erpnext/manufacturing/doctype/job_card/job_card.py
+++ b/erpnext/manufacturing/doctype/job_card/job_card.py
@@ -2,7 +2,6 @@
# For license information, please see license.txt
import datetime
import json
-from typing import Optional
import frappe
from frappe import _, bold
@@ -52,9 +51,7 @@ class JobCardOverTransferError(frappe.ValidationError):
class JobCard(Document):
def onload(self):
- excess_transfer = frappe.db.get_single_value(
- "Manufacturing Settings", "job_card_excess_transfer"
- )
+ excess_transfer = frappe.db.get_single_value("Manufacturing Settings", "job_card_excess_transfer")
self.set_onload("job_card_excess_transfer", excess_transfer)
self.set_onload("work_order_closed", self.is_work_order_closed())
self.set_onload("has_stock_entry", self.has_stock_entry())
@@ -83,9 +80,7 @@ class JobCard(Document):
wo_qty = flt(frappe.get_cached_value("Work Order", self.work_order, "qty"))
- completed_qty = flt(
- frappe.db.get_value("Work Order Operation", self.operation_id, "completed_qty")
- )
+ completed_qty = flt(frappe.db.get_value("Work Order Operation", self.operation_id, "completed_qty"))
over_production_percentage = flt(
frappe.db.get_single_value("Manufacturing Settings", "overproduction_percentage_for_work_order")
@@ -259,7 +254,7 @@ class JobCard(Document):
return True
return overlap
- def get_workstation_based_on_available_slot(self, existing) -> Optional[str]:
+ def get_workstation_based_on_available_slot(self, existing) -> str | None:
workstations = get_workstations(self.workstation_type)
if workstations:
busy_workstations = [row.workstation for row in existing]
@@ -339,7 +334,9 @@ class JobCard(Document):
# If remaining time fit in workstation time logs else split hours as per workstation time
if time_in_mins > row.remaining_time_in_mins:
- row.planned_end_time = add_to_date(row.planned_start_time, minutes=row.remaining_time_in_mins)
+ row.planned_end_time = add_to_date(
+ row.planned_start_time, minutes=row.remaining_time_in_mins
+ )
row.remaining_time_in_mins = 0
else:
row.planned_end_time = add_to_date(row.planned_start_time, minutes=time_in_mins)
@@ -459,7 +456,9 @@ class JobCard(Document):
row.completed_time = row.completed_time / len(set(operation_deatils.employee))
if operation_deatils.completed_qty:
- row.completed_qty = operation_deatils.completed_qty / len(set(operation_deatils.employee))
+ row.completed_qty = operation_deatils.completed_qty / len(
+ set(operation_deatils.employee)
+ )
else:
row.status = "Pending"
row.completed_time = 0.0
@@ -530,10 +529,7 @@ class JobCard(Document):
)
def validate_job_card(self):
- if (
- self.work_order
- and frappe.get_cached_value("Work Order", self.work_order, "status") == "Stopped"
- ):
+ if self.work_order and frappe.get_cached_value("Work Order", self.work_order, "status") == "Stopped":
frappe.throw(
_("Transaction not allowed against stopped Work Order {0}").format(
get_link_to_form("Work Order", self.work_order)
@@ -552,9 +548,7 @@ class JobCard(Document):
flt(self.total_completed_qty, precision) + flt(self.process_loss_qty, precision)
)
- if self.for_quantity and flt(total_completed_qty, precision) != flt(
- self.for_quantity, precision
- ):
+ if self.for_quantity and flt(total_completed_qty, precision) != flt(self.for_quantity, precision):
total_completed_qty_label = bold(_("Total Completed Qty"))
qty_to_manufacture = bold(_("Qty to Manufacture"))
@@ -588,9 +582,8 @@ class JobCard(Document):
return
for_quantity, time_in_mins, process_loss_qty = 0, 0, 0
- from_time_list, to_time_list = [], []
+ _from_time_list, _to_time_list = [], []
- field = "operation_id"
data = self.get_current_operation_data()
if data and len(data) > 0:
for_quantity = flt(data[0].completed_qty)
@@ -626,9 +619,7 @@ class JobCard(Document):
if wo.produced_qty > for_quantity + process_loss_qty:
first_part_msg = _(
"The {0} {1} is used to calculate the valuation cost for the finished good {2}."
- ).format(
- frappe.bold(_("Job Card")), frappe.bold(self.name), frappe.bold(self.production_item)
- )
+ ).format(frappe.bold(_("Job Card")), frappe.bold(self.name), frappe.bold(self.production_item))
second_part_msg = _(
"Kindly cancel the Manufacturing Entries first against the work order {0}."
@@ -695,9 +686,7 @@ class JobCard(Document):
from frappe.query_builder.functions import Sum
job_card_items_transferred_qty = {}
- job_card_items = [
- x.get("job_card_item") for x in ste_doc.get("items") if x.get("job_card_item")
- ]
+ job_card_items = [x.get("job_card_item") for x in ste_doc.get("items") if x.get("job_card_item")]
if job_card_items:
se = frappe.qb.DocType("Stock Entry")
@@ -822,9 +811,7 @@ class JobCard(Document):
def set_wip_warehouse(self):
if not self.wip_warehouse:
- self.wip_warehouse = frappe.db.get_single_value(
- "Manufacturing Settings", "default_wip_warehouse"
- )
+ self.wip_warehouse = frappe.db.get_single_value("Manufacturing Settings", "default_wip_warehouse")
def validate_operation_id(self):
if (
@@ -864,7 +851,7 @@ class JobCard(Document):
order_by="sequence_id, idx",
)
- message = "Job Card {0}: As per the sequence of the operations in the work order {1}".format(
+ message = "Job Card {}: As per the sequence of the operations in the work order {}".format(
bold(self.name), bold(get_link_to_form("Work Order", self.work_order))
)
@@ -929,7 +916,7 @@ def get_operations(doctype, txt, searchfield, start, page_len, filters):
return []
args = {"parent": filters.get("work_order")}
if txt:
- args["operation"] = ("like", "%{0}%".format(txt))
+ args["operation"] = ("like", f"%{txt}%")
return frappe.get_all(
"Work Order Operation",
@@ -1050,16 +1037,14 @@ def get_job_details(start, end, filters=None):
conditions = get_filters_cond("Job Card", filters, [])
job_cards = frappe.db.sql(
- """ SELECT `tabJob Card`.name, `tabJob Card`.work_order,
+ f""" SELECT `tabJob Card`.name, `tabJob Card`.work_order,
`tabJob Card`.status, ifnull(`tabJob Card`.remarks, ''),
min(`tabJob Card Time Log`.from_time) as from_time,
max(`tabJob Card Time Log`.to_time) as to_time
FROM `tabJob Card` , `tabJob Card Time Log`
WHERE
- `tabJob Card`.name = `tabJob Card Time Log`.parent {0}
- group by `tabJob Card`.name""".format(
- conditions
- ),
+ `tabJob Card`.name = `tabJob Card Time Log`.parent {conditions}
+ group by `tabJob Card`.name""",
as_dict=1,
)
diff --git a/erpnext/manufacturing/doctype/job_card/test_job_card.py b/erpnext/manufacturing/doctype/job_card/test_job_card.py
index e7fbcda7ab0..d9a2046ea59 100644
--- a/erpnext/manufacturing/doctype/job_card/test_job_card.py
+++ b/erpnext/manufacturing/doctype/job_card/test_job_card.py
@@ -59,7 +59,6 @@ class TestJobCard(FrappeTestCase):
frappe.db.rollback()
def test_job_card_operations(self):
-
job_cards = frappe.get_all(
"Job Card", filters={"work_order": self.work_order.name}, fields=["operation_id", "name"]
)
@@ -252,7 +251,6 @@ class TestJobCard(FrappeTestCase):
@change_settings("Manufacturing Settings", {"job_card_excess_transfer": 0})
def test_job_card_excess_material_transfer_block(self):
-
self.transfer_material_against = "Job Card"
self.source_warehouse = "Stores - _TC"
@@ -276,7 +274,6 @@ class TestJobCard(FrappeTestCase):
@change_settings("Manufacturing Settings", {"job_card_excess_transfer": 0})
def test_job_card_excess_material_transfer_with_no_reference(self):
-
self.transfer_material_against = "Job Card"
self.source_warehouse = "Stores - _TC"
diff --git a/erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.py b/erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.py
index 730a8575247..fc885760ef5 100644
--- a/erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.py
+++ b/erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.py
@@ -14,8 +14,7 @@ class ManufacturingSettings(Document):
def get_mins_between_operations():
return relativedelta(
- minutes=cint(frappe.db.get_single_value("Manufacturing Settings", "mins_between_operations"))
- or 10
+ minutes=cint(frappe.db.get_single_value("Manufacturing Settings", "mins_between_operations")) or 10
)
diff --git a/erpnext/manufacturing/doctype/production_plan/production_plan.py b/erpnext/manufacturing/doctype/production_plan/production_plan.py
index 7efc4f75e5b..aedd25a05e0 100644
--- a/erpnext/manufacturing/doctype/production_plan/production_plan.py
+++ b/erpnext/manufacturing/doctype/production_plan/production_plan.py
@@ -311,9 +311,7 @@ class ProductionPlan(Document):
if not self.get("material_requests") or not self.get_so_mr_list(
"material_request", "material_requests"
):
- frappe.throw(
- _("Please fill the Material Requests table"), title=_("Material Requests Required")
- )
+ frappe.throw(_("Please fill the Material Requests table"), title=_("Material Requests Required"))
mr_list = self.get_so_mr_list("material_request", "material_requests")
@@ -591,7 +589,10 @@ class ProductionPlan(Document):
item_dict[(d.item_code, d.material_request_item, d.warehouse)] = item_details
else:
item_details.update(
- {"qty": flt(item_dict.get(key, {}).get("qty")) + (flt(d.planned_qty) - flt(d.ordered_qty))}
+ {
+ "qty": flt(item_dict.get(key, {}).get("qty"))
+ + (flt(d.planned_qty) - flt(d.ordered_qty))
+ }
)
item_dict[key] = item_details
@@ -617,7 +618,7 @@ class ProductionPlan(Document):
def make_work_order_for_finished_goods(self, wo_list, default_warehouses):
items_data = self.get_production_items()
- for key, item in items_data.items():
+ for _key, item in items_data.items():
if self.sub_assembly_items:
item["use_multi_level_bom"] = 0
@@ -753,7 +754,7 @@ class ProductionPlan(Document):
key = "{}:{}:{}".format(item.sales_order, material_request_type, item_doc.customer or "")
schedule_date = item.schedule_date or add_days(nowdate(), cint(item_doc.lead_time_days))
- if not key in material_request_map:
+ if key not in material_request_map:
# make a new MR for the combination
material_request_map[key] = frappe.new_doc("Material Request")
material_request = material_request_map[key]
@@ -803,7 +804,7 @@ class ProductionPlan(Document):
if material_request_list:
material_request_list = [
- """{1}""".format(m.name, m.name)
+ f"""{m.name}"""
for m in material_request_list
]
msgprint(_("{0} created").format(comma_and(material_request_list)))
@@ -929,9 +930,7 @@ class ProductionPlan(Document):
return sub_assembly_items_store
def all_items_completed(self):
- all_items_produced = all(
- flt(d.planned_qty) - flt(d.produced_qty) < 0.000001 for d in self.po_items
- )
+ all_items_produced = all(flt(d.planned_qty) - flt(d.produced_qty) < 0.000001 for d in self.po_items)
if not all_items_produced:
return False
@@ -974,9 +973,7 @@ def download_raw_materials(doc, warehouses=None):
doc.warehouse = None
frappe.flags.show_qty_in_stock_uom = 1
- items = get_items_for_material_requests(
- doc, warehouses=warehouses, get_parent_warehouse_data=True
- )
+ items = get_items_for_material_requests(doc, warehouses=warehouses, get_parent_warehouse_data=True)
for d in items:
item_list.append(
@@ -1020,9 +1017,7 @@ def download_raw_materials(doc, warehouses=None):
build_csv_response(item_list, doc.name)
-def get_exploded_items(
- item_details, company, bom_no, include_non_stock_items, planned_qty=1, doc=None
-):
+def get_exploded_items(item_details, company, bom_no, include_non_stock_items, planned_qty=1, doc=None):
bei = frappe.qb.DocType("BOM Explosion Item")
bom = frappe.qb.DocType("BOM")
item = frappe.qb.DocType("Item")
@@ -1175,11 +1170,7 @@ def get_material_request_items(
elif total_qty > bin_dict.get("projected_qty", 0):
required_qty = total_qty - bin_dict.get("projected_qty", 0)
- if (
- doc.get("consider_minimum_order_qty")
- and required_qty > 0
- and required_qty < row["min_order_qty"]
- ):
+ if doc.get("consider_minimum_order_qty") and required_qty > 0 and required_qty < row["min_order_qty"]:
required_qty = row["min_order_qty"]
item_group_defaults = get_item_group_defaults(row.item_code, company)
@@ -1203,9 +1194,7 @@ def get_material_request_items(
if include_safety_stock:
required_qty += flt(row["safety_stock"])
- item_details = frappe.get_cached_value(
- "Item", row.item_code, ["purchase_uom", "stock_uom"], as_dict=1
- )
+ item_details = frappe.get_cached_value("Item", row.item_code, ["purchase_uom", "stock_uom"], as_dict=1)
conversion_factor = 1.0
if (
@@ -1258,7 +1247,9 @@ def get_sales_orders(self):
& (pi.parent_item == so_item.item_code)
& (
ExistsCriterion(
- frappe.qb.from_(bom).select(bom.name).where((bom.item == pi.item_code) & (bom.is_active == 1))
+ frappe.qb.from_(bom)
+ .select(bom.name)
+ .where((bom.item == pi.item_code) & (bom.is_active == 1))
)
)
)
@@ -1301,7 +1292,7 @@ def get_sales_orders(self):
)
open_so_query = open_so_query.where(
- (ExistsCriterion(open_so_subquery1) | ExistsCriterion(open_so_subquery2))
+ ExistsCriterion(open_so_subquery1) | ExistsCriterion(open_so_subquery2)
)
open_so = open_so_query.run(as_dict=True)
@@ -1423,9 +1414,7 @@ def get_items_for_material_requests(doc, warehouses=None, get_parent_warehouse_d
data["include_exploded_items"] = 1
planned_qty = data.get("required_qty") or data.get("planned_qty")
- ignore_existing_ordered_qty = (
- data.get("ignore_existing_ordered_qty") or ignore_existing_ordered_qty
- )
+ ignore_existing_ordered_qty = data.get("ignore_existing_ordered_qty") or ignore_existing_ordered_qty
warehouse = doc.get("for_warehouse")
item_details = {}
@@ -1458,7 +1447,12 @@ def get_items_for_material_requests(doc, warehouses=None, get_parent_warehouse_d
elif data.get("include_exploded_items") and include_subcontracted_items:
# fetch exploded items from BOM
item_details = get_exploded_items(
- item_details, company, bom_no, include_non_stock_items, planned_qty=planned_qty, doc=doc
+ item_details,
+ company,
+ bom_no,
+ include_non_stock_items,
+ planned_qty=planned_qty,
+ doc=doc,
)
else:
item_details = get_subitems(
@@ -1613,7 +1607,7 @@ def get_item_data(item_code):
return {
"bom_no": item_details.get("bom_no"),
- "stock_uom": item_details.get("stock_uom")
+ "stock_uom": item_details.get("stock_uom"),
# "description": item_details.get("description")
}
@@ -1656,7 +1650,9 @@ def get_sub_assembly_items(bom_no, bom_data, to_produce_qty, company, warehouse=
)
if d.value:
- get_sub_assembly_items(d.value, bom_data, stock_qty, company, warehouse, indent=indent + 1)
+ get_sub_assembly_items(
+ d.value, bom_data, stock_qty, company, warehouse, indent=indent + 1
+ )
def set_default_warehouses(row, default_warehouses):
@@ -1798,9 +1794,7 @@ def get_raw_materials_of_sub_assembly_items(
@frappe.whitelist()
-def sales_order_query(
- doctype=None, txt=None, searchfield=None, start=None, page_len=None, filters=None
-):
+def sales_order_query(doctype=None, txt=None, searchfield=None, start=None, page_len=None, filters=None):
frappe.has_permission("Production Plan", throw=True)
if not filters:
diff --git a/erpnext/manufacturing/doctype/production_plan/test_production_plan.py b/erpnext/manufacturing/doctype/production_plan/test_production_plan.py
index 7e33eb80f7d..31f34a83762 100644
--- a/erpnext/manufacturing/doctype/production_plan/test_production_plan.py
+++ b/erpnext/manufacturing/doctype/production_plan/test_production_plan.py
@@ -110,9 +110,7 @@ class TestProductionPlan(FrappeTestCase):
def test_production_plan_start_date(self):
"Test if Work Order has same Planned Start Date as Prod Plan."
planned_date = add_to_date(date=None, days=3)
- plan = create_production_plan(
- item_code="Test Production Item 1", planned_start_date=planned_date
- )
+ plan = create_production_plan(item_code="Test Production Item 1", planned_start_date=planned_date)
plan.make_work_order()
work_orders = frappe.get_all(
@@ -213,9 +211,7 @@ class TestProductionPlan(FrappeTestCase):
)
wo_doc = frappe.get_doc("Work Order", work_order)
- wo_doc.update(
- {"wip_warehouse": "Work In Progress - _TC", "fg_warehouse": "Finished Goods - _TC"}
- )
+ wo_doc.update({"wip_warehouse": "Work In Progress - _TC", "fg_warehouse": "Finished Goods - _TC"})
wo_doc.submit()
so_wo_qty = frappe.db.get_value("Sales Order Item", sales_order_item, "work_order_qty")
@@ -400,7 +396,7 @@ class TestProductionPlan(FrappeTestCase):
from erpnext.manufacturing.doctype.bom.test_bom import create_nested_bom
bom_tree_1 = {"Test Laptop": {"Test Motherboard": {"Test Motherboard Wires": {}}}}
- bom = create_nested_bom(bom_tree_1, prefix="")
+ create_nested_bom(bom_tree_1, prefix="")
item_doc = frappe.get_doc("Item", "Test Motherboard")
company = "_Test Company"
@@ -504,14 +500,10 @@ class TestProductionPlan(FrappeTestCase):
def test_pp_to_mr_customer_provided(self):
"Test Material Request from Production Plan for Customer Provided Item."
- create_item(
- "CUST-0987", is_customer_provided_item=1, customer="_Test Customer", is_purchase_item=0
- )
+ create_item("CUST-0987", is_customer_provided_item=1, customer="_Test Customer", is_purchase_item=0)
create_item("Production Item CUST")
- for item, raw_materials in {
- "Production Item CUST": ["Raw Material Item 1", "CUST-0987"]
- }.items():
+ for item, raw_materials in {"Production Item CUST": ["Raw Material Item 1", "CUST-0987"]}.items():
if not frappe.db.get_value("BOM", {"item": item}):
make_bom(item=item, raw_materials=raw_materials)
production_plan = create_production_plan(item_code="Production Item CUST")
@@ -664,7 +656,7 @@ class TestProductionPlan(FrappeTestCase):
items_data[(pln.po_items[0].name, item, None)]["qty"] = qty
# Create and Submit Work Order for each item in items_data
- for key, item in items_data.items():
+ for _key, item in items_data.items():
if pln.sub_assembly_items:
item["use_multi_level_bom"] = 0
@@ -833,7 +825,6 @@ class TestProductionPlan(FrappeTestCase):
self.assertEqual(pln.po_items[0].planned_qty, 0.55)
def test_temporary_name_relinking(self):
-
pp = frappe.new_doc("Production Plan")
# this can not be unittested so mocking data that would be expected
@@ -849,7 +840,7 @@ class TestProductionPlan(FrappeTestCase):
pp.append("sub_assembly_items", {"production_plan_item": po_item.temporary_name})
pp._rename_temporary_references()
- for po_item, subassy_item in zip(pp.po_items, pp.sub_assembly_items):
+ for po_item, subassy_item in zip(pp.po_items, pp.sub_assembly_items, strict=False):
self.assertEqual(po_item.name, subassy_item.production_plan_item)
# bad links should be erased
@@ -860,7 +851,7 @@ class TestProductionPlan(FrappeTestCase):
# reattempting on same doc shouldn't change anything
pp._rename_temporary_references()
- for po_item, subassy_item in zip(pp.po_items, pp.sub_assembly_items):
+ for po_item, subassy_item in zip(pp.po_items, pp.sub_assembly_items, strict=False):
self.assertEqual(po_item.name, subassy_item.production_plan_item)
def test_produced_qty_for_multi_level_bom_item(self):
@@ -1137,9 +1128,7 @@ class TestProductionPlan(FrappeTestCase):
wo_doc.fg_warehouse = "_Test Warehouse - _TC"
wo_doc.submit()
- reserved_qty_after_mr = flt(
- frappe.db.get_value("Bin", bin_name, "reserved_qty_for_production_plan")
- )
+ reserved_qty_after_mr = flt(frappe.db.get_value("Bin", bin_name, "reserved_qty_for_production_plan"))
self.assertEqual(reserved_qty_after_mr, before_qty)
def test_from_warehouse_for_purchase_material_request(self):
@@ -1147,7 +1136,7 @@ class TestProductionPlan(FrappeTestCase):
from erpnext.stock.utils import get_or_make_bin
create_item("RM-TEST-123 For Purchase", valuation_rate=100)
- bin_name = get_or_make_bin("RM-TEST-123 For Purchase", "_Test Warehouse - _TC")
+ get_or_make_bin("RM-TEST-123 For Purchase", "_Test Warehouse - _TC")
t_warehouse = create_warehouse("_Test Store - _TC")
make_stock_entry(
item_code="Raw Material Item 1",
@@ -1157,9 +1146,7 @@ class TestProductionPlan(FrappeTestCase):
)
plan = create_production_plan(item_code="Test Production Item 1", do_not_save=1)
- mr_items = get_items_for_material_requests(
- plan.as_dict(), warehouses=[{"warehouse": t_warehouse}]
- )
+ mr_items = get_items_for_material_requests(plan.as_dict(), warehouses=[{"warehouse": t_warehouse}])
for d in mr_items:
plan.append("mr_items", d)
@@ -1457,9 +1444,7 @@ class TestProductionPlan(FrappeTestCase):
)
pln.for_warehouse = rm_warehouse
- items = get_items_for_material_requests(
- pln.as_dict(), warehouses=[{"warehouse": store_warehouse}]
- )
+ items = get_items_for_material_requests(pln.as_dict(), warehouses=[{"warehouse": store_warehouse}])
for row in items:
self.assertEqual(row.get("quantity"), 10.0)
@@ -1468,9 +1453,7 @@ class TestProductionPlan(FrappeTestCase):
self.assertEqual(row.get("from_warehouse"), store_warehouse)
self.assertEqual(row.get("conversion_factor"), 1.0)
- items = get_items_for_material_requests(
- pln.as_dict(), warehouses=[{"warehouse": pln.for_warehouse}]
- )
+ items = get_items_for_material_requests(pln.as_dict(), warehouses=[{"warehouse": pln.for_warehouse}])
for row in items:
self.assertEqual(row.get("quantity"), 1.0)
@@ -1485,7 +1468,7 @@ class TestProductionPlan(FrappeTestCase):
fg_item = make_item(properties={"is_stock_item": 1, "stock_uom": "_Test UOM 1"}).name
rm_item = make_item(properties={"is_stock_item": 1, "stock_uom": "_Test UOM 1"}).name
- store_warehouse = create_warehouse("Store Warehouse", company="_Test Company")
+ create_warehouse("Store Warehouse", company="_Test Company")
rm_warehouse = create_warehouse("RM Warehouse", company="_Test Company")
make_bom(item=fg_item, raw_materials=[rm_item], source_warehouse="_Test Warehouse - _TC")
@@ -1521,7 +1504,6 @@ class TestProductionPlan(FrappeTestCase):
def test_min_order_qty_in_pp(self):
from erpnext.stock.doctype.warehouse.test_warehouse import create_warehouse
- from erpnext.stock.utils import get_or_make_bin
fg_item = make_item(properties={"is_stock_item": 1}).name
rm_item = make_item(properties={"is_stock_item": 1, "min_order_qty": 1000}).name
@@ -1543,9 +1525,6 @@ class TestProductionPlan(FrappeTestCase):
self.assertEqual(d.get("quantity"), 1000.0)
def test_fg_item_quantity(self):
- from erpnext.stock.doctype.warehouse.test_warehouse import create_warehouse
- from erpnext.stock.utils import get_or_make_bin
-
fg_item = make_item(properties={"is_stock_item": 1}).name
rm_item = make_item(properties={"is_stock_item": 1}).name
diff --git a/erpnext/manufacturing/doctype/routing/routing.py b/erpnext/manufacturing/doctype/routing/routing.py
index d4c37cf79e7..701eaeb9ef3 100644
--- a/erpnext/manufacturing/doctype/routing/routing.py
+++ b/erpnext/manufacturing/doctype/routing/routing.py
@@ -32,9 +32,9 @@ class Routing(Document):
row.sequence_id = sequence_id + 1
elif sequence_id and row.sequence_id and cint(sequence_id) > cint(row.sequence_id):
frappe.throw(
- _("At row #{0}: the sequence id {1} cannot be less than previous row sequence id {2}").format(
- row.idx, row.sequence_id, sequence_id
- )
+ _(
+ "At row #{0}: the sequence id {1} cannot be less than previous row sequence id {2}"
+ ).format(row.idx, row.sequence_id, sequence_id)
)
sequence_id = row.sequence_id
diff --git a/erpnext/manufacturing/doctype/work_order/test_work_order.py b/erpnext/manufacturing/doctype/work_order/test_work_order.py
index 8e24d4cd59a..0d4539c5287 100644
--- a/erpnext/manufacturing/doctype/work_order/test_work_order.py
+++ b/erpnext/manufacturing/doctype/work_order/test_work_order.py
@@ -40,7 +40,6 @@ class TestWorkOrder(FrappeTestCase):
frappe.db.rollback()
def check_planned_qty(self):
-
planned0 = (
frappe.db.get_value(
"Bin", {"item_code": "_Test FG Item", "warehouse": "_Test Warehouse 1 - _TC"}, "planned_qty"
@@ -129,9 +128,7 @@ class TestWorkOrder(FrappeTestCase):
# reserved qty for production is updated
self.assertEqual(cint(bin1_at_start.reserved_qty_for_production) + 2, reserved_qty_on_submission)
- test_stock_entry.make_stock_entry(
- item_code="_Test Item", target=warehouse, qty=100, basic_rate=100
- )
+ test_stock_entry.make_stock_entry(item_code="_Test Item", target=warehouse, qty=100, basic_rate=100)
test_stock_entry.make_stock_entry(
item_code="_Test Item Home Desktop 100", target=warehouse, qty=100, basic_rate=100
)
@@ -141,9 +138,7 @@ class TestWorkOrder(FrappeTestCase):
bin1_at_completion = get_bin(item, warehouse)
- self.assertEqual(
- cint(bin1_at_completion.reserved_qty_for_production), reserved_qty_on_submission - 1
- )
+ self.assertEqual(cint(bin1_at_completion.reserved_qty_for_production), reserved_qty_on_submission - 1)
def test_production_item(self):
wo_order = make_wo_order_test_record(item="_Test FG Item", qty=1, do_not_save=True)
@@ -178,9 +173,7 @@ class TestWorkOrder(FrappeTestCase):
cint(self.bin1_at_start.reserved_qty_for_production) + 2,
cint(self.bin1_on_submit.reserved_qty_for_production),
)
- self.assertEqual(
- cint(self.bin1_at_start.projected_qty), cint(self.bin1_on_submit.projected_qty) + 2
- )
+ self.assertEqual(cint(self.bin1_at_start.projected_qty), cint(self.bin1_on_submit.projected_qty) + 2)
def test_reserved_qty_for_production_cancel(self):
self.test_reserved_qty_for_production_submit()
@@ -234,7 +227,6 @@ class TestWorkOrder(FrappeTestCase):
)
def test_reserved_qty_for_production_closed(self):
-
wo1 = make_wo_order_test_record(item="_Test FG Item", qty=2, source_warehouse=self.warehouse)
item = wo1.required_items[0].item_code
bin_before = get_bin(item, self.warehouse)
@@ -366,7 +358,9 @@ class TestWorkOrder(FrappeTestCase):
for item in s.items:
if item.bom_no and item.item_code in scrap_item_details:
self.assertEqual(wo_order_details.scrap_warehouse, item.t_warehouse)
- self.assertEqual(flt(wo_order_details.qty) * flt(scrap_item_details[item.item_code]), item.qty)
+ self.assertEqual(
+ flt(wo_order_details.qty) * flt(scrap_item_details[item.item_code]), item.qty
+ )
def test_allow_overproduction(self):
allow_overproduction("overproduction_percentage_for_work_order", 0)
@@ -480,7 +474,7 @@ class TestWorkOrder(FrappeTestCase):
)
self.assertEqual(len(job_cards), len(bom.operations))
- for i, job_card in enumerate(job_cards):
+ for _i, job_card in enumerate(job_cards):
doc = frappe.get_doc("Job Card", job_card)
doc.time_logs[0].completed_qty = 1
doc.submit()
@@ -571,9 +565,7 @@ class TestWorkOrder(FrappeTestCase):
for item in ["Test Batch Size Item For BOM", "Test Batch Size Item RM 1 For BOM"]:
make_item(item, {"include_item_in_manufacturing": 1, "is_stock_item": 1})
- bom_name = frappe.db.get_value(
- "BOM", {"item": fg_item, "is_active": 1, "with_operations": 1}, "name"
- )
+ bom_name = frappe.db.get_value("BOM", {"item": fg_item, "is_active": 1, "with_operations": 1}, "name")
if not bom_name:
bom = make_bom(item=fg_item, rate=1000, raw_materials=[rm1], do_not_save=True)
@@ -625,9 +617,7 @@ class TestWorkOrder(FrappeTestCase):
make_item(item, item_args)
- bom_name = frappe.db.get_value(
- "BOM", {"item": fg_item, "is_active": 1, "with_operations": 1}, "name"
- )
+ bom_name = frappe.db.get_value("BOM", {"item": fg_item, "is_active": 1, "with_operations": 1}, "name")
if not bom_name:
bom = make_bom(item=fg_item, rate=1000, raw_materials=[rm1], do_not_save=True)
@@ -847,7 +837,6 @@ class TestWorkOrder(FrappeTestCase):
)
qty = 10
- scrap_qty = 0.25 # bom item qty = 1, consider as 25% of FG
source_warehouse = "Stores - _TC"
wip_warehouse = "_Test Warehouse - _TC"
fg_item_non_whole, _, bom_item = create_process_loss_bom_items()
@@ -1189,7 +1178,9 @@ class TestWorkOrder(FrappeTestCase):
for row in stock_entry.items:
if row.item_code == fg_item:
self.assertTrue(row.serial_no)
- self.assertEqual(sorted(get_serial_nos(row.serial_no)), sorted(get_serial_nos(serial_nos)))
+ self.assertEqual(
+ sorted(get_serial_nos(row.serial_no)), sorted(get_serial_nos(serial_nos))
+ )
except frappe.MandatoryError:
self.fail("Batch generation causing failing in Work Order")
@@ -1663,9 +1654,7 @@ class TestWorkOrder(FrappeTestCase):
job_card2 = frappe.copy_doc(job_card_doc)
self.assertRaises(frappe.ValidationError, job_card2.save)
- frappe.db.set_single_value(
- "Manufacturing Settings", "overproduction_percentage_for_work_order", 100
- )
+ frappe.db.set_single_value("Manufacturing Settings", "overproduction_percentage_for_work_order", 100)
job_card2 = frappe.copy_doc(job_card_doc)
job_card2.time_logs = []
@@ -1729,9 +1718,7 @@ class TestWorkOrder(FrappeTestCase):
def test_op_cost_and_scrap_based_on_sub_assemblies(self):
# Make Sub Assembly BOM 1
- frappe.db.set_single_value(
- "Manufacturing Settings", "set_op_cost_and_scrape_from_sub_assemblies", 1
- )
+ frappe.db.set_single_value("Manufacturing Settings", "set_op_cost_and_scrape_from_sub_assemblies", 1)
items = {
"Test Final FG Item": 0,
@@ -1747,7 +1734,7 @@ class TestWorkOrder(FrappeTestCase):
if not frappe.db.exists("Item", item):
item_properties = {"is_stock_item": 1, "valuation_rate": items[item]}
- make_item(item_code=item, properties=item_properties),
+ (make_item(item_code=item, properties=item_properties),)
prepare_boms_for_sub_assembly_test()
@@ -1768,15 +1755,11 @@ class TestWorkOrder(FrappeTestCase):
if item.is_scrap_item:
scrap_items.append(item.item_code)
- self.assertEqual(
- sorted(scrap_items), sorted(["Test Final Scrap Item 1", "Test Final Scrap Item 2"])
- )
+ self.assertEqual(sorted(scrap_items), sorted(["Test Final Scrap Item 1", "Test Final Scrap Item 2"]))
for row in se_doc.additional_costs:
self.assertEqual(row.amount, 3000)
- frappe.db.set_single_value(
- "Manufacturing Settings", "set_op_cost_and_scrape_from_sub_assemblies", 0
- )
+ frappe.db.set_single_value("Manufacturing Settings", "set_op_cost_and_scrape_from_sub_assemblies", 0)
def test_capcity_planning_for_workstation(self):
frappe.db.set_single_value(
diff --git a/erpnext/manufacturing/doctype/work_order/work_order.py b/erpnext/manufacturing/doctype/work_order/work_order.py
index abaec0f9d4c..6bb03310389 100644
--- a/erpnext/manufacturing/doctype/work_order/work_order.py
+++ b/erpnext/manufacturing/doctype/work_order/work_order.py
@@ -154,9 +154,7 @@ class WorkOrder(Document):
def set_default_warehouse(self):
if not self.wip_warehouse and not self.skip_transfer:
- self.wip_warehouse = frappe.db.get_single_value(
- "Manufacturing Settings", "default_wip_warehouse"
- )
+ self.wip_warehouse = frappe.db.get_single_value("Manufacturing Settings", "default_wip_warehouse")
if not self.fg_warehouse:
self.fg_warehouse = frappe.db.get_single_value("Manufacturing Settings", "default_fg_warehouse")
@@ -216,9 +214,7 @@ class WorkOrder(Document):
so_qty = flt(so_item_qty) + flt(dnpi_qty)
allowance_percentage = flt(
- frappe.db.get_single_value(
- "Manufacturing Settings", "overproduction_percentage_for_sales_order"
- )
+ frappe.db.get_single_value("Manufacturing Settings", "overproduction_percentage_for_sales_order")
)
if total_qty > so_qty + (allowance_percentage / 100 * so_qty):
@@ -354,9 +350,7 @@ class WorkOrder(Document):
produced_qty = total_qty[0][0] if total_qty else 0
self.update_status()
- production_plan.run_method(
- "update_produced_pending_qty", produced_qty, self.production_plan_item
- )
+ production_plan.run_method("update_produced_pending_qty", produced_qty, self.production_plan_item)
def before_submit(self):
self.create_serial_no_batch_no()
@@ -534,9 +528,7 @@ class WorkOrder(Document):
get_datetime(self.operations[idx - 1].planned_end_time) + get_mins_between_operations()
)
- row.planned_end_time = get_datetime(row.planned_start_time) + relativedelta(
- minutes=row.time_in_mins
- )
+ row.planned_end_time = get_datetime(row.planned_start_time) + relativedelta(minutes=row.time_in_mins)
if row.planned_start_time == row.planned_end_time:
frappe.throw(_("Capacity Planning Error, planned start time can not be same as end time"))
@@ -603,11 +595,7 @@ class WorkOrder(Document):
)
def update_ordered_qty(self):
- if (
- self.production_plan
- and self.production_plan_item
- and not self.production_plan_sub_assembly_item
- ):
+ if self.production_plan and self.production_plan_item and not self.production_plan_sub_assembly_item:
table = frappe.qb.DocType("Work Order")
query = (
@@ -647,11 +635,9 @@ class WorkOrder(Document):
cond = "product_bundle_item = %s" if self.product_bundle_item else "production_item = %s"
qty = frappe.db.sql(
- """ select sum(qty) from
- `tabWork Order` where sales_order = %s and docstatus = 1 and {0}
- """.format(
- cond
- ),
+ f""" select sum(qty) from
+ `tabWork Order` where sales_order = %s and docstatus = 1 and {cond}
+ """,
(self.sales_order, (self.product_bundle_item or self.production_item)),
as_list=1,
)
@@ -801,9 +787,7 @@ class WorkOrder(Document):
def set_actual_dates(self):
if self.get("operations"):
- actual_start_dates = [
- d.actual_start_time for d in self.get("operations") if d.actual_start_time
- ]
+ actual_start_dates = [d.actual_start_time for d in self.get("operations") if d.actual_start_time]
if actual_start_dates:
self.actual_start_date = min(actual_start_dates)
@@ -848,11 +832,7 @@ class WorkOrder(Document):
if not self.qty > 0:
frappe.throw(_("Quantity to Manufacture must be greater than 0."))
- if (
- self.production_plan
- and self.production_plan_item
- and not self.production_plan_sub_assembly_item
- ):
+ if self.production_plan and self.production_plan_item and not self.production_plan_sub_assembly_item:
qty_dict = frappe.db.get_value(
"Production Plan Item", self.production_plan_item, ["planned_qty", "ordered_qty"], as_dict=1
)
@@ -988,7 +968,7 @@ class WorkOrder(Document):
query = (
frappe.qb.from_(ste)
.inner_join(ste_child)
- .on((ste_child.parent == ste.name))
+ .on(ste_child.parent == ste.name)
.select(
ste_child.item_code,
ste_child.original_item,
@@ -1018,7 +998,7 @@ class WorkOrder(Document):
query = (
frappe.qb.from_(ste)
.inner_join(ste_child)
- .on((ste_child.parent == ste.name))
+ .on(ste_child.parent == ste.name)
.select(
ste_child.item_code,
ste_child.original_item,
@@ -1286,9 +1266,7 @@ def make_stock_entry(work_order_id, purpose, qty=None):
)
if work_order.bom_no:
- stock_entry.inspection_required = frappe.db.get_value(
- "BOM", work_order.bom_no, "inspection_required"
- )
+ stock_entry.inspection_required = frappe.db.get_value("BOM", work_order.bom_no, "inspection_required")
if purpose == "Material Transfer for Manufacture":
stock_entry.to_warehouse = wip_warehouse
@@ -1394,9 +1372,7 @@ def close_work_order(work_order, status):
def split_qty_based_on_batch_size(wo_doc, row, qty):
- if not cint(
- frappe.db.get_value("Operation", row.operation, "create_job_card_based_on_batch_size")
- ):
+ if not cint(frappe.db.get_value("Operation", row.operation, "create_job_card_based_on_batch_size")):
row.batch_size = row.get("qty") or wo_doc.qty
row.job_card_qty = row.batch_size
@@ -1476,9 +1452,7 @@ def create_job_card(work_order, row, enable_capacity_planning=False, auto_create
doc.schedule_time_logs(row)
doc.insert()
- frappe.msgprint(
- _("Job card {0} created").format(get_link_to_form("Job Card", doc.name)), alert=True
- )
+ frappe.msgprint(_("Job card {0} created").format(get_link_to_form("Job Card", doc.name)), alert=True)
if enable_capacity_planning:
# automatically added scheduling rows shouldn't change status to WIP
@@ -1541,7 +1515,7 @@ def create_pick_list(source_name, target_doc=None, for_qty=None):
def get_reserved_qty_for_production(
item_code: str,
warehouse: str,
- non_completed_production_plans: list = None,
+ non_completed_production_plans: list | None = None,
check_production_plan: bool = False,
) -> float:
"""Get total reserved quantity for any item in specified warehouse"""
diff --git a/erpnext/manufacturing/doctype/workstation/workstation.py b/erpnext/manufacturing/doctype/workstation/workstation.py
index 0eb9906a2ab..fe2cbc89b48 100644
--- a/erpnext/manufacturing/doctype/workstation/workstation.py
+++ b/erpnext/manufacturing/doctype/workstation/workstation.py
@@ -88,7 +88,8 @@ class Workstation(Document):
if existing:
frappe.throw(
- _("Row #{0}: Timings conflicts with row {1}").format(d.idx, comma_and(existing)), OverlapError
+ _("Row #{0}: Timings conflicts with row {1}").format(d.idx, comma_and(existing)),
+ OverlapError,
)
def update_bom_operation(self):
@@ -128,10 +129,7 @@ def get_default_holiday_list():
def check_if_within_operating_hours(workstation, operation, from_datetime, to_datetime):
if from_datetime and to_datetime:
-
- if not cint(
- frappe.db.get_value("Manufacturing Settings", "None", "allow_production_on_holidays")
- ):
+ if not cint(frappe.db.get_value("Manufacturing Settings", "None", "allow_production_on_holidays")):
check_workstation_for_holiday(workstation, from_datetime, to_datetime)
if not cint(frappe.db.get_value("Manufacturing Settings", None, "allow_overtime")):
@@ -174,7 +172,9 @@ def check_workstation_for_holiday(workstation, from_datetime, to_datetime):
if applicable_holidays:
frappe.throw(
- _("Workstation is closed on the following dates as per Holiday List: {0}").format(holiday_list)
+ _("Workstation is closed on the following dates as per Holiday List: {0}").format(
+ holiday_list
+ )
+ "\n"
+ "\n".join(applicable_holidays),
WorkstationHolidayError,
diff --git a/erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py b/erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py
index 550445c1f77..6bc05a468f1 100644
--- a/erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py
+++ b/erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py
@@ -33,9 +33,7 @@ def get_report_data(last_purchase_rate, required_qty, row, manufacture_details):
row.item_code,
row.description,
comma_and(manufacture_details.get(row.item_code, {}).get("manufacturer", []), add_quotes=False),
- comma_and(
- manufacture_details.get(row.item_code, {}).get("manufacturer_part", []), add_quotes=False
- ),
+ comma_and(manufacture_details.get(row.item_code, {}).get("manufacturer_part", []), add_quotes=False),
qty_per_unit,
row.actual_qty,
required_qty,
diff --git a/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py b/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py
index 3573a3a93d8..48ffbac5820 100644
--- a/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py
+++ b/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py
@@ -44,9 +44,7 @@ def get_bom_stock(filters):
else:
bom_item_table = "BOM Item"
- warehouse_details = frappe.db.get_value(
- "Warehouse", filters.get("warehouse"), ["lft", "rgt"], as_dict=1
- )
+ warehouse_details = frappe.db.get_value("Warehouse", filters.get("warehouse"), ["lft", "rgt"], as_dict=1)
BOM = frappe.qb.DocType("BOM")
BOM_ITEM = frappe.qb.DocType(bom_item_table)
diff --git a/erpnext/manufacturing/report/cost_of_poor_quality_report/cost_of_poor_quality_report.py b/erpnext/manufacturing/report/cost_of_poor_quality_report/cost_of_poor_quality_report.py
index 481fe51d739..a86df319441 100644
--- a/erpnext/manufacturing/report/cost_of_poor_quality_report/cost_of_poor_quality_report.py
+++ b/erpnext/manufacturing/report/cost_of_poor_quality_report/cost_of_poor_quality_report.py
@@ -20,9 +20,7 @@ def get_data(report_filters):
job_card = frappe.qb.DocType("Job Card")
- operating_cost = ((job_card.hour_rate) * (job_card.total_time_in_mins) / 60.0).as_(
- "operating_cost"
- )
+ operating_cost = ((job_card.hour_rate) * (job_card.total_time_in_mins) / 60.0).as_("operating_cost")
item_code = (job_card.production_item).as_("item_code")
query = (
@@ -64,7 +62,7 @@ def append_filters(query, report_filters, operations, job_card):
):
if report_filters.get(field):
if field == "serial_no":
- query = query.where(job_card[field].like("%{}%".format(report_filters.get(field))))
+ query = query.where(job_card[field].like(f"%{report_filters.get(field)}%"))
elif field == "operation":
query = query.where(job_card[field].isin(operations))
else:
diff --git a/erpnext/manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.py b/erpnext/manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.py
index d3bce831551..26b933c52dd 100644
--- a/erpnext/manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.py
+++ b/erpnext/manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.py
@@ -15,9 +15,9 @@ def execute(filters=None):
return ForecastingReport(filters).execute_report()
-class ExponentialSmoothingForecast(object):
+class ExponentialSmoothingForecast:
def forecast_future_data(self):
- for key, value in self.period_wise_data.items():
+ for _key, value in self.period_wise_data.items():
forecast_data = []
for period in self.period_list:
forecast_key = "forecast_" + period.key
@@ -183,7 +183,6 @@ class ForecastingReport(ExponentialSmoothingForecast):
"Half-Yearly",
"Quarterly",
] or period.from_date >= getdate(self.filters.from_date):
-
forecast_key = period.key
label = _(period.label)
if period.from_date >= getdate(self.filters.from_date):
diff --git a/erpnext/manufacturing/report/process_loss_report/process_loss_report.py b/erpnext/manufacturing/report/process_loss_report/process_loss_report.py
index c3dd9cf9b1a..51efc6e655f 100644
--- a/erpnext/manufacturing/report/process_loss_report/process_loss_report.py
+++ b/erpnext/manufacturing/report/process_loss_report/process_loss_report.py
@@ -1,7 +1,6 @@
# Copyright (c) 2013, Frappe Technologies Pvt. Ltd. and contributors
# For license information, please see license.txt
-from typing import Dict, List, Tuple
import frappe
from frappe import _
@@ -9,12 +8,12 @@ from frappe.query_builder.functions import Sum
Filters = frappe._dict
Row = frappe._dict
-Data = List[Row]
-Columns = List[Dict[str, str]]
-QueryArgs = Dict[str, str]
+Data = list[Row]
+Columns = list[dict[str, str]]
+QueryArgs = dict[str, str]
-def execute(filters: Filters) -> Tuple[Columns, Data]:
+def execute(filters: Filters) -> tuple[Columns, Data]:
filters = frappe._dict(filters or {})
columns = get_columns()
data = get_data(filters)
diff --git a/erpnext/manufacturing/report/production_analytics/production_analytics.py b/erpnext/manufacturing/report/production_analytics/production_analytics.py
index 12b5d19ba87..c02c1e6fcd3 100644
--- a/erpnext/manufacturing/report/production_analytics/production_analytics.py
+++ b/erpnext/manufacturing/report/production_analytics/production_analytics.py
@@ -20,13 +20,10 @@ def get_columns(filters):
ranges = get_period_date_ranges(filters)
- for dummy, end_date in ranges:
-
+ for _dummy, end_date in ranges:
period = get_period(end_date, filters)
- columns.append(
- {"label": _(period), "fieldname": scrub(period), "fieldtype": "Float", "width": 120}
- )
+ columns.append({"label": _(period), "fieldname": scrub(period), "fieldtype": "Float", "width": 120})
return columns
@@ -110,7 +107,7 @@ def get_data(filters, columns):
for label in labels:
work = {}
work["Status"] = label
- for dummy, end_date in ranges:
+ for _dummy, end_date in ranges:
period = get_period(end_date, filters)
if periodic_data.get(label).get(period):
work[scrub(period)] = periodic_data.get(label).get(period)
diff --git a/erpnext/manufacturing/report/production_plan_summary/production_plan_summary.py b/erpnext/manufacturing/report/production_plan_summary/production_plan_summary.py
index 076690ff090..5bc9236c1d5 100644
--- a/erpnext/manufacturing/report/production_plan_summary/production_plan_summary.py
+++ b/erpnext/manufacturing/report/production_plan_summary/production_plan_summary.py
@@ -56,14 +56,10 @@ def get_production_plan_item_details(filters, data, order_details):
}
)
- get_production_plan_sub_assembly_item_details(
- filters, row, production_plan_doc, data, order_details
- )
+ get_production_plan_sub_assembly_item_details(filters, row, production_plan_doc, data, order_details)
-def get_production_plan_sub_assembly_item_details(
- filters, row, production_plan_doc, data, order_details
-):
+def get_production_plan_sub_assembly_item_details(filters, row, production_plan_doc, data, order_details):
for item in production_plan_doc.sub_assembly_items:
if row.name == item.production_plan_item:
subcontracted_item = item.type_of_manufacturing == "Subcontract"
@@ -76,7 +72,9 @@ def get_production_plan_sub_assembly_item_details(
)
else:
docname = frappe.get_value(
- "Work Order", {"production_plan_sub_assembly_item": item.name, "docstatus": ("<", 2)}, "name"
+ "Work Order",
+ {"production_plan_sub_assembly_item": item.name, "docstatus": ("<", 2)},
+ "name",
)
data.append(
@@ -88,7 +86,9 @@ def get_production_plan_sub_assembly_item_details(
"document_type": "Work Order" if not subcontracted_item else "Purchase Order",
"document_name": docname or "",
"bom_level": item.bom_level,
- "produced_qty": order_details.get((docname, item.production_item), {}).get("produced_qty", 0),
+ "produced_qty": order_details.get((docname, item.production_item), {}).get(
+ "produced_qty", 0
+ ),
"pending_qty": flt(item.qty)
- flt(order_details.get((docname, item.production_item), {}).get("produced_qty", 0)),
}
diff --git a/erpnext/manufacturing/report/production_planning_report/production_planning_report.py b/erpnext/manufacturing/report/production_planning_report/production_planning_report.py
index 109d9ab656b..63af3e5cbe6 100644
--- a/erpnext/manufacturing/report/production_planning_report/production_planning_report.py
+++ b/erpnext/manufacturing/report/production_planning_report/production_planning_report.py
@@ -13,7 +13,7 @@ def execute(filters=None):
return ProductionPlanReport(filters).execute_report()
-class ProductionPlanReport(object):
+class ProductionPlanReport:
def __init__(self, filters=None):
self.filters = frappe._dict(filters or {})
self.raw_materials_dict = {}
@@ -79,7 +79,10 @@ class ProductionPlanReport(object):
query = query.where(child.parent.isin(self.filters.docnames))
if doctype == "Sales Order":
- query = query.select(child.delivery_date, parent.base_grand_total,).where(
+ query = query.select(
+ child.delivery_date,
+ parent.base_grand_total,
+ ).where(
(child.stock_qty > child.produced_qty)
& (parent.per_delivered < 100.0)
& (parent.status.notin(["Completed", "Closed"]))
@@ -91,7 +94,9 @@ class ProductionPlanReport(object):
query = query.orderby(parent.base_grand_total, order=Order.desc)
elif doctype == "Material Request":
- query = query.select(child.schedule_date,).where(
+ query = query.select(
+ child.schedule_date,
+ ).where(
(parent.per_ordered < 100)
& (parent.material_request_type == "Manufacture")
& (parent.status != "Stopped")
@@ -280,9 +285,7 @@ class ProductionPlanReport(object):
d.remaining_qty = d.required_qty
self.pick_materials_from_warehouses(d, data, warehouses)
- if (
- d.remaining_qty and self.filters.raw_material_warehouse and d.remaining_qty != d.required_qty
- ):
+ if d.remaining_qty and self.filters.raw_material_warehouse and d.remaining_qty != d.required_qty:
row = self.get_args()
d.warehouse = self.filters.raw_material_warehouse
d.required_qty = d.remaining_qty
diff --git a/erpnext/manufacturing/report/test_reports.py b/erpnext/manufacturing/report/test_reports.py
index e436fdca646..3e20f310ff9 100644
--- a/erpnext/manufacturing/report/test_reports.py
+++ b/erpnext/manufacturing/report/test_reports.py
@@ -1,5 +1,4 @@
import unittest
-from typing import List, Tuple
import frappe
@@ -13,7 +12,7 @@ DEFAULT_FILTERS = {
}
-REPORT_FILTER_TEST_CASES: List[Tuple[ReportName, ReportFilters]] = [
+REPORT_FILTER_TEST_CASES: list[tuple[ReportName, ReportFilters]] = [
("BOM Explorer", {"bom": frappe.get_last_doc("BOM").name}),
("BOM Operations Time", {}),
("BOM Stock Calculated", {"bom": frappe.get_last_doc("BOM").name, "qty_to_make": 2}),
diff --git a/erpnext/manufacturing/report/work_order_consumed_materials/work_order_consumed_materials.py b/erpnext/manufacturing/report/work_order_consumed_materials/work_order_consumed_materials.py
index 14e97d3dd78..64363e20e39 100644
--- a/erpnext/manufacturing/report/work_order_consumed_materials/work_order_consumed_materials.py
+++ b/erpnext/manufacturing/report/work_order_consumed_materials/work_order_consumed_materials.py
@@ -22,7 +22,7 @@ def get_data(report_filters):
wo_items = {}
work_orders = frappe.get_all("Work Order", filters=filters, fields=fields)
- returned_materials = get_returned_materials(work_orders)
+ get_returned_materials(work_orders)
for d in work_orders:
d.extra_consumed_qty = 0.0
@@ -33,7 +33,7 @@ def get_data(report_filters):
wo_items.setdefault((d.name, d.production_item), []).append(d)
data = []
- for key, wo_data in wo_items.items():
+ for _key, wo_data in wo_items.items():
for index, row in enumerate(wo_data):
if index != 0:
# If one work order has multiple raw materials then show parent data in the first row only
diff --git a/erpnext/patches/v10_0/item_barcode_childtable_migrate.py b/erpnext/patches/v10_0/item_barcode_childtable_migrate.py
index e2d0943d724..b98e7ab4bf6 100644
--- a/erpnext/patches/v10_0/item_barcode_childtable_migrate.py
+++ b/erpnext/patches/v10_0/item_barcode_childtable_migrate.py
@@ -12,9 +12,7 @@ def execute():
if "barcode" not in frappe.db.get_table_columns("Item"):
return
- items_barcode = frappe.db.sql(
- "select name, barcode from tabItem where barcode is not null", as_dict=True
- )
+ items_barcode = frappe.db.sql("select name, barcode from tabItem where barcode is not null", as_dict=True)
frappe.reload_doc("stock", "doctype", "item")
for item in items_barcode:
diff --git a/erpnext/patches/v10_0/set_currency_in_pricing_rule.py b/erpnext/patches/v10_0/set_currency_in_pricing_rule.py
index d68148eec1c..08f5ed166ab 100644
--- a/erpnext/patches/v10_0/set_currency_in_pricing_rule.py
+++ b/erpnext/patches/v10_0/set_currency_in_pricing_rule.py
@@ -9,6 +9,4 @@ def execute():
if doc.company:
currency = frappe.get_cached_value("Company", doc.company, "default_currency")
- frappe.db.sql(
- """update `tabPricing Rule` set currency = %s where name = %s""", (currency, doc.name)
- )
+ frappe.db.sql("""update `tabPricing Rule` set currency = %s where name = %s""", (currency, doc.name))
diff --git a/erpnext/patches/v10_1/transfer_subscription_to_auto_repeat.py b/erpnext/patches/v10_1/transfer_subscription_to_auto_repeat.py
index 87151c102b1..375c0109fc8 100644
--- a/erpnext/patches/v10_1/transfer_subscription_to_auto_repeat.py
+++ b/erpnext/patches/v10_1/transfer_subscription_to_auto_repeat.py
@@ -52,7 +52,6 @@ def drop_columns_from_subscription():
"status",
"amended_from",
]:
-
if field in frappe.db.get_table_columns("Subscription"):
fields_to_drop["Subscription"].append(field)
diff --git a/erpnext/patches/v11_0/create_department_records_for_each_company.py b/erpnext/patches/v11_0/create_department_records_for_each_company.py
index 84be2bee9dc..a4ba154b3e5 100644
--- a/erpnext/patches/v11_0/create_department_records_for_each_company.py
+++ b/erpnext/patches/v11_0/create_department_records_for_each_company.py
@@ -53,11 +53,10 @@ def update_records(doctype, comp_dict):
for department in records:
when_then.append(
- """
- WHEN company = "%s" and department = "%s"
- THEN "%s"
+ f"""
+ WHEN company = "{company}" and department = "{department}"
+ THEN "{records[department]}"
"""
- % (company, department, records[department])
)
if not when_then:
@@ -66,11 +65,10 @@ def update_records(doctype, comp_dict):
frappe.db.sql(
"""
update
- `tab%s`
+ `tab{}`
set
- department = CASE %s END
- """
- % (doctype, " ".join(when_then))
+ department = CASE {} END
+ """.format(doctype, " ".join(when_then))
)
@@ -83,11 +81,10 @@ def update_instructors(comp_dict):
for department in records:
when_then.append(
- """
- WHEN employee = "%s" and department = "%s"
- THEN "%s"
+ f"""
+ WHEN employee = "{employee.name}" and department = "{department}"
+ THEN "{records[department]}"
"""
- % (employee.name, department, records[department])
)
if not when_then:
diff --git a/erpnext/patches/v11_0/make_italian_localization_fields.py b/erpnext/patches/v11_0/make_italian_localization_fields.py
index 1b9793df80b..05c7b8a1e0c 100644
--- a/erpnext/patches/v11_0/make_italian_localization_fields.py
+++ b/erpnext/patches/v11_0/make_italian_localization_fields.py
@@ -20,19 +20,17 @@ def execute():
# Set state codes
condition = ""
for state, code in state_codes.items():
- condition += " when {0} then {1}".format(frappe.db.escape(state), frappe.db.escape(code))
+ condition += f" when {frappe.db.escape(state)} then {frappe.db.escape(code)}"
if condition:
- condition = "state_code = (case state {0} end),".format(condition)
+ condition = f"state_code = (case state {condition} end),"
frappe.db.sql(
- """
+ f"""
UPDATE tabAddress set {condition} country_code = UPPER(ifnull((select code
from `tabCountry` where name = `tabAddress`.country), ''))
where country_code is null and state_code is null
- """.format(
- condition=condition
- )
+ """
)
frappe.db.sql(
diff --git a/erpnext/patches/v11_0/merge_land_unit_with_location.py b/erpnext/patches/v11_0/merge_land_unit_with_location.py
index c1afef67785..92d0bc90c58 100644
--- a/erpnext/patches/v11_0/merge_land_unit_with_location.py
+++ b/erpnext/patches/v11_0/merge_land_unit_with_location.py
@@ -29,9 +29,9 @@ def execute():
rename_field("Linked Location", "land_unit", "location")
if not frappe.db.exists("Location", "All Land Units"):
- frappe.get_doc(
- {"doctype": "Location", "is_group": True, "location_name": "All Land Units"}
- ).insert(ignore_permissions=True)
+ frappe.get_doc({"doctype": "Location", "is_group": True, "location_name": "All Land Units"}).insert(
+ ignore_permissions=True
+ )
if frappe.db.table_exists("Land Unit"):
land_units = frappe.get_all("Land Unit", fields=["*"], order_by="lft")
diff --git a/erpnext/patches/v11_0/move_item_defaults_to_child_table_for_multicompany.py b/erpnext/patches/v11_0/move_item_defaults_to_child_table_for_multicompany.py
index 37c07799ddc..418bb1378d5 100644
--- a/erpnext/patches/v11_0/move_item_defaults_to_child_table_for_multicompany.py
+++ b/erpnext/patches/v11_0/move_item_defaults_to_child_table_for_multicompany.py
@@ -106,8 +106,6 @@ def execute():
`expense_account`, `income_account`, `buying_cost_center`, `selling_cost_center`
)
VALUES {}
- """.format(
- ", ".join(["%s"] * len(to_insert_data))
- ),
+ """.format(", ".join(["%s"] * len(to_insert_data))),
tuple(to_insert_data),
)
diff --git a/erpnext/patches/v11_0/refactor_naming_series.py b/erpnext/patches/v11_0/refactor_naming_series.py
index 9cfb082c1f2..53c293cae81 100644
--- a/erpnext/patches/v11_0/refactor_naming_series.py
+++ b/erpnext/patches/v11_0/refactor_naming_series.py
@@ -124,9 +124,7 @@ def get_series():
def get_series_to_preserve(doctype):
series_to_preserve = frappe.db.sql_list(
- """select distinct naming_series from `tab{doctype}` where ifnull(naming_series, '') != ''""".format(
- doctype=doctype
- )
+ f"""select distinct naming_series from `tab{doctype}` where ifnull(naming_series, '') != ''"""
)
series_to_preserve.sort()
return series_to_preserve
diff --git a/erpnext/patches/v11_0/rename_asset_adjustment_doctype.py b/erpnext/patches/v11_0/rename_asset_adjustment_doctype.py
index c444c16a59b..206e7f5ebef 100644
--- a/erpnext/patches/v11_0/rename_asset_adjustment_doctype.py
+++ b/erpnext/patches/v11_0/rename_asset_adjustment_doctype.py
@@ -6,8 +6,6 @@ import frappe
def execute():
- if frappe.db.table_exists("Asset Adjustment") and not frappe.db.table_exists(
- "Asset Value Adjustment"
- ):
+ if frappe.db.table_exists("Asset Adjustment") and not frappe.db.table_exists("Asset Value Adjustment"):
frappe.rename_doc("DocType", "Asset Adjustment", "Asset Value Adjustment", force=True)
frappe.reload_doc("assets", "doctype", "asset_value_adjustment")
diff --git a/erpnext/patches/v11_0/rename_bom_wo_fields.py b/erpnext/patches/v11_0/rename_bom_wo_fields.py
index fb25eeb6fcc..2132ff31917 100644
--- a/erpnext/patches/v11_0/rename_bom_wo_fields.py
+++ b/erpnext/patches/v11_0/rename_bom_wo_fields.py
@@ -9,9 +9,7 @@ from frappe.model.utils.rename_field import rename_field
def execute():
# updating column value to handle field change from Data to Currency
changed_field = "base_scrap_material_cost"
- frappe.db.sql(
- f"update `tabBOM` set {changed_field} = '0' where trim(coalesce({changed_field}, ''))= ''"
- )
+ frappe.db.sql(f"update `tabBOM` set {changed_field} = '0' where trim(coalesce({changed_field}, ''))= ''")
for doctype in ["BOM Explosion Item", "BOM Item", "Work Order Item", "Item"]:
if frappe.db.has_column(doctype, "allow_transfer_for_manufacture"):
diff --git a/erpnext/patches/v11_0/rename_production_order_to_work_order.py b/erpnext/patches/v11_0/rename_production_order_to_work_order.py
index b58ac4e72f1..31a9c88d4eb 100644
--- a/erpnext/patches/v11_0/rename_production_order_to_work_order.py
+++ b/erpnext/patches/v11_0/rename_production_order_to_work_order.py
@@ -21,14 +21,10 @@ def execute():
rename_field("Timesheet", "production_order", "work_order")
rename_field("Stock Entry", "production_order", "work_order")
- frappe.rename_doc(
- "Report", "Production Orders in Progress", "Work Orders in Progress", force=True
- )
+ frappe.rename_doc("Report", "Production Orders in Progress", "Work Orders in Progress", force=True)
frappe.rename_doc("Report", "Completed Production Orders", "Completed Work Orders", force=True)
frappe.rename_doc("Report", "Open Production Orders", "Open Work Orders", force=True)
frappe.rename_doc(
"Report", "Issued Items Against Production Order", "Issued Items Against Work Order", force=True
)
- frappe.rename_doc(
- "Report", "Production Order Stock Report", "Work Order Stock Report", force=True
- )
+ frappe.rename_doc("Report", "Production Order Stock Report", "Work Order Stock Report", force=True)
diff --git a/erpnext/patches/v11_0/rename_supplier_type_to_supplier_group.py b/erpnext/patches/v11_0/rename_supplier_type_to_supplier_group.py
index 96daba7d368..9aa0d67804d 100644
--- a/erpnext/patches/v11_0/rename_supplier_type_to_supplier_group.py
+++ b/erpnext/patches/v11_0/rename_supplier_type_to_supplier_group.py
@@ -25,10 +25,8 @@ def execute():
def build_tree():
frappe.db.sql(
- """update `tabSupplier Group` set parent_supplier_group = '{0}'
- where is_group = 0""".format(
- _("All Supplier Groups")
- )
+ """update `tabSupplier Group` set parent_supplier_group = '{}'
+ where is_group = 0""".format(_("All Supplier Groups"))
)
if not frappe.db.exists("Supplier Group", _("All Supplier Groups")):
diff --git a/erpnext/patches/v11_0/set_department_for_doctypes.py b/erpnext/patches/v11_0/set_department_for_doctypes.py
index b784772576f..70e9c8cbba6 100644
--- a/erpnext/patches/v11_0/set_department_for_doctypes.py
+++ b/erpnext/patches/v11_0/set_department_for_doctypes.py
@@ -4,7 +4,6 @@ import frappe
def execute():
-
doctypes_to_update = {
"projects": ["Activity Cost", "Timesheet"],
"setup": ["Sales Person"],
diff --git a/erpnext/patches/v11_0/set_update_field_and_value_in_workflow_state.py b/erpnext/patches/v11_0/set_update_field_and_value_in_workflow_state.py
index 548a7cb158c..b6fc1a630a2 100644
--- a/erpnext/patches/v11_0/set_update_field_and_value_in_workflow_state.py
+++ b/erpnext/patches/v11_0/set_update_field_and_value_in_workflow_state.py
@@ -4,7 +4,6 @@ from frappe.model.workflow import get_workflow_name
def execute():
for doctype in ["Expense Claim", "Leave Application"]:
-
active_workflow = get_workflow_name(doctype)
if not active_workflow:
continue
diff --git a/erpnext/patches/v11_0/update_allow_transfer_for_manufacture.py b/erpnext/patches/v11_0/update_allow_transfer_for_manufacture.py
index a7351d27595..3f59747391a 100644
--- a/erpnext/patches/v11_0/update_allow_transfer_for_manufacture.py
+++ b/erpnext/patches/v11_0/update_allow_transfer_for_manufacture.py
@@ -16,12 +16,10 @@ def execute():
frappe.reload_doc("manufacturing", "doctype", frappe.scrub(doctype))
frappe.db.sql(
- """ update `tab{0}` child, tabItem item
+ f""" update `tab{doctype}` child, tabItem item
set
child.include_item_in_manufacturing = 1
where
child.item_code = item.name and ifnull(item.is_stock_item, 0) = 1
- """.format(
- doctype
- )
+ """
)
diff --git a/erpnext/patches/v11_0/update_backflush_subcontract_rm_based_on_bom.py b/erpnext/patches/v11_0/update_backflush_subcontract_rm_based_on_bom.py
index 51ba706dcf0..9d7d4548987 100644
--- a/erpnext/patches/v11_0/update_backflush_subcontract_rm_based_on_bom.py
+++ b/erpnext/patches/v11_0/update_backflush_subcontract_rm_based_on_bom.py
@@ -7,9 +7,7 @@ import frappe
def execute():
frappe.reload_doc("buying", "doctype", "buying_settings")
- frappe.db.set_value(
- "Buying Settings", None, "backflush_raw_materials_of_subcontract_based_on", "BOM"
- )
+ frappe.db.set_value("Buying Settings", None, "backflush_raw_materials_of_subcontract_based_on", "BOM")
frappe.reload_doc("stock", "doctype", "stock_entry_detail")
frappe.db.sql(
diff --git a/erpnext/patches/v11_0/update_department_lft_rgt.py b/erpnext/patches/v11_0/update_department_lft_rgt.py
index 778392ec5fc..9104e36ece8 100644
--- a/erpnext/patches/v11_0/update_department_lft_rgt.py
+++ b/erpnext/patches/v11_0/update_department_lft_rgt.py
@@ -12,10 +12,8 @@ def execute():
).insert(ignore_permissions=True, ignore_mandatory=True)
frappe.db.sql(
- """update `tabDepartment` set parent_department = '{0}'
- where is_group = 0""".format(
- _("All Departments")
- )
+ """update `tabDepartment` set parent_department = '{}'
+ where is_group = 0""".format(_("All Departments"))
)
rebuild_tree("Department", "parent_department")
diff --git a/erpnext/patches/v11_0/update_sales_partner_type.py b/erpnext/patches/v11_0/update_sales_partner_type.py
index 72fd424b245..ced77d97276 100644
--- a/erpnext/patches/v11_0/update_sales_partner_type.py
+++ b/erpnext/patches/v11_0/update_sales_partner_type.py
@@ -16,7 +16,7 @@ def execute():
# get partner type in existing forms (customized)
# and create a document if not created
for d in ["Sales Partner"]:
- partner_type = frappe.db.sql_list("select distinct partner_type from `tab{0}`".format(d))
+ partner_type = frappe.db.sql_list(f"select distinct partner_type from `tab{d}`")
for s in partner_type:
if s and s not in default_sales_partner_type:
insert_sales_partner_type(s)
diff --git a/erpnext/patches/v11_0/update_total_qty_field.py b/erpnext/patches/v11_0/update_total_qty_field.py
index 09fcdb8723d..3ed7c834a46 100644
--- a/erpnext/patches/v11_0/update_total_qty_field.py
+++ b/erpnext/patches/v11_0/update_total_qty_field.py
@@ -24,16 +24,14 @@ def execute():
for doctype in doctypes:
total_qty = frappe.db.sql(
- """
+ f"""
SELECT
parent, SUM(qty) as qty
FROM
- `tab{0} Item`
- where parenttype = '{0}'
+ `tab{doctype} Item`
+ where parenttype = '{doctype}'
GROUP BY parent
- """.format(
- doctype
- ),
+ """,
as_dict=True,
)
@@ -53,13 +51,11 @@ def execute():
# This is probably never used anywhere else as of now, but should be
values = []
for d in batch_transactions:
- values.append("({0}, {1})".format(frappe.db.escape(d.parent), d.qty))
+ values.append(f"({frappe.db.escape(d.parent)}, {d.qty})")
conditions = ",".join(values)
frappe.db.sql(
- """
- INSERT INTO `tab{}` (name, total_qty) VALUES {}
+ f"""
+ INSERT INTO `tab{doctype}` (name, total_qty) VALUES {conditions}
ON DUPLICATE KEY UPDATE name = VALUES(name), total_qty = VALUES(total_qty)
- """.format(
- doctype, conditions
- )
+ """
)
diff --git a/erpnext/patches/v11_1/make_job_card_time_logs.py b/erpnext/patches/v11_1/make_job_card_time_logs.py
index beb2c4e5341..14bc4ee2a6d 100644
--- a/erpnext/patches/v11_1/make_job_card_time_logs.py
+++ b/erpnext/patches/v11_1/make_job_card_time_logs.py
@@ -8,9 +8,7 @@ import frappe
def execute():
frappe.reload_doc("manufacturing", "doctype", "job_card_time_log")
- if frappe.db.table_exists("Job Card") and frappe.get_meta("Job Card").has_field(
- "actual_start_date"
- ):
+ if frappe.db.table_exists("Job Card") and frappe.get_meta("Job Card").has_field("actual_start_date"):
time_logs = []
for d in frappe.get_all(
"Job Card",
@@ -37,9 +35,7 @@ def execute():
`tabJob Card Time Log`
(from_time, to_time, time_in_mins, completed_qty, parent, parenttype, parentfield, name)
values {values}
- """.format(
- values=",".join(["%s"] * len(time_logs))
- ),
+ """.format(values=",".join(["%s"] * len(time_logs))),
tuple(time_logs),
)
diff --git a/erpnext/patches/v11_1/move_customer_lead_to_dynamic_column.py b/erpnext/patches/v11_1/move_customer_lead_to_dynamic_column.py
index b681f25d84e..b4095ee4e84 100644
--- a/erpnext/patches/v11_1/move_customer_lead_to_dynamic_column.py
+++ b/erpnext/patches/v11_1/move_customer_lead_to_dynamic_column.py
@@ -8,14 +8,10 @@ import frappe
def execute():
frappe.reload_doctype("Quotation")
frappe.db.sql(""" UPDATE `tabQuotation` set party_name = lead WHERE quotation_to = 'Lead' """)
- frappe.db.sql(
- """ UPDATE `tabQuotation` set party_name = customer WHERE quotation_to = 'Customer' """
- )
+ frappe.db.sql(""" UPDATE `tabQuotation` set party_name = customer WHERE quotation_to = 'Customer' """)
frappe.reload_doctype("Opportunity")
- frappe.db.sql(
- """ UPDATE `tabOpportunity` set party_name = lead WHERE opportunity_from = 'Lead' """
- )
+ frappe.db.sql(""" UPDATE `tabOpportunity` set party_name = lead WHERE opportunity_from = 'Lead' """)
frappe.db.sql(
""" UPDATE `tabOpportunity` set party_name = customer WHERE opportunity_from = 'Customer' """
)
diff --git a/erpnext/patches/v11_1/set_missing_opportunity_from.py b/erpnext/patches/v11_1/set_missing_opportunity_from.py
index ae5f6200145..fd3bf7ef445 100644
--- a/erpnext/patches/v11_1/set_missing_opportunity_from.py
+++ b/erpnext/patches/v11_1/set_missing_opportunity_from.py
@@ -2,7 +2,6 @@ import frappe
def execute():
-
frappe.reload_doctype("Opportunity")
if frappe.db.has_column("Opportunity", "enquiry_from"):
frappe.db.sql(
@@ -10,9 +9,7 @@ def execute():
where ifnull(opportunity_from, '') = '' and ifnull(enquiry_from, '') != ''"""
)
- if frappe.db.has_column("Opportunity", "lead") and frappe.db.has_column(
- "Opportunity", "enquiry_from"
- ):
+ if frappe.db.has_column("Opportunity", "lead") and frappe.db.has_column("Opportunity", "enquiry_from"):
frappe.db.sql(
""" UPDATE `tabOpportunity` set party_name = lead
where enquiry_from = 'Lead' and ifnull(party_name, '') = '' and ifnull(lead, '') != ''"""
diff --git a/erpnext/patches/v12_0/add_default_buying_selling_terms_in_company.py b/erpnext/patches/v12_0/add_default_buying_selling_terms_in_company.py
index 284b616bbda..0029074da94 100644
--- a/erpnext/patches/v12_0/add_default_buying_selling_terms_in_company.py
+++ b/erpnext/patches/v12_0/add_default_buying_selling_terms_in_company.py
@@ -11,9 +11,7 @@ def execute():
if frappe.db.has_column("Company", "default_terms"):
rename_field("Company", "default_terms", "default_selling_terms")
- for company in frappe.get_all(
- "Company", ["name", "default_selling_terms", "default_buying_terms"]
- ):
+ for company in frappe.get_all("Company", ["name", "default_selling_terms", "default_buying_terms"]):
if company.default_selling_terms and not company.default_buying_terms:
frappe.db.set_value(
"Company", company.name, "default_buying_terms", company.default_selling_terms
diff --git a/erpnext/patches/v12_0/create_accounting_dimensions_in_missing_doctypes.py b/erpnext/patches/v12_0/create_accounting_dimensions_in_missing_doctypes.py
index 744ea1ccd8a..c3bf4a0f39e 100644
--- a/erpnext/patches/v12_0/create_accounting_dimensions_in_missing_doctypes.py
+++ b/erpnext/patches/v12_0/create_accounting_dimensions_in_missing_doctypes.py
@@ -3,7 +3,6 @@ from frappe.custom.doctype.custom_field.custom_field import create_custom_field
def execute():
-
frappe.reload_doc("accounts", "doctype", "accounting_dimension")
accounting_dimensions = frappe.db.sql(
@@ -17,7 +16,6 @@ def execute():
count = 1
for d in accounting_dimensions:
-
if count % 2 == 0:
insert_after_field = "dimension_col_break"
else:
@@ -31,7 +29,6 @@ def execute():
"Expense Claim Detail",
"Expense Taxes and Charges",
]:
-
field = frappe.db.get_value("Custom Field", {"dt": doctype, "fieldname": d.fieldname})
if field:
diff --git a/erpnext/patches/v12_0/create_irs_1099_field_united_states.py b/erpnext/patches/v12_0/create_irs_1099_field_united_states.py
index 80e9047cf06..8c7f6bd225f 100644
--- a/erpnext/patches/v12_0/create_irs_1099_field_united_states.py
+++ b/erpnext/patches/v12_0/create_irs_1099_field_united_states.py
@@ -4,7 +4,6 @@ from erpnext.regional.united_states.setup import make_custom_fields
def execute():
-
frappe.reload_doc("accounts", "doctype", "allowed_to_transact_with", force=True)
frappe.reload_doc("accounts", "doctype", "pricing_rule_detail", force=True)
frappe.reload_doc("crm", "doctype", "lost_reason_detail", force=True)
diff --git a/erpnext/patches/v12_0/fix_quotation_expired_status.py b/erpnext/patches/v12_0/fix_quotation_expired_status.py
index 285183bfa25..5d9c8102481 100644
--- a/erpnext/patches/v12_0/fix_quotation_expired_status.py
+++ b/erpnext/patches/v12_0/fix_quotation_expired_status.py
@@ -16,9 +16,7 @@ def execute():
and qo.valid_till < so.transaction_date""" # check if SO was created after quotation expired
frappe.db.sql(
- """UPDATE `tabQuotation` qo SET qo.status = 'Expired' WHERE {cond} and exists({invalid_so_against_quo})""".format(
- cond=cond, invalid_so_against_quo=invalid_so_against_quo
- )
+ f"""UPDATE `tabQuotation` qo SET qo.status = 'Expired' WHERE {cond} and exists({invalid_so_against_quo})"""
)
valid_so_against_quo = """
@@ -31,7 +29,5 @@ def execute():
and qo.valid_till >= so.transaction_date""" # check if SO was created before quotation expired
frappe.db.sql(
- """UPDATE `tabQuotation` qo SET qo.status = 'Closed' WHERE {cond} and exists({valid_so_against_quo})""".format(
- cond=cond, valid_so_against_quo=valid_so_against_quo
- )
+ f"""UPDATE `tabQuotation` qo SET qo.status = 'Closed' WHERE {cond} and exists({valid_so_against_quo})"""
)
diff --git a/erpnext/patches/v12_0/make_item_manufacturer.py b/erpnext/patches/v12_0/make_item_manufacturer.py
index 3f233659d01..67d6f974005 100644
--- a/erpnext/patches/v12_0/make_item_manufacturer.py
+++ b/erpnext/patches/v12_0/make_item_manufacturer.py
@@ -30,8 +30,6 @@ def execute():
"""
INSERT INTO `tabItem Manufacturer`
(`name`, `item_code`, `manufacturer`, `manufacturer_part_no`, `creation`, `owner`)
- VALUES {}""".format(
- ", ".join(["%s"] * len(item_manufacturer))
- ),
+ VALUES {}""".format(", ".join(["%s"] * len(item_manufacturer))),
tuple(item_manufacturer),
)
diff --git a/erpnext/patches/v12_0/move_bank_account_swift_number_to_bank.py b/erpnext/patches/v12_0/move_bank_account_swift_number_to_bank.py
index 671dfd116d2..e6f522b8c94 100644
--- a/erpnext/patches/v12_0/move_bank_account_swift_number_to_bank.py
+++ b/erpnext/patches/v12_0/move_bank_account_swift_number_to_bank.py
@@ -16,7 +16,7 @@ def execute():
SET b.swift_number = ba.swift_number WHERE b.name = ba.bank
"""
)
- except Exception as e:
+ except Exception:
frappe.log_error("Bank to Bank Account patch migration failed")
frappe.reload_doc("accounts", "doctype", "bank_account")
diff --git a/erpnext/patches/v12_0/move_credit_limit_to_customer_credit_limit.py b/erpnext/patches/v12_0/move_credit_limit_to_customer_credit_limit.py
index 17c1966624e..67fe5db516e 100644
--- a/erpnext/patches/v12_0/move_credit_limit_to_customer_credit_limit.py
+++ b/erpnext/patches/v12_0/move_credit_limit_to_customer_credit_limit.py
@@ -29,12 +29,10 @@ def move_credit_limit_to_child_table():
fields = ", bypass_credit_limit_check_at_sales_order"
credit_limit_records = frappe.db.sql(
- """
- SELECT name, credit_limit {0}
- FROM `tab{1}` where credit_limit > 0
- """.format(
- fields, doctype
- ),
+ f"""
+ SELECT name, credit_limit {fields}
+ FROM `tab{doctype}` where credit_limit > 0
+ """,
as_dict=1,
) # nosec
diff --git a/erpnext/patches/v12_0/move_item_tax_to_item_tax_template.py b/erpnext/patches/v12_0/move_item_tax_to_item_tax_template.py
index c4c3b692e23..8ac1991d443 100644
--- a/erpnext/patches/v12_0/move_item_tax_to_item_tax_template.py
+++ b/erpnext/patches/v12_0/move_item_tax_to_item_tax_template.py
@@ -80,11 +80,9 @@ def execute():
for dt in doctypes:
for d in frappe.db.sql(
- """select name, parenttype, parent, item_code, item_tax_rate from `tab{0} Item`
+ f"""select name, parenttype, parent, item_code, item_tax_rate from `tab{dt} Item`
where ifnull(item_tax_rate, '') not in ('', '{{}}')
- and item_tax_template is NULL""".format(
- dt
- ),
+ and item_tax_template is NULL""",
as_dict=1,
):
item_tax_map = json.loads(d.item_tax_rate)
@@ -145,13 +143,23 @@ def get_item_tax_template(
if not parent_account:
parent_account = frappe.db.get_value(
"Account",
- filters={"account_type": "Tax", "root_type": "Liability", "is_group": 0, "company": company},
+ filters={
+ "account_type": "Tax",
+ "root_type": "Liability",
+ "is_group": 0,
+ "company": company,
+ },
fieldname="parent_account",
)
if not parent_account:
parent_account = frappe.db.get_value(
"Account",
- filters={"account_type": "Tax", "root_type": "Liability", "is_group": 1, "company": company},
+ filters={
+ "account_type": "Tax",
+ "root_type": "Liability",
+ "is_group": 1,
+ "company": company,
+ },
)
filters = {
"account_name": account_name,
diff --git a/erpnext/patches/v12_0/move_target_distribution_from_parent_to_child.py b/erpnext/patches/v12_0/move_target_distribution_from_parent_to_child.py
index 71926107bd5..ffd8ddcf308 100644
--- a/erpnext/patches/v12_0/move_target_distribution_from_parent_to_child.py
+++ b/erpnext/patches/v12_0/move_target_distribution_from_parent_to_child.py
@@ -18,9 +18,7 @@ def execute():
WHERE
`tab{child_doc}`.parent = `tab{parent_doc}`.name
and `tab{parent_doc}`.distribution_id is not null and `tab{parent_doc}`.distribution_id != ''
- """.format(
- parent_doc=d, child_doc="Target Detail"
- )
+ """.format(parent_doc=d, child_doc="Target Detail")
)
frappe.delete_doc("Report", "Sales Partner-wise Transaction Summary")
diff --git a/erpnext/patches/v12_0/purchase_receipt_status.py b/erpnext/patches/v12_0/purchase_receipt_status.py
index 3b828d69cb2..2869e2bcd0a 100644
--- a/erpnext/patches/v12_0/purchase_receipt_status.py
+++ b/erpnext/patches/v12_0/purchase_receipt_status.py
@@ -17,16 +17,14 @@ def execute():
if not affected_purchase_receipts:
return
- logger.info(
- "purchase_receipt_status: begin patch, PR count: {}".format(len(affected_purchase_receipts))
- )
+ logger.info(f"purchase_receipt_status: begin patch, PR count: {len(affected_purchase_receipts)}")
frappe.reload_doc("stock", "doctype", "Purchase Receipt")
frappe.reload_doc("stock", "doctype", "Purchase Receipt Item")
for pr in affected_purchase_receipts:
pr_name = pr[0]
- logger.info("purchase_receipt_status: patching PR - {}".format(pr_name))
+ logger.info(f"purchase_receipt_status: patching PR - {pr_name}")
pr_doc = frappe.get_doc("Purchase Receipt", pr_name)
diff --git a/erpnext/patches/v12_0/rename_bank_reconciliation_fields.py b/erpnext/patches/v12_0/rename_bank_reconciliation_fields.py
index e2a3887b9ac..dfc23669e0e 100644
--- a/erpnext/patches/v12_0/rename_bank_reconciliation_fields.py
+++ b/erpnext/patches/v12_0/rename_bank_reconciliation_fields.py
@@ -6,12 +6,8 @@ import frappe
def _rename_single_field(**kwargs):
count = frappe.db.sql(
- "SELECT COUNT(*) FROM tabSingles WHERE doctype='{doctype}' AND field='{new_name}';".format(
- **kwargs
- )
- )[0][
- 0
- ] # nosec
+ "SELECT COUNT(*) FROM tabSingles WHERE doctype='{doctype}' AND field='{new_name}';".format(**kwargs)
+ )[0][0] # nosec
if count == 0:
frappe.db.sql(
"UPDATE tabSingles SET field='{new_name}' WHERE doctype='{doctype}' AND field='{old_name}';".format(
@@ -22,7 +18,5 @@ def _rename_single_field(**kwargs):
def execute():
_rename_single_field(doctype="Bank Clearance", old_name="bank_account", new_name="account")
- _rename_single_field(
- doctype="Bank Clearance", old_name="bank_account_no", new_name="bank_account"
- )
+ _rename_single_field(doctype="Bank Clearance", old_name="bank_account_no", new_name="bank_account")
frappe.reload_doc("Accounts", "doctype", "Bank Clearance")
diff --git a/erpnext/patches/v12_0/repost_stock_ledger_entries_for_target_warehouse.py b/erpnext/patches/v12_0/repost_stock_ledger_entries_for_target_warehouse.py
index a4a85871ea2..69ddb603d7d 100644
--- a/erpnext/patches/v12_0/repost_stock_ledger_entries_for_target_warehouse.py
+++ b/erpnext/patches/v12_0/repost_stock_ledger_entries_for_target_warehouse.py
@@ -41,35 +41,29 @@ def execute():
cond = " AND parent_doc.update_stock = 1"
data = frappe.db.sql(
- """ SELECT parent_doc.name as name, child_doc.name as child_name
+ f""" SELECT parent_doc.name as name, child_doc.name as child_name
FROM
`tab{doctype}` parent_doc, `tab{doctype} Item` child_doc
WHERE
parent_doc.name = child_doc.parent AND parent_doc.docstatus < 2
AND child_doc.target_warehouse is not null AND child_doc.target_warehouse != ''
AND child_doc.creation > '2020-04-16' {cond}
- """.format(
- doctype=doctype, cond=cond
- ),
+ """,
as_dict=1,
)
if data:
names = [d.child_name for d in data]
frappe.db.sql(
- """ UPDATE `tab{0} Item` set target_warehouse = null
- WHERE name in ({1}) """.format(
- doctype, ",".join(["%s"] * len(names))
- ),
+ """ UPDATE `tab{} Item` set target_warehouse = null
+ WHERE name in ({}) """.format(doctype, ",".join(["%s"] * len(names))),
tuple(names),
)
frappe.db.sql(
""" UPDATE `tabPacked Item` set target_warehouse = null
- WHERE parenttype = '{0}' and parent_detail_docname in ({1})
- """.format(
- doctype, ",".join(["%s"] * len(names))
- ),
+ WHERE parenttype = '{}' and parent_detail_docname in ({})
+ """.format(doctype, ",".join(["%s"] * len(names))),
tuple(names),
)
diff --git a/erpnext/patches/v12_0/set_against_blanket_order_in_sales_and_purchase_order.py b/erpnext/patches/v12_0/set_against_blanket_order_in_sales_and_purchase_order.py
index d88593b4984..5d1cb64bf6b 100644
--- a/erpnext/patches/v12_0/set_against_blanket_order_in_sales_and_purchase_order.py
+++ b/erpnext/patches/v12_0/set_against_blanket_order_in_sales_and_purchase_order.py
@@ -2,17 +2,14 @@ import frappe
def execute():
-
frappe.reload_doc("selling", "doctype", "sales_order_item", force=True)
frappe.reload_doc("buying", "doctype", "purchase_order_item", force=True)
for doctype in ("Sales Order Item", "Purchase Order Item"):
frappe.db.sql(
- """
- UPDATE `tab{0}`
+ f"""
+ UPDATE `tab{doctype}`
SET against_blanket_order = 1
WHERE ifnull(blanket_order, '') != ''
- """.format(
- doctype
- )
+ """
)
diff --git a/erpnext/patches/v12_0/set_automatically_process_deferred_accounting_in_accounts_settings.py b/erpnext/patches/v12_0/set_automatically_process_deferred_accounting_in_accounts_settings.py
index 37af989549f..8f29fc888e0 100644
--- a/erpnext/patches/v12_0/set_automatically_process_deferred_accounting_in_accounts_settings.py
+++ b/erpnext/patches/v12_0/set_automatically_process_deferred_accounting_in_accounts_settings.py
@@ -4,6 +4,4 @@ import frappe
def execute():
frappe.reload_doc("accounts", "doctype", "accounts_settings")
- frappe.db.set_value(
- "Accounts Settings", None, "automatically_process_deferred_accounting_entry", 1
- )
+ frappe.db.set_value("Accounts Settings", None, "automatically_process_deferred_accounting_entry", 1)
diff --git a/erpnext/patches/v12_0/set_produced_qty_field_in_sales_order_for_work_order.py b/erpnext/patches/v12_0/set_produced_qty_field_in_sales_order_for_work_order.py
index 562ebed757b..a5b9f43da8f 100644
--- a/erpnext/patches/v12_0/set_produced_qty_field_in_sales_order_for_work_order.py
+++ b/erpnext/patches/v12_0/set_produced_qty_field_in_sales_order_for_work_order.py
@@ -12,6 +12,5 @@ def execute():
fields=["sales_order", "sales_order_item"],
filters={"sales_order": ("!=", ""), "sales_order_item": ("!=", "")},
):
-
# update produced qty in sales order
update_produced_qty_in_so_item(d.sales_order, d.sales_order_item)
diff --git a/erpnext/patches/v12_0/set_purchase_receipt_delivery_note_detail.py b/erpnext/patches/v12_0/set_purchase_receipt_delivery_note_detail.py
index 2edf0f54fcf..e8207316baf 100644
--- a/erpnext/patches/v12_0/set_purchase_receipt_delivery_note_detail.py
+++ b/erpnext/patches/v12_0/set_purchase_receipt_delivery_note_detail.py
@@ -4,7 +4,6 @@ import frappe
def execute():
-
frappe.reload_doc("stock", "doctype", "delivery_note_item", force=True)
frappe.reload_doc("stock", "doctype", "purchase_receipt_item", force=True)
@@ -50,14 +49,12 @@ def execute():
Format => { 'document' : ['return_document_1','return_document_2'] }"""
return_against_documents = frappe.db.sql(
- """
+ f"""
SELECT
return_against as document, name as return_document
FROM `tab{doctype}`
WHERE
- is_return = 1 and docstatus = 1""".format(
- doctype=doctype
- ),
+ is_return = 1 and docstatus = 1""",
as_dict=1,
) # nosec
@@ -72,7 +69,7 @@ def execute():
return_document_map = defaultdict(list)
detail_field = "purchase_receipt_item" if doctype == "Purchase Receipt" else "dn_detail"
- child_doc = frappe.scrub("{0} Item".format(doctype))
+ child_doc = frappe.scrub(f"{doctype} Item")
frappe.reload_doc("stock", "doctype", child_doc)
return_document_map = make_return_document_map(doctype, return_document_map)
@@ -89,7 +86,8 @@ def execute():
for return_item in return_doc_items:
for doc_item in doc_items:
if (
- row_is_mappable(doc_item, return_item, detail_field) and doc_item.get("name") not in mapped
+ row_is_mappable(doc_item, return_item, detail_field)
+ and doc_item.get("name") not in mapped
):
map_rows(doc_item, return_item, detail_field, doctype)
mapped.append(doc_item.get("name"))
diff --git a/erpnext/patches/v12_0/set_quotation_status.py b/erpnext/patches/v12_0/set_quotation_status.py
index bebedd3a498..edfb4a4544a 100644
--- a/erpnext/patches/v12_0/set_quotation_status.py
+++ b/erpnext/patches/v12_0/set_quotation_status.py
@@ -2,7 +2,6 @@ import frappe
def execute():
-
frappe.db.sql(
""" UPDATE `tabQuotation` set status = 'Open'
where docstatus = 1 and status = 'Submitted' """
diff --git a/erpnext/patches/v12_0/set_task_status.py b/erpnext/patches/v12_0/set_task_status.py
index 1c6654e57ac..27810d7abe9 100644
--- a/erpnext/patches/v12_0/set_task_status.py
+++ b/erpnext/patches/v12_0/set_task_status.py
@@ -10,7 +10,7 @@ def execute():
)
if property_setter_name:
property_setter = frappe.get_doc("Property Setter", property_setter_name)
- if not "Completed" in property_setter.value:
+ if "Completed" not in property_setter.value:
property_setter.value = property_setter.value + "\nCompleted"
property_setter.save()
diff --git a/erpnext/patches/v12_0/stock_entry_enhancements.py b/erpnext/patches/v12_0/stock_entry_enhancements.py
index db099a304cf..75749a49972 100644
--- a/erpnext/patches/v12_0/stock_entry_enhancements.py
+++ b/erpnext/patches/v12_0/stock_entry_enhancements.py
@@ -28,7 +28,6 @@ def create_stock_entry_types():
"Repack",
"Send to Subcontractor",
]:
-
ste_type = frappe.get_doc({"doctype": "Stock Entry Type", "name": purpose, "purpose": purpose})
try:
diff --git a/erpnext/patches/v12_0/update_bom_in_so_mr.py b/erpnext/patches/v12_0/update_bom_in_so_mr.py
index 114f65d100e..88ac90d9f97 100644
--- a/erpnext/patches/v12_0/update_bom_in_so_mr.py
+++ b/erpnext/patches/v12_0/update_bom_in_so_mr.py
@@ -11,14 +11,12 @@ def execute():
condition = " and doc.per_ordered < 100 and doc.material_request_type = 'Manufacture'"
frappe.db.sql(
- """ UPDATE `tab{doc}` as doc, `tab{doc} Item` as child_doc, tabItem as item
+ f""" UPDATE `tab{doctype}` as doc, `tab{doctype} Item` as child_doc, tabItem as item
SET
child_doc.bom_no = item.default_bom
WHERE
child_doc.item_code = item.name and child_doc.docstatus < 2
and child_doc.parent = doc.name
- and item.default_bom is not null and item.default_bom != '' {cond}
- """.format(
- doc=doctype, cond=condition
- )
+ and item.default_bom is not null and item.default_bom != '' {condition}
+ """
)
diff --git a/erpnext/patches/v12_0/update_is_cancelled_field.py b/erpnext/patches/v12_0/update_is_cancelled_field.py
index 398dd700eda..ea9a06bdcd8 100644
--- a/erpnext/patches/v12_0/update_is_cancelled_field.py
+++ b/erpnext/patches/v12_0/update_is_cancelled_field.py
@@ -17,20 +17,16 @@ def execute():
continue
frappe.db.sql(
- """
+ f"""
UPDATE `tab{doctype}`
SET is_cancelled = 0
- where is_cancelled in ('', 'No') or is_cancelled is NULL""".format(
- doctype=doctype
- )
+ where is_cancelled in ('', 'No') or is_cancelled is NULL"""
)
frappe.db.sql(
- """
+ f"""
UPDATE `tab{doctype}`
SET is_cancelled = 1
- where is_cancelled = 'Yes'""".format(
- doctype=doctype
- )
+ where is_cancelled = 'Yes'"""
)
frappe.reload_doc(module, "doctype", frappe.scrub(doctype))
diff --git a/erpnext/patches/v12_0/update_owner_fields_in_acc_dimension_custom_fields.py b/erpnext/patches/v12_0/update_owner_fields_in_acc_dimension_custom_fields.py
index 7dc0af9a1aa..26db58dffe8 100644
--- a/erpnext/patches/v12_0/update_owner_fields_in_acc_dimension_custom_fields.py
+++ b/erpnext/patches/v12_0/update_owner_fields_in_acc_dimension_custom_fields.py
@@ -19,8 +19,7 @@ def execute():
"""
UPDATE `tabCustom Field`
SET owner = 'Administrator'
- WHERE fieldname = %s
- AND dt IN (%s)"""
- % ("%s", ", ".join(["%s"] * len(doclist))), # nosec
- tuple([dimension.fieldname] + doclist),
+ WHERE fieldname = {}
+ AND dt IN ({})""".format("%s", ", ".join(["%s"] * len(doclist))), # nosec
+ tuple([dimension.fieldname, *doclist]),
)
diff --git a/erpnext/patches/v12_0/update_pricing_rule_fields.py b/erpnext/patches/v12_0/update_pricing_rule_fields.py
index 8da06b0bda0..f4eee85dd25 100644
--- a/erpnext/patches/v12_0/update_pricing_rule_fields.py
+++ b/erpnext/patches/v12_0/update_pricing_rule_fields.py
@@ -8,7 +8,6 @@ parentfield = {"item_code": "items", "item_group": "item_groups", "brand": "bran
def execute():
-
if not frappe.get_all("Pricing Rule", limit=1):
return
@@ -33,20 +32,16 @@ def execute():
child_doctype = doctype + " Item"
frappe.db.sql(
- """ UPDATE `tab{child_doctype}` SET pricing_rules = pricing_rule
+ f""" UPDATE `tab{child_doctype}` SET pricing_rules = pricing_rule
WHERE docstatus < 2 and pricing_rule is not null and pricing_rule != ''
- """.format(
- child_doctype=child_doctype
- )
+ """
)
data = frappe.db.sql(
- """ SELECT pricing_rule, name, parent,
+ f""" SELECT pricing_rule, name, parent,
parenttype, creation, modified, docstatus, modified_by, owner, name
- FROM `tab{child_doc}` where docstatus < 2 and pricing_rule is not null
- and pricing_rule != ''""".format(
- child_doc=child_doctype
- ),
+ FROM `tab{child_doctype}` where docstatus < 2 and pricing_rule is not null
+ and pricing_rule != ''""",
as_dict=1,
)
@@ -73,9 +68,7 @@ def execute():
""" INSERT INTO
`tabPricing Rule Detail` (`pricing_rule`, `child_docname`, `parent`, `parentfield`, `parenttype`,
`creation`, `modified`, `docstatus`, `modified_by`, `owner`, `name`)
- VALUES {values} """.format(
- values=", ".join(["%s"] * len(values))
- ),
+ VALUES {values} """.format(values=", ".join(["%s"] * len(values))),
tuple(values),
)
@@ -116,8 +109,6 @@ def execute():
""" INSERT INTO
`tab{doctype}` ({field}, parent, parentfield, parenttype, creation, modified,
owner, modified_by, name)
- VALUES {values} """.format(
- doctype=doctype, field=field, values=", ".join(["%s"] * len(values))
- ),
+ VALUES {values} """.format(doctype=doctype, field=field, values=", ".join(["%s"] * len(values))),
tuple(values),
)
diff --git a/erpnext/patches/v13_0/add_bin_unique_constraint.py b/erpnext/patches/v13_0/add_bin_unique_constraint.py
index 7ad2bec8598..92fc7024d8d 100644
--- a/erpnext/patches/v13_0/add_bin_unique_constraint.py
+++ b/erpnext/patches/v13_0/add_bin_unique_constraint.py
@@ -21,7 +21,6 @@ def delete_broken_bins():
def delete_and_patch_duplicate_bins():
-
duplicate_bins = frappe.db.sql(
"""
SELECT
diff --git a/erpnext/patches/v13_0/add_cost_center_in_loans.py b/erpnext/patches/v13_0/add_cost_center_in_loans.py
index e293cf2874e..f4c29150865 100644
--- a/erpnext/patches/v13_0/add_cost_center_in_loans.py
+++ b/erpnext/patches/v13_0/add_cost_center_in_loans.py
@@ -7,6 +7,4 @@ def execute():
for company in frappe.get_all("Company", pluck="name"):
default_cost_center = frappe.db.get_value("Company", company, "cost_center")
- frappe.qb.update(loan).set(loan.cost_center, default_cost_center).where(
- loan.company == company
- ).run()
+ frappe.qb.update(loan).set(loan.cost_center, default_cost_center).where(loan.company == company).run()
diff --git a/erpnext/patches/v13_0/add_missing_fg_item_for_stock_entry.py b/erpnext/patches/v13_0/add_missing_fg_item_for_stock_entry.py
index ddbb7fd0f1b..fb7540e1a00 100644
--- a/erpnext/patches/v13_0/add_missing_fg_item_for_stock_entry.py
+++ b/erpnext/patches/v13_0/add_missing_fg_item_for_stock_entry.py
@@ -13,9 +13,7 @@ def execute():
return
frappe.reload_doc("manufacturing", "doctype", "manufacturing_settings")
- if cint(
- frappe.db.get_single_value("Manufacturing Settings", "make_serial_no_batch_from_work_order")
- ):
+ if cint(frappe.db.get_single_value("Manufacturing Settings", "make_serial_no_batch_from_work_order")):
return
frappe.reload_doc("manufacturing", "doctype", "work_order")
@@ -76,9 +74,7 @@ def execute():
def set_expense_account(doc):
for row in doc.items:
if row.is_finished_item and not row.expense_account:
- row.expense_account = frappe.get_cached_value(
- "Company", doc.company, "stock_adjustment_account"
- )
+ row.expense_account = frappe.get_cached_value("Company", doc.company, "stock_adjustment_account")
def repost_stock_entry(doc):
diff --git a/erpnext/patches/v13_0/add_po_to_global_search.py b/erpnext/patches/v13_0/add_po_to_global_search.py
index 514cd343900..c07b6d91181 100644
--- a/erpnext/patches/v13_0/add_po_to_global_search.py
+++ b/erpnext/patches/v13_0/add_po_to_global_search.py
@@ -4,9 +4,7 @@ import frappe
def execute():
global_search_settings = frappe.get_single("Global Search Settings")
- if "Purchase Order" in (
- dt.document_type for dt in global_search_settings.allowed_in_global_search
- ):
+ if "Purchase Order" in (dt.document_type for dt in global_search_settings.allowed_in_global_search):
return
global_search_settings.append("allowed_in_global_search", {"document_type": "Purchase Order"})
diff --git a/erpnext/patches/v13_0/agriculture_deprecation_warning.py b/erpnext/patches/v13_0/agriculture_deprecation_warning.py
index 512444ef657..053710bfc98 100644
--- a/erpnext/patches/v13_0/agriculture_deprecation_warning.py
+++ b/erpnext/patches/v13_0/agriculture_deprecation_warning.py
@@ -2,7 +2,6 @@ import click
def execute():
-
click.secho(
"Agriculture Domain is moved to a separate app and will be removed from ERPNext in version-14.\n"
"Please install the app to continue using the Agriculture domain: https://github.com/frappe/agriculture",
diff --git a/erpnext/patches/v13_0/change_default_item_manufacturer_fieldtype.py b/erpnext/patches/v13_0/change_default_item_manufacturer_fieldtype.py
index 0b00188e6a8..5baec0c67da 100644
--- a/erpnext/patches/v13_0/change_default_item_manufacturer_fieldtype.py
+++ b/erpnext/patches/v13_0/change_default_item_manufacturer_fieldtype.py
@@ -2,7 +2,6 @@ import frappe
def execute():
-
# Erase all default item manufacturers that dont exist.
item = frappe.qb.DocType("Item")
manufacturer = frappe.qb.DocType("Manufacturer")
diff --git a/erpnext/patches/v13_0/convert_qi_parameter_to_link_field.py b/erpnext/patches/v13_0/convert_qi_parameter_to_link_field.py
index 08ddbbf3375..d0bde56cb05 100644
--- a/erpnext/patches/v13_0/convert_qi_parameter_to_link_field.py
+++ b/erpnext/patches/v13_0/convert_qi_parameter_to_link_field.py
@@ -6,9 +6,7 @@ def execute():
params = set()
# get all parameters from QI readings table
- for (p,) in frappe.db.get_all(
- "Quality Inspection Reading", fields=["specification"], as_list=True
- ):
+ for (p,) in frappe.db.get_all("Quality Inspection Reading", fields=["specification"], as_list=True):
params.add(p.strip())
# get all parameters from QI Template as some may be unused in QI
diff --git a/erpnext/patches/v13_0/convert_to_website_item_in_item_card_group_template.py b/erpnext/patches/v13_0/convert_to_website_item_in_item_card_group_template.py
index 1bac0fdbf0b..b3e9593bd2c 100644
--- a/erpnext/patches/v13_0/convert_to_website_item_in_item_card_group_template.py
+++ b/erpnext/patches/v13_0/convert_to_website_item_in_item_card_group_template.py
@@ -1,5 +1,4 @@
import json
-from typing import List, Union
import frappe
@@ -42,7 +41,7 @@ def execute():
)
-def generate_fields_to_edit() -> List:
+def generate_fields_to_edit() -> list:
fields = []
for i in range(1, 13):
fields.append(f"card_{i}_item") # fields like 'card_1_item', etc.
@@ -50,7 +49,7 @@ def generate_fields_to_edit() -> List:
return fields
-def make_new_website_item(item: str) -> Union[str, None]:
+def make_new_website_item(item: str) -> str | None:
try:
doc = frappe.get_doc("Item", item)
web_item = make_website_item(doc) # returns [website_item.name, item_name]
diff --git a/erpnext/patches/v13_0/copy_custom_field_filters_to_website_item.py b/erpnext/patches/v13_0/copy_custom_field_filters_to_website_item.py
index e8d0b593e6f..59ca96bd0bd 100644
--- a/erpnext/patches/v13_0/copy_custom_field_filters_to_website_item.py
+++ b/erpnext/patches/v13_0/copy_custom_field_filters_to_website_item.py
@@ -84,11 +84,9 @@ def execute():
move_table_multiselect_data(df)
else:
frappe.db.sql( # nosemgrep
- """
+ f"""
UPDATE `tabWebsite Item` wi, `tabItem` i
- SET wi.{0} = i.{0}
+ SET wi.{row.fieldname} = i.{row.fieldname}
WHERE wi.item_code = i.item_code
- """.format(
- row.fieldname
- )
+ """
)
diff --git a/erpnext/patches/v13_0/create_accounting_dimensions_in_orders.py b/erpnext/patches/v13_0/create_accounting_dimensions_in_orders.py
index 8e6bce66fe4..84b17a5515e 100644
--- a/erpnext/patches/v13_0/create_accounting_dimensions_in_orders.py
+++ b/erpnext/patches/v13_0/create_accounting_dimensions_in_orders.py
@@ -12,14 +12,12 @@ def execute():
count = 1
for d in accounting_dimensions:
-
if count % 2 == 0:
insert_after_field = "dimension_col_break"
else:
insert_after_field = "accounting_dimensions_section"
for doctype in ["Purchase Order", "Purchase Receipt", "Sales Order"]:
-
field = frappe.db.get_value("Custom Field", {"dt": doctype, "fieldname": d.fieldname})
if field:
@@ -36,7 +34,7 @@ def execute():
try:
create_custom_field(doctype, df, ignore_validate=True)
frappe.clear_cache(doctype=doctype)
- except Exception as e:
+ except Exception:
pass
count += 1
diff --git a/erpnext/patches/v13_0/create_accounting_dimensions_in_pos_doctypes.py b/erpnext/patches/v13_0/create_accounting_dimensions_in_pos_doctypes.py
index 51ab0e8b65c..b9e703373c5 100644
--- a/erpnext/patches/v13_0/create_accounting_dimensions_in_pos_doctypes.py
+++ b/erpnext/patches/v13_0/create_accounting_dimensions_in_pos_doctypes.py
@@ -15,14 +15,12 @@ def execute():
count = 1
for d in accounting_dimensions:
-
if count % 2 == 0:
insert_after_field = "dimension_col_break"
else:
insert_after_field = "accounting_dimensions_section"
for doctype in ["POS Invoice", "POS Invoice Item"]:
-
field = frappe.db.get_value("Custom Field", {"dt": doctype, "fieldname": d.fieldname})
if field:
diff --git a/erpnext/patches/v13_0/create_uae_pos_invoice_fields.py b/erpnext/patches/v13_0/create_uae_pos_invoice_fields.py
index 66aae9a30af..d28f8c95f6d 100644
--- a/erpnext/patches/v13_0/create_uae_pos_invoice_fields.py
+++ b/erpnext/patches/v13_0/create_uae_pos_invoice_fields.py
@@ -8,9 +8,7 @@ from erpnext.regional.united_arab_emirates.setup import make_custom_fields
def execute():
- company = frappe.get_all(
- "Company", filters={"country": ["in", ["Saudi Arabia", "United Arab Emirates"]]}
- )
+ company = frappe.get_all("Company", filters={"country": ["in", ["Saudi Arabia", "United Arab Emirates"]]})
if not company:
return
diff --git a/erpnext/patches/v13_0/custom_fields_for_taxjar_integration.py b/erpnext/patches/v13_0/custom_fields_for_taxjar_integration.py
index 5cbd0b5fcb5..e748f52521a 100644
--- a/erpnext/patches/v13_0/custom_fields_for_taxjar_integration.py
+++ b/erpnext/patches/v13_0/custom_fields_for_taxjar_integration.py
@@ -9,9 +9,7 @@ def execute():
if not company:
return
- TAXJAR_CREATE_TRANSACTIONS = frappe.db.get_single_value(
- "TaxJar Settings", "taxjar_create_transactions"
- )
+ TAXJAR_CREATE_TRANSACTIONS = frappe.db.get_single_value("TaxJar Settings", "taxjar_create_transactions")
TAXJAR_CALCULATE_TAX = frappe.db.get_single_value("TaxJar Settings", "taxjar_calculate_tax")
TAXJAR_SANDBOX_MODE = frappe.db.get_single_value("TaxJar Settings", "is_sandbox")
diff --git a/erpnext/patches/v13_0/delete_bank_reconciliation_detail.py b/erpnext/patches/v13_0/delete_bank_reconciliation_detail.py
index c53eb794378..46946a8a0e7 100644
--- a/erpnext/patches/v13_0/delete_bank_reconciliation_detail.py
+++ b/erpnext/patches/v13_0/delete_bank_reconciliation_detail.py
@@ -6,9 +6,7 @@ import frappe
def execute():
-
if frappe.db.exists("DocType", "Bank Reconciliation Detail") and frappe.db.exists(
"DocType", "Bank Clearance Detail"
):
-
frappe.delete_doc("DocType", "Bank Reconciliation Detail", force=1)
diff --git a/erpnext/patches/v13_0/enable_provisional_accounting.py b/erpnext/patches/v13_0/enable_provisional_accounting.py
index dd18167b718..6edb423cfc4 100644
--- a/erpnext/patches/v13_0/enable_provisional_accounting.py
+++ b/erpnext/patches/v13_0/enable_provisional_accounting.py
@@ -11,6 +11,4 @@ def execute():
company.enable_perpetual_inventory_for_non_stock_items,
).set(company.default_provisional_account, company.service_received_but_not_billed).where(
company.enable_perpetual_inventory_for_non_stock_items == 1
- ).where(
- company.service_received_but_not_billed.isnotnull()
- ).run()
+ ).where(company.service_received_but_not_billed.isnotnull()).run()
diff --git a/erpnext/patches/v13_0/fix_additional_cost_in_mfg_stock_entry.py b/erpnext/patches/v13_0/fix_additional_cost_in_mfg_stock_entry.py
index aeb8d8eb588..e305b375c7f 100644
--- a/erpnext/patches/v13_0/fix_additional_cost_in_mfg_stock_entry.py
+++ b/erpnext/patches/v13_0/fix_additional_cost_in_mfg_stock_entry.py
@@ -1,4 +1,4 @@
-from typing import List, NewType
+from typing import NewType
import frappe
@@ -13,7 +13,7 @@ def execute():
create_repost_item_valuation(patched_stock_entry)
-def find_broken_stock_entries() -> List[StockEntryCode]:
+def find_broken_stock_entries() -> list[StockEntryCode]:
period_closing_date = frappe.db.get_value(
"Period Closing Voucher", {"docstatus": 1}, "posting_date", order_by="posting_date desc"
)
diff --git a/erpnext/patches/v13_0/fix_invoice_statuses.py b/erpnext/patches/v13_0/fix_invoice_statuses.py
index 253b425c58b..dc15a019a38 100644
--- a/erpnext/patches/v13_0/fix_invoice_statuses.py
+++ b/erpnext/patches/v13_0/fix_invoice_statuses.py
@@ -41,7 +41,7 @@ def execute():
("Overdue", "Overdue and Discounted", "Partly Paid", "Partly Paid and Discounted"),
),
"outstanding_amount": (">", 0),
- "modified": (">", "2021-01-01")
+ "modified": (">", "2021-01-01"),
# an assumption is being made that only invoices modified
# after 2021 got affected as incorrectly overdue.
# required for performance reasons.
diff --git a/erpnext/patches/v13_0/healthcare_deprecation_warning.py b/erpnext/patches/v13_0/healthcare_deprecation_warning.py
index c6fba59371c..3fff235f446 100644
--- a/erpnext/patches/v13_0/healthcare_deprecation_warning.py
+++ b/erpnext/patches/v13_0/healthcare_deprecation_warning.py
@@ -2,7 +2,6 @@ import click
def execute():
-
click.secho(
"Healthcare Module is moved to a separate app and will be removed from ERPNext in version-14.\n"
"Please install the app to continue using the module: https://github.com/frappe/healthcare",
diff --git a/erpnext/patches/v13_0/hospitality_deprecation_warning.py b/erpnext/patches/v13_0/hospitality_deprecation_warning.py
index 2708b2ccd3b..64166514562 100644
--- a/erpnext/patches/v13_0/hospitality_deprecation_warning.py
+++ b/erpnext/patches/v13_0/hospitality_deprecation_warning.py
@@ -2,7 +2,6 @@ import click
def execute():
-
click.secho(
"Hospitality domain is moved to a separate app and will be removed from ERPNext in version-14.\n"
"When upgrading to ERPNext version-14, please install the app to continue using the Hospitality domain: https://github.com/frappe/hospitality",
diff --git a/erpnext/patches/v13_0/item_naming_series_not_mandatory.py b/erpnext/patches/v13_0/item_naming_series_not_mandatory.py
index 0235a621ce0..d25da7accb1 100644
--- a/erpnext/patches/v13_0/item_naming_series_not_mandatory.py
+++ b/erpnext/patches/v13_0/item_naming_series_not_mandatory.py
@@ -4,7 +4,6 @@ from erpnext.utilities.naming import set_by_naming_series
def execute():
-
stock_settings = frappe.get_doc("Stock Settings")
set_by_naming_series(
diff --git a/erpnext/patches/v13_0/move_branch_code_to_bank_account.py b/erpnext/patches/v13_0/move_branch_code_to_bank_account.py
index 24061271484..79c79ffb592 100644
--- a/erpnext/patches/v13_0/move_branch_code_to_bank_account.py
+++ b/erpnext/patches/v13_0/move_branch_code_to_bank_account.py
@@ -6,13 +6,10 @@ import frappe
def execute():
-
frappe.reload_doc("accounts", "doctype", "bank_account")
frappe.reload_doc("accounts", "doctype", "bank")
- if frappe.db.has_column("Bank", "branch_code") and frappe.db.has_column(
- "Bank Account", "branch_code"
- ):
+ if frappe.db.has_column("Bank", "branch_code") and frappe.db.has_column("Bank Account", "branch_code"):
frappe.db.sql(
"""UPDATE `tabBank` b, `tabBank Account` ba
SET ba.branch_code = b.branch_code
diff --git a/erpnext/patches/v13_0/non_profit_deprecation_warning.py b/erpnext/patches/v13_0/non_profit_deprecation_warning.py
index 5b54b25a5bc..173664625ad 100644
--- a/erpnext/patches/v13_0/non_profit_deprecation_warning.py
+++ b/erpnext/patches/v13_0/non_profit_deprecation_warning.py
@@ -2,7 +2,6 @@ import click
def execute():
-
click.secho(
"Non Profit Domain is moved to a separate app and will be removed from ERPNext in version-14.\n"
"When upgrading to ERPNext version-14, please install the app to continue using the Non Profit domain: https://github.com/frappe/non_profit",
diff --git a/erpnext/patches/v13_0/rename_issue_doctype_fields.py b/erpnext/patches/v13_0/rename_issue_doctype_fields.py
index a9b6df70985..dfa76a78dc3 100644
--- a/erpnext/patches/v13_0/rename_issue_doctype_fields.py
+++ b/erpnext/patches/v13_0/rename_issue_doctype_fields.py
@@ -57,7 +57,11 @@ def execute():
for entry in opportunities:
mins_to_first_response = convert_to_seconds(entry.mins_to_first_response, "Minutes")
frappe.db.set_value(
- "Opportunity", entry.name, "first_response_time", mins_to_first_response, update_modified=False
+ "Opportunity",
+ entry.name,
+ "first_response_time",
+ mins_to_first_response,
+ update_modified=False,
)
# commit after every 100 updates
count += 1
diff --git a/erpnext/patches/v13_0/requeue_failed_reposts.py b/erpnext/patches/v13_0/requeue_failed_reposts.py
index 752490da304..c7dfaa256a3 100644
--- a/erpnext/patches/v13_0/requeue_failed_reposts.py
+++ b/erpnext/patches/v13_0/requeue_failed_reposts.py
@@ -3,7 +3,6 @@ from frappe.utils import cstr
def execute():
-
reposts = frappe.get_all(
"Repost Item Valuation",
{"status": "Failed", "modified": [">", "2021-10-05"]},
diff --git a/erpnext/patches/v13_0/set_per_billed_in_return_delivery_note.py b/erpnext/patches/v13_0/set_per_billed_in_return_delivery_note.py
index a4d70124492..40df73ee14b 100644
--- a/erpnext/patches/v13_0/set_per_billed_in_return_delivery_note.py
+++ b/erpnext/patches/v13_0/set_per_billed_in_return_delivery_note.py
@@ -20,9 +20,9 @@ def execute():
.run(as_dict=True)
)
- frappe.qb.update(dn_item).inner_join(dn).on(dn.name == dn_item.parent).set(
- dn_item.returned_qty, 0
- ).where(dn.is_return == 1).where(dn_item.returned_qty > 0).run()
+ frappe.qb.update(dn_item).inner_join(dn).on(dn.name == dn_item.parent).set(dn_item.returned_qty, 0).where(
+ dn.is_return == 1
+ ).where(dn_item.returned_qty > 0).run()
for d in dn_list:
dn_doc = frappe.get_doc("Delivery Note", d.get("name"))
diff --git a/erpnext/patches/v13_0/set_work_order_qty_in_so_from_mr.py b/erpnext/patches/v13_0/set_work_order_qty_in_so_from_mr.py
index 1adf0d84538..be30fb12515 100644
--- a/erpnext/patches/v13_0/set_work_order_qty_in_so_from_mr.py
+++ b/erpnext/patches/v13_0/set_work_order_qty_in_so_from_mr.py
@@ -28,9 +28,7 @@ def execute():
results = query.run(as_dict=True)
for row in results:
- so_item = frappe.get_value(
- "Material Request Item", row.material_request_item, "sales_order_item"
- )
+ so_item = frappe.get_value("Material Request Item", row.material_request_item, "sales_order_item")
frappe.db.set_value("Work Order", row.name, "sales_order_item", so_item)
if so_item:
diff --git a/erpnext/patches/v13_0/shopify_deprecation_warning.py b/erpnext/patches/v13_0/shopify_deprecation_warning.py
index 245d1a96250..274c35faafe 100644
--- a/erpnext/patches/v13_0/shopify_deprecation_warning.py
+++ b/erpnext/patches/v13_0/shopify_deprecation_warning.py
@@ -2,7 +2,6 @@ import click
def execute():
-
click.secho(
"Shopify Integration is moved to a separate app and will be removed from ERPNext in version-14.\n"
"Please install the app to continue using the integration: https://github.com/frappe/ecommerce_integrations",
diff --git a/erpnext/patches/v13_0/shopping_cart_to_ecommerce.py b/erpnext/patches/v13_0/shopping_cart_to_ecommerce.py
index 35710a9bb4a..41c3358e76b 100644
--- a/erpnext/patches/v13_0/shopping_cart_to_ecommerce.py
+++ b/erpnext/patches/v13_0/shopping_cart_to_ecommerce.py
@@ -3,7 +3,6 @@ import frappe
def execute():
-
frappe.delete_doc("DocType", "Shopping Cart Settings", ignore_missing=True)
frappe.delete_doc("DocType", "Products Settings", ignore_missing=True)
frappe.delete_doc("DocType", "Supplier Item Group", ignore_missing=True)
@@ -13,7 +12,6 @@ def execute():
def notify_users():
-
click.secho(
"Shopping cart and Product settings are merged into E-commerce settings.\n"
"Checkout the documentation to learn more:"
diff --git a/erpnext/patches/v13_0/trim_whitespace_from_serial_nos.py b/erpnext/patches/v13_0/trim_whitespace_from_serial_nos.py
index b69a408e65b..182711afda5 100644
--- a/erpnext/patches/v13_0/trim_whitespace_from_serial_nos.py
+++ b/erpnext/patches/v13_0/trim_whitespace_from_serial_nos.py
@@ -38,9 +38,7 @@ def execute():
if correct_sr_no == sle.serial_no:
continue
- frappe.db.set_value(
- "Stock Ledger Entry", sle.name, "serial_no", correct_sr_no, update_modified=False
- )
+ frappe.db.set_value("Stock Ledger Entry", sle.name, "serial_no", correct_sr_no, update_modified=False)
broken_serial_nos.update(serial_no_list)
if not broken_serial_nos:
diff --git a/erpnext/patches/v13_0/update_accounts_in_loan_docs.py b/erpnext/patches/v13_0/update_accounts_in_loan_docs.py
index bf98e9ea420..c073ba4fb18 100644
--- a/erpnext/patches/v13_0/update_accounts_in_loan_docs.py
+++ b/erpnext/patches/v13_0/update_accounts_in_loan_docs.py
@@ -14,6 +14,4 @@ def execute():
lr.payment_account, loan.payment_account
).set(lr.loan_account, loan.loan_account).set(
lr.penalty_income_account, loan.penalty_income_account
- ).where(
- lr.docstatus < 2
- ).run()
+ ).where(lr.docstatus < 2).run()
diff --git a/erpnext/patches/v13_0/update_actual_start_and_end_date_in_wo.py b/erpnext/patches/v13_0/update_actual_start_and_end_date_in_wo.py
index 3c6c5b5b75f..2c41a2976e9 100644
--- a/erpnext/patches/v13_0/update_actual_start_and_end_date_in_wo.py
+++ b/erpnext/patches/v13_0/update_actual_start_and_end_date_in_wo.py
@@ -29,7 +29,7 @@ def execute():
)
if not doc.planned_end_date:
- planned_end_date = add_to_date(doc.planned_start_date, minutes=doc.lead_time)
+ add_to_date(doc.planned_start_date, minutes=doc.lead_time)
doc.db_set("planned_end_date", doc.actual_start_date, update_modified=False)
frappe.db.sql(
diff --git a/erpnext/patches/v13_0/update_disbursement_account.py b/erpnext/patches/v13_0/update_disbursement_account.py
index d6aba4720ee..c980f63a40b 100644
--- a/erpnext/patches/v13_0/update_disbursement_account.py
+++ b/erpnext/patches/v13_0/update_disbursement_account.py
@@ -2,7 +2,6 @@ import frappe
def execute():
-
frappe.reload_doc("loan_management", "doctype", "loan_type")
frappe.reload_doc("loan_management", "doctype", "loan")
diff --git a/erpnext/patches/v13_0/update_job_card_status.py b/erpnext/patches/v13_0/update_job_card_status.py
index f2d12da119a..0f5469261fc 100644
--- a/erpnext/patches/v13_0/update_job_card_status.py
+++ b/erpnext/patches/v13_0/update_job_card_status.py
@@ -5,7 +5,6 @@ import frappe
def execute():
-
job_card = frappe.qb.DocType("Job Card")
(
frappe.qb.update(job_card)
diff --git a/erpnext/patches/v13_0/update_maintenance_schedule_field_in_visit.py b/erpnext/patches/v13_0/update_maintenance_schedule_field_in_visit.py
index 136d34e6ff1..183cd790ae6 100644
--- a/erpnext/patches/v13_0/update_maintenance_schedule_field_in_visit.py
+++ b/erpnext/patches/v13_0/update_maintenance_schedule_field_in_visit.py
@@ -13,8 +13,6 @@ def execute():
frappe.qb.update(mv).join(mvp).on(mvp.parent == mv.name).set(
mv.maintenance_schedule, Coalesce(mvp.prevdoc_docname, "")
- ).where(
- (mv.maintenance_type == "Scheduled") & (mvp.prevdoc_docname.notnull()) & (mv.docstatus < 2)
- ).run(
+ ).where((mv.maintenance_type == "Scheduled") & (mvp.prevdoc_docname.notnull()) & (mv.docstatus < 2)).run(
as_dict=1
)
diff --git a/erpnext/patches/v13_0/update_old_loans.py b/erpnext/patches/v13_0/update_old_loans.py
index 30db996e736..638db8a1573 100644
--- a/erpnext/patches/v13_0/update_old_loans.py
+++ b/erpnext/patches/v13_0/update_old_loans.py
@@ -13,7 +13,6 @@ from erpnext.loan_management.doctype.process_loan_interest_accrual.process_loan_
def execute():
-
# Create a penalty account for loan types
frappe.reload_doc("loan_management", "doctype", "loan_type")
@@ -111,9 +110,7 @@ def execute():
loan_type_name = create_loan_type(loan, loan_type_name, penalty_account)
# update loan type in loan
- frappe.db.sql(
- "UPDATE `tabLoan` set loan_type = %s where name = %s", (loan_type_name, loan.name)
- )
+ frappe.db.sql("UPDATE `tabLoan` set loan_type = %s where name = %s", (loan_type_name, loan.name))
loan_type = loan_type_name
if loan_type_name not in updated_loan_types:
diff --git a/erpnext/patches/v13_0/update_reserved_qty_closed_wo.py b/erpnext/patches/v13_0/update_reserved_qty_closed_wo.py
index 72e77fe2161..4bba7b96c83 100644
--- a/erpnext/patches/v13_0/update_reserved_qty_closed_wo.py
+++ b/erpnext/patches/v13_0/update_reserved_qty_closed_wo.py
@@ -4,7 +4,6 @@ from erpnext.stock.utils import get_bin
def execute():
-
wo = frappe.qb.DocType("Work Order")
wo_item = frappe.qb.DocType("Work Order Item")
diff --git a/erpnext/patches/v13_0/update_sane_transfer_against.py b/erpnext/patches/v13_0/update_sane_transfer_against.py
index 45691e2ded7..0f58775d9cb 100644
--- a/erpnext/patches/v13_0/update_sane_transfer_against.py
+++ b/erpnext/patches/v13_0/update_sane_transfer_against.py
@@ -5,7 +5,5 @@ def execute():
bom = frappe.qb.DocType("BOM")
(
- frappe.qb.update(bom)
- .set(bom.transfer_material_against, "Work Order")
- .where(bom.with_operations == 0)
+ frappe.qb.update(bom).set(bom.transfer_material_against, "Work Order").where(bom.with_operations == 0)
).run()
diff --git a/erpnext/patches/v13_0/update_schedule_type_in_loans.py b/erpnext/patches/v13_0/update_schedule_type_in_loans.py
index e5b5f643604..757758b5bf9 100644
--- a/erpnext/patches/v13_0/update_schedule_type_in_loans.py
+++ b/erpnext/patches/v13_0/update_schedule_type_in_loans.py
@@ -9,6 +9,6 @@ def execute():
loan_type.repayment_schedule_type, "Monthly as per repayment start date"
).where(loan_type.is_term_loan == 1).run()
- frappe.qb.update(loan).set(
- loan.repayment_schedule_type, "Monthly as per repayment start date"
- ).where(loan.is_term_loan == 1).run()
+ frappe.qb.update(loan).set(loan.repayment_schedule_type, "Monthly as per repayment start date").where(
+ loan.is_term_loan == 1
+ ).run()
diff --git a/erpnext/patches/v13_0/update_sla_enhancements.py b/erpnext/patches/v13_0/update_sla_enhancements.py
index 84c683acd2c..8464fa8acbc 100644
--- a/erpnext/patches/v13_0/update_sla_enhancements.py
+++ b/erpnext/patches/v13_0/update_sla_enhancements.py
@@ -39,14 +39,16 @@ def execute():
for priority in priorities:
if priority.parenttype == "Service Level Agreement":
response_time = convert_to_seconds(priority.response_time, priority.response_time_period)
- resolution_time = convert_to_seconds(priority.resolution_time, priority.resolution_time_period)
+ resolution_time = convert_to_seconds(
+ priority.resolution_time, priority.resolution_time_period
+ )
frappe.db.set_value(
"Service Level Priority",
priority.name,
{"response_time": response_time, "resolution_time": resolution_time},
)
if priority.parenttype == "Service Level":
- if not priority.parent in priority_dict:
+ if priority.parent not in priority_dict:
priority_dict[priority.parent] = []
priority_dict[priority.parent].append(priority)
@@ -86,7 +88,9 @@ def execute():
{
"priority": priority.priority,
"default_priority": priority.default_priority,
- "response_time": convert_to_seconds(priority.response_time, priority.response_time_period),
+ "response_time": convert_to_seconds(
+ priority.response_time, priority.response_time_period
+ ),
"resolution_time": convert_to_seconds(
priority.resolution_time, priority.resolution_time_period
),
diff --git a/erpnext/patches/v13_0/update_subscription.py b/erpnext/patches/v13_0/update_subscription.py
index 66b3def79c4..96bd14621da 100644
--- a/erpnext/patches/v13_0/update_subscription.py
+++ b/erpnext/patches/v13_0/update_subscription.py
@@ -6,7 +6,6 @@ import frappe
def execute():
-
frappe.reload_doc("accounts", "doctype", "subscription")
frappe.reload_doc("accounts", "doctype", "subscription_invoice")
frappe.reload_doc("accounts", "doctype", "subscription_plan")
diff --git a/erpnext/patches/v13_0/update_timesheet_changes.py b/erpnext/patches/v13_0/update_timesheet_changes.py
index 02654c11d30..c54b4cbe103 100644
--- a/erpnext/patches/v13_0/update_timesheet_changes.py
+++ b/erpnext/patches/v13_0/update_timesheet_changes.py
@@ -20,12 +20,10 @@ def execute():
)
frappe.db.sql(
- """UPDATE `tabTimesheet`
- SET currency = '{0}',
+ f"""UPDATE `tabTimesheet`
+ SET currency = '{base_currency}',
exchange_rate = 1.0,
base_total_billable_amount = total_billable_amount,
base_total_billed_amount = total_billed_amount,
- base_total_costing_amount = total_costing_amount""".format(
- base_currency
- )
+ base_total_costing_amount = total_costing_amount"""
)
diff --git a/erpnext/patches/v13_0/wipe_serial_no_field_for_0_qty.py b/erpnext/patches/v13_0/wipe_serial_no_field_for_0_qty.py
index 693d06dc1a0..280635c41bc 100644
--- a/erpnext/patches/v13_0/wipe_serial_no_field_for_0_qty.py
+++ b/erpnext/patches/v13_0/wipe_serial_no_field_for_0_qty.py
@@ -2,7 +2,6 @@ import frappe
def execute():
-
doctype = "Stock Reconciliation Item"
if not frappe.db.has_column(doctype, "current_serial_no"):
@@ -11,6 +10,4 @@ def execute():
sr_item = frappe.qb.DocType(doctype)
- (
- frappe.qb.update(sr_item).set(sr_item.current_serial_no, None).where(sr_item.current_qty == 0)
- ).run()
+ (frappe.qb.update(sr_item).set(sr_item.current_serial_no, None).where(sr_item.current_qty == 0)).run()
diff --git a/erpnext/patches/v14_0/change_is_subcontracted_fieldtype.py b/erpnext/patches/v14_0/change_is_subcontracted_fieldtype.py
index 9b07ba846f4..a044bb0d9ab 100644
--- a/erpnext/patches/v14_0/change_is_subcontracted_fieldtype.py
+++ b/erpnext/patches/v14_0/change_is_subcontracted_fieldtype.py
@@ -7,20 +7,16 @@ import frappe
def execute():
for doctype in ["Purchase Order", "Purchase Receipt", "Purchase Invoice", "Supplier Quotation"]:
frappe.db.sql(
- """
+ f"""
UPDATE `tab{doctype}`
SET is_subcontracted = 0
- where is_subcontracted in ('', 'No') or is_subcontracted is null""".format(
- doctype=doctype
- )
+ where is_subcontracted in ('', 'No') or is_subcontracted is null"""
)
frappe.db.sql(
- """
+ f"""
UPDATE `tab{doctype}`
SET is_subcontracted = 1
- where is_subcontracted = 'Yes'""".format(
- doctype=doctype
- )
+ where is_subcontracted = 'Yes'"""
)
frappe.reload_doc(frappe.get_meta(doctype).module, "doctype", frappe.scrub(doctype))
diff --git a/erpnext/patches/v14_0/copy_is_subcontracted_value_to_is_old_subcontracting_flow.py b/erpnext/patches/v14_0/copy_is_subcontracted_value_to_is_old_subcontracting_flow.py
index 607ef69538e..40a408b96a6 100644
--- a/erpnext/patches/v14_0/copy_is_subcontracted_value_to_is_old_subcontracting_flow.py
+++ b/erpnext/patches/v14_0/copy_is_subcontracted_value_to_is_old_subcontracting_flow.py
@@ -7,6 +7,4 @@ import frappe
def execute():
for doctype in ["Purchase Order", "Purchase Receipt", "Purchase Invoice"]:
tab = frappe.qb.DocType(doctype).as_("tab")
- frappe.qb.update(tab).set(tab.is_old_subcontracting_flow, 1).where(
- tab.is_subcontracted == 1
- ).run()
+ frappe.qb.update(tab).set(tab.is_old_subcontracting_flow, 1).where(tab.is_subcontracted == 1).run()
diff --git a/erpnext/patches/v14_0/correct_asset_value_if_je_with_workflow.py b/erpnext/patches/v14_0/correct_asset_value_if_je_with_workflow.py
index aededa2287d..dba27b4044d 100644
--- a/erpnext/patches/v14_0/correct_asset_value_if_je_with_workflow.py
+++ b/erpnext/patches/v14_0/correct_asset_value_if_je_with_workflow.py
@@ -39,9 +39,7 @@ def correct_value_for_assets_with_manual_depr_entries():
asset.opening_accumulated_depreciation.as_("opening_accumulated_depreciation"),
Sum(gle.debit).as_("depr_amount"),
)
- .where(
- gle.account == IfNull(aca.depreciation_expense_account, company.depreciation_expense_account)
- )
+ .where(gle.account == IfNull(aca.depreciation_expense_account, company.depreciation_expense_account))
.where(gle.debit != 0)
.where(gle.is_cancelled == 0)
.where(asset.docstatus == 1)
@@ -80,9 +78,7 @@ def correct_value_for_assets_with_auto_depr(fb_name=None):
asset.opening_accumulated_depreciation.as_("opening_accumulated_depreciation"),
Sum(gle.debit).as_("depr_amount"),
)
- .where(
- gle.account == IfNull(aca.depreciation_expense_account, company.depreciation_expense_account)
- )
+ .where(gle.account == IfNull(aca.depreciation_expense_account, company.depreciation_expense_account))
.where(gle.debit != 0)
.where(gle.is_cancelled == 0)
.where(asset.docstatus == 1)
diff --git a/erpnext/patches/v14_0/create_accounting_dimensions_in_subcontracting_doctypes.py b/erpnext/patches/v14_0/create_accounting_dimensions_in_subcontracting_doctypes.py
index b349c07f6df..aedf2f176fd 100644
--- a/erpnext/patches/v14_0/create_accounting_dimensions_in_subcontracting_doctypes.py
+++ b/erpnext/patches/v14_0/create_accounting_dimensions_in_subcontracting_doctypes.py
@@ -12,7 +12,6 @@ def execute():
count = 1
for d in accounting_dimensions:
-
if count % 2 == 0:
insert_after_field = "dimension_col_break"
else:
@@ -24,7 +23,6 @@ def execute():
"Subcontracting Receipt",
"Subcontracting Receipt Item",
]:
-
field = frappe.db.get_value("Custom Field", {"dt": doctype, "fieldname": d.fieldname})
if field:
diff --git a/erpnext/patches/v14_0/crm_ux_cleanup.py b/erpnext/patches/v14_0/crm_ux_cleanup.py
index b2df36ff351..186ccf8bb3b 100644
--- a/erpnext/patches/v14_0/crm_ux_cleanup.py
+++ b/erpnext/patches/v14_0/crm_ux_cleanup.py
@@ -45,7 +45,8 @@ def add_calendar_event_for_leads():
"owner": d.lead_owner,
"subject": ("Contact " + cstr(d.lead_name)),
"description": (
- ("Contact " + cstr(d.lead_name)) + (("
By: " + cstr(d.contact_by)) if d.contact_by else "")
+ ("Contact " + cstr(d.lead_name))
+ + (("
By: " + cstr(d.contact_by)) if d.contact_by else "")
),
"starts_on": d.contact_date,
"ends_on": d.ends_on,
@@ -87,8 +88,6 @@ def add_calendar_event_for_opportunities():
}
)
- event.append(
- "event_participants", {"reference_doctype": "Opportunity", "reference_docname": d.name}
- )
+ event.append("event_participants", {"reference_doctype": "Opportunity", "reference_docname": d.name})
event.insert(ignore_permissions=True)
diff --git a/erpnext/patches/v14_0/delete_agriculture_doctypes.py b/erpnext/patches/v14_0/delete_agriculture_doctypes.py
index 8ec0c33090d..c8f9c93d279 100644
--- a/erpnext/patches/v14_0/delete_agriculture_doctypes.py
+++ b/erpnext/patches/v14_0/delete_agriculture_doctypes.py
@@ -13,9 +13,7 @@ def execute():
for report in reports:
frappe.delete_doc("Report", report, ignore_missing=True, force=True)
- dashboards = frappe.get_all(
- "Dashboard", {"module": "agriculture", "is_standard": 1}, pluck="name"
- )
+ dashboards = frappe.get_all("Dashboard", {"module": "agriculture", "is_standard": 1}, pluck="name")
for dashboard in dashboards:
frappe.delete_doc("Dashboard", dashboard, ignore_missing=True, force=True)
diff --git a/erpnext/patches/v14_0/delete_education_doctypes.py b/erpnext/patches/v14_0/delete_education_doctypes.py
index 55b64eaabd8..1d636f99a7b 100644
--- a/erpnext/patches/v14_0/delete_education_doctypes.py
+++ b/erpnext/patches/v14_0/delete_education_doctypes.py
@@ -16,9 +16,7 @@ def execute():
for report in reports:
frappe.delete_doc("Report", report, ignore_missing=True, force=True)
- print_formats = frappe.get_all(
- "Print Format", {"module": "education", "standard": "Yes"}, pluck="name"
- )
+ print_formats = frappe.get_all("Print Format", {"module": "education", "standard": "Yes"}, pluck="name")
for print_format in print_formats:
frappe.delete_doc("Print Format", print_format, ignore_missing=True, force=True)
@@ -31,9 +29,7 @@ def execute():
for dashboard in dashboards:
frappe.delete_doc("Dashboard", dashboard, ignore_missing=True, force=True)
- dashboards = frappe.get_all(
- "Dashboard Chart", {"module": "education", "is_standard": 1}, pluck="name"
- )
+ dashboards = frappe.get_all("Dashboard Chart", {"module": "education", "is_standard": 1}, pluck="name")
for dashboard in dashboards:
frappe.delete_doc("Dashboard Chart", dashboard, ignore_missing=True, force=True)
diff --git a/erpnext/patches/v14_0/delete_healthcare_doctypes.py b/erpnext/patches/v14_0/delete_healthcare_doctypes.py
index 896a4409507..b4dde5b5899 100644
--- a/erpnext/patches/v14_0/delete_healthcare_doctypes.py
+++ b/erpnext/patches/v14_0/delete_healthcare_doctypes.py
@@ -15,9 +15,7 @@ def execute():
for report in reports:
frappe.delete_doc("Report", report, ignore_missing=True, force=True)
- print_formats = frappe.get_all(
- "Print Format", {"module": "healthcare", "standard": "Yes"}, pluck="name"
- )
+ print_formats = frappe.get_all("Print Format", {"module": "healthcare", "standard": "Yes"}, pluck="name")
for print_format in print_formats:
frappe.delete_doc("Print Format", print_format, ignore_missing=True, force=True)
@@ -30,9 +28,7 @@ def execute():
for dashboard in dashboards:
frappe.delete_doc("Dashboard", dashboard, ignore_missing=True, force=True)
- dashboards = frappe.get_all(
- "Dashboard Chart", {"module": "healthcare", "is_standard": 1}, pluck="name"
- )
+ dashboards = frappe.get_all("Dashboard Chart", {"module": "healthcare", "is_standard": 1}, pluck="name")
for dashboard in dashboards:
frappe.delete_doc("Dashboard Chart", dashboard, ignore_missing=True, force=True)
diff --git a/erpnext/patches/v14_0/delete_hub_doctypes.py b/erpnext/patches/v14_0/delete_hub_doctypes.py
index 08f4445fe2e..451880d5b75 100644
--- a/erpnext/patches/v14_0/delete_hub_doctypes.py
+++ b/erpnext/patches/v14_0/delete_hub_doctypes.py
@@ -2,7 +2,6 @@ import frappe
def execute():
-
doctypes = frappe.get_all("DocType", {"module": "Hub Node", "custom": 0}, pluck="name")
for doctype in doctypes:
frappe.delete_doc("DocType", doctype, ignore_missing=True)
diff --git a/erpnext/patches/v14_0/delete_non_profit_doctypes.py b/erpnext/patches/v14_0/delete_non_profit_doctypes.py
index e9ea8b19e12..74a73fdce90 100644
--- a/erpnext/patches/v14_0/delete_non_profit_doctypes.py
+++ b/erpnext/patches/v14_0/delete_non_profit_doctypes.py
@@ -6,9 +6,7 @@ def execute():
frappe.delete_doc("Workspace", "Non Profit", ignore_missing=True, force=True)
- print_formats = frappe.get_all(
- "Print Format", {"module": "Non Profit", "standard": "Yes"}, pluck="name"
- )
+ print_formats = frappe.get_all("Print Format", {"module": "Non Profit", "standard": "Yes"}, pluck="name")
for print_format in print_formats:
frappe.delete_doc("Print Format", print_format, ignore_missing=True, force=True)
diff --git a/erpnext/patches/v14_0/fix_crm_no_of_employees.py b/erpnext/patches/v14_0/fix_crm_no_of_employees.py
index 268eb95732e..29c8b05c79f 100644
--- a/erpnext/patches/v14_0/fix_crm_no_of_employees.py
+++ b/erpnext/patches/v14_0/fix_crm_no_of_employees.py
@@ -15,12 +15,10 @@ def execute():
frappe.reload_doctype(doctype)
for key, value in options.items():
frappe.db.sql(
- """
+ f"""
update `tab{doctype}`
set no_of_employees = %s
where no_of_employees = %s
- """.format(
- doctype=doctype
- ),
+ """,
(value, key),
)
diff --git a/erpnext/patches/v14_0/migrate_cost_center_allocations.py b/erpnext/patches/v14_0/migrate_cost_center_allocations.py
index 48f4e6d9893..03e2b0289dc 100644
--- a/erpnext/patches/v14_0/migrate_cost_center_allocations.py
+++ b/erpnext/patches/v14_0/migrate_cost_center_allocations.py
@@ -44,8 +44,6 @@ def get_existing_cost_center_allocations():
cc_allocations = frappe._dict()
for d in records:
- cc_allocations.setdefault(d.name, frappe._dict()).setdefault(
- d.cost_center, d.percentage_allocation
- )
+ cc_allocations.setdefault(d.name, frappe._dict()).setdefault(d.cost_center, d.percentage_allocation)
return cc_allocations
diff --git a/erpnext/patches/v14_0/migrate_gl_to_payment_ledger.py b/erpnext/patches/v14_0/migrate_gl_to_payment_ledger.py
index 72c8c074d2c..56694065bcf 100644
--- a/erpnext/patches/v14_0/migrate_gl_to_payment_ledger.py
+++ b/erpnext/patches/v14_0/migrate_gl_to_payment_ledger.py
@@ -152,7 +152,8 @@ def execute():
gl.star,
ConstantColumn(1).as_("docstatus"),
IfNull(
- ifelse(gl.against_voucher_type == "", None, gl.against_voucher_type), gl.voucher_type
+ ifelse(gl.against_voucher_type == "", None, gl.against_voucher_type),
+ gl.voucher_type,
).as_("against_voucher_type"),
IfNull(ifelse(gl.against_voucher == "", None, gl.against_voucher), gl.voucher_no).as_(
"against_voucher_no"
diff --git a/erpnext/patches/v14_0/remove_hr_and_payroll_modules.py b/erpnext/patches/v14_0/remove_hr_and_payroll_modules.py
index 4d01fcb4216..3d01f1422e4 100644
--- a/erpnext/patches/v14_0/remove_hr_and_payroll_modules.py
+++ b/erpnext/patches/v14_0/remove_hr_and_payroll_modules.py
@@ -33,9 +33,7 @@ def execute():
]:
frappe.delete_doc("Report", report, ignore_missing=True, force=True)
- doctypes = frappe.get_all(
- "DocType", {"module": ("in", ["HR", "Payroll"]), "custom": 0}, pluck="name"
- )
+ doctypes = frappe.get_all("DocType", {"module": ("in", ["HR", "Payroll"]), "custom": 0}, pluck="name")
for doctype in doctypes:
frappe.delete_doc("DocType", doctype, ignore_missing=True, force=True)
@@ -51,9 +49,7 @@ def execute():
frappe.delete_doc("User Type", "Employee Self Service", ignore_missing=True, force=True)
for dt in ["Web Form", "Dashboard", "Dashboard Chart", "Number Card"]:
- records = frappe.get_all(
- dt, {"module": ("in", ["HR", "Payroll"]), "is_standard": 1}, pluck="name"
- )
+ records = frappe.get_all(dt, {"module": ("in", ["HR", "Payroll"]), "is_standard": 1}, pluck="name")
for record in records:
frappe.delete_doc(dt, record, ignore_missing=True, force=True)
diff --git a/erpnext/patches/v14_0/update_asset_value_for_manual_depr_entries.py b/erpnext/patches/v14_0/update_asset_value_for_manual_depr_entries.py
index 5d7b5cf19c1..9bdcda09d3c 100644
--- a/erpnext/patches/v14_0/update_asset_value_for_manual_depr_entries.py
+++ b/erpnext/patches/v14_0/update_asset_value_for_manual_depr_entries.py
@@ -17,9 +17,7 @@ def execute():
.join(company)
.on(company.name == asset.company)
.select(Sum(gle.debit).as_("value"), asset.name.as_("asset_name"))
- .where(
- gle.account == IfNull(aca.depreciation_expense_account, company.depreciation_expense_account)
- )
+ .where(gle.account == IfNull(aca.depreciation_expense_account, company.depreciation_expense_account))
.where(gle.debit != 0)
.where(gle.is_cancelled == 0)
.where(asset.docstatus == 1)
@@ -31,8 +29,4 @@ def execute():
asset_total_depr_value_map.asset_name == asset.name
).set(
asset.value_after_depreciation, asset.value_after_depreciation - asset_total_depr_value_map.value
- ).where(
- asset.docstatus == 1
- ).where(
- asset.calculate_depreciation == 0
- ).run()
+ ).where(asset.docstatus == 1).where(asset.calculate_depreciation == 0).run()
diff --git a/erpnext/patches/v14_0/update_closing_balances.py b/erpnext/patches/v14_0/update_closing_balances.py
index 2c842814839..cfc29c87fa1 100644
--- a/erpnext/patches/v14_0/update_closing_balances.py
+++ b/erpnext/patches/v14_0/update_closing_balances.py
@@ -22,7 +22,6 @@ def execute():
filters={"docstatus": 1, "company": company},
order_by="posting_date",
):
-
company_wise_order.setdefault(pcv.company, [])
if pcv.posting_date not in company_wise_order[pcv.company]:
pcv_doc = frappe.get_doc("Period Closing Voucher", pcv.name)
diff --git a/erpnext/patches/v14_0/update_flag_for_return_invoices.py b/erpnext/patches/v14_0/update_flag_for_return_invoices.py
index bea99575425..ca1b2967c53 100644
--- a/erpnext/patches/v14_0/update_flag_for_return_invoices.py
+++ b/erpnext/patches/v14_0/update_flag_for_return_invoices.py
@@ -22,7 +22,7 @@ def execute():
.where(
(si.creation.gte(creation_date))
& (si.docstatus == 1)
- & (si.is_return == True)
+ & (si.is_return is True)
& (si.return_against.notnull())
)
.run()
@@ -51,7 +51,7 @@ def execute():
.where(
(pi.creation.gte(creation_date))
& (pi.docstatus == 1)
- & (pi.is_return == True)
+ & (pi.is_return is True)
& (pi.return_against.notnull())
)
.run()
diff --git a/erpnext/patches/v14_0/update_partial_tds_fields.py b/erpnext/patches/v14_0/update_partial_tds_fields.py
index 5ccc2dc3aa2..991201395f3 100644
--- a/erpnext/patches/v14_0/update_partial_tds_fields.py
+++ b/erpnext/patches/v14_0/update_partial_tds_fields.py
@@ -14,32 +14,20 @@ def execute():
frappe.qb.update(purchase_invoice).set(
purchase_invoice.tax_withholding_net_total, purchase_invoice.net_total
- ).set(
- purchase_invoice.base_tax_withholding_net_total, purchase_invoice.base_net_total
- ).where(
+ ).set(purchase_invoice.base_tax_withholding_net_total, purchase_invoice.base_net_total).where(
purchase_invoice.company == company.name
- ).where(
- purchase_invoice.apply_tds == 1
- ).where(
+ ).where(purchase_invoice.apply_tds == 1).where(
purchase_invoice.posting_date >= fiscal_year_details.year_start_date
- ).where(
- purchase_invoice.docstatus == 1
- ).run()
+ ).where(purchase_invoice.docstatus == 1).run()
purchase_order = frappe.qb.DocType("Purchase Order")
frappe.qb.update(purchase_order).set(
purchase_order.tax_withholding_net_total, purchase_order.net_total
- ).set(
- purchase_order.base_tax_withholding_net_total, purchase_order.base_net_total
- ).where(
+ ).set(purchase_order.base_tax_withholding_net_total, purchase_order.base_net_total).where(
purchase_order.company == company.name
- ).where(
- purchase_order.apply_tds == 1
- ).where(
+ ).where(purchase_order.apply_tds == 1).where(
purchase_order.transaction_date >= fiscal_year_details.year_start_date
- ).where(
- purchase_order.docstatus == 1
- ).run()
+ ).where(purchase_order.docstatus == 1).run()
except FiscalYearError:
pass
diff --git a/erpnext/portal/doctype/homepage/homepage.py b/erpnext/portal/doctype/homepage/homepage.py
index 0d2e3607881..be90776cca3 100644
--- a/erpnext/portal/doctype/homepage/homepage.py
+++ b/erpnext/portal/doctype/homepage/homepage.py
@@ -20,7 +20,6 @@ class Homepage(Document):
filters={"published": 1},
limit=3,
):
-
doc = frappe.get_doc("Website Item", d.name)
if not doc.route:
# set missing route
diff --git a/erpnext/projects/doctype/project/project.py b/erpnext/projects/doctype/project/project.py
index 8704147cd22..29a288ef671 100644
--- a/erpnext/projects/doctype/project/project.py
+++ b/erpnext/projects/doctype/project/project.py
@@ -17,7 +17,7 @@ from erpnext.setup.doctype.holiday_list.holiday_list import is_holiday
class Project(Document):
def get_feed(self):
- return "{0}: {1}".format(_(self.status), frappe.safe_decode(self.project_name))
+ return f"{_(self.status)}: {frappe.safe_decode(self.project_name)}"
def onload(self):
self.set_onload(
@@ -49,7 +49,6 @@ class Project(Document):
Copy tasks from template
"""
if self.project_template and not frappe.db.get_all("Task", dict(project=self.name), limit=1):
-
# has a template, and no loaded tasks, so lets create
if not self.expected_start_date:
# project starts today
@@ -120,7 +119,9 @@ class Project(Document):
for child_task in template_task.get("depends_on"):
if project_template_map and project_template_map.get(child_task.task):
project_task.reload() # reload, as it might have been updated in the previous iteration
- project_task.append("depends_on", {"task": project_template_map.get(child_task.task).name})
+ project_task.append(
+ "depends_on", {"task": project_template_map.get(child_task.task).name}
+ )
project_task.save()
def check_for_parent_tasks(self, template_task, project_task, project_tasks):
@@ -274,7 +275,7 @@ class Project(Document):
frappe.db.set_value("Project", new_name, "copied_from", new_name)
def send_welcome_email(self):
- url = get_url("/project/?name={0}".format(self.name))
+ url = get_url(f"/project/?name={self.name}")
messages = (
_("You have been invited to collaborate on the project: {0}").format(self.name),
url,
@@ -289,7 +290,9 @@ class Project(Document):
for user in self.users:
if user.welcome_email_sent == 0:
frappe.sendmail(
- user.user, subject=_("Project Collaboration Invitation"), content=content.format(*messages)
+ user.user,
+ subject=_("Project Collaboration Invitation"),
+ content=content.format(*messages),
)
user.welcome_email_sent = 1
@@ -308,9 +311,7 @@ def get_timeline_data(doctype, name):
)
-def get_project_list(
- doctype, txt, filters, limit_start, limit_page_length=20, order_by="modified"
-):
+def get_project_list(doctype, txt, filters, limit_start, limit_page_length=20, order_by="modified"):
meta = frappe.get_meta(doctype)
if not filters:
filters = []
@@ -594,9 +595,7 @@ def update_project_sales_billing():
return
# Else simply fallback to Daily
- exists_query = (
- "(SELECT 1 from `tab{doctype}` where docstatus = 1 and project = `tabProject`.name)"
- )
+ exists_query = "(SELECT 1 from `tab{doctype}` where docstatus = 1 and project = `tabProject`.name)"
project_map = {}
for project_details in frappe.db.sql(
"""
@@ -639,7 +638,7 @@ def set_project_status(project, status):
"""
set status for project and all related tasks
"""
- if not status in ("Completed", "Cancelled"):
+ if status not in ("Completed", "Cancelled"):
frappe.throw(_("Status must be Cancelled or Completed"))
project = frappe.get_doc("Project", project)
@@ -659,9 +658,7 @@ def get_holiday_list(company=None):
holiday_list = frappe.get_cached_value("Company", company, "default_holiday_list")
if not holiday_list:
frappe.throw(
- _("Please set a default Holiday List for Company {0}").format(
- frappe.bold(get_default_company())
- )
+ _("Please set a default Holiday List for Company {0}").format(frappe.bold(get_default_company()))
)
return holiday_list
diff --git a/erpnext/projects/doctype/project/test_project.py b/erpnext/projects/doctype/project/test_project.py
index b8340ffe193..1b7460f7a2a 100644
--- a/erpnext/projects/doctype/project/test_project.py
+++ b/erpnext/projects/doctype/project/test_project.py
@@ -30,9 +30,7 @@ class TestProject(FrappeTestCase):
priority="High",
)
- template = make_project_template(
- "Test Project Template - No Parent and Dependend Tasks", [task1]
- )
+ template = make_project_template("Test Project Template - No Parent and Dependend Tasks", [task1])
project = get_project(project_name, template)
tasks = frappe.get_all(
"Task",
@@ -185,9 +183,7 @@ class TestProject(FrappeTestCase):
template_parent_task3,
template_task3,
]
- project_template = make_project_template(
- "Project template with common Task Subject", template_tasks
- )
+ project_template = make_project_template("Project template with common Task Subject", template_tasks)
# Step - 4: Create Project against the Project Template
project = get_project("Project with common Task Subject", project_template)
@@ -196,7 +192,7 @@ class TestProject(FrappeTestCase):
)
# Test - 1: No. of Project Tasks should be equal to No. of Template Tasks
- self.assertEquals(len(project_tasks), len(template_tasks))
+ self.assertEqual(len(project_tasks), len(template_tasks))
# Test - 2: All child Project Tasks should have Parent Task linked
for pt in project_tasks:
@@ -205,7 +201,6 @@ class TestProject(FrappeTestCase):
def get_project(name, template):
-
project = frappe.get_doc(
dict(
doctype="Project",
diff --git a/erpnext/projects/doctype/project_template/test_project_template.py b/erpnext/projects/doctype/project_template/test_project_template.py
index 4fd24bf78a2..382ffd5aa4c 100644
--- a/erpnext/projects/doctype/project_template/test_project_template.py
+++ b/erpnext/projects/doctype/project_template/test_project_template.py
@@ -12,7 +12,9 @@ class TestProjectTemplate(unittest.TestCase):
pass
-def make_project_template(project_template_name, project_tasks=[]):
+def make_project_template(project_template_name, project_tasks=None):
+ if project_tasks is None:
+ project_tasks = []
if not frappe.db.exists("Project Template", project_template_name):
project_tasks = project_tasks or [
create_task(subject="_Test Template Task 1", is_template=1, begin=0, duration=3),
diff --git a/erpnext/projects/doctype/project_update/project_update.py b/erpnext/projects/doctype/project_update/project_update.py
index 175f787a303..7390621860d 100644
--- a/erpnext/projects/doctype/project_update/project_update.py
+++ b/erpnext/projects/doctype/project_update/project_update.py
@@ -34,13 +34,8 @@ def daily_reminder():
email_sending(project_name, frequency, date_start, date_end, progress, number_of_drafts, update)
-def email_sending(
- project_name, frequency, date_start, date_end, progress, number_of_drafts, update
-):
-
- holiday = frappe.db.sql(
- """SELECT holiday_date FROM `tabHoliday` where holiday_date = CURRENT_DATE;"""
- )
+def email_sending(project_name, frequency, date_start, date_end, progress, number_of_drafts, update):
+ holiday = frappe.db.sql("""SELECT holiday_date FROM `tabHoliday` where holiday_date = CURRENT_DATE;""")
msg = (
"Project Name: "
+ project_name
@@ -87,8 +82,6 @@ def email_sending(
if len(holiday) == 0:
email = frappe.db.sql("""SELECT user from `tabProject User` WHERE parent = %s;""", project_name)
for emails in email:
- frappe.sendmail(
- recipients=emails, subject=frappe._(project_name + " " + "Summary"), message=msg
- )
+ frappe.sendmail(recipients=emails, subject=frappe._(project_name + " " + "Summary"), message=msg)
else:
pass
diff --git a/erpnext/projects/doctype/task/task.py b/erpnext/projects/doctype/task/task.py
index 1a7834257ca..b051494a651 100755
--- a/erpnext/projects/doctype/task/task.py
+++ b/erpnext/projects/doctype/task/task.py
@@ -24,7 +24,7 @@ class Task(NestedSet):
nsm_parent_field = "parent_task"
def get_feed(self):
- return "{0}: {1}".format(_(self.status), self.subject)
+ return f"{_(self.status)}: {self.subject}"
def get_customer_details(self):
cust = frappe.db.sql("select customer_name from `tabCustomer` where name=%s", self.customer)
@@ -118,14 +118,14 @@ class Task(NestedSet):
def validate_parent_template_task(self):
if self.parent_task:
if not frappe.db.get_value("Task", self.parent_task, "is_template"):
- parent_task_format = """{0}""".format(self.parent_task)
+ parent_task_format = f"""{self.parent_task}"""
frappe.throw(_("Parent Task {0} is not a Template Task").format(parent_task_format))
def validate_depends_on_tasks(self):
if self.depends_on:
for task in self.depends_on:
if not frappe.db.get_value("Task", task.task, "is_template"):
- dependent_task_format = """{0}""".format(task.task)
+ dependent_task_format = f"""{task.task}"""
frappe.throw(_("Dependent Task {0} is not a Template Task").format(dependent_task_format))
def validate_completed_on(self):
@@ -184,7 +184,7 @@ class Task(NestedSet):
task_list, count = [self.name], 0
while len(task_list) > count:
tasks = frappe.db.sql(
- " select %s from `tabTask Depends On` where %s = %s " % (d[0], d[1], "%s"),
+ " select {} from `tabTask Depends On` where {} = {} ".format(d[0], d[1], "%s"),
cstr(task_list[count]),
)
count = count + 1
@@ -276,14 +276,12 @@ def get_project(doctype, txt, searchfield, start, page_len, filters):
search_cond = " or " + " or ".join(field + " like %(txt)s" for field in searchfields)
return frappe.db.sql(
- """ select name {search_columns} from `tabProject`
+ f""" select name {search_columns} from `tabProject`
where %(key)s like %(txt)s
%(mcond)s
- {search_condition}
+ {search_cond}
order by name
- limit %(page_len)s offset %(start)s""".format(
- search_columns=search_columns, search_condition=search_cond
- ),
+ limit %(page_len)s offset %(start)s""",
{
"key": searchfield,
"txt": "%" + txt + "%",
@@ -343,7 +341,6 @@ def make_timesheet(source_name, target_doc=None, ignore_permissions=False):
@frappe.whitelist()
def get_children(doctype, parent, task=None, project=None, is_root=False):
-
filters = [["docstatus", "<", "2"]]
if task:
diff --git a/erpnext/projects/doctype/task/test_task.py b/erpnext/projects/doctype/task/test_task.py
index ea7d6edcdf9..b0194b08dfa 100644
--- a/erpnext/projects/doctype/task/test_task.py
+++ b/erpnext/projects/doctype/task/test_task.py
@@ -131,9 +131,7 @@ def create_task(
task.exp_start_date = start or nowdate()
task.exp_end_date = end or nowdate()
task.project = (
- project or None
- if is_template
- else frappe.get_value("Project", {"project_name": "_Test Project"})
+ project or None if is_template else frappe.get_value("Project", {"project_name": "_Test Project"})
)
task.is_template = is_template
task.start = begin
diff --git a/erpnext/projects/doctype/timesheet/test_timesheet.py b/erpnext/projects/doctype/timesheet/test_timesheet.py
index 828a55e7bc1..da042f36aef 100644
--- a/erpnext/projects/doctype/timesheet/test_timesheet.py
+++ b/erpnext/projects/doctype/timesheet/test_timesheet.py
@@ -5,7 +5,7 @@ import datetime
import unittest
import frappe
-from frappe.utils import add_months, add_to_date, now_datetime, nowdate
+from frappe.utils import add_to_date, now_datetime, nowdate
from erpnext.accounts.doctype.sales_invoice.test_sales_invoice import create_sales_invoice
from erpnext.projects.doctype.timesheet.timesheet import OverlapError, make_sales_invoice
@@ -40,9 +40,7 @@ class TestTimesheet(unittest.TestCase):
emp = make_employee("test_employee_6@salary.com")
timesheet = make_timesheet(emp, simulate=True, is_billable=1)
- sales_invoice = make_sales_invoice(
- timesheet.name, "_Test Item", "_Test Customer", currency="INR"
- )
+ sales_invoice = make_sales_invoice(timesheet.name, "_Test Item", "_Test Customer", currency="INR")
sales_invoice.due_date = nowdate()
sales_invoice.submit()
timesheet = frappe.get_doc("Timesheet", timesheet.name)
@@ -211,9 +209,7 @@ def make_timesheet(
timesheet_detail.activity_type = activity_type
timesheet_detail.from_time = now_datetime()
timesheet_detail.hours = 2
- timesheet_detail.to_time = timesheet_detail.from_time + datetime.timedelta(
- hours=timesheet_detail.hours
- )
+ timesheet_detail.to_time = timesheet_detail.from_time + datetime.timedelta(hours=timesheet_detail.hours)
timesheet_detail.project = project
timesheet_detail.task = task
diff --git a/erpnext/projects/doctype/timesheet/timesheet.py b/erpnext/projects/doctype/timesheet/timesheet.py
index 4db647eb3e2..e67841e0358 100644
--- a/erpnext/projects/doctype/timesheet/timesheet.py
+++ b/erpnext/projects/doctype/timesheet/timesheet.py
@@ -293,12 +293,10 @@ def get_projectwise_timesheet_data(project=None, parent=None, from_time=None, to
@frappe.whitelist()
def get_timesheet_detail_rate(timelog, currency):
timelog_detail = frappe.db.sql(
- """SELECT tsd.billing_amount as billing_amount,
+ f"""SELECT tsd.billing_amount as billing_amount,
ts.currency as currency FROM `tabTimesheet Detail` tsd
INNER JOIN `tabTimesheet` ts ON ts.name=tsd.parent
- WHERE tsd.name = '{0}'""".format(
- timelog
- ),
+ WHERE tsd.name = '{timelog}'""",
as_dict=1,
)[0]
@@ -320,14 +318,12 @@ def get_timesheet(doctype, txt, searchfield, start, page_len, filters):
condition = "and tsd.project = %(project)s"
return frappe.db.sql(
- """select distinct tsd.parent from `tabTimesheet Detail` tsd,
+ f"""select distinct tsd.parent from `tabTimesheet Detail` tsd,
`tabTimesheet` ts where
ts.status in ('Submitted', 'Payslip') and tsd.parent = ts.name and
tsd.docstatus = 1 and ts.total_billable_amount > 0
and tsd.parent LIKE %(txt)s {condition}
- order by tsd.parent limit %(page_len)s offset %(start)s""".format(
- condition=condition
- ),
+ order by tsd.parent limit %(page_len)s offset %(start)s""",
{
"txt": "%" + txt + "%",
"start": start,
@@ -452,18 +448,14 @@ def get_events(start, end, filters=None):
where `tabTimesheet Detail`.parent = `tabTimesheet`.name
and `tabTimesheet`.docstatus < 2
and (from_time <= %(end)s and to_time >= %(start)s) {conditions} {match_cond}
- """.format(
- conditions=conditions, match_cond=get_match_cond("Timesheet")
- ),
+ """.format(conditions=conditions, match_cond=get_match_cond("Timesheet")),
{"start": start, "end": end},
as_dict=True,
update={"allDay": 0},
)
-def get_timesheets_list(
- doctype, txt, filters, limit_start, limit_page_length=20, order_by="modified"
-):
+def get_timesheets_list(doctype, txt, filters, limit_start, limit_page_length=20, order_by="modified"):
user = frappe.session.user
# find customer name from contact.
customer = ""
@@ -482,7 +474,7 @@ def get_timesheets_list(
projects = [d.name for d in frappe.get_all("Project", filters={"customer": customer})]
# Return timesheet related data to web portal.
timesheets = frappe.db.sql(
- """
+ f"""
SELECT
ts.name, tsd.activity_type, ts.status, ts.total_billable_hours,
COALESCE(ts.sales_invoice, tsd.sales_invoice) AS sales_invoice, tsd.project
@@ -494,10 +486,8 @@ def get_timesheets_list(
tsd.project IN %(projects)s
)
ORDER BY `end_date` ASC
- LIMIT {1} offset {0}
- """.format(
- limit_start, limit_page_length
- ),
+ LIMIT {limit_page_length} offset {limit_start}
+ """,
dict(sales_invoices=sales_invoices, projects=projects),
as_dict=True,
) # nosec
diff --git a/erpnext/projects/report/billing_summary.py b/erpnext/projects/report/billing_summary.py
index ac1524a49dd..ab8d3838921 100644
--- a/erpnext/projects/report/billing_summary.py
+++ b/erpnext/projects/report/billing_summary.py
@@ -50,9 +50,7 @@ def get_data(filters):
timesheets = get_timesheets(filters)
filters.from_date = frappe.utils.get_datetime(filters.from_date)
- filters.to_date = frappe.utils.add_to_date(
- frappe.utils.get_datetime(filters.to_date), days=1, seconds=-1
- )
+ filters.to_date = frappe.utils.add_to_date(frappe.utils.get_datetime(filters.to_date), days=1, seconds=-1)
timesheet_details = get_timesheet_details(filters, timesheets.keys())
diff --git a/erpnext/projects/report/delayed_tasks_summary/test_delayed_tasks_summary.py b/erpnext/projects/report/delayed_tasks_summary/test_delayed_tasks_summary.py
index 91a0607b17c..c288125ac11 100644
--- a/erpnext/projects/report/delayed_tasks_summary/test_delayed_tasks_summary.py
+++ b/erpnext/projects/report/delayed_tasks_summary/test_delayed_tasks_summary.py
@@ -31,14 +31,14 @@ class TestDelayedTasksSummary(unittest.TestCase):
{"subject": "_Test Task 98", "status": "Completed", "priority": "Low", "delay": -1},
]
report = execute(filters)
- data = list(filter(lambda x: x.subject == "_Test Task 99", report[1]))[0]
+ data = next(filter(lambda x: x.subject == "_Test Task 99", report[1]))
for key in ["subject", "status", "priority", "delay"]:
self.assertEqual(expected_data[0].get(key), data.get(key))
filters.status = "Completed"
report = execute(filters)
- data = list(filter(lambda x: x.subject == "_Test Task 98", report[1]))[0]
+ data = next(filter(lambda x: x.subject == "_Test Task 98", report[1]))
for key in ["subject", "status", "priority", "delay"]:
self.assertEqual(expected_data[1].get(key), data.get(key))
diff --git a/erpnext/projects/utils.py b/erpnext/projects/utils.py
index 3cc4da4f07d..5046d015cb6 100644
--- a/erpnext/projects/utils.py
+++ b/erpnext/projects/utils.py
@@ -19,13 +19,14 @@ def query_task(doctype, txt, searchfield, start, page_len, filters):
return frappe.db.sql(
"""select name, subject from `tabTask`
- where (`%s` like %s or `subject` like %s) %s
+ where (`{}` like {} or `subject` like {}) {}
order by
- case when `subject` like %s then 0 else 1 end,
- case when `%s` like %s then 0 else 1 end,
- `%s`,
+ case when `subject` like {} then 0 else 1 end,
+ case when `{}` like {} then 0 else 1 end,
+ `{}`,
subject
- limit %s offset %s"""
- % (searchfield, "%s", "%s", match_conditions, "%s", searchfield, "%s", searchfield, "%s", "%s"),
+ limit {} offset {}""".format(
+ searchfield, "%s", "%s", match_conditions, "%s", searchfield, "%s", searchfield, "%s", "%s"
+ ),
(search_string, search_string, order_by_string, order_by_string, page_len, start),
)
diff --git a/erpnext/quality_management/doctype/quality_procedure/quality_procedure.py b/erpnext/quality_management/doctype/quality_procedure/quality_procedure.py
index 6834abc9d41..5497e8db7ae 100644
--- a/erpnext/quality_management/doctype/quality_procedure/quality_procedure.py
+++ b/erpnext/quality_management/doctype/quality_procedure/quality_procedure.py
@@ -54,7 +54,9 @@ class QualityProcedure(NestedSet):
for process in self.processes:
if process.procedure:
- if not frappe.db.get_value("Quality Procedure", process.procedure, "parent_quality_procedure"):
+ if not frappe.db.get_value(
+ "Quality Procedure", process.procedure, "parent_quality_procedure"
+ ):
frappe.db.set_value(
"Quality Procedure", process.procedure, "parent_quality_procedure", self.name
)
@@ -66,9 +68,13 @@ class QualityProcedure(NestedSet):
if old_child_procedures := set([d.procedure for d in old_doc.processes if d.procedure]):
current_child_procedures = set([d.procedure for d in self.processes if d.procedure])
- if removed_child_procedures := list(old_child_procedures.difference(current_child_procedures)):
+ if removed_child_procedures := list(
+ old_child_procedures.difference(current_child_procedures)
+ ):
for child_procedure in removed_child_procedures:
- frappe.db.set_value("Quality Procedure", child_procedure, "parent_quality_procedure", None)
+ frappe.db.set_value(
+ "Quality Procedure", child_procedure, "parent_quality_procedure", None
+ )
def add_child_to_parent(self):
"""Add `Child Procedure` to `Parent Procedure`"""
@@ -102,7 +108,8 @@ def get_children(doctype, parent=None, parent_quality_procedure=None, is_root=Fa
# return the list in order
return [
dict(
- value=d.procedure, expandable=frappe.db.get_value("Quality Procedure", d.procedure, "is_group")
+ value=d.procedure,
+ expandable=frappe.db.get_value("Quality Procedure", d.procedure, "is_group"),
)
for d in parent_procedure.processes
if d.procedure
diff --git a/erpnext/quality_management/doctype/quality_review/quality_review.py b/erpnext/quality_management/doctype/quality_review/quality_review.py
index f691005566d..19aa6273500 100644
--- a/erpnext/quality_management/doctype/quality_review/quality_review.py
+++ b/erpnext/quality_management/doctype/quality_review/quality_review.py
@@ -47,9 +47,7 @@ def review():
def create_review(goal):
goal = frappe.get_doc("Quality Goal", goal)
- review = frappe.get_doc(
- {"doctype": "Quality Review", "goal": goal.name, "date": frappe.utils.getdate()}
- )
+ review = frappe.get_doc({"doctype": "Quality Review", "goal": goal.name, "date": frappe.utils.getdate()})
review.insert(ignore_permissions=True)
diff --git a/erpnext/regional/address_template/setup.py b/erpnext/regional/address_template/setup.py
index fd1dfa726b6..684c76620a4 100644
--- a/erpnext/regional/address_template/setup.py
+++ b/erpnext/regional/address_template/setup.py
@@ -1,5 +1,6 @@
"""Import Address Templates from ./templates directory."""
import os
+
import frappe
@@ -26,7 +27,7 @@ def get_address_templates():
def get_file_content(file_name):
"""Convert 'united_states.html' to '/path/to/united_states.html'."""
full_path = os.path.join(template_dir, file_name)
- with open(full_path, "r") as f:
+ with open(full_path) as f:
content = f.read()
return content
@@ -41,7 +42,7 @@ def get_address_templates():
def update_address_template(country, html, is_default=0):
"""Update existing Address Template or create a new one."""
if not frappe.db.exists("Country", country):
- frappe.log_error("Country {} for regional Address Template does not exist.".format(country))
+ frappe.log_error(f"Country {country} for regional Address Template does not exist.")
return
if frappe.db.exists("Address Template", country):
diff --git a/erpnext/regional/address_template/test_regional_address_template.py b/erpnext/regional/address_template/test_regional_address_template.py
index 523653b5846..952748b3338 100644
--- a/erpnext/regional/address_template/test_regional_address_template.py
+++ b/erpnext/regional/address_template/test_regional_address_template.py
@@ -32,7 +32,7 @@ class TestRegionalAddressTemplate(TestCase):
"""Update an existing Address Template."""
country = ensure_country("Germany")
if not frappe.db.exists("Address Template", country.name):
- template = frappe.get_doc(
+ frappe.get_doc(
{"doctype": "Address Template", "country": country.name, "template": "EXISTING"}
).insert()
diff --git a/erpnext/regional/doctype/import_supplier_invoice/import_supplier_invoice.py b/erpnext/regional/doctype/import_supplier_invoice/import_supplier_invoice.py
index c52685e330a..204e6f483da 100644
--- a/erpnext/regional/doctype/import_supplier_invoice/import_supplier_invoice.py
+++ b/erpnext/regional/doctype/import_supplier_invoice/import_supplier_invoice.py
@@ -77,13 +77,13 @@ class ImportSupplierInvoice(Document):
invoices_args["terms"] = get_payment_terms_from_file(file_content)
supplier_name = create_supplier(self.supplier_group, supp_dict)
- address = create_address(supplier_name, supp_dict)
+ create_address(supplier_name, supp_dict)
pi_name = create_purchase_invoice(supplier_name, file_name, invoices_args, self.name)
self.file_count += 1
if pi_name:
self.purchase_invoices_count += 1
- file_save = save_file(
+ save_file(
file_name,
encoded_content,
"Purchase Invoice",
@@ -161,7 +161,7 @@ def get_file_content(file_name, zip_file_object):
except UnicodeDecodeError:
try:
content = encoded_content.decode("utf-16")
- except UnicodeDecodeError as e:
+ except UnicodeDecodeError:
frappe.log_error("UTF-16 encoding error for File Name: " + file_name)
return content
@@ -279,7 +279,6 @@ def create_supplier(supplier_group, args):
return existing_supplier_name
else:
-
new_supplier = frappe.new_doc("Supplier")
new_supplier.supplier_name = re.sub("&", "&", args.supplier)
new_supplier.supplier_group = supplier_group
@@ -390,7 +389,7 @@ def create_purchase_invoice(supplier_name, file_name, args, name):
pi.imported_grand_total = calc_total
pi.save()
return pi.name
- except Exception as e:
+ except Exception:
frappe.db.set_value("Import Supplier Invoice", name, "status", "Error")
pi.log_error("Unable to create Puchase Invoice")
return None
diff --git a/erpnext/regional/italy/setup.py b/erpnext/regional/italy/setup.py
index 1f66b361221..23406ea85a6 100644
--- a/erpnext/regional/italy/setup.py
+++ b/erpnext/regional/italy/setup.py
@@ -7,10 +7,11 @@ import frappe
from frappe import _
from frappe.custom.doctype.custom_field.custom_field import create_custom_fields
from frappe.permissions import add_permission, update_permission_property
+
from erpnext.regional.italy import (
fiscal_regimes,
- tax_exemption_reasons,
mode_of_payment_codes,
+ tax_exemption_reasons,
vat_collectability_options,
)
diff --git a/erpnext/regional/italy/utils.py b/erpnext/regional/italy/utils.py
index f5b2e2d96b8..1e0a8805075 100644
--- a/erpnext/regional/italy/utils.py
+++ b/erpnext/regional/italy/utils.py
@@ -39,7 +39,7 @@ def export_invoices(filters=None):
attachments = get_e_invoice_attachments(invoices)
- zip_filename = "{0}-einvoices.zip".format(frappe.utils.get_datetime().strftime("%Y%m%d_%H%M%S"))
+ zip_filename = "{}-einvoices.zip".format(frappe.utils.get_datetime().strftime("%Y%m%d_%H%M%S"))
download_zip(attachments, zip_filename)
@@ -307,7 +307,9 @@ def sales_invoice_validate(doc):
for row in doc.taxes:
if row.rate == 0 and row.tax_amount == 0 and not row.tax_exemption_reason:
frappe.throw(
- _("Row {0}: Please set at Tax Exemption Reason in Sales Taxes and Charges").format(row.idx),
+ _("Row {0}: Please set at Tax Exemption Reason in Sales Taxes and Charges").format(
+ row.idx
+ ),
title=_("E-Invoicing Information Missing"),
)
@@ -338,9 +340,7 @@ def sales_invoice_on_submit(doc, method):
_("Row {0}: Please set the Mode of Payment in Payment Schedule").format(schedule.idx),
title=_("E-Invoicing Information Missing"),
)
- elif not frappe.db.get_value(
- "Mode of Payment", schedule.mode_of_payment, "mode_of_payment_code"
- ):
+ elif not frappe.db.get_value("Mode of Payment", schedule.mode_of_payment, "mode_of_payment_code"):
frappe.throw(
_("Row {0}: Please set the correct code on Mode of Payment {1}").format(
schedule.idx, schedule.mode_of_payment
@@ -473,9 +473,7 @@ def get_progressive_name_and_number(doc, replace=False):
filename = attachment.file_name.split(".xml")[0]
return filename, filename.split("_")[1]
- company_tax_id = (
- doc.company_tax_id if doc.company_tax_id.startswith("IT") else "IT" + doc.company_tax_id
- )
+ company_tax_id = doc.company_tax_id if doc.company_tax_id.startswith("IT") else "IT" + doc.company_tax_id
progressive_name = frappe.model.naming.make_autoname(company_tax_id + "_.#####")
progressive_number = progressive_name.split("_")[1]
diff --git a/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py b/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py
index 67179890088..1b2bc771f7b 100644
--- a/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py
+++ b/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py
@@ -149,12 +149,8 @@ def get_gl_entries(company, fiscal_year):
debit = frappe.query_builder.functions.Sum(gle.debit).as_("debit")
credit = frappe.query_builder.functions.Sum(gle.credit).as_("credit")
- debit_currency = frappe.query_builder.functions.Sum(gle.debit_in_account_currency).as_(
- "debitCurr"
- )
- credit_currency = frappe.query_builder.functions.Sum(gle.credit_in_account_currency).as_(
- "creditCurr"
- )
+ debit_currency = frappe.query_builder.functions.Sum(gle.debit_in_account_currency).as_("debitCurr")
+ credit_currency = frappe.query_builder.functions.Sum(gle.credit_in_account_currency).as_("creditCurr")
query = (
frappe.qb.from_(gle)
@@ -222,25 +218,21 @@ def get_result(company, fiscal_year):
result = []
company_currency = frappe.get_cached_value("Company", company, "default_currency")
- accounts = frappe.get_all(
- "Account", filters={"Company": company}, fields=["name", "account_number"]
- )
+ accounts = frappe.get_all("Account", filters={"Company": company}, fields=["name", "account_number"])
for d in data:
JournalCode = re.split("-|/|[0-9]", d.get("voucher_no"))[0]
- if d.get("voucher_no").startswith("{0}-".format(JournalCode)) or d.get("voucher_no").startswith(
- "{0}/".format(JournalCode)
+ if d.get("voucher_no").startswith(f"{JournalCode}-") or d.get("voucher_no").startswith(
+ f"{JournalCode}/"
):
EcritureNum = re.split("-|/", d.get("voucher_no"))[1]
else:
- EcritureNum = re.search(r"{0}(\d+)".format(JournalCode), d.get("voucher_no"), re.IGNORECASE)[1]
+ EcritureNum = re.search(rf"{JournalCode}(\d+)", d.get("voucher_no"), re.IGNORECASE)[1]
EcritureDate = format_datetime(d.get("GlPostDate"), "yyyyMMdd")
- account_number = [
- account.account_number for account in accounts if account.name == d.get("account")
- ]
+ account_number = [account.account_number for account in accounts if account.name == d.get("account")]
if account_number[0] is not None:
CompteNum = account_number[0]
else:
diff --git a/erpnext/regional/report/irs_1099/irs_1099.py b/erpnext/regional/report/irs_1099/irs_1099.py
index 66ade1f89fb..304a07c7e78 100644
--- a/erpnext/regional/report/irs_1099/irs_1099.py
+++ b/erpnext/regional/report/irs_1099/irs_1099.py
@@ -34,7 +34,7 @@ def execute(filters=None):
conditions += "AND s.supplier_group = %s" % frappe.db.escape(filters.get("supplier_group"))
data = frappe.db.sql(
- """
+ f"""
SELECT
s.supplier_group as "supplier_group",
gl.party AS "supplier",
@@ -55,9 +55,7 @@ def execute(filters=None):
gl.party
ORDER BY
- gl.party DESC""".format(
- conditions=conditions
- ),
+ gl.party DESC""",
{"fiscal_year": filters.fiscal_year, "company": filters.company},
as_dict=True,
)
@@ -117,7 +115,7 @@ def irs_1099_print(filters):
"Supplier", row.supplier
)
row["payments"] = fmt_money(row["payments"], precision=0, currency="USD")
- pdf = get_pdf(render_template(template, row), output=output if output else None)
+ get_pdf(render_template(template, row), output=output if output else None)
frappe.local.response.filename = (
f"{filters.fiscal_year} {filters.company} IRS 1099 Forms{IRS_1099_FORMS_FILE_EXTENSION}"
diff --git a/erpnext/regional/report/uae_vat_201/uae_vat_201.py b/erpnext/regional/report/uae_vat_201/uae_vat_201.py
index 6ef21e52ca1..1b77b3c0dd1 100644
--- a/erpnext/regional/report/uae_vat_201/uae_vat_201.py
+++ b/erpnext/regional/report/uae_vat_201/uae_vat_201.py
@@ -62,13 +62,9 @@ def append_vat_on_sales(data, filters):
frappe.format(get_reverse_charge_tax(filters), "Currency"),
)
- append_data(
- data, "4", _("Zero Rated"), frappe.format(get_zero_rated_total(filters), "Currency"), "-"
- )
+ append_data(data, "4", _("Zero Rated"), frappe.format(get_zero_rated_total(filters), "Currency"), "-")
- append_data(
- data, "5", _("Exempt Supplies"), frappe.format(get_exempt_total(filters), "Currency"), "-"
- )
+ append_data(data, "5", _("Exempt Supplies"), frappe.format(get_exempt_total(filters), "Currency"), "-")
append_data(data, "", "", "", "")
@@ -139,7 +135,7 @@ def get_total_emiratewise(filters):
conditions = get_conditions(filters)
try:
return frappe.db.sql(
- """
+ f"""
select
s.vat_emirate as emirate, sum(i.base_net_amount) as total, sum(i.tax_amount)
from
@@ -148,12 +144,10 @@ def get_total_emiratewise(filters):
i.parent = s.name
where
s.docstatus = 1 and i.is_exempt != 1 and i.is_zero_rated != 1
- {where_conditions}
+ {conditions}
group by
s.vat_emirate;
- """.format(
- where_conditions=conditions
- ),
+ """,
filters,
)
except (IndexError, TypeError):
@@ -198,7 +192,7 @@ def get_reverse_charge_tax(filters):
conditions = get_conditions_join(filters)
return (
frappe.db.sql(
- """
+ f"""
select sum(debit) from
`tabPurchase Invoice` p inner join `tabGL Entry` gl
on
@@ -208,10 +202,8 @@ def get_reverse_charge_tax(filters):
and p.docstatus = 1
and gl.docstatus = 1
and account in (select account from `tabUAE VAT Account` where parent=%(company)s)
- {where_conditions} ;
- """.format(
- where_conditions=conditions
- ),
+ {conditions} ;
+ """,
filters,
)[0][0]
or 0
@@ -240,7 +232,7 @@ def get_reverse_charge_recoverable_tax(filters):
conditions = get_conditions_join(filters)
return (
frappe.db.sql(
- """
+ f"""
select
sum(debit * p.recoverable_reverse_charge / 100)
from
@@ -253,10 +245,8 @@ def get_reverse_charge_recoverable_tax(filters):
and p.recoverable_reverse_charge > 0
and gl.docstatus = 1
and account in (select account from `tabUAE VAT Account` where parent=%(company)s)
- {where_conditions} ;
- """.format(
- where_conditions=conditions
- ),
+ {conditions} ;
+ """,
filters,
)[0][0]
or 0
@@ -354,7 +344,7 @@ def get_zero_rated_total(filters):
try:
return (
frappe.db.sql(
- """
+ f"""
select
sum(i.base_net_amount) as total
from
@@ -363,10 +353,8 @@ def get_zero_rated_total(filters):
i.parent = s.name
where
s.docstatus = 1 and i.is_zero_rated = 1
- {where_conditions} ;
- """.format(
- where_conditions=conditions
- ),
+ {conditions} ;
+ """,
filters,
)[0][0]
or 0
@@ -381,7 +369,7 @@ def get_exempt_total(filters):
try:
return (
frappe.db.sql(
- """
+ f"""
select
sum(i.base_net_amount) as total
from
@@ -390,10 +378,8 @@ def get_exempt_total(filters):
i.parent = s.name
where
s.docstatus = 1 and i.is_exempt = 1
- {where_conditions} ;
- """.format(
- where_conditions=conditions
- ),
+ {conditions} ;
+ """,
filters,
)[0][0]
or 0
diff --git a/erpnext/regional/report/vat_audit_report/vat_audit_report.py b/erpnext/regional/report/vat_audit_report/vat_audit_report.py
index 3d486ce6506..718b6c0df31 100644
--- a/erpnext/regional/report/vat_audit_report/vat_audit_report.py
+++ b/erpnext/regional/report/vat_audit_report/vat_audit_report.py
@@ -13,7 +13,7 @@ def execute(filters=None):
return VATAuditReport(filters).run()
-class VATAuditReport(object):
+class VATAuditReport:
def __init__(self, filters=None):
self.filters = frappe._dict(filters or {})
self.columns = []
@@ -58,19 +58,17 @@ class VATAuditReport(object):
self.invoices = frappe._dict()
invoice_data = frappe.db.sql(
- """
+ f"""
SELECT
- {select_columns}
+ {self.select_columns}
FROM
`tab{doctype}`
WHERE
- docstatus = 1 {where_conditions}
+ docstatus = 1 {conditions}
and is_opening = 'No'
ORDER BY
posting_date DESC
- """.format(
- select_columns=self.select_columns, doctype=doctype, where_conditions=conditions
- ),
+ """,
self.filters,
as_dict=1,
)
@@ -86,11 +84,10 @@ class VATAuditReport(object):
SELECT
item_code, parent, base_net_amount, is_zero_rated
FROM
- `tab%s Item`
+ `tab{} Item`
WHERE
- parent in (%s)
- """
- % (doctype, ", ".join(["%s"] * len(self.invoices))),
+ parent in ({})
+ """.format(doctype, ", ".join(["%s"] * len(self.invoices))),
tuple(self.invoices),
as_dict=1,
)
@@ -111,15 +108,14 @@ class VATAuditReport(object):
SELECT
parent, account_head, item_wise_tax_detail
FROM
- `tab%s`
+ `tab{}`
WHERE
- parenttype = %s and docstatus = 1
- and parent in (%s)
+ parenttype = {} and docstatus = 1
+ and parent in ({})
ORDER BY
account_head
- """
- % (self.tax_doctype, "%s", ", ".join(["%s"] * len(self.invoices.keys()))),
- tuple([doctype] + list(self.invoices.keys())),
+ """.format(self.tax_doctype, "%s", ", ".join(["%s"] * len(self.invoices.keys()))),
+ tuple([doctype, *list(self.invoices.keys())]),
)
for parent, account, item_wise_tax_detail in self.tax_details:
diff --git a/erpnext/regional/saudi_arabia/setup.py b/erpnext/regional/saudi_arabia/setup.py
index 7f41c462cce..c6ba28c5993 100644
--- a/erpnext/regional/saudi_arabia/setup.py
+++ b/erpnext/regional/saudi_arabia/setup.py
@@ -2,11 +2,12 @@
# License: GNU General Public License v3. See license.txt
import frappe
+from frappe.custom.doctype.custom_field.custom_field import create_custom_fields
from frappe.permissions import add_permission, update_permission_property
+
from erpnext.regional.saudi_arabia.wizard.operations.setup_ksa_vat_setting import (
create_ksa_vat_setting,
)
-from frappe.custom.doctype.custom_field.custom_field import create_custom_fields
def setup(company=None, patch=True):
diff --git a/erpnext/regional/saudi_arabia/wizard/operations/setup_ksa_vat_setting.py b/erpnext/regional/saudi_arabia/wizard/operations/setup_ksa_vat_setting.py
index 66d9df224e7..cf4f6e81b7b 100644
--- a/erpnext/regional/saudi_arabia/wizard/operations/setup_ksa_vat_setting.py
+++ b/erpnext/regional/saudi_arabia/wizard/operations/setup_ksa_vat_setting.py
@@ -10,7 +10,7 @@ def create_ksa_vat_setting(company):
company = frappe.get_doc("Company", company)
file_path = os.path.join(os.path.dirname(__file__), "..", "data", "ksa_vat_settings.json")
- with open(file_path, "r") as json_file:
+ with open(file_path) as json_file:
account_data = json.load(json_file)
# Creating KSA VAT Setting
diff --git a/erpnext/regional/united_arab_emirates/utils.py b/erpnext/regional/united_arab_emirates/utils.py
index 634a152147d..d71b87bd903 100644
--- a/erpnext/regional/united_arab_emirates/utils.py
+++ b/erpnext/regional/united_arab_emirates/utils.py
@@ -55,14 +55,12 @@ def get_account_currency(account):
def get_tax_accounts(company):
"""Get the list of tax accounts for a specific company."""
tax_accounts_dict = frappe._dict()
- tax_accounts_list = frappe.get_all(
- "UAE VAT Account", filters={"parent": company}, fields=["Account"]
- )
+ tax_accounts_list = frappe.get_all("UAE VAT Account", filters={"parent": company}, fields=["Account"])
if not tax_accounts_list and not frappe.flags.in_test:
frappe.throw(_('Please set Vat Accounts for Company: "{0}" in UAE VAT Settings').format(company))
for tax_account in tax_accounts_list:
- for account, name in tax_account.items():
+ for _account, name in tax_account.items():
tax_accounts_dict[name] = name
return tax_accounts_dict
@@ -106,7 +104,6 @@ def update_totals(vat_tax, base_vat_tax, doc):
doc.grand_total -= vat_tax
if doc.meta.get_field("rounded_total"):
-
if doc.is_rounded_total_disabled():
doc.outstanding_amount = doc.grand_total
@@ -120,9 +117,7 @@ def update_totals(vat_tax, base_vat_tax, doc):
doc.outstanding_amount = doc.rounded_total or doc.grand_total
doc.in_words = money_in_words(doc.grand_total, doc.currency)
- doc.base_in_words = money_in_words(
- doc.base_grand_total, erpnext.get_company_currency(doc.company)
- )
+ doc.base_in_words = money_in_words(doc.base_grand_total, erpnext.get_company_currency(doc.company))
doc.set_payment_schedule()
diff --git a/erpnext/regional/united_states/setup.py b/erpnext/regional/united_states/setup.py
index 47f24ef4e72..cb139e6ee86 100644
--- a/erpnext/regional/united_states/setup.py
+++ b/erpnext/regional/united_states/setup.py
@@ -1,10 +1,8 @@
# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and Contributors
# License: GNU General Public License v3. See license.txt
+
import frappe
-import os
-import json
-from frappe.permissions import add_permission, update_permission_property
from frappe.custom.doctype.custom_field.custom_field import create_custom_fields
diff --git a/erpnext/regional/united_states/test_united_states.py b/erpnext/regional/united_states/test_united_states.py
index 83ba6ed3ad1..e54552b0332 100644
--- a/erpnext/regional/united_states/test_united_states.py
+++ b/erpnext/regional/united_states/test_united_states.py
@@ -10,7 +10,6 @@ from erpnext.regional.report.irs_1099.irs_1099 import execute as execute_1099_re
class TestUnitedStates(unittest.TestCase):
def test_irs_1099_custom_field(self):
-
if not frappe.db.exists("Supplier", "_US 1099 Test Supplier"):
doc = frappe.new_doc("Supplier")
doc.supplier_name = "_US 1099 Test Supplier"
@@ -38,7 +37,6 @@ class TestUnitedStates(unittest.TestCase):
def make_payment_entry_to_irs_1099_supplier():
-
frappe.db.sql("delete from `tabGL Entry` where party='_US 1099 Test Supplier'")
frappe.db.sql("delete from `tabGL Entry` where against='_US 1099 Test Supplier'")
frappe.db.sql("delete from `tabPayment Entry` where party='_US 1099 Test Supplier'")
diff --git a/erpnext/selling/doctype/customer/customer.py b/erpnext/selling/doctype/customer/customer.py
index 74f68ea6922..182e10a4765 100644
--- a/erpnext/selling/doctype/customer/customer.py
+++ b/erpnext/selling/doctype/customer/customer.py
@@ -18,9 +18,8 @@ from frappe.model.rename_doc import update_linked_doctypes
from frappe.utils import cint, cstr, flt, get_formatted_email, today
from frappe.utils.user import get_users_with_role
-from erpnext.accounts.party import ( # noqa
+from erpnext.accounts.party import (
get_dashboard_info,
- get_timeline_data,
validate_party_accounts,
)
from erpnext.utilities.transaction_base import TransactionBase
@@ -49,17 +48,16 @@ class Customer(TransactionBase):
self.name = set_name_from_naming_options(frappe.get_meta(self.doctype).autoname, self)
def get_customer_name(self):
-
if frappe.db.get_value("Customer", self.customer_name) and not frappe.flags.in_import:
count = frappe.db.sql(
"""select ifnull(MAX(CAST(SUBSTRING_INDEX(name, ' ', -1) AS UNSIGNED)), 0) from tabCustomer
where name like %s""",
- "%{0} - %".format(self.customer_name),
+ f"%{self.customer_name} - %",
as_list=1,
)[0][0]
count = cint(count) + 1
- new_customer_name = "{0} - {1}".format(self.customer_name, cstr(count))
+ new_customer_name = f"{self.customer_name} - {cstr(count)}"
msgprint(
_("Changed customer name to '{}' as '{}' already exists.").format(
@@ -259,9 +257,7 @@ class Customer(TransactionBase):
)
]
- current_credit_limits = [
- d.credit_limit for d in sorted(self.credit_limits, key=lambda k: k.company)
- ]
+ current_credit_limits = [d.credit_limit for d in sorted(self.credit_limits, key=lambda k: k.company)]
if past_credit_limits == current_credit_limits:
return
@@ -442,9 +438,7 @@ def get_loyalty_programs(doc):
) and (
not loyalty_program.customer_territory
or doc.territory
- in get_nested_links(
- "Territory", loyalty_program.customer_territory, doc.flags.ignore_permissions
- )
+ in get_nested_links("Territory", loyalty_program.customer_territory, doc.flags.ignore_permissions)
):
lp_details.append(loyalty_program.name)
@@ -480,14 +474,14 @@ def get_customer_list(doctype, txt, searchfield, start, page_len, filters=None):
fields = get_fields("Customer", fields)
match_conditions = build_match_conditions("Customer")
- match_conditions = "and {}".format(match_conditions) if match_conditions else ""
+ match_conditions = f"and {match_conditions}" if match_conditions else ""
if filters:
filter_conditions = get_filters_cond(doctype, filters, [])
- match_conditions += "{}".format(filter_conditions)
+ match_conditions += f"{filter_conditions}"
return frappe.db.sql(
- """
+ f"""
select %s
from `tabCustomer`
where docstatus < 2
@@ -497,9 +491,7 @@ def get_customer_list(doctype, txt, searchfield, start, page_len, filters=None):
case when name like %s then 0 else 1 end,
case when customer_name like %s then 0 else 1 end,
name, customer_name limit %s, %s
- """.format(
- match_conditions=match_conditions
- )
+ """
% (", ".join(fields), searchfield, "%s", "%s", "%s", "%s", "%s", "%s"),
("%%%s%%" % txt, "%%%s%%" % txt, "%%%s%%" % txt, "%%%s%%" % txt, start, page_len),
)
@@ -534,12 +526,12 @@ def check_credit_limit(customer, company, ignore_outstanding_sales_order=False,
]
if not credit_controller_users_formatted:
frappe.throw(
- _("Please contact your administrator to extend the credit limits for {0}.").format(customer)
+ _("Please contact your administrator to extend the credit limits for {0}.").format(
+ customer
+ )
)
- user_list = "
".format(
- "