SIA/CI3_siddharth_application
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

poedit

Browse Source
This commit is contained in:
venbatechnologies 2018-05-15 14:18:02 +05:30
parent 2079a7598b
commit 41fc9df7d8
9 changed files with 3920 additions and 3882 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
application/controllers/purchaseorder.php
View File

@ -536,6 +536,7 @@ function edited(){
//$data['WorkStatus']=$this->purchaseorder_model->GetWorkStatus('C019'); //$data['WorkStatus']=$this->purchaseorder_model->GetWorkStatus('C019');
$data['WorkStatus']=$this->purchaseorder_model->getStatus(7); $data['WorkStatus']=$this->purchaseorder_model->getStatus(7);
//print_r($data);die;
$this->global['pageTitle'] = 'Siddharth : Edit Service Purchase order form'; $this->global['pageTitle'] = 'Siddharth : Edit Service Purchase order form';
$this->loadViews("EditservicePurchaseorder", $this->global, $data, NULL); $this->loadViews("EditservicePurchaseorder", $this->global, $data, NULL);
} }
@ -1165,7 +1166,7 @@ function edited(){
} }
//echo $LineItemNo; //echo $LineItemNo;
/*---------*/ /*---------*/
$logpo =array('PONO'=>$PONO,'Date'=>$PODate,'POType'=>$POType,'MaterialCode'=>$MaterialCode,'Quantity'=>$Quantity,'Rate'=>$Rate,'SupplierID'=>$SupplierID,'LineItemNos'=>$LineItemNo); $logpo =array('PONO'=>$PONO,'Date'=>$PODate,'POType'=>$POType,'MaterialCode'=>$MaterialCode,'Quantity'=>$Quantity,'Rate'=>$itemRate,'SupplierID'=>$SupplierID,'LineItemNos'=>$LineItemNo);
$addlog= $this->purchaseorder_model->newlogpo($logpo); $addlog= $this->purchaseorder_model->newlogpo($logpo);
/*---------*/ /*---------*/

10
application/controllers/servicepurchaseorder.php
View File

