Shiloh/brotherton-erpnext
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chore: translation / semgrep / sider fixes

Browse Source
This commit is contained in:
Ankush Menat 2021-05-23 16:41:03 +05:30
parent c15fef571f
commit 3aed662f46
No known key found for this signature in database
GPG Key ID: 8EA82E09BBD13AAF
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/stock/doctype/item/item.py
View File

@ -365,8 +365,8 @@ class Item(WebsiteGenerator):
# load attributes
for v in context.variants:
v.attributes = frappe.get_all("Item Variant Attribute",
fields=["attribute", "attribute_value"],
filters={"parent": v.name})
fields=["attribute", "attribute_value"],
filters={"parent": v.name})
# make a map for easier access in templates
v.attribute_map = frappe._dict({})
for attr in v.attributes:
@ -1256,7 +1256,7 @@ def get_uom_conv_factor(uom, stock_uom):
inverse_match = frappe.db.get_value("UOM Conversion Factor", {"to_uom": from_uom, "from_uom": to_uom}, ["value"], as_dict=1)
if inverse_match:
return 1 / inverse_match.value
return 1 / inverse_match.value
# This attempts to try and get conversion from intermediate UOM.
# case:

10
erpnext/stock/doctype/item/test_item.py
View File

@ -518,11 +518,11 @@ class TestItem(unittest.TestCase):
def test_attribute_completions(self):
expected_attrs = [{'attribute_value': 'Small'},
{'attribute_value': 'Extra Small'},
{'attribute_value': 'Extra Large'},
{'attribute_value': 'Large'},
{'attribute_value': '2XL'},
{'attribute_value': 'Medium'}]
{'attribute_value': 'Extra Small'},
{'attribute_value': 'Extra Large'},
{'attribute_value': 'Large'},
{'attribute_value': '2XL'},
{'attribute_value': 'Medium'}]
attrs = get_item_attribute("Test Size")
self.assertEqual(attrs, expected_attrs)

4
erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py
View File

@ -96,7 +96,7 @@ class StockReconciliation(StockController):
def validate_data(self):
def _get_msg(row_num, msg):
return _("Row # {0}: ").format(row_num+1) + msg
return _("Row # {0}:").format(row_num+1) + " " + msg
self.validation_messages = []
item_warehouse_combinations = []
@ -182,7 +182,7 @@ class StockReconciliation(StockController):
validate_cancelled_item(item_code, item.docstatus)
except Exception as e:
self.validation_messages.append(_("Row # ") + ("%d: " % (row.idx)) + cstr(e))
self.validation_messages.append(_("Row #") + " " + ("%d: " % (row.idx)) + cstr(e))
def update_stock_ledger(self):
""" find difference between current and expected entries