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

correction

Browse Source
This commit is contained in:
venbatechnologies@gmail.com 2017-07-13 12:04:30 +05:30
parent d5337c4275
commit e774947267
4 changed files with 51 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
application/controllers/purchaseorder.php
View File

@ -1056,7 +1056,8 @@ public function importpoprint($PONO)
$Currencycode=''; $Currencycode='';
$data['CompanyDetails'] = $this->purchaseorder_model->getCompanyInformation(); $data['CompanyDetails'] = $this->purchaseorder_model->getCompanyInformation();
$data['POItem'] = $this->purchaseorder_model->GetImportPurchaseOrderDetailsForPDF($PONO); $data['POItem'] = $this->purchaseorder_model->GetImportPurchaseOrderDetailsForPDF($PONO);
//print_r( $data['POItem']); $data['releasedetails'] = $this->purchaseorder_model->GetReleasedDetails($PONO);
//print_r( $data['releasedetails']);
foreach ($data['POItem'] as $Reqdby) foreach ($data['POItem'] as $Reqdby)
{ {
$Requester=$Reqdby->Requestedby; $Requester=$Reqdby->Requestedby;
@ -1150,7 +1151,7 @@ public function importpoprint($PONO)
$this->dompdf->load_html($php); $this->dompdf->load_html($php);
$this->dompdf->render(); $this->dompdf->render();
$data['Attachment'] = FALSE; $data['Attachment'] = FALSE;
//$this->dompdf->stream("ImportPOReport.pdf",$data,$php); $this->dompdf->stream("ImportPOReport.pdf",$data,$php);
} }

3
application/models/purchaseorder_model.php
View File

@ -1120,7 +1120,8 @@ function GetCurrencytype()
$this->db->join('T_Employee_Details re','re.EmpID=tbl.EmpID'); $this->db->join('T_Employee_Details re','re.EmpID=tbl.EmpID');
$this->db->where('mast.PONO',$PONO); $this->db->where('mast.PONO',$PONO);
$result=$this->db->get(); $result=$this->db->get();
//print_r($this->db->last_query());
//die();
return $result->result(); return $result->result();
} }

12
application/views/editimportpo.php
View File

@ -119,8 +119,8 @@ if(!empty($POMaster))
$PaymentDays=$Req->PaymentDays; $PaymentDays=$Req->PaymentDays;
$StatusName=$Req->StatusName; $StatusName=$Req->StatusName;
$Currency_Type=$Req->CurrencyType; $Currency_Type=$Req->CurrencyType;
$parentPO =$Req->ParentPO; $parentPO =$Req->ParentPO;
$DeliverySchedule=$Req->DeliverySchedule; $DeliverySchedule=$Req->DeliverySchedule;
} }
} }
//echo $ServiceDescription; //echo $ServiceDescription;
@ -4360,10 +4360,10 @@ $('.EditImport').click(function(){
var cellval = tr.cells; var cellval = tr.cells;
cellval[3].innerHTML = editQuantity; cellval[4].innerHTML = editQuantity;
cellval[4].innerHTML =editUOM; cellval[5].innerHTML =editUOM;
cellval[5].innerHTML =itemRate; cellval[6].innerHTML =itemRate;
cellval[6].innerHTML =BasicValue; cellval[7].innerHTML =BasicValue;
$('#materialCode'+userid).val(editMaterialCode); $('#materialCode'+userid).val(editMaterialCode);
$('#materialName'+userid).val(edititemname); $('#materialName'+userid).val(edititemname);

39
application/views/importpopdf.php
View File

@ -362,6 +362,45 @@
</table> </table>
<p> <p>
<div align="Left"> <b>Service Description:</b><br/><br/><?php echo $ServiceDescription;?></div></p> <div align="Left"> <b>Service Description:</b><br/><br/><?php echo $ServiceDescription;?></div></p>
<?php
if(!empty($releasedetails)){
$releasedOn = '';
foreach($releasedetails as $detail){
$releasedOn= new DateTime($detail->ReleasedOn, new DateTimeZone('Asia/Kolkata'));
?>
<table width="200%">
<tr>
<td><b>ReleasedBy:</b></td>
<td><b>ReleasedOn:</b></td>
</tr>
<tr>
<td><?php echo $detail->FirstName;?></td>
<td><?php echo $releasedOn->format('d-m-Y');?></td>
<td></td>
<td></td>
<td></td>
<td></td>
</tr>
</table>
<?php
}
}
else {
?>
<table width="200%">
<tr>
<td><b>Till Release State:</b></td>
</tr>
</table>
<?php } ?>
</div>
</div> </div>