nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-26 08:24:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Iterate over list instead of map's output and formatting

Browse Source
This commit is contained in:
marination
2023-01-31 17:13:05 +05:30
parent fa9b327501
commit ece6358e60
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
erpnext/selling/doctype/quotation/quotation.py
View File

@@ -102,7 +102,7 @@ class Quotation(SellingController):
def validate_alternative_items(self): def validate_alternative_items(self):
items_with_alternatives = filter(lambda item: not item.is_alternative, self.get("items")) items_with_alternatives = filter(lambda item: not item.is_alternative, self.get("items"))
items_with_alternatives = map(lambda item: item.item_code, items_with_alternatives) items_with_alternatives = list(map(lambda item: item.item_code, items_with_alternatives))
alternative_items = filter(lambda item: item.is_alternative, self.get("items")) alternative_items = filter(lambda item: item.is_alternative, self.get("items"))
for row in alternative_items: for row in alternative_items:
@@ -114,7 +114,6 @@ class Quotation(SellingController):
title=_("Invalid Item"), title=_("Invalid Item"),
) )
def update_opportunity(self, status): def update_opportunity(self, status):
for opportunity in set(d.prevdoc_docname for d in self.get("items")): for opportunity in set(d.prevdoc_docname for d in self.get("items")):
if opportunity: if opportunity:
@@ -227,7 +226,8 @@ def _make_sales_order(source_name, target_doc=None, ignore_permissions=False):
) )
alternative_map = { alternative_map = {
x.get("original_item") : x.get("alternative_item") for x in frappe.flags.get("args", {}).get("mapping", []) x.get("original_item"): x.get("alternative_item")
for x in frappe.flags.get("args", {}).get("mapping", [])
} }
def set_missing_values(source, target): def set_missing_values(source, target):
@@ -253,7 +253,7 @@ def _make_sales_order(source_name, target_doc=None, ignore_permissions=False):
target.blanket_order = obj.blanket_order target.blanket_order = obj.blanket_order
target.blanket_order_rate = obj.blanket_order_rate target.blanket_order_rate = obj.blanket_order_rate
def can_map_row(item) -> bool: def can_map_row(item) -> bool:
""" """
Row mapping from Quotation to Sales order: Row mapping from Quotation to Sales order:
1. Simple row: Map if adequate qty 1. Simple row: Map if adequate qty
@@ -275,7 +275,6 @@ def _make_sales_order(source_name, target_doc=None, ignore_permissions=False):
is_selected = alternative_map.get(item.item_code) is None is_selected = alternative_map.get(item.item_code) is None
return is_selected and has_qty return is_selected and has_qty
doclist = get_mapped_doc( doclist = get_mapped_doc(
"Quotation", "Quotation",
source_name, source_name,