From b8aeb9ea88bc62d04945af6936b5320bba41470c Mon Sep 17 00:00:00 2001 From: marination Date: Tue, 5 Jan 2021 12:16:25 +0530 Subject: [PATCH] fix: Indentation and missing semi-colon - Fix incorrect indentation after merge conflict - Sider --- erpnext/stock/dashboard/item_dashboard.js | 2 +- erpnext/stock/doctype/stock_entry/stock_entry.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/erpnext/stock/dashboard/item_dashboard.js b/erpnext/stock/dashboard/item_dashboard.js index 20415bc07e..d3c442d303 100644 --- a/erpnext/stock/dashboard/item_dashboard.js +++ b/erpnext/stock/dashboard/item_dashboard.js @@ -163,7 +163,7 @@ erpnext.stock.ItemDashboard = Class.extend({ max_count: max_count, can_write:can_write, show_item: show_item || false - } + }; }, get_capacity_dashboard_data: function(data) { diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.py b/erpnext/stock/doctype/stock_entry/stock_entry.py index 1cb71c2db6..ecdd396f3a 100644 --- a/erpnext/stock/doctype/stock_entry/stock_entry.py +++ b/erpnext/stock/doctype/stock_entry/stock_entry.py @@ -87,7 +87,7 @@ class StockEntry(StockController): self.validate_serialized_batch() self.set_actual_qty() self.calculate_rate_and_amount() - self.validate_putaway_capacity() + self.validate_putaway_capacity() def on_submit(self): self.update_stock_ledger()