diff --git a/application/controllers/purchaseorder.php b/application/controllers/purchaseorder.php index 6feb9855..bc066bd7 100755 --- a/application/controllers/purchaseorder.php +++ b/application/controllers/purchaseorder.php @@ -1413,7 +1413,7 @@ public function mririmportpoprint($PONO) // $this->load->View("importpopdf", $data); - $this->load->View("mririmportpopdf", $data); + $this->load->View("mrirsimportpopdf", $data); // Add header to pdf @@ -2602,7 +2602,7 @@ function addNewImportPurchaseOrder() - $this->load->View("capitalpopdf", $data); + $this->load->View("mrircapitalpopdf", $data); // Add header to pdf //$this->load->view('includes/pdffooter'); diff --git a/application/models/purchaseorder_model.php b/application/models/purchaseorder_model.php index 95dc3d7c..49db3c19 100755 --- a/application/models/purchaseorder_model.php +++ b/application/models/purchaseorder_model.php @@ -738,7 +738,7 @@ function GetImportPurchaseOrderDetailsForPDF($PONO = '') $subQuery='SELECT distinct LineItem.LineItemNo,LineItem.ReqNo,Mat.MaterialCode,Mat.MaterialName,Import_DispatchDetails, Mat.UOM,Quantity,ReqMas.Requestedby,Rate,ROUND((RMCIncludingCustomersPerKG*Quantity),2)as Taxamount , -ProductPrice,Tax.*,LineItem.CostCenterCode , POMaster.*,sup.SupplierName,sup.Address,LineItem.AmendedDetails as LineAmend,AdvanceAmount +ProductPrice,Tax.*,LineItem.CostCenterCode ,Date(ReqMast.ReqDate) as ReqDate,POMaster.*,sup.SupplierName,sup.Address,LineItem.AmendedDetails as LineAmend,AdvanceAmount FROM T_PurchaseOrder_LineItem LineItem join T_Requestion_Master ReqMas on ReqMas.ReqNo=LineItem.ReqNo join T_MaterialMaster Mat on Mat.MaterialCode = LineItem.MaterialCode @@ -746,6 +746,7 @@ join T_Import_Tax Tax on Tax.LineItemNo = LineItem.LineItemNo join T_PurchaseOrder_Master POMaster on POMaster.PONO = LineItem.PONO join T_SupplierDetailsN sup on sup.SupplierID = POMaster.SupplierID left join T_PurchaseOrder_AdvanceRequest PurAdv on POMaster.PONO=PurAdv.PONO +join T_Requestion_Master ReqMast on LineItem.ReqNo=ReqMast.ReqNo where LineItem.PONO =?'; $query = $this->db->query($subQuery,array($PONO)); @@ -1332,13 +1333,14 @@ join T_MaterialMaster Mat on Mat.MaterialCode = LineItem.MaterialCode $subQuery ='SELECT distinct LineItem.LineItemNo,ReqNo,Mat.MaterialCode,Mat.MaterialName, Mat.UOM,Quantity,Rate,ROUND((Quantity *Rate),2 ) as BasicValue , - LineItem.CostCenterCode , POMaster.*,sup.SupplierName,sup.Address,Payment.PaymentID,Payment.PaymentTerms + LineItem.CostCenterCode , POMaster.*,sup.SupplierName,sup.Address,Payment.PaymentID,Payment.PaymentTerms,AdvanceAmount FROM T_PurchaseOrder_LineItem LineItem join T_MaterialMaster Mat on Mat.MaterialCode = LineItem.MaterialCode join T_PurchaseOrder_Master POMaster on POMaster.PONO = LineItem.PONO join T_SupplierDetailsN sup on sup.SupplierID = POMaster.SupplierID join T_PaymentTerms Payment on Payment.PaymentID = POMaster.PaymentTerms + left join T_PurchaseOrder_AdvanceRequest PurAdv on POMaster.PONO=PurAdv.PONO where LineItem.PONO =?'; $query = $this->db->query($subQuery,array($PONO)); @@ -1412,6 +1414,7 @@ join T_MaterialMaster Mat on Mat.MaterialCode = LineItem.MaterialCode $this->db->where('ReqMast.ReqNo',$ReqNo); $Reqresult=$this->db->get(); $Details['RequistionNo']= $Reqresult->result()[0]->ReqNo; + $Detaisl['ReqDate']=$Reqresult->result()[0]->ReqDate; $Details['RequestedName']= $Reqresult->result()[0]->FirstName; $Details['RequestedDept']= $Reqresult->result()[0]->DepartmentName; $Details['CostCenterCode']= $Reqresult->result()[0]->CostCenterCode; diff --git a/application/views/importpopdf.php b/application/views/importpopdf.php index f450e5d1..927b5549 100644 --- a/application/views/importpopdf.php +++ b/application/views/importpopdf.php @@ -18,6 +18,7 @@ $PayableAT=''; $Placeoforigin=''; $Import_DispatchDetails=''; + $ReqDate=''; @@ -38,6 +39,7 @@ foreach ($POItem as $PO) { $ReqNo=$PO->ReqNo; + $ReqDate=$PO->ReqDate; $PONO = $PO->PONO; $postatus= $PO->Status; $SuplierName = $PO->SupplierName; @@ -171,7 +173,7 @@ - 01/08/2017 + diff --git a/application/views/mrircapitalpopdf.php b/application/views/mrircapitalpopdf.php index f113b7b1..f9cf2273 100755 --- a/application/views/mrircapitalpopdf.php +++ b/application/views/mrircapitalpopdf.php @@ -121,7 +121,7 @@ ?> -
PURCHASE ORDER - PO NO:
+
PURCHASE ORDER - PO NO:/C
@@ -147,13 +147,13 @@ - - - + + + - + @@ -161,12 +161,13 @@ -

 

