From debffbfb2d0bfa6ef8e1e764efb1b8e29c5f2ea8 Mon Sep 17 00:00:00 2001 From: GangaManoj Date: Thu, 2 Sep 2021 20:27:15 +0530 Subject: [PATCH] fix: Trim trailing whitespaces --- erpnext/selling/doctype/sales_order/sales_order.py | 6 +++--- .../selling/doctype/selling_settings/selling_settings.py | 2 +- erpnext/selling/sales_common.js | 2 +- erpnext/stock/doctype/packed_item/packed_item.py | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/erpnext/selling/doctype/sales_order/sales_order.py b/erpnext/selling/doctype/sales_order/sales_order.py index 47ebfe90d31..b4e70472b93 100755 --- a/erpnext/selling/doctype/sales_order/sales_order.py +++ b/erpnext/selling/doctype/sales_order/sales_order.py @@ -970,15 +970,15 @@ def make_purchase_order(source_name, selected_items=None, target_doc=None): }, target_doc, set_missing_values) set_delivery_date(doc.items, source_name) - + return doc def set_delivery_date(items, sales_order): delivery_dates = frappe.get_all( - 'Sales Order Item', + 'Sales Order Item', filters = { 'parent': sales_order - }, + }, fields = ['delivery_date', 'item_code'] ) diff --git a/erpnext/selling/doctype/selling_settings/selling_settings.py b/erpnext/selling/doctype/selling_settings/selling_settings.py index b54559ad288..92394e68ac0 100644 --- a/erpnext/selling/doctype/selling_settings/selling_settings.py +++ b/erpnext/selling/doctype/selling_settings/selling_settings.py @@ -36,7 +36,7 @@ class SellingSettings(Document): def toggle_editable_rate_for_bundle_items(self): editable_bundle_item_rates = cint(self.editable_bundle_item_rates) - + make_property_setter("Packed Item", "rate", "read_only", not(editable_bundle_item_rates), "Check", validate_fields_for_doctype=False) def set_default_customer_group_and_territory(self): diff --git a/erpnext/selling/sales_common.js b/erpnext/selling/sales_common.js index f05477ce23d..091c22271e6 100644 --- a/erpnext/selling/sales_common.js +++ b/erpnext/selling/sales_common.js @@ -90,7 +90,7 @@ erpnext.selling.SellingController = erpnext.TransactionController.extend({ this.frm.toggle_display("customer_name", (this.frm.doc.customer_name && this.frm.doc.customer_name!==this.frm.doc.customer)); - + this.toggle_editable_price_list_rate(); }, diff --git a/erpnext/stock/doctype/packed_item/packed_item.py b/erpnext/stock/doctype/packed_item/packed_item.py index 4f1a67597d9..34fe797547c 100644 --- a/erpnext/stock/doctype/packed_item/packed_item.py +++ b/erpnext/stock/doctype/packed_item/packed_item.py @@ -128,7 +128,7 @@ def update_product_bundle_price(doc, parent_items): # for the last product bundle if doc.get("packed_items"): update_parent_item_price(doc, parent_items[parent_items_index][0], bundle_price) - + def update_parent_item_price(doc, parent_item_code, bundle_price): parent_item_doc = doc.get('items', {'item_code': parent_item_code})[0]