From ef90a84094d9d75d112ad69e11cf72607554855e Mon Sep 17 00:00:00 2001 From: velz2020 Date: Fri, 15 Sep 2017 13:04:29 +0530 Subject: [PATCH] Revenue PDF change,payslip pdf Change --- application/models/payroll_model.php | 2 +- application/models/purchaseorder_model.php | 2 +- application/views/revenuepopdf.php | 64 ++++++++++++++++------ 3 files changed, 49 insertions(+), 19 deletions(-) diff --git a/application/models/payroll_model.php b/application/models/payroll_model.php index 665a6a76..c83b3414 100755 --- a/application/models/payroll_model.php +++ b/application/models/payroll_model.php @@ -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'); diff --git a/application/models/purchaseorder_model.php b/application/models/purchaseorder_model.php index 1b1aa935..097e5fc3 100755 --- a/application/models/purchaseorder_model.php +++ b/application/models/purchaseorder_model.php @@ -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 diff --git a/application/views/revenuepopdf.php b/application/views/revenuepopdf.php index ba13fc86..63b2e232 100755 --- a/application/views/revenuepopdf.php +++ b/application/views/revenuepopdf.php @@ -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 @@


- web: www.Sidharthindustries.com + web: -               PAN:BCHP6184J
+               PAN:
- Email: purchase@sidharthindustries.com -   GSTIN: 33BCHPS1840J1ZJ + Email: +   GSTIN: Purchase Order No:
@@ -199,9 +221,9 @@ Our Reference :
- Shipped From:            Vendor code: Sup008



Email ID:DR@dr.com         PAN:DDDDD1234D
Contact :1111111111          GSTIN:33AADCR1792G1Z1 + Shipped From:



Email :
Vendor code:           PAN:
Contact :          GSTIN: - Shipped To:

State code:33 + Shipped To:

State code: Delivery :
@@ -229,7 +251,7 @@

Insurance :

Please arrange to deliver the materials listed below as per schedule to our works

- +
@@ -263,15 +285,23 @@ $index = $index + 1; ?> - - - - - - - - - + + + + + + + + + Total IGST Amount in RS - +
 SNo
MaterialCode ; ?>MaterialName ; ?>HSNCODE)){echo $record->HSNCODE;}else{echo "NIL";} ; ?>UOM ; ?>Quantity ; ?>Rate ; ?>Per ; ?>
MaterialCode ; ?>MaterialName ; ?>HSNCODE)){echo $record->HSNCODE;}else{echo "NIL";} ; ?>UOM ; ?>Quantity ; ?>Rate ; ?>Per ; ?>
Others in Rs Total Tax Amount in RsOrder value in RsOrder Value in Rs