+
PO DATE :DISPATCH / SCHEDULE BY :PLACE OF ORIGIN:EXCHANGE RATE:DISPATCH / SCHEDULE BY : PLACE OF ORIGIN:
PO DATE :DELIVERY DATE/ SCHEDULE BY :DELIVERY DATE/ SCHEDULE BY :
+ @@ -181,6 +182,9 @@ ?> + + + @@ -200,8 +204,10 @@ - + + @@ -251,8 +257,10 @@ - + + + @@ -273,51 +281,37 @@
Requistion NumberRequistion Date Requested By Requested Department Cost Center  
# Item Code Item NameQtyHSN Code UOM

+ 		Qty Rate Per Unit in MaterialCode ; ?> MaterialName ; ?>Quantity ; ?>0989776 UOM ; ?>Quantity ; ?>Rate),2, '.', '') ; ?> Quantity * $record->Rate),2, '.', '');?>
+

Payment Terms

+

+ +

Special Instruction:

+

 

- + + + + - + + + + + - - - - - - - - - - + + - - - -
Total Amount In Words

Total Amount In Words

 + Total Order Amount in Total Order Amount in
Advance Amount Paid
- - Total Order Amount in Total Order Amount in
Advance Anount Paid:
Total Amount To Be Paid:Total Amount To Pay In INR
-

Payment Terms

-

- 		-

Certified that the particulars given above are true and correct

-

-

 

-

Authorized Signatory

-
-

 

- -

Special Instruction:

-

-

 

- - - +

 

Released By : FirstName;?>
Released On : format('d-m-Y');?>
@@ -354,3 +336,17 @@ + + +

Certified that the particulars given above are true and correct

+

+

 

+

Authorized Signatory

+ + + + +

 

+ + + diff --git a/application/views/mririmportpopdf.php b/application/views/mririmportpopdf.php index 362e212a..0ac63c10 100644 --- a/application/views/mririmportpopdf.php +++ b/application/views/mririmportpopdf.php @@ -18,9 +18,12 @@ $PayableAT=''; $Placeoforigin=''; $Import_DispatchDetails=''; + $ReqDate=''; $AdvanceAmount=0.00; $color=''; + $ReqDate=''; + $index=0; if(!empty($CompanyDetails)) { @@ -38,6 +41,7 @@ foreach ($POItem as $PO) { $ReqNo=$PO->ReqNo; + $ReqDate=$PO->ReqDate; $PONO = $PO->PONO; $postatus= $PO->Status; $SuplierName = $PO->SupplierName; @@ -50,7 +54,6 @@ $DeliveryDate = $dtDe->format('d-m-Y'); $ServiceDescription =$PO->ServiceDescription; $CostCenterCode=$PO->CostCenterCode; - $AdvanceAmount=$PO->AdvanceAmount; //$ReqBy=$PO->Requestedby; $PaymentTerms = $PO->PaymentTerms; @@ -60,21 +63,11 @@ // $PaymentDays=$PO->PaymentDays; // $PayableAT=$PO->PayableAT; $DeliverySchedule=$PO->DeliverySchedule; + $AdvanceAmount=$PO->AdvanceAmount; } } - - if($AdvanceAmount>0) - { - $color="green"; - } - else - { - $color="black"; - } - - //echo $DeliverySchedule; if(!empty($Requestername)) @@ -137,7 +130,7 @@ ?>
 
-
PURCHASE ORDER - PO NO:
+
PURCHASE ORDER - PO NO:/I
@@ -161,9 +154,9 @@ - - - + + +
PO DATE :DELIVERY DATE / SCHEDULE BY :PLACE OF ORIGIN:PO DATE :  DELIVERY DATE / SCHEDULE BY :  PLACE OF ORIGIN:  
@@ -174,15 +167,18 @@
- + + - + + + @@ -191,15 +187,17 @@
Requistion NumberRequistion Date Requested By Requested DepartmentCost CenterCost Center Code
- - - - - - - - +
#Item and DescriptionQtyUOM

- 		Rate per unit in Basic Price in Total Amount in
+ + + + + + + + + @@ -237,15 +235,17 @@ - - - - - - + + + + + + + - @@ -275,21 +275,23 @@ ?>
#Item and DescriptionHSN CodeQtyUOM

+ 		Rate per unit in  Basic Price in  Total Amount in 
MaterialName ; ?>Quantity ; ?>UOM ; ?>Rate),2) ; ?>Quantity*$record->Rate); + MaterialName ; ?>000666Quantity ; ?>UOM ; ?>Rate),2) ; ?>Quantity*$record->Rate); echo number_format($BasicValue,2) ; ?> Quantity*$record->Rate); + Quantity*$record->Rate); echo number_format($BasicValue,2) ; ?>
+

 

+ +

Payment Terms: 

+ +
Special Instructions :
+

 

- - - - - + @@ -297,28 +299,15 @@ - - - - -
Total Amount In Words

Total Amount In Total Amount In
Advance Amount :
Amount to Pay:
-

Payment Terms

-

- 		-

Certified that the particulars given above are true and correct

-

-

 

-

Authorized Signatory

-
-

 

- -
Special Instructions :
+ + +  

-
Released By : FirstName;?>
-
Released On : format('d-m-Y');?>
+
 Released By : FirstName;?>
+
 Released On : format('d-m-Y');?>
- + + + +

Certified that the particulars given above are true and correct

+

+

 

+

Authorized Signatory

+ + + + + + +
\ No newline at end of file