SIA/CI3_siddharth_application
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

import po date format, mrir

Browse Source
This commit is contained in:
venbatechnologies@gmail.com 2017-08-11 18:56:54 +05:30
parent bf746c0730
commit e6c4b082d0
8 changed files with 75 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
application/controllers/purchaseorder.php
View File

@ -2571,7 +2571,8 @@ function addNewImportPurchaseOrder()
$data['CompanyDetails'] = $this->purchaseorder_model->getCompanyInformation(); $data['CompanyDetails'] = $this->purchaseorder_model->getCompanyInformation();
$data['POItem'] = $this->purchaseorder_model->GetCapitalPurchaseOrderDetailsForPDF($PONO); $data['POItem'] = $this->purchaseorder_model->GetCapitalPurchaseOrderDetailsForPDF($PONO);
$AdvanceAmount='';
$TotaltoPay='';
$data['releasedetails'] = $this->purchaseorder_model->GetReleasedDetails($PONO); $data['releasedetails'] = $this->purchaseorder_model->GetReleasedDetails($PONO);
$CurrencyType=''; $CurrencyType='';
@ -2585,7 +2586,17 @@ function addNewImportPurchaseOrder()
$TotalOrderValue=$data['POItem'][0]->TotalOrderValue; $TotalOrderValue=$data['POItem'][0]->TotalOrderValue;
$totalAmt=sprintf("%.2f", $TotalOrderValue);
foreach ($data['POItem'] as $POI)
{
$AdvanceAmount=$POI->AdvanceAmount;
}
$TotaltoPay=$TotalOrderValue-$AdvanceAmount;
$totalAmt=sprintf("%.2f", $TotaltoPay);
$data['TotalAmountInWords']= $this->convertNumber($totalAmt); $data['TotalAmountInWords']= $this->convertNumber($totalAmt);
} }
@ -2597,14 +2608,22 @@ function addNewImportPurchaseOrder()
$SymbolCurrencyName=$data['CurrencySymbol'][0]->Currency; $SymbolCurrencyName=$data['CurrencySymbol'][0]->Currency;
$PaiseVal=$data['CurrencySymbol'][0]->PaiseVal; $PaiseVal=$data['CurrencySymbol'][0]->PaiseVal;
$TotalOrderValue=$data['POItem'][0]->TotalOrderValue; $TotalOrderValue=$data['POItem'][0]->TotalOrderValue;
foreach ($data['POItem'] as $POI)
{
$AdvanceAmount=$POI->AdvanceAmount;
}
$TotaltoPay=$TotalOrderValue-$AdvanceAmount;
$totalAmt=sprintf("%.2f", $TotalOrderValue); $totalAmt=sprintf("%.2f", $TotaltoPay);
$data['TotalAmountInWords']= $this->convertNumberSymbol($totalAmt,$SymbolCurrency,$SymbolCurrencyName,$PaiseVal); $data['TotalAmountInWords']= $this->convertNumberSymbol($totalAmt,$SymbolCurrency,$SymbolCurrencyName,$PaiseVal);
} }

10
application/models/mrir_model.php
View File