@ -309,6 +309,9 @@ $result = $this->purchaseorder_model->GetPODetailforBillingServicePO($PO);
$ItemNo = $RetItemNo[0]['ItemNo']; $ItemNo = $RetItemNo[0]['ItemNo'];
} }
$POLineItemList = array('PONO'=>$PONO, 'ReqNo'=>$Reqnumber,'MaterialCode'=>$MaterialCode,'Quantity'=>$Quantity,'Rate'=>$itemRate,'Status'=>$LineItemStatus,'CreatedBy'=>$CreateBy,'CreatedDate'=>$createddt,'CostCenterCode'=>$CostCenter,'ServiceFrequency'=>$ServiceFrequency,'ServiceMaterialDescription'=>$ItemDescription,'Per'=>$Per,'ItemNo'=>$ItemNo); $POLineItemList = array('PONO'=>$PONO, 'ReqNo'=>$Reqnumber,'MaterialCode'=>$MaterialCode,'Quantity'=>$Quantity,'Rate'=>$itemRate,'Status'=>$LineItemStatus,'CreatedBy'=>$CreateBy,'CreatedDate'=>$createddt,'CostCenterCode'=>$CostCenter,'ServiceFrequency'=>$ServiceFrequency,'ServiceMaterialDescription'=>$ItemDescription,'Per'=>$Per,'ItemNo'=>$ItemNo);
$POLineItem = $this->purchaseorder_model->addPOLineItem($POLineItemList); $POLineItem = $this->purchaseorder_model->addPOLineItem($POLineItemList);
@ -321,6 +324,13 @@ $result = $this->purchaseorder_model->GetPODetailforBillingServicePO($PO);
} }
//echo $LineItemNo; //echo $LineItemNo;
/*---------*/
$logpo =array('PONO'=>$PONO,'Date'=>$PODate,'POType'=>$POType,'MaterialCode'=>$MaterialCode,'Quantity'=>$Quantity,'Rate'=>$itemRate,'SupplierID'=>$SupplierID,'LineItemNos'=>$LineItemNo);
$addlog= $this->purchaseorder_model->newlogpo($logpo);
/*---------*/
if(trim($POType) == SERVICE ) if(trim($POType) == SERVICE )
{ {
// echo 'Success'; // echo 'Success';

13
application/models/purchaseorder_model.php
View File

@ -28,8 +28,8 @@ class purchaseorder_model extends CI_Model
function updateReqDetails($Reqnumber,$MaterialCode,$ReqDetail){ function updateReqDetails($Reqnumber,$MaterialCode,$ReqDetail){
//echo'hi'; //echo'hi';
$this->db->where('ReqNo',$Reqnumber,'MaterialCode',$MaterialCode); $this->db->where('ReqNo',$Reqnumber);
//$this->db->where('MaterialCode',$MaterialCode); $this->db->where('MaterialCode',$MaterialCode);
// $this->db->where('Quantity',$Quantity); // $this->db->where('Quantity',$Quantity);
$this->db->update('T_Requestion_Details',$ReqDetail); $this->db->update('T_Requestion_Details',$ReqDetail);
@ -63,9 +63,9 @@ Where IGRM.PONO = ? ';
// echo $IGRItemNo; // echo $IGRItemNo;
// echo $IGRNO; // echo $IGRNO;
// die(); // die();
$this->db->where('IGRItemNo',$IGRItemNo,'IGRNO',$IGRNO,'MaterialCode',$MaterialCode); $this->db->where('IGRItemNo',$IGRItemNo);
$this->db->where('IGRNO',$IGRNO);
$this->db->where('MaterialCode',$MaterialCode);
$this->db->update('T_IGR_Details',$IGRDs); $this->db->update('T_IGR_Details',$IGRDs);
$r = $this->db->affected_rows(); $r = $this->db->affected_rows();
@ -76,6 +76,9 @@ Where IGRM.PONO = ? ';
} }

8
application/views/EditservicePurchaseorder.php
View File

@ -2350,7 +2350,13 @@ $(document).ready(function () {
<td><?php echo $inde; ?></td> <td><?php echo $inde; ?></td>
<td><?php echo empty($oldpo->logDate)?"-":date('d-m-Y',strtotime($oldpo->logDate)); ?></td> <?php if($oldpo->logDate !='-'){
$logdate = date('d-m-Y',strtotime($oldpo->logDate));
}else{
$logdate = '-';
}?>
<td><?=$logdate;?></td>
<td><?php echo $oldpo->Lqty;?></td> <td><?php echo $oldpo->Lqty;?></td>
<td><?php echo $oldpo->logRate?></td> <td><?php echo $oldpo->logRate?></td>
<td><?php echo $oldpo->LSuppid?></td> <td><?php echo $oldpo->LSuppid?></td>

8
application/views/editCapitalPo.php
View File

@ -3836,7 +3836,13 @@ $("#PaymentMethod").select2();
<td><?php echo $inde; ?></td> <td><?php echo $inde; ?></td>
<td><?php echo empty($oldpo->logDate)?"-":date('d-m-Y',strtotime($oldpo->logDate)); ?></td> <?php if($oldpo->logDate !='-'){
$logdate = date('d-m-Y',strtotime($oldpo->logDate));
}else{
$logdate = '-';
}?>
<td><?=$logdate;?></td>
<td><?php echo $oldpo->Lqty;?></td> <td><?php echo $oldpo->Lqty;?></td>
<td><?php echo $oldpo->logRate?></td> <td><?php echo $oldpo->logRate?></td>
<td><?php echo $oldpo->LSuppid?></td> <td><?php echo $oldpo->LSuppid?></td>

8
application/views/editRevenuepurchaseorder.php
View File

@ -4205,6 +4205,7 @@ function calculateEditTaxValue()
</div> </div>
</div> </div>
<!--################################################################## --> <!--################################################################## -->
<div class="col-md-12" id="editpodiv"> <div class="col-md-12" id="editpodiv">
<div class="col-md-12"><label>Editable POScreen</label> <div class="col-md-12"><label>Editable POScreen</label>
<table id="edittable" class="table table-hover table-bordered" style="background-color:#fff;font-size:12px;" > <table id="edittable" class="table table-hover table-bordered" style="background-color:#fff;font-size:12px;" >
@ -4237,8 +4238,13 @@ function calculateEditTaxValue()
<td><?php echo $inde; ?></td> <td><?php echo $inde; ?></td>
<?php if($oldpo->logDate !='-'){
$logdate = date('d-m-Y',strtotime($oldpo->logDate));
}else{
$logdate = '-';
}?>
<td><?php echo empty($oldpo->logDate)?"-":date('d-m-Y',strtotime($oldpo->logDate)); ?></td> <td><?=$logdate;?></td>
<td><?php echo $oldpo->Lqty;?></td> <td><?php echo $oldpo->Lqty;?></td>
<td><?php echo $oldpo->logRate?></td> <td><?php echo $oldpo->logRate?></td>
<td><?php echo $oldpo->LSuppid?></td> <td><?php echo $oldpo->LSuppid?></td>

8
application/views/editimportpo.php
View File

@ -3104,7 +3104,13 @@ echo form_textarea($data);
<td><?php echo $inde; ?></td> <td><?php echo $inde; ?></td>
<td><?php echo empty($oldpo->logDate)?"-":date('d-m-Y',strtotime($oldpo->logDate)); ?></td> <?php if($oldpo->logDate !='-'){
$logdate = date('d-m-Y',strtotime($oldpo->logDate));
}else{
$logdate = '-';
}?>
<td><?=$logdate;?></td>
<td><?php echo $oldpo->Lqty;?></td> <td><?php echo $oldpo->Lqty;?></td>
<td><?php echo $oldpo->logRate?></td> <td><?php echo $oldpo->logRate?></td>
<td><?php echo $oldpo->LSuppid?></td> <td><?php echo $oldpo->LSuppid?></td>