diff --git a/application/controllers/CostCenter.php b/application/controllers/CostCenter.php index a63e6368..4b92d9e3 100644 --- a/application/controllers/CostCenter.php +++ b/application/controllers/CostCenter.php @@ -21,6 +21,7 @@ class CostCenter extends BaseController $this->load->library('form_validation'); $this->load->library('pagination'); $this->isLoggedIn(); + $this->CompanyName = $this->global['CompanyName']; } /** @@ -29,7 +30,7 @@ class CostCenter extends BaseController public function index() { //$this->global['pageTitle'] = 'Resico : Cost Details'; - $this->global['pageTitle'] = $this->global['CompanyName'].' : Cost Details'; + $this->global['pageTitle'] = $this->CompanyName.' : Cost Details'; $this->loadViews("costListing", $this->global, NULL , NULL); } @@ -42,7 +43,7 @@ class CostCenter extends BaseController $data['userRecords'] = $this->costcenter_model->CostListing(); //$this->global['pageTitle'] = 'Resico : Cost List'; - $this->global['pageTitle'] = $this->global['CompanyName'].' : Cost Details'; + $this->global['pageTitle'] = $this->CompanyName.' : Cost Details'; $this->loadViews("costListing", $this->global, $data, NULL); } @@ -62,7 +63,7 @@ class CostCenter extends BaseController $data['FiscalYear'] = $this->costcenter_model->getFiscalYear(); //$this->global['pageTitle'] = 'Resico : Add Cost Center'; - $this->global['pageTitle'] = $this->global['CompanyName'].' : Add Cost Center'; + $this->global['pageTitle'] = $this->CompanyName.' : Add Cost Center'; $this->loadViews("addCostCenter", $this->global,$data, NULL); @@ -173,7 +174,7 @@ class CostCenter extends BaseController $data['FiscalYear'] = $this->costcenter_model->getFiscalYear(); //$this->global['pageTitle'] = 'Resico : Edit Cost'; - $this->global['pageTitle'] = $this->global['CompanyName'].' : Edit Cost Center'; + $this->global['pageTitle'] = $this->CompanyName.' : Edit Cost Center'; $this->loadViews("editCostCenter", $this->global, $data,NULL); } @@ -338,7 +339,7 @@ class CostCenter extends BaseController $data['Cost'] = $this->costcenter_model->getuserinfo($CostCenterID); //$this->global['pageTitle'] = 'Resico : View Cost Details'; - $this->global['pageTitle'] = $this->global['CompanyName'].' : View Cost Details'; + $this->global['pageTitle'] = $this->CompanyName.' : View Cost Details'; $this->loadViews("viewcost", $this->global, $data,NULL); @@ -476,7 +477,7 @@ class CostCenter extends BaseController function pageNotFound() { //$this->global['pageTitle'] = 'Resico : 404 - Page Not Found'; - $this->global['pageTitle'] = $this->global['CompanyName'].' : 404 - Page Not Found'; + $this->global['pageTitle'] = $this->CompanyName.' : 404 - Page Not Found'; $this->loadViews("404", $this->global, NULL, NULL); } diff --git a/application/controllers/MRIRcontroller.php b/application/controllers/MRIRcontroller.php index 6feb5e83..7ea21d81 100644 --- a/application/controllers/MRIRcontroller.php +++ b/application/controllers/MRIRcontroller.php @@ -24,6 +24,7 @@ class MRIRcontroller extends BaseController $this->load->library('session'); $this->load->library('form_validation'); $this->isLoggedIn(); + $this->CompanyName = $this->global['CompanyName']; } /** @@ -32,7 +33,7 @@ class MRIRcontroller extends BaseController public function index() { //$this->global['pageTitle'] = 'Resico : View material inspection report'; - $this->global['pageTitle'] = $this->global['CompanyName'].' : View material inspection report'; + $this->global['pageTitle'] = $this->CompanyName.' : View material inspection report'; $this->loadViews("viewmaterialinspectionreport", $this->global,NULL , NULL); } @@ -42,7 +43,7 @@ class MRIRcontroller extends BaseController function materialinspectionreport($mrir='',$IGRNO='') { //$this->global['pageTitle'] = 'Resico : Material Inspection Report'; - $this->global['pageTitle'] = $this->global['CompanyName'].' : Material Inspection Report'; + $this->global['pageTitle'] = $this->CompanyName.' : Material Receipt and Inspection Report'; $this->load->model('mrir_model'); @@ -61,6 +62,7 @@ class MRIRcontroller extends BaseController //$this->global['pageTitle'] = 'Resico : MRIR Pdf '; + $this->global['pageTitle'] = $this->CompanyName.' : MRIR pdf'; $data['CompanyDetails'] = $this->purchaseorder_model->getCompanyInformation(); $data['MRIRDetails'] = $this->mrir_model->edit_mrir($MrirNo); $this->load->View("Mrirprintpdf",$data, NULL); @@ -95,7 +97,7 @@ class MRIRcontroller extends BaseController public function viewmrirforbilling() { //$this->global['pageTitle'] = 'Resico : Billing '; - $this->global['pageTitle'] = $this->global['CompanyName'].' : Billing '; + $this->global['pageTitle'] = $this->CompanyName.' : Billing '; $data['Billing'] = $this->mrir_model->view_mrir_Billing(); $this->loadViews("viewmrirforbilling", $this->global,$data , NULL); } @@ -106,7 +108,7 @@ class MRIRcontroller extends BaseController public function viewmMaterialDistributionList() { //$this->global['pageTitle'] = 'Resico : Distribution list '; - $this->global['pageTitle'] = $this->global['CompanyName'].' : Distribution list '; + $this->global['pageTitle'] = $this->CompanyName.' : Distribution list '; $data['Distribution'] = $this->mrir_model->ViewDistributionList(); $data['status'] = $this->mrir_model->getStatus(); $this->loadViews("MaterialIssueList", $this->global,$data , NULL); @@ -123,7 +125,8 @@ class MRIRcontroller extends BaseController $data['IGRDetails'] = $this->mrir_model->get_IGR($IgrNo,$IgrItemno); // $this->global['pageTitle'] = 'Resico: IGR Details '; - $this->global['pageTitle'] = $this->global['CompanyName'].' : IGR Details '; + //$this->global['pageTitle'] = $this->CompanyName.' : IGR Details '; + $this->global['pageTitle'] = $this->CompanyName.' : Material Receipt and Inspection Report'; $this->loadViews("materialinspectionreport", $this->global, $data,NULL); } @@ -135,7 +138,7 @@ class MRIRcontroller extends BaseController { // $this->global['pageTitle'] = 'Resico : View Inward Gate Register'; - $this->global['pageTitle'] = $this->global['CompanyName'].' : View Inward Gate Register'; + $this->global['pageTitle'] = $this->CompanyName.' : View Inward Gate Register'; $data['IGR']= $this->mrir_model->ViewigrListing(); @@ -151,7 +154,7 @@ class MRIRcontroller extends BaseController $data['viewmrirdatas'] = $this->mrir_model-> view_mrir(); //$this->global['pageTitle'] = 'Resico : View Material Inspection Report'; - $this->global['pageTitle'] = $this->global['CompanyName'].' : View Material Inspection Report'; + $this->global['pageTitle'] = $this->CompanyName.' : View Material Receipt And Inspection Report'; $this->loadViews("viewmaterialinspectionreport", $this->global,$data,NULL); } @@ -167,7 +170,7 @@ class MRIRcontroller extends BaseController $data['MRIRDetails'] = $this->mrir_model->edit_mrir($MrirNo); //$this->global['pageTitle'] = 'Resico : Edit Material Inspection Report'; - $this->global['pageTitle'] = $this->global['CompanyName'].' : Edit Material Inspection Report'; + $this->global['pageTitle'] = $this->CompanyName.' : Edit Material Inspection Report'; $this->loadViews("Editmaterialinspectionreport", $this->global,$data,NULL); @@ -412,7 +415,7 @@ class MRIRcontroller extends BaseController function pageNotFound() { //$this->global['pageTitle'] = 'Resico : 404 - Page Not Found'; - $this->global['pageTitle'] = $this->global['CompanyName'].' : 404 - Page Not Found'; + $this->global['pageTitle'] = $this->CompanyName.' : 404 - Page Not Found'; $this->loadViews("404", $this->global, NULL, NULL); } } diff --git a/application/controllers/amendmentpurchaseorder.php b/application/controllers/amendmentpurchaseorder.php index 1b224b0f..563052b4 100644 --- a/application/controllers/amendmentpurchaseorder.php +++ b/application/controllers/amendmentpurchaseorder.php @@ -20,7 +20,8 @@ class amendmentpurchaseorder extends BaseController $this->load->model('purchaseorder_model'); $this->load->library('session'); $this->load->library('form_validation'); - $this->isLoggedIn(); + $this->isLoggedIn(); + $this->CompanyName = $this->global['CompanyName']; } /** @@ -33,7 +34,7 @@ class amendmentpurchaseorder extends BaseController $forwhat='amendment'; $data['POData'] = $this->purchaseorder_model->purchaseorderListing($forwhat); //$this->global['pageTitle'] = 'Resico : Amendment Purchase Order'; - $this->global['pageTitle'] = $this->global['CompanyName'].' : Amendment Purchase Order'; + $this->global['pageTitle'] = $this->CompanyName.' : Amendment Purchase Order'; $this->loadviews('AmendPOlist',$this->global,$data,NULL); } @@ -117,7 +118,7 @@ class amendmentpurchaseorder extends BaseController $data['PaymentTerms']=$this->purchaseorder_model->GetPaymentTerms($PONO); $data['WorkStatus']=$this->purchaseorder_model->getStatus(7); //$this->global['pageTitle'] = 'Resico : Edit Service Purchase order form'; - $this->global['pageTitle'] = $this->global['CompanyName'].' : Edit Service Purchase order form'; + $this->global['pageTitle'] = $this->CompanyName.' : Amendment Service Purchase Order'; $this->loadViews("editServiceAmendPO", $this->global, $data, NULL); } else if($ReqType == REVENUE) @@ -127,7 +128,7 @@ class amendmentpurchaseorder extends BaseController $data['POItem'] = $this->purchaseorder_model->GetRevenuePurchaseOrderDetails($PONO); $data['PaymentTerms']=$this->purchaseorder_model->GetPaymentTerms($PONO); //$this->global['pageTitle'] = 'Resico : Edit Revenue Purchase order form'; - $this->global['pageTitle'] = $this->global['CompanyName'].' : Edit Revenue Purchase order form'; + $this->global['pageTitle'] = $this->CompanyName.' : Amendment Revenue Purchase Order'; $this->loadViews("editRevenueAmendPO", $this->global, $data, NULL); } else if($ReqType == IMPORT) @@ -167,7 +168,7 @@ class amendmentpurchaseorder extends BaseController $data['unicode']=$unicode; $data['currencycode']=$currencycode; //$this->global['pageTitle'] = 'Resico : Edit Import Purchase order form'; - $this->global['pageTitle'] = $this->global['CompanyName'].' : Edit Import Purchase order form'; + $this->global['pageTitle'] = $this->CompanyName.' : Amendment Import Purchase Order'; $this->loadViews("editImportAmendPO", $this->global, $data, NULL); } else if($ReqType == CAPITAL) @@ -215,7 +216,7 @@ class amendmentpurchaseorder extends BaseController } //$this->global['pageTitle'] = 'Resico : Edit Capital Purchase order form'; - $this->global['pageTitle'] = $this->global['CompanyName'].' : Edit Capital Purchase order form'; + $this->global['pageTitle'] = $this->CompanyName.' : Amendment Capital Purchase Order'; $this->loadViews("editCapitalAmendPO", $this->global, $data, NULL); } diff --git a/application/controllers/assetdetails.php b/application/controllers/assetdetails.php index 0d17d212..96b0d33f 100644 --- a/application/controllers/assetdetails.php +++ b/application/controllers/assetdetails.php @@ -21,6 +21,7 @@ class assetdetails extends BaseController $this->load->model('assetdetails_model'); $this->load->library('form_validation'); $this->isLoggedIn(); + $this->CompanyName = $this->global['CompanyName']; } /** @@ -29,7 +30,7 @@ class assetdetails extends BaseController public function index() { //$this->global['pageTitle'] = 'Resico : Asset Details'; - $this->global['pageTitle'] = $this->global['CompanyName'].' : Asset Details'; + $this->global['pageTitle'] = $this->CompanyName.' : Asset Details'; $this->loadViews("assetListing", $this->global, NULL , NULL); } @@ -42,7 +43,7 @@ class assetdetails extends BaseController $this->load->model('assetdetails_model'); $data['userRecords'] = $this->assetdetails_model->assetListing(); //$this->global['pageTitle'] = 'Resico : Asset List'; - $this->global['pageTitle'] = $this->global['CompanyName'].' : Asset Details'; + $this->global['pageTitle'] = $this->CompanyName.' : Asset Details'; $this->loadViews("assetListing", $this->global, $data, NULL); } @@ -56,7 +57,7 @@ class assetdetails extends BaseController $data['AssetStatus'] = $this->assetdetails_model->getConfigValue('C015'); $data['po'] = $this->assetdetails_model->getPO(); //$this->global['pageTitle'] = 'Resico : Add Asset'; - $this->global['pageTitle'] = $this->global['CompanyName'].' : Add Asset Details'; + $this->global['pageTitle'] = $this->CompanyName.' : Add Asset Details'; $this->loadViews("addasset", $this->global, $data, NULL); } @@ -276,7 +277,7 @@ class assetdetails extends BaseController $data['AssetStatusList'] = $this->assetdetails_model->getConfigValue('C015'); $data['PO'] = $this->assetdetails_model->getPO($PO); //$this->global['pageTitle'] = 'Resico : Edit Asset'; - $this->global['pageTitle'] = $this->global['CompanyName'].' : Edit Asset '; + $this->global['pageTitle'] = $this->CompanyName.' : Edit Asset '; $this->loadViews("editasset", $this->global, $data,NULL); } @@ -535,7 +536,7 @@ class assetdetails extends BaseController function pageNotFound() { //$this->global['pageTitle'] = 'Resico : 404 - Page Not Found'; - $this->global['pageTitle'] = $this->global['CompanyName'].' : 404 - Page Not Found'; + $this->global['pageTitle'] = $this->CompanyName.' : 404 - Page Not Found'; $this->loadViews("404", $this->global, NULL, NULL); } diff --git a/application/controllers/cashbook.php b/application/controllers/cashbook.php index 4df68dcb..11fc59ef 100755 --- a/application/controllers/cashbook.php +++ b/application/controllers/cashbook.php @@ -21,6 +21,7 @@ class cashbook extends BaseController $this->isLoggedIn(); $this->load->helper(array('form','url')); $this->load->library('upload'); + $this->CompanyName = $this->global['CompanyName']; } @@ -60,7 +61,7 @@ class cashbook extends BaseController $data['data'] = $this->cashbook_model->getIncomeExpenseList($aid); $data['PaymentDetails'] = $this->cashbook_model->viewpaymentdetails($aid); //$this->global['pageTitle'] = 'Resico : Cash Book: View Income Expense '; - $this->global['pageTitle'] = $this->global['CompanyName'].' : Cash Book - View Income Expense '; + $this->global['pageTitle'] = $this->CompanyName.' : Cash Book - View Income Expense '; $this->loadViews("viewIndIncomeExpense", $this->global, $data , NULL); } @@ -70,7 +71,7 @@ class cashbook extends BaseController //$data['list'] = $this->cashbook_model->getIncomeExpenseList(); $data['list'] = $this->cashbook_model->getreceiptpaymentlist(); //$this->global['pageTitle'] = 'Resico : Cash Book: Listing'; - $this->global['pageTitle'] = $this->global['CompanyName'].': Cash Book: Listing'; + $this->global['pageTitle'] = $this->CompanyName.': Receipt and Payment Details'; $this->loadViews("income_expense_list", $this->global, $data , NULL); } @@ -84,7 +85,7 @@ class cashbook extends BaseController $data['dropdownvalues'] = $this->cashbook_model->getAccounTypes(); //$this->global['pageTitle'] = 'Resico : Cash Book: Add New Income Expense '; - $this->global['pageTitle'] = $this->global['CompanyName'].': Cash Book: Add New Income Expense '; + $this->global['pageTitle'] = $this->CompanyName.': Cash Book: Add New Income Expense '; $this->loadViews("addnewIncomeExpense", $this->global, $data , NULL); } @@ -351,7 +352,7 @@ class cashbook extends BaseController $aid = $this->uri->segment(3); $data['data'] = $this->cashbook_model->getAccounutInfo(); //$this->global['pageTitle'] = 'Resico : Cash Book: View Income Expense '; - $this->global['pageTitle'] = $this->global['CompanyName'].' : Cash Book: View Income Expense '; + $this->global['pageTitle'] = $this->CompanyName.' : Cash Book: View Income Expense '; $this->loadViews("viewIndIncomeExpense", $this->global, $data , NULL); } @@ -362,7 +363,7 @@ class cashbook extends BaseController public function index() { //$this->global['pageTitle'] = 'Resico : Cashbook Details'; - $this->global['pageTitle'] = $this->global['CompanyName'].' : Cashbook Details'; + $this->global['pageTitle'] = $this->CompanyName.' : Cashbook Details'; $this->loadViews("cashbooklisting", $this->global, NULL , NULL); } @@ -376,7 +377,7 @@ class cashbook extends BaseController $data['cashbook'] = $this->cashbook_model->Selectcash(); //$this->global['pageTitle'] = 'Resico : Cashbook Listing'; - $this->global['pageTitle'] = $this->global['CompanyName'].' : Cashbook Listing'; + $this->global['pageTitle'] = $this->CompanyName.' : Cashbook Listing'; $this->loadViews("cashbooklisting", $this->global, $data, NULL); } @@ -442,7 +443,7 @@ class cashbook extends BaseController /** this array for dropdown value(account name)*/ $data['dropdownvalues'] = $this->cashbook_model->getAccounTypes(); //$this->global['pageTitle'] = 'Resico : Edit Cashbook'; - $this->global['pageTitle'] = $this->global['CompanyName'].' : Edit Cashbook'; + $this->global['pageTitle'] = $this->CompanyName.' : Edit Cashbook'; $this->loadViews("editincomeexpenses", $this->global,$data, NULL); } diff --git a/application/controllers/companycontroller.php b/application/controllers/companycontroller.php index d932f96d..ab5d8809 100644 --- a/application/controllers/companycontroller.php +++ b/application/controllers/companycontroller.php @@ -11,6 +11,7 @@ require APPPATH . '/libraries/BaseController.php'; */ class companycontroller extends BaseController { + // var $CompanyName; /** * default constructor of the class */ @@ -18,15 +19,17 @@ class companycontroller extends BaseController { parent::__construct(); $this->load->model('companydetailsmodel'); - $this->isLoggedIn(); + $this->isLoggedIn(); + $this->CompanyName = $this->global['CompanyName']; } /** * Index Page for this controller(default function of the class) - */ + */ public function index() { - $this->global['pageTitle'] = $this->global['CompanyName'].' : Company Details'; + + $this->global['pageTitle'] = $this->CompanyName.' : Company Details'; //$this->loadViews("companyadd", $this->global, NULL , NULL); //$this->loadViews("Updatecompany", $this->global,NULL,NULL); } @@ -36,8 +39,10 @@ class companycontroller extends BaseController */ public function companyview() { + //$vit = $this->vit; + // echo $vit;die; //$this->global['pageTitle'] = 'Resico : Company Details'; - $this->global['pageTitle'] = $this->global['CompanyName'].' : Company Details' ; + $this->global['pageTitle'] = $this->CompanyName.' : Company Details' ; $data['userRecords'] = $this->companydetailsmodel->companylisting(); $data['payment'] = $this->companydetailsmodel->getPaymentTerms(); @@ -84,8 +89,8 @@ class companycontroller extends BaseController * Note : this function Temporary not in use */ function companyadd(){ - - $this->global['pageTitle'] = $this->global['CompanyName'].' : Company Details'; + + $this->global['pageTitle'] = $this->CompanyName.' : Company Details'; $this->loadViews("companyadd", $this->global, NULL); } diff --git a/application/controllers/configurationctrl.php b/application/controllers/configurationctrl.php index 45454ac3..e466d591 100644 --- a/application/controllers/configurationctrl.php +++ b/application/controllers/configurationctrl.php @@ -20,7 +20,8 @@ class configurationctrl extends BaseController $this->load->library('form_validation'); $this->load->model('configmodel'); - $this->isLoggedIn(); + $this->isLoggedIn(); + $this->CompanyName = $this->global['CompanyName']; } /** @@ -29,7 +30,7 @@ class configurationctrl extends BaseController public function index() { //$this->global['pageTitle'] = 'Resico : Config Details'; - $this->global['pageTitle'] = $this->global['CompanyName'].' : Config Details'; + $this->global['pageTitle'] = $this->CompanyName.' : Config Details'; $this->loadViews("configlisting", $this->global, NULL , NULL); } @@ -44,7 +45,7 @@ class configurationctrl extends BaseController $data['userRecords'] = $this->configmodel->configlisting(); //$this->global['pageTitle'] = 'Resico : Config Listing'; - $this->global['pageTitle'] = $this->global['CompanyName'].' : Config Listing'; + $this->global['pageTitle'] = $this->CompanyName.' : Config Listing'; $this->loadViews("configlisting", $this->global, $data, NULL); @@ -56,7 +57,7 @@ class configurationctrl extends BaseController function addconfig() { //$this->global['pageTitle'] = 'Resico : Add New Config'; - $this->global['pageTitle'] = $this->global['CompanyName'].' : Add New Config'; + $this->global['pageTitle'] = $this->CompanyName.' : Add New Config'; $data['userRecords'] = $this->configmodel->configlisting(); $this->loadViews("addconfig", $this->global,NULL, NULL); @@ -121,7 +122,7 @@ class configurationctrl extends BaseController $index = 1; //$this->global['pageTitle'] = 'Resico : Edit Config'; - $this->global['pageTitle'] = $this->global['CompanyName'].' : Edit Config'; + $this->global['pageTitle'] = $this->CompanyName.' : Edit Config'; $this->loadViews("editconfig", $this->global, $data,NULL); } diff --git a/application/controllers/department.php b/application/controllers/department.php index 67a7a32e..0451d9c9 100644 --- a/application/controllers/department.php +++ b/application/controllers/department.php @@ -20,6 +20,7 @@ class department extends BaseController $this->load->model('department_model'); $this->load->library('Excel'); $this->isLoggedIn(); + $this->CompanyName = $this->global['CompanyName']; } /** @@ -29,7 +30,7 @@ class department extends BaseController { //$this->global['pageTitle'] = 'Resico : Department Details'; - $this->global['pageTitle'] = $this->global['CompanyName'].' : Department Details'; + $this->global['pageTitle'] = $this->CompanyName.' : Department Details'; $this->loadViews("departmentListing", $this->global, NULL , NULL); } @@ -47,7 +48,7 @@ class department extends BaseController $this->load->model('department_model'); $data['userRecords'] = $this->department_model->departmentListing(); //$this->global['pageTitle'] = 'Resico : Department Listing'; - $this->global['pageTitle'] = $this->global['CompanyName'].' : Department Listing'; + $this->global['pageTitle'] = $this->CompanyName.' : Department Listing'; $this->loadViews("departmentListing", $this->global, $data, NULL); } } @@ -59,7 +60,7 @@ class department extends BaseController { $data['depcode'] = $this->department_model->getdepcode(); //$this->global['pageTitle'] = 'Resico : Add New Department'; - $this->global['pageTitle'] = $this->global['CompanyName'].' : Add New Department'; + $this->global['pageTitle'] = $this->CompanyName.' : Add New Department'; $this->loadViews("adddepartment", $this->global,$data, NULL); } @@ -171,7 +172,7 @@ class department extends BaseController $data['department'] = $this->department_model->getDeptInfo($DepartmentID); $data['depcode'] = $this->department_model->getdepcode(); //$this->global['pageTitle'] = 'Resico : Edit Department'; - $this->global['pageTitle'] = $this->global['CompanyName'].' : Edit Department'; + $this->global['pageTitle'] = $this->CompanyName.' : Edit Department'; $this->loadViews("editdepartment", $this->global,$data, NULL); } @@ -249,7 +250,7 @@ class department extends BaseController function pageNotFound() { //$this->global['pageTitle'] = 'Resico : 404 - Page Not Found'; - $this->global['pageTitle'] = $this->global['CompanyName'].' : 404 - Page Not Found'; + $this->global['pageTitle'] = $this->CompanyName.' : 404 - Page Not Found'; $this->loadViews("404", $this->global, NULL, NULL); } diff --git a/application/controllers/emergencypurchaseorder.php b/application/controllers/emergencypurchaseorder.php index d7b162a6..6f158255 100644 --- a/application/controllers/emergencypurchaseorder.php +++ b/application/controllers/emergencypurchaseorder.php @@ -24,6 +24,7 @@ class emergencypurchaseorder extends BaseController $this->load->model('inwardgateregister_model'); $this->load->model('mrir_model'); $this->isLoggedIn(); + $this->CompanyName = $this->global['CompanyName']; } /** @@ -32,7 +33,7 @@ class emergencypurchaseorder extends BaseController public function index() { //$this->global['pageTitle'] = 'Resico : AddPO'; - //$this->global['pageTitle'] = $this->global['CompanyName'].' : AddPO'; + //$this->global['pageTitle'] = $this->CompanyName.' : AddPO'; $this->loadViews("addPO", $this->global, NULL , NULL); } @@ -42,7 +43,7 @@ class emergencypurchaseorder extends BaseController $data['stList'] = $this->purchaseorder_model->getStatusListforAllReq(); $data['ReqList'] = $this->purchaseorder_model->getRequistionListbySearch(); //$this->global['pageTitle'] = 'Resico : Create PO from Requisition List'; - $this->global['pageTitle'] = $this->global['CompanyName'].' : Create Purchase Order from Requistion'; + $this->global['pageTitle'] = $this->CompanyName.' : Create Purchase Order from Requistion'; $this->loadViews("createPOfromRequistion", $this->global, $data,Null); } @@ -54,7 +55,7 @@ class emergencypurchaseorder extends BaseController $RequestedBy = $this->session->userdata ('EmpID'); //$this->global['pageTitle'] = 'Resico : Create Emergency Purchase Order'; - $this->global['pageTitle'] = $this->global['CompanyName'].' : Emergency Purchase Order'; + $this->global['pageTitle'] = $this->CompanyName.' : Emergency Purchase Order'; $data['RequestType'] = $this->requistion_model->getConfigValue('C004'); $data['Suplist'] = $this->purchaseorder_model->getSupplierName(); @@ -676,7 +677,7 @@ class emergencypurchaseorder extends BaseController $this->purchaseorder_model->UpdateRequistionStatus(); $data['POData'] = $this->purchaseorder_model->purchaseorderListing(); //$this->global['pageTitle'] = 'Resico : Purchase Orders'; - $this->global['pageTitle'] = $this->global['CompanyName'].' : Purchase Orders Details'; + $this->global['pageTitle'] = $this->CompanyName.' : Purchase Orders Details'; $this->loadViews("POlist", $this->global, $data, NULL); @@ -721,7 +722,7 @@ class emergencypurchaseorder extends BaseController { //$this->global['pageTitle'] = 'Resico : Purchase order form'; - $this->global['pageTitle'] = $this->global['CompanyName'].' : Purchase order form'; + $this->global['pageTitle'] = $this->CompanyName.' : Purchase order form'; $data['TaxType'] = $this->purchaseorder_model->getConfigValue('C006'); $data['FreightType'] = $this->purchaseorder_model->getConfigValue('C018'); $data['Suplist'] = $this->purchaseorder_model->getSupplierName(); @@ -810,14 +811,14 @@ class emergencypurchaseorder extends BaseController { $data['POItem'] = $this->purchaseorder_model->GetServicePurchaseOrderDetails($PONO); //$this->global['pageTitle'] = 'Resico : Edit Service Purchase order form'; - $this->global['pageTitle'] = $this->global['CompanyName'].' : Edit Service Purchase Order '; + $this->global['pageTitle'] = $this->CompanyName.' : Edit Service Purchase Order '; $this->loadViews("EditservicePurchaseorder", $this->global, $data, NULL); } else if($ReqType == REVENUE) { $data['POItem'] = $this->purchaseorder_model->GetRevenuePurchaseOrderDetails($PONO); //$this->global['pageTitle'] = 'Resico : Edit Revenue Purchase order form'; - $this->global['pageTitle'] = $this->global['CompanyName'].' : Edit Revenue Purchase Order'; + $this->global['pageTitle'] = $this->CompanyName.' : Edit Revenue Purchase Order'; $this->loadViews("editRevenuepurchaseorder", $this->global, $data, NULL); } @@ -1268,7 +1269,7 @@ class emergencypurchaseorder extends BaseController function pageNotFound() { //$this->global['pageTitle'] = 'Resico : 404 - Page Not Found'; - $this->global['pageTitle'] = $this->global['CompanyName'].': 404 - Page Not Found'; + $this->global['pageTitle'] = $this->CompanyName.': 404 - Page Not Found'; $this->loadViews("404", $this->global, NULL, NULL); } diff --git a/application/controllers/employeedetails.php b/application/controllers/employeedetails.php index 2a559692..4d050492 100644 --- a/application/controllers/employeedetails.php +++ b/application/controllers/employeedetails.php @@ -19,7 +19,8 @@ class employeedetails extends BaseController parent::__construct(); $this->load->model('employeedetails_model'); $this->load->model('companydetailsmodel'); - $this->isLoggedIn(); + $this->isLoggedIn(); + $this->CompanyName = $this->global['CompanyName']; } /** @@ -28,7 +29,7 @@ class employeedetails extends BaseController public function index() { //$this->global['pageTitle'] = 'Resico : Employee Details'; - $this->global['pageTitle'] = $this->global['CompanyName'].' : Employee Details'; + $this->global['pageTitle'] = $this->CompanyName.' : Employee Details'; //Load the view supplierListing.php $this->loadViews("employeeListing", $this->global, NULL , NULL); } @@ -43,7 +44,7 @@ class employeedetails extends BaseController $this->load->model('employeedetails_model'); $data['userRecords'] = $this->employeedetails_model->employeeListing(); //$this->global['pageTitle'] = 'Resico : Employee Listing'; - $this->global['pageTitle'] = $this->global['CompanyName'].' : Employee Details'; + $this->global['pageTitle'] = $this->CompanyName.' : Employee Details'; $this->loadViews("employeeListing", $this->global, $data, NULL); } @@ -392,7 +393,7 @@ class employeedetails extends BaseController $data['Department'] = $this->employeedetails_model->getDepartment(); // $this->global['pageTitle'] = 'Resico : Add New Employee'; - $this->global['pageTitle'] = $this->global['CompanyName'].' : Add New Employee'; + $this->global['pageTitle'] = $this->CompanyName.' : Add New Employee'; $this->loadViews("addemployee", $this->global, $data, NULL); } @@ -620,7 +621,7 @@ class employeedetails extends BaseController $data['DepartmentList'] = $this->employeedetails_model->getDepartment(); $data['EmpDetails'] = $this->employeedetails_model->viewemployee($EmpID); //$this->global['pageTitle'] = 'Resico : View Employee'; - $this->global['pageTitle'] = $this->global['CompanyName'].' : View Employee'; + $this->global['pageTitle'] = $this->CompanyName.' : View Employee'; $this->loadViews("editEmployee", $this->global, $data, NULL); @@ -844,7 +845,7 @@ class employeedetails extends BaseController function pageNotFound() { //$this->global['pageTitle'] = 'Resico : 404 - Page Not Found'; - $this->global['pageTitle'] = $this->global['CompanyName'].' : 404 - Page Not Found'; + $this->global['pageTitle'] = $this->CompanyName.' : 404 - Page Not Found'; $this->loadViews("404", $this->global, NULL, NULL); } diff --git a/application/controllers/emppaydate.php b/application/controllers/emppaydate.php index b20da0db..ffa71d92 100644 --- a/application/controllers/emppaydate.php +++ b/application/controllers/emppaydate.php @@ -21,6 +21,7 @@ class emppaydate extends BaseController $this->load->library('session'); $this->load->library('form_validation'); $this->isLoggedIn(); + $this->CompanyName = $this->global['CompanyName']; } /** @@ -29,7 +30,7 @@ class emppaydate extends BaseController public function index() { //$this->global['pageTitle'] = 'Resico : Employee Pay Details'; - $this->global['pageTitle'] = $this->global['CompanyName'].' : Employee Pay Details'; + $this->global['pageTitle'] = $this->CompanyName.' : Employee Pay Details'; $this->loadViews("emppayListing", $this->global); } @@ -45,7 +46,7 @@ class emppaydate extends BaseController $data['userRecords'] = $this->emppaydate_model->emppayListing(); //$this->global['pageTitle'] = 'Resico : Employee Pay List'; - $this->global['pageTitle'] = $this->global['CompanyName'].' : Employee Pay List'; + $this->global['pageTitle'] = $this->CompanyName.' : Employee Payment Details'; $this->loadViews("emppayListing", $this->global, $data, NULL); } @@ -59,7 +60,7 @@ class emppaydate extends BaseController $this->load->model('payroll_model'); $result['empdetails'] = $this->payroll_model->getEmpID($q); //$this->global['pageTitle'] = 'Resico : Add Employee Pay'; - $this->global['pageTitle'] = $this->global['CompanyName'].' : Add Employee Pay'; + $this->global['pageTitle'] = $this->CompanyName.' : Add Employee Pay'; $this->loadViews("addemppaydate", $this->global,$result); } @@ -169,7 +170,7 @@ class emppaydate extends BaseController $data['emppay'] = $this->emppaydate_model->getUserInfo($paydataid); //$this->global['pageTitle'] = 'Resico : Edit Employee Pay Monthly Details '; - $this->global['pageTitle'] = $this->global['CompanyName'].' : Edit Employee Pay Monthly Details '; + $this->global['pageTitle'] = $this->CompanyName.' : Edit Employee Payment Details '; $this->loadViews("editOldemppay", $this->global, $data,NULL); @@ -323,7 +324,7 @@ class emppaydate extends BaseController function pageNotFound() { //$this->global['pageTitle'] = 'Resico : 404 - Page Not Found'; - $this->global['pageTitle'] = $this->global['CompanyName'].' : 404 - Page Not Found'; + $this->global['pageTitle'] = $this->CompanyName.' : 404 - Page Not Found'; $this->loadViews("404", $this->global, NULL, NULL); } diff --git a/application/controllers/inwardgateregister.php b/application/controllers/inwardgateregister.php index 8c4c6775..a1963037 100644 --- a/application/controllers/inwardgateregister.php +++ b/application/controllers/inwardgateregister.php @@ -20,7 +20,8 @@ class inwardgateregister extends BaseController $this->load->model('inwardgateregister_model'); $this->load->library('session'); $this->load->library('form_validation'); - $this->isLoggedIn(); + $this->isLoggedIn(); + $this->CompanyName = $this->global['CompanyName']; } /** @@ -29,7 +30,7 @@ class inwardgateregister extends BaseController public function index() { //$this->global['pageTitle'] = 'Resico : Inward Gate Register'; - $this->global['pageTitle'] = $this->global['CompanyName'].' : Inward Gate Register'; + $this->global['pageTitle'] = $this->CompanyName.' : Inward Gate Register'; $this->loadViews("viewinwardgateregister", $this->global,NULL , NULL); } @@ -41,7 +42,7 @@ class inwardgateregister extends BaseController { $this->load->model('inwardgateregister_model'); //$this->global['pageTitle'] = 'Resico : Inward Gate Register Details'; - $this->global['pageTitle'] = $this->global['CompanyName'].' : Inward Gate Register Details'; + $this->global['pageTitle'] = $this->CompanyName.' : Inward Gate Register Details'; $data['IGR']= $this->inwardgateregister_model->igrListing(); $this->loadViews("viewIGRDetails",$this->global,$data,NULL); } @@ -54,7 +55,7 @@ class inwardgateregister extends BaseController $this->load->model('inwardgateregister_model'); //$this->global['pageTitle'] = 'Resico : Add Inward Gate Register'; - $this->global['pageTitle'] = $this->global['CompanyName'].' : Add Inward Gate Register'; + $this->global['pageTitle'] = $this->CompanyName.' : Inward Gate Register'; $data['PO_NO'] = $this->inwardgateregister_model->getpurchaseorder(); $this->loadViews("inwardgateregister", $this->global, $data, NULL); } @@ -246,7 +247,7 @@ class inwardgateregister extends BaseController function pageNotFound() { //$this->global['pageTitle'] = 'Resico : 404 - Page Not Found'; - $this->global['pageTitle'] = $this->global['CompanyName'].' : 404 - Page Not Found'; + $this->global['pageTitle'] = $this->CompanyName.' : 404 - Page Not Found'; $this->loadViews("404", $this->global, NULL, NULL); } } diff --git a/application/controllers/monthlypay.php b/application/controllers/monthlypay.php index 8b97cf57..0da463c4 100755 --- a/application/controllers/monthlypay.php +++ b/application/controllers/monthlypay.php @@ -21,6 +21,7 @@ class monthlypay extends BaseController $this->load->library('session'); $this->load->library('form_validation'); $this->isLoggedIn(); + $this->CompanyName = $this->global['CompanyName']; } /** @@ -29,7 +30,7 @@ class monthlypay extends BaseController public function index() { //$this->global['pageTitle'] = 'Resico : Monthly Pay Details'; - $this->global['pageTitle'] = $this->global['CompanyName'].' : Monthly Pay Details'; + $this->global['pageTitle'] = $this->CompanyName.' : Monthly Pay Details'; $this->loadviews('monthlyListing',$this->global); } @@ -41,7 +42,7 @@ class monthlypay extends BaseController { $data['days'] = $this-> monthlypay_model->getPublicHoldays(); //$this->global['pageTitle'] = 'Resico : Public Holidays'; - $this->global['pageTitle'] = $this->global['CompanyName'].' : Public Holidays'; + $this->global['pageTitle'] = $this->CompanyName.' : Public Holiday '; $this->loadviews('publicholidays',$this->global,$data,NULL); } @@ -154,7 +155,7 @@ class monthlypay extends BaseController $data['attendance'] = $this-> monthlypay_model->monthlyAttendance($current); $data['emppay'] = $this-> monthlypay_model->getEmpPayDetails($current,$string); //$this->global['pageTitle'] = 'Resico : Monthly Attendance'; - $this->global['pageTitle'] = $this->global['CompanyName'].' : Monthly Attendance'; + $this->global['pageTitle'] = $this->CompanyName.' : Employee Monthly Attendance'; $this->loadViews("attendance", $this->global, $data, NULL); } @@ -221,7 +222,7 @@ class monthlypay extends BaseController $data['userRecords'] = $this->monthlypay_model->monthlyListing(); //$this->global['pageTitle'] = 'Resico : Monthly Pay List'; - $this->global['pageTitle'] = $this->global['CompanyName'].' : Monthly Pay List'; + $this->global['pageTitle'] = $this->CompanyName.' : Monthly Payment Details'; $this->loadViews("monthlyListing", $this->global, $data, NULL); } @@ -229,17 +230,19 @@ class monthlypay extends BaseController /** * To load the add new monthlypay + * note : not in use */ function addmonthly() { //$this->global['pageTitle'] = 'Resico : Add Monthly Pay'; - $this->global['pageTitle'] = $this->global['CompanyName'].' : Add Monthly Pay'; + $this->global['pageTitle'] = $this->CompanyName.' : Add Monthly Pay'; $this->loadviews('addMontly',$this->global, NULL); } /** - * For store new data into DB. + * For store new data into DB. + * note : not in use */ function addNewmonthly() { @@ -292,7 +295,8 @@ class monthlypay extends BaseController } /** - * For editing purpose and it has oldest values. + * For editing purpose and it has oldest values. + * note : not in use */ function editOldmonthly($EmpID='',$month_year='') @@ -301,7 +305,7 @@ class monthlypay extends BaseController $data['monthly'] = $this->monthlypay_model->getUserInfo($EmpID,$month_year); //$this->global['pageTitle'] = 'Resico : Edit Monthly Listing'; - $this->global['pageTitle'] = $this->global['CompanyName'].' : Edit Monthly Listing'; + $this->global['pageTitle'] = $this->CompanyName.' : Edit Monthly Listing'; $this->loadViews("editOldmonthly", $this->global, $data,NULL); @@ -311,6 +315,7 @@ class monthlypay extends BaseController /** * For stored new values after editing. + * note : not in use */ function editmonthly() { @@ -381,11 +386,12 @@ class monthlypay extends BaseController /** * To load employee payment details for permission screen + * note : not in use **/ function permissionslip() { //$this->global['pageTitle'] = 'Resico : Permission Slip'; - //$this->global['pageTitle'] = $this->global['CompanyName'].' : Edit Service Purchase order form'; + //$this->global['pageTitle'] = $this->CompanyName.' : Edit Service Purchase order form'; $data['emplists']=$this->monthlypay_model->emplist(); @@ -394,6 +400,7 @@ class monthlypay extends BaseController /** * To store new permission details into DB. + * note : not in use **/ function addper() { @@ -431,17 +438,19 @@ class monthlypay extends BaseController } /** * To get permission slip details for listing + * note : not in use */ function permissionlist(){ // $this->global['pageTitle'] = 'Resico : Permission Listing'; - // $this->global['pageTitle'] = $this->global['CompanyName'].' : Edit Service Purchase order form'; + // $this->global['pageTitle'] = $this->CompanyName.' : Edit Service Purchase order form'; // $data['permissionlist']=$this->monthlypay_model->perlist(); // $this->loadviews('permissionlist',$this->global,$data,NULL); } /** * To display permissionslip details for PDF + * note : not in use */ function permissionpdf($SNO){ @@ -481,8 +490,8 @@ class monthlypay extends BaseController */ function pageNotFound() { - $this->global['pageTitle'] = 'Resico : 404 - Page Not Found'; - $this->global['pageTitle'] = $this->global['CompanyName'].' : 404 - Page Not Found'; + //$this->global['pageTitle'] = 'Resico : 404 - Page Not Found'; + $this->global['pageTitle'] = $this->CompanyName.' : 404 - Page Not Found'; $this->loadViews("404", $this->global, NULL, NULL); } diff --git a/application/controllers/payslip.php b/application/controllers/payslip.php index a22112f1..eab21036 100755 --- a/application/controllers/payslip.php +++ b/application/controllers/payslip.php @@ -22,7 +22,8 @@ class payslip extends BaseController $this->load->model('payroll_model'); $this->load->model('monthlypay_model'); $this->load->library('form_validation'); - $this->isLoggedIn(); + $this->isLoggedIn(); + $this->CompanyName = $this->global['CompanyName']; } /** @@ -53,7 +54,7 @@ class payslip extends BaseController $Data['Payon'] = $this->payroll_model->getPayOn(); $Data['Bank'] = $this->payroll_model->getBankInfo(); //$this->global['pageTitle'] = 'Resico : Bank Report Screen'; - $this->global['pageTitle'] = $this->global['CompanyName'].' : Bank Report Screen'; + $this->global['pageTitle'] = $this->CompanyName.' : Bank Report'; $this->loadViews("bankreport", $this->global,$Data,NULL); } @@ -443,7 +444,7 @@ class payslip extends BaseController $data['loanemployees'] = $this->payroll_model->getEmpDetailsforLoan(); //$this->global['pageTitle'] = 'Resico : Loan Reports'; - $this->global['pageTitle'] = $this->global['CompanyName'].' : Loan Reports'; + $this->global['pageTitle'] = $this->CompanyName.' : Loan Reports'; $this->loadViews("loanreports", $this->global,$data, NULL); } @@ -455,7 +456,7 @@ class payslip extends BaseController { //$this->global['pageTitle'] = 'Resico : Payroll Data Upload2'; - $this->global['pageTitle'] = $this->global['CompanyName'].' : Payroll Data Upload2'; + $this->global['pageTitle'] = $this->CompanyName.' : Monthly Payroll Data Upload'; $this->loadViews("payslipupload2", $this->global, NULL); } @@ -469,7 +470,7 @@ class payslip extends BaseController $data['fresh'] = $this-> monthlypay_model->getEmpPayDetailsforMonthInputs($current); $data['dropdownvalue'] = $current; //$this->global['pageTitle'] = 'Resico : Payroll Monthly Inputs'; - $this->global['pageTitle'] = $this->global['CompanyName'].' : Payroll Monthly Inputs'; + $this->global['pageTitle'] = $this->CompanyName.' : Monthly Payroll Details'; $this->loadViews("monthlypayinputs", $this->global,$data,NULL); @@ -491,7 +492,7 @@ class payslip extends BaseController $data['fresh'] = $this-> monthlypay_model->getEmpPayDetailsforMonthInputs($current); $data['dropdownvalue'] = $current; //$this->global['pageTitle'] = 'Resico : Payroll Monthly Inputs'; - $this->global['pageTitle'] = $this->global['CompanyName'].' : Payroll Monthly Inputs'; + $this->global['pageTitle'] = $this->CompanyName.' : Monthly Payroll Inputs'; $this->loadViews("monthlypayinputs", $this->global,$data,NULL); @@ -658,7 +659,7 @@ class payslip extends BaseController $curr_month =date('m'); $curr_monthyear = $curr_month.'-'.$curr_year; //$this->global['pageTitle'] = 'Resico : Payslip Listing'; - $this->global['pageTitle'] = $this->global['CompanyName'].' : Payslip Listing'; + $this->global['pageTitle'] = $this->CompanyName.' : Payslip Details'; $data['PayInfo'] = $this->payroll_model->GetPayslipdata(); $data['dropdownvalue'] = $curr_monthyear; $this->loadViews("paysliplist", $this->global, $data , NULL); @@ -669,7 +670,7 @@ class payslip extends BaseController $pre_monthyear = $this->input->post('month'); //$this->global['pageTitle'] = 'Resico : Payslip Listing'; - $this->global['pageTitle'] = $this->global['CompanyName'].' : Payslip Listing'; + $this->global['pageTitle'] = $this->CompanyName.' : Payslip Details'; $data['PayInfo'] = $this->payroll_model->GetPayslipdata($pre_monthyear); $data['dropdownvalue'] = $pre_monthyear; @@ -682,7 +683,7 @@ class payslip extends BaseController { //$this->global['pageTitle'] = 'Resico : Edit Employee Payslip'; - $this->global['pageTitle'] = $this->global['CompanyName'].' : Edit Employee Payslip'; + $this->global['pageTitle'] = $this->CompanyName.' : Edit Payslip'; $data['PayInfo'] = $this->payroll_model->GetPayslipdata($PayOn,$EmpID); $this->loadViews("editPayslip", $this->global, $data , NULL); } @@ -696,7 +697,7 @@ class payslip extends BaseController $Data['Payon'] = $this->payroll_model->getPayOn(); //$this->global['pageTitle'] = 'Resico : Payroll Generater'; - $this->global['pageTitle'] = $this->global['CompanyName'].' : Payroll Generater'; + $this->global['pageTitle'] = $this->CompanyName.' : PaySlip Generater'; $this->loadViews("payslipgenerate", $this->global, $Data , NULL); } @@ -1089,7 +1090,7 @@ class payslip extends BaseController { //$this->global['pageTitle'] = 'Resico : Incentive and Bonus Reports'; - $this->global['pageTitle'] = $this->global['CompanyName'].' : Incentive and Bonus Reports'; + $this->global['pageTitle'] = $this->CompanyName.' : Incentive and Bonus Reports'; $fin_year = $this->input->post('finyear'); $data['finyear'] = $fin_year; $data['Reportvalue'] = $this->monthlypay_model->reportvalue($fin_year); @@ -1103,7 +1104,7 @@ class payslip extends BaseController $Fin_year = $_GET['Finyear']; $data['finyear'] = $Fin_year; //$this->global['pageTitle'] = 'Resico : Monthwise Incentive and Bonus Reports'; - $this->global['pageTitle'] = $this->global['CompanyName'].' : Monthwise Incentive and Bonus Reports'; + $this->global['pageTitle'] = $this->CompanyName.' : Monthwise Incentive and Bonus Reports'; $data['MonthwiseReport'] = $this->monthlypay_model->Monthwisereportvalue($Fin_year,$EmployeeID); $this->loadViews("Bonusreportmonthwise", $this->global,$data,NULL); } @@ -1114,7 +1115,7 @@ class payslip extends BaseController function pageNotFound() { //$this->global['pageTitle'] = 'Resico : 404 - Page Not Found'; - $this->global['pageTitle'] = $this->global['CompanyName'].' : 404 - Page Not Found'; + $this->global['pageTitle'] = $this->CompanyName.' : 404 - Page Not Found'; $this->loadViews("404", $this->global, NULL, NULL); } diff --git a/application/controllers/purchaseorder.php b/application/controllers/purchaseorder.php index 717b4d42..40f25a30 100644 --- a/application/controllers/purchaseorder.php +++ b/application/controllers/purchaseorder.php @@ -24,6 +24,7 @@ class purchaseorder extends BaseController $this->load->library('form_validation'); $this->load->model('requistion_model'); $this->isLoggedIn(); + $this->CompanyName = $this->global['CompanyName']; } /** @@ -32,14 +33,17 @@ class purchaseorder extends BaseController public function index() { //$this->global['pageTitle'] = 'Resico : AddPO'; - $this->global['pageTitle'] = $this->global['CompanyName'].' : AddPO'; + $this->global['pageTitle'] = $this->CompanyName.' : AddPO'; $this->loadViews("addPO", $this->global, NULL , NULL); } + /** + * note : not in use + */ function viewfullpurchaseorder() { //$this->global['pageTitle'] = 'Resico : View Purchase Order'; - $this->global['pageTitle'] = $this->global['CompanyName'].' : View Purchase Order'; + $this->global['pageTitle'] = $this->CompanyName.' : View Purchase Order'; $this->loadViews("viewfullpurchaseorder", $this->global,Null); } @@ -50,7 +54,7 @@ class purchaseorder extends BaseController function advancerequest() { //$this->global['pageTitle'] = 'Resico : Advance Request'; - $this->global['pageTitle'] = $this->global['CompanyName'].' : Advance Request'; + $this->global['pageTitle'] = $this->CompanyName.' : Advance Request'; $data['PONO']=$this->purchaseorder_model->getadvancePONO('ST026'); $this->loadViews("advancerequest", $this->global, $data, NULL); } @@ -69,7 +73,7 @@ class purchaseorder extends BaseController /* End Here */ //$this->global['pageTitle'] = 'Resico : Create PO from Requisition List'; - $this->global['pageTitle'] = $this->global['CompanyName'].' : Create PO from Requisition List'; + $this->global['pageTitle'] = $this->CompanyName.' : Create PO from Requisition List'; $this->loadViews("createPOfromRequistion", $this->global, $data,Null); } @@ -86,7 +90,7 @@ class purchaseorder extends BaseController $data['POData'] = $this->purchaseorder_model->purchaseorderListing(); //$this->global['pageTitle'] = 'Resico : Purchase Orders'; - $this->global['pageTitle'] = $this->global['CompanyName'].' : Purchase Orders'; + $this->global['pageTitle'] = $this->CompanyName.' : Purchase Orders'; $this->loadViews("POlist", $this->global, $data, NULL); } @@ -124,7 +128,7 @@ class purchaseorder extends BaseController { //$this->global['pageTitle'] = 'Resico : Purchase order' ; - $this->global['pageTitle'] = $this->global['CompanyName'].' : Purchase order' ; + $this->global['pageTitle'] = $this->CompanyName.' : Purchase order' ; $data['TaxType'] = $this->purchaseorder_model->getConfigValue('C006'); $data['FreightType'] = $this->purchaseorder_model->getConfigValue('C018'); $data['Suplist'] = $this->purchaseorder_model->getSupplierName(); @@ -411,7 +415,7 @@ class purchaseorder extends BaseController $data['WorkStatus']=$this->purchaseorder_model->getStatus(7); //$this->global['pageTitle'] = 'Resico : Edit Service Purchase order form'; - $this->global['pageTitle'] = $this->global['CompanyName'].' : Edit Service Purchase order form'; + $this->global['pageTitle'] = $this->CompanyName.' : Edit Service Purchase order form'; $this->loadViews("EditservicePurchaseorder", $this->global, $data, NULL); } else if($ReqType == REVENUE) @@ -421,7 +425,7 @@ class purchaseorder extends BaseController $data['PaymentTerms']=$this->purchaseorder_model->GetPaymentTerms($PONO); $data['WorkStatus']=$this->purchaseorder_model->getStatus(7); //$this->global['pageTitle'] = 'Resico : Edit Revenue Purchase order form'; - $this->global['pageTitle'] = $this->global['CompanyName'].' : Edit Revenue Purchase order form'; + $this->global['pageTitle'] = $this->CompanyName.' : Edit Revenue Purchase order form'; $this->loadViews("editRevenuepurchaseorder", $this->global, $data, NULL); } @@ -461,7 +465,7 @@ class purchaseorder extends BaseController $data['unicode']=$unicode; $data['currencycode']=$currencycode; //$this->global['pageTitle'] = 'Resico : Edit Import Purchase order form'; - $this->global['pageTitle'] = $this->global['CompanyName'].' : Edit Import Purchase order form'; + $this->global['pageTitle'] = $this->CompanyName.' : Edit Import Purchase order form'; $this->loadViews("editimportpo", $this->global, $data, NULL); } else if($ReqType == CAPITAL) @@ -512,7 +516,7 @@ class purchaseorder extends BaseController // $this->global['pageTitle'] = 'Resico : Edit Capital Purchase order form'; - $this->global['pageTitle'] = $this->global['CompanyName'].' : Edit Capital Purchase order form'; + $this->global['pageTitle'] = $this->CompanyName.' : Edit Capital Purchase order form'; $this->loadViews("editCapitalPo", $this->global, $data, NULL); } @@ -646,7 +650,7 @@ class purchaseorder extends BaseController $data['unicode']=$unicode; $data['currencycode']=$currencycode; //$this->global['pageTitle'] = 'Resico : Edit Import Purchase order form'; - $this->global['pageTitle'] = $this->global['CompanyName'].' : Edit Import Purchase order form'; + $this->global['pageTitle'] = $this->CompanyName.' : Edit Import Purchase order form'; $this->loadViews("editimportpo", $this->global, $data, NULL); } @@ -702,7 +706,7 @@ class purchaseorder extends BaseController // $this->global['pageTitle'] = 'Resico : Edit Capital Purchase order form'; - $this->global['pageTitle'] = $this->global['CompanyName'].' : Edit Capital Purchase order form'; + $this->global['pageTitle'] = $this->CompanyName.' : Edit Capital Purchase order form'; $this->loadViews("editCapitalPo", $this->global, $data, NULL); } @@ -1233,7 +1237,7 @@ class purchaseorder extends BaseController function pageNotFound() { //$this->global['pageTitle'] = 'Resico : 404 - Page Not Found'; - $this->global['pageTitle'] = $this->global['CompanyName'].' : 404 - Page Not Found'; + $this->global['pageTitle'] = $this->CompanyName.' : 404 - Page Not Found'; $this->loadViews("404", $this->global, NULL, NULL); } @@ -2054,7 +2058,7 @@ function addNewImportPurchaseOrder() function poapproval(){ $q="APPROVAL"; //$this->global['pageTitle'] = 'Resico : Purchase Order Approval'; - $this->global['pageTitle'] = $this->global['CompanyName'].' : Purchase Order Approval'; + $this->global['pageTitle'] = $this->CompanyName.' : Purchase Order Approval'; $userID = $this->session->userdata ( 'userId' ); @@ -2126,7 +2130,7 @@ function addNewImportPurchaseOrder() $q="RELEASE"; //$this->global['pageTitle'] = 'Resico: Purchase Order Release'; - $this->global['pageTitle'] = $this->global['CompanyName'].' : Purchase Order Release'; + $this->global['pageTitle'] = $this->CompanyName.' : Purchase Order Release'; $userID = $this->session->userdata ( 'userId' ); diff --git a/application/controllers/quality.php b/application/controllers/quality.php index de51d053..91f6378a 100644 --- a/application/controllers/quality.php +++ b/application/controllers/quality.php @@ -19,7 +19,8 @@ class quality extends BaseController parent::__construct(); $this->load->model('quality_model'); $this->load->library('form_validation'); - $this->isLoggedIn(); + $this->isLoggedIn(); + $this->CompanyName = $this->global['CompanyName']; } /** @@ -31,8 +32,8 @@ class quality extends BaseController $data['customers'] = $this->quality_model->getAllcustomers(); $data['existspec'] = $this->quality_model->getAllspec(); $data['existspecinward'] = $this->quality_model->getAllspecInward(); - $this->global['pageTitle'] = 'Resico : Quality Master'; - $this->global['pageTitle'] = $this->global['CompanyName'].' : Edit Service Purchase order form'; + // $this->global['pageTitle'] = 'Resico : Quality Master'; + $this->global['pageTitle'] = $this->CompanyName.' : Quality Master'; $this->loadViews("qualitymasterlistview", $this->global, $data , NULL); } @@ -42,8 +43,8 @@ class quality extends BaseController public function reportList() { $data['records'] = $this->quality_model->getTestMasterforList(); - $this->global['pageTitle'] = 'Resico : Prodcut Report List '; - $this->global['pageTitle'] = $this->global['CompanyName'].' : Edit Service Purchase order form'; + // $this->global['pageTitle'] = 'Resico : Prodcut Report List '; + $this->global['pageTitle'] = $this->CompanyName.' : Report List'; $this->loadViews("reportmasterlist", $this->global, $data , NULL); } @@ -54,8 +55,8 @@ class quality extends BaseController { $data['records'] = $this->quality_model->getTestMasterforListInward(); - $this->global['pageTitle'] = 'Resico : Report List Inward'; - $this->global['pageTitle'] = $this->global['CompanyName'].' : Edit Service Purchase order form'; + //$this->global['pageTitle'] = 'Resico : Report List Inward'; + $this->global['pageTitle'] = $this->CompanyName.' : Report List Inward'; $this->loadViews("reportmasterlist_inward", $this->global, $data , NULL); } @@ -69,8 +70,8 @@ class quality extends BaseController $data['productsinward'] = $this->quality_model->getAllprodcutsInward(); $data['customersinward'] = $this->quality_model->getAllcustomersInward(); - $this->global['pageTitle'] = 'Resico : Quality Master'; - $this->global['pageTitle'] = $this->global['CompanyName'].' : Edit Service Purchase order form'; + //$this->global['pageTitle'] = 'Resico : Quality Master'; + $this->global['pageTitle'] = $this->CompanyName.' : Quality Master'; $this->loadViews("qualitymaster", $this->global, $data , NULL); } @@ -147,8 +148,8 @@ class quality extends BaseController $data['records'] = $this->quality_model->getDataforReport(); $data['emplist'] = $this->quality_model->getEmplistforReport(); - $this->global['pageTitle'] = 'Resico : Inspection Report Screen'; - $this->global['pageTitle'] = $this->global['CompanyName'].' : Edit Service Purchase order form'; + //$this->global['pageTitle'] = 'Resico : Inspection Report Screen'; + $this->global['pageTitle'] = $this->CompanyName.' : Inspection Report Screen'; $this->loadViews("qualityreport", $this->global, $data, NULL); } @@ -160,8 +161,8 @@ class quality extends BaseController $prodcutid = $this->uri->segment(3); $customerid =$this->uri->segment(4); $data['specifications'] = $this->quality_model->getIndividualSpec($prodcutid,$customerid); - $this->global['pageTitle'] = 'Resico : View reports Lists'; - $this->global['pageTitle'] = $this->global['CompanyName'].' : Edit Service Purchase order form'; + //$this->global['pageTitle'] = 'Resico : View reports Lists'; + $this->global['pageTitle'] = $this->CompanyName.' : View reports Lists'; $this->loadViews("viewIndSpec", $this->global, $data, NULL); } @@ -173,8 +174,8 @@ class quality extends BaseController { $reportid = $this->uri->segment(3); $data['reportdata'] = $this->quality_model->getIndividualReportData($reportid); - $this->global['pageTitle'] = 'Resico : View Individual Report'; - $this->global['pageTitle'] = $this->global['CompanyName'].' : Edit Service Purchase order form'; + //$this->global['pageTitle'] = 'Resico : View Individual Report'; + $this->global['pageTitle'] = $this->CompanyName.' : View Individual Report'; $this->loadViews("viewindreport", $this->global, $data, NULL); } @@ -184,8 +185,8 @@ class quality extends BaseController $reportid = $this->uri->segment(3); $data['reportdata'] = $this->quality_model->getIndividualInwardReportData($reportid); - $this->global['pageTitle'] = 'Resico : View Individual Report'; - $this->global['pageTitle'] = $this->global['CompanyName'].' : Edit Service Purchase order form'; + //$this->global['pageTitle'] = 'Resico : View Individual Report'; + $this->global['pageTitle'] = $this->CompanyName.' : View Individual Report'; $this->loadViews("viewindInwardreport", $this->global, $data, NULL); } @@ -430,8 +431,8 @@ class quality extends BaseController $data['records'] = $this->quality_model->getIGRNOforReport(); $data['reports'] = $this->quality_model->getIGRNOReport(); $data['emplist'] = $this->quality_model->getEmplistforReport(); - $this->global['pageTitle'] = 'Resico : Inward Inspection'; - $this->global['pageTitle'] = $this->global['CompanyName'].' : Edit Service Purchase order form'; + //$this->global['pageTitle'] = 'Resico : Inward Inspection'; + $this->global['pageTitle'] = $this->CompanyName.' : Inward Inspection'; $this->loadViews("inward_report_create", $this->global,$data,NULL); } @@ -459,8 +460,8 @@ class quality extends BaseController */ function pageNotFound() { - $this->global['pageTitle'] = 'Resico : 404 - Page Not Found'; - $this->global['pageTitle'] = $this->global['CompanyName'].' : Edit Service Purchase order form'; + //$this->global['pageTitle'] = 'Resico : 404 - Page Not Found'; + $this->global['pageTitle'] = $this->CompanyName.': 404 - Page Not Found'; $this->loadViews("404", $this->global, NULL, NULL); } diff --git a/application/controllers/rawmaterialdetails.php b/application/controllers/rawmaterialdetails.php index c9eafed9..1df0ee0e 100644 --- a/application/controllers/rawmaterialdetails.php +++ b/application/controllers/rawmaterialdetails.php @@ -22,7 +22,8 @@ class rawmaterialdetails extends BaseController $this->load->library('pagination'); $this->load->library('form_validation'); $this->load->library('Excel'); - $this->isLoggedIn(); + $this->isLoggedIn(); + $this->CompanyName = $this->global['CompanyName']; } /** @@ -30,8 +31,8 @@ class rawmaterialdetails extends BaseController */ public function index() { - $this->global['pageTitle'] = 'Resico : RawMaterialDetails'; - $this->global['pageTitle'] = $this->global['CompanyName'].' : RawMaterialDetails'; + //$this->global['pageTitle'] = 'Resico : RawMaterialDetails'; + $this->global['pageTitle'] = $this->CompanyName.' : RawMaterialDetails'; $this->loadViews("rawmaterialListing", $this->global, NULL , NULL); } @@ -47,7 +48,7 @@ class rawmaterialdetails extends BaseController $data['userRecords'] = $this->rawmaterialdetails_model->rawmaterialListing(); //$this->global['pageTitle'] = 'Resico : RawMaterial Listing'; - $this->global['pageTitle'] = $this->global['CompanyName'].' : RawMaterial Listing'; + $this->global['pageTitle'] = $this->CompanyName.' : RawMaterial Listing'; $this->loadViews("rawmaterialListing", $this->global, $data, NULL); @@ -67,7 +68,7 @@ class rawmaterialdetails extends BaseController $data['costcentercode'] =$this->rawmaterialdetails_model->getcostcentercode(); $data['cfUOM'] = $this->rawmaterialdetails_model->getConversionfactorUOM(); //$this->global['pageTitle'] = 'Resico : Add New RawMaterial'; - $this->global['pageTitle'] = $this->global['CompanyName'].' : Add New RawMaterial'; + $this->global['pageTitle'] = $this->CompanyName.' : Add New RawMaterial'; $this->loadViews("addRawMaterial", $this->global, $data, NULL); } @@ -258,7 +259,7 @@ else $data['cfUOM'] = $this->rawmaterialdetails_model->getConversionfactorUOM(); $data['assetcode'] = $this->rawmaterialdetails_model->getAssetcode(); //$this->global['pageTitle'] = 'Resico : Edit Material Master'; - $this->global['pageTitle'] = $this->global['CompanyName'].' : Edit Material Master'; + $this->global['pageTitle'] = $this->CompanyName.' : Edit Material Master'; $this->loadViews("editRawmaterial", $this->global,$data, NULL); } @@ -529,7 +530,7 @@ function insertvalueintoconfig(){ function pageNotFound() { //$this->global['pageTitle'] = 'Resico : 404 - Page Not Found'; - $this->global['pageTitle'] = $this->global['CompanyName'].' : 404 - Page Not Found'; + $this->global['pageTitle'] = $this->CompanyName.' : 404 - Page Not Found'; $this->loadViews("404", $this->global, NULL, NULL); } diff --git a/application/controllers/report.php b/application/controllers/report.php index 1f1dbac3..4956b45b 100755 --- a/application/controllers/report.php +++ b/application/controllers/report.php @@ -18,12 +18,13 @@ class report extends BaseController { parent::__construct(); $this->load->model('dahsboard_Model'); - $this->isLoggedIn(); + $this->isLoggedIn(); + $this->CompanyName = $this->global['CompanyName']; } public function pending_report() { - $this->global['pageTitle'] = 'Resico : Reports'; + $this->global['pageTitle'] = $this->CompanyName.' : Reports'; if ($this->input->post('btn_submit')) { @@ -62,7 +63,7 @@ class report extends BaseController public function releasedPO() { - $this->global['pageTitle'] = 'Resico : Reports'; + $this->global['pageTitle'] = $this->CompanyName.' : Reports'; if ($this->input->post('btn_submit')) { @@ -102,7 +103,7 @@ class report extends BaseController public function openorderPO() { - $this->global['pageTitle'] = 'Resico : Reports'; + $this->global['pageTitle'] = $this->CompanyName.' : Reports'; if ($this->input->post('btn_submit')) { @@ -217,7 +218,7 @@ class report extends BaseController } public function MM_ReceiptValue() { - $this->global['pageTitle'] = 'Resico : Reports'; + $this->global['pageTitle'] = $this->CompanyName.' : Reports'; if ($this->input->post('btn_submit')) { @@ -250,7 +251,7 @@ class report extends BaseController public function purchase() { - $this->global['pageTitle'] = 'Resico : Reports '; + $this->global['pageTitle'] = $this->CompanyName.' : Reports '; if ($this->input->post('btn_submit')) { $cname = $this->input->post('client_name'); $prod = $this->input->post('item_name'); @@ -281,7 +282,7 @@ class report extends BaseController { if ($this->input->post('btn_submit')) { - $this->global['pageTitle'] = 'Resico : Reports'; + $this->global['pageTitle'] = $this->CompanyName.' : Reports'; //$this->input->post('btn_submit'); $cname = $this->input->post('client_name'); $prod = $this->input->post('item_name'); @@ -299,7 +300,7 @@ class report extends BaseController } else{ - $this->global['pageTitle'] = 'Resico : Reports'; + $this->global['pageTitle'] = $this->CompanyName.' : Reports'; //$this->input->post('btn_submit'); $cname = $this->input->get('cname'); $prod = $this->input->get('prod'); @@ -326,7 +327,7 @@ class report extends BaseController } public function year_wise() { - $this->global['pageTitle'] = 'Resico : Reports'; + $this->global['pageTitle'] = $this->CompanyName.' : Reports'; if ($this->input->post('financialyear')) { @@ -348,7 +349,7 @@ class report extends BaseController public function month_wise() { - $this->global['pageTitle'] = 'Resico : Reports'; + $this->global['pageTitle'] = $this->CompanyName.' : Reports'; $month=$this->input->get('dat'); @@ -363,7 +364,7 @@ class report extends BaseController public function year_wise_total() { - $this->global['pageTitle'] = 'Resico : Reports'; + $this->global['pageTitle'] = $this->CompanyName.' : Reports'; $last = $this->uri->total_segments(); $month=$this->uri->segment($last); @@ -380,7 +381,7 @@ class report extends BaseController public function purchase_supplier() { - $this->global['pageTitle'] = 'Resico : Supplier-wise Reports'; + $this->global['pageTitle'] = $this->CompanyName.' : Supplier-wise Reports'; if ($this->input->post('btn_submit')) { $cname = $this->input->post('client_name'); $ab=$this->input->post('financialyear'); @@ -406,7 +407,7 @@ class report extends BaseController public function consolidate() { - $this->global['pageTitle'] = 'Resico : Consolidated Reports'; + $this->global['pageTitle'] = $this->CompanyName.' : Consolidated Reports'; if ($this->input->post('btn_submit')) { $cname = $this->input->post('client_name'); $ab=$this->input->post('financialyear'); @@ -433,7 +434,7 @@ class report extends BaseController public function consolidate_month() { - $this->global['pageTitle'] = 'Resico : Reports'; + $this->global['pageTitle'] = $this->CompanyName.' : Reports'; $sid=$this->input->get('sid'); $mid = $this->input->get('mid'); $cname = $this->input->get('cname'); @@ -453,7 +454,7 @@ class report extends BaseController public function consolidate_year() { - $this->global['pageTitle'] = 'Resico : Reports'; + $this->global['pageTitle'] = $this->CompanyName.' : Reports'; $sid=$this->input->get('sid'); $mid = $this->input->get('mid'); $cname = $this->input->get('cname'); @@ -474,7 +475,7 @@ class report extends BaseController public function cumulative() { - $this->global['pageTitle'] = 'Resico : Cumulative Reports'; + $this->global['pageTitle'] = $this->CompanyName.' : Cumulative Reports'; //print_r($prod); @@ -486,7 +487,7 @@ class report extends BaseController public function cum_month() { - $this->global['pageTitle'] = 'Resico : Cumulative Month-wise Reports'; + $this->global['pageTitle'] = $this->CompanyName.' : Cumulative Month-wise Reports'; $last = $this->uri->segment_array(); $sup = $last[3]; @@ -502,7 +503,7 @@ class report extends BaseController public function cum_year() { - $this->global['pageTitle'] = 'Resico : Cumulative Year-wise Reports'; + $this->global['pageTitle'] = $this->CompanyName.' : Cumulative Year-wise Reports'; $last = $this->uri->segment_array(); $sup = $last[3]; @@ -518,7 +519,7 @@ class report extends BaseController public function cum_day() { - $this->global['pageTitle'] = 'Resico : Cumulative Day-wise Reports'; + $this->global['pageTitle'] = $this->CompanyName.' : Cumulative Day-wise Reports'; $last = $this->uri->segment_array(); $sup = $last[3]; @@ -533,7 +534,7 @@ class report extends BaseController public function ipurchase() { - $this->global['pageTitle'] = 'Resico : Reports'; + $this->global['pageTitle'] = $this->CompanyName.' : Reports'; if ($this->input->post('btn_submit')) { $cname = $this->input->post('client_name'); $prod = $this->input->post('item_name'); @@ -567,7 +568,7 @@ class report extends BaseController { if ($this->input->post('btn_submit')) { - $this->global['pageTitle'] = 'Resico : Reports'; + $this->global['pageTitle'] = $this->CompanyName.' : Reports'; //$this->input->post('btn_submit'); $cname = $this->input->post('client_name'); $prod = $this->input->post('item_name'); @@ -585,7 +586,7 @@ class report extends BaseController } else{ - $this->global['pageTitle'] = 'Resico : Reports'; + $this->global['pageTitle'] = $this->CompanyName.' : Reports'; //$this->input->post('btn_submit'); $cname = $this->input->get('cname'); $cat = $this->input->get('cat'); @@ -612,7 +613,7 @@ class report extends BaseController } public function iyear_wise() { - $this->global['pageTitle'] = 'Resico : Reports'; + $this->global['pageTitle'] = $this->CompanyName.' : Reports'; if ($this->input->post('financialyear')) { @@ -633,7 +634,7 @@ class report extends BaseController public function imonth_wise() { - $this->global['pageTitle'] = 'Resico : Reports'; + $this->global['pageTitle'] = $this->CompanyName.' : Reports'; $month=$this->input->get('dat'); @@ -647,7 +648,7 @@ class report extends BaseController public function iyear_wise_total() { - $this->global['pageTitle'] = 'Resico : Reports'; + $this->global['pageTitle'] = $this->CompanyName.' : Reports'; $last = $this->uri->total_segments(); $month=$this->uri->segment($last); @@ -663,7 +664,7 @@ class report extends BaseController public function ipurchase_supplier() { - $this->global['pageTitle'] = 'Resico : Reports'; + $this->global['pageTitle'] = $this->CompanyName.' : Reports'; if ($this->input->post('btn_submit')) { $cname = $this->input->post('client_name'); $ab=$this->input->post('financialyear'); @@ -694,7 +695,7 @@ class report extends BaseController public function iconsolidate() { - $this->global['pageTitle'] = 'Resico : Reports'; + $this->global['pageTitle'] = $this->CompanyName.' : Reports'; if ($this->input->post('btn_submit')) { $cname = $this->input->post('client_name'); $ab=$this->input->post('financialyear'); @@ -717,7 +718,7 @@ class report extends BaseController public function i_consolidate_month() { - $this->global['pageTitle'] = 'Resico : Reports'; + $this->global['pageTitle'] = $this->CompanyName.' : Reports'; //$this->input->post('btn_submit'); $sid=$this->input->get('sid'); $mid = $this->input->get('mid'); @@ -742,7 +743,7 @@ class report extends BaseController public function i_consolidate_year() { - $this->global['pageTitle'] = 'Resico : Reports'; + $this->global['pageTitle'] = $this->CompanyName.' : Reports'; //$this->input->post('btn_submit'); $sid=$this->input->get('sid'); $mid = $this->input->get('mid'); @@ -765,7 +766,7 @@ class report extends BaseController public function icumulative() { - $this->global['pageTitle'] = 'Resico : Reports'; + $this->global['pageTitle'] = $this->CompanyName.' : Reports'; //print_r($prod); @@ -778,7 +779,7 @@ class report extends BaseController public function icum_month() { - $this->global['pageTitle'] = 'Resico : Reports'; + $this->global['pageTitle'] = $this->CompanyName.' : Reports'; $last = $this->uri->segment_array(); $sup = $last[3]; @@ -792,7 +793,7 @@ class report extends BaseController public function icum_year() { - $this->global['pageTitle'] = 'Resico : Reports'; + $this->global['pageTitle'] = $this->CompanyName.' : Reports'; $last = $this->uri->segment_array(); $sup = $last[3]; @@ -807,7 +808,7 @@ class report extends BaseController public function icum_day() { - $this->global['pageTitle'] = 'Resico : Reports'; + $this->global['pageTitle'] = $this->CompanyName.' : Reports'; $last = $this->uri->segment_array(); $sup = $last[3]; @@ -822,7 +823,7 @@ class report extends BaseController public function rawi_cumulative() { - $this->global['pageTitle'] = 'Resico : Reports'; + $this->global['pageTitle'] = $this->CompanyName.' : Reports'; //print_r($prod); @@ -833,7 +834,7 @@ class report extends BaseController public function rawi_cum_year() { - $this->global['pageTitle'] = 'Resico : Reports'; + $this->global['pageTitle'] = $this->CompanyName.' : Reports'; //$mat=$this->input->get('mid'); $cat=$this->input->get('cat'); //print_r($sup); @@ -845,7 +846,7 @@ class report extends BaseController public function rawi_cum_month() { - $this->global['pageTitle'] = 'Resico : Reports'; + $this->global['pageTitle'] = $this->CompanyName.' : Reports'; //$mat=$this->input->get('mid'); $cat=$this->input->get('cat'); @@ -858,7 +859,7 @@ class report extends BaseController public function rawi_cum_day() { - $this->global['pageTitle'] = 'Resico : Reports'; + $this->global['pageTitle'] = $this->CompanyName.' : Reports'; //$mat=$this->input->get('mid'); $cat=$this->input->get('cat'); //print_r($prod); @@ -870,7 +871,7 @@ class report extends BaseController public function rawi_consolidate() { - $this->global['pageTitle'] = 'Resico : Reports'; + $this->global['pageTitle'] = $this->CompanyName.' : Reports'; if ($this->input->post('btn_submit')) { $cname = $this->input->post('client_name'); @@ -895,7 +896,7 @@ class report extends BaseController public function rawi_consolidate_month() { - $this->global['pageTitle'] = 'Resico : Reports'; + $this->global['pageTitle'] = $this->CompanyName.' : Reports'; //$this->input->post('btn_submit'); $cat = $this->input->get('cat'); $sup = $this->input->get('sup'); @@ -917,7 +918,7 @@ class report extends BaseController public function rawi_consolidate_year() { - $this->global['pageTitle'] = 'Resico : Reports'; + $this->global['pageTitle'] = $this->CompanyName.' : Reports'; //$this->input->post('btn_submit'); $cat = $this->input->get('cat'); $sup = $this->input->get('sup'); @@ -939,7 +940,7 @@ class report extends BaseController public function pending_purchase() { - $this->global['pageTitle'] = 'Resico : Reports'; + $this->global['pageTitle'] = $this->CompanyName.' : Reports'; if ($this->input->post('btn_submit')) { @@ -985,7 +986,7 @@ class report extends BaseController public function per() { - $this->global['pageTitle'] = 'Resico : Reports'; + $this->global['pageTitle'] = $this->CompanyName.' : Reports'; $ab=$this->input->post('financialyear'); @@ -1007,7 +1008,7 @@ class report extends BaseController public function cashbook() { - $this->global['pageTitle'] = 'Resico : Cashbook Reports'; + $this->global['pageTitle'] = $this->CompanyName.' : Cashbook Reports'; $income="RECEIPT"; $expense="PAYMENT"; @@ -1043,7 +1044,7 @@ class report extends BaseController public function daily_incexp() { - $this->global['pageTitle'] = 'Resico : Cashbook Daily Reports'; + $this->global['pageTitle'] = $this->CompanyName.' : Cashbook Daily Reports'; $data['tdy']=$this->dahsboard_Model->today(); //$data['Indiancurrency']=$this->dahsboard_Model->INRSymbol(); @@ -1060,14 +1061,14 @@ class report extends BaseController //public function monthexpenses() public function load_monthly_incexp() { $data['monthyearvalue'] = ''; - $this->global['pageTitle'] = 'Resico : Cashbook Monthly Reports'; + $this->global['pageTitle'] = $this->CompanyName.' : Cashbook Monthly Reports'; $this->loadviews("cashbookmthlyreport",$this->global,$data, NULL); } public function monthly_incexp() { $monthyearvalue = $this->input->post('monthyear'); - $this->global['pageTitle'] = 'Resico : Cashbook Monthly Reports'; + $this->global['pageTitle'] = $this->CompanyName.' : Cashbook Monthly Reports'; if($monthyearvalue == ''){ @@ -1104,7 +1105,7 @@ class report extends BaseController public function yearly_incexp() { - $this->global['pageTitle'] = 'Resico : Cashbook Yearly Reports'; + $this->global['pageTitle'] = $this->CompanyName.' : Cashbook Yearly Reports'; $data['financialyear']=$this->dahsboard_Model->cashbookfinyear(); @@ -1146,7 +1147,7 @@ class report extends BaseController $c=$_GET['c']; if ($c=='PAYMENT') { - $this->global['pageTitle'] = 'Resico : PaymentWise Reports'; + $this->global['pageTitle'] = $this->CompanyName.' : PaymentWise Reports'; $data['departmentwise']=$this->dahsboard_Model->departmentwise($sid,$d,$c); $data['Indiancurrency']=$this->dahsboard_Model->INRSymbol(); @@ -1155,7 +1156,7 @@ class report extends BaseController //cashbookmonthlydep=>cashbookmthlypaydep } else{ - $this->global['pageTitle'] = 'Resico : ReceiptWise Reports'; + $this->global['pageTitle'] = $this->CompanyName.' : ReceiptWise Reports'; $data['departmentwise']=$this->dahsboard_Model->departmentwise($sid,$d,$c); $data['Indiancurrency']=$this->dahsboard_Model->INRSymbol(); $this->loadviews("cashbookmthlyrecdep",$this->global,$data, NULL); @@ -1167,7 +1168,7 @@ class report extends BaseController { $sid=$_GET['sid']; //$this->global['pageTitle'] = 'Cashbook - yearmonthwise - '; - $this->global['pageTitle'] = 'Resico : Cashbook Yearly Reports'; + $this->global['pageTitle'] = $this->CompanyName.' : Cashbook Yearly Reports'; $data['yearmonthwise']=$this->dahsboard_Model->yearmonthwise($sid); $data['Indiancurrency']=$this->dahsboard_Model->INRSymbol(); diff --git a/application/controllers/reportlistcontroller.php b/application/controllers/reportlistcontroller.php index 848063ad..ca7b999a 100644 --- a/application/controllers/reportlistcontroller.php +++ b/application/controllers/reportlistcontroller.php @@ -11,6 +11,7 @@ require APPPATH . '/libraries/BaseController.php'; */ class reportlistcontroller extends BaseController { + /** * Default constructor of the class */ @@ -20,6 +21,7 @@ class reportlistcontroller extends BaseController $this->load->model('user_model'); $this->load->library('form_validation'); $this->isLoggedIn(); + $this->CompanyName = $this->global['CompanyName']; } /** @@ -28,7 +30,7 @@ class reportlistcontroller extends BaseController public function index() { //$this->global['pageTitle'] = 'Reports list '; - $this->global['pageTitle'] = $this->global['CompanyName'].' : Reports list '; + $this->global['pageTitle'] = $this->CompanyName.' : Reports list '; $this->loadViews("reportslink", $this->global , NULL); } diff --git a/application/controllers/requisitionform.php b/application/controllers/requisitionform.php index 0d7f3ff2..10ea3c01 100644 --- a/application/controllers/requisitionform.php +++ b/application/controllers/requisitionform.php @@ -20,7 +20,8 @@ class requisitionform extends BaseController $this->load->model('requistion_model'); $this->load->library('session'); $this->load->library('form_validation'); - $this->isLoggedIn(); + $this->isLoggedIn(); + $this->CompanyName = $this->global['CompanyName']; } /** * To load the Requistion Listing screen @@ -28,7 +29,7 @@ class requisitionform extends BaseController function requisitionlisting() { //$this->global['pageTitle'] = 'Resico : Requisition Listing'; - $this->global['pageTitle'] = $this->global['CompanyName'].' : Requisition Listing'; + $this->global['pageTitle'] = $this->CompanyName.' : Requisition Listing'; $userID = $this->session->userdata ( 'userId' ); // $data['ReqList'] = $this->requistion_model->getRequistListUserID($userID); $data['Status'] = $this->requistion_model->CheckDraftStatus($userID); @@ -42,7 +43,7 @@ class requisitionform extends BaseController function requisition() { //$this->global['pageTitle'] = 'Resico : Raise Requisition'; - $this->global['pageTitle'] = $this->global['CompanyName'].' : Raise Requisition'; + $this->global['pageTitle'] = $this->CompanyName.' : Raise Requisition'; $data['RequestType'] = $this->requistion_model->getConfigValue('C020'); $data['EmpList'] = $this->requistion_model->getAllEmployees(); @@ -61,7 +62,7 @@ class requisitionform extends BaseController function requisitionlistApproval() { //$this->global['pageTitle'] = 'Resico : Requisition Approval'; - $this->global['pageTitle'] = $this->global['CompanyName'].' : Requisition Approval'; + $this->global['pageTitle'] = $this->CompanyName.' : Requisition Approval'; $data['Status']= $this->requistion_model->getStatus(); $userID = $this->session->userdata ( 'userId' ); @@ -77,7 +78,7 @@ class requisitionform extends BaseController function EditRequistionForm() { //$this->global['pageTitle'] = 'Resico : Edit Requisition'; - $this->global['pageTitle'] = $this->global['CompanyName'].' : Edit Requisition'; + $this->global['pageTitle'] = $this->CompanyName.' : Edit Requisition'; $ReqNo= $_GET['ReqNo']; $ReqType= $_GET['ReqType']; @@ -194,7 +195,7 @@ class requisitionform extends BaseController $data['AppList'] = $this->requistion_model->getApproverRequistList($userID,$Status,$FromDate, $ToDate); //$this->global['pageTitle'] = 'Resico : Requisition Approval'; - $this->global['pageTitle'] = $this->global['CompanyName'].' : Requisition Approval'; + $this->global['pageTitle'] = $this->CompanyName.' : Requisition Approval'; $data['Status']= $this->requistion_model->getStatus(); @@ -627,7 +628,7 @@ function ViewRequest() function pageNotFound() { //$this->global['pageTitle'] = 'Resico : 404 - Page Not Found'; - $this->global['pageTitle'] = $this->global['CompanyName'].' : 404 - Page Not Found'; + $this->global['pageTitle'] = $this->CompanyName.' : 404 - Page Not Found'; $this->loadViews("404", $this->global, NULL, NULL); } } diff --git a/application/controllers/servicepurchaseorder.php b/application/controllers/servicepurchaseorder.php index e40399ee..8d2a72a5 100644 --- a/application/controllers/servicepurchaseorder.php +++ b/application/controllers/servicepurchaseorder.php @@ -24,7 +24,8 @@ class servicepurchaseorder extends BaseController $this->load->library('session'); $this->load->library('form_validation'); $this->load->model('requistion_model'); - $this->isLoggedIn(); + $this->isLoggedIn(); + $this->CompanyName = $this->global['CompanyName']; } /** @@ -33,8 +34,8 @@ class servicepurchaseorder extends BaseController function viewServicePOReportForBilling() { - $this->global['pageTitle'] = 'Resico : Service Purchase Order for Billing'; - $this->global['pageTitle'] = $this->global['CompanyName'].' : Edit Service Purchase order form'; + //$this->global['pageTitle'] = 'Resico : Service Purchase Order for Billing'; + $this->global['pageTitle'] = $this->CompanyName.': Service Purchase Order'; $data["Billing"] = $this->purchaseorder_model->GetServicePOListforBilling(); @@ -47,8 +48,8 @@ class servicepurchaseorder extends BaseController */ function UpdateServicePOStatus() { - $this->global['pageTitle'] = 'Resico : Update Service PO Status'; - $this->global['pageTitle'] = $this->global['CompanyName'].' : Edit Service Purchase order form'; + // $this->global['pageTitle'] = 'Resico : Update Service PO Status'; + $this->global['pageTitle'] = $this->CompanyName.' : Update Service PO Status'; $data['PO'] = $this->purchaseorder_model->GetServicePOListforStatusUpdate(); $data['WorkStatus']=$this->purchaseorder_model->getStatus(7); $this->loadViews("statusofservicepurchaseorder", $this->global,$data,Null); @@ -492,7 +493,7 @@ class servicepurchaseorder extends BaseController function pageNotFound() { $this->global['pageTitle'] = 'Resico : 404 - Page Not Found'; - $this->global['pageTitle'] = $this->global['CompanyName'].' : Edit Service Purchase order form'; + $this->global['pageTitle'] = $this->CompanyName.' : Edit Service Purchase order form'; $this->loadViews("404", $this->global, NULL, NULL); } diff --git a/application/controllers/storerequisitioncontroller.php b/application/controllers/storerequisitioncontroller.php index 262b810a..1c5d5e27 100644 --- a/application/controllers/storerequisitioncontroller.php +++ b/application/controllers/storerequisitioncontroller.php @@ -20,7 +20,8 @@ class storerequisitionlist extends BaseController $this->load->model('storerequistion_model'); $this->load->library('session'); $this->load->library('form_validation'); - $this->isLoggedIn(); + $this->isLoggedIn(); + $this->CompanyName = $this->global['CompanyName']; } @@ -30,7 +31,7 @@ class storerequisitionlist extends BaseController function addstores() { //$this->global['pageTitle'] = 'Resico : Created Store Requisition Listing'; - $this->global['pageTitle'] = $this->global['CompanyName'].' : Raise Store Requisition'; + $this->global['pageTitle'] = $this->CompanyName.' : Raise Store Requisition'; $userId= $this->session->userdata ('userId'); @@ -49,7 +50,7 @@ class storerequisitionlist extends BaseController { //$this->global['pageTitle'] = 'Resico : StoreRequisition Listing'; - $this->global['pageTitle'] = $this->global['CompanyName'].' : Store Requisition Details'; + $this->global['pageTitle'] = $this->CompanyName.' : Store Requisition Details'; $userId= $this->session->userdata ('userId'); $data['Store'] = $this->storerequistion_model->Storeall($userId); @@ -82,7 +83,7 @@ class storerequisitionlist extends BaseController $StoreReqNo = $_GET['StoreReqNo']; //$this->global['pageTitle'] = 'Resico : Edit StoreRequisition'; - $this->global['pageTitle'] = $this->global['CompanyName'].' : Edit StoreRequisition'; + $this->global['pageTitle'] = $this->CompanyName.' : Edit StoreRequisition'; $this->load->model('storerequistion_model'); $data['cost'] = $this->storerequistion_model->editRequistDetails($StoreReqNo); @@ -181,7 +182,7 @@ class storerequisitionlist extends BaseController function addstorerequisitionlist() { //$this->global['pageTitle'] = 'Resico : Store Requisition Listing'; - $this->global['pageTitle'] = $this->global['CompanyName'].' : Store Requisition Listing'; + $this->global['pageTitle'] = $this->CompanyName.' : Store Requisition Listing'; $this->load->model('storerequistion_model'); $data['Status']= $this->storerequistion_model->getStatus(); @@ -199,7 +200,7 @@ class storerequisitionlist extends BaseController { //$this->global['pageTitle'] = 'Resico : Issue StoreRequisition'; - $this->global['pageTitle'] = $this->global['CompanyName'].' : Issue StoreRequisition'; + $this->global['pageTitle'] = $this->CompanyName.' : Issue StoreRequisition'; $this->load->model('storerequistion_model'); $StoreReqNo= $_GET['ReqNo']; @@ -326,7 +327,7 @@ class storerequisitionlist extends BaseController $userID = $this->session->userdata ( 'userId' ); $data['AppList'] = $this->storerequistion_model->getApproverRequistList($userID); //$this->global['pageTitle'] = 'Resico : Approval Store Requisition Listing'; - $this->global['pageTitle'] = $this->global['CompanyName'].' : Approval Store Requisition Listing'; + $this->global['pageTitle'] = $this->CompanyName.' : Approval Store Requisition Listing'; $data['Status']= $this->storerequistion_model->getStatus(); $this->loadViews("approvalstorerequisitionslip", $this->global, $data, NULL); @@ -358,7 +359,7 @@ class storerequisitionlist extends BaseController function requisitionlistApproval() { // $this->global['pageTitle'] = 'Resico :Approvalstorerequisitionlist'; - $this->global['pageTitle'] = $this->global['CompanyName'].' : Approvalstorerequisitionlist'; + $this->global['pageTitle'] = $this->CompanyName.' : Approvalstorerequisitionlist'; $userID = $this->session->userdata ( 'userId' ); diff --git a/application/controllers/storestatus.php b/application/controllers/storestatus.php index 45675b2f..ca2e14e4 100644 --- a/application/controllers/storestatus.php +++ b/application/controllers/storestatus.php @@ -23,7 +23,8 @@ class storestatus extends BaseController parent::__construct(); $this->load->model('store_model'); $this->load->library('form_validation'); - $this->isLoggedIn(); + $this->isLoggedIn(); + $this->CompanyName = $this->global['CompanyName']; } @@ -35,7 +36,7 @@ class storestatus extends BaseController { //$this->global['pageTitle'] = 'Resico : Store Status'; - $this->global['pageTitle'] = $this->global['CompanyName'].' : Store Status'; + $this->global['pageTitle'] = $this->CompanyName.' : Store Status'; $this->loadViews("storestatus", $this->global, NULL , NULL); } @@ -48,7 +49,7 @@ class storestatus extends BaseController function storeavailability() { //$this->global['pageTitle'] = 'Resico : Store Status'; - $this->global['pageTitle'] = $this->global['CompanyName'].' : Store Status'; + $this->global['pageTitle'] = $this->CompanyName.' : Store Status'; $data['Stock'] = $this->store_model->viewStock(); $data['MaterialList'] = $this->store_model->GetAllMaterialList(); $data['StockStatus'] = $this->store_model->GetConfigValue('C021'); @@ -166,7 +167,7 @@ class storestatus extends BaseController { //$this->global['pageTitle'] = 'Resico : 404 - Page Not Found'; - $this->global['pageTitle'] = $this->global['CompanyName'].' : 404 - Page Not Found'; + $this->global['pageTitle'] = $this->CompanyName.' : 404 - Page Not Found'; $this->loadViews("404", $this->global, NULL, NULL); } diff --git a/application/controllers/supplier.php b/application/controllers/supplier.php index f69887d4..20cd8065 100644 --- a/application/controllers/supplier.php +++ b/application/controllers/supplier.php @@ -23,6 +23,7 @@ class supplier extends BaseController $this->load->library('pagination'); $this->load->library('Excel'); $this->isLoggedIn(); + $this->CompanyName = $this->global['CompanyName']; } /** diff --git a/application/controllers/user.php b/application/controllers/user.php index c784c2f9..06de7840 100755 --- a/application/controllers/user.php +++ b/application/controllers/user.php @@ -23,6 +23,7 @@ class user extends BaseController $this->load->model('costcenter_model'); $this->isLoggedIn(); + $this->CompanyName = $this->global['CompanyName']; } /** @@ -31,7 +32,7 @@ class user extends BaseController public function index() { // $this->global['pageTitle'] = 'Resico : Dashboard'; - $this->global['pageTitle'] = $this->global['CompanyName'].' : Dashboard'; + $this->global['pageTitle'] = $this->CompanyName.' : Dashboard'; $this->load->model('employeedetails_model'); $this->load->model('dahsboard_Model'); @@ -966,7 +967,7 @@ function attendanceyear($empID ='') $data['userRecords'] = $this->user_model->userListing(); //$this->global['pageTitle'] = 'Resico : User Listing'; - $this->global['pageTitle'] = $this->global['CompanyName'].' : User Listing'; + $this->global['pageTitle'] = $this->CompanyName.' : User Listing'; $this->loadViews("users", $this->global, $data, NULL); //} @@ -991,7 +992,7 @@ function attendanceyear($empID ='') $data['Department'] = $this->costcenter_model->getDepartment(); //$this->global['pageTitle'] = 'Resico : Add New User'; - $this->global['pageTitle'] = $this->global['CompanyName'].' : Add New User'; + $this->global['pageTitle'] = $this->CompanyName.' : Add New User'; $this->loadViews("addNew", $this->global, $data, NULL); //} @@ -1178,7 +1179,7 @@ function attendanceyear($empID ='') $data['AccessDept'] = $this->costcenter_model ->getaccessDept($Empid); //$this->global['pageTitle'] = 'Resico : Edit User'; - $this->global['pageTitle'] = $this->global['CompanyName'].' : Edit User'; + $this->global['pageTitle'] = $this->CompanyName.' : Edit User'; $this->loadViews("editOld", $this->global, $data, NULL); @@ -1266,7 +1267,7 @@ function attendanceyear($empID ='') function loadChangePass() { //$this->global['pageTitle'] = 'Resico : Change Password'; - $this->global['pageTitle'] = $this->global['CompanyName'].' : Change Password'; + $this->global['pageTitle'] = $this->CompanyName.' : Change Password'; $this->loadViews("changePassword", $this->global, NULL, NULL); } @@ -1320,7 +1321,7 @@ function attendanceyear($empID ='') function pageNotFound() { //$this->global['pageTitle'] = 'Resico : 404 - Page Not Found'; - $this->global['pageTitle'] = $this->global['CompanyName'].' : 404 - Page Not Found'; + $this->global['pageTitle'] = $this->CompanyName.' : 404 - Page Not Found'; $this->loadViews("404", $this->global, NULL, NULL); } @@ -1341,7 +1342,7 @@ function attendanceyear($empID ='') $data['finyear']=$this->user_model->finyear(); //$this->global['pageTitle'] = 'Resico : MaterialInwardRegister'; - $this->global['pageTitle'] = $this->global['CompanyName'].' : MaterialInwardRegister'; + $this->global['pageTitle'] = $this->CompanyName.' : MaterialInwardRegister'; $this->loadViews("Report_Material_inward_Register", $this->global,$data,NULL); } diff --git a/application/views/AmendPOlist.php b/application/views/AmendPOlist.php index fe4640b9..7429198d 100644 --- a/application/views/AmendPOlist.php +++ b/application/views/AmendPOlist.php @@ -15,7 +15,8 @@
-

