diff --git a/application/controllers/CostCenter.php b/application/controllers/CostCenter.php index b2134ba3..a63e6368 100644 --- a/application/controllers/CostCenter.php +++ b/application/controllers/CostCenter.php @@ -42,7 +42,7 @@ class CostCenter extends BaseController $data['userRecords'] = $this->costcenter_model->CostListing(); //$this->global['pageTitle'] = 'Resico : Cost List'; - $this->global['pageTitle'] = $this->global['CompanyName'].' : Cost List'; + $this->global['pageTitle'] = $this->global['CompanyName'].' : Cost Details'; $this->loadViews("costListing", $this->global, $data, NULL); } @@ -173,7 +173,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'; + $this->global['pageTitle'] = $this->global['CompanyName'].' : Edit Cost Center'; $this->loadViews("editCostCenter", $this->global, $data,NULL); } diff --git a/application/controllers/assetdetails.php b/application/controllers/assetdetails.php index 34e0c1bf..0d17d212 100644 --- a/application/controllers/assetdetails.php +++ b/application/controllers/assetdetails.php @@ -28,8 +28,8 @@ class assetdetails extends BaseController */ public function index() { - $this->global['pageTitle'] = 'Resico : Asset Details'; - $this->global['pageTitle'] = $this->global['CompanyName'].' : Edit Service Purchase order form'; + //$this->global['pageTitle'] = 'Resico : Asset Details'; + $this->global['pageTitle'] = $this->global['CompanyName'].' : Asset Details'; $this->loadViews("assetListing", $this->global, NULL , NULL); } @@ -41,8 +41,8 @@ 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'].' : Edit Service Purchase order form'; + //$this->global['pageTitle'] = 'Resico : Asset List'; + $this->global['pageTitle'] = $this->global['CompanyName'].' : Asset Details'; $this->loadViews("assetListing", $this->global, $data, NULL); } @@ -55,8 +55,8 @@ 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'].' : Edit Service Purchase order form'; + //$this->global['pageTitle'] = 'Resico : Add Asset'; + $this->global['pageTitle'] = $this->global['CompanyName'].' : Add Asset Details'; $this->loadViews("addasset", $this->global, $data, NULL); } @@ -275,8 +275,8 @@ class assetdetails extends BaseController $data['assetList'] = $this->assetdetails_model->getAssetDetails($AssetID); $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 Service Purchase order form'; + //$this->global['pageTitle'] = 'Resico : Edit Asset'; + $this->global['pageTitle'] = $this->global['CompanyName'].' : Edit Asset '; $this->loadViews("editasset", $this->global, $data,NULL); } @@ -534,8 +534,8 @@ class assetdetails 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->global['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 8d49cf11..d7b162a6 100644 --- a/application/controllers/emergencypurchaseorder.php +++ b/application/controllers/emergencypurchaseorder.php @@ -32,7 +32,7 @@ class emergencypurchaseorder extends BaseController public function index() { //$this->global['pageTitle'] = 'Resico : AddPO'; - $this->global['pageTitle'] = $this->global['CompanyName'].' : AddPO'; + //$this->global['pageTitle'] = $this->global['CompanyName'].' : AddPO'; $this->loadViews("addPO", $this->global, NULL , NULL); } @@ -42,7 +42,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 PO from Requisition List'; + $this->global['pageTitle'] = $this->global['CompanyName'].' : Create Purchase Order from Requistion'; $this->loadViews("createPOfromRequistion", $this->global, $data,Null); } @@ -54,7 +54,7 @@ class emergencypurchaseorder extends BaseController $RequestedBy = $this->session->userdata ('EmpID'); //$this->global['pageTitle'] = 'Resico : Create Emergency Purchase Order'; - $this->global['pageTitle'] = $this->global['CompanyName'].' : Create Emergency Purchase Order'; + $this->global['pageTitle'] = $this->global['CompanyName'].' : Emergency Purchase Order'; $data['RequestType'] = $this->requistion_model->getConfigValue('C004'); $data['Suplist'] = $this->purchaseorder_model->getSupplierName(); @@ -676,7 +676,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'; + $this->global['pageTitle'] = $this->global['CompanyName'].' : Purchase Orders Details'; $this->loadViews("POlist", $this->global, $data, NULL); @@ -810,14 +810,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 form'; + $this->global['pageTitle'] = $this->global['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 form'; + $this->global['pageTitle'] = $this->global['CompanyName'].' : Edit Revenue Purchase Order'; $this->loadViews("editRevenuepurchaseorder", $this->global, $data, NULL); } diff --git a/application/controllers/employeedetails.php b/application/controllers/employeedetails.php index 97394b78..2a559692 100644 --- a/application/controllers/employeedetails.php +++ b/application/controllers/employeedetails.php @@ -43,7 +43,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 Listing'; + $this->global['pageTitle'] = $this->global['CompanyName'].' : Employee Details'; $this->loadViews("employeeListing", $this->global, $data, NULL); } diff --git a/application/controllers/storerequisition.php b/application/controllers/storerequisition.php deleted file mode 100644 index 2dca60e1..00000000 --- a/application/controllers/storerequisition.php +++ /dev/null @@ -1,89 +0,0 @@ -load->library('session'); - $this->load->library('form_validation'); - $this->isLoggedIn(); - } - - /** - * Index Page for this controller (default function of the class) - */ - public function index() - { - //$this->global['pageTitle'] = 'Resico : storesrequisitionslip'; - - //$this->loadviews('storesrequisitionslip',$this->global); - } - - /** - * To load the Add store requisition screen - */ - function addstorerequisitionslip() - { - //$this->global['pageTitle'] = 'Resico : Add Store Requisition'; - $this->global['pageTitle'] = $this->global['CompanyName'].' : Add Store Requisition'; - - $this->loadviews('addstorerequisitionslip',$this->global); - } - - /** - * To load the store requisition list screen - */ - function storerequisitionlist() - { - //$this->global['pageTitle'] = 'Resico : Store Requisition List'; - $this->global['pageTitle'] = $this->global['CompanyName'].' : Store Requisition List'; - - $this->loadviews('storerequisitionlist',$this->global); - } - - /** - * To load the store requisition listing - */ - function storerequisitionlisting() - { - //$this->global['pageTitle'] = 'Resico : Store Requisition Listing'; - $this->global['pageTitle'] = $this->global['CompanyName'].' : Store Requisition Listing'; - - $this->loadviews('storerequisitionlisting',$this->global); - } - - /** - * To load the approval store requisition screen - */ - function approvalstorerequisition() - { - //$this->global['pageTitle'] = 'Resico : Approval Store Requisition'; - $this->global['pageTitle'] = $this->global['CompanyName'].' : Approval Store Requisition'; - - $this->loadviews('approvalstorerequisitionslip',$this->global); - } - - /** - * To load pagenotfound screen - */ - function pageNotFound() - { - //$this->global['pageTitle'] = 'Resico : 404 - Page Not Found'; - $this->global['pageTitle'] = $this->global['CompanyName'].' : 404 - Page Not Found'; - - $this->loadViews("404", $this->global, NULL, NULL); - } -} \ No newline at end of file diff --git a/application/controllers/storerequisitionlist.php b/application/controllers/storerequisitioncontroller.php similarity index 99% rename from application/controllers/storerequisitionlist.php rename to application/controllers/storerequisitioncontroller.php index e0348ae6..262b810a 100644 --- a/application/controllers/storerequisitionlist.php +++ b/application/controllers/storerequisitioncontroller.php @@ -30,7 +30,7 @@ class storerequisitionlist extends BaseController function addstores() { //$this->global['pageTitle'] = 'Resico : Created Store Requisition Listing'; - $this->global['pageTitle'] = $this->global['CompanyName'].' : Created Store Requisition Listing'; + $this->global['pageTitle'] = $this->global['CompanyName'].' : Raise Store Requisition'; $userId= $this->session->userdata ('userId'); @@ -49,7 +49,7 @@ class storerequisitionlist extends BaseController { //$this->global['pageTitle'] = 'Resico : StoreRequisition Listing'; - $this->global['pageTitle'] = $this->global['CompanyName'].' : StoreRequisition Listing'; + $this->global['pageTitle'] = $this->global['CompanyName'].' : Store Requisition Details'; $userId= $this->session->userdata ('userId'); $data['Store'] = $this->storerequistion_model->Storeall($userId); diff --git a/application/controllers/supplier.php b/application/controllers/supplier.php index b92b3f6c..f69887d4 100644 --- a/application/controllers/supplier.php +++ b/application/controllers/supplier.php @@ -47,7 +47,7 @@ class supplier extends BaseController $data['userRecords'] = $this->supplier_model->supplierListing(); //$this->global['pageTitle'] = 'Resico : Supplier Listing'; - $this->global['pageTitle'] = $this->global['CompanyName'].' : Supplier Listing'; + $this->global['pageTitle'] = $this->global['CompanyName'].' : Supplier Details'; //Load the view supplierListing.php @@ -64,7 +64,7 @@ class supplier extends BaseController $data['payment'] = $this->supplier_model->getPaymentTerms(); //$this->global['pageTitle'] = 'Resico : Add New Supplier'; - $this->global['pageTitle'] = $this->global['CompanyName'].' : Add New Supplier'; + $this->global['pageTitle'] = $this->global['CompanyName'].' : New Supplier Details'; //Load the view addsupplier.php $this->loadViews("addsupplier", $this->global,$data, NULL); diff --git a/application/views/EditservicePurchaseorder.php b/application/views/EditservicePurchaseorder.php index ccff887d..57f39808 100755 --- a/application/views/EditservicePurchaseorder.php +++ b/application/views/EditservicePurchaseorder.php @@ -711,7 +711,8 @@ $(document).ready(function () {
-

