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

fix: Trim trailing whitespaces

Browse Source
This commit is contained in:
GangaManoj
2021-09-02 20:27:15 +05:30
parent 17bf32d8dc
commit debffbfb2d
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/selling/doctype/sales_order/sales_order.py
View File

@@ -970,15 +970,15 @@ def make_purchase_order(source_name, selected_items=None, target_doc=None):
}, target_doc, set_missing_values) }, target_doc, set_missing_values)
set_delivery_date(doc.items, source_name) set_delivery_date(doc.items, source_name)
return doc return doc
def set_delivery_date(items, sales_order): def set_delivery_date(items, sales_order):
delivery_dates = frappe.get_all( delivery_dates = frappe.get_all(
'Sales Order Item', 'Sales Order Item',
filters = { filters = {
'parent': sales_order 'parent': sales_order
}, },
fields = ['delivery_date', 'item_code'] fields = ['delivery_date', 'item_code']
) )

2
erpnext/selling/doctype/selling_settings/selling_settings.py
View File

@@ -36,7 +36,7 @@ class SellingSettings(Document):
def toggle_editable_rate_for_bundle_items(self): def toggle_editable_rate_for_bundle_items(self):
editable_bundle_item_rates = cint(self.editable_bundle_item_rates) 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) 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): def set_default_customer_group_and_territory(self):

2
erpnext/selling/sales_common.js
View File

@@ -90,7 +90,7 @@ erpnext.selling.SellingController = erpnext.TransactionController.extend({
this.frm.toggle_display("customer_name", this.frm.toggle_display("customer_name",
(this.frm.doc.customer_name && this.frm.doc.customer_name!==this.frm.doc.customer)); (this.frm.doc.customer_name && this.frm.doc.customer_name!==this.frm.doc.customer));
this.toggle_editable_price_list_rate(); this.toggle_editable_price_list_rate();
}, },

2
erpnext/stock/doctype/packed_item/packed_item.py
View File

@@ -128,7 +128,7 @@ def update_product_bundle_price(doc, parent_items):
# for the last product bundle # for the last product bundle
if doc.get("packed_items"): if doc.get("packed_items"):
update_parent_item_price(doc, parent_items[parent_items_index][0], bundle_price) update_parent_item_price(doc, parent_items[parent_items_index][0], bundle_price)
def update_parent_item_price(doc, parent_item_code, 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] parent_item_doc = doc.get('items', {'item_code': parent_item_code})[0]