mirror of
https://github.com/frappe/erpnext.git
synced 2026-05-27 00:44:45 +00:00
refactor(treewide): formatting and ruff fixes, + manually enabled F401
Signed-off-by: Akhil Narang <me@akhilnarang.dev>
This commit is contained in:
@@ -54,9 +54,7 @@ def get_level():
|
||||
sales_data.append({"Communication": communication_number})
|
||||
|
||||
# recent login
|
||||
if frappe.db.sql(
|
||||
"select name from tabUser where last_login > date_sub(now(), interval 2 day) limit 1"
|
||||
):
|
||||
if frappe.db.sql("select name from tabUser where last_login > date_sub(now(), interval 2 day) limit 1"):
|
||||
activation_level += 1
|
||||
|
||||
level = {"activation_level": activation_level, "sales_data": sales_data}
|
||||
|
||||
@@ -15,9 +15,7 @@ def transaction_processing(data, from_doctype, to_doctype):
|
||||
|
||||
length_of_data = len(deserialized_data)
|
||||
|
||||
frappe.msgprint(
|
||||
_("Started a background job to create {1} {0}").format(to_doctype, length_of_data)
|
||||
)
|
||||
frappe.msgprint(_("Started a background job to create {1} {0}").format(to_doctype, length_of_data))
|
||||
frappe.enqueue(
|
||||
job,
|
||||
deserialized_data=deserialized_data,
|
||||
@@ -57,7 +55,7 @@ def retry_failed_transactions(failed_docs: list | None):
|
||||
try:
|
||||
frappe.db.savepoint("before_creation_state")
|
||||
task(log.transaction_name, log.from_doctype, log.to_doctype)
|
||||
except Exception as e:
|
||||
except Exception:
|
||||
frappe.db.rollback(save_point="before_creation_state")
|
||||
update_log(log.name, "Failed", 1, str(frappe.get_traceback(with_context=True)))
|
||||
else:
|
||||
@@ -78,7 +76,7 @@ def job(deserialized_data, from_doctype, to_doctype):
|
||||
doc_name = d.get("name")
|
||||
frappe.db.savepoint("before_creation_state")
|
||||
task(doc_name, from_doctype, to_doctype)
|
||||
except Exception as e:
|
||||
except Exception:
|
||||
frappe.db.rollback(save_point="before_creation_state")
|
||||
fail_count += 1
|
||||
create_log(
|
||||
@@ -90,9 +88,7 @@ def job(deserialized_data, from_doctype, to_doctype):
|
||||
log_date=str(date.today()),
|
||||
)
|
||||
else:
|
||||
create_log(
|
||||
doc_name, None, from_doctype, to_doctype, status="Success", log_date=str(date.today())
|
||||
)
|
||||
create_log(doc_name, None, from_doctype, to_doctype, status="Success", log_date=str(date.today()))
|
||||
|
||||
show_job_status(fail_count, len(deserialized_data), to_doctype)
|
||||
|
||||
|
||||
@@ -92,9 +92,7 @@ def get_id_from_url(url):
|
||||
if not isinstance(url, str):
|
||||
frappe.throw(_("URL can only be a string"), title=_("Invalid URL"))
|
||||
|
||||
pattern = re.compile(
|
||||
r'[a-z\:\//\.]+(youtube|youtu)\.(com|be)/(watch\?v=|embed/|.+\?v=)?([^"&?\s]{11})?'
|
||||
)
|
||||
pattern = re.compile(r'[a-z\:\//\.]+(youtube|youtu)\.(com|be)/(watch\?v=|embed/|.+\?v=)?([^"&?\s]{11})?')
|
||||
id = pattern.match(url)
|
||||
return id.groups()[-1]
|
||||
|
||||
|
||||
@@ -6,9 +6,7 @@ class NamingSeriesNotSetError(frappe.ValidationError):
|
||||
pass
|
||||
|
||||
|
||||
def set_by_naming_series(
|
||||
doctype, fieldname, naming_series, hide_name_field=True, make_mandatory=1
|
||||
):
|
||||
def set_by_naming_series(doctype, fieldname, naming_series, hide_name_field=True, make_mandatory=1):
|
||||
"""Change a doctype's naming to user naming series"""
|
||||
from frappe.custom.doctype.property_setter.property_setter import make_property_setter
|
||||
|
||||
@@ -24,9 +22,7 @@ def set_by_naming_series(
|
||||
try:
|
||||
frappe.db.sql(
|
||||
"""update `tab{doctype}` set naming_series={s} where
|
||||
ifnull(naming_series, '')=''""".format(
|
||||
doctype=doctype, s="%s"
|
||||
),
|
||||
ifnull(naming_series, '')=''""".format(doctype=doctype, s="%s"),
|
||||
get_default_naming_series(doctype),
|
||||
)
|
||||
except NamingSeriesNotSetError:
|
||||
@@ -34,27 +30,19 @@ def set_by_naming_series(
|
||||
|
||||
if hide_name_field:
|
||||
make_property_setter(doctype, fieldname, "reqd", 0, "Check", validate_fields_for_doctype=False)
|
||||
make_property_setter(
|
||||
doctype, fieldname, "hidden", 1, "Check", validate_fields_for_doctype=False
|
||||
)
|
||||
make_property_setter(doctype, fieldname, "hidden", 1, "Check", validate_fields_for_doctype=False)
|
||||
else:
|
||||
make_property_setter(
|
||||
doctype, "naming_series", "reqd", 0, "Check", validate_fields_for_doctype=False
|
||||
)
|
||||
make_property_setter(doctype, "naming_series", "reqd", 0, "Check", validate_fields_for_doctype=False)
|
||||
make_property_setter(
|
||||
doctype, "naming_series", "hidden", 1, "Check", validate_fields_for_doctype=False
|
||||
)
|
||||
|
||||
if hide_name_field:
|
||||
make_property_setter(
|
||||
doctype, fieldname, "hidden", 0, "Check", validate_fields_for_doctype=False
|
||||
)
|
||||
make_property_setter(doctype, fieldname, "hidden", 0, "Check", validate_fields_for_doctype=False)
|
||||
make_property_setter(doctype, fieldname, "reqd", 1, "Check", validate_fields_for_doctype=False)
|
||||
|
||||
# set values for mandatory
|
||||
frappe.db.sql(
|
||||
"""update `tab{doctype}` set `{fieldname}`=`name` where
|
||||
ifnull({fieldname}, '')=''""".format(
|
||||
doctype=doctype, fieldname=fieldname
|
||||
)
|
||||
f"""update `tab{doctype}` set `{fieldname}`=`name` where
|
||||
ifnull({fieldname}, '')=''"""
|
||||
)
|
||||
|
||||
@@ -57,9 +57,7 @@ def get_web_item_qty_in_stock(item_code, item_warehouse_field, warehouse=None):
|
||||
|
||||
in_stock = int(total_stock > 0)
|
||||
|
||||
return frappe._dict(
|
||||
{"in_stock": in_stock, "stock_qty": total_stock, "is_stock_item": is_stock_item}
|
||||
)
|
||||
return frappe._dict({"in_stock": in_stock, "stock_qty": total_stock, "is_stock_item": is_stock_item})
|
||||
|
||||
|
||||
def adjust_qty_for_expired_items(item_code, stock_qty, warehouse):
|
||||
@@ -150,7 +148,9 @@ def get_price(item_code, price_list, customer_group, company, qty=1):
|
||||
if pricing_rule.pricing_rule_for == "Rate":
|
||||
rate_discount = flt(mrp) - flt(pricing_rule.price_list_rate)
|
||||
if rate_discount > 0:
|
||||
price_obj.formatted_discount_rate = fmt_money(rate_discount, currency=price_obj["currency"])
|
||||
price_obj.formatted_discount_rate = fmt_money(
|
||||
rate_discount, currency=price_obj["currency"]
|
||||
)
|
||||
price_obj.price_list_rate = pricing_rule.price_list_rate or 0
|
||||
|
||||
if price_obj:
|
||||
@@ -198,9 +198,7 @@ def get_non_stock_item_status(item_code, item_warehouse_field):
|
||||
# if item is a product bundle, check if its bundle items are in stock
|
||||
if frappe.db.exists("Product Bundle", item_code):
|
||||
items = frappe.get_doc("Product Bundle", item_code).get_all_children()
|
||||
bundle_warehouse = frappe.db.get_value(
|
||||
"Website Item", {"item_code": item_code}, item_warehouse_field
|
||||
)
|
||||
bundle_warehouse = frappe.db.get_value("Website Item", {"item_code": item_code}, item_warehouse_field)
|
||||
return all(
|
||||
get_web_item_qty_in_stock(d.item_code, item_warehouse_field, bundle_warehouse).in_stock
|
||||
for d in items
|
||||
|
||||
@@ -58,9 +58,7 @@ class TransactionBase(StatusUpdater):
|
||||
|
||||
def compare_values(self, ref_doc, fields, doc=None):
|
||||
for reference_doctype, ref_dn_list in ref_doc.items():
|
||||
prev_doc_detail_map = self.get_prev_doc_reference_details(
|
||||
ref_dn_list, reference_doctype, fields
|
||||
)
|
||||
prev_doc_detail_map = self.get_prev_doc_reference_details(ref_dn_list, reference_doctype, fields)
|
||||
for reference_name in ref_dn_list:
|
||||
prevdoc_values = prev_doc_detail_map.get(reference_name)
|
||||
if not prevdoc_values:
|
||||
|
||||
Reference in New Issue
Block a user