Resico Industries - Amendment Purchase Order List

+ +

diff --git a/application/views/Editmaterialinspectionreport.php b/application/views/Editmaterialinspectionreport.php index 276c9ab6..46157c7c 100644 --- a/application/views/Editmaterialinspectionreport.php +++ b/application/views/Editmaterialinspectionreport.php @@ -86,7 +86,8 @@ if(!empty($MRIRDetails))

-
Resico Industries - Edit Material Receipt And Inspection Report (MRIR) -
+ +

-

Resico Industries - Material Distribution List

+ +

'form-label-left Approve ','name' => 'Approve','id' => 'Approve'); diff --git a/application/views/addemppaydate.php b/application/views/addemppaydate.php index d709ad45..9ebb4609 100644 --- a/application/views/addemppaydate.php +++ b/application/views/addemppaydate.php @@ -28,7 +28,8 @@ $("#due_started").datepicker({

-
Employee Salary Payment Details
+ +

diff --git a/application/views/advancerequest.php b/application/views/advancerequest.php index d4997624..0f5276e7 100644 --- a/application/views/advancerequest.php +++ b/application/views/advancerequest.php @@ -19,7 +19,8 @@ $(function() {

-
Resico Industries - Advance Request
+ +

diff --git a/application/views/attendance.php b/application/views/attendance.php index 9f61fb74..fc02c871 100755 --- a/application/views/attendance.php +++ b/application/views/attendance.php @@ -172,7 +172,8 @@ $currentday = date('d');

-
Employee Monthly Attendance View/Edit
+ +

diff --git a/application/views/bankreport.php b/application/views/bankreport.php index ce6f4ca1..5bb32482 100644 --- a/application/views/bankreport.php +++ b/application/views/bankreport.php @@ -98,7 +98,8 @@ $("#esireport").click(function(){

-
Resico Industries - Bank Report Generator
+ +

diff --git a/application/views/capitalpurchaseorder.php b/application/views/capitalpurchaseorder.php index b3c719c7..d1bf89a5 100644 --- a/application/views/capitalpurchaseorder.php +++ b/application/views/capitalpurchaseorder.php @@ -313,7 +313,8 @@ function vaildateBeforeOpenModal()
-

Resico Industries - Capital Purchase Order

+ +

diff --git a/application/views/cashbooklisting.php b/application/views/cashbooklisting.php index c9b43ad6..2dceb60a 100755 --- a/application/views/cashbooklisting.php +++ b/application/views/cashbooklisting.php @@ -7,6 +7,7 @@

Resico Industries - Cashbook Listing

+

diff --git a/application/views/editCapitalAmendPO.php b/application/views/editCapitalAmendPO.php index 29b15b4f..7ce89d96 100644 --- a/application/views/editCapitalAmendPO.php +++ b/application/views/editCapitalAmendPO.php @@ -426,7 +426,8 @@ document.getElementById('dispatchinternational').style.display = 'block';
-

Resico Industries - Amendment Capital Purchase Order -

+ +

+

+

-
Edit Salary Payment Details
+ +
@@ -426,7 +427,7 @@ if(!empty($emppay)) { ?>
- + session->flashdata('error'); ?>
@@ -436,14 +437,14 @@ if(!empty($emppay)) { ?>
- + session->flashdata('success'); ?>
- ', '
'); ?> + ', '
'); ?>
diff --git a/application/views/editPayslip.php b/application/views/editPayslip.php index 96f2122b..70a31ce2 100755 --- a/application/views/editPayslip.php +++ b/application/views/editPayslip.php @@ -129,7 +129,8 @@ if(!empty($PayInfo))

-
Edit Payslip Details -
+ +

diff --git a/application/views/editRevenueAmendPO.php b/application/views/editRevenueAmendPO.php index 04819b76..bcfa3a45 100644 --- a/application/views/editRevenueAmendPO.php +++ b/application/views/editRevenueAmendPO.php @@ -989,7 +989,9 @@ function calculateEditTaxValue()
-

Resico Industries - Amendment Revenue Purchase Order-

+ +

+
diff --git a/application/views/editServiceAmendPO.php b/application/views/editServiceAmendPO.php index f8dbe0be..3e97a556 100644 --- a/application/views/editServiceAmendPO.php +++ b/application/views/editServiceAmendPO.php @@ -696,7 +696,8 @@ $(document).ready(function () {
-

Resico Industries - Amendment Service Purchase Order -

+ +

diff --git a/application/views/editimportpo.php b/application/views/editimportpo.php index 0bfd6e7e..fbae730a 100644 --- a/application/views/editimportpo.php +++ b/application/views/editimportpo.php @@ -339,9 +339,11 @@ tinymce.init({
-

Resico Industries - Edit Import Purchase Order-

+ +

-

Resico Industries - Amended Purchase Order-

+ +

+
Details
diff --git a/application/views/emppayListing.php b/application/views/emppayListing.php index 123fc72d..83b5e5ba 100644 --- a/application/views/emppayListing.php +++ b/application/views/emppayListing.php @@ -4,7 +4,8 @@

-
Employee Salary Details
+ +

diff --git a/application/views/importpo.php b/application/views/importpo.php index 4e5d398a..20bbd4d6 100644 --- a/application/views/importpo.php +++ b/application/views/importpo.php @@ -289,7 +289,8 @@ function vaildateBeforeOpenModal()
-

Resico Industries - Import Purchase Order


+ +


Back diff --git a/application/views/income_expense_list.php b/application/views/income_expense_list.php index 0707b8f8..83fe536f 100755 --- a/application/views/income_expense_list.php +++ b/application/views/income_expense_list.php @@ -4,7 +4,8 @@

-
Resico Industries - Receipt and Payment List
+ +

diff --git a/application/views/inward_report_create.php b/application/views/inward_report_create.php index 19e9b31c..14c24d41 100755 --- a/application/views/inward_report_create.php +++ b/application/views/inward_report_create.php @@ -37,7 +37,8 @@ th{

-
Inward Inspection Report Screen
+ +
Inward Inspection Report Screen

diff --git a/application/views/inwardgateregister.php b/application/views/inwardgateregister.php index bf12d7ac..e19b0318 100644 --- a/application/views/inwardgateregister.php +++ b/application/views/inwardgateregister.php @@ -56,7 +56,9 @@ Inputmask("A{2,3} 9{1,2} A{1,2} 9{4}").mask($("#VehicleNo"));

-
Resico Industries - Inward Gate Register (IGR) Entry
+ +
+


diff --git a/application/views/materialinspectionreport.php b/application/views/materialinspectionreport.php index 6b618fc8..77cff766 100644 --- a/application/views/materialinspectionreport.php +++ b/application/views/materialinspectionreport.php @@ -82,7 +82,8 @@ if(!empty($IGRDetails))

-
Resico Industries - Material Receipt And Inspection Report (MRIR)
+ +

-
Employee Monthly Payment Listing
+ +

diff --git a/application/views/monthlypayinputs.php b/application/views/monthlypayinputs.php index b6a56ab1..dbf03ec7 100755 --- a/application/views/monthlypayinputs.php +++ b/application/views/monthlypayinputs.php @@ -48,7 +48,8 @@ $('html').bind('keypress', function(e)

-
Employee Monthly Payment Listing
+ +

diff --git a/application/views/payslipgenerate.php b/application/views/payslipgenerate.php index 9b434896..17408517 100755 --- a/application/views/payslipgenerate.php +++ b/application/views/payslipgenerate.php @@ -189,7 +189,8 @@ $(function() {

-
Resico Industries - PaySlip Generator
+ +

diff --git a/application/views/paysliplist.php b/application/views/paysliplist.php index 57357a1d..c5f3f2b1 100755 --- a/application/views/paysliplist.php +++ b/application/views/paysliplist.php @@ -15,7 +15,8 @@ $datefordropdown = date_format($datefordropdown,'m-Y');

-
Employee Monthly Payslip
+ +

diff --git a/application/views/payslipupload2.php b/application/views/payslipupload2.php index 76c1b69b..be658ff0 100755 --- a/application/views/payslipupload2.php +++ b/application/views/payslipupload2.php @@ -38,7 +38,8 @@ function checkYearMonthAsEmpty()

-
Resico Industries - Monthly Pay Inputs Upload
+ +

diff --git a/application/views/poapproval_view.php b/application/views/poapproval_view.php index e45e1620..d20a0e65 100644 --- a/application/views/poapproval_view.php +++ b/application/views/poapproval_view.php @@ -23,7 +23,8 @@ if(empty($Status))
-

Resico Industries - Purchase Order Approval List

+ +

diff --git a/application/views/porelease_view.php b/application/views/porelease_view.php index 534847a6..c65132d0 100644 --- a/application/views/porelease_view.php +++ b/application/views/porelease_view.php @@ -25,7 +25,8 @@ if(empty($Status))
-

Purchase Order Release List

+ +

diff --git a/application/views/publicholidays.php b/application/views/publicholidays.php index f251bbf1..4235e653 100755 --- a/application/views/publicholidays.php +++ b/application/views/publicholidays.php @@ -40,7 +40,8 @@ $('html').bind('keypress', function(e)

-
Public Holiday Information -
+ +

diff --git a/application/views/purchaseorder.php b/application/views/purchaseorder.php index 39f52dda..3850373d 100644 --- a/application/views/purchaseorder.php +++ b/application/views/purchaseorder.php @@ -2225,7 +2225,7 @@ function calculateEditTaxValue()
-

+

diff --git a/application/views/qualitymaster.php b/application/views/qualitymaster.php index 8abdb4b2..1b9a3d55 100644 --- a/application/views/qualitymaster.php +++ b/application/views/qualitymaster.php @@ -41,7 +41,8 @@ foreach($customersinward as $customer)

-
Product Test Specification Master Screen
+ +
Product Test Specification Master Screen

diff --git a/application/views/qualitymasterlistview.php b/application/views/qualitymasterlistview.php index c61d707e..5451600c 100644 --- a/application/views/qualitymasterlistview.php +++ b/application/views/qualitymasterlistview.php @@ -10,7 +10,8 @@

-
Product Test Specification List
+ +
Product Test Specification List

diff --git a/application/views/qualityreport.php b/application/views/qualityreport.php index f2e13dce..b707a05a 100644 --- a/application/views/qualityreport.php +++ b/application/views/qualityreport.php @@ -35,7 +35,8 @@ th{

-
Pre Dispatch Inspection Report Screen
+ +
Pre Dispatch Inspection Report Screen

diff --git a/application/views/reportmasterlist.php b/application/views/reportmasterlist.php index cb2533c8..e5c6c237 100644 --- a/application/views/reportmasterlist.php +++ b/application/views/reportmasterlist.php @@ -9,7 +9,8 @@

-
Product Test Reports List
+ +
Product Test Reports List

diff --git a/application/views/reportmasterlist_inward.php b/application/views/reportmasterlist_inward.php index a8c13ad5..1e3ffc83 100644 --- a/application/views/reportmasterlist_inward.php +++ b/application/views/reportmasterlist_inward.php @@ -9,7 +9,8 @@

-
Inward Product Test Reports List
+ +
Inward Product Test Reports List

diff --git a/application/views/servicePurchaseorder.php b/application/views/servicePurchaseorder.php index 0ca651a5..3b2d3fbd 100644 --- a/application/views/servicePurchaseorder.php +++ b/application/views/servicePurchaseorder.php @@ -649,7 +649,8 @@ function clearEditTaxField()
-

Resico Industries - Service Purchase Order

+ +

diff --git a/application/views/serviceporeport.php b/application/views/serviceporeport.php index 687f73f0..918d52cb 100644 --- a/application/views/serviceporeport.php +++ b/application/views/serviceporeport.php @@ -26,7 +26,8 @@ $Adv='';
-

Service Purchase Order Report

+ +

Report

The PONO Shown In Green Colour Are Paid Advance Amount
diff --git a/application/views/statusofservicepurchaseorder.php b/application/views/statusofservicepurchaseorder.php index 95f21f79..7282d8c0 100644 --- a/application/views/statusofservicepurchaseorder.php +++ b/application/views/statusofservicepurchaseorder.php @@ -14,7 +14,8 @@

-
Status Of Service Purchase Order
+ +
Status Of Service Purchase Order


diff --git a/application/views/viewIGRDetails.php b/application/views/viewIGRDetails.php index 43993c56..2ffac969 100644 --- a/application/views/viewIGRDetails.php +++ b/application/views/viewIGRDetails.php @@ -40,7 +40,8 @@
-

Resico Industries -View Inward Gate Register

+ +

diff --git a/application/views/viewIndSpec.php b/application/views/viewIndSpec.php index f8816b26..87f93e68 100644 --- a/application/views/viewIndSpec.php +++ b/application/views/viewIndSpec.php @@ -31,7 +31,8 @@ foreach($specifications as $s)

-
Product Customer Test Specification Master Screen
+ +
(Product Customer Test Specification Master Screen)

diff --git a/application/views/viewindInwardreport.php b/application/views/viewindInwardreport.php index b2f87d21..4b2f4e97 100644 --- a/application/views/viewindInwardreport.php +++ b/application/views/viewindInwardreport.php @@ -47,7 +47,8 @@ th{

-
Inward Material Inspection Report - Test Report No:
+ +
Inward Material Inspection Report - Test Report No:

diff --git a/application/views/viewindreport.php b/application/views/viewindreport.php index f72196a1..4405d985 100644 --- a/application/views/viewindreport.php +++ b/application/views/viewindreport.php @@ -42,7 +42,8 @@ th{

-
Pre Dispatch Inspection Report - Test Report No:
+ +
Pre Dispatch Inspection Report - Test Report No:

diff --git a/application/views/viewinwardgateregister.php b/application/views/viewinwardgateregister.php index b8f6ff1e..841d4b2e 100644 --- a/application/views/viewinwardgateregister.php +++ b/application/views/viewinwardgateregister.php @@ -41,7 +41,8 @@
-

Resico Industries - View Inward Gate Register

+ +

diff --git a/application/views/viewmaterialinspectionreport.php b/application/views/viewmaterialinspectionreport.php index dc3ac1fd..4d960bf9 100644 --- a/application/views/viewmaterialinspectionreport.php +++ b/application/views/viewmaterialinspectionreport.php @@ -38,7 +38,8 @@
-

Resico Industries - View Material Receipt And Inspection Report

+ +

diff --git a/application/views/viewmrirforbilling.php b/application/views/viewmrirforbilling.php index 3222c44a..d7d85d12 100644 --- a/application/views/viewmrirforbilling.php +++ b/application/views/viewmrirforbilling.php @@ -26,6 +26,8 @@ $color='';

Resico Industries - Billing For MRIR

+

+
The PONO Shown In Green Colour Are Paid Advance Amount