From ad73ea291368ca405935bfef3829d0048720a676 Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Thu, 5 Apr 2018 19:19:16 +0530 Subject: [PATCH] company name changed all screen --- application/config/routes.php | 8 +++---- application/controllers/CostCenter.php | 2 +- application/controllers/MRIRcontroller.php | 3 ++- application/controllers/assetdetails.php | 2 +- application/controllers/c_test.php | 2 ++ application/controllers/department.php | 14 ++++++------ application/controllers/employeedetails.php | 2 +- application/controllers/payslip.php | 10 ++++++--- application/controllers/purchaseorder.php | 22 +++++++++++-------- .../controllers/rawmaterialdetails.php | 16 +++++++------- .../storerequisitioncontroller.php | 6 ++--- application/controllers/supplier.php | 2 +- application/models/payroll_model.php | 2 +- application/models/purchaseorder_model.php | 10 ++++++++- .../views/Report_Material_Master_ItemWise.php | 4 ++-- .../Report_Material_Master_ReceiptValue.php | 4 ++-- .../Report_Material_Master_SupplierWise.php | 4 ++-- application/views/Report_POreleased.php | 4 ++-- application/views/Report_consolidate.php | 4 ++-- .../views/Report_consolidate_inward.php | 4 ++-- application/views/Report_consolidate_m.php | 4 ++-- .../views/Report_consolidate_month.php | 4 ++-- .../views/Report_consolidate_month_inward.php | 4 ++-- application/views/Report_consolidate_raw.php | 4 ++-- application/views/Report_consolidate_y.php | 4 ++-- application/views/Report_consolidate_year.php | 4 ++-- .../views/Report_consolidate_year_inward.php | 4 ++-- application/views/Report_costcenter.php | 4 ++-- application/views/Report_cumulative.php | 4 ++-- application/views/Report_cumulative_day.php | 4 ++-- .../views/Report_cumulative_day_inward.php | 4 ++-- .../views/Report_cumulative_day_raw.php | 4 ++-- .../views/Report_cumulative_inward.php | 4 ++-- application/views/Report_cumulative_month.php | 4 ++-- .../views/Report_cumulative_month_inward.php | 4 ++-- .../views/Report_cumulative_month_raw.php | 4 ++-- application/views/Report_cumulative_raw.php | 4 ++-- application/views/Report_cumulative_year.php | 4 ++-- .../views/Report_cumulative_year_inward.php | 4 ++-- .../views/Report_cumulative_year_raw.php | 4 ++-- application/views/Report_month_wise.php | 8 ++++--- .../views/Report_month_wise_inward.php | 4 ++-- application/views/Report_openorder.php | 4 ++-- application/views/Report_pending_purchase.php | 4 ++-- application/views/Report_purchase.php | 4 ++-- application/views/Report_purchase_inward.php | 4 ++-- application/views/Report_supplier.php | 4 ++-- application/views/Report_supplier_inward.php | 4 ++-- application/views/Report_totalorders.php | 4 ++-- application/views/Report_year_wise.php | 4 ++-- application/views/Report_year_wise_inward.php | 4 ++-- application/views/Report_year_wise_total.php | 4 ++-- .../views/Report_year_wise_total_inward.php | 4 ++-- application/views/addstorerequisitionslip.php | 2 +- .../views/approvalstorerequisitionslip.php | 6 ++--- application/views/bankreportprint.php | 2 +- application/views/cashbooklisting.php | 2 +- application/views/create_pdf.php | 2 +- application/views/editstorerequisition.php | 6 ++--- application/views/forgotPassword.php | 4 ++-- application/views/includes/pdffooter.php | 2 +- application/views/payslipgenerateprint.php | 12 ++++++---- application/views/report_emp.php | 18 +++++++++------ application/views/report_pendingreqst.php | 4 ++-- application/views/requisitionlistapproval.php | 2 +- application/views/serviceporeport.php | 7 ++++-- application/views/storerequisition.php | 2 +- application/views/storerequisitionlisting.php | 11 +++++----- application/views/viewIGRDetails.php | 4 ++-- application/views/viewinwardgateregister.php | 4 ++-- .../views/viewmaterialinspectionreport.php | 4 ++-- application/views/viewmrirforbilling.php | 2 +- 72 files changed, 195 insertions(+), 162 deletions(-) diff --git a/application/config/routes.php b/application/config/routes.php index 5689133f..5eca5bbd 100644 --- a/application/config/routes.php +++ b/application/config/routes.php @@ -188,10 +188,10 @@ $route['POApproval'] = "purchaseorder/poapproval"; // -$route['storerequisition']="storerequisitionlist/addstore"; -$route['approvalstorerequisitionslip']="storerequisitionlist/SearchRequistLists"; -$route['storerequisitionlisting']="storerequisitionlist/addstorerequisitionlist"; -$route['EditStoreRequisition'] = "storerequisitionlist/EditStoreRequistion"; +$route['storerequisition']="storerequisitioncontroller/addstore"; +$route['approvalstorerequisitionslip']="storerequisitioncontroller/SearchRequistLists"; +$route['storerequisitionlisting']="storerequisitioncontroller/addstorerequisitionlist"; +$route['EditStoreRequisition'] = "storerequisitioncontroller/EditStoreRequistion"; //<-------------IGR page-----------------> $route['Addigr'] = "inwardgateregister/addinwardgateregister"; diff --git a/application/controllers/CostCenter.php b/application/controllers/CostCenter.php index 4b92d9e3..90647d13 100644 --- a/application/controllers/CostCenter.php +++ b/application/controllers/CostCenter.php @@ -383,7 +383,7 @@ class CostCenter extends BaseController $this->excel->getActiveSheet()->setTitle('Cost Master'); - $this->excel->getActiveSheet()->setCellValue('G3', 'RESICO INDUSTRIES Cost Master'); + $this->excel->getActiveSheet()->setCellValue('G3', strtoupper($this->CompanyName).' Cost Master'); $this->excel->getActiveSheet()->setCellValue('C5', 'S.No'); $this->excel->getActiveSheet()->setCellValue('D5', 'CostCenterCode'); $this->excel->getActiveSheet()->setCellValue('E5', 'CostCenterName'); diff --git a/application/controllers/MRIRcontroller.php b/application/controllers/MRIRcontroller.php index 7ea21d81..727872a9 100644 --- a/application/controllers/MRIRcontroller.php +++ b/application/controllers/MRIRcontroller.php @@ -77,7 +77,8 @@ class MRIRcontroller extends BaseController $HTMLFooter = $this->load->view('includes/bankreport_footer',$data, true); $mpdf->SetDisplayMode('fullpage'); - $mpdf->SetTitle('Resico : MRIR PDF'); + //$mpdf->SetTitle('Resico : MRIR PDF'); + $mpdf->SetTitle($this->CompanyName.' : MRIR PDF'); $mpdf->SetHTMLHeader($HtmlHeading); $html = $this->load->view('Mrirprintpdf',$data,true); $mpdf->SetDisplayMode('fullpage'); diff --git a/application/controllers/assetdetails.php b/application/controllers/assetdetails.php index 96b0d33f..a032aa95 100644 --- a/application/controllers/assetdetails.php +++ b/application/controllers/assetdetails.php @@ -415,7 +415,7 @@ class assetdetails extends BaseController $this->excel->getActiveSheet()->setTitle('Asset Details'); - $this->excel->getActiveSheet()->setCellValue('G3', 'RESICO INDUSTRIES Asset Details'); + $this->excel->getActiveSheet()->setCellValue('G3', strtoupper($this->CompanyName).' Asset Details'); $this->excel->getActiveSheet()->setCellValue('C5', 'AssetCode'); $this->excel->getActiveSheet()->setCellValue('D5', 'AssetName'); $this->excel->getActiveSheet()->setCellValue('E5', 'AssetDescription'); diff --git a/application/controllers/c_test.php b/application/controllers/c_test.php index ba5f639a..173ccc4d 100644 --- a/application/controllers/c_test.php +++ b/application/controllers/c_test.php @@ -22,6 +22,8 @@ class C_test extends BaseController { $data['PODetail'] = $this->purchaseorder_model->getPurchaseOrder($PONO); $data['POLineItem'] = $this->purchaseorder_model->getPOLineItem($PONO); + //$data['CompanyDtl'] = $this->purchaseorder_model->getcompanydtl(); + print_r($data['CompanyDtl']); //$this->global['pageTitle'] = 'Purchase Order Report'; // Add header to pdf diff --git a/application/controllers/department.php b/application/controllers/department.php index 0451d9c9..902018a0 100644 --- a/application/controllers/department.php +++ b/application/controllers/department.php @@ -39,18 +39,18 @@ class department extends BaseController */ function departmentListing() { - if($this->isAdmin() == TRUE) - { - $this->loadThis(); - } - else - { + // if($this->isAdmin() == TRUE) + // { + // $this->loadThis(); + // } + // else + // { $this->load->model('department_model'); $data['userRecords'] = $this->department_model->departmentListing(); //$this->global['pageTitle'] = 'Resico : Department Listing'; $this->global['pageTitle'] = $this->CompanyName.' : Department Listing'; $this->loadViews("departmentListing", $this->global, $data, NULL); - } + //} } /** diff --git a/application/controllers/employeedetails.php b/application/controllers/employeedetails.php index 4d050492..22ed3226 100644 --- a/application/controllers/employeedetails.php +++ b/application/controllers/employeedetails.php @@ -862,7 +862,7 @@ class employeedetails extends BaseController $this->excel->getActiveSheet()->setTitle('Employee details'); - $this->excel->getActiveSheet()->setCellValue('L3', 'RESICO INDUSTRIES Employee Details'); + $this->excel->getActiveSheet()->setCellValue('L3', strtoupper($this->CompanyName).' Employee Details'); $this->excel->getActiveSheet()->setCellValue('C5', 'EmpID'); $this->excel->getActiveSheet()->setCellValue('D5', 'FirstName-LastName'); diff --git a/application/controllers/payslip.php b/application/controllers/payslip.php index eab21036..b56e2d67 100755 --- a/application/controllers/payslip.php +++ b/application/controllers/payslip.php @@ -353,7 +353,8 @@ class payslip extends BaseController $mpdf=new mPDF('utf-8','A4-P',10, 12,12, 10, 10, 38, 4, 6); $HTMLFooter = $this->load->view('includes/bankreport_footer',$data, true); $mpdf->SetDisplayMode('fullpage'); - $mpdf->SetTitle('Resico : PDF'.$filename); + //$mpdf->SetTitle('Resico : PDF'.$filename); + $mpdf->SetTitle($this->CompanyName.' : PDF'.$filename); /*$mpdf->setTitle('Resico : PayrollReport');*/ //$mpdf->SetHTMLHeader($HtmlHeading); $mpdf->setFooter($HTMLFooter . "Page {PAGENO} of {nb}"); @@ -794,7 +795,8 @@ class payslip extends BaseController $EmpID = $result[$i]['EmpId']; $Data['PayDetails'] = $this->payroll_model->GetPayslipdata($Payon,$EmpID); - + $Data['CompanyDetails'] = $this->payroll_model->Companydetails(); + $totalsalary =$Data['PayDetails'][0]->LessAdvance; $totalsalaryinwords = $this->convertNumber(round($totalsalary)); $Data['amtinwords']=$totalsalaryinwords; @@ -817,6 +819,7 @@ class payslip extends BaseController $totalsalary =$Data['PayDetails'][0]->LessAdvance; $totalsalaryinwords = $this->convertNumber(round($totalsalary)); $Data['amtinwords']=$totalsalaryinwords; + $Data['CompanyDetails'] = $this->payroll_model->Companydetails(); $html=$this->load->view("payslipgenerateprint", $Data,true ); } @@ -829,7 +832,8 @@ class payslip extends BaseController $mpdf->setAutoTopMargin = 'stretch'; $mpdf->setAutoBottomMargin = 'stretch'; $mpdf->WriteHTML($html); - $mpdf->SetTitle('Resico : Payslip'); + //$mpdf->SetTitle('Resico : Payslip'); + $mpdf->SetTitle($this->CompanyName.' : Payslip'); $mpdf->Output("".$filename.'.pdf','I',$php); } diff --git a/application/controllers/purchaseorder.php b/application/controllers/purchaseorder.php index 40f25a30..55cfafe0 100644 --- a/application/controllers/purchaseorder.php +++ b/application/controllers/purchaseorder.php @@ -1287,7 +1287,7 @@ $AdvanceAmount=0.00; $mpdf=new mPDF('utf-8','A4-P',7, 10,10, 10, 82, 38, 4, 6); - + $data['companydtl'] = $this->purchaseorder_model->getcompanyDtl(); $HtmlHeading = $this->load->view('includes/pdfheader',$data, true); $HTMLFooter = $this->load->view('includes/pdffooter',$data, true); $mpdf->SetWatermarkImage('./assets/images/mpdf.png', 8, 10 ); @@ -1308,7 +1308,8 @@ $AdvanceAmount=0.00; $mpdf->SetHTMLHeader($HtmlHeading); $html = $this->load->view('revenuepopdf',$data,true); - $mpdf->SetTitle('Resico : PO PDF'); + //$mpdf->SetTitle('Resico : PO PDF'); + $mpdf->SetTitle($this->CompanyName.' : Revenue PO PDF'); $mpdf->SetDisplayMode('fullpage'); $mpdf->setFooter($HTMLFooter . "Page {PAGENO} of {nb}"); @@ -1373,8 +1374,8 @@ $AdvanceAmount=0.00; $mpdf=new mPDF('utf-8','A4-P',7, 10,10, 10, 82, 38, 4, 6); - - + + $data['companydtl'] = $this->purchaseorder_model->getcompanyDtl(); $HtmlHeading = $this->load->view('includes/pdfheader',$data, true); $HTMLFooter = $this->load->view('includes/pdffooter',$data, true); $mpdf->SetWatermarkImage('./assets/images/mpdf.png', 8, 10 ); @@ -1395,7 +1396,8 @@ $AdvanceAmount=0.00; $mpdf->SetHTMLHeader($HtmlHeading); $html = $this->load->view('servicepopdf',$data,true); - $mpdf->SetTitle('Resico : PO PDF'); + //$mpdf->SetTitle('Resico : PO PDF'); + $mpdf->SetTitle($this->CompanyName.' : Service PO PDF'); $mpdf->SetDisplayMode('fullpage'); $mpdf->setFooter($HTMLFooter . "Page {PAGENO} of {nb}"); @@ -1514,7 +1516,7 @@ public function importpoprint($PONO) $mpdf=new mPDF('utf-8','A4-P',7, 10,10, 10, 82, 38, 4, 6); - + $data['companydtl'] = $this->purchaseorder_model->getcompanyDtl(); $HtmlHeading = $this->load->view('includes/pdfheader',$data, true); $HTMLFooter = $this->load->view('includes/pdffooter',$data, true); $mpdf->SetWatermarkImage('./assets/images/mpdf.png', 8, 10 ); @@ -1538,7 +1540,8 @@ public function importpoprint($PONO) $mpdf->SetDisplayMode('fullpage'); $mpdf->setFooter($HTMLFooter . "Page {PAGENO} of {nb}"); - $mpdf->SetTitle('Resico : PO PDF'); + //$mpdf->SetTitle('Resico : PO PDF'); + $mpdf->SetTitle($this->CompanyName.' : Import PO PDF'); $mpdf->list_indent_first_level = 1; $mpdf->setAutoTopMargin = 'stretch'; $mpdf->setAutoBottomMargin = 'stretch'; @@ -2768,7 +2771,7 @@ function addNewImportPurchaseOrder() $mpdf=new mPDF('utf-8','A4-P',7, 10,10, 10, 82, 38, 4, 6); - +$data['companydtl'] = $this->purchaseorder_model->getcompanyDtl(); $HtmlHeading = $this->load->view('includes/pdfheader',$data, true); $HTMLFooter = $this->load->view('includes/pdffooter',$data, true); $mpdf->SetWatermarkImage('./assets/images/mpdf.png', 8, 10 ); @@ -2789,7 +2792,8 @@ function addNewImportPurchaseOrder() $mpdf->SetHTMLHeader($HtmlHeading); $html = $this->load->view('capitalpopdf',$data,true); - $mpdf->SetTitle('Resico : PO PDF'); + //$mpdf->SetTitle('Resico : PO PDF'); + $mpdf->SetTitle($this->CompanyName.' : Capital PO PDF'); $mpdf->SetDisplayMode('fullpage'); $mpdf->setFooter($HTMLFooter . "Page {PAGENO} of {nb}"); diff --git a/application/controllers/rawmaterialdetails.php b/application/controllers/rawmaterialdetails.php index 1df0ee0e..187a4541 100644 --- a/application/controllers/rawmaterialdetails.php +++ b/application/controllers/rawmaterialdetails.php @@ -269,12 +269,12 @@ else */ function editRawmaterial() { - if($this->isAdmin() == TRUE) - { - $this->loadThis(); - } - else - { + // if($this->isAdmin() == TRUE) + // { + // $this->loadThis(); + // } + // else + // { $RawmaterialID = $this->input->post('MaterialCode'); $this->form_validation->set_rules('MaterialName','Material Name','trim|required|'); $this->form_validation->set_rules('MaterialType','MaterialType','trim'); @@ -379,7 +379,7 @@ else } } - } + function autocomplete() { @@ -429,7 +429,7 @@ function insertvalueintoconfig(){ $this->excel->getActiveSheet()->setTitle('Material Master'); - $this->excel->getActiveSheet()->setCellValue('F3', 'RESICO INDUSTRIES Material Master'); + $this->excel->getActiveSheet()->setCellValue('F3', strtoupper($this->CompanyName).' Material Master'); $this->excel->getActiveSheet()->setCellValue('C5', 'MaterialCode'); $this->excel->getActiveSheet()->setCellValue('D5', 'MaterialName'); $this->excel->getActiveSheet()->setCellValue('E5', 'MaterialType'); diff --git a/application/controllers/storerequisitioncontroller.php b/application/controllers/storerequisitioncontroller.php index 1c5d5e27..d3fcfefe 100644 --- a/application/controllers/storerequisitioncontroller.php +++ b/application/controllers/storerequisitioncontroller.php @@ -3,13 +3,13 @@ require APPPATH . '/libraries/BaseController.php'; /** - * Class :storerequisitionlist (Store Stock list details - Controller) - * storerequisitionlist Class to control all Store's-stock related operations. + * Class :storerequisitioncontroller (Store Stock list details - Controller) + * storerequisitioncontroller Class to control all Store's-stock related operations. * @author : Venba Info Tech - * @version : 1.1 * @since : 18 November 2017 */ -class storerequisitionlist extends BaseController +class storerequisitioncontroller extends BaseController { /** * Default constructor of the class diff --git a/application/controllers/supplier.php b/application/controllers/supplier.php index 20cd8065..fdf44ebc 100644 --- a/application/controllers/supplier.php +++ b/application/controllers/supplier.php @@ -475,7 +475,7 @@ class supplier extends BaseController $this->excel->setActiveSheetIndex(0)->getStyle('J3')->getAlignment()->applyFromArray(array('horizontal' => PHPExcel_Style_Alignment::HORIZONTAL_CENTER,)); $this->excel->getActiveSheet()->setTitle('Supplier details'); - $this->excel->getActiveSheet()->setCellValue('J3', 'RESICO INDUSTRIES Supplier Details'); + $this->excel->getActiveSheet()->setCellValue('J3', strtoupper($this->CompanyName).' Supplier Details'); $this->excel->getActiveSheet()->setCellValue('A5', 'SupplierID'); $this->excel->getActiveSheet()->setCellValue('B5', 'SupplierName'); diff --git a/application/models/payroll_model.php b/application/models/payroll_model.php index 22da7e9e..c7376d3b 100755 --- a/application/models/payroll_model.php +++ b/application/models/payroll_model.php @@ -73,7 +73,7 @@ class Payroll_model extends CI_Model } function Companydetails() { - $this->db->select('CompanyName,CollectrateAddress'); + $this->db->select('CompanyName,Address,CollectrateAddress'); $this->db->from('T_Company_Details'); $query = $this->db->get(); return $query->result(); diff --git a/application/models/purchaseorder_model.php b/application/models/purchaseorder_model.php index 3a46e0eb..3e33cb82 100755 --- a/application/models/purchaseorder_model.php +++ b/application/models/purchaseorder_model.php @@ -2,12 +2,20 @@ class purchaseorder_model extends CI_Model { + + function getcompanyDtl(){ + $this->db->select('*'); + $this->db->from('T_Company_Details'); + $query = $this->db->get(); + return $query->result(); + + } function GetServicePOListforStatusUpdate() { $this->db->distinct(); $this->db->select('PO.PONO'); $this->db->from('T_PurchaseOrder_Master PO'); - $this->db->join('T_PurchaseOrder_LineItem Line','PO.PONO = Line.PONO'); + $this->db->join('T_PurchaseOrder_LineItem Line','PO.PONO = Line.PONO'); $this->db->join('T_Requestion_Master Req','Req.ReqNo = Line.ReqNo'); $this->db->where('PO.POType',SERVICE); diff --git a/application/views/Report_Material_Master_ItemWise.php b/application/views/Report_Material_Master_ItemWise.php index 71e74312..4e196199 100755 --- a/application/views/Report_Material_Master_ItemWise.php +++ b/application/views/Report_Material_Master_ItemWise.php @@ -6,7 +6,7 @@ if(!empty($mmi)) } ?> - + - + diff --git a/application/views/Report_Material_Master_SupplierWise.php b/application/views/Report_Material_Master_SupplierWise.php index d58f28ea..604b4699 100755 --- a/application/views/Report_Material_Master_SupplierWise.php +++ b/application/views/Report_Material_Master_SupplierWise.php @@ -6,7 +6,7 @@ if(!empty($mms)) } ?> - + +
-

Report - Month-wise ()

+

Report - Month-wise ()

@@ -126,8 +127,9 @@ if(!empty($mms))
+
- + diff --git a/application/views/Report_month_wise_inward.php b/application/views/Report_month_wise_inward.php index 39e2f3a7..ae98589a 100644 --- a/application/views/Report_month_wise_inward.php +++ b/application/views/Report_month_wise_inward.php @@ -6,7 +6,7 @@ if(!empty($mms)) } ?> - + +
+

-

Employee Performance
+

Employee Performance
input->post('financialyear')){ @@ -201,8 +203,10 @@

+
+
- + diff --git a/application/views/report_pendingreqst.php b/application/views/report_pendingreqst.php index b2e653dc..62509288 100755 --- a/application/views/report_pendingreqst.php +++ b/application/views/report_pendingreqst.php @@ -6,7 +6,7 @@ if(!empty($pending_list)) } ?> - +