From e6c4b082d0b8fcc319ac5f9a761c0cc3b5373513 Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Fri, 11 Aug 2017 18:56:54 +0530 Subject: [PATCH] import po date format, mrir --- application/controllers/purchaseorder.php | 31 +++++++++++++++++----- application/models/mrir_model.php | 10 ++++--- application/models/purchaseorder_model.php | 2 ++ application/views/editimportpo.php | 14 +++++----- application/views/importpo.php | 8 +++--- application/views/importpopdf.php | 6 ++--- application/views/mririmportpopdf.php | 6 ++--- application/views/viewmrirforbilling.php | 28 ++++++++++++++++--- 8 files changed, 75 insertions(+), 30 deletions(-) diff --git a/application/controllers/purchaseorder.php b/application/controllers/purchaseorder.php index eaebca83..2a4b50a6 100755 --- a/application/controllers/purchaseorder.php +++ b/application/controllers/purchaseorder.php @@ -2571,7 +2571,8 @@ function addNewImportPurchaseOrder() $data['CompanyDetails'] = $this->purchaseorder_model->getCompanyInformation(); $data['POItem'] = $this->purchaseorder_model->GetCapitalPurchaseOrderDetailsForPDF($PONO); - + $AdvanceAmount=''; + $TotaltoPay=''; $data['releasedetails'] = $this->purchaseorder_model->GetReleasedDetails($PONO); $CurrencyType=''; @@ -2585,7 +2586,17 @@ function addNewImportPurchaseOrder() $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); } @@ -2597,14 +2608,22 @@ function addNewImportPurchaseOrder() $SymbolCurrencyName=$data['CurrencySymbol'][0]->Currency; $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); } - - + + diff --git a/application/models/mrir_model.php b/application/models/mrir_model.php index e4fed057..66ebdabc 100755 --- a/application/models/mrir_model.php +++ b/application/models/mrir_model.php @@ -107,8 +107,8 @@ function ViewDistributionList() { $this->db->distinct(); $this->db->select('TMM.MRIRNO,TMM.PONO, TMM.IGRNO,IGRM.DeliveryChellanOrInvoiceNo, -IGRM.DeliveryChellanDate,IGRM.VehicleNo,IGRM.CourierNo,TMD.StoreInchargeID,TMD.QualityInchargeID, -TMD.PlantInchargeID,TMD.UpdateBY, POM.PODate,POM.POType,POM.ReleasedBy, +IGRM.DeliveryChellanDate,IGRM.VehicleNo,IGRM.CourierNo,TMD.QualityInchargeID, +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, MM.UOM, POL.Quantity,IGRD.QuantityAsPerInvoice, TMD.ActualQuantityReceived,TMD.QuantityAccepted, 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 ('tbl_users user1','user1.userid = POM.ReleasedBy'); $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_Status ST','ST.StatusCode = TMD.MRIRStatus'); $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 */ 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->join ('T_MRIR_Details TMD','TMM.MRIRNO = TMD.MRIRNO'); $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_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 ('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->order_by('TMD.MRIRNO','asc'); diff --git a/application/models/purchaseorder_model.php b/application/models/purchaseorder_model.php index ad101296..f875b53f 100755 --- a/application/models/purchaseorder_model.php +++ b/application/models/purchaseorder_model.php @@ -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 diff --git a/application/views/editimportpo.php b/application/views/editimportpo.php index 81e44b49..a8e48849 100755 --- a/application/views/editimportpo.php +++ b/application/views/editimportpo.php @@ -29,7 +29,7 @@ foreach ($PaymentTerms as $TER) } //echo $Terms; $dt = new DateTime('now', new DateTimeZone('Asia/Kolkata')); -$CurrentDate = $dt->format('Y-m-d'); +$CurrentDate = $dt->format('d-m-y'); $MaxPoDate = ''; if(!empty($MaxPODate)) @@ -118,10 +118,10 @@ if(!empty($POMaster)) $Address = $Req->Address; $Pdt = new DateTime($Req->PODate); - $PODate = $Pdt->format('Y-m-d'); + $PODate = $Pdt->format('d-m-Y'); $Ddt = new DateTime($Req->DeliveryDate); - $Deliverydt = $Ddt->format('Y-m-d'); + $Deliverydt = $Ddt->format('d-m-Y'); $DeliveryAddress =$Req->DeliveryAddress; $PONOStatus = $Req->StatusCode; @@ -155,7 +155,7 @@ if(!empty($RequistionDetails)) { // $Reqon=$ReqDet->ReqDate; $Reqonn=new DateTime($ReqDet->ReqDate); - $Reqon=$Reqonn->format('Y-m-d'); + $Reqon=$Reqonn->format('d-m-Y'); $Requestedby=$ReqDet->Requestedby; $RequesterName=$ReqDet->FirstName; //$Status=$ReqDet->Status; @@ -221,7 +221,7 @@ if(!empty($RequistionDetails)) $("#PODate").datepicker({ minDate : d, 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({ @@ -237,13 +237,13 @@ if(!empty($RequistionDetails)) $("#Requeston").datepicker({ //minDate : d, 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({ minDate : m, //maxDate : 'now', - dateFormat: 'mm/dd/yy',changeMonth: true, changeYear: true,yearRange: '-100:+0' + dateFormat: 'dd/mm/yy',changeMonth: true, changeYear: true,yearRange: '-100:+0' }); }); diff --git a/application/views/importpo.php b/application/views/importpo.php index 7b6b6a27..4980720d 100755 --- a/application/views/importpo.php +++ b/application/views/importpo.php @@ -8,7 +8,7 @@ $UOM=''; $Terms=''; 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)) @@ -20,7 +20,7 @@ if(!empty($CompanyDetails)) } //echo "$CompanyAddress"; $dt = new DateTime('now', new DateTimeZone('Asia/Kolkata')); -$CurrentDate = $dt->format('Y-m-d'); +$CurrentDate = $dt->format('d-m-y'); //echo $CurrentDate; $MaxPoDate = ''; if(!empty($MaxPODate)) @@ -99,14 +99,14 @@ $("#PaymentTerms").select2(); $("#PODate").datepicker({ minDate : d, 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({ minDate : m, //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({ // minDate : 'now', diff --git a/application/views/importpopdf.php b/application/views/importpopdf.php index 82344192..d21ac9aa 100755 --- a/application/views/importpopdf.php +++ b/application/views/importpopdf.php @@ -236,12 +236,12 @@ Quantity ; ?> UOM ; ?> - Rate),2) ; ?> + Rate),2, '.', '') ; ?> Quantity*$record->Rate); - echo number_format($BasicValue,2) ; ?> + echo number_format($BasicValue,2, '.', '') ; ?> Quantity*$record->Rate); - echo number_format($BasicValue,2) ; ?> + echo number_format($BasicValue,2, '.', '') ; ?> diff --git a/application/views/mririmportpopdf.php b/application/views/mririmportpopdf.php index 178daab5..ac951760 100755 --- a/application/views/mririmportpopdf.php +++ b/application/views/mririmportpopdf.php @@ -241,12 +241,12 @@ Quantity ; ?> UOM ; ?> - Rate),2) ; ?> + Rate),2, '.', '') ; ?> Quantity*$record->Rate); - echo number_format($BasicValue,2) ; ?> + echo number_format($BasicValue,2, '.', '') ; ?> Quantity*$record->Rate); - echo number_format($BasicValue,2) ; ?> + echo number_format($BasicValue,2, '.', '') ; ?> diff --git a/application/views/viewmrirforbilling.php b/application/views/viewmrirforbilling.php index 1d2450b8..ff8d7471 100755 --- a/application/views/viewmrirforbilling.php +++ b/application/views/viewmrirforbilling.php @@ -97,7 +97,7 @@ $color=''; StatusName ?> Remarks ?> QualityInchargeID ?> - StoreInchargeID ?> + StoreinchargeName?> @@ -340,13 +340,33 @@ $color=''; $("#DeliveryChellanOrInvoiceNo").val(item.DeliveryChellanOrInvoiceNo); var dcd = new Date(item.DeliveryChellanDate); //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); $("#VehicleNo").val(item.VehicleNo); $("#CourierNo").val(item.CourierNo); var ddate = new Date(item.DeliveryDate); //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; //alert(Potype); if(Potype=='CAPITAL' || Potype=='IMPORT') @@ -358,7 +378,7 @@ $color=''; $("#SupplierName").val(item.SupplierName); $("#Address").val(item.Address); $('#Remarks').val(item.ServiceDescription); - $("#StoreIncharge").val(item.StoreInchargeID); + $("#StoreIncharge").val(item.StoreinchargeName); $("#PlantIncharge").val(item.PlantInchargeID); $("#QualityIncharge").val(item.QualityInchargeID);