done capital ,service screen changes

This commit is contained in:
gandhimathi 2017-09-18 15:13:51 +05:30
parent 89a04ed2ba
commit b8968a4c59
3 changed files with 11 additions and 8 deletions

View File

@ -2559,7 +2559,7 @@ function addNewImportPurchaseOrder()
$data['CompanyDetails'] = $this->purchaseorder_model->getCompanyInformation();
$data['POItem'] = $this->purchaseorder_model->GetCapitalPurchaseOrderDetailsForPDF($PONO);
$data['releasedetails'] = $this->purchaseorder_model->GetReleasedDetails($PONO);
$CurrencyType='';

View File

@ -1,6 +1,6 @@
<?php
$TotalCgst1='-';
$TotalCgst1='-';
$PONO = '';
$postatus ='';
$CompanyAddress = '';
@ -42,6 +42,7 @@
$TotalOtherAllowance=0;
$TotalFreight=0;
$CapitalRange='';
$ourRef='';
if(!empty($CompanyDetails))
{
foreach ($CompanyDetails as $CO)
@ -99,7 +100,7 @@
$supplierGst=$PO->GSTNO;
$supplierPan=$PO->PAN;
$supplierContact=$PO->ContactNumber;
$ourRef=$PO->Other_Reference;
$supplierVendor=$PO->SupplierID;
$CostCenterCode=$PO->CostCenterCode;
@ -226,9 +227,9 @@
<td colspan="3">
<span><strong>Supplier's Offer No</strong>:<br> <?php echo $supOfferNo; ?> </span>
</td>
<td colspan="3"><strong>Our Reference : </strong><br> <?php echo $supRef; ?> </td> </tr>
<td colspan="3"><strong>Our Reference : </strong><br> <?php echo $ourRef; ?> </td> </tr>
<tr>
<td colspan="4" rowspan="2"><u><strong style="font-size:16px;">Shipped From:</strong></u><br /><?php echo $SuplierName?><br/><?php echo $SuplierAddress ?> <br/><br /><strong>Email :</strong><?php echo $supplierEmail; ?><br><strong> Vendor code:</strong> <?php echo $supplierVendor; ?>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<strong>PAN:</strong> <?php echo $supplierPan; ?> <br ><strong>Contact :</strong><?php echo $supplierContact; ?> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<strong>GSTIN:</strong><?php echo $supplierGst; ?> </td>
<td colspan="4" rowspan="2"><u><strong style="font-size:16px;">Shipped From:</strong></u><br /><?php echo $SuplierName?><br/><?php echo $SuplierAddress ?> <br/><br /><strong>Email :</strong><?php echo $supplierEmail; ?><br><strong> Vendor code:</strong> <?php echo $supplierVendor; ?>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<strong>PAN:</strong> <?php echo $supplierPan; ?> <br ><strong>Contact :</strong><?php echo $supRef;; ?> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<strong>GSTIN:</strong><?php echo $supplierGst; ?> </td>
<td rowspan="2" colspan="2"><u><strong style="font-size:16px;">Shipped To:</strong></u><br /><?php echo $CompanyAddress; ?><br> <strong>State code:</strong><?php echo $CompanyStateCode; ?></td><!--data should be come-->
<td colspan="6"><strong>Delivery</strong> :<br><?php echo $DeliveryDate.$DeliverySchedule;?></td>
@ -474,7 +475,7 @@
else if($CapitalRange==0){
$TotalFreight1=$TotalFreight;
}
}
?>
&nbsp;
<p style="text-align: left;"><strong>Special instructions:</strong></p>

View File

@ -42,6 +42,7 @@
$supplierContact='';
$supplierVendor='';
$serviceDescription='';
$ourRef='';
if(!empty($CompanyDetails))
{
foreach ($CompanyDetails as $CO)
@ -121,6 +122,7 @@
$supplierContact=$PO->ContactNumber;
$serviceDescription=$PO->Description_Of_Service;
$supplierVendor=$PO->SupplierID;
$ourRef=$PO->Other_Reference;
}
}
@ -217,9 +219,9 @@
<td colspan="3">
<span><strong>Supplier's Offer No</strong>:<br> <?php echo $supOfferNo; ?></span>
</td>
<td colspan="3"><strong>Our Reference : </strong><br> <?php echo $supRef; ?></td> </tr>
<td colspan="3"><strong>Our Reference : </strong><br> <?php echo $ourRef; ?></td> </tr>
<tr>
<td colspan="4" rowspan="2"><u><strong style="font-size:16px;">Shipped From:</strong></u><br /><?php echo $SuplierName?><br/><?php echo $SuplierAddress ?> <br/><br /><strong>Email :</strong><?php echo $supplierEmail; ?><br><strong>Vendor code:</strong> <?php echo $supplierVendor; ?>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp;<strong>PAN:</strong><?php echo $supplierPan; ?><br ><strong>Contact :</strong><?php echo $supplierContact; ?>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<strong>GSTIN:</strong><?php echo $supplierGst; ?></td>
<td colspan="4" rowspan="2"><u><strong style="font-size:16px;">Shipped From:</strong></u><br /><?php echo $SuplierName?><br/><?php echo $SuplierAddress ?> <br/><br /><strong>Email :</strong><?php echo $supplierEmail; ?><br><strong>Vendor code:</strong> <?php echo $supplierVendor; ?>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp;<strong>PAN:</strong><?php echo $supplierPan; ?><br ><strong>Contact :</strong><?php echo $supRef; ?>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<strong>GSTIN:</strong><?php echo $supplierGst; ?></td>
<td rowspan="2" colspan="2"><u><strong style="font-size:16px;">Shipped To:</strong></u><br /><?php echo $CompanyAddress;?><br> <strong>State code:</strong><?php echo $CompanyStateCode;?> </td>
<td colspan="6"><strong>Delivery</strong> :<br><?php echo $DeliveryDate.$DeliverySchedule;?></td>