diff --git a/GSKMTOrange/build.gradle b/GSKMTOrange/build.gradle
index 758a32f..81774ea 100644
--- a/GSKMTOrange/build.gradle
+++ b/GSKMTOrange/build.gradle
@@ -21,8 +21,8 @@ android {
         targetSdkVersion 26
 
         //For Egypt
-        versionCode 25
-        versionName "3.7"
+        versionCode 26
+        versionName "3.8"
 
         //For UAE
         /*versionCode 22
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StockDataActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StockDataActivity.java
index c2bf56a..b5a5873 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StockDataActivity.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StockDataActivity.java
@@ -270,7 +270,13 @@ public class StockDataActivity extends AppCompatActivity implements DialogCallba
                     //childDataList = new ArrayList<>();
                     childDataList = db.getMSL_Availability_StockFacingSKU_AfterSaveData(categoryId, headerDataList.get(i).getBrand_id(), store_id);
                     if (!(childDataList.size() > 0)) {
-                        childDataList = db.getMSL_Availability_StockFacingSKUData(categoryId, headerDataList.get(i).getBrand_id(), keyAccount_id, storeType_id, class_id, null, CommonString.TABLE_MAPPING_STOCK);
+
+                        if(store_flag_str.equalsIgnoreCase(CommonString.FROM_DEVIATION)) {
+                            childDataList = db.getMSL_Availability_StockFacingSKUData(categoryId, headerDataList.get(i).getBrand_id(), keyAccount_id, storeType_id, class_id, null, CommonString.TABLE_MAPPING_STOCK_ADHOC);
+                        }
+                        else {
+                            childDataList = db.getMSL_Availability_StockFacingSKUData(categoryId, headerDataList.get(i).getBrand_id(), keyAccount_id, storeType_id, class_id, null, CommonString.TABLE_MAPPING_STOCK);
+                        }
                     }
 
                     hashMapListChildData.put(hashMapListHeaderData.get(i), childDataList);