Revenue PDF change,payslip pdf Change
This commit is contained in:
velz2020
parent
4c6a3d31f4
commit
ef90a84094
@ -129,7 +129,7 @@ class Payroll_model extends CI_Model
|
||||
*/
|
||||
function GetPayslipdata($PayOn='',$EmpId='')
|
||||
{
|
||||
$this->db->select('Pay.*,payfile.TotalNoofDays as TotalNoofDays ,Emp.FirstName as FName ,Emp.LastName as Lname,Emp.DateofBirth as Dob,Emp.PANNo as Pan,Emp.BankBranchName as BankName,Emp.IFSCCode as IFSCCode,Emp.DateofJoining as DOJ,Emp.Designation as Designation,Dep.DepartmentName as DeptName');
|
||||
$this->db->select('Pay.*,payfile.TotalNoofDays as TotalNoofDays ,Emp.FirstName as FName ,Emp.LastName as Lname,Emp.DateofBirth as Dob,Emp.PANNo as Pan,Emp.BankBranchName as BankName,Emp.AadharNo,Emp.IFSCCode as IFSCCode,Emp.DateofJoining as DOJ,Emp.Designation as Designation,Dep.DepartmentName as DeptName');
|
||||
$this->db->from('T_Payroll Pay');
|
||||
$this->db->join('T_Payroll_File payfile', 'Pay.PayOn = payfile.PayOn');
|
||||
$this->db->join('T_Employee_Details Emp', 'Pay.EmpID = Emp.EmpID');
|
||||
|
||||
@ -708,7 +708,7 @@ function GetPOType($ReqNo)
|
||||
Mat.UOM,Mat.HSNCODE,Quantity,Rate,ROUND((Quantity *Rate),2 ) as BasicValue ,
|
||||
ROUND(((AfterSGST + AfterCGST +
|
||||
AfterIGST)) ,2)as Taxamount,AdvanceAmount,
|
||||
TotalValue,Tax.*,LineItem.CostCenterCode ,POMaster.*,sup.SupplierName,sup.Address,LineItem.AmendedDetails as LineAmend,Payment.PaymentTerms
|
||||
TotalValue,Tax.*,LineItem.CostCenterCode ,POMaster.*,sup.SupplierName,sup.Address,sup.SupplierID,sup.ContactNumber,sup.EmailAddress,sup.PAN,sup.GSTNO,LineItem.AmendedDetails as LineAmend,Payment.PaymentTerms
|
||||
FROM T_PurchaseOrder_LineItem LineItem
|
||||
join T_MaterialMaster Mat on Mat.MaterialCode = LineItem.MaterialCode
|
||||
join T_Revenue_Tax Tax on Tax.LineItemNo = LineItem.LineItemNo
|
||||
|
||||
@ -24,12 +24,28 @@
|
||||
$finCap='';
|
||||
$modeofshipment='';
|
||||
$insuranceno='';
|
||||
$companyWebsit='';
|
||||
$companyPan='';
|
||||
$companyEmail='';
|
||||
$companyGst='';
|
||||
|
||||
$supplierEmail='';
|
||||
$supcode='';
|
||||
$supplierPan='';
|
||||
$supplierContact='';
|
||||
$supplierGst='';
|
||||
$statecode='';
|
||||
if(!empty($CompanyDetails))
|
||||
{
|
||||
foreach ($CompanyDetails as $CO)
|
||||
{
|
||||
$CompanyName = $CO->CompanyName;
|
||||
$CompanyAddress = $CO->Address;
|
||||
$companyWebsit=$CO->companyWebsite;
|
||||
$companyPan=$CO->PAN;
|
||||
$companyEmail=$CO->EmailAddress;
|
||||
$companyGst=$CO->GSTNO;
|
||||
$statecode=$CO->StateCode;
|
||||
|
||||
}
|
||||
}
|
||||
@ -42,6 +58,12 @@
|
||||
$postatus= $PO->Status;
|
||||
$SuplierName = $PO->SupplierName;
|
||||
$SuplierAddress = $PO->Address;
|
||||
$supplierEmail=$PO->EmailAddress;
|
||||
$supcode=$PO->SupplierID;
|
||||
$supplierPan=$PO->PAN;
|
||||
$supplierContact=$PO->ContactNumber;
|
||||
$supplierGst=$PO->GSTNO;
|
||||
|
||||
$DeliveryAddress = $PO->DeliveryAddress;
|
||||
$postatus= $PO->Status;
|
||||
$advance=$PO->AdvanceAmount;
|
||||
@ -176,12 +198,12 @@
|
||||
<td style="text-align: left;" colspan="5" rowspan="2">
|
||||
<span><strong style="font-size:16px;"> <?php echo $CompanyName; ?> </strong></span><br>
|
||||
<span><?php echo $CompanyAddress; ?></span><br><br>
|
||||
<span><strong>web: </strong>www.Sidharthindustries.com<!-- <?php echo $companyWebsit; ?> --> </span>
|
||||
<span><strong>web: </strong><?php echo $companyWebsit; ?> </span>
|
||||
|
||||
<span><strong> PAN:</strong>BCHP6184J <!-- <?php echo $companyPan; ?> --></span><br>
|
||||
<span><strong> PAN:</strong><?php echo $companyPan; ?></span><br>
|
||||
|
||||
<span><strong>Email: </strong>purchase@sidharthindustries.com<!-- <?php echo $companyEmail; ?> --> </span>
|
||||
<span><strong> GSTIN: </strong>33BCHPS1840J1ZJ<!-- <?php echo $companyGst; ?> --></span>
|
||||
<span><strong>Email: </strong><?php echo $companyEmail; ?> </span>
|
||||
<span><strong> GSTIN: </strong><?php echo $companyGst; ?></span>
|
||||
</td>
|
||||
<td colspan="3">
|
||||
<span><strong>Purchase Order No:</strong></span><br>
|
||||
@ -199,9 +221,9 @@
|
||||
</td>
|
||||
<td colspan="3"><strong>Our Reference : </strong><br><?php echo $supRef; ?></td> </tr>
|
||||
<tr>
|
||||
<td colspan="4" rowspan="2"><u><strong style="font-size:16px;">Shipped From:</strong></u> Vendor code: Sup008 <!--data will come--><br /><?php echo $SuplierName?><br/><?php echo $SuplierAddress ?> <br/><br /><strong>Email ID:</strong>DR@dr.com<!-- <?php echo $supplierEmail; ?> --> <strong>PAN:</strong>DDDDD1234D<!-- <?php echo $supplierPan; ?> --><br ><strong>Contact :</strong>1111111111<!-- <?php echo $supplierContact; ?> --> <strong>GSTIN:</strong>33AADCR1792G1Z1<!-- <?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 $supcode;?> <strong>PAN:</strong><?php echo $supplierPan; ?><br ><strong>Contact :</strong><?php echo $supplierContact; ?> <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>33 </td><!--data should be come-->
|
||||
<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 $statecode;?></td><!--data should be come-->
|
||||
<td colspan="6"><strong>Delivery</strong> :<br><?php echo $DeliveryDate.$DeliverySchedule;?></td>
|
||||
</tr>
|
||||
|
||||
@ -229,7 +251,7 @@
|
||||
<p><strong>Insurance : </strong><?php echo $insuranceno;?></p>
|
||||
<p>Please arrange to deliver the materials listed below as per schedule to our works</p>
|
||||
|
||||
<table style="border-collapse: collapse; height: 36px; width: 100%;" border="1" cellspacing="0" cellpadding="0">
|
||||
<table style="border-collapse: collapse; height: 36px; width: 100.2%;" border="1" cellspacing="0" cellpadding="0">
|
||||
<tbody>
|
||||
<tr>
|
||||
<td style="text-align: center;"><strong> SNo</strong></td>
|
||||
@ -263,15 +285,23 @@
|
||||
$index = $index + 1;
|
||||
|
||||
?>
|
||||
<tr style="text-align: center;line-height: 1em;">
|
||||
<td><?php echo $index ; ?></td>
|
||||
<td style="text-align: left;"><?php echo $record->MaterialCode ; ?></td>
|
||||
<td style="text-align: left;"><?php echo $record->MaterialName ; ?></td>
|
||||
<td><?php if(!empty($record->HSNCODE)){echo $record->HSNCODE;}else{echo "NIL";} ; ?></td>
|
||||
<td><?php echo $record->UOM ; ?></td>
|
||||
<td><?php echo $record->Quantity ; ?></td>
|
||||
<td><?php echo $record->Rate ; ?></td>
|
||||
<td><?php echo $record->Per ; ?></td><!--per data should be come-->
|
||||
<tr style="text-align: center;line-height: 1.5em;border: none;">
|
||||
<td style="border-right: solid 1px ;
|
||||
border-left: solid 1px ;"><?php echo $index ; ?></td>
|
||||
<td style="text-align: left;border-right: solid 1px ;
|
||||
border-left: solid 1px ;"><?php echo $record->MaterialCode ; ?></td>
|
||||
<td style="text-align: left;border-right: solid 1px ;
|
||||
border-left: solid 1px ;"><?php echo $record->MaterialName ; ?></td>
|
||||
<td style="border-right: solid 1px ;
|
||||
border-left: solid 1px ;"><?php if(!empty($record->HSNCODE)){echo $record->HSNCODE;}else{echo "NIL";} ; ?></td>
|
||||
<td style="border-right: solid 1px ;
|
||||
border-left: solid 1px ;"><?php echo $record->UOM ; ?></td>
|
||||
<td style="border-right: solid 1px ;
|
||||
border-left: solid 1px ;"><?php echo $record->Quantity ; ?></td>
|
||||
<td style="border-right: solid 1px ;
|
||||
border-left: solid 1px ;"><?php echo $record->Rate ; ?></td>
|
||||
<td style="border-right: solid 1px ;
|
||||
border-left: solid 1px ;"><?php echo $record->Per ; ?></td><!--per data should be come-->
|
||||
</tr>
|
||||
|
||||
<?php
|
||||
@ -395,7 +425,7 @@ $OrderValue = (( $SubTotalAmount + $AfterCGST +$AfterIGST+$AfterSGST +$Insuranc
|
||||
<td style="text-align: center;"><strong>Total IGST Amount in RS</strong></td>
|
||||
<td style="text-align: center;"><strong>Others in Rs</strong></td>
|
||||
<td style="text-align: center;"><strong>Total Tax Amount in Rs</strong></td>
|
||||
<td style="text-align: center;"><strong>Order value in Rs</strong></td>
|
||||
<td style="text-align: center;"><strong>Order Value in Rs</strong></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td style="text-align: right;"><?php echo number_format($OrderValue,2,'.','');?></td><!--data should be come-->
|
||||
|
||||
Loading…
Reference in New Issue
Block a user