From e778f34fb9974a3bb4b0b823c47902b1bfdc2e43 Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Tue, 22 Aug 2017 17:45:49 +0530 Subject: [PATCH] mrir,igr dateformat and apporaval store no in aproval store screen and storestatus changes in stock details screen --- application/models/dahsboard_model.php | 4 ++-- application/views/Mrirprintpdf.php | 6 +++--- application/views/approvalstorerequisitionslip.php | 4 ++-- application/views/assetListing.php | 2 +- application/views/inwardgateregister.php | 4 ++-- application/views/requisitionlistapproval.php | 8 ++++---- application/views/storestatus.php | 4 ++-- application/views/viewIGRDetails.php | 2 +- application/views/viewinwardgateregister.php | 2 +- application/views/viewmaterialinspectionreport.php | 2 +- 10 files changed, 19 insertions(+), 19 deletions(-) diff --git a/application/models/dahsboard_model.php b/application/models/dahsboard_model.php index 071f660a..2d3dff5c 100755 --- a/application/models/dahsboard_model.php +++ b/application/models/dahsboard_model.php @@ -331,7 +331,7 @@ group by Dept_Name"; function report_ccr(){ - $sql="SELECT Cost_Center_Budget.CostCenterCode as Cost_Center_Code, CostCenterName as Cost_Center_Name,Dept_Details.DepartmentName as Dept_Name,Cost_Center_Budget.BudgetType as BudgetType,Cost_Center_Budget.BudgetYear as BudgetYear, + $sql="SELECT Cost_Center_Budget.CostCenterCode as Cost_Center_Code, CostCenterName as Cost_Center_Name,group_concat(distinct Dept_Details.DepartmentName) as Dept_Name,Cost_Center_Budget.BudgetType as BudgetType,Cost_Center_Budget.BudgetYear as BudgetYear, case Cost_Center_Budget.BudgetType when 'IMPORT' @@ -375,7 +375,7 @@ JOIN T_CostCenter_Departments CostCentDept on CostCentDept.CostCenterCode=Cost_M JOIN T_DepartmentDetails Dept_Details on Dept_Details.DEPCode= CostCentDept.DEPCode WHERE DATE(Cost_Center_Budget.CreatedDate) BETWEEN '2017-04-01' AND '2018-03-31' group by -Cost_Center_Budget.CostCenterCode,Cost_Center_Budget.BudgetType +Cost_Center_Budget.CostCenterCode,Cost_Center_Budget.BudgetType,Cost_Center_Budget.BudgetYear order by Cost_Center_Budget.CostCenterCode"; $query = $this->db->query($sql); return $query->result(); diff --git a/application/views/Mrirprintpdf.php b/application/views/Mrirprintpdf.php index f96e43af..9801628d 100755 --- a/application/views/Mrirprintpdf.php +++ b/application/views/Mrirprintpdf.php @@ -49,17 +49,17 @@ $IGRNO=$MRIR->IGRNO; $IGRRAISEDBY=$MRIR->IGRRasiedbyName; $dt1=new DateTime($MRIR->IGRCreated,new DateTimeZone('Asia/Kolkata')); - $IGRCREATEDON=$dt1->format('d-m-y'); + $IGRCREATEDON=$dt1->format('d-m-Y'); $PONO=$MRIR->PONO; $dt=new DateTime($MRIR->PODate, new DateTimeZone('Asia/Kolkata')); $PODATE=$dt->format('d-m-Y'); $PORAISEDBY=$MRIR->PORasiedbyName; $DCINV=$MRIR->DeliveryChellanOrInvoiceNo; $dt4=new DateTime($MRIR->DeliveryChellanDate,new DateTimeZone('Asia/Kolkata')); - $DCINVDATE=$dt4->format('d-m-y'); + $DCINVDATE=$dt4->format('d-m-Y'); $VECHICLENO=$MRIR->VehicleNo; $dt3=new DateTime($MRIR->MRIRCreatedon,new DateTimeZone('Asia/Kolkata')); - $MRIRCREATEDON=$dt3->format('d-m-y'); + $MRIRCREATEDON=$dt3->format('d-m-Y'); $MRIRRAISEDBY=$MRIR->MRIRRasiedbyName; $COSTCENTERCODE=$MRIR->CostCenterCode; $COSTCENTERNAME=$MRIR->CostCenterName; diff --git a/application/views/approvalstorerequisitionslip.php b/application/views/approvalstorerequisitionslip.php index d71ed357..a2aaf720 100755 --- a/application/views/approvalstorerequisitionslip.php +++ b/application/views/approvalstorerequisitionslip.php @@ -27,7 +27,7 @@
-

Store Requisition Details - REQNo

+

Store Requisition Details -

@@ -236,7 +236,7 @@ function Reset() } $("#myModal").on("shown.bs.modal", function(e) { var ReqId = $(e.relatedTarget).data('userid'); - // alert(ReqId); + $("#StReqno").html(ReqId); $('#ReqNO').val(ReqId); $("#CostCenter").val(''); $("#tbleAppend").empty(); diff --git a/application/views/assetListing.php b/application/views/assetListing.php index f44277e3..f048700f 100755 --- a/application/views/assetListing.php +++ b/application/views/assetListing.php @@ -52,7 +52,7 @@ SupplierName ?> DateOfPurchase); - $DOPurchase = $dtpurchase ->format('d/m/Y'); + $DOPurchase = $dtpurchase ->format('d-m-Y'); echo $DOPurchase ?> AssetValue, 2); ?> AssetStatus ?> diff --git a/application/views/inwardgateregister.php b/application/views/inwardgateregister.php index 64268919..5845d093 100755 --- a/application/views/inwardgateregister.php +++ b/application/views/inwardgateregister.php @@ -10,7 +10,7 @@ $("#InvoiceDate").datepicker({ maxDate : 'now', - dateFormat: 'mm/dd/yy',changeMonth: true, changeYear: true,yearRange: '-100:+0' + dateFormat: 'dd-mm-yy',changeMonth: true, changeYear: true,yearRange: '-100:+0' }); }); @@ -50,7 +50,7 @@ Inputmask("A{2,3} 9{1,2} A{1,2} 9{4}").mask($("#VehicleNo")); } -
+

Siddharth Industries - Inward Gate Register (IGR) Entry
diff --git a/application/views/requisitionlistapproval.php b/application/views/requisitionlistapproval.php index d5429707..0b5f2348 100755 --- a/application/views/requisitionlistapproval.php +++ b/application/views/requisitionlistapproval.php @@ -1,4 +1,3 @@ -
@@ -91,13 +90,13 @@
-

Requisition Details - REQ No

+

Requisition Details -

- +