@ -107,8 +107,8 @@ function ViewDistributionList()
{ {
$this->db->distinct(); $this->db->distinct();
$this->db->select('TMM.MRIRNO,TMM.PONO, TMM.IGRNO,IGRM.DeliveryChellanOrInvoiceNo, $this->db->select('TMM.MRIRNO,TMM.PONO, TMM.IGRNO,IGRM.DeliveryChellanOrInvoiceNo,
IGRM.DeliveryChellanDate,IGRM.VehicleNo,IGRM.CourierNo,TMD.StoreInchargeID,TMD.QualityInchargeID, IGRM.DeliveryChellanDate,IGRM.VehicleNo,IGRM.CourierNo,TMD.QualityInchargeID,
TMD.PlantInchargeID,TMD.UpdateBY, POM.PODate,POM.POType,POM.ReleasedBy, TMD.PlantInchargeID,TMD.UpdateBY, POM.PODate,POM.POType,POM.ReleasedBy,ED2.FirstName as StoreinchargeName,
ED.FirstName as UpdatedbyName,ED1.FirstName as ReleasedbyName,MM.MaterialCode,MM.MaterialName, ED.FirstName as UpdatedbyName,ED1.FirstName as ReleasedbyName,MM.MaterialCode,MM.MaterialName,
MM.UOM, POL.Quantity,IGRD.QuantityAsPerInvoice, TMD.ActualQuantityReceived,TMD.QuantityAccepted, MM.UOM, POL.Quantity,IGRD.QuantityAsPerInvoice, TMD.ActualQuantityReceived,TMD.QuantityAccepted,
TMD.QuantityRejected,ST.StatusName,TMD.Remarks,AdvanceAmount '); TMD.QuantityRejected,ST.StatusName,TMD.Remarks,AdvanceAmount ');
@ -123,6 +123,8 @@ TMD.QuantityRejected,ST.StatusName,TMD.Remarks,AdvanceAmount ');
$this->db->join ('T_Employee_Details ED','ED.EmpID = user.EmpID'); $this->db->join ('T_Employee_Details ED','ED.EmpID = user.EmpID');
$this->db->join ('tbl_users user1','user1.userid = POM.ReleasedBy'); $this->db->join ('tbl_users user1','user1.userid = POM.ReleasedBy');
$this->db->join ('T_Employee_Details ED1','ED1.EmpID = user1.EmpID'); $this->db->join ('T_Employee_Details ED1','ED1.EmpID = user1.EmpID');
$this->db->join ('tbl_users user2','user2.userid=TMD.StoreInchargeID');
$this->db->join ('T_Employee_Details ED2','ED2.EmpID = user2.EmpID');
$this->db->join ('T_MaterialMaster MM','MM.MaterialCode = IGRD.MaterialCode and POL.MaterialCode = MM.MaterialCode'); $this->db->join ('T_MaterialMaster MM','MM.MaterialCode = IGRD.MaterialCode and POL.MaterialCode = MM.MaterialCode');
$this->db->join ('T_Status ST','ST.StatusCode = TMD.MRIRStatus'); $this->db->join ('T_Status ST','ST.StatusCode = TMD.MRIRStatus');
$this->db->where('TMM.MRIRStatus',MRIR_APPROVED); $this->db->where('TMM.MRIRStatus',MRIR_APPROVED);
@ -222,7 +224,7 @@ TMD.QuantityRejected,ST.StatusName,TMD.Remarks,AdvanceAmount ');
/* This function is used to get the value for modal in view MRIR page */ /* This function is used to get the value for modal in view MRIR page */
function get_MRIRs($mrir) function get_MRIRs($mrir)
{ {
$this->db->select('TMM.MRIRNO,TMM.PONO,TMM.IGRNO,TMD.*,IGRM.DeliveryChellanOrInvoiceNo,IGRM.DeliveryChellanDate,IGRM.VehicleNo,IGRD.*,SUPP.SupplierName,SUPP.Address,POMR.DeliveryDate,POMR.ServiceDescription,MM.MaterialCode,MM.UOM,MM.MaterialName,POLT.Quantity,POLT.ReceivedQuantity,POMR.POType'); $this->db->select('TMM.MRIRNO,TMM.PONO,TMM.IGRNO,TMD.*,IGRM.DeliveryChellanOrInvoiceNo,IGRM.DeliveryChellanDate,IGRM.VehicleNo,IGRD.*,SUPP.SupplierName,SUPP.Address,POMR.DeliveryDate,POMR.ServiceDescription,MM.MaterialCode,MM.UOM,MM.MaterialName,POLT.Quantity,POLT.ReceivedQuantity,POMR.POType,ED.FirstName as StoreinchargeName');
$this->db->from ('T_MRIR_Master TMM'); $this->db->from ('T_MRIR_Master TMM');
$this->db->join ('T_MRIR_Details TMD','TMM.MRIRNO = TMD.MRIRNO'); $this->db->join ('T_MRIR_Details TMD','TMM.MRIRNO = TMD.MRIRNO');
$this->db->join ('T_MaterialMaster MM','TMD.MaterialCode = MM.MaterialCode'); $this->db->join ('T_MaterialMaster MM','TMD.MaterialCode = MM.MaterialCode');
@ -231,6 +233,8 @@ TMD.QuantityRejected,ST.StatusName,TMD.Remarks,AdvanceAmount ');
$this->db->join ('T_PurchaseOrder_LineItem POLT','IGRM.PONO=POLT.PONO and POLT.MaterialCode=TMD.MaterialCode'); $this->db->join ('T_PurchaseOrder_LineItem POLT','IGRM.PONO=POLT.PONO and POLT.MaterialCode=TMD.MaterialCode');
$this->db->join ('T_IGR_Details IGRD','IGRD.IGRNO= IGRM.IGRNO and IGRD.MaterialCode=TMD.MaterialCode'); $this->db->join ('T_IGR_Details IGRD','IGRD.IGRNO= IGRM.IGRNO and IGRD.MaterialCode=TMD.MaterialCode');
$this->db->join ('T_SupplierDetailsN SUPP','POMR.SupplierID=SUPP.SupplierID'); $this->db->join ('T_SupplierDetailsN SUPP','POMR.SupplierID=SUPP.SupplierID');
$this->db->join ('tbl_users user','user.userid=TMD.StoreInchargeID');
$this->db->join ('T_Employee_Details ED','ED.EmpID = user.EmpID');
$this->db->where('TMD.MRIRNO',$mrir); $this->db->where('TMD.MRIRNO',$mrir);
//$this->db->order_by('TMD.MRIRNO','asc'); //$this->db->order_by('TMD.MRIRNO','asc');

2
application/models/purchaseorder_model.php
View File

@ -276,6 +276,8 @@ tax.LineItemNo = Item.LineItemNo where Item.CostCenterCode=? and mast.ReqType=?
} }
/** /**
* This function is used to get the Requsition List for the login user * This function is used to get the Requsition List for the login user

14
application/views/editimportpo.php
View File

@ -29,7 +29,7 @@ foreach ($PaymentTerms as $TER)
} }
//echo $Terms; //echo $Terms;
$dt = new DateTime('now', new DateTimeZone('Asia/Kolkata')); $dt = new DateTime('now', new DateTimeZone('Asia/Kolkata'));
$CurrentDate = $dt->format('Y-m-d'); $CurrentDate = $dt->format('d-m-y');
$MaxPoDate = ''; $MaxPoDate = '';
if(!empty($MaxPODate)) if(!empty($MaxPODate))
@ -118,10 +118,10 @@ if(!empty($POMaster))
$Address = $Req->Address; $Address = $Req->Address;
$Pdt = new DateTime($Req->PODate); $Pdt = new DateTime($Req->PODate);
$PODate = $Pdt->format('Y-m-d'); $PODate = $Pdt->format('d-m-Y');
$Ddt = new DateTime($Req->DeliveryDate); $Ddt = new DateTime($Req->DeliveryDate);
$Deliverydt = $Ddt->format('Y-m-d'); $Deliverydt = $Ddt->format('d-m-Y');
$DeliveryAddress =$Req->DeliveryAddress; $DeliveryAddress =$Req->DeliveryAddress;
$PONOStatus = $Req->StatusCode; $PONOStatus = $Req->StatusCode;
@ -155,7 +155,7 @@ if(!empty($RequistionDetails))
{ {
// $Reqon=$ReqDet->ReqDate; // $Reqon=$ReqDet->ReqDate;
$Reqonn=new DateTime($ReqDet->ReqDate); $Reqonn=new DateTime($ReqDet->ReqDate);
$Reqon=$Reqonn->format('Y-m-d'); $Reqon=$Reqonn->format('d-m-Y');
$Requestedby=$ReqDet->Requestedby; $Requestedby=$ReqDet->Requestedby;
$RequesterName=$ReqDet->FirstName; $RequesterName=$ReqDet->FirstName;
//$Status=$ReqDet->Status; //$Status=$ReqDet->Status;
@ -221,7 +221,7 @@ if(!empty($RequistionDetails))
$("#PODate").datepicker({ $("#PODate").datepicker({
minDate : d, minDate : d,
maxDate : 'now', maxDate : 'now',
dateFormat: 'mm/dd/yy',changeMonth: true, changeYear: true,yearRange: '-100:+0' dateFormat: 'dd/mm/yy',changeMonth: true, changeYear: true,yearRange: '-100:+0'
}); });
// $("#PayableAT").datepicker({ // $("#PayableAT").datepicker({
@ -237,13 +237,13 @@ if(!empty($RequistionDetails))
$("#Requeston").datepicker({ $("#Requeston").datepicker({
//minDate : d, //minDate : d,
maxDate : 'now', maxDate : 'now',
dateFormat: 'mm/dd/yy',changeMonth: true, changeYear: true,yearRange: '-100:+0' dateFormat: 'dd/mm/yy',changeMonth: true, changeYear: true,yearRange: '-100:+0'
}); });
$("#Exchangerateon").datepicker({ $("#Exchangerateon").datepicker({
minDate : m, minDate : m,
//maxDate : 'now', //maxDate : 'now',
dateFormat: 'mm/dd/yy',changeMonth: true, changeYear: true,yearRange: '-100:+0' dateFormat: 'dd/mm/yy',changeMonth: true, changeYear: true,yearRange: '-100:+0'
}); });
}); });

8
application/views/importpo.php
View File

@ -8,7 +8,7 @@ $UOM='';
$Terms=''; $Terms='';
date_default_timezone_set('Australia/Melbourne'); date_default_timezone_set('Australia/Melbourne');
$date = date('m/d/Y h:i:s a', time()); $date = date('d/m/Y h:i:s a', time());
if(!empty($CompanyDetails)) if(!empty($CompanyDetails))
@ -20,7 +20,7 @@ if(!empty($CompanyDetails))
} }
//echo "$CompanyAddress"; //echo "$CompanyAddress";
$dt = new DateTime('now', new DateTimeZone('Asia/Kolkata')); $dt = new DateTime('now', new DateTimeZone('Asia/Kolkata'));
$CurrentDate = $dt->format('Y-m-d'); $CurrentDate = $dt->format('d-m-y');
//echo $CurrentDate; //echo $CurrentDate;
$MaxPoDate = ''; $MaxPoDate = '';
if(!empty($MaxPODate)) if(!empty($MaxPODate))
@ -99,14 +99,14 @@ $("#PaymentTerms").select2();
$("#PODate").datepicker({ $("#PODate").datepicker({
minDate : d, minDate : d,
maxDate : 'now', maxDate : 'now',
dateFormat: 'mm/dd/yy',changeMonth: true, changeYear: true,yearRange: '-100:+0' dateFormat: 'dd/mm/yy',changeMonth: true, changeYear: true,yearRange: '-100:+0'
}); });
$("#Exchangerateon").datepicker({ $("#Exchangerateon").datepicker({
minDate : m, minDate : m,
//maxDate : 'now', //maxDate : 'now',
dateFormat: 'mm/dd/yy',changeMonth: true, changeYear: true,yearRange: '-100:+0' dateFormat: 'dd/mm/yy',changeMonth: true, changeYear: true,yearRange: '-100:+0'
}); });
// $("#Deliverydt").datepicker({ // $("#Deliverydt").datepicker({
// minDate : 'now', // minDate : 'now',

6
application/views/importpopdf.php
View File

@ -236,12 +236,12 @@
<td align="center"><?php echo $record->Quantity ; ?></td> <td align="center"><?php echo $record->Quantity ; ?></td>
<td align="center"><?php echo $record->UOM ; ?></td> <td align="center"><?php echo $record->UOM ; ?></td>
<td align="center"><?php echo number_format(($record->Rate),2) ; ?></td> <td align="center"><?php echo number_format(($record->Rate),2, '.', '') ; ?></td>
<td align="center"><?php $BasicValue=($record->Quantity*$record->Rate); <td align="center"><?php $BasicValue=($record->Quantity*$record->Rate);
echo number_format($BasicValue,2) ; ?></td> echo number_format($BasicValue,2, '.', '') ; ?></td>
<!-- <td align="right"><?php echo number_format(($record->TotalOrderValue),2); ?></td> --> <!-- <td align="right"><?php echo number_format(($record->TotalOrderValue),2); ?></td> -->
<td align="center"><?php $BasicValue=($record->Quantity*$record->Rate); <td align="center"><?php $BasicValue=($record->Quantity*$record->Rate);
echo number_format($BasicValue,2) ; ?></td> echo number_format($BasicValue,2, '.', '') ; ?></td>
</tr> </tr>

6
application/views/mririmportpopdf.php
View File

@ -241,12 +241,12 @@
<td align="center"><?php echo $record->Quantity ; ?></td> <td align="center"><?php echo $record->Quantity ; ?></td>
<td align="center"><?php echo $record->UOM ; ?></td> <td align="center"><?php echo $record->UOM ; ?></td>
<td align="center"><?php echo number_format(($record->Rate),2) ; ?></td> <td align="center"><?php echo number_format(($record->Rate),2, '.', '') ; ?></td>
<td align="center"><?php $BasicValue=($record->Quantity*$record->Rate); <td align="center"><?php $BasicValue=($record->Quantity*$record->Rate);
echo number_format($BasicValue,2) ; ?></td> echo number_format($BasicValue,2, '.', '') ; ?></td>
<!-- <td align="right"><?php echo number_format(($record->TotalOrderValue),2); ?></td> --> <!-- <td align="right"><?php echo number_format(($record->TotalOrderValue),2); ?></td> -->
<td align="center"><?php $BasicValue=($record->Quantity*$record->Rate); <td align="center"><?php $BasicValue=($record->Quantity*$record->Rate);
echo number_format($BasicValue,2) ; ?></td> echo number_format($BasicValue,2, '.', '') ; ?></td>
</tr> </tr>

28
application/views/viewmrirforbilling.php
View File

@ -97,7 +97,7 @@ $color='';
<td><?php echo $d->StatusName ?></td><!-- Remarks --> <td><?php echo $d->StatusName ?></td><!-- Remarks -->
<td><?php echo $d->Remarks ?></td><!-- Remarks --> <td><?php echo $d->Remarks ?></td><!-- Remarks -->
<td><?php echo $d->QualityInchargeID ?></td> <td><?php echo $d->QualityInchargeID ?></td>
<td><?php echo $d->StoreInchargeID ?></td> <td><?php echo $d->StoreinchargeName?></td>
</tr> </tr>
<?php <?php
}} ?> }} ?>
@ -340,13 +340,33 @@ $color='';
$("#DeliveryChellanOrInvoiceNo").val(item.DeliveryChellanOrInvoiceNo); $("#DeliveryChellanOrInvoiceNo").val(item.DeliveryChellanOrInvoiceNo);
var dcd = new Date(item.DeliveryChellanDate); var dcd = new Date(item.DeliveryChellanDate);
//alert(dcd.getDate()+ '.' + (dcd.getMonth() + 1)+ '.' + dcd.getFullYear()); //alert(dcd.getDate()+ '.' + (dcd.getMonth() + 1)+ '.' + dcd.getFullYear());
var dcd2 = (dcd.getDate()+ '.' + (dcd.getMonth() + 1)+ '.' + dcd.getFullYear()); //
if(item.DeliveryChellanDate != null)
{
var dcd2 = (dcd.getDate()+ '/' + (dcd.getMonth() + 1)+ '/' + dcd.getFullYear());
}
else
{
var dcd2 = '';
}
$("#DeliveryChellanDate").val(dcd2); $("#DeliveryChellanDate").val(dcd2);
$("#VehicleNo").val(item.VehicleNo); $("#VehicleNo").val(item.VehicleNo);
$("#CourierNo").val(item.CourierNo); $("#CourierNo").val(item.CourierNo);
var ddate = new Date(item.DeliveryDate); var ddate = new Date(item.DeliveryDate);
//alert(ddate.getDate()+ '.' + (ddate.getMonth() + 1)+ '.' + ddate.getFullYear()); //alert(ddate.getDate()+ '.' + (ddate.getMonth() + 1)+ '.' + ddate.getFullYear());
var ddate2 = (ddate.getDate()+ '.' + (ddate.getMonth() + 1)+ '.' + ddate.getFullYear()); if(item.DeliveryDate != null)
{
if(item.DeliveryDate == '0000-00-00 00:00:00' || item.DeliveryDate == '')
{
//alert('i have 0 and null value');
var ddate2='';
}
else
{
//alert('i have date format');
var ddate2 = (ddate.getDate()+ '/' + (ddate.getMonth() + 1)+ '/' + ddate.getFullYear());
}
}
var Potype=item.POType; var Potype=item.POType;
//alert(Potype); //alert(Potype);
if(Potype=='CAPITAL' || Potype=='IMPORT') if(Potype=='CAPITAL' || Potype=='IMPORT')
@ -358,7 +378,7 @@ $color='';
$("#SupplierName").val(item.SupplierName); $("#SupplierName").val(item.SupplierName);
$("#Address").val(item.Address); $("#Address").val(item.Address);
$('#Remarks').val(item.ServiceDescription); $('#Remarks').val(item.ServiceDescription);
$("#StoreIncharge").val(item.StoreInchargeID); $("#StoreIncharge").val(item.StoreinchargeName);
$("#PlantIncharge").val(item.PlantInchargeID); $("#PlantIncharge").val(item.PlantInchargeID);
$("#QualityIncharge").val(item.QualityInchargeID); $("#QualityIncharge").val(item.QualityInchargeID);