SIA/siddharth_application
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mrir pdf

Browse Source
This commit is contained in:
venbatechnologies@gmail.com 2017-08-08 12:04:37 +05:30
parent 6db9e9bbd7
commit a806cee92a
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
application/models/purchaseorder_model.php
View File

@ -609,7 +609,7 @@ function purchaseorderListing($forwhat='')
$subQuery ='SELECT distinct LineItem.LineItemNo,LineItem.ReqNo,LineItem.ServiceMaterialDescription,Mat.MaterialCode,Mat.MaterialName,Mat.UOM,Mat.HSNCODE,
LineItem.Quantity,LineItem.Rate,(LineItem.Quantity *LineItem.Rate) as BasicValue ,(After_CGST + After_SGST + After_IGST) as Taxamount
,TotalValue,CGST,SGST,IGST,After_CGST,After_SGST,After_IGST,otherallowance,LineItem.CostCenterCode,sup.SupplierName,sup.Address,POMaster.DeliveryAddress,POMaster.DeliveryDate,POMaster.Status,POMaster.PODate,POMaster.PONO,POMaster.ServiceDescription,POMaster.PaymentOtherDescription,POMaster.DeliveryOption,POMaster.DeliverySchedule,ReqMat.NumberOfService,ReqMat.Service_Period,ReqMat.Schedule_Type,Payment.PaymentID,Payment.PaymentTerms,AdvanceAmount FROM
,TotalValue,CGST,SGST,IGST,After_CGST,After_SGST,After_IGST,otherallowance,LineItem.CostCenterCode,sup.SupplierName,sup.Address,POMaster.DeliveryAddress,POMaster.DeliveryDate,POMaster.Status,POMaster.PODate,POMaster.PONO,POMaster.ServiceDescription,POMaster.PaymentOtherDescription,POMaster.DeliveryOption,POMaster.DeliverySchedule,ReqMat.NumberOfService,ReqMat.Service_Period,ReqMat.Schedule_Type,Payment.PaymentID,Payment.PaymentTerms,AdvanceAmount,HSNCODE FROM
T_PurchaseOrder_LineItem LineItem
join T_MaterialMaster Mat on Mat.MaterialCode = LineItem.MaterialCode
join T_Service_Tax Tax on Tax.LineItemNo = LineItem.LineItemNo
@ -681,7 +681,7 @@ function purchaseorderListing($forwhat='')
Mat.UOM,Mat.HSNCODE,Quantity,Rate,(Quantity *Rate) as BasicValue ,
(AfterPackagingValue + AfterFreightValue + AfterSGST + AfterCGST +
AfterIGST + Insurance) as Taxamount,AdvanceAmount,
TotalValue,Tax.*,LineItem.CostCenterCode ,POMaster.*,sup.SupplierName,sup.Address,Payment.PaymentID,Payment.PaymentTerms
TotalValue,Tax.*,LineItem.CostCenterCode ,POMaster.*,sup.SupplierName,sup.Address,Payment.PaymentID,Payment.PaymentTerms,HSNCODE
FROM T_PurchaseOrder_LineItem LineItem
join T_MaterialMaster Mat on Mat.MaterialCode = LineItem.MaterialCode
join T_Revenue_Tax Tax on Tax.LineItemNo = LineItem.LineItemNo
@ -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 ,Date(ReqMast.ReqDate) as ReqDate,POMaster.*,sup.SupplierName,sup.Address,LineItem.AmendedDetails as LineAmend,AdvanceAmount, Pay.PaymentTerms as Pay,ROUND((Quantity *Rate),2 ) as BasicValue
ProductPrice,Tax.*,LineItem.CostCenterCode ,Date(ReqMast.ReqDate) as ReqDate,POMaster.*,sup.SupplierName,sup.Address,LineItem.AmendedDetails as LineAmend,AdvanceAmount, Pay.PaymentTerms as Pay,ROUND((Quantity *Rate),2 ) as BasicValue,HSNCODE
FROM T_PurchaseOrder_LineItem LineItem
join T_Requestion_Master ReqMas on ReqMas.ReqNo=LineItem.ReqNo
join T_MaterialMaster Mat on Mat.MaterialCode = LineItem.MaterialCode

2
application/views/Amendedimportpopdf.php
View File

@ -228,7 +228,7 @@
<tr>
<td style="text-align: center;"><?php echo $index ; ?></td>
<td style="text-align: center;"><?php echo $record->MaterialName ; ?></td>
<td>000666</td>
<td style="text-align: center;"><?php echo $record->HSNCODE;?></td>
<td style="text-align: center;"><?php echo $record->UOM ; ?></td>
<td align="right"><?php echo $record->Quantity ; ?></td>

2
application/views/importpopdf.php
View File

@ -232,7 +232,7 @@
<tr>
<td align="center"><?php echo $index ; ?></td>
<td align="center"><?php echo $record->MaterialName ; ?></td>
<td align="center">000666</td><!--HSN code should come from DB-->
<td align="center"><?php echo $record->HSNCODE;?></td><!--HSN code should come from DB-->
<td align="center"><?php echo $record->Quantity ; ?></td>
<td align="center"><?php echo $record->UOM ; ?></td>

2
application/views/mrirrevenuepopdf.php
View File

@ -195,7 +195,7 @@
<td style="text-align: center;"><?php echo $index ; ?></td>
<td style="text-align: center;">001</td>
<td style="text-align: center;"><?php echo $record->MaterialName ; ?></td>
<td style="text-align: center;">000666</td><!--HSN code should come from DB-->
<td style="text-align: center;"><?php echo $record->HSNCODE;?></td><!--HSN code should come from DB-->
<td style="text-align: center;"><?php echo $record->UOM ; ?></td>
<td align="right"><?php echo $record->Quantity ; ?></td>