Resico Industries - Edit Service Purchase Order -

+ +

diff --git a/application/views/POlist.php b/application/views/POlist.php index bedeb833..3f950ae7 100644 --- a/application/views/POlist.php +++ b/application/views/POlist.php @@ -14,7 +14,8 @@
-

Resico Industries - Purchase Order List

+ +

diff --git a/application/views/addCostCenter.php b/application/views/addCostCenter.php index 2b91230a..bd3370b5 100644 --- a/application/views/addCostCenter.php +++ b/application/views/addCostCenter.php @@ -73,7 +73,8 @@ span {

-
Add Cost List
+ +

diff --git a/application/views/addasset.php b/application/views/addasset.php index 4b6487ca..e00e04a1 100644 --- a/application/views/addasset.php +++ b/application/views/addasset.php @@ -1,57 +1,10 @@ -

-
Add Asset Details
+ +

@@ -342,8 +295,50 @@ $(function() {
- - \ No newline at end of file diff --git a/application/views/addemployee.php b/application/views/addemployee.php index 78047c2c..9a3fbac6 100644 --- a/application/views/addemployee.php +++ b/application/views/addemployee.php @@ -387,7 +387,8 @@ - - - Resico (India) Pvt Ltd + diff --git a/application/views/issueStoreRequistion.php b/application/views/issueStoreRequistion.php index 7a61bc26..f5684d05 100644 --- a/application/views/issueStoreRequistion.php +++ b/application/views/issueStoreRequistion.php @@ -87,14 +87,15 @@ span.highlight {

-
Resico Industries - Store Requisition -
+ +

'form-label-left requistion ','name' => 'requistion','id' => 'requistion'); - echo form_open($this->config->base_url().'storerequisitionlist/UpdateIssueRequistion',$attributes); + echo form_open($this->config->base_url().'storerequisitioncontroller/UpdateIssueRequistion',$attributes); ?> diff --git a/application/views/purchaseorder.php b/application/views/purchaseorder.php index dda61996..39f52dda 100644 --- a/application/views/purchaseorder.php +++ b/application/views/purchaseorder.php @@ -2224,7 +2224,8 @@ function calculateEditTaxValue()
-

Resico Industries - Revenue Purchase Order

+ +

diff --git a/application/views/requisitionform.php b/application/views/requisitionform.php index 87fa23ba..db2d5f37 100644 --- a/application/views/requisitionform.php +++ b/application/views/requisitionform.php @@ -31,7 +31,8 @@ if(!empty($Emp))
-

Resico Industries - Requisition Form

+ +

-

Resico Industries - Requisition Approval List

+ +
-

Resico Industries - Requisition Listing

- + +

0 ) {?>

The Requisition No is in Draft status. Please act on the requisition.Then only you can raise New Requisition. diff --git a/application/views/storerequisition.php b/application/views/storerequisition.php index ecb09e97..16ea5afb 100644 --- a/application/views/storerequisition.php +++ b/application/views/storerequisition.php @@ -70,13 +70,14 @@ span.highlight {

-

Resico Industries - Requisition Listing

+ +

0 ) { ?>

-The Store Requisition No is in Draft status. Please act on the requisition.Then only you can raise New StoreRequisition. + The Store Requisition No is in Draft status. Please act on the requisition.Then only you can raise New StoreRequisition.

diff --git a/application/views/storerequisitionlisting.php b/application/views/storerequisitionlisting.php index e7013364..7787c9c4 100644 --- a/application/views/storerequisitionlisting.php +++ b/application/views/storerequisitionlisting.php @@ -36,7 +36,7 @@ span.highlight { 'form-label-left Storerequistion ','name' => 'Storerequistion','id' => 'Storerequistion'); - echo form_open($this->config->base_url().'storerequisitionlist/addstorerequisitionlist',$attributes); ?> + echo form_open($this->config->base_url().'storerequisitioncontroller/addstorerequisitionlist',$attributes); ?>
@@ -62,7 +62,8 @@ span.highlight {