diff --git a/application/controllers/emergencypurchaseorder.php b/application/controllers/emergencypurchaseorder.php index f9c34999..76e618b4 100755 --- a/application/controllers/emergencypurchaseorder.php +++ b/application/controllers/emergencypurchaseorder.php @@ -812,6 +812,27 @@ $RequestedBy = $this->input->post('drpDepartment'); $igrD = $this->inwardgateregister_model->addigrD($igrDetails); + + + +//print_r($igrD); +//* ================================================== * / + $IGRItemNo = ''; + foreach($igrD as $value) + { + + $IGRItemNo = $value->IGRItemNo; + } + +//echo $IGRItemNo; + $MaterialstockHistoryadd= array('Ref_No'=>$IGRItemNo,'MaterialCode'=>$MaterialCode,'Transaction_type'=>'Add','Ref_Type'=>'IGR','SupplierID'=>$SupplierID,'Quantity'=>$QuantityAsPerInvoice,'ItemValue'=>$itemRate,'CreatedBy'=>$CreatedBy,'CreatedOn'=>$createddt); + + + $this->inwardgateregister_model->addMaterialStockHistory($MaterialstockHistoryadd); + //*=====================================================*/ + + + $Recqty = $this->inwardgateregister_model->getPOLineItemReceivedQty($PONO,$MaterialCode); $ReceivedQuantity = 0.00; diff --git a/application/controllers/purchaseorder.php b/application/controllers/purchaseorder.php index 7fe36e41..30d77792 100755 --- a/application/controllers/purchaseorder.php +++ b/application/controllers/purchaseorder.php @@ -1412,6 +1412,23 @@ function edited(){ $this->purchaseorder_model->updateIGR($IGRD[$j]['IGRItemNo'],$IGRDs); + +/*------------------------------- may 24 today change edit po start---------------------------------*/ + + + $MaterialstockHistoryupdate= array('SupplierID'=>$SupplierID,'Quantity'=>$Quantity,'ItemValue'=>$itemRate,'UpdateBY'=>$updatedBy,'UpdatedOn'=>$updateddt); + // print_r($MaterialstockHistoryupdate); + + $itemNo = $IGRD[$j]['IGRItemNo']; + //echo $itemNo; + + $this->purchaseorder_model->updateMatStock($itemNo, + $MaterialstockHistoryupdate); + + /*-------------------------------today change edit po end---------------------------------*/ + + + } diff --git a/application/models/inwardgateregister_model.php b/application/models/inwardgateregister_model.php index 6526b68b..24e86f74 100755 --- a/application/models/inwardgateregister_model.php +++ b/application/models/inwardgateregister_model.php @@ -16,6 +16,31 @@ class inwardgateregister_model extends CI_Model * @param number $segment : This is pagination limit * @return array $result : This is result */ + + + /*------------------------------------------------------------*/ + function addMaterialStockHistory($MaterialstockHistoryadd) +{ + + $this->db->trans_start(); + $this->db->insert('T_Material_stock_history', $MaterialstockHistoryadd); + $insert_id = $this->db->affected_rows(); + $this->db->trans_complete(); + // print_r($this->db->last_query()); + //print_r($insert_id); + if($insert_id>0) + { + $subQuery = 'select * from T_Material_stock_history'; + + $query = $this->db->query($subQuery); + + return $query->result(); + } + + +} + +/*------------------------------------------------------------*/ function igrListing() { $this->db->select('igr.*,PO.DeliveryDate,sup.SupplierName,igr.file'); diff --git a/application/models/purchaseorder_model.php b/application/models/purchaseorder_model.php index 476acdd5..2ca01592 100755 --- a/application/models/purchaseorder_model.php +++ b/application/models/purchaseorder_model.php @@ -22,6 +22,24 @@ class purchaseorder_model extends CI_Model } + +/*-----------may25-------------------*/ + + + function updateMatStock($itemNo, + $MaterialstockHistoryupdate){ + //echo'hi'; + + + $this->db->where('Ref_No',$itemNo); + $this->db->update('T_Material_stock_history', $MaterialstockHistoryupdate); + + $r = $this->db->affected_rows(); + return $r; +} + +/*-----------may25-------------------*/ + /*------------------------------*/ diff --git a/application/views/editRevenuepurchaseorder.php b/application/views/editRevenuepurchaseorder.php index 56ec65c1..40314723 100755 --- a/application/views/editRevenuepurchaseorder.php +++ b/application/views/editRevenuepurchaseorder.php @@ -4808,7 +4808,7 @@ function populateValueMainFormForEditRevenueTax() do { i += 1; - alert(i); + // alert(i); var tr= document.getElementById(i); //alert(tr); if(tr != null)