From 12b98027ee9771d8868562a1e0a73ab41718c645 Mon Sep 17 00:00:00 2001
From: Anand Doshi <anand@erpnext.com>
Date: Fri, 29 Aug 2014 16:11:11 +0530
Subject: [PATCH 1/2] [fix] Maintenance Scheduler periodicity validation
---
.../doctype/maintenance_schedule/maintenance_schedule.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py b/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py
index 4b06fe07fd..a739651529 100644
--- a/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py
+++ b/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py
@@ -134,7 +134,7 @@ class MaintenanceSchedule(TransactionBase):
def validate_dates_with_periodicity(self):
for d in self.get("item_maintenance_detail"):
- if d.start_date and d.end_date and d.periodicity:
+ if d.start_date and d.end_date and d.periodicity and d.periodicity!="Random":
date_diff = (getdate(d.end_date) - getdate(d.start_date)).days + 1
days_in_period = {
"Weekly": 7,
From 40a8ae290743ce61882e204486bd63980f923486 Mon Sep 17 00:00:00 2001
From: Anand Doshi <anand@erpnext.com>
Date: Fri, 29 Aug 2014 16:28:31 +0530
Subject: [PATCH 2/2] [fix] get incoming rate
---
erpnext/stock/utils.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/erpnext/stock/utils.py b/erpnext/stock/utils.py
index 100d338fd6..7264f360b9 100644
--- a/erpnext/stock/utils.py
+++ b/erpnext/stock/utils.py
@@ -67,7 +67,7 @@ def get_incoming_rate(args):
from erpnext.stock.stock_ledger import get_previous_sle
in_rate = 0
- if args.get("serial_no"):
+ if (args.get("serial_no") or "").strip():
in_rate = get_avg_purchase_rate(args.get("serial_no"))
else:
valuation_method = get_valuation_method(args.get("item_code"))