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 @@