diff --git a/application/models/storerequistion_model.php b/application/models/storerequistion_model.php
index fcfc42fe..37ab3d01 100755
--- a/application/models/storerequistion_model.php
+++ b/application/models/storerequistion_model.php
@@ -389,10 +389,11 @@ $this->db->select('StoreReqNo,Sr.CostCenterCode,Cc.CostCenterName
function getRequistItemList($StoreReqNo)
{
- $subQuery = ' select Str.StoreReqNo,Str.MaterialCode,Str.QuantityRequired,Str.QuantityIssued,Str.Remarks,Str.StoreComments,Mat.MaterialName,Mat.UOM,Ss.StatusName
+ $subQuery = ' select Str.StoreReqNo,Str.MaterialCode,Str.QuantityRequired,Str.QuantityIssued,Str.Remarks,Str.StoreComments,Mat.MaterialName,Mat.UOM,Ss.StatusName,St.Status,St.Quantity
from T_Store_Requestion_Details Str
join T_MaterialMaster Mat on Mat.MaterialCode = Str.MaterialCode
join T_Status Ss on Ss.StatusCode = Str.Status
+ join T_Store_Stockdetails St on St.MaterialCode=Str.MaterialCode
where Str.StoreReqNo =?';
diff --git a/application/views/editstorerequisition.php b/application/views/editstorerequisition.php
index f2e8f199..b23f2462 100755
--- a/application/views/editstorerequisition.php
+++ b/application/views/editstorerequisition.php
@@ -397,7 +397,12 @@ $(function() {
Cancel -->
Update
-
+
+
+ OK
+
@@ -795,6 +800,11 @@ function validateBeforeAdd()
}
+function Redirect()
+{
+ window.location = "storerequisition";
+}
+
function Save(status)
diff --git a/application/views/issueStoreRequistion.php b/application/views/issueStoreRequistion.php
index eeb3cc3a..624a81d9 100755
--- a/application/views/issueStoreRequistion.php
+++ b/application/views/issueStoreRequistion.php
@@ -59,6 +59,11 @@ $(function() {
.dataTables_wrapper {
padding-bottom: 0px ! important;
}
+
+
+span.highlight {
+ background-color: yellow;
+}
@@ -67,6 +72,7 @@ $(function() {
Siddharth Industries - Store Requisition -
+
@@ -133,7 +139,7 @@ $(function() {