From d21d19ed95a342fe7e4664789a584b89624af439 Mon Sep 17 00:00:00 2001
From: gandhimathi <bitbucket@venbinfotech.com>
Date: Thu, 31 May 2018 14:31:52 +0530
Subject: [PATCH] currentstock

---
 .../controllers/rawmaterialdetails.php        |  1 +
 .../models/rawmaterialdetails_model.php       | 10 +++++++++
 application/views/addRawMaterial.php          |  2 +-
 application/views/bankdebit.php               |  4 ++--
 application/views/bankinvoice.php             |  6 ++---
 application/views/editOldRawmaterial.php      | 22 ++++++++++++++++---
 6 files changed, 36 insertions(+), 9 deletions(-)

diff --git a/application/controllers/rawmaterialdetails.php b/application/controllers/rawmaterialdetails.php
index be503cf2..c9e06ad2 100755
--- a/application/controllers/rawmaterialdetails.php
+++ b/application/controllers/rawmaterialdetails.php
@@ -259,6 +259,7 @@ else
             }   
             
             $data['materialDetails'] = $this->rawmaterialdetails_model->getMaterialDetails($RawMaterialID);
+            $data['currentstock'] = $this->rawmaterialdetails_model->getMaterialstock($RawMaterialID);
             $data['materialType'] = $this->rawmaterialdetails_model->getmaterialType($MaterialType );
             $data['materialCategory'] = $this->rawmaterialdetails_model->getmaterialCategory($MaterialCategory);
             $data['UOMList'] = $this->rawmaterialdetails_model->getUOM($UOM);
diff --git a/application/models/rawmaterialdetails_model.php b/application/models/rawmaterialdetails_model.php
index 9ee47436..c0fb0aaf 100755
--- a/application/models/rawmaterialdetails_model.php
+++ b/application/models/rawmaterialdetails_model.php
@@ -119,6 +119,16 @@ class rawmaterialdetails_model extends CI_Model
         return $query->result();
     }
 
+    function getMaterialstock($MaterialCode)
+    {
+  $subquery="SELECT SUM(IF(Transaction_type='Add',Quantity,0)) - SUM(IF(Transaction_type='Reduce',Quantity,0))as remainingqty
+FROM T_Material_stock_history 
+where MaterialCode='$MaterialCode'";
+$query = $this->db->query($subquery);
+return $query->result();
+
+    }
+
     function getAssetcode()
     {
         $this->db->select('AssetCode,AssetName');
diff --git a/application/views/addRawMaterial.php b/application/views/addRawMaterial.php
index ad77162b..ff74ef94 100755
--- a/application/views/addRawMaterial.php
+++ b/application/views/addRawMaterial.php
@@ -182,7 +182,7 @@ $(function() {
                                 </div>
                                 <div class="col-md-3">
                                     <div class="form-group">
-                                        <label for="conversionfactor">Open Stock</label>
+                                        <label for="conversionfactor">Opening Stock</label>
                                         <input type="text" class="form-control" id="openstock"  name="openstock" maxlength="255">
                                     </div>
                                 </div>
diff --git a/application/views/bankdebit.php b/application/views/bankdebit.php
index c614975f..350da7ed 100644
--- a/application/views/bankdebit.php
+++ b/application/views/bankdebit.php
@@ -129,8 +129,8 @@ foreach($financialyear as $item)
 					   <th>PONO</th>
 					   <th>Supplier Name</th>
 					   <th>Total PO Amount (&#8377;)</th>
-					   <th>Balance To Pay (&#8377;)</th>
-					   <th>Amount Paid (&#8377;)</th>
+					   <th>Balance payable (&#8377;)</th>
+					   <th>Balance Paid (&#8377;)</th>
                       </tr>
                    </thead>
 				   <tbody>
diff --git a/application/views/bankinvoice.php b/application/views/bankinvoice.php
index 94aec5b5..8cd18e37 100644
--- a/application/views/bankinvoice.php
+++ b/application/views/bankinvoice.php
@@ -44,7 +44,7 @@ foreach($financialyear as $item)
 			<div class="box-body">           	
 			<form method="post" action="<?php echo base_url($this->uri->uri_string()); ?>"> 
 			 	
-		     <center><h3 class="box-title"><p style="color:#3c8dbc"><b>view Invoice</b></p></h3></center>
+		     <center><h3 class="box-title"><p style="color:#3c8dbc"><b>View Invoice</b></p></h3></center>
 
 			    
 
@@ -133,8 +133,8 @@ foreach($financialyear as $item)
 					   <th>Invoice Number</th>
 					   <th>Customer Name</th>
 					   <th>Invoice Amount (&#8377;)</th>
-					   <th>Balance To Received</th>
-					   <th>AmountReceived</th>
+					   <th> Balance Receivable</th>
+					   <th> Amount Received</th>
                       </tr>
                     </thead>
 				    <tbody>
diff --git a/application/views/editOldRawmaterial.php b/application/views/editOldRawmaterial.php
index 0f255025..80a09b51 100755
--- a/application/views/editOldRawmaterial.php
+++ b/application/views/editOldRawmaterial.php
@@ -51,6 +51,16 @@ if(!empty($materialDetails))
     }
 }
 
+if(!empty($currentstock))
+{
+    foreach ($currentstock as $MC)
+    {
+        // print_r($currentstock);
+        // die();
+        $currentstock =$MC->remainingqty;
+    }
+}
+
 
 ?>
 <script> 
@@ -211,7 +221,7 @@ $("#Date").datepicker({
                                     ?>
                                 <div class="col-md-3">                                                                             
                                     <div class="form-group autoSearch" id="mc">
-                                        <label for="Matcate">Open Stock</label>
+                                        <label for="Matcate">Opening Stock</label>
                                         <input type="text" class="form-control required "  id="openstock" readonly name="openstock" value="<?php echo  $openstock;?>" maxlength="255">
                                     </div> 
 
@@ -223,7 +233,7 @@ $("#Date").datepicker({
                                         ?>
                                          <div class="col-md-3">
                                     <div class="form-group">
-                                        <label for="conversionfactor">Open Stock</label>
+                                        <label for="conversionfactor">Opening Stock</label>
                                         <input type="text" class="form-control" id="openstock"  name="openstock" maxlength="255">
                                     </div>
                                 </div>
@@ -266,8 +276,14 @@ $("#Date").datepicker({
                      
                             </div>
                             <div class="col-md-12">
+                            <div class="col-md-3">
+                                    <div class="form-group">
+                                        <label for="conversionfactor">Current Stock</label>
+                                        <input type="text" class="form-control" id="currentstock" readonly value="<?php echo $currentstock; ?>"  name="currentstock" maxlength="255">
+                                    </div>
+                                </div>
 
-                                    <div class="col-md-6">
+                                    <div class="col-md-4">
                                      <div class="form-group">
                                         <label for="remarks">Remarks</label>
                                         <input type="text" class="form-control" id="remarks"  name="remarks" maxlength="255" value="<?php echo $remarks;?>">