fix(treewide): manual ruff fixes

(cherry picked from commit f63396ef47)
(cherry picked from commit 7828eee014)
Signed-off-by: Akhil Narang <me@akhilnarang.dev>
This commit is contained in:
Akhil Narang
2024-03-27 12:16:13 +05:30
parent 4d34b1ead7
commit b087fb3d54
38 changed files with 98 additions and 137 deletions

View File

@@ -1,6 +1,6 @@
# Copyright (c) 2021, Frappe Technologies Pvt. Ltd. and contributors
# For license information, please see license.txt
import typing
import frappe
from frappe import _
@@ -8,7 +8,7 @@ from frappe.model.document import Document
class ItemVariantSettings(Document):
invalid_fields_for_copy_fields_in_variants = ["barcodes"]
invalid_fields_for_copy_fields_in_variants: typing.ClassVar[list] = ["barcodes"]
def set_default_fields(self):
self.fields = []

View File

@@ -182,12 +182,12 @@ class TestPackedItem(FrappeTestCase):
def sort_function(p):
return p.parent_item, p.item_code, p.qty
for sent, returned in zip(
for sent_item, returned_item in zip(
sorted(original, key=sort_function), sorted(returned, key=sort_function), strict=False
):
self.assertEqual(sent.item_code, returned.item_code)
self.assertEqual(sent.parent_item, returned.parent_item)
self.assertEqual(sent.qty, -1 * returned.qty)
self.assertEqual(sent_item.item_code, returned_item.item_code)
self.assertEqual(sent_item.parent_item, returned_item.parent_item)
self.assertEqual(sent_item.qty, -1 * returned_item.qty)
def test_returning_full_bundles(self):
from erpnext.stock.doctype.delivery_note.delivery_note import make_sales_return

View File

@@ -2,10 +2,9 @@
# License: GNU General Public License v3. See license.txt
import frappe
from frappe.permissions import add_user_permission, remove_user_permission
from frappe.tests.utils import FrappeTestCase, change_settings
from frappe.utils import add_days, flt, nowdate, nowtime, today
from frappe.utils import add_days, flt, nowtime, today
from erpnext.accounts.doctype.account.test_account import get_inventory_account
from erpnext.stock.doctype.item.test_item import (
@@ -518,10 +517,10 @@ class TestStockEntry(FrappeTestCase):
self.assertTrue(sle)
sle.sort(key=lambda x: x[1])
for i, sle in enumerate(sle):
self.assertEqual(expected_sle[i][0], sle[0])
self.assertEqual(expected_sle[i][1], sle[1])
self.assertEqual(expected_sle[i][2], sle[2])
for i, sle_value in enumerate(sle):
self.assertEqual(expected_sle[i][0], sle_value[0])
self.assertEqual(expected_sle[i][1], sle_value[1])
self.assertEqual(expected_sle[i][2], sle_value[2])
def check_gl_entries(self, voucher_type, voucher_no, expected_gl_entries):
expected_gl_entries.sort(key=lambda x: x[0])

View File

@@ -900,14 +900,14 @@ class TestStockLedgerEntry(FrappeTestCase, StockTestMixin):
receipt.submit()
expected_queues = []
for idx, rate in enumerate(rates, start=1):
for idx in range(1, len(rates) + 1):
expected_queues.append({"stock_queue": [[10, 10 * i] for i in range(1, idx + 1)]})
self.assertSLEs(receipt, expected_queues)
transfer = make_stock_entry(
item_code=item.name, source=source, target=target, qty=10, do_not_save=True, rate=10
)
for rate in rates[1:]:
for _ in rates[1:]:
row = frappe.copy_doc(transfer.items[0], ignore_no_copy=False)
transfer.append("items", row)
@@ -936,7 +936,7 @@ class TestStockLedgerEntry(FrappeTestCase, StockTestMixin):
repack = make_stock_entry(
item_code=rm.name, source=warehouse, qty=10, do_not_save=True, rate=10, purpose="Repack"
)
for rate in rates[1:]:
for _ in rates[1:]:
row = frappe.copy_doc(repack.items[0], ignore_no_copy=False)
repack.append("items", row)

View File

@@ -550,9 +550,7 @@ class StockReconciliation(StockController):
data.incoming_rate = (data.total_amount) / data.actual_qty
for key, value in merge_similar_entries.items():
new_sl_entries.append(value)
new_sl_entries.extend(merge_similar_entries.values())
return new_sl_entries
def get_gl_entries(self, warehouse_account=None):

View File

@@ -188,7 +188,7 @@ def get_child_warehouses(warehouse):
from frappe.utils.nestedset import get_descendants_of
children = get_descendants_of("Warehouse", warehouse, ignore_permissions=True, order_by="lft")
return children + [warehouse] # append self for backward compatibility
return [*children, warehouse] # append self for backward compatibility
def get_warehouses_based_on_account(account, company=None):

View File

@@ -3,7 +3,6 @@
import datetime
from collections import OrderedDict
from typing import Union
import frappe
from frappe import _
@@ -15,7 +14,7 @@ Filters = frappe._dict
Row = frappe._dict
Data = list[Row]
Columns = list[dict[str, str]]
DateTime = Union[datetime.date, datetime.datetime]
DateTime = datetime.date | datetime.datetime
FilteredEntries = list[dict[str, str | float | DateTime | None]]
ItemGroupsDict = dict[tuple[int, int], dict[str, str | int]]
SVDList = list[frappe._dict]