diff --git a/application/config/constants.php~ b/application/config/constants.php~
deleted file mode 100644
index fdc6b80b..00000000
--- a/application/config/constants.php~
+++ /dev/null
@@ -1,237 +0,0 @@
-<?php  if ( ! defined('BASEPATH')) exit('No direct script access allowed');
-
-/*
-|--------------------------------------------------------------------------
-| File and Directory Modes
-|--------------------------------------------------------------------------
-|
-| These prefs are used when checking and setting modes when working
-| with the file system.  The defaults are fine on servers with proper
-| security, but you may wish (or even need) to change the values in
-| certain environments (Apache running a separate process for each
-| user, PHP under CGI with Apache suEXEC, etc.).  Octal values should
-| always be used to set the mode correctly.
-|
-*/
-define('FILE_READ_MODE', 0644);
-define('FILE_WRITE_MODE', 0666);
-define('DIR_READ_MODE', 0755);
-define('DIR_WRITE_MODE', 0777);
-
-/*
-|--------------------------------------------------------------------------
-| File Stream Modes
-|--------------------------------------------------------------------------
-|
-| These modes are used when working with fopen()/popen()
-|
-*/
-
-define('FOPEN_READ',							'rb');
-define('FOPEN_READ_WRITE',						'r+b');
-define('FOPEN_WRITE_CREATE_DESTRUCTIVE',		'wb'); // truncates existing file data, use with care
-define('FOPEN_READ_WRITE_CREATE_DESTRUCTIVE',	'w+b'); // truncates existing file data, use with care
-define('FOPEN_WRITE_CREATE',					'ab');
-define('FOPEN_READ_WRITE_CREATE',				'a+b');
-define('FOPEN_WRITE_CREATE_STRICT',				'xb');
-define('FOPEN_READ_WRITE_CREATE_STRICT',		'x+b');
-
-/**** USER DEFINED CONSTANTS **********/
-
-define('ROLE_ADMIN',                            '1');
-define('ROLE_MANAGER',                         	'2');
-define('ROLE_EMPLOYEE',                         '3');
-/*define('ROLE_PRODUCTION',                       '4');
-define('ROLE_QUALITY',                        	'5');
-define('ROLE_SECURITY',                         '6');
-define('ROLE_SALES',	                        '7');
-define('ROLE_ACCOUNTS',                         '8');*/
-
-
-/***** USER DESIGNATION ******/
-define('SECURITY',                            'SECURITY');
-
-define('SEGMENT',								2);
-
-/**************  Requistion Status code                 */
-define('REQ_DRAFT',                            'ST001');
-define('REQ_PENDING_APPROVAL',                 'ST002');
-define('REQITEM_NEW',                          'ST003');
-define('REQ_APPROVED',                         'ST004');
-define('REQ_PO_CREATED' ,                       'ST005');
-define('REQ_REJECTED',                          'ST006');
-define('REQ_CLOSED',                            'ST007');
-define('REQ_ONHOLD',                            'ST008');
-define('REQITEM_ONHOLD',                        'ST009');
-define('REQITEM_PARTIALLY_DELIVERED',           'ST010');
-define('REQITEM_DELIVERED',                     'ST011');
-define('REQ_DELETED',                     'ST013');
-define('REQITEM_POCREATED',                     'ST022');
-define('REQITEM_PARTIALLY_PO_CREATED',                     'ST023');
-define('REQITEM_Emergency_PO_CREATED',                     'ST024');
-define('POLINEITEM_IGR_CREATED',                     'ST040');
-
-/*IGR Status */
-define('IGR_CREATED',                     'ST027');
-define('IGR_CLOSED',                     'ST028');
-define('IGR_CANCELLED',                     'ST029');
-define('POLINEITEM_IGRPARTIAL_CREATED',                     'ST042');
-/*IGR Status*/
-
-/*MRIR Status */
-define('MRIR_CREATED',                     'ST041');
-define('MRIR_APPROVED',                     'ST044');
-define('MRIR_REJECTED',                     'ST045');
-
-define('REQUISTSTATUS',                     '0');
-define('REQUISTITEMSTATUS',                     '1');
-
-/* Purchase Order Status */
-
-define('PO_DRAFT',                            'ST014');
-define('PO_CREATED',                          'ST015');
-define('PO_INPROGRESS',                       'ST016');
-define('PO_DISPATCHED',                       'ST017');
-define('PO_DELIVERED',                        'ST018');
-define('PO_CANCELLED',                        'ST019');
-define('PO_ONHOLD',                           'ST020');
-define('PO_CLOSED',                           'ST021');
-define('PO_AMENDED',                     'ST030');
-define('PO_RELEASED',                     'ST026');
-define('PO_AWAITING_RELEASE',                     'ST025');
-define('PO_APPROVED',                     'ST025');
-
-/*store Status*/
-
-define('STORE_DRAFT',                            'ST043');
-define('STORE_CREATED',                            'ST015');
-
-/*store requisition*/
-define('STORE REQUISTION STATUS',                     '6');
-define('STORE_OPEN',                            'ST034');
-define('STORE_PENDINGAPPROVAL',                 'ST035');
-define('STORE_APPROVAL',                        'ST036');
-define('STORE_ISSUSED',                         'ST037');
-define('STORE_ONHOLD',                          'ST038');
-define('STORE_REJECT',                          'ST039');
-
-
-
-
-/* Department Code */
-define('ADMIN',                            			'DEP01');
-define('QUALITY',                            		'DEP02');
-define('STORE',                            			'DEP03');
-define('SALES',                            			'DEP04');
-define('PRODUCTION',                            	'DEP05');
-define('DELIVERY',                            		'DEP06');
-define('TRP',                            			'DEP07');
-define('COATING',                            		'DEP08');
-define('MAINTENANANCE',                            	'DEP09');
-define('FINANCE',                            		'DEP10');
-define('PURCHASE',                            		'DEP11');
-define('MANAGEMENT',                            		'DEP12');
-/* PO Type  */
-define('REVENUE',                            		'REVENUE');
-define('SERVICE',                            		'SERVICE');
-define('IMPORT',                            		'IMPORT');
-define('CAPITAL',                            		'CAPITAL');
-
-// Tax Type
-define('PERCENTAGE',                            		'PERCENTAGE');
-define('LUMPSUM',                            		'LUMP SUM');
-define('NILTYPE',                            		'NIL');
-
-// Freight Type
-define('PERUOM',                            		'PER UOM');
-define('PERTRIP',                            		'PER TRIP');
-
-
-/*  Formula for Tax calculation */
-/* Discount*/
-define('DIS_PERCENTAGE',                            		'((Discountval/100) * basicValue)');
-define('DIS_LUMPSUM',                            		    'Discountval');
-// Packaging
-define('PACKAGING_PERCENTAGE_BYDISCOUNTVALUE',             		'((Packagingvalue/100) * (basicValue-AfterDiscount))');
-define('PACKAGING_PERCENTAGE_BYBASICVALUE',                            		'(Packagingvalue/100) * basicValue');
-define('PACKAGING_LUMPSUM_BYDISCOUNTVALUE',             		'Packagingvalue');
-define('PACKAGING_LUMPSUM_BYBASICVALUE',                            		'Packagingvalue');
-//Excise
-define('EXCISE_ONBASICVALUE',                            		'((ExciseDuty/100) * basicValue)');
-define('EXCISE_ONBASIC_DISCOUNT',                            		'((ExciseDuty/100) * (basicValue-AfterDiscount))');
-define('EXCISE_ONBASIC_DISCOUNT_PACKAGING',                      '((ExciseDuty/100) * ((basicValue-AfterDiscount)+ AfterPackaging))');
-define('EXCISE_ONBASIC_PACKAGING',                            		'((ExciseDuty/100) * (basicValue + AfterPackaging))');
-
-
-//Vat
-define('VAT_ONBASICVALUE',                            		'((vatValue/100) * basicValue)');
-//define('VAT_ONEXICSEVALUE',                            		'((vatValue/100) * (basicValue+ExciseDuty))');
-define('VAT_ONEXICSEVALUE',                            		'(((basicValue - discountValue) + (packageValue + ExciseDuty)) * (vatValue/100))');
-
-//CST
-define('CST_ONBASICVALUE',                            		'((CSTValue/100) * basicValue)');
-//define('CST_ONEXICSEVALUE',                            		'((CSTValue/100) * (basicValue+ExciseDuty))');
-define('CST_ONEXICSEVALUE',                            		'(((basicValue - discountValue) + (packageValue + ExciseDuty)) * (CSTValue/100))');
-//GST
-define('GSTTAX',                            				'((GSTValue/100) * basicValue)');
-//Other Tax
-define('OTHERTAX',                            				'((OtherTaxValue/100) * basicValue)');
-//Freight Tax
-define('FREIGHT_PERCENTAGE',                            			'((FreightValue/100) * basicValue)');
-define('FREIGHT_LUMPSUM',                            				'FreightValue');
-define('FREIGHT_PERUOM',                            				'FreightValue * Quantity');
-define('FREIGHT_PERTRIP',                            				'FreightValue');
-
-/*           SERVICE PO VARIABLES    */
-define('SERVICETAX_SERVICETAX_14PERCENT',                            			'((14/100) * basicValue)');
-define('SERVICETAX_EDUCESS_2PERCENT',                            			'((2/100) * ServiceTaxAmount)');
-define('SERVICETAX_HIGHEREDUCESS_1PERCENT',                            			'((1/100) * ServiceTaxAmount)');
-define('SERVICETAX_KRISHIKALYAN',                            			'(((.5)/100) * basicValue)');
-define('SERVICETAX_SWACHHBHARAT',                            			'(((.5)/100) * basicValue)');
-
-/*IMPORT PO CALCULATIONS*/
-
-
-define('LOADING_CHARGE',                                            '(txtlanding*txtbasicprice/100)');
-define('HIGHSEAS_SALES',                                  '(totalhighsess*highsesspercentage/100)');
-define('CUSTOM_DUTY',                                     '(sumcustom*txtcustompercentage)/100');
-define('EXCISE_DUTY',                                      '(txtexcisesum*txtpercentage)/100');
-define('EXCISE_ED',                                        '(txtexcise*txtexcisepercentage)/100');
-define('EXCISE_SH',                                        '(excisetxt*exciseshcess)/100');
-define('CUSTOM_ED',                                        '(totalval*txtedcesspercentage)/100');
-define('CUSTOM_SH',                                        '(totcustomsh*txtshpercentage)/100');
-define('ADDTNL_EXCISEDUTY',                                '(totaddtnlexcise*addtnpercentage)/100');
-define('GROSS_EXP',                                        '(txtgrossdutypayable-txtmodvat)');
-define('AVL_MODVAT',                'txtexciseduty1+txtexciseedcess+txtexciseshcess+txtaddtnlexcise');
-define('GROSS_DUTY',   'landingcha+highsesssalless+customcha+excisecha+exciseedcha+exciseshcha+customed+customsh+txtaddtnexciseduty');
-define('PURCHASE_RATE',                                    'txtbasicinrprice/quantity');
-define('CUSTOMDUTY_EXP',                                   'txtgrossexp/quantity');
-define('RMC_CAL',                                          'txtpurchaserate+txtcustomdutyexp');
-define('CALCULATE_TOTAL',                                  '(txtrmc*quantity)+basicprice');
-/* Capital Po Calculations */
-define('Capital_Landing_Charge',                                            'basicPrice*(landCharge/100)');
-define('Capital_Highseas_Charge',                                            '((highSeas/100) * (basicPrice+afterLandingCharge))');
-define('Capital_Customduty_Charge',                                            '((Customduty/100) * (basicPrice+afterLandingCharge+afterHighseas))');
-define('Capital_Excise_Charge',                                            '((Excise/100) * (basicPrice+afterLandingCharge+afterHighseas+afterCustomduty))');
-define('Capital_ExciseEDcess_Charge',                                            '(ExciseEDcessCharge/100) * ExciseDuty');
-define('Capital_ExciseSHcess_Charge',                                            '(ExciseSHcessCharge/100) * ExciseDuty');
-define('Capital_CustomEDcess_Charge',                                            '((CustomEDcess/100) * (afterLandingCharge+AfterHighseas+AfterCustomduty+AfterExcisedutyTax+AfterExcisedutyEDcess+AfterExcisedutySHcess))');
-define('Capital_CustomSHcess_Charge',                                            '((CustomSHcess/100) * (afterLandingCharge+AfterHighseas+AfterCustomduty+AfterExcisedutyTax+AfterExcisedutyEDcess+AfterExcisedutySHcess))');
-define('Capital_AdditionalExciseduty_Charge',                                            '((AdditionalExciseduty/100) * (basicPrices+afterLandingCharge+AfterHighseas+AfterCustomduty+AfterExcisedutyTax+AfterExcisedutyEDcess+AfterExcisedutySHcess+AfterCustomEDcess+AfterCustomSHcess))');
-
-define('Capital_Grossdutypayable_Charge',                                            '(AfterAdditionalExciseduty+afterLandingCharge+AfterHighseas+AfterCustomduty+AfterExcisedutyTax+AfterExcisedutyEDcess+AfterExcisedutySHcess+AfterCustomEDcess+AfterCustomSHcess)');
-define('Capital_ModvatCharge_Charge',                                            '(AfterExcisedutyTax+AfterExcisedutyEDcess+AfterExcisedutySHcess+AfterAdditionalExciseduty)');
-
-define('Capital_Grossexpenses_Charge',                                            '(Grossdutypayable-AvailableModvat)');
-define('Capital_purchaserate_Charge',                                            '(AfterBasicPriceTax/PurQuantity)');
-define('Capital_CustomDutyExpenses_Charge',                                            '(Grossexpenses/PurQuantity)');
-define('Capital_RMCIncludingCustomers_Charge',                                            '(purchaserate+CustomDutyExpenses)');
-/* calculate cgst sgst igst calculations for service tax*/
-define('SERVICETAX_CGST',                                            '((Cgst/100) * basicValue)');
-define('SERVICETAX_SGST',                                            '((Sgst/100) * basicValue)');
-
-define('SERVICETAX_IGST',                                            '((Igst/100) * basicValue)');
-
-
-/* End of file constants.php */
-/* Location: ./application/config/constants.php */
diff --git a/application/config/routes.php b/application/config/routes.php
index 6d73eb5e..588d97a8 100644
--- a/application/config/routes.php
+++ b/application/config/routes.php
@@ -112,24 +112,24 @@ $route['editUser'] = "user/editUser";
 $route['editOldPO'] = "purchaseorder/editOldPO";
 $route['editOldPO/(:num)'] = "purchaseorder/editOldPO/$1";
 //$route['editPO'] = "purchaseorder/editPO";
-$route['editOldsupplier'] = "supplier/editOldsupplier";
-$route['editOldsupplier/(:num)'] = "supplier/editOldsupplier/$1";
+//$route['editOldsupplier'] = "supplier/editOldsupplier";
+//$route['editOldsupplier/(:num)'] = "supplier/editOldsupplier/$1";
 $route['editsupplier'] = "supplier/editsupplier";
 
 $route['editOldcost'] = "CostCenter/editOldcost";
 $route['editOldcost/(:num)'] = "CostCenter/editOldcost/$1";
 $route['editcost'] = "CostCenter/editcost";
 
-$route['editOldasset'] = "assetdetails/editOldasset";
-$route['editOldasset/(:num)'] = "assetdetails/editOldasset/$1";
+$route['editOldasset'] = "assetdetails/editasset";
+$route['editOldasset/(:num)'] = "assetdetails/editasset/$1";
 $route['editasset'] = "assetdetails/editasset";
 
-$route['editOldemployee'] = "employeedetails/editOldemployee";
-$route['editOldemployee/(:num)'] = "employeedetails/editOldemployee/$1";
-$route['editemployee'] = "employeedetils/editemployee";
+//$route['editOldemployee'] = "employeedetails/editOldemployee";
+//$route['editOldemployee/(:num)'] = "employeedetails/editOldemployee/$1";
+$route['editemployee'] = "employeedetails/ViewEmployee";
 
-$route['editOldRawmaterial/(:num)'] = "rawmaterialdetails/editOldRawmaterial/$1";
-$route['editOldRawmaterial'] = "rawmaterialdetails/editOldRawmaterial";
+$route['editRawmaterial/(:num)'] = "rawmaterialdetails/editRawmaterial/$1";
+$route['editRawmaterial'] = "rawmaterialdetails/editRawmaterial";
 $route['editrawmaterial'] = "rawmaterialdetails/editemployee";
 
 //<-----------Application Delete Routes------------>
diff --git a/application/controllers/CostCenter.php b/application/controllers/CostCenter.php
index 5343dbde..b8488036 100644
--- a/application/controllers/CostCenter.php
+++ b/application/controllers/CostCenter.php
@@ -3,11 +3,11 @@
 require APPPATH . '/libraries/BaseController.php';
 
 /**
- * Class : Cost Center (Cost Center Controller)
+ * Class : CostCenter (Cost Center Details - Controller)
  * User Class to control all user related operations.
- * @author : VenbaMail Mali
+ * @author : Venba Info Tech -
  * @version : 1.1
- * @since : 15 Feb 2016
+ * @since : 18 November 2017
  */
 class CostCenter extends BaseController
 {
@@ -29,7 +29,7 @@ class CostCenter extends BaseController
      */
 	public function index()
     {
-        $this->global['pageTitle'] = 'Siddharth : Cost';
+        $this->global['pageTitle'] = 'Resico : Cost Details';
         
         $this->loadViews("costListing", $this->global, NULL , NULL);
     }
@@ -44,7 +44,7 @@ class CostCenter extends BaseController
             $data['userRecords'] = $this->costcenter_model->CostListing();
 			
 			       
-            $this->global['pageTitle'] = 'Siddharth : Cost List';
+            $this->global['pageTitle'] = 'Resico : Cost List';
             
             $this->loadViews("costListing", $this->global, $data, NULL);
         
@@ -63,7 +63,7 @@ class CostCenter extends BaseController
 
             $data['FiscalYear'] =  	$this->costcenter_model->getFiscalYear();		
             
-            $this->global['pageTitle'] = 'siddharth : Add Cost Center';
+            $this->global['pageTitle'] = 'Resico : Add Cost Center';
 
             $this->loadViews("addCostCenter", $this->global,$data,  NULL);
         
@@ -175,9 +175,9 @@ class CostCenter extends BaseController
 			 $data['FiscalYear'] =  	$this->costcenter_model->getFiscalYear();
             //print_r(count($data['BudType']));
             
-            $this->global['pageTitle'] = 'Siddharth : Edit Cost';
+            $this->global['pageTitle'] = 'Resico : Edit Cost';
             
-            $this->loadViews("editOldcost", $this->global, $data,NULL);
+            $this->loadViews("editCostCenter", $this->global, $data,NULL);
         
     }
 	
@@ -417,7 +417,7 @@ class CostCenter extends BaseController
             $data['Cost'] = $this->costcenter_model->getuserinfo($CostCenterID);
             //$data['users'] = $this->purchaseorder_model->getusers();
             
-            $this->global['pageTitle'] = 'Siddharth : View Cost';
+            $this->global['pageTitle'] = 'Resico : View Cost Details';
             
             $this->loadViews("viewcost", $this->global, $data,NULL);
         
@@ -457,7 +457,7 @@ class CostCenter extends BaseController
         $this->excel->getActiveSheet()->setTitle('Cost Master');									
 
 
-        $this->excel->getActiveSheet()->setCellValue('G3', 'SIDDHARTH INDUSTRIES Cost Master');
+        $this->excel->getActiveSheet()->setCellValue('G3', 'RESICO INDUSTRIES Cost Master');
        $this->excel->getActiveSheet()->setCellValue('B5', 'S.No');
 	   $this->excel->getActiveSheet()->setCellValue('C5', 'CostCenterCode');
         $this->excel->getActiveSheet()->setCellValue('D5', 'CostCenterName');
@@ -561,7 +561,7 @@ class CostCenter extends BaseController
     
     function pageNotFound()
     {
-        $this->global['pageTitle'] = 'CodeInsect : 404 - Page Not Found';
+        $this->global['pageTitle'] = 'Resico : 404 - Page Not Found';
         
         $this->loadViews("404", $this->global, NULL, NULL);
     }
diff --git a/application/controllers/MRIRcontroller.php b/application/controllers/MRIRcontroller.php
index 3bf6a016..f13386b9 100644
--- a/application/controllers/MRIRcontroller.php
+++ b/application/controllers/MRIRcontroller.php
@@ -3,11 +3,11 @@
 require APPPATH . '/libraries/BaseController.php';
 
 /**
- * Class :  Inward Gate Register Controller (security)
+ * Class : MRIRcontroller (Material Inspection Report - Controller)
  * User Class to control all user related operations.
- * @author : Saravana kumar
+ * @author : Venba Info Tech - Saravana kumar
  * @version : 1.1
- * @since : 10 Jun 2017
+ * @since : 18 Novmeber 2017
  */
 class MRIRcontroller extends BaseController
 {
@@ -29,14 +29,14 @@ class MRIRcontroller extends BaseController
      */
 	public function index()
     {
-        $this->global['pageTitle'] = 'Siddharth : View  material inspection report';
+        $this->global['pageTitle'] = 'Resico : View  material inspection report';
         
         $this->loadViews("viewmaterialinspectionreport", $this->global,NULL , NULL);
     }
      /* For Entry MRIR Screen*/
     function materialinspectionreport($mrir='',$IGRNO='')
     {
-        $this->global['pageTitle'] = 'Siddharth : Material Inspection Report';
+        $this->global['pageTitle'] = 'Resico : Material Inspection Report';
         
         $this->load->model('mrir_model');
                         
@@ -50,7 +50,7 @@ class MRIRcontroller extends BaseController
         $MrirNo =  $_GET['MRIRNO'];
        // echo $MrirNo;
 
-        $this->global['pageTitle'] = 'Siddharth : MRIR Pdf ';
+        $this->global['pageTitle'] = 'Resico : MRIR Pdf ';
         $data['CompanyDetails'] =  $this->purchaseorder_model->getCompanyInformation();
         //print_r($data['CompanyDetails']);
         $data['MRIRDetails'] = $this->mrir_model->edit_mrir($MrirNo);
@@ -77,7 +77,7 @@ class MRIRcontroller extends BaseController
     
 	public function viewmrirforbilling()
     {
-        $this->global['pageTitle'] = 'Siddharth : Billing ';
+        $this->global['pageTitle'] = 'Resico : Billing ';
 		  $data['Billing'] = $this->mrir_model->view_mrir_Billing(); 
 		
      
@@ -85,7 +85,7 @@ class MRIRcontroller extends BaseController
     }
 public function viewmMaterialDistributionList()
     {
-        $this->global['pageTitle'] = 'Siddharth : Distribution list ';
+        $this->global['pageTitle'] = 'Resico : Distribution list ';
       
 	    $data['Distribution'] = $this->mrir_model->ViewDistributionList(); 
 		$data['status']   = $this->mrir_model->getStatus(); 
@@ -102,7 +102,7 @@ public function viewmMaterialDistributionList()
 
             $data['IGRDetails'] = $this->mrir_model->get_IGR($IgrNo);
            
-            $this->global['pageTitle'] = 'Siddharth : IGR Details ';
+            $this->global['pageTitle'] = 'Resico: IGR Details ';
             
             $this->loadViews("materialinspectionreport", $this->global, $data,NULL);
 
@@ -110,7 +110,7 @@ public function viewmMaterialDistributionList()
 	function viewinwardgateregister()
 	{
 		
-		$this->global['pageTitle'] = 'Siddharth : View Inward Gate Register';
+		$this->global['pageTitle'] = 'Resico : View Inward Gate Register';
 		
 		$data['IGR']= $this->mrir_model->ViewigrListing();
 		
@@ -126,7 +126,7 @@ public function viewmMaterialDistributionList()
                
             $data['viewmrirdatas'] = $this->mrir_model-> view_mrir();
             //old name:mrirdatas2
-            $this->global['pageTitle'] = 'Siddharth : View Material Inspection Report';
+            $this->global['pageTitle'] = 'Resico : View Material Inspection Report';
             //print_r( $data);
             $this->loadViews("viewmaterialinspectionreport", $this->global,$data,NULL);
     
@@ -143,7 +143,7 @@ public function viewmMaterialDistributionList()
         $data['MRIRDetails'] = $this->mrir_model->edit_mrir($MrirNo);//get_MRIR_Values($MrirNo);
         //print_r($data['MRIRDetails']);
 
-        $this->global['pageTitle'] = 'Siddharth : Edit Material Inspection Report';       
+        $this->global['pageTitle'] = 'Resico : Edit Material Inspection Report';       
 
         $this->loadViews("Editmaterialinspectionreport", $this->global,$data,NULL);
         
@@ -375,7 +375,7 @@ public function viewmMaterialDistributionList()
              
     function pageNotFound()
     {
-        $this->global['pageTitle'] = 'Siddharth : 404 - Page Not Found';
+        $this->global['pageTitle'] = 'Resico : 404 - Page Not Found';
         $this->loadViews("404", $this->global, NULL, NULL);
     }
 }
diff --git a/application/controllers/amendmentpurchaseorder.php b/application/controllers/amendmentpurchaseorder.php
index 6871213b..e365d280 100644
--- a/application/controllers/amendmentpurchaseorder.php
+++ b/application/controllers/amendmentpurchaseorder.php
@@ -5,9 +5,9 @@ require APPPATH . '/libraries/BaseController.php';
 /**
  * Class : Amendment Purchase Order controller
  * User Class to control all user related operations.
- * @author : Velmurugan
+ * @author : Venba Info Tech - Velmurugan
  * @version : 1.1
- * @since : 10 Jul 2017
+ * @since : 18 November 2017
  */
 class amendmentpurchaseorder extends BaseController
 {
@@ -36,7 +36,7 @@ class amendmentpurchaseorder extends BaseController
           		
 			$forwhat='amendment';
 			$data['POData'] =  $this->purchaseorder_model->purchaseorderListing($forwhat);	
-            $this->global['pageTitle'] = 'Siddharth : Amendment Purchase Order';
+            $this->global['pageTitle'] = 'Resico : Amendment Purchase Order';
 		    $this->loadviews('AmendPOlist',$this->global,$data,NULL);  
     }
 	
@@ -115,7 +115,7 @@ class amendmentpurchaseorder extends BaseController
 				$data['POItem'] = $this->purchaseorder_model->GetServicePurchaseOrderDetails($PONO);
 				$data['PaymentTerms']=$this->purchaseorder_model->GetPaymentTerms($PONO);
 				$data['WorkStatus']=$this->purchaseorder_model->getStatus(7);
-                $this->global['pageTitle'] = 'Siddharth : Edit Service Purchase order form';			  
+                $this->global['pageTitle'] = 'Resico : Edit Service Purchase order form';			  
 				$this->loadViews("editServiceAmendPO", $this->global,  $data, NULL);	
 			  }
 				else if($ReqType == REVENUE)
@@ -126,7 +126,7 @@ class amendmentpurchaseorder extends BaseController
 				$data['PaymentTerms']=$this->purchaseorder_model->GetPaymentTerms($PONO);
 				//echo "FROM CON";
 				//print_r($data['Payment']);
-                $this->global['pageTitle'] = 'Siddharth : Edit Revenue Purchase order form';			  
+                $this->global['pageTitle'] = 'Resico : Edit Revenue Purchase order form';			  
 				$this->loadViews("editRevenueAmendPO", $this->global,  $data, NULL);	
 				}
 
@@ -173,7 +173,7 @@ class amendmentpurchaseorder extends BaseController
                //print_r($unicode);
                 $data['unicode']=$unicode;
                 $data['currencycode']=$currencycode;
-                $this->global['pageTitle'] = 'Siddharth : Edit Import Purchase order form';
+                $this->global['pageTitle'] = 'Resico : Edit Import Purchase order form';
                 $this->loadViews("editImportAmendPO", $this->global,  $data, NULL);      
                 }
 				else if($ReqType == CAPITAL)
@@ -246,7 +246,7 @@ class amendmentpurchaseorder extends BaseController
                        }
                
               
-                        $this->global['pageTitle'] = 'Siddharth : Edit Capital Purchase order form';
+                        $this->global['pageTitle'] = 'Resico : Edit Capital Purchase order form';
                          $this->loadViews("editCapitalAmendPO", $this->global,  $data, NULL);      
                          }
 		
diff --git a/application/controllers/assetdetails.php b/application/controllers/assetdetails.php
index d0efb6f2..e39cddae 100644
--- a/application/controllers/assetdetails.php
+++ b/application/controllers/assetdetails.php
@@ -3,11 +3,11 @@
 require APPPATH . '/libraries/BaseController.php';
 
 /**
- * Class : purchaseorder (PurchaseorderController)
+ * Class : assetdetails (Asset Details - Controller)
  * User Class to control all user related operations.
- * @author : VenbaMail Mali
+ * @author : Venba Info Tech
  * @version : 1.1
- * @since : 15 Feb 2016
+ * @since : 18 November 2017
  */
 class assetdetails extends BaseController
 {
@@ -26,7 +26,7 @@ class assetdetails extends BaseController
      */
 	public function index()
     {
-        $this->global['pageTitle'] = 'Siddharth : Asset Details';
+        $this->global['pageTitle'] = 'Resico : Asset Details';
         
         $this->loadViews("assetListing", $this->global, NULL , NULL);
     }
@@ -41,7 +41,7 @@ class assetdetails extends BaseController
 
             $data['userRecords'] = $this->assetdetails_model->assetListing();
             
-            $this->global['pageTitle'] = 'Siddharth : Asset List';
+            $this->global['pageTitle'] = 'Resico : Asset List';
             //print_r($data);die();
             $this->loadViews("assetListing", $this->global, $data, NULL);
         
@@ -56,7 +56,7 @@ class assetdetails extends BaseController
 			$data['po'] = $this->assetdetails_model->getPO();  
 			
             //print_r($data);die();
-            $this->global['pageTitle'] = 'siddharth : Add Asset';
+            $this->global['pageTitle'] = 'Resico : Add Asset';
 		
             $this->loadViews("addasset", $this->global, $data, NULL);
         
@@ -301,9 +301,9 @@ class assetdetails extends BaseController
 			$data['AssetStatusList'] = $this->assetdetails_model->getConfigValue('C015');  			
             $data['PO'] = $this->assetdetails_model->getPO($PO);
 			//print_r($data);die();
-			$this->global['pageTitle'] = 'Siddharth : Edit Asset';
+			$this->global['pageTitle'] = 'Resico : Edit Asset';
             
-            $this->loadViews("editOldasset", $this->global, $data,NULL);
+            $this->loadViews("editasset", $this->global, $data,NULL);
         
     }
     
@@ -435,7 +435,7 @@ class assetdetails extends BaseController
 
         $this->excel->getActiveSheet()->setTitle('Asset Details');
 
-        $this->excel->getActiveSheet()->setCellValue('G3', 'SIDDHARTH INDUSTRIES Asset Details');
+        $this->excel->getActiveSheet()->setCellValue('G3', 'RESICO INDUSTRIES Asset Details');
         $this->excel->getActiveSheet()->setCellValue('C5', 'AssetCode');
         $this->excel->getActiveSheet()->setCellValue('D5', 'AssetName');
         $this->excel->getActiveSheet()->setCellValue('E5', 'AssetDescription');
@@ -552,7 +552,7 @@ class assetdetails extends BaseController
    
     function pageNotFound()
     {
-        $this->global['pageTitle'] = 'CodeInsect : 404 - Page Not Found';
+        $this->global['pageTitle'] = 'Resico : 404 - Page Not Found';
         
         $this->loadViews("404", $this->global, NULL, NULL);
     }
diff --git a/application/controllers/companycontroller.php b/application/controllers/companycontroller.php
index d8d33452..e2d0e793 100644
--- a/application/controllers/companycontroller.php
+++ b/application/controllers/companycontroller.php
@@ -3,11 +3,11 @@
 require APPPATH . '/libraries/BaseController.php';
 
 /**
- * Class : Employee  (Employee Controller)
+ * Class : companycontroller (Company Details - Controller)
  * User Class to control all user related operations.
- * @author : Gandhimathi
+ * @author :Venba Info Tech - Gandhimathi
  * @version : 1.1
- * @since : 07 Apr 2017
+ * @since : 18 November 2017
  */
 class companycontroller extends BaseController
 {
diff --git a/application/controllers/configurationctrl.php b/application/controllers/configurationctrl.php
index f683bac6..cca4b419 100644
--- a/application/controllers/configurationctrl.php
+++ b/application/controllers/configurationctrl.php
@@ -3,11 +3,11 @@
 require APPPATH . '/libraries/BaseController.php';
 
 /**
- * Class : Supplier Controller (supplier)
+ * Class : configurationctrl (Configuration Details - Controller)
  * User Class to control all user related operations.
- * @author : Surendar
+ * @author :Venba Info Tech - Surendar
  * @version : 1.1
- * @since : 26 July 2017
+ * @since : 18 November 2017
  */
 class configurationctrl extends BaseController
 {
@@ -27,7 +27,7 @@ class configurationctrl extends BaseController
 public function index()
     {
 		 
-       $this->global['pageTitle'] = 'Resico : Supplier';
+       $this->global['pageTitle'] = 'Resico : Config Details';
         
         $this->loadViews("configlisting", $this->global, NULL , NULL);
     }
diff --git a/application/controllers/department.php b/application/controllers/department.php
index b56e7ba0..137da1d8 100644
--- a/application/controllers/department.php
+++ b/application/controllers/department.php
@@ -3,11 +3,11 @@
 require APPPATH . '/libraries/BaseController.php';
 
 /**
- * Class : Supplier Controller (supplier)
+ * Class : department (Department Details - Controller)
  * User Class to control all user related operations.
- * @author : Gandhimathi
+ * @author : Venba Info Tech - Gandhimathi
  * @version : 1.1
- * @since : 12 Apr 2017
+ * @since : 18 November 2017
  */
 class department extends BaseController
 {
diff --git a/application/controllers/emergencypurchaseorder.php b/application/controllers/emergencypurchaseorder.php
index 334a5a14..b9129210 100644
--- a/application/controllers/emergencypurchaseorder.php
+++ b/application/controllers/emergencypurchaseorder.php
@@ -3,11 +3,11 @@
 require APPPATH . '/libraries/BaseController.php';
 
 /**
- * Class : purchaseorder (PurchaseorderController)
+ * Class : emergencypurchaseorder (Emergency Purchase Order - Controller)
  * User Class to control all user related operations.
- * @author : VenbaMail Mali
+ * @author : Venba Info Tech -
  * @version : 1.1
- * @since : 15 Feb 2016
+ * @since : 18 November 2017
  */
 class emergencypurchaseorder extends BaseController
 {
@@ -30,7 +30,7 @@ class emergencypurchaseorder extends BaseController
      */
     public function index()
     {
-        $this->global['pageTitle'] = 'Siddharth : AddPO';
+        $this->global['pageTitle'] = 'Resico : 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'] = 'Siddharth : Create PO from Requisition List';
+        $this->global['pageTitle'] = 'Resico : Create PO from Requisition List';
 
         $this->loadViews("createPOfromRequistion", $this->global,  $data,Null);
     }
@@ -50,7 +50,7 @@ class emergencypurchaseorder extends BaseController
     function CreateEmergencyPO()
     {
         $RequestedBy = $this->session->userdata ('EmpID');
-        $this->global['pageTitle'] = 'Siddharth : Create Emergency Purchase Order';
+        $this->global['pageTitle'] = 'Resico : Create Emergency Purchase Order';
         $data['RequestType'] = $this->requistion_model->getConfigValue('C004');
         $data['Suplist'] = $this->purchaseorder_model->getSupplierName();
         $data['INRSYMBOL']=$this->purchaseorder_model->GetINRCurrencytype('INR');
@@ -447,7 +447,7 @@ $RequestedBy = $this->input->post('drpDepartment');
         $this->purchaseorder_model->UpdateRequistionStatus();
         $data['POData'] =  $this->purchaseorder_model->purchaseorderListing();
 
-        $this->global['pageTitle'] = 'Siddharth : Purchase Orders';
+        $this->global['pageTitle'] = 'Resico : Purchase Orders';
 
         $this->loadViews("POlist", $this->global, $data, NULL);
 
@@ -487,7 +487,7 @@ $RequestedBy = $this->input->post('drpDepartment');
         else
         {
 
-            $this->global['pageTitle'] = 'Siddharth : Purchase order form';
+            $this->global['pageTitle'] = 'Resico : Purchase order form';
             $data['TaxType'] = $this->purchaseorder_model->getConfigValue('C006');
             $data['FreightType'] = $this->purchaseorder_model->getConfigValue('C018');
             $data['Suplist'] = $this->purchaseorder_model->getSupplierName();
@@ -571,14 +571,14 @@ $RequestedBy = $this->input->post('drpDepartment');
         {
 
             $data['POItem'] = $this->purchaseorder_model->GetServicePurchaseOrderDetails($PONO);
-            $this->global['pageTitle'] = 'Siddharth : Edit Service Purchase order form';
+            $this->global['pageTitle'] = 'Resico : Edit Service Purchase order form';
             $this->loadViews("EditservicePurchaseorder", $this->global,  $data, NULL);
         }
         else if($ReqType == REVENUE)
         {
 
             $data['POItem'] = $this->purchaseorder_model->GetRevenuePurchaseOrderDetails($PONO);
-            $this->global['pageTitle'] = 'Siddharth : Edit Revenue Purchase order form';
+            $this->global['pageTitle'] = 'Resico : Edit Revenue Purchase order form';
             $this->loadViews("editRevenuepurchaseorder", $this->global,  $data, NULL);
         }
 
@@ -1036,7 +1036,7 @@ $RequestedBy = $this->input->post('drpDepartment');
     }
     function pageNotFound()
     {
-        $this->global['pageTitle'] = 'CodeInsect : 404 - Page Not Found';
+        $this->global['pageTitle'] = 'Resico : 404 - Page Not Found';
 
         $this->loadViews("404", $this->global, NULL, NULL);
     }
diff --git a/application/controllers/emergencypurchaseorder.php~ b/application/controllers/emergencypurchaseorder.php~
deleted file mode 100644
index 1f17f873..00000000
--- a/application/controllers/emergencypurchaseorder.php~
+++ /dev/null
@@ -1,1110 +0,0 @@
-<?php if(!defined('BASEPATH')) exit('No direct script access allowed');
-
-require APPPATH . '/libraries/BaseController.php';
-
-/**
- * Class : purchaseorder (PurchaseorderController)
- * User Class to control all user related operations.
- * @author : VenbaMail Mali
- * @version : 1.1
- * @since : 15 Feb 2016
- */
-class emergencypurchaseorder extends BaseController
-{
-    /**
-     * This is default constructor of the class
-     */
-    public function __construct()
-    {
-        parent::__construct();
-        $this->load->model('purchaseorder_model');
-
-        $this->load->library('session');
-        $this->load->library('form_validation');
-        $this->load->model('requistion_model');
-        $this->isLoggedIn();
-    }
-
-    /**
-     * This function used to load the first screen of the user
-     */
-    public function index()
-    {
-        $this->global['pageTitle'] = 'Siddharth : AddPO';
-
-        $this->loadViews("addPO", $this->global, NULL , NULL);
-    }
-
-    function requisition()
-    {
-        $data['DeptList'] = $this->purchaseorder_model->getDepartmentListForAllReq();
-
-        $data['stList'] = $this->purchaseorder_model->getStatusListforAllReq();
-
-        $data['ReqList'] =  $this->purchaseorder_model->getRequistionListbySearch();
-        $this->global['pageTitle'] = 'Siddharth : Create PO from Requisition List';
-
-        $this->loadViews("createPOfromRequistion", $this->global,  $data,Null);
-    }
-
-    function CreateEmergencyPO()
-    {
-        $RequestedBy = $this->session->userdata ('EmpID');
-        $this->global['pageTitle'] = 'Siddharth : Create Emergency Purchase Order';
-        $data['RequestType'] = $this->requistion_model->getConfigValue('C004');
-        $data['Suplist'] = $this->purchaseorder_model->getSupplierName();
-        $data['INRSYMBOL']=$this->purchaseorder_model->GetINRCurrencytype('INR');
-        /*$data['DeptList'] = $this->purchaseorder_model->getDepartmentAllList();*/
-                 $empDetails = $this->requistion_model->GetEmployeeDetails($RequestedBy);
-                 
-                     $DeptCode =  $empDetails[0]['DEPCode'];
-                     $data['DeptList'] = $empDetails;
-		  $data['CostList'] = $this->requistion_model->GetCostCenterByDept( $DeptCode);
-                 
-        $data['CompanyDetails'] =  $this->purchaseorder_model->getCompanyInformation();
-        $data['MaxPODate'] =  $this->purchaseorder_model->getLastCreatedPODate();
-        $data['TaxType'] = $this->purchaseorder_model->getConfigValue('C006'); 
-			$data['FreightType'] = $this->purchaseorder_model->getConfigValue('C018'); 
-			$data['Payment']=$this->purchaseorder_model->getSupplierPayment('C009');
-			$data['WorkStatus']=$this->purchaseorder_model->GetWorkStatus('C019');
-
-        $this->loadViews("alterpurchaseorder", $this->global, $data,  Null);
-
-    }
-    /**
-     * this function used for get all material code  using request type
-     */
-    function getMaterialCode(){
-        $reqType =  $this->input->post('input');
-        $materialList = $this->requistion_model->GetMaterialCode($reqType);
-        echo json_encode($materialList);
-
-    }
-
-    /*This function is used for get cost center list using department code*/
-    function getCostCenterName(){
-        $CostList='';
-        $DeptCode =  $this->input->post('id');
-        $CostList = $this->requistion_model->GetCostCenterByDept($DeptCode);
-        // print_r($CostList);
-        echo json_encode($CostList);
-
-    }
-
-    //This used to Create Service Purchase Order
-    function addNewServicePurchaseOrder()
-    {
-    
-    	
-        $POdt =$this->input->post('PODate');
-        $PODate =  $this->getDateformat($POdt);
-        $SupplierID = $this->input->post('drpSupplier');
-        $DeliveryAddr = $this->input->post('DeliveryAddr');
-        $dt = $this->input->post('Deliverydt');
-        $CostCenterName = $this->input->post('CostCenterName');
-        $DeliveryOption = $this->input->post('DateRange');
-        if($DeliveryOption==1){
-         $Deliverydt = '';
-        $DeliverySchedule = $this->input->post('Scheduleby');
-        }
-         else{
-         $Deliverydt = $this->getDateformat($dt);
-        $DeliverySchedule = '';
-        }
-       
-        
-        $POType = $this->input->post('POType');
-       
-        $SpcialInstruction = $this->input->post('TextSpcialInstruction');
-        $TotalOrderValueSummary = $this->input->post('TextTotalOrderValueSummaryService');
-
-        $POStatus = $this->input->post('TextStatus');
-        $CreateBy = $this->session->userdata ('userId');
-        $RequestedBy = $this->session->userdata ('EmpID');
-
-       $ReqStatus =  REQITEM_Emergency_PO_CREATED;
-     
-        $RowCount =  $this->input->post('TextRowCount');
-
-        $DeletedRow =  $this->input->post('TextDeletedRowCount');
-
-        $comma_separated = explode(':', $DeletedRow);
-
-        $dt = new DateTime('now', new DateTimeZone('Asia/Kolkata'));
-
-        $createddt =  $dt->format('Y-m-d H:i:s');
-        $PaymentTerms=$this->input->post('PaymentMethod');
-    $PayableAT=$this->input->post('PayableAT');
-    
-    $PaymentDays=$this->input->post('paymentDateOptions');
-     $ServiceWorkStatus=$this->input->post('workStatus');
-
-        
-
-        //create T_Requestion_Master
-       	$Request = array('ReqType'=>$POType, 'Requestedby'=>$RequestedBy,'CostCenterCode'=>$CostCenterName,'Status'=>$ReqStatus,'Comments'=>$SpcialInstruction,'ReqDate'=>$createddt,'CreatedDate'=>$createddt,'CreatedBy'=>$CreateBy);
-			
-					$Req  = $this->requistion_model->addRequistion($Request);
-			
-					$RegNo='';
-					 if(count($Req)>0)
-        {
-            $RegNo =  $Req[0]['ReqNo'];
-        }
-      
-       
-        // PO Master
-        $POList = array('SupplierID'=>$SupplierID, 'TotalOrderValue'=>$TotalOrderValueSummary,'PODate'=>$PODate,'Status'=>$POStatus,'DeliverySchedule'=>$DeliverySchedule,'DeliveryOption'=>$DeliveryOption,'ServiceDescription'=>$SpcialInstruction,'CreatedBy'=>$CreateBy,'DeliveryAddress'=>$DeliveryAddr,'DeliveryDate'=>$Deliverydt,'CreatedDate'=>$createddt,'PaymentTerms'=>$PaymentTerms,'PaymentDays'=>$PaymentDays,'PayableAT'=>$PayableAT,'ServiceWorkStatus'=>$ServiceWorkStatus,'POType'=>$POType);
-
-        $POMaster  = $this->purchaseorder_model->addPOMaster($POList);
-        $PONO = '';
-        if(count($POMaster)>0)
-        {
-            $PONO =  $POMaster[0]['PONO'];
-        }
-        
-        $RegDetailsStatus=REQITEM_POCREATED;
-
-        // PO Line Items
-        $LineItemStatus = REQITEM_NEW;
-
-        for ($i = 1; $i <= $RowCount; $i++)
-        {
-        	
-            $MaterialCode = $this->input->post('materialCode'.$i);
-            $Quantity = $this->input->post('quantity'.$i);
-            $Reqnumber = $this->input->post('Reqnumber'.$i);
-            $itemRate = $this->input->post('itemRate'.$i);
-            $ServiceTax = $this->input->post('ServiceTax'.$i);
-            $EduCess = $this->input->post('EduCess'.$i);
-            $SecHighTax = $this->input->post('SecHighTax'.$i);
-            $KrishiTax = $this->input->post('KrishiTax'.$i);
-            $SwachhTax = $this->input->post('SwachhTax'.$i);
-            $CostCenter	= $this->input->post('costCode'.$i);
-
-            $TotalOrderValue = $this->input->post('TotalOrderValue'.$i);
-            $ServiceFrequency=$this->input->post('Frequency'.$i);
-            $SkipInsert = "False";
-            if( count($comma_separated) > 0)
-            {
-                for($j = 1; $j < count($comma_separated); $j++)
-                {
-                    $deletedRow = 	$comma_separated[$j];
-
-                    if($deletedRow == $i  )
-                    {
-                        $SkipInsert = "True";
-                        break;
-                    }
-
-                }
-            }
-            if($SkipInsert == "False")
-            {
-            
-            	//add requistion details
-            	$ReqDetails = array('ReqNo'=>$RegNo, 'MaterialCode'=>$MaterialCode,'Quantity'=>$Quantity,'Status'=>$RegDetailsStatus,'UpdatedBy'=>$CreateBy,'UpdatedOn'=>$createddt);
-								
-      					
-								$ReqDetQuery = $this->requistion_model->addRequistionDetails($ReqDetails);
-								
-							
-							
-                $POLineItemList = array('PONO'=>$PONO, 'ReqNo'=>$RegNo,'MaterialCode'=>$MaterialCode,'Quantity'=>$Quantity,'Rate'=>$itemRate,'Status'=>$LineItemStatus,'CreatedBy'=>$CreateBy,'CreatedDate'=>$createddt,'CostCenterCode'=>$CostCenter,'ServiceFrequency'=>$ServiceFrequency);
-                $POLineItem = $this->purchaseorder_model->addPOLineItem($POLineItemList);
-                $LineItemNo = '';
-                if(count($POLineItem)>0)
-                {
-                    $LineItemNo =  $POLineItem[0]['LineItemNo'];
-                }
-
-
-                if(trim($POType) == SERVICE )
-                {
-                  // echo 'Success';
-
-                    $ServiceTaxList = array('LineItemNo'=>$LineItemNo, 'ServiceTax'=>$ServiceTax,'EducessTax'=>$EduCess,'SecHigherEducessTax'=>$SecHighTax,'KrishiKalyantax'=>$KrishiTax,'SwachhBharattax'=>$SwachhTax,'TotalValue'=>$TotalOrderValue, 'CreatedBy'=>$CreateBy,'CreatedDate'=>$createddt);
-                      
-                    $ServiceTax = $this->purchaseorder_model->addServiceTax($ServiceTaxList);
-
-                }
-            }
-            else {
-
-            }
-
-        }
-
-        if($POStatus == REQ_DRAFT)
-					{
-					  echo 'Emergency Service Purchase Order Saved Successfully!The PO NO Is: '.$PONO;
-					 
-					}
-					else
-					{
-						echo 'Emergency Service Purchase Order Created Successfully!The PO NO Is: '.$PONO;
-					
-					}
-       
-
-    }
-    
-    
-     
-   //This used to Create Revenue Emergency Purchase Order
-	function addNewRevenuePurchaseOrder()
-	{
-		
-		
-				$POdt =$this->input->post('PODate');
-				$PODate =  $this->getDateformat($POdt);
-                $SupplierID = $this->input->post('drpSupplier');  
-				$DeliveryAddr = $this->input->post('DeliveryAddr');
-				$dt = $this->input->post('Deliverydt');
-				 $DeliveryOption = $this->input->post('DateRange');
-        if($DeliveryOption==1){
-         $Deliverydt = '';
-        $DeliverySchedule = $this->input->post('Scheduleby');
-        }
-         else{
-         $Deliverydt = $this->getDateformat($dt);
-        $DeliverySchedule = '';
-        }
-		$CostCenterName = $this->input->post('CostCenterName');
-				$POType = $this->input->post('POType');
-				$PoRange = $this->input->post('txtPoRange');
-				
-				$SpcialInstruction = $this->input->post('TextSpcialInstruction');
-				$TotalOrderValueSummary = $this->input->post('txtTotalOrderValueSummary');
-			    $POStatus = $this->input->post('TextStatus');
-
-                $CreateBy = $this->session->userdata ( 'userId' );
-				$RowCount =  $this->input->post('TextRowCount'); 
-				$DeletedRow =  $this->input->post('TextDeletedRowCount'); 
-				  $RequestedBy = $this->session->userdata ('EmpID');
-       $ReqStatus =  REQITEM_Emergency_PO_CREATED;
-     
-				
-				$comma_separated = explode(':', $DeletedRow);	
-				
-				$dt = new DateTime('now', new DateTimeZone('Asia/Kolkata'));				
-				$createddt =  $dt->format('Y-m-d H:i:s');
-				 $PaymentTerms=$this->input->post('PaymentMethod');
-    $PayableAT=$this->input->post('PayableAT');
-   
-    $PaymentDays=$this->input->post('paymentDateOptions');
-				//add requistion 
-				 	$Request = array('ReqType'=>$POType, 'Requestedby'=>$RequestedBy,'CostCenterCode'=>$CostCenterName,'Status'=>$ReqStatus,'Comments'=>$SpcialInstruction,'ReqDate'=>$createddt,'CreatedDate'=>$createddt,'CreatedBy'=>$CreateBy);
-			
-					$Req  = $this->requistion_model->addRequistion($Request);
-			
-					$RegNo='';
-					 if(count($Req)>0)
-        {
-            $RegNo =  $Req[0]['ReqNo'];
-        }
-				// PO Master
-				$POList = array('SupplierID'=>$SupplierID, 'TotalOrderValue'=>$TotalOrderValueSummary,'PODate'=>$PODate,'Status'=>$POStatus,'DeliverySchedule'=>$DeliverySchedule,'DeliveryOption'=>$DeliveryOption,'PORange'=>$PoRange,'ServiceDescription'=>$SpcialInstruction,'CreatedBy'=>$CreateBy,'DeliveryAddress'=>$DeliveryAddr,'DeliveryDate'=>$Deliverydt,'CreatedDate'=>$createddt,'PaymentTerms'=>$PaymentTerms,'PaymentDays'=>$PaymentDays,'PayableAT'=>$PayableAT,'POType'=>$POType );
-					
-					$POMaster  = $this->purchaseorder_model->addPOMaster($POList);
-					
-					 $PONO = '';
-					if(count($POMaster)>0)
-					{
-					 $PONO =  $POMaster[0]['PONO'];
-					}
-					
-					// PO Line Items
-					 $RegDetailsStatus=REQITEM_POCREATED;
-					$LineItemStatus = REQITEM_NEW;
-					
-						for ($i = 1; $i <= $RowCount; $i++)
-							{	
-							
-								$MaterialCode = $this->input->post('materialCode'.$i);
-								$Quantity = $this->input->post('quantity'.$i); 
-								$Reqnumber = $this->input->post('Reqnumber'.$i);
-								$itemRate = $this->input->post('itemRate'.$i);
-
-								$DiscountType = $this->input->post('DisType'.$i);
-								$DiscountValue = $this->input->post('DisVal'.$i); 
-								$AfterDiscount = $this->input->post('AfterDisVal'.$i);
-								$PackagingOption = $this->input->post('PackOption'.$i);
-								$PackagingType = $this->input->post('PackType'.$i);
-								$PackagingValue = $this->input->post('PackVal'.$i); 
-								$AfterPackagingValue = $this->input->post('AfterPackVal'.$i);
-								$ExciseOption = $this->input->post('ExciseOption'.$i);
-								$ExciseValue = $this->input->post('ExciseVal'.$i);
-								$AfterExciseValue = $this->input->post('AfterExciseVal'.$i); 
-								$VatOption = $this->input->post('VatOption'.$i);
-								$VatValue = $this->input->post('VatVal'.$i);
-								$AfterVatValue = $this->input->post('AfterVatVal'.$i);
-								$CSTOption = $this->input->post('CSTOption'.$i); 
-								$CSTValue = $this->input->post('CSTVal'.$i);
-								$AfterCSTValue = $this->input->post('AfterCSTVal'.$i);
-								$GSTValue = $this->input->post('GSTVal'.$i);
-								$AfterGSTValue = $this->input->post('AfterGSTVal'.$i); 
-								$OtherTaxValue = $this->input->post('OtherTaxVal'.$i);
-								$AfterOtherTaxValue = $this->input->post('AfterOtherTaxVal'.$i);
-								$FreightType = $this->input->post('FreightType'.$i);
-								$FreightValue = $this->input->post('FreightVal'.$i); 
-								$AfterFreightValue = $this->input->post('AfterFreightVal'.$i);
-								$InsuranceValue = $this->input->post('Insval'.$i);
-								$TotalOrderValue = $this->input->post('TotalOrderValue'.$i);							
-								$CostCenter	= $this->input->post('costCode'.$i);
-								
-								$SkipInsert = "False";				 
-								if( count($comma_separated) > 0)
-								{
-								   for($j = 1; $j < count($comma_separated); $j++)
-								   {	
-									  $deletedRow = 	$comma_separated[$j]	;
-									
-									  if($deletedRow == $i  )
-									  {
-										  $SkipInsert = "True";
-										  break;
-									  }						 
-									  
-									}
-								 }
-								 if($SkipInsert == "False")
-									{
-	//add requistion details
-            	$ReqDetails = array('ReqNo'=>$RegNo, 'MaterialCode'=>$MaterialCode,'Quantity'=>$Quantity,'Status'=>$RegDetailsStatus,'UpdatedBy'=>$CreateBy,'UpdatedOn'=>$createddt);
-								
-      				
-								$ReqDetQuery = $this->requistion_model->addRequistionDetails($ReqDetails);										
-										
-										$POLineItemList = array('PONO'=>$PONO, 'ReqNo'=>$RegNo,'MaterialCode'=>$MaterialCode,'Quantity'=>$Quantity,'Rate'=>$itemRate,'Status'=>$LineItemStatus,'CreatedBy'=>$CreateBy,'CreatedDate'=>$createddt,'CostCenterCode'=>$CostCenter);
-							
-										$POLineItem = $this->purchaseorder_model->addPOLineItem($POLineItemList);
-							
-										$LineItemNo = '';
-										if(count($POLineItem)>0)
-										{
-											$LineItemNo =  $POLineItem[0]['LineItemNo'];
-										}
-										//echo $LineItemNo; 
-										
-										if(trim($POType) == REVENUE )
-										{
-										//	echo 'Success';
-										$RevenueTaxList = array('LineItemNo'=>$LineItemNo, 'DiscountType'=>$DiscountType,'DiscountValue'=>$DiscountValue,'AfterDiscount'=>$AfterDiscount,'PackagingType'=>$PackagingType,'PackagingValue'=>$PackagingValue,'PackagingCalulatedOn'=>$PackagingOption,'AfterPackagingValue'=>$AfterPackagingValue,'FreightType'=>$FreightType, 'FreightValue'=>$FreightValue,'AfterFreightValue'=>$AfterFreightValue,'ExciseDuty'=>$ExciseValue,'ExciseDutyCalulatedOn'=>$ExciseOption,'AfterExciseDuty'=>$AfterExciseValue,'Vat'=>$VatValue,'AfterVAT'=>$AfterVatValue,'VatCalulatedOn'=>$VatOption, 'CST'=>$CSTValue,'AfterCST'=>$AfterCSTValue,'CSTCalulatedOn'=>$CSTOption,'GST'=>$GSTValue,'AfterGST'=>$AfterGSTValue,'OtherTaxes'=>$OtherTaxValue,'AfterOtherTaxes'=>$AfterOtherTaxValue,'Insurance'=>$InsuranceValue,'TotalValue'=>$TotalOrderValue, 'CreatedBy'=>$CreateBy,'CreatedDate'=>$createddt);
-										
-										$RevenueList = $this->purchaseorder_model->addRevenueTax($RevenueTaxList);
-										//echo 'Revenue tax Success';
-										}
-								}
-								
-							}							
-					echo 'Purchase Order Created Successfully! PO Number Is: '.$PONO ;
-					
-	}
-
-
-    /**
-     * This function is used to load the purchaseorder list
-     */
-    function PurchaseOrderList()
-    {
-
-        $this->load->library('pagination');
-
-        $count = $this->purchaseorder_model->purchaseorderListingCount('');
-
-        $returns = $this->paginationCompress ( "purchaseorderListing/", $count, 5 );
-
-        //$this->purchaseorder_model->UpdateRequistItemStatus();
-        $this->purchaseorder_model->UpdateRequistionStatus();
-        $data['POData'] =  $this->purchaseorder_model->purchaseorderListing();
-
-        $this->global['pageTitle'] = 'Siddharth : Purchase Orders';
-
-        $this->loadViews("POlist", $this->global, $data, NULL);
-
-    }
-    function  Req_validate($selectValue)
-    {
-        //echo 'select_validate  method called';
-        // 'none' is the first option and the text says something like "-Choose one-"
-        if(strlen($selectValue) == 0)
-        {
-            $this->form_validation->set_message('Req_validate', 'Please Select Requisition Number to Create PO.');
-            return false;
-        }
-        else // user picked something
-        {
-            return true;
-        }
-    }
-
-    /**
-     * This function used to show the Purchase Order Screen
-     */
-
-    function CreatePurchaseOrder()
-    {
-
-
-        $this->load->library('form_validation');
-
-        $this->form_validation->set_rules('txtReqNo', 'txtReqNo', 'callback_Req_validate');
-
-        if($this->form_validation->run() == FALSE)
-        {
-            $this->requisition();
-            //echo 'Validate method called';
-        }
-        else
-        {
-
-            $this->global['pageTitle'] = 'Siddharth : Purchase order form';
-            $data['TaxType'] = $this->purchaseorder_model->getConfigValue('C006');
-            $data['FreightType'] = $this->purchaseorder_model->getConfigValue('C018');
-            $data['Suplist'] = $this->purchaseorder_model->getSupplierName();
-            $SelectedReq = json_decode($this->input->post('txtReqNo'));
-            $Req = $SelectedReq->Req;
-            $data['ReqList'] = $Req ;
-            $ReqArray = array();
-            $ReqType = '';
-            $result = array();
-
-            foreach ($Req as $SID):
-                $ReqArray[] 	=  $SID->ReqNo  ;
-                $result[] = $this->purchaseorder_model->getRawPOMaterialList($SID->ReqNo);
-                $ReqType =  $SID->ReqType;
-                //echo $SID->ReqNo;
-
-            endforeach;
-            //print_r ($result);
-            $dt = new DateTime('now', new DateTimeZone('Asia/Kolkata'));
-            $Year =  $dt->format('Y');
-            $data['CostList'] = $this->purchaseorder_model->getCostCenterbyRequist('',$Year,$ReqType);
-            $data['MaterialList'] = $result; //$this->purchaseorder_model->getRawMaterialList($ReqType,$ReqArray);
-            //print_r ($data['MaterialList']);
-            $data['RequistionDetails'] = $this->purchaseorder_model->getRequistDetails($ReqArray);
-            $data['CompanyDetails'] =  $this->purchaseorder_model->getCompanyInformation();
-            $data['MaxPODate'] =  $this->purchaseorder_model->getLastCreatedPODate();
-
-            $ViewName = '';
-            if($ReqType  == REVENUE)
-            {
-                $ViewName = 'Purchaseorder';
-            }
-            else if($ReqType  == SERVICE)
-            {
-                $ViewName = 'servicePurchaseorder';
-            }
-            $this->loadViews($ViewName, $this->global,$data, NULL);
-        }
-    }
-
-    function CreatePOPrint()
-    {
-        $PONO =  $_GET['PONO'];
-        $ReqType =  $_GET['ReqType'];
-
-        if($ReqType == SERVICE)
-        {
-            $this ->servicepoprint($PONO);
-
-        }
-        else if($ReqType == REVENUE)
-        {
-            $this ->revenuepoprint($PONO);
-
-        }
-    }
-    //To View/Update Purchase Order
-    function EditPurchaseOrder()
-    {
-        $PONO =  $_GET['PONO'];
-        $ReqType =  $_GET['ReqType'];
-        $dt = new DateTime('now', new DateTimeZone('Asia/Kolkata'));
-        $Year =  $dt->format('Y');
-        $data['CostList'] = $this->purchaseorder_model->getCostCenterbyRequist('',$Year,$ReqType);
-        $Req = $this->purchaseorder_model->getRequistionNoFromPO($PONO);
-        $data['ReqList'] = $Req ;
-        $result = array();
-        $ReqArray = array();
-        foreach ($Req as $SID):
-            $ReqArray[] 	=  $SID->ReqNo  ;
-            $result[] = $this->purchaseorder_model->getRawPOMaterialList($SID->ReqNo);
-        endforeach;
-        $data['MaterialList'] = $result;//$this->purchaseorder_model->getRawMaterialList($ReqType,$ReqArray);
-        $data['Suplist'] = $this->purchaseorder_model->getSupplierName();
-        $data['RequistionDetails'] = $this->purchaseorder_model->getRequistDetails($ReqArray);
-        $data['POMaster'] = $this->purchaseorder_model->GetServicePurchaseOrder($PONO);
-        $data['MaxPODate'] =  $this->purchaseorder_model->getLastCreatedPODate();
-        $data['TaxType'] = $this->purchaseorder_model->getConfigValue('C006');
-        $data['FreightType'] = $this->purchaseorder_model->getConfigValue('C018');
-        if($ReqType == SERVICE)
-        {
-
-            $data['POItem'] = $this->purchaseorder_model->GetServicePurchaseOrderDetails($PONO);
-            $this->global['pageTitle'] = 'Siddharth : Edit Service Purchase order form';
-            $this->loadViews("EditservicePurchaseorder", $this->global,  $data, NULL);
-        }
-        else if($ReqType == REVENUE)
-        {
-
-            $data['POItem'] = $this->purchaseorder_model->GetRevenuePurchaseOrderDetails($PONO);
-            $this->global['pageTitle'] = 'Siddharth : Edit Revenue Purchase order form';
-            $this->loadViews("editRevenuepurchaseorder", $this->global,  $data, NULL);
-        }
-
-    }
-
-    // To get the Material value based on the MaterialCode
-    function getDetailsforReq()
-    {
-
-
-        $SearchFilter= $this->input->post('id');
-        // $reqDate= $this->input->post('ReqDate');
-        $DeptCode =  $SearchFilter[0];
-        $MatType =  $SearchFilter[1];
-        $ReqNo = $SearchFilter[2];
-        // $ReqDetai = $this->purchaseorder_model->getRequistDetails( $EmpID );
-
-        $CostList = $this->requistion_model->GetCostCenterByDept( $DeptCode);
-
-        $HTML = "<option value='-1'>Select Cost center</option>";
-        $BudAmount = "";
-        if(count($CostList) > 0)
-        {
-            for ($j = 0; $j < count($CostList); $j++)
-            {
-                $Code = $CostList[$j]['CostCenterCode'];
-                $Name = $CostList[$j]['CostCenterName'];
-                $HTML .="<option value='".$Code."'>".$Code."-".$Name."</option>";
-            }
-        }
-        $MaterialDetails = $this->purchaseorder_model->getRawMaterialListForPO($MatType,$ReqNo);
-
-        $HTML1 = "<option value='-1'>Select Material Type</option>";
-
-        if(count($MaterialDetails) > 0)
-        {
-            for ($j = 0; $j < count($MaterialDetails); $j++)
-            {
-                $Code = $MaterialDetails[$j]['MaterialCode'];
-                $Name = $MaterialDetails[$j]['MaterialName'];
-                $HTML1 .="<option value='".$Code."'>".$Code."-".$Name."</option>";
-
-            }
-
-        }
-        // print_r($HTML1);
-
-        die(json_encode(array('MatDetail' =>$HTML1,'Cost'=> $HTML)));
-    }
-    /* This method to get the status based on the Department selection in th
-    */
-    function getStatusByDepartment()
-    {
-        $DepId =  $this->input->post('id');
-
-        $data = $this->purchaseorder_model->getStatusByDepartment($DepId);
-
-        $HTML = "<option value='0'>Select Requistion Status</option>";
-        if(count($data) > 0)
-        {
-            for ($j = 0; $j < count($data); $j++)
-            {
-                $Code = $data[$j]['StatusCode'];
-                $Name = $data[$j]['StatusName'];
-                $HTML .="<option value='".$Code."'>".$Code."-".$Name."</option>";
-            }
-        }
-        //echo $HTML;
-        die(json_encode(array('depStaus' => $HTML)));
-    }
-
-    // To get the available Budget Amount
-    function AvilBudgetAmount()
-    {
-        $SearchFilter= $this->input->post('id');
-        // $reqDate= $this->input->post('ReqDate');
-        $CostCode =  $SearchFilter[0];
-        $ReqType =  $SearchFilter[1];
-        print_r($SearchFilter);
-        $CostCode=  $this->input->post('id');
-        $dt = new DateTime('now', new DateTimeZone('Asia/Kolkata'));
-
-        $Year =  $dt->format('Y');
-        $this->load->model('purchaseorder_model');
-        $result = $this->purchaseorder_model->GetAvailableBudgetAmount($CostCode,$Year,$ReqType);
-        //print_r($result);
-        $AvilBudAmt = '';
-        if(count($result)>0)
-        {
-            $AvilBudAmt = $result[0]['BudgetAmount'] -  $result[0]['Totalvalue'];
-        }
-
-        //  echo 'Test';
-        print_r($AvilBudAmt);
-        //die(json_encode(array('Cost' => $AvilBudAmt)));
-    }
-
-
-    function getDateformat($Val)
-    {
-        $date = new DateTime($Val,new DateTimeZone('Asia/Kolkata'));
-        //  print_r($date);
-        $retDate = $date->format('Y-m-d H:i:s');
-        return $retDate;
-    }
-    /* Method to get the Requistion list based on the search filter*/
-
-    function SearchListofRequistion()
-    {
-        $SearchFilter= $this->input->post('id');
-        // $reqDate= $this->input->post('ReqDate');
-        $DEPCode =  $SearchFilter[0];
-        $Status =  $SearchFilter[1];
-        $rng =   $SearchFilter[2];
-        // $ToDate =  $SearchFilter[3];
-        $FromDate ='';
-        $ToDate = '';
-        // echo $rng;
-        $Dt =  explode("-",$rng);
-        //  print_r( $Dt);
-        if(count( $Dt)>1)
-        {
-            $FDate = $Dt[0];
-            $TDate = $Dt[1];
-            $FromDate =  $this->getDateformat($FDate);
-            $ToDate =  $this->getDateformat($TDate);
-        }
-        //echo $FromDate;
-        // print_r($Dt);
-        $result =  $this->purchaseorder_model->getRequistionListbySearch($DEPCode,$Status,$FromDate,$ToDate);
-
-
-        $HTML="";
-        for ($i = 0; $i < count($result); $i++)
-        {
-            $SNo = $i + 1;
-            $ReqNo = $result[$i]['ReqNo'];
-            $ReqType = $result[$i]['ReqType'];
-            $Reqedby = $result[$i]['FirstName'];
-            $ReqDate = $result[$i]['ReqDate'];
-            $Status = $result[$i]['StatusName'];
-            $Department = $result[$i]['DepartmentName'];
-            $Designation = $result[$i]['Designation'];
-
-            $HTML.="<tr  id='".$i."'>
-							<td align='left'><input type='checkbox' name='chk'".$i." id='chk'".$i."/></td>
-							<td align='left'><a data-toggle='modal' data-target='#myModal'><u>". $ReqNo."</u></a></td>
-							   
-							<td align='left'>".$ReqType."</td>
-							
-							<td align='left'>".$Reqedby."</td>	
-							<td align='left'>".$ReqDate."</td>	
-							<td align='left'>".$Status."</td>	
-							<td align='left'>".$Department."</td>	
-							<td align='left'>".$Designation."</td>							
-							</tr>";
-        }
-        //print_r( $HTML);
-        die(json_encode(array('ReqList' =>$HTML)));
-    }
-
-
-    /* To View the request details*/
-    function ListPORequistion()
-    {
-        $ReqNo= $this->input->post('id');
-        $result =  $this->requistion_model->getRequistItemList($ReqNo);
-        $ReqList = $this->requistion_model->getRequistDetails($ReqNo);
-        $DepNo = $ReqList[0]['DEPCode'];
-        $CostList = $this->requistion_model->GetCostCenterByDept($DepNo);
-        $HTML="";
-        for ($i = 0; $i < count($result); $i++)
-        {
-            $SNo = $i + 1;
-            $MaterialCode = $result[$i]['MaterialCode'];
-            $MaterialName = $result[$i]['MaterialName'];
-            $UOM = $result[$i]['UOM'];
-            $Quantity = $result[$i]['Quantity'];
-            $HTML.="<tr  id='".$i."'>
-							<td align='left'>".$SNo."</td>
-							<td align='left'>". $MaterialCode."</td>
-													                      
-							<td align='left'>".$MaterialName."</td>
-							
-							<td align='left'>".$UOM."</td>	
-							<td align='left'>".$Quantity."</td>								
-							</tr>";
-
-            //$index =  $index + 1;
-
-        }
-
-        $CostCenter = "<option value='-1'>Select Cost center</option>";
-        if(count($CostList) > 0)
-        {
-            for ($j = 0; $j < count($CostList); $j++)
-            {
-                $Code = $CostList[$j]['CostCenterCode'];
-                $Name = $CostList[$j]['CostCenterName'];
-                $CostCenter .="<option value='".$Code."'>".$Code."-".$Name."</option>";
-            }
-        }
-        //echo $HTML;
-        //echo $CostCenter;
-        die(json_encode(array('Items' =>$HTML,'Requist'=>$ReqList,'Cost'=>$CostCenter)));
-    }
-
-    //This used to Create Revenue Purchase Order
-    function addNewPurchaseOrder()
-    {
-        $POdt =$this->input->post('PODate');
-        $PODate =  $this->getDateformat($POdt);
-        $SupplierID = $this->input->post('drpSupplier');
-        $DeliveryAddr = $this->input->post('DeliveryAddr');
-        $dt = $this->input->post('Deliverydt');
-        $Deliverydt = $this->getDateformat($dt);
-        $POType = $this->input->post('POType');
-        $PoRange = $this->input->post('txtPoRange');
-
-        $SpcialInstruction = $this->input->post('txtSpcialInstruction');
-        $TotalOrderValueSummary = $this->input->post('txtTotalOrderValueSummary');
-        $POStatus = $this->input->post('txtStatus');
-
-        $CreateBy = $this->session->userdata ( 'userId' );
-        $RowCount =  $this->input->post('txtRowCount');
-        $DeletedRow =  $this->input->post('txtDeletedRow');
-
-        $comma_separated = explode(':', $DeletedRow);
-
-        $dt = new DateTime('now', new DateTimeZone('Asia/Kolkata'));
-        $createddt =  $dt->format('Y-m-d H:i:s');
-        // PO Master
-        $POList = array('SupplierID'=>$SupplierID, 'TotalOrderValue'=>$TotalOrderValueSummary,'PODate'=>$PODate,'Status'=>$POStatus,'PORange'=>$PoRange,'ServiceDescription'=>$SpcialInstruction,'CreatedBy'=>$CreateBy,'DeliveryAddress'=>$DeliveryAddr,'DeliveryDate'=>$Deliverydt,'CreatedDate'=>$createddt );
-
-        $POMaster  = $this->purchaseorder_model->addPOMaster($POList);
-
-        $PONO = '';
-        if(count($POMaster)>0)
-        {
-            $PONO =  $POMaster[0]['PONO'];
-        }
-        //echo $PONO;
-        //echo $POType;
-        // PO Line Items
-        $LineItemStatus = REQITEM_NEW;
-        //echo ' test:'.REVENUE;
-        //echo $RowCount;
-        for ($i = 1; $i <= $RowCount; $i++)
-        {
-
-            $MaterialCode = $this->input->post('materialCode'.$i);
-            $Quantity = $this->input->post('quantity'.$i);
-            $Reqnumber = $this->input->post('Reqnumber'.$i);
-            $itemRate = $this->input->post('itemRate'.$i);
-
-            $DiscountType = $this->input->post('DisType'.$i);
-            $DiscountValue = $this->input->post('DisVal'.$i);
-            $AfterDiscount = $this->input->post('AfterDisVal'.$i);
-            $PackagingOption = $this->input->post('PackOption'.$i);
-            $PackagingType = $this->input->post('PackType'.$i);
-            $PackagingValue = $this->input->post('PackVal'.$i);
-            $AfterPackagingValue = $this->input->post('AfterPackVal'.$i);
-            $ExciseOption = $this->input->post('ExciseOption'.$i);
-            $ExciseValue = $this->input->post('ExciseVal'.$i);
-            $AfterExciseValue = $this->input->post('AfterExciseVal'.$i);
-            $VatOption = $this->input->post('VatOption'.$i);
-            $VatValue = $this->input->post('VatVal'.$i);
-            $AfterVatValue = $this->input->post('AfterVatVal'.$i);
-            $CSTOption = $this->input->post('CSTOption'.$i);
-            $CSTValue = $this->input->post('CSTVal'.$i);
-            $AfterCSTValue = $this->input->post('AfterCSTVal'.$i);
-            $GSTValue = $this->input->post('GSTVal'.$i);
-            $AfterGSTValue = $this->input->post('AfterGSTVal'.$i);
-            $OtherTaxValue = $this->input->post('OtherTaxVal'.$i);
-            $AfterOtherTaxValue = $this->input->post('AfterOtherTaxVal'.$i);
-            $FreightType = $this->input->post('FreightType'.$i);
-            $FreightValue = $this->input->post('FreightVal'.$i);
-            $AfterFreightValue = $this->input->post('AfterFreightVal'.$i);
-            $InsuranceValue = $this->input->post('Insval'.$i);
-            $TotalOrderValue = $this->input->post('TotalOrderValue'.$i);
-            $CostCenter	= $this->input->post('costCode'.$i);
-
-            $SkipInsert = "False";
-            if( count($comma_separated) > 0)
-            {
-                for($j = 1; $j < count($comma_separated); $j++)
-                {
-                    $deletedRow = 	$comma_separated[$j]	;
-
-                    if($deletedRow == $i  )
-                    {
-                        $SkipInsert = "True";
-                        break;
-                    }
-
-                }
-            }
-            if($SkipInsert == "False")
-            {
-                $POLineItemList = array('PONO'=>$PONO, 'ReqNo'=>$Reqnumber,'MaterialCode'=>$MaterialCode,'Quantity'=>$Quantity,'Rate'=>$itemRate,'Status'=>$LineItemStatus,'CreatedBy'=>$CreateBy,'CreatedDate'=>$createddt,'CostCenterCode'=>$CostCenter);
-
-                $POLineItem = $this->purchaseorder_model->addPOLineItem($POLineItemList);
-
-                $LineItemNo = '';
-                if(count($POLineItem)>0)
-                {
-                    $LineItemNo =  $POLineItem[0]['LineItemNo'];
-                }
-                //echo $LineItemNo;
-
-                if(trim($POType) == REVENUE )
-                {
-                    //	echo 'Success';
-                    $RevenueTaxList = array('LineItemNo'=>$LineItemNo, 'DiscountType'=>$DiscountType,'DiscountValue'=>$DiscountValue,'AfterDiscount'=>$AfterDiscount,'PackagingType'=>$PackagingType,'PackagingValue'=>$PackagingValue,'PackagingCalulatedOn'=>$PackagingOption,'AfterPackagingValue'=>$AfterPackagingValue,'FreightType'=>$FreightType, 'FreightValue'=>$FreightValue,'AfterFreightValue'=>$AfterFreightValue,'ExciseDuty'=>$ExciseValue,'ExciseDutyCalulatedOn'=>$ExciseOption,'AfterExciseDuty'=>$AfterExciseValue,'Vat'=>$VatValue,'AfterVAT'=>$AfterVatValue,'VatCalulatedOn'=>$VatOption, 'CST'=>$CSTValue,'AfterCST'=>$AfterCSTValue,'CSTCalulatedOn'=>$CSTOption,'GST'=>$GSTValue,'AfterGST'=>$AfterGSTValue,'OtherTaxes'=>$OtherTaxValue,'AfterOtherTaxes'=>$AfterOtherTaxValue,'Insurance'=>$InsuranceValue,'TotalValue'=>$TotalOrderValue, 'CreatedBy'=>$CreateBy,'CreatedDate'=>$createddt);
-
-                    $RevenueList = $this->purchaseorder_model->addRevenueTax($RevenueTaxList);
-                    //echo 'Revenue tax Success';
-                }
-            }
-
-        }
-        echo 'Purchase Order Created Successfully! PO Number Is: '.$PONO ;
-
-    }
-    //This used to Edit the Revenue Purchase Order
-    function EditRevenuePurchaseOrder()
-    {
-        $PONO =$this->input->post('txtPONO');
-        $POdt =$this->input->post('PODate');
-        $PODate =  $this->getDateformat($POdt);
-        $SupplierID = $this->input->post('drpSupplier');
-        $DeliveryAddr = $this->input->post('txtDeliveryAddress');
-        $dt = $this->input->post('Deliverydt');
-        $Deliverydt = $this->getDateformat($dt);
-        $POType = $this->input->post('POType');
-        $PoRange = $this->input->post('txtPoRange');
-
-        $SpcialInstruction = $this->input->post('SpcialInstruction');
-        $TotalOrderValueSummary = $this->input->post('txtTotalOrderValueSummary');
-        $POStatus = $this->input->post('txtStatus');
-
-        $updatedBy = $this->session->userdata ( 'userId' );
-        $RowCount =  $this->input->post('txtRowCount');
-        $DeletedRow =  $this->input->post('txtDeletedRow');
-
-        $comma_separated = explode(':', $DeletedRow);
-        $dt = new DateTime('now', new DateTimeZone('Asia/Kolkata'));
-        $updateddt =  $dt->format('Y-m-d H:i:s');
-        // PO Master
-        // PO Master
-        $POList = array('SupplierID'=>$SupplierID, 'TotalOrderValue'=>$TotalOrderValueSummary,'PODate'=>$PODate,'Status'=>$POStatus,'ServiceDescription'=>$SpcialInstruction,'UpdateBY'=>$updatedBy,'DeliveryAddress'=>$DeliveryAddr,'DeliveryDate'=>$Deliverydt,'UpdatedOn'=>$updateddt );
-
-        $POMaster  = $this->purchaseorder_model->updatePOMaster($PONO,$POList);
-
-        $LineItemStatus = REQITEM_NEW;
-
-
-
-        //echo $RowCount;
-        for ($i = 1; $i <= $RowCount; $i++)
-        {
-
-            $MaterialCode = $this->input->post('materialCode'.$i);
-            $Quantity = $this->input->post('quantity'.$i);
-            $Reqnumber = $this->input->post('Reqnumber'.$i);
-            $itemRate = $this->input->post('itemRate'.$i);
-
-            $DiscountType = $this->input->post('DisType'.$i);
-            $DiscountValue = $this->input->post('DisVal'.$i);
-            $AfterDiscount = $this->input->post('AfterDisVal'.$i);
-            $PackagingOption = $this->input->post('PackOption'.$i);
-            $PackagingType = $this->input->post('PackType'.$i);
-            $PackagingValue = $this->input->post('PackVal'.$i);
-            $AfterPackagingValue = $this->input->post('AfterPackVal'.$i);
-            $ExciseOption = $this->input->post('ExciseOption'.$i);
-            $ExciseValue = $this->input->post('ExciseVal'.$i);
-            $AfterExciseValue = $this->input->post('AfterExciseVal'.$i);
-            $VatOption = $this->input->post('VatOption'.$i);
-            $VatValue = $this->input->post('VatVal'.$i);
-            $AfterVatValue = $this->input->post('AfterVatVal'.$i);
-            $CSTOption = $this->input->post('CSTOption'.$i);
-            $CSTValue = $this->input->post('CSTVal'.$i);
-            $AfterCSTValue = $this->input->post('AfterCSTVal'.$i);
-            $GSTValue = $this->input->post('GSTVal'.$i);
-            $AfterGSTValue = $this->input->post('AfterGSTVal'.$i);
-            $OtherTaxValue = $this->input->post('OtherTaxVal'.$i);
-            $AfterOtherTaxValue = $this->input->post('AfterOtherTaxVal'.$i);
-            $FreightType = $this->input->post('FreightType'.$i);
-            $FreightValue = $this->input->post('FreightVal'.$i);
-            $AfterFreightValue = $this->input->post('AfterFreightVal'.$i);
-            $InsuranceValue = $this->input->post('Insval'.$i);
-            $TotalOrderValue = $this->input->post('TotalOrderValue'.$i);
-            $POLineItemNo = $this->input->post('LineItemNo'.$i);
-            $CostCenter	= $this->input->post('costCode'.$i);
-            $LineItemNo = '';
-
-
-            $SkipInsert = "False";
-            if( count($comma_separated) > 0)
-            {
-                for($j = 1; $j < count($comma_separated); $j++)
-                {
-                    $deletedRow = 	$comma_separated[$j]	;
-
-                    if($deletedRow == $i  )
-                    {
-                        $SkipInsert = "True";
-                        break;
-                    }
-
-                }
-            }
-            if($SkipInsert == "False")
-            {
-                if(strlen($POLineItemNo) == 0)
-                {
-                    $POLineItemList = array('PONO'=>$PONO, 'ReqNo'=>$Reqnumber,'MaterialCode'=>$MaterialCode,'Quantity'=>$Quantity,'Rate'=>$itemRate,'Status'=>$LineItemStatus,'CreatedBy'=>$updatedBy,'CreatedDate'=>$updateddt,'CostCenterCode'=>$CostCenter);
-                    $POLineItem = $this->purchaseorder_model->addPOLineItem($POLineItemList);
-                    if(count($POLineItem)>0)
-                    {
-                        $LineItemNo =  $POLineItem[0]['LineItemNo'];
-                    }
-
-                }
-                else
-                {
-                    $LineItemNo = $POLineItemNo;
-
-                    $POLineItemList = array('PONO'=>$PONO, 'ReqNo'=>$Reqnumber,'MaterialCode'=>$MaterialCode,'Quantity'=>$Quantity,'Rate'=>$itemRate,'Status'=>$LineItemStatus,'UpdateBY'=>$updatedBy,'UpdatedOn'=>$updateddt,'CostCenterCode'=>$CostCenter);
-                    $POLineItem = $this->purchaseorder_model->updatePOLineItem($PONO,$POLineItemNo,$POLineItemList);
-
-                }
-                $isExists = $this->purchaseorder_model->LineItemExistsinRevenueTax($LineItemNo);
-                if(count($isExists) == 0)
-                {
-                    $RevenueTaxList = array('LineItemNo'=>$LineItemNo, 'DiscountType'=>$DiscountType,'DiscountValue'=>$DiscountValue,'AfterDiscount'=>$AfterDiscount,'PackagingType'=>$PackagingType,'PackagingValue'=>$PackagingValue,'PackagingCalulatedOn'=>$PackagingOption,'AfterPackagingValue'=>$AfterPackagingValue,'FreightType'=>$FreightType, 'FreightValue'=>$FreightValue,'AfterFreightValue'=>$AfterFreightValue,'ExciseDuty'=>$ExciseValue,'ExciseDutyCalulatedOn'=>$ExciseOption,'AfterExciseDuty'=>$AfterExciseValue,'Vat'=>$VatValue,'AfterVAT'=>$AfterVatValue,'VatCalulatedOn'=>$VatOption, 'CST'=>$CSTValue,'AfterCST'=>$AfterCSTValue,'CSTCalulatedOn'=>$CSTOption,'GST'=>$GSTValue,'AfterGST'=>$AfterGSTValue,'OtherTaxes'=>$OtherTaxValue,'AfterOtherTaxes'=>$AfterOtherTaxValue,'Insurance'=>$InsuranceValue,'TotalValue'=>$TotalOrderValue, 'CreatedBy'=>$updatedBy,'CreatedDate'=>$updateddt);
-
-                    $RevenueList = $this->purchaseorder_model->addRevenueTax($RevenueTaxList);
-
-                }
-                else
-                {
-                    $RevenueTaxList = array('DiscountType'=>$DiscountType,'DiscountValue'=>$DiscountValue,'AfterDiscount'=>$AfterDiscount,'PackagingType'=>$PackagingType,'PackagingValue'=>$PackagingValue,'PackagingCalulatedOn'=>$PackagingOption,'AfterPackagingValue'=>$AfterPackagingValue,'FreightType'=>$FreightType, 'FreightValue'=>$FreightValue,'AfterFreightValue'=>$AfterFreightValue,'ExciseDuty'=>$ExciseValue,'ExciseDutyCalulatedOn'=>$ExciseOption,'AfterExciseDuty'=>$AfterExciseValue,'Vat'=>$VatValue,'AfterVAT'=>$AfterVatValue,'VatCalulatedOn'=>$VatOption, 'CST'=>$CSTValue,'AfterCST'=>$AfterCSTValue,'CSTCalulatedOn'=>$CSTOption,'GST'=>$GSTValue,'AfterGST'=>$AfterGSTValue,'OtherTaxes'=>$OtherTaxValue,'AfterOtherTaxes'=>$AfterOtherTaxValue,'Insurance'=>$InsuranceValue,'TotalValue'=>$TotalOrderValue, 'UpdateBY'=>$updatedBy,'UpdatedOn'=>$updateddt);
-
-                    $this->purchaseorder_model->updateRevenueTax($LineItemNo,$RevenueTaxList);
-
-                }
-            }
-
-        }
-
-        echo 'Purchase Order Updated Successfully! PO Number Is: '.$PONO ;
-    }
-    function pageNotFound()
-    {
-        $this->global['pageTitle'] = 'CodeInsect : 404 - Page Not Found';
-
-        $this->loadViews("404", $this->global, NULL, NULL);
-    }
-
-    public function revenuepoprint($PONO)
-    {
-        // Load all views as normal
-
-
-        //$PONO =   $_GET['PO'];
-
-        $data['CompanyDetails'] =  $this->purchaseorder_model->getCompanyInformation();
-        $data['POItem'] = $this->purchaseorder_model->GetRevenuePurchaseOrderDetailsForPDF($PONO);
-
-
-        // Add header to pdf
-        //$this->load->view('includes/pdfheader');
-
-        // Load the pdf page with multiviews
-        $this->load->View("revenuepopdf", $data);
-
-        // Add header to pdf
-        //$this->load->view('includes/pdffooter');
-
-        // Get output html
-        $php = $this->output->get_output();
-
-        // Load library
-        $this->load->library('dompdf_gen');
-
-        // Convert to PDF
-        $this->dompdf->load_html($php);
-        $this->dompdf->render();
-        $data['Attachment'] = FALSE;
-        $this->dompdf->stream("RevenuePOReport.pdf",$data,$php);
-
-    }
-    public function servicepoprint($PONO)
-    {
-
-        //	$this->load->view('includes/pdfheader');
-
-        // Load the pdf page with multiviews
-        $data['CompanyDetails'] =  $this->purchaseorder_model->getCompanyInformation();
-        $data['POItem'] = $this->purchaseorder_model->GetServicePurchaseOrderDetailsForPrint($PONO);
-
-        $this->load->View("servicepopdf", $data);
-
-        // Add header to pdf
-        //$this->load->view('includes/pdffooter');
-
-        // Get output html
-        $php = $this->output->get_output();
-
-        // Load library
-        $this->load->library('dompdf_gen');
-
-        // Convert to PDF
-        $this->dompdf->load_html($php);
-        $this->dompdf->render();
-        $data['Attachment'] = FALSE;
-        $this->dompdf->stream("ServicePOReport.pdf",$data,$php);
-
-    }
-    /**
-     * This function used to load the Delete the Requistion Items
-     */
-    function DeletePODetails()
-    {
-
-        $ReqList=  $this->input->post('id');
-        $LineItemNo = '';
-        $ReqNo ='';
-        $MaterialCode = '';
-        $POType = '';
-        if(count($ReqList) > 0)
-        {
-            $LineItemNo = $ReqList[0];
-            $ReqNo =  $ReqList[1];
-            $MaterialCode =  $ReqList[2];
-            $POType = $ReqList[3];
-        }
-        // print_r($ReqList);
-
-
-        If($POType == REVENUE)
-        {
-            $this->purchaseorder_model->DeletePORevenueTax($LineItemNo);
-        }
-        else If($POType == SERVICE)
-        {
-            $this->purchaseorder_model->DeletePOServiceTax($LineItemNo);
-        }
-        $this->purchaseorder_model->DeletePOLineItem($LineItemNo , $ReqNo,$MaterialCode);
-        echo "Successfully Deleted the Line item".$LineItemNo;
-
-    }
-}
-
-?>
-
diff --git a/application/controllers/employeedetails.php b/application/controllers/employeedetails.php
index 81d7b6b5..b848c9a8 100644
--- a/application/controllers/employeedetails.php
+++ b/application/controllers/employeedetails.php
@@ -3,11 +3,11 @@
 require APPPATH . '/libraries/BaseController.php';
 
 /**
- * Class : Employee  (Employee Controller)
+ * Class : employeedetails (Employee Details - Controller)
  * User Class to control all user related operations.
- * @author : Gandhimathi
+ * @author :Venba Info Tech - Gandhimathi
  * @version : 1.1
- * @since : 07 Apr 2017
+ * @since : 18 November 2017
  */
 class employeedetails extends BaseController
 {
@@ -19,7 +19,7 @@ class employeedetails extends BaseController
         parent::__construct();
         $this->load->model('employeedetails_model');
         $this->isLoggedIn();   
-    }
+    }               
   /**
      * This function used to load the first screen of the user
      */
diff --git a/application/controllers/emppaydate.php b/application/controllers/emppaydate.php
index 3f30cdd0..cb1484f0 100644
--- a/application/controllers/emppaydate.php
+++ b/application/controllers/emppaydate.php
@@ -3,11 +3,11 @@
 require APPPATH . '/libraries/BaseController.php';
 
 /**
- * Class : Cost Center (Cost Center Controller)
+ * Class : emppaydate (Employee Payment details - Controller)
  * User Class to control all user related operations.
- * @author : VenbaMail Mali
+ * @author : Venba Info Tech -
  * @version : 1.1
- * @since : 15 Feb 2016
+ * @since : 18 November 2017
  */
 class emppaydate extends BaseController
 {
@@ -30,7 +30,7 @@ class emppaydate extends BaseController
      */
 	public function index()
     {
-        $this->global['pageTitle'] = 'Siddharth : Employee Pay Details';
+        $this->global['pageTitle'] = 'Resico : Employee Pay Details';
         
        $this->loadViews("emppayListing", $this->global);
     }
@@ -46,7 +46,7 @@ class emppaydate extends BaseController
         
             $data['userRecords'] = $this->emppaydate_model->emppayListing();
             
-            $this->global['pageTitle'] = 'Siddharth : Employee Pay List';
+            $this->global['pageTitle'] = 'Resico : Employee Pay List';
             
             $this->loadViews("emppayListing", $this->global, $data, NULL);   
     }
@@ -63,7 +63,7 @@ class emppaydate extends BaseController
 
             
             
-            $this->global['pageTitle'] = 'Siddharth : Add Employee Pay';
+            $this->global['pageTitle'] = 'Resico : Add Employee Pay';
 
             $this->loadViews("addemppaydate", $this->global,$result);
         
@@ -173,7 +173,7 @@ class emppaydate extends BaseController
             $data['emppay'] = $this->emppaydate_model->getUserInfo($paydataid);
       
    
-            $this->global['pageTitle'] = 'Siddharth : Edit Employee Pay Monthly Details ';
+            $this->global['pageTitle'] = 'Resico : Edit Employee Pay Monthly Details ';
             
             $this->loadViews("editOldemppay", $this->global, $data,NULL);
         
@@ -328,7 +328,7 @@ class emppaydate extends BaseController
     
     function pageNotFound()
     {
-        $this->global['pageTitle'] = 'CodeInsect : 404 - Page Not Found';
+        $this->global['pageTitle'] = 'Resico : 404 - Page Not Found';
         
         $this->loadViews("404", $this->global, NULL, NULL);
     }
diff --git a/application/controllers/inwardgateregister.php b/application/controllers/inwardgateregister.php
index 02d7126b..2c5e947e 100644
--- a/application/controllers/inwardgateregister.php
+++ b/application/controllers/inwardgateregister.php
@@ -5,9 +5,9 @@ require APPPATH . '/libraries/BaseController.php';
 /**
  * Class :  Inward Gate Register Controller (security)
  * User Class to control all user related operations.
- * @author : Saravana kumar
+ * @author :Venba Info Tech - Saravana kumar
  * @version : 1.1
- * @since : 8 Jun 2017
+ * @since :18 November 2017
  */
 class inwardgateregister extends BaseController
 {
@@ -29,7 +29,7 @@ class inwardgateregister extends BaseController
      */
 	public function index()
     {
-        $this->global['pageTitle'] = 'Siddharth : Inward Gate Register';
+        $this->global['pageTitle'] = 'Resico : Inward Gate Register';
         
         $this->loadViews("viewinwardgateregister", $this->global,NULL , NULL);
     }
@@ -38,7 +38,7 @@ class inwardgateregister extends BaseController
 	function viewIGRDetails()
 	{
 		$this->load->model('inwardgateregister_model');
-		$this->global['pageTitle'] = 'Siddharth : Inward Gate Register Details';
+		$this->global['pageTitle'] = 'Resico : Inward Gate Register Details';
 		$data['IGR']= $this->inwardgateregister_model->igrListing();
 		
 		$this->loadViews("viewIGRDetails",$this->global,$data,NULL);
@@ -48,7 +48,7 @@ class inwardgateregister extends BaseController
     {
 		
 		$this->load->model('inwardgateregister_model');
-        $this->global['pageTitle'] = 'Siddharth : Add Inward Gate Register';
+        $this->global['pageTitle'] = 'Resico : Add Inward Gate Register';
        
 		
 		$data['PO_NO'] = $this->inwardgateregister_model->getpurchaseorder();
@@ -202,7 +202,7 @@ class inwardgateregister extends BaseController
 	 }	
     function pageNotFound()
     {
-        $this->global['pageTitle'] = 'Siddharth : 404 - Page Not Found';
+        $this->global['pageTitle'] = 'Resico : 404 - Page Not Found';
         
         $this->loadViews("404", $this->global, NULL, NULL);
     }
diff --git a/application/controllers/login.php b/application/controllers/login.php
index 853d20af..df031ffa 100644
--- a/application/controllers/login.php
+++ b/application/controllers/login.php
@@ -1,11 +1,11 @@
 <?php if(!defined('BASEPATH')) exit('No direct script access allowed');
 
 /**
- * Class : Login (LoginController)
+ * Class : Login (Login - Controller)
  * Login class to control to authenticate user credentials and starts user's session.
- * @author : Kishor Mali
+ * @author : Venba Info Tech
  * @version : 1.1
- * @since : 15 November 2016
+ * @since :18 November 2017
  */
 class Login extends CI_Controller
 {
diff --git a/application/controllers/monthlypay.php b/application/controllers/monthlypay.php
index 5edf611f..12c12344 100644
--- a/application/controllers/monthlypay.php
+++ b/application/controllers/monthlypay.php
@@ -3,11 +3,11 @@
 require APPPATH . '/libraries/BaseController.php';
 
 /**
- * Class : Cost Center (Cost Center Controller)
+ * Class : monthlypay (Monthly Payment Details - Controller)
  * User Class to control all user related operations.
- * @author : VenbaMail Mali
+ * @author : Venba Info Tech -
  * @version : 1.1
- * @since : 15 Feb 2016
+ * @since :18 November 2017
  */
 class monthlypay extends BaseController
 {
@@ -29,7 +29,7 @@ class monthlypay extends BaseController
      */
     public function index()
     {
-        $this->global['pageTitle'] = 'Siddharth : Monthly Pay Details';
+        $this->global['pageTitle'] = 'Resico: Monthly Pay Details';
         
         $this->loadviews('monthlyListing',$this->global);  
     }
@@ -39,7 +39,7 @@ class monthlypay extends BaseController
 		
 		
 		$data['days'] = $this-> monthlypay_model->getPublicHoldays();		
-		$this->global['pageTitle'] = 'Siddharth : Public Holidays';
+		$this->global['pageTitle'] = 'Resico : Public Holidays';
         
         $this->loadviews('publicholidays',$this->global,$data,NULL);  
 		
@@ -138,7 +138,7 @@ class monthlypay extends BaseController
 		 $data['datefordropdown'] = $current;
 		 $data['attendance'] = $this-> monthlypay_model->monthlyAttendance($current);		
 		 $data['emppay'] = $this-> monthlypay_model->getEmpPayDetails($current,$string);
-		 $this->global['pageTitle'] = 'Siddharth : Monthly Attendance';
+		 $this->global['pageTitle'] = 'Resico : Monthly Attendance';
          $this->loadViews("attendance", $this->global, $data, NULL);
 	}
 
@@ -202,7 +202,7 @@ class monthlypay extends BaseController
         
             $data['userRecords'] = $this->monthlypay_model->monthlyListing();
             
-            $this->global['pageTitle'] = 'Siddharth : Monthly Pay List';
+            $this->global['pageTitle'] = 'Resico : Monthly Pay List';
             
             $this->loadViews("monthlyListing", $this->global, $data, NULL);   
     }
@@ -223,7 +223,7 @@ class monthlypay extends BaseController
 
             //$data['emp_id'] = $this->monthlypay_model->getmonthlypay();   
             
-            $this->global['pageTitle'] = 'siddharth : Add Monthly Pay';
+            $this->global['pageTitle'] = 'Resico : Add Monthly Pay';
 
              $this->loadviews('addMontly',$this->global, NULL);  
         
@@ -296,7 +296,7 @@ class monthlypay extends BaseController
             $data['monthly'] = $this->monthlypay_model->getUserInfo($EmpID,$month_year);
             //$data['monthly_pay_inputs'] = $this->monthlylisting_model->getUserInfo($employeeid);
    
-            $this->global['pageTitle'] = 'Siddharth : Edit Monthly Listing';
+            $this->global['pageTitle'] = 'Resico : Edit Monthly Listing';
             
             $this->loadViews("editOldmonthly", $this->global, $data,NULL);
         
@@ -379,7 +379,7 @@ class monthlypay extends BaseController
     
     function pageNotFound()
     {
-        $this->global['pageTitle'] = 'CodeInsect : 404 - Page Not Found';
+        $this->global['pageTitle'] = 'Resico : 404 - Page Not Found';
         
         $this->loadViews("404", $this->global, NULL, NULL);
     }
diff --git a/application/controllers/payslip.php b/application/controllers/payslip.php
index 7c27b038..2a7a35fa 100644
--- a/application/controllers/payslip.php
+++ b/application/controllers/payslip.php
@@ -3,11 +3,11 @@
 require APPPATH . '/libraries/BaseController.php';
 
 /**
- * Class : Employee  (Employee Controller)
+ * Class : payslip (Pay Slip - Controller)
  * User Class to control all user related operations.
- * @author : Gandhimathi
+ * @author : Venba Info Tech - Gandhimathi
  * @version : 1.1
- * @since : 07 Apr 2017
+ * @since : 18 November 2017
  */
 class payslip extends BaseController
 {
@@ -47,7 +47,7 @@ function phpAlert($msg) {
 			
 			$Data['Payon'] = $this->payroll_model->getPayOn();
 			$Data['Bank'] = $this->payroll_model->getBankInfo();
-			$this->global['pageTitle'] = 'Siddharth : Bank Report Screen';
+			$this->global['pageTitle'] = 'Resico : Bank Report Screen';
             $this->loadViews("bankreport", $this->global,$Data,NULL);
 		
 		}
@@ -128,7 +128,7 @@ function phpAlert($msg) {
 				else{
 				
 				    $this->load->library('excel');
-				   // $this->global['pageTitle'] = 'Siddharth : PF Excel Report';
+				   // $this->global['pageTitle'] = 'Resico : PF Excel Report';
                    // $this->loadViews('pfexcel',$this->global,$data,NULL);
 				   $this->excel->setActiveSheetIndex(0);
 	                $this->excel->getActiveSheet()->setTitle('Employee PF Report ' . $data['PayMonth']);
@@ -467,7 +467,7 @@ function phpAlert($msg) {
 			}
 			
 							 $data['loanemployees'] = $this->payroll_model->getEmpDetailsforLoan();
-			                 $this->global['pageTitle'] = 'Siddharth : Loan Reports';                 
+			                 $this->global['pageTitle'] = 'Resico : Loan Reports';                 
 							 $this->loadViews("loanreports", $this->global,$data, NULL);
 
 	}
@@ -478,7 +478,7 @@ function phpAlert($msg) {
     public function viewUpload2()
    {
         
-       $this->global['pageTitle'] = 'Siddharth : Payroll Data Upload2';
+       $this->global['pageTitle'] = 'Resico : Payroll Data Upload2';
         
                 
        $this->loadViews("payslipupload2", $this->global, NULL);
@@ -491,7 +491,7 @@ function phpAlert($msg) {
 	 //  $data['fresh'] = $this-> monthlypay_model->getEmpPayDetails($current);
 	 
 	   $data['fresh'] = $this-> monthlypay_model->getEmpPayDetailsforMonthInputs($current);
-	   $this->global['pageTitle'] = 'Siddharth : Payroll Monthly Inputs';
+	   $this->global['pageTitle'] = 'Resico : Payroll Monthly Inputs';
        $this->loadViews("monthlypayinputs", $this->global,$data,NULL);
 	   
 	   
@@ -676,7 +676,7 @@ function phpAlert($msg) {
 	
 	function payslipLisiting()
 	{
-		$this->global['pageTitle'] = 'Siddharth : Payslip Listing';
+		$this->global['pageTitle'] = 'Resico : Payslip Listing';
 		$data['PayInfo'] = $this->payroll_model->GetPayslipdata();
         $this->loadViews("paysliplist", $this->global, $data , NULL);
 	}
@@ -685,7 +685,7 @@ function phpAlert($msg) {
 	{
 		
 		
-		$this->global['pageTitle'] = 'Siddharth : Edit Employee Payslip';
+		$this->global['pageTitle'] = 'Resico : Edit Employee Payslip';
 		$data['PayInfo'] = $this->payroll_model->GetPayslipdata($PayOn,$EmpID);
         $this->loadViews("editPayslip", $this->global, $data , NULL);
 	}
@@ -696,7 +696,7 @@ function phpAlert($msg) {
 		
 		
 		
-        $this->global['pageTitle'] = 'Siddharth : Payroll Generater';
+        $this->global['pageTitle'] = 'Resico : Payroll Generater';
 		 
         $this->loadViews("payslipgenerate", $this->global, $Data , NULL);
     }
@@ -1108,7 +1108,7 @@ function getEmployee()
    
     function pageNotFound()
     {
-        $this->global['pageTitle'] = 'CodeInsect : 404 - Page Not Found';
+        $this->global['pageTitle'] = 'Resico : 404 - Page Not Found';
         
         $this->loadViews("404", $this->global, NULL, NULL);
     }
diff --git a/application/controllers/purchaseorder.php b/application/controllers/purchaseorder.php
index 80f56945..e31aba40 100644
--- a/application/controllers/purchaseorder.php
+++ b/application/controllers/purchaseorder.php
@@ -5,11 +5,11 @@ require APPPATH . '/libraries/BaseController.php';
 require APPPATH . '/third_party/mpdf/mpdf.php';
 
 /**
- * Class : purchaseorder (PurchaseorderController)
+ * Class : purchaseorder (Purchase order - Controller)
  * User Class to control all user related operations.
  * @author : Venba InfoTech
  * @version : 1.1
- * @since : 09/06 Feb 2017
+ * @since : 18 November 2017 
  */
 class purchaseorder extends BaseController
 {
@@ -32,20 +32,20 @@ class purchaseorder extends BaseController
      */
     public function index()
     {
-        $this->global['pageTitle'] = 'Siddharth : AddPO';		
+        $this->global['pageTitle'] = 'Resico : AddPO';		
         
         $this->loadViews("addPO", $this->global, NULL , NULL);
     }
 	function viewfullpurchaseorder()
 	 {
-			$this->global['pageTitle'] = 'Siddharth : View Purchase Order';
+			$this->global['pageTitle'] = 'Resico : View Purchase Order';
             
             $this->loadViews("viewfullpurchaseorder", $this->global,Null);
 	 
 	 }
      function advancerequest()
    {
-       $this->global['pageTitle'] = 'Siddharth : Advance Request';  
+       $this->global['pageTitle'] = 'Resico : Advance Request';  
 
        $data['PONO']=$this->purchaseorder_model->getadvancePONO('ST026');
        //print_r($data['PONO']);   
@@ -63,7 +63,7 @@ class purchaseorder extends BaseController
 			
 			$data['ReqList'] =  $this->purchaseorder_model->getAllRequistionListToCreatePO();
 			 /* End Here */
-		    $this->global['pageTitle'] = 'Siddharth : Create PO from Requisition List';
+		    $this->global['pageTitle'] = 'Resico : Create PO from Requisition List';
             
             $this->loadViews("createPOfromRequistion", $this->global,  $data,Null);
 	 }
@@ -85,7 +85,7 @@ class purchaseorder extends BaseController
 			
 			$data['POData'] =  $this->purchaseorder_model->purchaseorderListing();	
             
-            $this->global['pageTitle'] = 'Siddharth : Purchase Orders';
+            $this->global['pageTitle'] = 'Resico : Purchase Orders';
             
             $this->loadViews("POlist", $this->global, $data, NULL);
        
@@ -121,7 +121,7 @@ class purchaseorder extends BaseController
             else
             { 
             
-            $this->global['pageTitle'] = 'Siddharth : Purchase order' ;
+            $this->global['pageTitle'] = 'Resico : Purchase order' ;
             $data['TaxType'] = $this->purchaseorder_model->getConfigValue('C006'); 
             $data['FreightType'] = $this->purchaseorder_model->getConfigValue('C018'); 
             $data['Suplist'] = $this->purchaseorder_model->getSupplierName(); 
@@ -407,7 +407,7 @@ class purchaseorder extends BaseController
                 //$data['WorkStatus']=$this->purchaseorder_model->GetWorkStatus('C019');
             	
                 $data['WorkStatus']=$this->purchaseorder_model->getStatus(7);
-                $this->global['pageTitle'] = 'Siddharth : Edit Service Purchase order form';           
+                $this->global['pageTitle'] = 'Resico : Edit Service Purchase order form';           
                 $this->loadViews("EditservicePurchaseorder", $this->global,  $data, NULL);  
               }
                 else if($ReqType == REVENUE)
@@ -416,7 +416,7 @@ class purchaseorder extends BaseController
                 $data['POItem'] = $this->purchaseorder_model->GetRevenuePurchaseOrderDetails($PONO);
                 $data['PaymentTerms']=$this->purchaseorder_model->GetPaymentTerms($PONO);
                  $data['WorkStatus']=$this->purchaseorder_model->getStatus(7);
-                $this->global['pageTitle'] = 'Siddharth : Edit Revenue Purchase order form';           
+                $this->global['pageTitle'] = 'Resico : Edit Revenue Purchase order form';           
                 $this->loadViews("editRevenuepurchaseorder", $this->global,  $data, NULL);  
                 }
                 else if($ReqType == IMPORT)
@@ -454,7 +454,7 @@ class purchaseorder extends BaseController
                //print_r($unicode);
                 $data['unicode']=$unicode;
                 $data['currencycode']=$currencycode;
-               $this->global['pageTitle'] = 'Siddharth : Edit Import Purchase order form';
+               $this->global['pageTitle'] = 'Resico : Edit Import Purchase order form';
                 $this->loadViews("editimportpo", $this->global,  $data, NULL);      
                 }
                 else if($ReqType == CAPITAL)
@@ -504,7 +504,7 @@ class purchaseorder extends BaseController
                        }
                
               
-                        $this->global['pageTitle'] = 'Siddharth : Edit Capital Purchase order form';
+                        $this->global['pageTitle'] = 'Resico : Edit Capital Purchase order form';
                          $this->loadViews("editCapitalPo", $this->global,  $data, NULL);      
                          }
         
@@ -636,7 +636,7 @@ class purchaseorder extends BaseController
                //print_r($unicode);
                 $data['unicode']=$unicode;
                 $data['currencycode']=$currencycode;
-               $this->global['pageTitle'] = 'Siddharth : Edit Import Purchase order form';
+               $this->global['pageTitle'] = 'Resico : Edit Import Purchase order form';
                 $this->loadViews("editimportpo", $this->global,  $data, NULL);      
                 }
                 
@@ -691,7 +691,7 @@ class purchaseorder extends BaseController
                        }
                
               
-                        $this->global['pageTitle'] = 'Siddharth : Edit Capital Purchase order form';
+                        $this->global['pageTitle'] = 'Resico : Edit Capital Purchase order form';
                          $this->loadViews("editCapitalPo", $this->global,  $data, NULL);      
                          }
 
@@ -1203,7 +1203,7 @@ class purchaseorder extends BaseController
 	}
     function pageNotFound()
     {
-        $this->global['pageTitle'] = 'CodeInsect : 404 - Page Not Found';
+        $this->global['pageTitle'] = 'Resico : 404 - Page Not Found';
         
         $this->loadViews("404", $this->global, NULL, NULL);
     }
@@ -2141,7 +2141,7 @@ function addNewImportPurchaseOrder()
 	/*  All Function following This command for FINANCE TEAM PO APPROVAL SCREEN*/
 	 function poapproval(){
 	 $q="APPROVAL";
-	 $this->global['pageTitle'] = 'Siddharth : Purchase Order Approval';
+	 $this->global['pageTitle'] = 'Resico : Purchase Order Approval';
 	// $data['Status']= $this->purchaseorder_model->getStatus();
 	 $userID =  $this->session->userdata ( 'userId' );
 	 //print_r($data['Status']);echo "CON";
@@ -2197,7 +2197,7 @@ function addNewImportPurchaseOrder()
 	 function porelease(){
 	 
 	 $q="RELEASE";
-	 $this->global['pageTitle'] = 'Siddharth : Purchase Order Release';
+	 $this->global['pageTitle'] = 'Resico: Purchase Order Release';
 	// $data['Status']= $this->purchaseorder_model->getStatus();
 	 $userID =  $this->session->userdata ( 'userId' );
 	 //print_r($data['Status']);echo "CON";
diff --git a/application/controllers/purchaseorder.php~ b/application/controllers/purchaseorder.php~
deleted file mode 100644
index 9c65ae6b..00000000
--- a/application/controllers/purchaseorder.php~
+++ /dev/null
@@ -1,2805 +0,0 @@
-<?php if(!defined('BASEPATH')) exit('No direct script access allowed');
-
-require APPPATH . '/libraries/BaseController.php';
-
-/**
- * Class : purchaseorder (PurchaseorderController)
- * User Class to control all user related operations.
- * @author : Venba InfoTech
- * @version : 1.1
- * @since : 09/06 Feb 2017
- */
-class purchaseorder extends BaseController
-{
-    /**
-     * This is default constructor of the class
-     */
-    public function __construct()
-    {
-        parent::__construct();
-        $this->load->model('purchaseorder_model');
-		
-		$this->load->library('session');
-	    $this->load->library('form_validation');
-		$this->load->model('requistion_model');
-        $this->isLoggedIn();   
-    }
-    
-    /**
-     * This function used to load the first screen of the user
-     */
-    public function index()
-    {
-        $this->global['pageTitle'] = 'Siddharth : AddPO';		
-        
-        $this->loadViews("addPO", $this->global, NULL , NULL);
-    }
-	function viewfullpurchaseorder()
-	 {
-			$this->global['pageTitle'] = 'Siddharth : View Purchase Order';
-            
-            $this->loadViews("viewfullpurchaseorder", $this->global,Null);
-	 
-	 }
-     function advancerequest()
-   {
-       $this->global['pageTitle'] = 'Siddharth : Advance Request';  
-
-       $data['PONO']=$this->purchaseorder_model->getadvancePONO('ST026');
-       //print_r($data['PONO']);   
-       
-       $this->loadViews("advancerequest", $this->global, $data, NULL);
-   }
-	function requisition()
-	 {
-		     $data['DeptList'] = $this->purchaseorder_model->getDepartmentListForAllReq();
-			 
-		     $data['stList'] = $this->purchaseorder_model->getStatusListforAllReq();
-			   /*   Cost code from Requisition - Client Review Fix   
-			  Start here */
-			// $data['ReqList'] =  $this->purchaseorder_model->getRequistionListbySearch();
-			
-			$data['ReqList'] =  $this->purchaseorder_model->getAllRequistionListToCreatePO();
-			 /* End Here */
-		    $this->global['pageTitle'] = 'Siddharth : Create PO from Requisition List';
-            
-            $this->loadViews("createPOfromRequistion", $this->global,  $data,Null);
-	 }
-	
-	
-	 /**
-     * This function is used to load the purchaseorder list
-     */
-    function PurchaseOrderList()
-    {
-            
-            $this->load->library('pagination');
-            
-           // $count = $this->purchaseorder_model->purchaseorderListingCount('');
-
-			//$returns = $this->paginationCompress ( "purchaseorderListing/", $count, 10 );
-
-			$this->purchaseorder_model->UpdateRequistionStatus();	
-			
-			$data['POData'] =  $this->purchaseorder_model->purchaseorderListing();	
-            
-            $this->global['pageTitle'] = 'Siddharth : Purchase Orders';
-            
-            $this->loadViews("POlist", $this->global, $data, NULL);
-       
-    }
-	function  Req_validate($selectValue)
-{
-	//echo 'select_validate  method called';
-    // 'none' is the first option and the text says something like "-Choose one-"
-    if(strlen($selectValue) == 0)
-    {
-        $this->form_validation->set_message('Req_validate', 'Please Select Requisition Number to Create PO.');
-        return false;
-    }
-    else // user picked something
-    {
-        return true;
-    }
-}
-
-	/**
-     * This function used to show the Purchase Order Screen
-     */
-   function CreatePurchaseOrder()
-    {      
-                        
-            $this->form_validation->set_rules('txtReqNo', 'txtReqNo', 'callback_Req_validate'); 
-            
-            if($this->form_validation->run() == FALSE)
-            {
-                $this->requisition();
-                
-            }
-            else
-            { 
-            
-            $this->global['pageTitle'] = 'Siddharth : Purchase order' ;
-            $data['TaxType'] = $this->purchaseorder_model->getConfigValue('C006'); 
-            $data['FreightType'] = $this->purchaseorder_model->getConfigValue('C018'); 
-            $data['Suplist'] = $this->purchaseorder_model->getSupplierName(); 
-            $data['Payment']=$this->purchaseorder_model->getPaymentTermsDetails();
-           // print_r($data['Payment']);
-			
-             $data['WorkStatus']=$this->purchaseorder_model->getStatus(7);
-            
-                
-           
-                          
-
-            $SelectedReq = json_decode($this->input->post('txtReqNo'));
-            
-            $Req = $SelectedReq->Req;
-            $data['ReqList'] = $Req ;
-            $ReqArray = array();
-            $ReqType = $this->input->post('txtReqType'); 
-            $result = array();
-            
-                        foreach ($Req as $SID):
-                        $ReqArray[]     =  $SID->ReqNo  ;   
-                        $result[] = $this->purchaseorder_model->getRawPOMaterialList($SID->ReqNo);      
-                         if($ReqType == '')
-                         {                           
-                            $ReqType =  $SID->ReqType;  
-                         }                  
-                        
-                        endforeach;
-                    
-                  
-              $data['MaterialList'] = $result; 
-              //print_r($data['MaterialList']);
-              /*   Cost code from Requisition - Client Review Fix   
-              Start here */
-              $ReqDetails = $this->purchaseorder_model->getRequistDetails($ReqArray);
-              $data['RequistionDetails'] =  $ReqDetails;
-              $CostCode = '';
-			  
-			  $this->load->model('costcenter_model');
-              $FYStart = '';
-		   $FYEnd = '';
-		   $FiscalYear =   $this->costcenter_model->getFiscalYear();
-		   if(!empty($FiscalYear))
-				{
-			foreach ($FiscalYear as $Fy)
-			{
-				$FYStart =$Fy->StartYear;
-				$FYEnd =$Fy->EndYear;
-        //$FYEnd=$FYStart+1;
-			}
-				
-			}
-				
-			$FYdt = $FYStart." - ".$FYEnd ; 
-
-      //echo $FYEnd;
-              
-              foreach ($ReqDetails as $Rs):
-                 $CostCode = $Rs->CostCenterCode;  
-              endforeach;
-              
-              $AvlBudget   =   $this->purchaseorder_model->GetAvailableBudgetAmount($CostCode,$FYdt,$ReqType);
-              
-              
-                if(count($AvlBudget)>0)
-                {
-                $data['AvlBudAmt'] = $AvlBudget[0]['BudgetAmount'] -  $AvlBudget[0]['Totalvalue'];
-                }
-                /* End Here */
-                
-              $data['CompanyDetails'] =  $this->purchaseorder_model->getCompanyInformation();
-              //print_r($data['CompanyDetails']);
-             // $data['MaxPODate'] =  $this->purchaseorder_model->getLastCreatedPODate();
-              $data['MaxPODate'] =  $this->purchaseorder_model->getLastReleasedPODate();
-              $data['Currency']=$this->purchaseorder_model->GetCurrencytype();
-              $data['INRSYMBOL']=$this->purchaseorder_model->GetINRCurrencytype('INR');
-              //print_r($data['INRSYMBOL']);
-
-              $AvlimportBudget   =   $this->purchaseorder_model->GetAvailableImportBudgetAmount($CostCode,$FYdt,$ReqType);
-
-               // $AvlBudget   =   $this->purchaseorder_model->GetAvailableBudgetAmount($CostCode,$Year,$ReqType);
-              
-
-                    //print_r($AvlimportBudget);
-              
-              
-                if(count($AvlimportBudget)>0)
-                { 
-            $data['AvlimportBudAmt'] = $AvlimportBudget[0]['BudgetAmount'] -  $AvlimportBudget[0]['TotalValue'];
-                }
-
-            //print_r($data['AvlimportBudAmt']);
-
-
-                    // $data[$Rate->ExchangeRate]=$Rate->ExchangeRate;
-               //$data['CurrencyDetail']=$this->purchaseorder_model->GetCurrencyDetail($Currency);
-              
-              $ViewName = '';     
-             if($ReqType  == REVENUE)
-             {
-                 $ViewName = 'purchaseorder';
-             }               
-             else if($ReqType  == SERVICE)
-             {
-                 $ViewName = 'servicePurchaseorder';
-             }      
-             else if($ReqType  == IMPORT)
-             {
-                 $ViewName = 'importpo';
-             }  
-            else if($ReqType  == CAPITAL)
-             {
-             	 	 $CapitalAvlBudget   =   $this->purchaseorder_model->GetAvailableCapitalBudgetAmount($CostCode,$FYdt,$ReqType);
-				 
-				
-				 if(count($CapitalAvlBudget)>0)
-                {
-                
-                   
-                    $data['AvlCapitalBudAmt'] = $CapitalAvlBudget[0]['BudgetAmount'] -  $CapitalAvlBudget[0]['Totalvalue'];
-               }
-                 $ViewName = 'capitalpurchaseorder';
-             }           
-             $this->loadViews($ViewName, $this->global,$data, NULL); 
-            }
-    }
-	 function CreatePOPrint()
-	 {
-		$PONO =  $_GET['PONO'];
-		$ReqType =  $_GET['ReqType']; 
-		
-				if($ReqType == SERVICE)
-			  {	    
-				 $this ->servicepoprint($PONO);
-				
-			  }
-				else if($ReqType == REVENUE)
-				{
-					 $this ->revenuepoprint($PONO);
-			
-				}
-
-				else if($ReqType == IMPORT)
-				{
-					 $this ->importpoprint($PONO);
-			
-				}
-				  else if($ReqType == CAPITAL)
-				{
-					 $this ->CapitalPoPrint($PONO);
-			
-				}
-	 }	
-
-
-   function CreateMRIRPOPrint()
-   {
-    $PONO =  $_GET['PONO'];
-    $POType =  $_GET['POType']; 
-    
-        if($POType == SERVICE)
-        {     
-         $this ->mrirservicepoprint($PONO);
-        
-        }
-        else if($POType == REVENUE)
-        {
-           $this ->mrirrevenuepoprint($PONO);
-      
-        }
-
-        else if($POType == IMPORT)
-        {
-           $this ->mririmportpoprint($PONO);
-      
-        }
-          else if($POType == CAPITAL)
-        {
-           $this ->mrirCapitalPoPrint($PONO);
-      
-        }
-   }  
-
-	function CreaterevenuePOPrint()
-	 {
-			 $this->load->View("revenuepopdf", NULL); 
-	 }
-	function CreateservicePOPrint()
-	 {
-			 $this->load->View("servicepopdf", NULL); 
-	 }
-	 function CreateimportPOPrint()
-	 {
-			 $this->load->View("importpopdf", NULL); 
-	 }
-	 function CreatecapitalPOPrint()
-	 {
-			 $this->load->View("capitalpopdf", NULL); 
-	 }
-	//To View/Update Purchase Order	
-	 //To View/Update Purchase Order 
-     function EditPurchaseOrder()
-     {
-                $PONO =  $_GET['PONO'];
-                $ReqType =  $_GET['ReqType'];  
-                
-                $Req = $this->purchaseorder_model->getRequistionNoFromPO($PONO);  
-
-                $data['ReqList'] = $Req ;
-          
-                $result = array();
-                $ReqArray = array();                
-                foreach ($Req as $SID):
-                    $ReqArray[]     =  $SID->ReqNo  ;
-                    $result[] = $this->purchaseorder_model->getRawPOMaterialList($SID->ReqNo);                         
-                 endforeach;
-            
-                $data['MaterialList'] = $result;//$this->purchaseorder_model->getRawMaterialList($ReqType,$ReqArray);
-                $data['Suplist'] = $this->purchaseorder_model->getSupplierName();
-               
-                  $data['Payment']=$this->purchaseorder_model->getPaymentTermsDetails();
-                $data['INRSYMBOL']=$this->purchaseorder_model->GetINRCurrencytype('INR');
-                 /*   Cost code from Requisition - Client Review Fix   
-                Start here */
- 
-                $ReqDetails = $this->purchaseorder_model->getRequistDetails($ReqArray);
-
-                $data['RequistionDetails'] =  $ReqDetails;
-                foreach ($data['RequistionDetails'] as $ReqDet) 
-                  {
-                    
-                    $Status=$ReqDet->Status;
-                  }
-                
-                $data['POSTATUS']=$this->purchaseorder_model->GetPOStatus($Status);
-              
-                foreach ($data['POSTATUS'] as $POST) 
-                {
-                    $Status=$POST->StatusName;
-                }
-             
-                $CostCode = '';
-                $this->load->model('costcenter_model');
-              $FYStart = '';
-		   $FYEnd = '';
-		   $FiscalYear =   $this->costcenter_model->getFiscalYear();
-		   if(!empty($FiscalYear))
-				{
-			foreach ($FiscalYear as $Fy)
-			{
-				$FYStart =$Fy->StartYear;
-				$FYEnd =$Fy->EndYear;
-			}
-				
-			}
-				
-			$FYdt = $FYStart." - ".$FYEnd ; 
-                foreach ($ReqDetails as $Rs):
-                 $CostCode = $Rs->CostCenterCode;  
-                endforeach;
-                $AvlBudget   =   $this->purchaseorder_model->GetAvailableBudgetAmount($CostCode,$FYdt,$ReqType);
-                if(count($AvlBudget)>0)
-                {
-                $data['AvlBudAmt'] = $AvlBudget[0]['BudgetAmount'] -  $AvlBudget[0]['Totalvalue'];
-                }
-                /* End Here */
-                
-                $data['POMaster'] = $this->purchaseorder_model->GetServicePurchaseOrder($PONO);
-                //$data['POSTATUS']=$this->purchaseorder_model->GetServicePurchaseOrder($PONO);
-                //print_r($data['POMaster']);
-                foreach ($data['POMaster'] as $Exc) 
-                {
-                      $exRate=$Exc->ExchangeRate;
-                }
-                foreach ($data['POMaster'] as $TER) 
-                {
-                   $PAYTERM=$TER->PaymentTerms;
-                }
-               
-              
-                $data['MaxPODate'] =  $this->purchaseorder_model->getLastReleasedPODate();
-                $data['TaxType'] = $this->purchaseorder_model->getConfigValue('C006'); 
-                $data['FreightType'] = $this->purchaseorder_model->getConfigValue('C018'); 
-               if($ReqType == SERVICE)
-              {     
-                
-                $data['POItem'] = $this->purchaseorder_model->GetServicePurchaseOrderDetails($PONO);
-              
-                $data['PaymentTerms']=$this->purchaseorder_model->GetPaymentTerms($PONO);
-                //$data['WorkStatus']=$this->purchaseorder_model->GetWorkStatus('C019');
-            	
-                $data['WorkStatus']=$this->purchaseorder_model->getStatus(7);
-                $this->global['pageTitle'] = 'Siddharth : Edit Service Purchase order form';           
-                $this->loadViews("EditservicePurchaseorder", $this->global,  $data, NULL);  
-              }
-                else if($ReqType == REVENUE)
-                {
-                    
-                $data['POItem'] = $this->purchaseorder_model->GetRevenuePurchaseOrderDetails($PONO);
-                $data['PaymentTerms']=$this->purchaseorder_model->GetPaymentTerms($PONO);
-                 $data['WorkStatus']=$this->purchaseorder_model->getStatus(7);
-                $this->global['pageTitle'] = 'Siddharth : Edit Revenue Purchase order form';           
-                $this->loadViews("editRevenuepurchaseorder", $this->global,  $data, NULL);  
-                }
-                else if($ReqType == IMPORT)
-                {
-                    $AvlBudget   =   $this->purchaseorder_model->GetAvailableImportBudgetAmount($CostCode,$FYdt,$ReqType);
-              
-              
-                if(count($AvlBudget)>0)
-                {
-                $data['AvlBudAmt'] = $AvlBudget[0]['BudgetAmount'] -  $AvlBudget[0]['TotalValue'];
-                }
-                 //print_r($data['AvlBudAmt']); 
-               $data['POItem'] = $this->purchaseorder_model->GetImportPurchaseOrderDetails($PONO);
-               $data['Currency']=$this->purchaseorder_model->GetCurrencytype();
-               foreach($data['POMaster'] as $CUR)
-                {     
-                  //print_r($CUR->CurrencyType);
-                  $Currency=$CUR->CurrencyType;
-                }
-                    // $data[$Rate->ExchangeRate]=$Rate->ExchangeRate;
-               $data['CurrencyDetail']=$this->purchaseorder_model->GetCurrencyDetail($Currency);
-               $data['PaymentTerms']=$this->purchaseorder_model->GetPaymentTerms($PONO);
-               //print_r($data['PaymentTerms']);
-               $unicode ='';
-               foreach ($data['CurrencyDetail'] as $Detail)
-               {
-                $unicode=$Detail->FontCode2000;
-               }
-               foreach ($data['CurrencyDetail'] as $Detail)
-               {
-                 $currencycode=$Detail->Currency_Code;
-               }
-               //print_r($unicode);
-                $data['unicode']=$unicode;
-                $data['currencycode']=$currencycode;
-               $this->global['pageTitle'] = 'Siddharth : Edit Import Purchase order form';
-                $this->loadViews("editimportpo", $this->global,  $data, NULL);      
-                }
-                else if($ReqType == CAPITAL)
-                {
-                       $CapitalRange = $_GET['CapitalRange']; 
-                       
-                  	 $CapitalAvlBudget   =   $this->purchaseorder_model->GetAvailableCapitalBudgetAmount($CostCode,$FYdt,$ReqType);
-				 
-				
-				 if(count($CapitalAvlBudget)>0)
-                {
-                
-                   
-                    $data['AvlCapitalBudAmt'] = $CapitalAvlBudget[0]['BudgetAmount'] -  $CapitalAvlBudget[0]['Totalvalue'];
-               }
-                
-                        if($CapitalRange=='0'){
-                        $data['POItem'] = $this->purchaseorder_model->getCapitalPurchaseOrderDetails($PONO);
-                      }
-                    else if($CapitalRange=='1'){
-                        $data['POItem'] = $this->purchaseorder_model->getDomesticCapitalPurchaseOrderDetails($PONO);
-                      }
-                        $data['requestedBy'] = $this->purchaseorder_model->GetRequesedByDetails($PONO);
-           
-          
-                        //$CapitalRange='';
-                        foreach($data['POItem'] as $Rate)
-                        {     
-                          $exRate=$Rate->ExchangeRate;
-                          $CapitalRange=$Rate->CapitalRange;
-                        }
-                        foreach($data['POItem'] as $CUR)
-                        {     
-                
-                        $Currency=$CUR->CurrencyType;
-                       }
-
-                        if($CapitalRange=='0'){
-                         $data['CurrencyDetail']=$this->purchaseorder_model->GetCurrencyDetail($Currency);
-                        $data['ExchangeRate']=$exRate;
-                        $data['Currency']=$this->purchaseorder_model->GetCurrencytype();
-                         }
-                        else if($CapitalRange=='1'){
-                         $data['CurrencyDetail']=$this->purchaseorder_model->GetCurrencyDetail('INR');
-                        $data['ExchangeRate']=$exRate;
-                        $data['Currency']=$this->purchaseorder_model->GetCurrencytype();
-                       }
-               
-              
-                        $this->global['pageTitle'] = 'Siddharth : Edit Capital Purchase order form';
-                         $this->loadViews("editCapitalPo", $this->global,  $data, NULL);      
-                         }
-        
-     }
-	 
-	 // To get the Material value based on the MaterialCode
-	function getDetailsforReq()
-	 {		 
-		 
-		      
-		    $SearchFilter= $this->input->post('id');
-			// $reqDate= $this->input->post('ReqDate');
-			$DeptCode =  $SearchFilter[0];
-			$MatType =  $SearchFilter[1];
-			$ReqNo = $SearchFilter[2];
-		   // $ReqDetai = $this->purchaseorder_model->getRequistDetails( $EmpID );  
-			  
-			$CostList = $this->requistion_model->GetCostCenterByDept( $DeptCode);
-		   		   
-			$HTML = "<option value='-1'>Select Cost center</option>";
-		    $BudAmount = "";
-		   if(count($CostList) > 0)
-		   {
-             for ($j = 0; $j < count($CostList); $j++)
-			  {
-				$Code = $CostList[$j]['CostCenterCode'];
-				$Name = $CostList[$j]['CostCenterName'];
-				$HTML .="<option value='".$Code."'>".$Code."-".$Name."</option>";
-				}	
-		   }	
-		   $MaterialDetails = $this->purchaseorder_model->getRawMaterialListForPO($MatType,$ReqNo);   
-		  
-		   $HTML1 = "<option value='-1'>Select Material Type</option>";
-		   
-		   if(count($MaterialDetails) > 0)
-		   {
-             for ($j = 0; $j < count($MaterialDetails); $j++)
-			  {
-				$Code = $MaterialDetails[$j]['MaterialCode'];
-				$Name = $MaterialDetails[$j]['MaterialName'];
-				$HTML1 .="<option value='".$Code."'>".$Code."-".$Name."</option>";
-				
-				}
-							
-		   }   
-		  // print_r($HTML1);
-			   
-		   die(json_encode(array('MatDetail' =>$HTML1,'Cost'=> $HTML)));
-	 }
-	/* This method to get the status based on the Department selection in th 
-	*/
-	function getStatusByDepartment()
-	{
-		$DepId =  $this->input->post('id');
-		
-		$data = $this->purchaseorder_model->getStatusByDepartment($DepId);
-		
-		$HTML = "<option value='0'>Select Requistion Status</option>";
-		 if(count($data) > 0)
-		   {
-             for ($j = 0; $j < count($data); $j++)
-			  {
-				$Code = $data[$j]['StatusCode'];
-				$Name = $data[$j]['StatusName'];
-				$HTML .="<option value='".$Code."'>".$Code."-".$Name."</option>";
-				}	
-		   }
-		   //echo $HTML;
-			die(json_encode(array('depStaus' => $HTML)));		   
-	}
-	
-	// To get the available Budget Amount
-	function AvilBudgetAmount()
-	 {		 
-		   $SearchFilter= $this->input->post('id');
-			// $reqDate= $this->input->post('ReqDate');
-			$CostCode =  $SearchFilter[0];
-			$ReqType =  $SearchFilter[1];
-			print_r($SearchFilter);
-		   $CostCode=  $this->input->post('id');
-		   $dt = new DateTime('now', new DateTimeZone('Asia/Kolkata'));
-				
-			$Year =  $dt->format('Y');
-			$this->load->model('purchaseorder_model');
-		    $result = $this->purchaseorder_model->GetAvailableBudgetAmount($CostCode,$Year,$ReqType);
-			//print_r($result);
-		    $AvilBudAmt = '';
-			if(count($result)>0)
-			{
-				 $AvilBudAmt = $result[0]['BudgetAmount'] -  $result[0]['Totalvalue'];
-			}	   
-		 
-		   print_r($AvilBudAmt);
-			
-	 }
-	 
-	 
-	 function getDateformat($Val)
-	{
-		$date = new DateTime($Val,new DateTimeZone('Asia/Kolkata'));
-		$retDate = $date->format('Y-m-d H:i:s');
-		return $retDate;
-	}
-	/* Method to get the Requistion list based on the search filter*/
-	
-	 function SearchListofRequistion()
-     {
-		$SearchFilter= $this->input->post('id');
-
-		$DEPCode =  $SearchFilter[0];
-		$Status =  $SearchFilter[1];
-		$rng =   $SearchFilter[2];;
-
-		$FromDate ='';
-		$ToDate = '';
-
-		$Dt =  explode("-",$rng);
-
-		if(count( $Dt)>1)
-		{
-			$FDate = $Dt[0];
-			$TDate = $Dt[1];
-			$FromDate =  $this->getDateformat($FDate);
-			$ToDate =  $this->getDateformat($TDate);
-		} 
-
-		$result =  $this->purchaseorder_model->getRequistionListbySearch($DEPCode,$Status,$FromDate,$ToDate);
-
-
-		$HTML="";	
-   		 for ($i = 0; $i < count($result); $i++)
-			 {
-					$SNo = $i + 1;
-					$ReqNo = $result[$i]['ReqNo'];
-					$ReqType = $result[$i]['ReqType'];
-					$Reqedby = $result[$i]['FirstName'];
-					$ReqDate = $result[$i]['ReqDate'];					
-					$Status = $result[$i]['StatusName'];
-					$Department = $result[$i]['DepartmentName'];
-					$Designation = $result[$i]['Designation'];
-					
-					$HTML.="<tr  id='".$i."'>
-							<td align='left'><input type='checkbox' name='chk'".$i." id='chk'".$i."/></td>
-							<td align='left'><a data-toggle='modal' data-target='#myModal'><u>". $ReqNo."</u></a></td>
-							   
-							<td align='left'>".$ReqType."</td>
-							
-							<td align='left'>".$Reqedby."</td>	
-							<td align='left'>".$ReqDate."</td>	
-							<td align='left'>".$Status."</td>	
-							<td align='left'>".$Department."</td>	
-							<td align='left'>".$Designation."</td>							
-							</tr>";					 
-			}	
-		  die(json_encode(array('ReqList' =>$HTML)));	
-     }
-	
-	
-	/* To View the request details*/	
-	 function ListPORequistion()
-     {
-		 $ReqNo= $this->input->post('id');
-         $result =  $this->requistion_model->getRequistItemList($ReqNo);
-		 $ReqList = $this->requistion_model->getRequistDetails($ReqNo);
-		 $DepNo = $ReqList[0]['DEPCode'];
-		 $CostList = $this->requistion_model->GetCostCenterByDept($DepNo);
-		  $HTML="";	
-   		  for ($i = 0; $i < count($result); $i++)
-			 {
-					$SNo = $i + 1;
-					$MaterialCode = $result[$i]['MaterialCode'];
-					$MaterialName = $result[$i]['MaterialName'];
-					$UOM = $result[$i]['UOM'];					
-					$Quantity = $result[$i]['Quantity'];
-					$HTML.="<tr  id='".$i."'>
-							<td align='left'>".$SNo."</td>
-							<td align='left'>". $MaterialCode."</td>
-													                      
-							<td align='left'>".$MaterialName."</td>
-							
-							<td align='left'>".$UOM."</td>	
-							<td align='left'>".$Quantity."</td>								
-							</tr>";
-
-					//$index =  $index + 1;
-   
-			}
-
-		$CostCenter = "<option value='-1'>Select Cost center</option>";
-		if(count($CostList) > 0)
-		   {
-             for ($j = 0; $j < count($CostList); $j++)
-			  {
-				$Code = $CostList[$j]['CostCenterCode'];
-				$Name = $CostList[$j]['CostCenterName'];
-				$CostCenter .="<option value='".$Code."'>".$Code."-".$Name."</option>";
-				}	
-		   }
-			
-			die(json_encode(array('Items' =>$HTML,'Requist'=>$ReqList,'Cost'=>$CostCenter)));	
-     }
-	 
-   //This used to Create Revenue Purchase Order
-	
-	function addNewPurchaseOrder()
-	{
-
-				$POdt =$this->input->post('PODate');
-				$PODate =  $this->getDateformat($POdt);
-                                $SupplierID = $this->input->post('drpSupplier');  
-				$DeliveryAddr = $this->input->post('DeliveryAddr');
-				$dt = $this->input->post('Deliverydt');
-				$POType = $this->input->post('POType');
-                                $DeliveryOption = $this->input->post('DateRange');
-                                if($DeliveryOption==1){
-                                 $Deliverydt = '';
-                                $DeliverySchedule = $this->input->post('Scheduleby');
-                                }
-                                 else{
-                                 $Deliverydt = $this->getDateformat($dt);
-                                $DeliverySchedule = '';
-                                }
-
-
-				$POType = $this->input->post('POType');
-				$PoRange = $this->input->post('txtPoRange');
-				
-				$SpcialInstruction = $this->input->post('SpcialInstruction');
-				$TotalOrderValueSummary = $this->input->post('txtTotalOrderValueSummary');
-                                 $POStatus = $this->input->post('txtStatus');
-
-                                $CreateBy = $this->session->userdata ( 'userId' );
-				$RowCount =  $this->input->post('txtRowCount'); 
-				$DeletedRow =  $this->input->post('txtDeletedRow'); 
-				
-				$comma_separated = explode(':', $DeletedRow);	
-				
-				$dt = new DateTime('now', new DateTimeZone('Asia/Kolkata'));				
-				$createddt =  $dt->format('Y-m-d H:i:s');
-
-				$PaymentTerms=$this->input->post('PaymentTerms');
-                               $OtherPayment=$this->input->post('Otherpayment');
-				$Local_Interstate=$this->input->post('Range');
-				// PO Master
-								$POList = array('SupplierID'=>$SupplierID, 'TotalOrderValue'=>$TotalOrderValueSummary,'PODate'=>$PODate,'DeliverySchedule'=>$DeliverySchedule,'DeliveryOption'=>$DeliveryOption,'Status'=>$POStatus,'PORange'=>$PoRange,'ServiceDescription'=>$SpcialInstruction,'CreatedBy'=>$CreateBy,'DeliveryAddress'=>$DeliveryAddr,'DeliveryDate'=>$Deliverydt,'CreatedDate'=>$createddt,'PaymentTerms'=>$PaymentTerms,'POType'=>$POType,'CapitalRange'=>$Local_Interstate,'PaymentOtherDescription'=>$OtherPayment);
-
-              //print_r($POList);
-              //die();  
-
-					
-					$POMaster  = $this->purchaseorder_model->addPOMaster($POList);
-					
-					 $PONO = '';
-					if(count($POMaster)>0)
-					{
-					  $PONO =  $POMaster[0]['PONO'];
-					}
-					
-					// PO Line Items
-					$LineItemStatus = REQITEM_NEW;
-					
-						for ($i = 1; $i <= $RowCount; $i++)
-							{	
-							
-								$MaterialCode = $this->input->post('materialCode'.$i);
-								$Quantity = $this->input->post('quantity'.$i); 
-								$Reqnumber = $this->input->post('Reqnumber'.$i);
-								$itemRate = $this->input->post('itemRate'.$i);
-
-								$DiscountType = $this->input->post('DisType'.$i);
-								$DiscountValue = $this->input->post('DisVal'.$i); 
-								$AfterDiscount = $this->input->post('AfterDisVal'.$i);
-								$PackagingOption = $this->input->post('PackOption'.$i);
-								$PackagingType = $this->input->post('PackType'.$i);
-								$PackagingValue = $this->input->post('PackVal'.$i); 
-								$AfterPackagingValue = $this->input->post('AfterPackVal'.$i);
-								
-								$FreightType = $this->input->post('FreightType'.$i);
-								$FreightValue = $this->input->post('FreightVal'.$i); 
-								$AfterFreightValue = $this->input->post('AfterFreightVal'.$i);
-                                                                $NOOfTrip = $this->input->post('NoOfTrip'.$i);
-								$InsuranceValue = $this->input->post('Insval'.$i);
-								$TotalOrderValue = $this->input->post('TotalOrderValue'.$i);							
-								$CostCenter	= $this->input->post('costCode'.$i);
-								  $Cgst = $this->input->post('RevenueCgst'.$i);
-                  $Sgst = $this->input->post('RevenueSgst'.$i);
-                                                                $Igst = $this->input->post('RevenueIgst'.$i);
-                                                                $AfterCgst = $this->input->post('RevenueAfterCgst'.$i);
-                                                                $AfterSgst = $this->input->post('RevenueAfterSgst'.$i);
-                                                                $AfterIgst = $this->input->post('RevenueAfterIgst'.$i);
-								$SkipInsert = "False";				 
-								if( count($comma_separated) > 0)
-								{
-								   for($j = 1; $j < count($comma_separated); $j++)
-								   {	
-									  $deletedRow = 	$comma_separated[$j]	;
-									
-									  if($deletedRow == $i  )
-									  {
-										  $SkipInsert = "True";
-										  break;
-									  }						 
-									  
-									}
-								 }
-								 if($SkipInsert == "False")
-									{
-										$POLineItemList = array('PONO'=>$PONO, 'ReqNo'=>$Reqnumber,'MaterialCode'=>$MaterialCode,'Quantity'=>$Quantity,'Rate'=>$itemRate,'Status'=>$LineItemStatus,'CreatedBy'=>$CreateBy,'CreatedDate'=>$createddt,'CostCenterCode'=>$CostCenter);
-							
-										$POLineItem = $this->purchaseorder_model->addPOLineItem($POLineItemList);
-							
-										$LineItemNo = '';
-										if(count($POLineItem)>0)
-										{
-											$LineItemNo =  $POLineItem[0]['LineItemNo'];
-										}
-										//echo $LineItemNo; 
-										
-										if(trim($POType) == REVENUE )
-										{
-										//	echo 'Success';
-										$RevenueTaxList = array('LineItemNo'=>$LineItemNo, 'DiscountType'=>$DiscountType,'DiscountValue'=>$DiscountValue,'AfterDiscount'=>$AfterDiscount,'PackagingType'=>$PackagingType,'PackagingValue'=>$PackagingValue,'PackagingCalulatedOn'=>$PackagingOption,'AfterPackagingValue'=>$AfterPackagingValue,'FreightType'=>$FreightType, 'FreightValue'=>$FreightValue,'AfterFreightValue'=>$AfterFreightValue,'Insurance'=>$InsuranceValue,'TotalValue'=>$TotalOrderValue, 'CreatedBy'=>$CreateBy,'CreatedDate'=>$createddt,'CGST'=>$Cgst,'AfterCGST'=>$AfterCgst,'SGST'=>$Sgst,'AfterSGST'=>$AfterSgst,'IGST'=>$Igst,'AfterIGST'=>$AfterIgst,'NoOfTrip'=>$NOOfTrip);
-										
-										$RevenueList = $this->purchaseorder_model->addRevenueTax($RevenueTaxList);
-										//echo 'Revenue tax Success';
-										}
-								}
-								
-							}							
-					echo 'Purchase Order Created Successfully! PO Number Is: '.$PONO ;
-					
-	}
-	//This used to Edit the Revenue Purchase Order
-	function EditRevenuePurchaseOrder()
-	{
-	
-				$PONO =$this->input->post('txtPONO');
-				$POdt =$this->input->post('PODate');
-				$PODate =  $this->getDateformat($POdt);
-                $SupplierID = $this->input->post('drpSupplier');  
-				$DeliveryAddr = $this->input->post('txtDeliveryAddress');
-				$dt = $this->input->post('Deliverydt');
-				//$Deliverydt = $this->getDateformat($dt);
-				$DeliveryOption = $this->input->post('DateRange');
-                                if($DeliveryOption==1){
-                                 $Deliverydt = '';
-                                $DeliverySchedule = $this->input->post('Scheduleby');
-                                }
-                                 else{
-                                 $Deliverydt = $this->getDateformat($dt);
-                                $DeliverySchedule = '';
-                                }
-
-
-
-
-
-				$POType = $this->input->post('POType');
-				$PoRange = $this->input->post('txtPoRange');
-				
-				$SpcialInstruction = $this->input->post('SpcialInstruction');
-				$TotalOrderValueSummary = $this->input->post('txtTotalOrderValueSummary');
-			    $POStatus = $this->input->post('txtStatus');
-
-                $updatedBy = $this->session->userdata ( 'userId' );
-				$RowCount =  $this->input->post('txtRowCount');
-				$DeletedRow =  $this->input->post('txtDeletedRow'); 
-				
-				$comma_separated = explode(':', $DeletedRow);	
-				$dt = new DateTime('now', new DateTimeZone('Asia/Kolkata'));				
-				$updateddt =  $dt->format('Y-m-d H:i:s');
-
-				$PaymentTerms=$this->input->post('PaymentTerms');
-                                $OtherPayment=$this->input->post('Otherpayment');
-				$Local_Interstate=$this->input->post('Range');
-				// PO Master
-				// PO Master
-				$POList = array('SupplierID'=>$SupplierID, 'TotalOrderValue'=>$TotalOrderValueSummary,'PODate'=>$PODate,'DeliverySchedule'=>$DeliverySchedule,'DeliveryOption'=>$DeliveryOption,'Status'=>$POStatus,'PORange'=>$PoRange,'ServiceDescription'=>$SpcialInstruction,'CreatedBy'=>$updatedBy,'DeliveryAddress'=>$DeliveryAddr,'DeliveryDate'=>$Deliverydt,'CreatedDate'=>$updateddt,'PaymentTerms'=>$PaymentTerms,'POType'=>$POType,'CapitalRange'=>$Local_Interstate,'PaymentOtherDescription'=>$OtherPayment);
-					
-					$POMaster  = $this->purchaseorder_model->updatePOMaster($PONO,$POList);				
-				
-					$LineItemStatus = REQITEM_NEW;
-					
-					
-						for ($i = 1; $i <= $RowCount; $i++)
-							{	
-							
-								$MaterialCode = $this->input->post('materialCode'.$i);
-								$Quantity = $this->input->post('quantity'.$i); 
-								$Reqnumber = $this->input->post('Reqnumber'.$i);
-								$itemRate = $this->input->post('itemRate'.$i);
-
-								$DiscountType = $this->input->post('DisType'.$i);
-								$DiscountValue = $this->input->post('DisVal'.$i); 
-								$AfterDiscount = $this->input->post('AfterDisVal'.$i);
-								$PackagingOption = $this->input->post('PackOption'.$i);
-								$PackagingType = $this->input->post('PackType'.$i);
-								$PackagingValue = $this->input->post('PackVal'.$i); 
-								$AfterPackagingValue = $this->input->post('AfterPackVal'.$i);
-								  $Cgst = $this->input->post('RevenueCgst'.$i);
-                                                                $Sgst = $this->input->post('RevenueSgst'.$i);
-                                                                $Igst = $this->input->post('RevenueIgst'.$i);
-                                                                $AfterCgst = $this->input->post('RevenueAfterCgst'.$i);
-                                                                $AfterSgst = $this->input->post('RevenueAfterSgst'.$i);
-                                                                $AfterIgst = $this->input->post('RevenueAfterIgst'.$i);
-								$FreightType = $this->input->post('FreightType'.$i);
-								$FreightValue = $this->input->post('FreightVal'.$i); 
-								$AfterFreightValue = $this->input->post('AfterFreightVal'.$i);
-								$NOOfTrip = $this->input->post('NoOfTrip'.$i);
-                                                                $InsuranceValue = $this->input->post('Insval'.$i);
-								$TotalOrderValue = $this->input->post('TotalOrderValue'.$i);							
-								$POLineItemNo = $this->input->post('LineItemNo'.$i);
-								$CostCenter	= $this->input->post('costCode'.$i);
-								$LineItemNo = '';
-								
-								
-								 $SkipInsert = "False";				 
-								   if( count($comma_separated) > 0)
-								   {
-								   for($j = 1; $j < count($comma_separated); $j++)
-								   {	
-									  $deletedRow = 	$comma_separated[$j]	;
-									
-									  if($deletedRow == $i  )
-									  {
-										  $SkipInsert = "True";
-										  break;
-									  }						 
-									  
-									}
-								   }
-
-								     if($SkipInsert == "False")
-									{
-                                                                        
-								if(strlen($POLineItemNo) == 0)
-								{ 
-									$POLineItemList = array('PONO'=>$PONO, 'ReqNo'=>$Reqnumber,'MaterialCode'=>$MaterialCode,'Quantity'=>$Quantity,'Rate'=>$itemRate,'Status'=>$LineItemStatus,'CreatedBy'=>$updatedBy,'CreatedDate'=>$updateddt,'CostCenterCode'=>$CostCenter);
-									$POLineItem = $this->purchaseorder_model->addPOLineItem($POLineItemList);
-									if(count($POLineItem)>0)
-									{
-										$LineItemNo =  $POLineItem[0]['LineItemNo'];
-									}
-					
-								}
-								else
-								{
-                                                               
-									$LineItemNo = $POLineItemNo;	
-							
-									$POLineItemList = array('PONO'=>$PONO, 'ReqNo'=>$Reqnumber,'MaterialCode'=>$MaterialCode,'Quantity'=>$Quantity,'Rate'=>$itemRate,'Status'=>$LineItemStatus,'UpdateBY'=>$updatedBy,'UpdatedOn'=>$updateddt,'CostCenterCode'=>$CostCenter);
-									$POLineItem = $this->purchaseorder_model->updatePOLineItem($PONO,$POLineItemNo,$POLineItemList);	
-							
-								}
-								$isExists = $this->purchaseorder_model->LineItemExistsinRevenueTax($LineItemNo); 
-								if(count($isExists) == 0)
-								{
-									$RevenueTaxList = array('LineItemNo'=>$LineItemNo, 'DiscountType'=>$DiscountType,'DiscountValue'=>$DiscountValue,'AfterDiscount'=>$AfterDiscount,'PackagingType'=>$PackagingType,'PackagingValue'=>$PackagingValue,'PackagingCalulatedOn'=>$PackagingOption,'AfterPackagingValue'=>$AfterPackagingValue,'FreightType'=>$FreightType, 'FreightValue'=>$FreightValue,'AfterFreightValue'=>$AfterFreightValue,'Insurance'=>$InsuranceValue,'TotalValue'=>$TotalOrderValue, 'CreatedBy'=>$updatedBy,'CreatedDate'=>$updateddt,'CGST'=>$Cgst,'AfterCGST'=>$AfterCgst,'SGST'=>$Sgst,'AfterSGST'=>$AfterSgst,'IGST'=>$Igst,'AfterIGST'=>$AfterIgst,'NoOfTrip'=>$NOOfTrip);
-								
-									$RevenueList = $this->purchaseorder_model->addRevenueTax($RevenueTaxList);
-								
-								}
-								else
-								{
-                                                               
-									$RevenueTaxList = array('DiscountType'=>$DiscountType,'DiscountValue'=>$DiscountValue,'AfterDiscount'=>$AfterDiscount,'PackagingType'=>$PackagingType,'PackagingValue'=>$PackagingValue,'PackagingCalulatedOn'=>$PackagingOption,'AfterPackagingValue'=>$AfterPackagingValue,'FreightType'=>$FreightType, 'FreightValue'=>$FreightValue,'AfterFreightValue'=>$AfterFreightValue,'Insurance'=>$InsuranceValue,'TotalValue'=>$TotalOrderValue, 'UpdateBY'=>$updatedBy,'UpdatedOn'=>$updateddt,'CGST'=>$Cgst,'AfterCGST'=>$AfterCgst,'SGST'=>$Sgst,'AfterSGST'=>$AfterSgst,'IGST'=>$Igst,'AfterIGST'=>$AfterIgst,'CreatedBy'=>$updatedBy,'NoOfTrip'=>$NOOfTrip);
-									
-									$this->purchaseorder_model->updateRevenueTax($LineItemNo,$RevenueTaxList); 
-									
-										}
-							 }								
-								
-							}							
-					
-					echo 'Purchase Order Updated Successfully! PO Number Is: '.$PONO ;
-	}
-    function pageNotFound()
-    {
-        $this->global['pageTitle'] = 'CodeInsect : 404 - Page Not Found';
-        
-        $this->loadViews("404", $this->global, NULL, NULL);
-    }
-	
-	public function revenuepoprint($PONO) 
-    {
-    // Load all views as normal
-     
-         
-            //$PONO =   $_GET['PO'];
-             
-                $data['CompanyDetails'] =  $this->purchaseorder_model->getCompanyInformation();
-                $data['POItem'] = $this->purchaseorder_model->GetRevenuePurchaseOrderDetailsForPDF($PONO);
-                           $data['releasedetails'] = $this->purchaseorder_model->GetReleasedDetails($PONO);
-            $data['CurrencySymbol']=$this->purchaseorder_model->GerCurrencyCodeName('INR');
-            
-                       $Currencycode='';
-                       
-               $TotalOrderValue=$data['POItem'][0]->TotalOrderValue;              
-                       
-                        $totalAmt=sprintf("%.2f", $TotalOrderValue);
-                    
-                        $data['TotalAmountInWords']= $this->convertNumber($totalAmt);
-                        $data['RequistionDetails'] = $this->purchaseorder_model->GetPdfRequistionDetails($PONO);
-            // Add header to pdf
-            //$this->load->view('includes/pdfheader');
-            
-            // Load the pdf page with multiviews
-                            $this->load->View("revenuepopdf", $data);
-            
-            // Add header to pdf
-            //$this->load->view('includes/pdffooter');
-            
-            // Get output html
-            $php = $this->output->get_output();
-            
-            // Load library
-            $this->load->library('dompdf_gen');
-            
-            // Convert to PDF
-            $this->dompdf->load_html($php);
-            $this->dompdf->render();
-            $data['Attachment'] = FALSE;
-            $this->dompdf->stream("RevenuePOReport.pdf",$data,$php);
-          
-}
-
-
-
-public function mrirrevenuepoprint($PONO) 
-    {
-    // Load all views as normal
-     
-         
-            //$PONO =   $_GET['PO'];
-             
-                $data['CompanyDetails'] =  $this->purchaseorder_model->getCompanyInformation();
-                $data['POItem'] = $this->purchaseorder_model->GetRevenuePurchaseOrderDetailsForPDF($PONO);
-               $data['releasedetails'] = $this->purchaseorder_model->GetReleasedDetails($PONO);
-            $data['CurrencySymbol']=$this->purchaseorder_model->GerCurrencyCodeName('INR');
-            
-                       $Currencycode='';
-                       
-               $TotalOrderValue=$data['POItem'][0]->TotalOrderValue;
-
-                $AdvanceAmount=0.00;
-               foreach ($data['POItem'] as $POI) 
-               {
-                    $AdvanceAmount=$POI->AdvanceAmount;        
-               }     
-
-               //echo "total $TotalOrderValue";
-               //echo "Advance $TotaltoPay";
-                 $TotaltoPay=0.00;
-                 $TotaltoPay=$TotalOrderValue-$AdvanceAmount;
-                // echo "$TotaltoPay";
-                       
-                        $totalAmt=sprintf("%.2f",$TotaltoPay);
-                    
-                        $data['TotalAmountInWords']= $this->convertNumber($totalAmt);
-                        $data['RequistionDetails'] = $this->purchaseorder_model->GetPdfRequistionDetails($PONO);
-            // Add header to pdf
-            //$this->load->view('includes/pdfheader');
-            
-            // Load the pdf page with multiviews
-                            $this->load->View("mrirrevenuepopdf", $data);
-            
-            // Add header to pdf
-            //$this->load->view('includes/pdffooter');
-            
-            // Get output html
-            $php = $this->output->get_output();
-            
-            // Load library
-            $this->load->library('dompdf_gen');
-            
-            // Convert to PDF
-            $this->dompdf->load_html($php);
-            $this->dompdf->render();
-            $data['Attachment'] = FALSE;
-            $this->dompdf->stream("RevenuePOReport.pdf",$data,$php);
-          
-}
- public function servicepoprint($PONO)
- {
-   
-        //    $this->load->view('includes/pdfheader');
-            
-            // Load the pdf page with multiviews
-            $data['CompanyDetails'] =  $this->purchaseorder_model->getCompanyInformation();
-            $data['POItem'] = $this->purchaseorder_model->GetServicePurchaseOrderDetailsForPrint($PONO);
-                 
-                      
-            $data['releasedetails'] = $this->purchaseorder_model->GetReleasedDetails($PONO);
-                     
-                     $data['CurrencySymbol']=$this->purchaseorder_model->GerCurrencyCodeName('INR');
-                   
-                    //print_r( $data['CurrencySymbol']);
-                   
-                      $TotalOrderValue=0;
-                      $Currencycode='';
-                       foreach ($data['POItem'] as $POValue) 
-            {
-                   
-                $TotalOrderValue=$TotalOrderValue + $POValue->TotalValue;
-                             
-
-            }
-                   
-               
-                     
-                       $totalAmt=sprintf("%.2f", $TotalOrderValue);
-                 
-                       $data['TotalAmountInWords']= $this->convertNumber($totalAmt);
-                     
-                       $data['RequistionDetails'] = $this->purchaseorder_model->GetPdfRequistionDetails($PONO);
-                       
-                       $this->load->View("servicepopdf", $data);
-            
-            // Add header to pdf
-            //$this->load->view('includes/pdffooter');
-            
-            // Get output html
-            $php = $this->output->get_output();
-            
-            // Load library
-            $this->load->library('dompdf_gen');
-            
-            // Convert to PDF
-            $this->dompdf->load_html($php);
-            $this->dompdf->render();
-            $data['Attachment'] = FALSE;
-            $this->dompdf->stream("ServicePOReport.pdf",$data,$php);
-          
-}
-
-
-
-
-public function mrirservicepoprint($PONO)
- {
-   
-        //    $this->load->view('includes/pdfheader');
-            
-            // Load the pdf page with multiviews
-            $data['CompanyDetails'] =  $this->purchaseorder_model->getCompanyInformation();
-            $data['POItem'] = $this->purchaseorder_model->GetServicePurchaseOrderDetailsForPrint($PONO);
-                 
-                      
-            $data['releasedetails'] = $this->purchaseorder_model->GetReleasedDetails($PONO);
-                     
-                     $data['CurrencySymbol']=$this->purchaseorder_model->GerCurrencyCodeName('INR');
-                   
-                    //print_r( $data['CurrencySymbol']);
-                   
-                      $TotalOrderValue=0;
-                      $Currencycode='';
-                       foreach ($data['POItem'] as $POValue) 
-                        {
-                   
-                         $TotalOrderValue=$TotalOrderValue + $POValue->TotalValue;
-                             
-                        }
-                   
-                           $Advance=0.00;
-                        foreach ($data['POItem'] as $PO) 
-                        {
-                           $Advance=$PO->AdvanceAmount;
-                        }
-                      
-                      $TotaltoPay=0.00;
-                      $TotaltoPay=$TotalOrderValue-$Advance;
-                      //echo $TotaltoPay;
-               
-                     
-                       $totalAmt=sprintf("%.2f", $TotaltoPay);
-                 
-                       $data['TotalAmountInWords']= $this->convertNumber($totalAmt);
-                     
-                       $data['RequistionDetails'] = $this->purchaseorder_model->GetPdfRequistionDetails($PONO);
-                       
-                       $this->load->View("mrirservicepopdf", $data);
-            
-            // Add header to pdf
-            //$this->load->view('includes/pdffooter');
-            
-            // Get output html
-            $php = $this->output->get_output();
-            
-            // Load library
-            $this->load->library('dompdf_gen');
-            
-            // Convert to PDF
-            $this->dompdf->load_html($php);
-            $this->dompdf->render();
-            $data['Attachment'] = FALSE;
-            $this->dompdf->stream("ServicePOReport.pdf",$data,$php);
-          
-}
-
-public function importpoprint($PONO) 
-  {
-    
-            //$this->load->view('includes/pdfheader');
-            
-            // Load the pdf page with multiviews
-				$Requester='';
-				$Depcode='';
-				$Currencycode='';
-            $data['CompanyDetails'] =  $this->purchaseorder_model->getCompanyInformation();
-            $data['POItem'] = $this->purchaseorder_model->GetImportPurchaseOrderDetailsForPDF($PONO);
-            $data['releasedetails'] = $this->purchaseorder_model->GetReleasedDetails($PONO);
-           //print_r( $data['releasedetails']);
-            foreach ($data['POItem'] as $Reqdby) 
-            {
-                $Requester=$Reqdby->Requestedby;
-
-            }
-
-            foreach ($data['POItem'] as $CURTYPE) 
-            {
-                $Currencycode=$CURTYPE->CurrencyType;
-            }
-
-            $data['Requestername']=$this->purchaseorder_model->GerRequesterName($Requester);
-
-            foreach ($data['Requestername'] as $ReqDep) 
-            {
-                $Depcode=$ReqDep->Departmentcode;
-            }
-
-            $data['DEPCODE']=$this->purchaseorder_model->GerRequesterDep($Depcode);
-            //print_r($data['Requestername']);
-            $data['Currencytype']=$this->purchaseorder_model->GerCurrencyCodeName($Currencycode);
-            $ProductPrice='';
-			$TotalOrderValue = '';
-            foreach ($data['POItem'] as $PO ) 
-            {
-                $TotalOrderValue=$PO->TotalOrderValue;
-            }
-            
-           //$totalAmt=sprintf("%.2f", $ProductPrice);
-            //$data['TotalAmountInWords']= $this->convertNumber($totalAmt);
-            //print_r($data['TotalAmountInWords']);
-
-            //$this->load->View("importpopdf", $data);
-            
-
-                       $CurrencyType='';
-                       if(!empty($data['POItem'])){
-                           $CurrencyType=$data['POItem'][0]->CurrencyType; 
-                         }
-                       //echo $CurrencyType;
-                        
-                       if($CurrencyType=='')
-					   {
-                         $data['CurrencySymbol']=$this->purchaseorder_model->GerCurrencyCodeName('INR');
-					   }
-						else
-						{
-								$data['CurrencySymbol']=$this->purchaseorder_model->GerCurrencyCodeName($CurrencyType);
-						}
-						
-                       // $TotalOrderValue=$data['POItem'][0]->$TotalOrderValue;
-                       //print_r($data['POItem'][0]);             
-                       
-                        $totalAmt=sprintf("%.2f", $TotalOrderValue);
-                    
-                        $data['TotalAmountInWords']= $this->convertNumber($totalAmt);                   
-                      
-                    
-                        
-                      
-					    $SymbolCurrency = '';
-						$SymbolCurrencyName ='';
-						$PaiseVal = '';
-						if(!empty($data['CurrencySymbol']) >0)
-						{
-                           $SymbolCurrency=$data['CurrencySymbol'][0]->FontCode2000;
-                           $SymbolCurrencyName=$data['CurrencySymbol'][0]->Currency;
-                           $PaiseVal=$data['CurrencySymbol'][0]->PaiseVal;
-						}
-                          $TotalOrderValue=$data['POItem'][0]->TotalOrderValue;              
-                       
-                        $totalAmt=sprintf("%.2f", $TotalOrderValue);
-                    
-                        $data['TotalAmountInWords']= $this->convertNumberSymbol($totalAmt,$SymbolCurrency,$SymbolCurrencyName,$PaiseVal);
-                           
-
-                         $this->load->View("importpopdf", $data);
-
-                       // $this->load->View("mririmportpopdf", $data);
-
-
-            // Add header to pdf
-        //s $this->load->view('includes/pdffooter');
-            
-            // Get output html
-         $php = $this->output->get_output();
-            
-            // Load library
-         $this->load->library('dompdf_gen');
-            
-            // Convert to PDF
-            //$this->dompdf->set_paper(array(0, 0, 841.89, 1190.55), 'landscape');
-         $this->dompdf->load_html($php);
-            $this->dompdf->render();
-            $data['Attachment'] = FALSE;
-          $this->dompdf->stream("ImportPOReport.pdf",$data,$php); 
-          
-}
-
-
-
-public function mririmportpoprint($PONO) 
-  {
-    
-            //$this->load->view('includes/pdfheader');
-            
-            // Load the pdf page with multiviews
-        $Requester='';
-        $Depcode='';
-        $Currencycode='';
-            $data['CompanyDetails'] =  $this->purchaseorder_model->getCompanyInformation();
-            $data['POItem'] = $this->purchaseorder_model->GetImportPurchaseOrderDetailsForPDF($PONO);
-            $data['releasedetails'] = $this->purchaseorder_model->GetReleasedDetails($PONO);
-           //print_r( $data['POItem']);
-            foreach ($data['POItem'] as $Reqdby) 
-            {
-                $Requester=$Reqdby->Requestedby;
-
-            }
-
-            foreach ($data['POItem'] as $CURTYPE) 
-            {
-                $Currencycode=$CURTYPE->CurrencyType;
-            }
-
-            $data['Requestername']=$this->purchaseorder_model->GerRequesterName($Requester);
-
-            foreach ($data['Requestername'] as $ReqDep) 
-            {
-                $Depcode=$ReqDep->Departmentcode;
-            }
-
-            $data['DEPCODE']=$this->purchaseorder_model->GerRequesterDep($Depcode);
-            //print_r($data['Requestername']);
-            $data['Currencytype']=$this->purchaseorder_model->GerCurrencyCodeName($Currencycode);
-            $ProductPrice='';
-      $TotalOrderValue = '';
-            foreach ($data['POItem'] as $PO ) 
-            {
-                $TotalOrderValue=$PO->TotalOrderValue;
-            }
-
-            foreach ($data['POItem'] as $POI) 
-            {
-              $AdvanceAmount=$POI->AdvanceAmount;
-            }
-            
-            //echo "Total $TotalOrderValue";
-            //echo "Advance $AdvanceAmount";
-            //$TotaltoPay=0.00;
-            $TotaltoPay=$TotalOrderValue-$AdvanceAmount;
-            //echo "Total to pay $TotaltoPay";
-           //$totalAmt=sprintf("%.2f", $ProductPrice);
-            //$data['TotalAmountInWords']= $this->convertNumber($totalAmt);
-            //print_r($data['TotalAmountInWords']);
-
-            //$this->load->View("importpopdf", $data);
-            
-
-                       $CurrencyType='';
-                       if(!empty($data['POItem'])){
-                           $CurrencyType=$data['POItem'][0]->CurrencyType; 
-                         }
-                       //echo $CurrencyType;
-                        
-                       if($CurrencyType=='')
-             {
-                         $data['CurrencySymbol']=$this->purchaseorder_model->GerCurrencyCodeName('INR');
-             }
-            else
-            {
-                $data['CurrencySymbol']=$this->purchaseorder_model->GerCurrencyCodeName($CurrencyType);
-            }
-            
-                       // $TotalOrderValue=$data['POItem'][0]->$TotalOrderValue;
-                       //print_r($data['POItem'][0]);             
-                       
-                        $totalAmt=sprintf("%.2f", $TotaltoPay);
-                        //echo $totalAmt;
-                    
-                        $data['TotalAmountInWords']= $this->convertNumber($totalAmt);                   
-                      
-                    
-                        
-                      
-              $SymbolCurrency = '';
-            $SymbolCurrencyName ='';
-            $PaiseVal = '';
-            if(!empty($data['CurrencySymbol']) >0)
-            {
-                           $SymbolCurrency=$data['CurrencySymbol'][0]->FontCode2000;
-                           $SymbolCurrencyName=$data['CurrencySymbol'][0]->Currency;
-                           $PaiseVal=$data['CurrencySymbol'][0]->PaiseVal;
-            }
-                          $TotalOrderValue=$data['POItem'][0]->TotalOrderValue;              
-                       
-                        $totalAmt=sprintf("%.2f", $TotaltoPay);
-                    
-                        $data['TotalAmountInWords']= $this->convertNumberSymbol($totalAmt,$SymbolCurrency,$SymbolCurrencyName,$PaiseVal);
-                           
-
-                         // $this->load->View("importpopdf", $data);
-
-                        $this->load->View("mririmportpopdf", $data);
-
-
-            // Add header to pdf
-        //s $this->load->view('includes/pdffooter');
-            
-            // Get output html
-         $php = $this->output->get_output();
-            
-            // Load library
-         $this->load->library('dompdf_gen');
-            
-            // Convert to PDF
-            //$this->dompdf->set_paper(array(0, 0, 841.89, 1190.55), 'landscape');
-         $this->dompdf->load_html($php);
-            $this->dompdf->render();
-            $data['Attachment'] = FALSE;
-          $this->dompdf->stream("ImportPOReport.pdf",$data,$php); 
-          
-}
-
-/**
-     * This function used to load the Delete the Requistion Items
-	 */
-    function DeletePODetails()
-     {
-		   	  
- 		    $ReqList=  $this->input->post('id');
-			$LineItemNo = '';
-		    $ReqNo ='';
-		    $MaterialCode = '';
-			$POType = '';
-		   if(count($ReqList) > 0) 
-		   {
-			   $LineItemNo = $ReqList[0];
-			   $ReqNo =  $ReqList[1];
-			   $MaterialCode =  $ReqList[2];
-			   $POType = $ReqList[3];
-		   }
-		  // print_r($ReqList);	   
-		  
-		   
-		  If($POType == REVENUE)
-		   {
-			   $this->purchaseorder_model->DeletePORevenueTax($LineItemNo); 
-		   }
-		   else If($POType == SERVICE)
-		   {
-			    $this->purchaseorder_model->DeletePOServiceTax($LineItemNo);
-		   }
-		   else If($POType == IMPORT)
-		   {
-			    $this->purchaseorder_model->DeletePOImportTax($LineItemNo);
-		   }
-		    else If($POType == CAPITAL)
-		   {
-			    $this->purchaseorder_model->DeletePOImportTax($LineItemNo);
-                      $this->purchaseorder_model->DeletePOServiceTax($LineItemNo);
-		   }
-           $this->purchaseorder_model->DeletePOLineItem($LineItemNo , $ReqNo,$MaterialCode);		   
-           echo "Successfully Deleted the Line item".$LineItemNo;	  
-        
-     }
-
-
-
-function addNewImportPurchaseOrder()
-    {//echo ("ggh");
-
-        $POdt =$this->input->post('PODate');
-                $PODate =  $this->getDateformat($POdt);
-                $SupplierID = $this->input->post('drpSupplier');  
-                $DeliveryAddr = $this->input->post('DeliveryAddr');
-                //$dt = $this->input->post('Deliverydt');
-                //$Deliverydt = $this->getDateformat($dt);
-                $POType = $this->input->post('POType');
-                $PoRange = $this->input->post('txtPoRange');
-                //$Dispatchinstruction=$this->post('Dispatch');
-                //echo $Dispatchinstruction;
-                //die();
-                //$Schedule=$this->post('Scheduleby');
-                $DeliveryOption = $this->input->post('DateRange');
-           
-                //echo $DeliveryOption;
-                //die(); 
-                $DeliverySchedule='';
-                $Dispatch='';
-                if($DeliveryOption==1)
-                {
-                   $Dispatch='';
-                   $DeliverySchedule = $this->input->post('Scheduleby');
-                }
-
-
-                else
-                {
-                   $Dispatch = $this->input->post('Dispatch');
-                   $DeliverySchedule = '';
-                }
-
-
-                // $PaymentDate=$this->input->post('Payment');
-                // if($PaymentDate==1)
-                // {
-                //  $PaymentDays='After';
-                // }
-                // else
-                // {
-                //  $PaymentDays='Before';
-                // }
-
-                //echo $PaymentDays;
-                //die();
-                 
-                $SpcialInstruction = $this->input->post('txtSpcialInstruction');
-                $TotalOrder = $this->input->post('txtToatlOrder');
-                $POStatus = $this->input->post('textStatus');
-              //echo "$POStatus";
-              //die();
-
-                $CreateBy = $this->session->userdata ( 'userId' );
-                $RowCount =  $this->input->post('txtRowCount'); 
-
-                $DeletedRow =  $this->input->post('txtDeletedRow'); 
-                
-                $comma_separated = explode(':', $DeletedRow);   
-                
-                $dt = new DateTime('now', new DateTimeZone('Asia/Kolkata'));                
-                $createddt =  $dt->format('Y-m-d H:i:s');
-                $Exchangerate=$this->input->post('ExchangeRate');
-                $ExchangeRateCalculatedon=$this->input->post('Exchangerateon');
-                $CurrencyType=$this->input->post('currencytype');
-                
-                $PaymentTerms=$this->input->post('PaymentTerms');
-                $Palaceoforigin=$this->input->post('PlaceOforigin');
-                // $Payableat=$this->input->post('PayableAT');
-
-                
-
-                // $POList = array('SupplierID'=>$SupplierID, 'TotalOrderValue'=>$TotalOrder,'PODate'=>$PODate,'Status'=>$POStatus,'PORange'=>$PoRange,'ServiceDescription'=>$SpcialInstruction,'CreatedBy'=>$CreateBy,'DeliveryAddress'=>$DeliveryAddr,'CreatedDate'=>$createddt,'ExchangeRate'=>$Exchangerate,'ExchangeRateCalculatedon'=>$ExchangeRateCalculatedon,'CurrencyType'=>$CurrencyType,'PaymentTerms'=>$PaymentTerms,'POType'=>$POType);
-
-
-                $POList = array('SupplierID'=>$SupplierID, 'TotalOrderValue'=>$TotalOrder,'PODate'=>$PODate,'Status'=>$POStatus,'PORange'=>$PoRange,'ServiceDescription'=>$SpcialInstruction,'CreatedBy'=>$CreateBy,'DeliveryAddress'=>$DeliveryAddr,'Import_DispatchDetails'=>$Dispatch,'CreatedDate'=>$createddt,'DeliverySchedule'=>$DeliverySchedule,'DeliveryOption'=>$DeliveryOption,'ExchangeRate'=>$Exchangerate,'ExchangeRateCalculatedon'=>$ExchangeRateCalculatedon,'CurrencyType'=>$CurrencyType,'PaymentTerms'=>$PaymentTerms,'POType'=>$POType,'Import_PlaceofOrgin'=>$Palaceoforigin);
-                     
-                 //print_r($POList);
-               //die();
-                    $POMaster  = $this->purchaseorder_model->addPOMaster($POList);
-                    
-                     $PONO = '';
-                    if(count($POMaster)>0)
-                    {
-                     $PONO =  $POMaster[0]['PONO'];
-                    }
-                    //echo $PONO; 
-                    //echo $POType;
-                    // PO Line Items
-                    $LineItemStatus = REQITEM_NEW;
-                    //echo ' test:'.REVENUE;
-                    //echo $RowCount;
-                        for ($i = 1; $i <= $RowCount; $i++)
-                            {   
-                            //echo "AS";
-                                $MaterialCode = $this->input->post('materialCode'.$i);
-                                $Quantity = $this->input->post('quantity'.$i); 
-                                $Reqnumber = $this->input->post('Reqnumber'.$i);
-                                $itemRate = $this->input->post('itemRate'.$i);
-
-                                //$Exchangerate = $this->input->post('Exchangerate'.$i);
-                                $BasicPriceinmton = $this->input->post('BasicPriceinUS'.$i); 
-                                $Productprice = $this->input->post('BasicAmt'.$i);
-                                $LandingCharge = $this->input->post('LandingChargee'.$i);
-                                $AfterLandingCharge = $this->input->post('AfterLandingChargee'.$i);
-                                $HighSeas = $this->input->post('Highseass'.$i);
-                                $AfterHighSeas = $this->input->post('AfterHighseass'.$i);
-
-                                $CustomDuty = $this->input->post('Customduty'.$i);
-                                $AfterCustomDuty = $this->input->post('AfterCustomduty'.$i);
-
-                                $ExciseDuty = $this->input->post('ExcisedutyTax'.$i);
-                                $AfterExciseDuty = $this->input->post('AfterExcisedutyTax'.$i);
-                                $ExciseDutyEd = $this->input->post('ExcisedutyED'.$i);
-                                $AfterExciseDutyEd = $this->input->post('AfterExcisedutyED'.$i);
-
-                                $ExciseDutySH = $this->input->post('ExcisedutySH'.$i);
-                                $AfterExciseDutySH = $this->input->post('AfterExcisedutySH'.$i);
-
-                                $CustomEd= $this->input->post('CustomEDcess'.$i); 
-                                $AfterCustomEd= $this->input->post('AfterCustomEDcess'.$i); 
-
-                                $CustomSH = $this->input->post('CustomSHcess'.$i);
-                                $AfterCustomSH = $this->input->post('AfterCustomSHcess'.$i);
-
-                                $AddAdtional = $this->input->post('AdditionalExciseduty'.$i);
-                                $AfterAddAdtional = $this->input->post('AfterAdditionalExciseduty'.$i);
-
-                                $Grossdutypayable = $this->input->post('Grossdutypayable'.$i);
-                                $AvailableModvat = $this->input->post('AvilableModvat'.$i);
-                                $Grossexpensesduetocustomduty = $this->input->post('Grossexpenses'.$i);
-                                $purchaseratePerKG = $this->input->post('purchaserate'.$i);
-                                $CustomDutyExpensesPerKG = $this->input->post('CustomDutyExpenses'.$i);
-                                $RMCIncludingCustomersPerKG = $this->input->post('RMCIncludingCustomers'.$i);
-                                $QuantityKG = $this->input->post('PurQuantity'.$i);
-
-                                //$currencytypeID = $this->input->post('currencytype'); 
-                                $Totalvalueitem=$this->input->post('TotalExp'.$i);
-
-                                //echo $BasicPriceinmton;
-                                $CostCenter = $this->input->post('costCode'.$i);
-                                
-                                $SkipInsert = "False";               
-                                if( count($comma_separated) > 0)
-                                {
-                                   for($j = 1; $j < count($comma_separated); $j++)
-                                   {    
-                                      $deletedRow =     $comma_separated[$j]    ;
-                                    
-                                      if($deletedRow == $i  )
-                                      {
-                                          $SkipInsert = "True";
-                                          break;
-                                      }                      
-                                      
-                                    }
-                                 }
-                                 if($SkipInsert == "False")
-                                    {
-                                        $POLineItemList = array('PONO'=>$PONO, 'ReqNo'=>$Reqnumber,'MaterialCode'=>$MaterialCode,'Quantity'=>$Quantity,'Rate'=>$itemRate,'Status'=>$LineItemStatus,'CreatedBy'=>$CreateBy,'CreatedDate'=>$createddt,'CostCenterCode'=>$CostCenter);
-
-                                        //print_r($POLineItemList);
-                                        //die();
-                            
-
-                                        $POLineItem = $this->purchaseorder_model->addPOLineItem($POLineItemList);
-                            
-                                        $LineItemNo = '';
-                                        if(count($POLineItem)>0)
-                                        {
-                                            $LineItemNo =  $POLineItem[0]['LineItemNo'];
-                                        }
-                                        //echo $LineItemNo; 
-                                        
-                                        if(trim($POType) == IMPORT )
-                                        {
-                                        //  echo 'Success';
-                                        $ImportTaxList = array('LineItemNo'=>$LineItemNo,'BasicPriceInMTon'=>$BasicPriceinmton,'ProductPrice'=>$Productprice,'LandingCharge'=>$LandingCharge,'AfterLandingCharge'=>$AfterLandingCharge,'AfterHighSeasSalesCharge'=>$AfterHighSeas,'HighSeasSalesCharge'=>$HighSeas,'CustomDuty'=>$CustomDuty,'AfterCustomDuty'=>$AfterCustomDuty,'ExciseDuty'=>$ExciseDuty,'AfterExciseDuty'=>$AfterExciseDuty,'ExciseDutyEdCess'=>$ExciseDutyEd,'AfterExciseDutyEdCess'=>$AfterExciseDutyEd,'ExciseDutySHCess'=>$ExciseDutySH,'CustomEdCess'=>$CustomEd,'CustomSHCess'=>$CustomSH,'AddlExciseDuty'=>$AddAdtional,'CreatedBy'=>$CreateBy,'CreatedDate'=>$createddt,'AfterExciseDutySHCess'=>$AfterExciseDutySH,'AfterAddlExciseDuty'=>$AfterAddAdtional,'Grossdutypayable'=>$Grossdutypayable,'AvailableModvat'=>$AvailableModvat,'Grossexpensesduetocustomduty'=>$Grossexpensesduetocustomduty,'purchaseratePerKG'=>$purchaseratePerKG,'CustomDutyExpensesPerKG'=>$CustomDutyExpensesPerKG,'RMCIncludingCustomersPerKG'=>$RMCIncludingCustomersPerKG,'QuantityKG'=>$QuantityKG,'AfterCustomSHCess'=>$AfterCustomSH,'AfterCustomEdCess'=>$AfterCustomEd,'TotalValue'=>$Totalvalueitem);
-                                        //print_r($ImportTaxList);
-                                        //die();
-                                         
-                                        
-                                        $ImportList = $this->purchaseorder_model->addImportTax($ImportTaxList);
-                                        
-                                        }
-                                }
-                                
-                            }                           
-                    echo 'Purchase Order Created Successfully! PO Number Is: '.$PONO ;
-    }
-
-
-    function EditImportPurchaseOrder()
-    {
-
-         //echo "dfds";
-         //die();
-                $PONO =$this->input->post('txtPONO');
-                $POdt = '';
-                $createddt='';
-
-                $PODate =  $this->getDateformat($POdt);
-                $SupplierID = $this->input->post('drpSupplier');  
-                $DeliveryAddr = $this->input->post('DeliveryAddr');
-                $dt = $this->input->post('Deliverydt');
-                $Deliverydt = $this->getDateformat($dt);
-                $POType = $this->input->post('POType');
-                //$PoRange = $this->input->post('txtPoRange');
-                //$DeliveryOption = $this->input->post('DateRange');
-
-                $Exchangerate=$this->input->post('ExchangeRate');
-                $ExchangeRateCalculatedon=$this->input->post('Exchangerateon');
-                $CurrencyType=$this->input->post('currencytype');
-
-                $DeliveryOption = $this->input->post('DateRange');
-           
-                //echo $DeliveryOption;
-                //die(); 
-                $DeliverySchedule='';
-                $Dispatch='';
-                if($DeliveryOption==1)
-                {
-                   $Dispatch='';
-                   $DeliverySchedule = $this->input->post('Scheduleby');
-                }
-
-
-                else
-                {
-                   $Dispatch = $this->input->post('Dispatch');
-                   $DeliverySchedule = '';
-                }
-                
-
-                // if($DeliveryOption==1){
-                //   $Deliverydt = '';
-                //   $DeliverySchedule = $this->input->post('Scheduleby');
-                //   }
-                // else{
-                //   $Deliverydt = $this->getDateformat($dt);
-                //   $DeliverySchedule = '';
-                //   }
-               // $PaymentDate=$this->input->post('Payment');
-                // if($PaymentDate==1)
-                // {
-                //     $PaymentDays='After';
-                // }
-                // else
-                // {
-                //     $PaymentDays='Before';
-                // }
-                
-                $SpcialInstruction = $this->input->post('txtSpcialInstruction');
-                //$TotalOrder = $this->input->post('txtToatlOrder');
-                $TotalOrder = $this->input->post('txttot');
-               // echo $TotalOrder;
-                //die();
-                $POStatus = $this->input->post('txtStatus');
-
-                $CreateBy = $this->session->userdata ( 'userId' );
-                $RowCount =  $this->input->post('txtRowCount'); 
-                $DeletedRow =  $this->input->post('txtDeletedRow'); 
-                
-                $comma_separated = explode(':', $DeletedRow);       
-                $dt = new DateTime('now', new DateTimeZone('Asia/Kolkata'));                
-                $updateddt =  $dt->format('Y-m-d H:i:s');
-
-                $PaymentTerms=$this->input->post('PaymentTerms');
-
-                $Palaceoforigin=$this->input->post('PlaceOforigin');
-                // $Payableat=$this->input->post('PayableAT');
-                // PO Master
-                // PO Master
-                // $POList = array('SupplierID'=>$SupplierID, 'TotalOrderValue'=>$TotalOrder,'PODate'=>$PODate,'Status'=>$POStatus,'ServiceDescription'=>$SpcialInstruction,'CreatedBy'=>$CreateBy,'DeliveryAddress'=>$DeliveryAddr,'DeliveryDate'=>$Deliverydt,'CreatedDate'=>$updateddt,'DeliverySchedule'=>$DeliverySchedule,'DeliveryOption'=>$DeliveryOption,'ExchangeRate'=>$Exchangerate,'ExchangeRateCalculatedon'=>$ExchangeRateCalculatedon,'CurrencyType'=>$CurrencyType,'PaymentTerms'=>$PaymentTerms);
-
-
-
-                $POList = array('SupplierID'=>$SupplierID, 'TotalOrderValue'=>$TotalOrder,'PODate'=>$PODate,'Status'=>$POStatus,'ServiceDescription'=>$SpcialInstruction,'CreatedBy'=>$CreateBy,'DeliveryAddress'=>$DeliveryAddr,'Import_DispatchDetails'=>$Dispatch,'CreatedDate'=>$createddt,'DeliverySchedule'=>$DeliverySchedule,'DeliveryOption'=>$DeliveryOption,'ExchangeRate'=>$Exchangerate,'ExchangeRateCalculatedon'=>$ExchangeRateCalculatedon,'CurrencyType'=>$CurrencyType,'PaymentTerms'=>$PaymentTerms,'POType'=>$POType,'Import_PlaceofOrgin'=>$Palaceoforigin);
-                //echo $PONO;
-                //echo $TotalOrder;
-                //print_r($POList);
-                //die();
-                    
-                    $POMaster  = $this->purchaseorder_model->updatePOMaster($PONO,$POList);             
-                   //echo "sdasds";
-                    $LineItemStatus = REQITEM_NEW;
-                    //echo $LineItemStatus;
-                    
-                    
-                
-                    //echo $RowCount;
-                        for ($i = 1; $i <= $RowCount; $i++)
-                            {   
-                                
-                                $MaterialCode = $this->input->post('materialCode'.$i);
-
-                                $Quantity = $this->input->post('quantity'.$i); 
-                                //echo $Quantity;
-                                $Reqnumber = $this->input->post('Reqnumber'.$i);
-                                $itemRate = $this->input->post('itemRate'.$i);
-                                ;
-                                //die();
-
-                                //$Exchangerate = $this->input->post('Exchangerate'.$i);
-                                $BasicPriceinmton = $this->input->post('BasicPriceInMTon'.$i); 
-                                $Productprice = $this->input->post('TotalValue'.$i);
-                                //echo $ProductPrice;
-                                //die();
-                                $LandingCharge = $this->input->post('LandingCharge'.$i);
-                                $AfterLandingCharge = $this->input->post('AfterLandingCharge'.$i);
-                                $HighSeas = $this->input->post('HighSeasSalesCharge'.$i);
-                                $AfterHighSeas = $this->input->post('AfterHighSeasSalesCharge'.$i);
-
-                                $CustomDuty = $this->input->post('CustomDuty'.$i);
-                                $AfterCustomDuty = $this->input->post('AfterCustomDuty'.$i);
-
-                                $ExciseDuty = $this->input->post('ExciseDuty'.$i);
-                                $AfterExciseDuty = $this->input->post('AfterExciseDuty'.$i);
-                                $ExciseDutyEd = $this->input->post('ExciseDutyEdCess'.$i);
-                                $AfterExciseDutyEd = $this->input->post('AfterExciseDutyEdCess'.$i);
-
-                                $ExciseDutySH = $this->input->post('ExciseDutySHCess'.$i);
-                                $AfterExciseDutySH = $this->input->post('AfterExciseDutySHCess'.$i);
-
-                                $CustomEd= $this->input->post('CustomEdCess'.$i); 
-                                $AfterCustomEd= $this->input->post('AfterCustomEdCess'.$i);
-
-                                $CustomSH = $this->input->post('CustomSHCess'.$i);
-                                $AfterCustomSH = $this->input->post('AfterCustomSHCess'.$i);
-
-                                $AddAdtional = $this->input->post('AddlExciseDuty'.$i);
-                                $AfterAddAdtional = $this->input->post('AfterAddlExciseDuty'.$i);
-
-                                $Grossdutypayable = $this->input->post('Grossdutypayable'.$i);
-                                //echo $Grossdutypayable;
-                                //die();
-
-                                $AvailableModvat = $this->input->post('AvailableModvat'.$i);
-
-                                $Grossexpensesduetocustomduty = $this->input->post('Grossexpensesduetocustomduty'.$i);
-
-                               
-                                $purchaseratePerKG = $this->input->post('purchaseratePerKG'.$i);
-                                 
-                                $CustomDutyExpensesPerKG = $this->input->post('CustomDutyExpensesPerKG'.$i);
-
-                                $RMCIncludingCustomersPerKG = $this->input->post('RMCIncludingCustomersPerKG'.$i);
-
-                                $QuantityKG = $this->input->post('QuantityKG'.$i);
-                                
-                                $POLineItemNo = $this->input->post('LineItemNo'.$i);
-
-                                $CostCenter    = $this->input->post('costCode'.$i);
-
-                                //$ExciseDutySH = $this->input->post('ExcisedutySH'.$i);
-                                $Totalvalueitem=$this->input->post('TotalValue'.$i);
-                                 // echo $Totalvalueitem;
-                                //die();
-                                $LineItemNo = '';
-                               //echo "sdsfsd";
-                               //die();
-                                
-                                $currencytypeID = $this->input->post('currencytype'); 
-                                 $SkipInsert = "False";              
-                                   if( count($comma_separated) > 0)
-                                   {
-                                   for($j = 1; $j < count($comma_separated); $j++)
-                                   {    
-                                      $deletedRow =     $comma_separated[$j]    ;
-                                    
-                                      if($deletedRow == $i  )
-                                      {
-                                          $SkipInsert = "True";
-                                          break;
-                                      }                      
-                                      
-                                    }
-                                   }
-                                     if($SkipInsert == "False")
-                                    {
-                                if(strlen($POLineItemNo) == 0)
-                                {
-                                    $POLineItemList = array('PONO'=>$PONO, 'ReqNo'=>$Reqnumber,'MaterialCode'=>$MaterialCode,'Quantity'=>$Quantity,'Rate'=>$itemRate,'Status'=>$LineItemStatus,'CreatedBy'=>$CreateBy,'CreatedDate'=>$createddt,'CostCenterCode'=>$CostCenter);
-                                    $POLineItem=$this->purchaseorder_model->addPOLineItem($POLineItemList);
-                                    if(count($POLineItem)>0)
-                                    {
-                                        $LineItemNo =  $POLineItem[0]['LineItemNo'];
-                                    }
-                    
-                                }
-                                else
-                                {
-
-
-
-                                    $LineItemNo = $POLineItemNo;
-                                    //echo $LineItemNo;
-                                    //die();    
-                            
-                                    $POLineItemList = array('PONO'=>$PONO, 'ReqNo'=>$Reqnumber,'MaterialCode'=>$MaterialCode,'Quantity'=>$Quantity,'Rate'=>$itemRate,'Status'=>$LineItemStatus,'UpdatedOn'=>$updateddt,'CostCenterCode'=>$CostCenter);
-                                    $POLineItem = $this->purchaseorder_model->updatePOLineItem($PONO,$POLineItemNo,$POLineItemList);    
-                            
-                                }
-                                $isExists = $this->purchaseorder_model->LineItemExistsinImportTax($LineItemNo); 
-                                //echo $isExists;
-                                
-                                //die();
-                                if(count($isExists) == 0)
-                                {
-                                    print_r(count($isExists));
-                                    //echo $isExists;
-                                    //die();
-                                    $ImportTaxList = array('LineItemNo'=>$LineItemNo,'BasicPriceInMTon'=>$BasicPriceinmton,'ProductPrice'=>$Productprice,'LandingCharge'=>$LandingCharge,'AfterLandingCharge'=>$AfterLandingCharge,'AfterHighSeasSalesCharge'=>$AfterHighSeas,'HighSeasSalesCharge'=>$HighSeas,'CustomDuty'=>$CustomDuty,'AfterCustomDuty'=>$AfterCustomDuty,'ExciseDuty'=>$ExciseDuty,'AfterExciseDuty'=>$AfterExciseDuty,'ExciseDutyEdCess'=>$ExciseDutyEd,'AfterExciseDutyEdCess'=>$AfterExciseDutyEd,'ExciseDutySHCess'=>$ExciseDutySH,'CustomEdCess'=>$CustomEd,'CustomSHCess'=>$CustomSH,'AddlExciseDuty'=>$AddAdtional,'CreatedBy'=>$CreateBy,'UpdatedOn'=>$updateddt,'AfterExciseDutySHCess'=>$AfterExciseDutySH,'AfterAddlExciseDuty'=>$AfterAddAdtional,'Grossdutypayable'=>$Grossdutypayable,'AvailableModvat'=>$AvailableModvat,'Grossexpensesduetocustomduty'=>$Grossexpensesduetocustomduty,'purchaseratePerKG'=>$purchaseratePerKG,'CustomDutyExpensesPerKG'=>$CustomDutyExpensesPerKG,'RMCIncludingCustomersPerKG'=>$RMCIncludingCustomersPerKG,'QuantityKG'=>$QuantityKG,'AfterCustomSHCess'=>$AfterCustomSH,'AfterCustomEdCess'=>$AfterCustomEd,'TotalValue'=>$Totalvalueitem);
-
-                                    
-                                //print_r($ImportTaxList);
-                                //die();
-                                    $ImportList = $this->purchaseorder_model->addImportTax($ImportTaxList);
-                                
-                                }
-                                else
-                                {
-                                    //echo "xxcx";
-                                    //die();
-                                    $ImportTaxList = array('LineItemNo'=>$LineItemNo,'BasicPriceInMTon'=>$BasicPriceinmton,'ProductPrice'=>$Productprice,'LandingCharge'=>$LandingCharge,'AfterLandingCharge'=>$AfterLandingCharge,'AfterHighSeasSalesCharge'=>$AfterHighSeas,'HighSeasSalesCharge'=>$HighSeas,'CustomDuty'=>$CustomDuty,'AfterCustomDuty'=>$AfterCustomDuty,'ExciseDuty'=>$ExciseDuty,'AfterExciseDuty'=>$AfterExciseDuty,'ExciseDutyEdCess'=>$ExciseDutyEd,'AfterExciseDutyEdCess'=>$AfterExciseDutyEd,'ExciseDutySHCess'=>$ExciseDutySH,'CustomEdCess'=>$CustomEd,'CustomSHCess'=>$CustomSH,'AddlExciseDuty'=>$AddAdtional,'CreatedBy'=>$CreateBy,'UpdatedOn'=>$updateddt,'AfterExciseDutySHCess'=>$AfterExciseDutySH,'AfterAddlExciseDuty'=>$AfterAddAdtional,'Grossdutypayable'=>$Grossdutypayable,'AvailableModvat'=>$AvailableModvat,'Grossexpensesduetocustomduty'=>$Grossexpensesduetocustomduty,'purchaseratePerKG'=>$purchaseratePerKG,'CustomDutyExpensesPerKG'=>$CustomDutyExpensesPerKG,'RMCIncludingCustomersPerKG'=>$RMCIncludingCustomersPerKG,'QuantityKG'=>$QuantityKG,'AfterCustomSHCess'=>$AfterCustomSH,'AfterCustomEdCess'=>$AfterCustomEd,'TotalValue'=>$Totalvalueitem);
-                                    //echo "cxvc ";
-                                    //die();
-                                    //print_r($ImportTaxList);
-                                    //die();
-                                    $this->purchaseorder_model->updateImportTax($LineItemNo,$ImportTaxList); 
-
-                                    
-                                        }
-                             }                              
-                                
-                            }
-
-                    
-                    echo 'Purchase Order Updated Successfully! PO Number Is: '.$PONO ;
-    }
-    
-	
-	
-	/*  All Function following This command for FINANCE TEAM PO APPROVAL SCREEN*/
-	 function poapproval(){
-	 $q="A";
-	 $this->global['pageTitle'] = 'Siddharth : Purchase Order Approval';
-	// $data['Status']= $this->purchaseorder_model->getStatus();
-	 $userID =  $this->session->userdata ( 'userId' );
-	 //print_r($data['Status']);echo "CON";
-	 $data['AppList'] = $this->purchaseorder_model->getPOList($q);  	  
-	 $this->loadViews("poapproval_view", $this->global,$data, NULL);
-	 
-	 }
-	 
-	  function getDateformat2($Val)
-	{
-		       $date = new DateTime($Val);
-				$retDate = $date->format('Y-m-d H:i:s');
-				return $retDate;
-	}
-	
-	
-	function ApprovePO()
-	{
-		  $StatusCode= Trim($_POST['SCode']);
-		  
-		  $PONO= Trim($_POST['PONO']);
-		  $Remarks= Trim($_POST['NewRemarks']);
-		 
-		  $ApprovedBy = $this->session->userdata ( 'userId' );
-				$dt = new DateTime('now', new DateTimeZone('Asia/Kolkata'));				
-		  $ApprovedDate =  $dt->format('Y-m-d H:i:s');
-		  
-		  if($StatusCode == 'ST025')
-		  {
-		  
-		  $store = array('Status'=>$StatusCode,'ApprovedOn'=>$ApprovedDate,'Approvedby'=>$ApprovedBy,'Remarks'=>$Remarks);
-		  $this->purchaseorder_model->UpdatePO($store,$PONO); 
-		  echo "Successfully Approve the Purchase Order No: ".$PONO;
-		  }
-		  else{
-		  $store = array('Status'=>$StatusCode,'OnHoldOn'=>$ApprovedDate,'OnHoldBy'=>$ApprovedBy,'Remarks'=>$Remarks);
-		  $this->purchaseorder_model->UpdatePO($store,$PONO); 
-		  echo "The Purchase Order No: ".$PONO ."is On Hold";
-		  
-	}
-		  
-	
-	
-		 
-  }	
-  
-  
-	
-	
-	/* FOLLOWING CODES FOR PO RELEASE SCREEN FUNCTIONALITIES*/
-	 
-	 
-	 function porelease(){
-	 
-	 $q="R";
-	 $this->global['pageTitle'] = 'Siddharth : Purchase Order Release';
-	// $data['Status']= $this->purchaseorder_model->getStatus();
-	 $userID =  $this->session->userdata ( 'userId' );
-	 //print_r($data['Status']);echo "CON";
-	 $data['AppList'] = $this->purchaseorder_model->getPOList($q);  	  
-	 $this->loadViews("porelease_view", $this->global,$data, NULL);
-	 
-	 }
-	 
-	 
-	 function ReleasePO()
-	{
-		  $StatusCode= Trim($_POST['SCode']);
-		  
-		  $PONO= Trim($_POST['PONO']);
-		  $Remarks= Trim($_POST['NewRemarks']);
-		 
-		  $ReleasedBy = $this->session->userdata ( 'userId' );
-				$dt = new DateTime('now', new DateTimeZone('Asia/Kolkata'));				
-		  $ReleasedDate =  $dt->format('Y-m-d H:i:s');
-		  
-		  if($StatusCode == 'ST026')
-		  {
-		  
-		  $store = array('Status'=>$StatusCode,'ReleasedOn'=>$ReleasedDate,'ReleasedBy'=>$ReleasedBy,'Remarks'=>$Remarks);
-		  $this->purchaseorder_model->UpdatePO($store,$PONO); 
-		  echo "Successfully Released the Purchase Order No: ".$PONO;
-		  }
-		  else{
-		  $store = array('Status'=>$StatusCode,'OnHoldOn'=>$ReleasedDate,'OnHoldBy'=>$ReleasedBy,'Remarks'=>$Remarks);
-		  $this->purchaseorder_model->UpdatePO($store,$PONO); 
-		   echo "The Purchase Order No: ".$PONO ."is On Hold";
-		  
-		  }
-}
-/* Add capital Po*/
- function addNewCapitalPurchaseOrder()
-    {
-
-
-        $POdt =$this->input->post('PODate');
-        $PODate =  $this->getDateformat($POdt);
-                                $SupplierID = $this->input->post('drpSupplier');  
-        $DeliveryAddr = $this->input->post('DeliveryAddr');
-        $dt = $this->input->post('Deliverydt');
-        
-        $POType = $this->input->post('POType');
-        $PoRange = $this->input->post('txtPoRange');
-
-        /* $DeliveryOption = $this->input->post('DateRange');
-                   if($DeliveryOption==1){
-                  $Deliverydt = '';
-                  $DeliverySchedule = $this->input->post('Scheduleby');
-                  }
-                 else{
-                 $Deliverydt = $this->getDateformat($dt);
-                  $DeliverySchedule = '';
-                  } */
-
-        $DeliveryOption = $this->input->post('DateRange');
-           
-               
-                $DeliverySchedule='';
-                $Dispatch='';
-                $Deliverydt='';
-                if($DeliveryOption==1)
-                {
-                   $Dispatch='';
-                   $Deliverydt='';
-                   $DeliverySchedule = $this->input->post('Scheduleby');
-                }
-                else if($DeliveryOption==2)
-                {
-                   $Deliverydt='';
-                   $DeliverySchedule = '';
-                   $Dispatch = $this->input->post('Dispatch');
-                }
-                    
-                else
-                {
-                   $Dispatch = '';
-                   $DeliverySchedule = '';
-                   $Deliverydt = $this->getDateformat($dt);
-                }
-                    $capitalType = $this->input->post('capitalType');
-                    if($capitalType=='Domestic'){
-                       $CapitalRange = '1';
-                          $ExchangeRateOn = '';
-                    $ExchangeRate='';
-                    $Palaceoforigin='';
-                        }
-                     else{
-                             
-                       $CapitalRange = '0';
-                          $ExchangeRateOn = $this->input->post('ExchangeRateOn');
-                    $ExchangeRate=$this->input->post('ExchangeRt');
-                    $Palaceoforigin=$this->input->post('PlaceOforigin');
-                        }
-                  
-                    $PaymentMethod = $this->input->post('PaymentMethod');
-                  $OtherPayment=$this->input->post('Otherpayment');
-                    
-                   
-
-                    
-        $SpcialInstruction = $this->input->post('txtSpcialInstruction');
-        $TotalOrder = $this->input->post('CapitalToatlOrder');
-          $POStatus = $this->input->post('txtStatus');
-       
-
-                           $CreateBy = $this->session->userdata ( 'userId' );
-        $RowCount =  $this->input->post('txtRowCount'); 
-
-        $DeletedRow =  $this->input->post('txtDeletedRow'); 
-        
-        $comma_separated = explode(':', $DeletedRow); 
-        
-        $dt = new DateTime('now', new DateTimeZone('Asia/Kolkata'));        
-        $createddt =  $dt->format('Y-m-d H:i:s');
-        $currencytypeID = $this->input->post('currencytype'); 
-                              
-        $POList = array('SupplierID'=>$SupplierID, 'TotalOrderValue'=>$TotalOrder,'PODate'=>$PODate,'Status'=>$POStatus,'PORange'=>$PoRange,'ExchangeRateCalculatedon'=>$ExchangeRateOn,'ExchangeRate'=>$ExchangeRate,'PaymentTerms'=>$PaymentMethod,'ServiceDescription'=>$SpcialInstruction,'CreatedBy'=>$CreateBy,'DeliveryAddress'=>$DeliveryAddr,'CreatedDate'=>$createddt,'DeliverySchedule'=>$DeliverySchedule,'DeliveryOption'=>$DeliveryOption,'CapitalRange'=>$CapitalRange,'POType'=>$POType,'CurrencyType'=>$currencytypeID,'DeliverySchedule'=>$DeliverySchedule,'Import_PlaceofOrgin'=>$Palaceoforigin,'Import_DispatchDetails'=>$Dispatch,'DeliveryDate'=>$Deliverydt,'PaymentOtherDescription'=>$OtherPayment);
-
-        // $POList = array('SupplierID'=>$SupplierID, 'TotalOrderValue'=>$TotalOrder,'PODate'=>$PODate,'Status'=>$POStatus,'PORange'=>$PoRange,'ServiceDescription'=>$SpcialInstruction,'CreatedBy'=>$CreateBy,'DeliveryAddress'=>$DeliveryAddr,'Import_DispatchDetails'=>$Dispatch,'CreatedDate'=>$createddt,'DeliverySchedule'=>$DeliverySchedule,'DeliveryOption'=>$DeliveryOption,'ExchangeRate'=>$Exchangerate,'ExchangeRateCalculatedon'=>$ExchangeRateCalculatedon,'CurrencyType'=>$CurrencyType,'PaymentTerms'=>$PaymentTerms,'POType'=>$POType,'Import_PlaceofOrgin'=>$Palaceoforigin);
-                             
-    
-          $POMaster  = $this->purchaseorder_model->addPOMaster($POList);
-          
-           $PONO = '';
-          if(count($POMaster)>0)
-          {
-           $PONO =  $POMaster[0]['PONO'];
-          }
-          
-          $LineItemStatus = REQITEM_NEW;
-          
-            for ($i = 1; $i <= $RowCount; $i++)
-              { 
-              
-                $MaterialCode = $this->input->post('materialCode'.$i);
-                $Quantity = $this->input->post('quantity'.$i); 
-                $Reqnumber = $this->input->post('Reqnumber'.$i);
-                $itemRate = $this->input->post('itemRate'.$i);
-                //echo $itemRate;
-                //die();
-
-          
-                $BasicPriceinmton = $this->input->post('rateInUs'.$i); 
-                $Productprice = $this->input->post('basicvalInINR'.$i);
-                $LandingCharge = $this->input->post('beforeLanding'.$i);
-                $AfterLandingCharge = $this->input->post('landingCharge'.$i);
-                $HighSeas = $this->input->post('beforeHighSeasSalesCharge'.$i);
-                $AfterHighSeas = $this->input->post('HighSeasSalesCharge'.$i);
-
-                $CustomDuty = $this->input->post('beforeCustomDuty'.$i);
-                $AfterCustomDuty = $this->input->post('CustomDuty'.$i);
-
-                $ExciseDuty = $this->input->post('beforeExciseDuty'.$i);
-                $AfterExciseDuty = $this->input->post('ExciseDuty'.$i);
-                $ExciseDutyEd = $this->input->post('beforeExciseDutyEDCess'.$i);
-                $AfterExciseDutyEd = $this->input->post('ExciseDutyEDCess'.$i);
-
-                $ExciseDutySH = $this->input->post('beforeExciseDutySHCess'.$i);
-                $AfterExciseDutySH = $this->input->post('ExciseDutySHCess'.$i);
-
-                $CustomEd= $this->input->post('beforeCustomEDCess'.$i); 
-                $AfterCustomEd= $this->input->post('CustomEDCess'.$i); 
-
-                $CustomSH = $this->input->post('beforeCustomSHCess'.$i);
-                $AfterCustomSH = $this->input->post('CustomSHCess'.$i);
-
-                $AddAdtional = $this->input->post('beforeAdditionalExciseDuty'.$i);
-                $AfterAddAdtional = $this->input->post('AdditionalExciseDuty'.$i);
-
-                $Grossdutypayable = $this->input->post('GrossDutyPayable'.$i);
-                $AvailableModvat = $this->input->post('AvailableModvat'.$i);
-                $Grossexpensesduetocustomduty = $this->input->post('GrossExpensesDuetoCustom'.$i);
-                $purchaseratePerKG = $this->input->post('purchaseRate'.$i);
-                $CustomDutyExpensesPerKG = $this->input->post('CustomDutyExpenses'.$i);
-                $RMCIncludingCustomersPerKG = $this->input->post('RMCIncludingCustomers'.$i);
-                $QuantityKG = $this->input->post('PurQuantity'.$i);
-
-                
-                $Totalvalueitem=$this->input->post('PerKgExpense'.$i);
-
-                //echo $BasicPriceinmton;
-                $CostCenter = $this->input->post('CPCostCode'.$i);
-               
-                $TotalOrderValue = $this->input->post('TotalOrderValue'.$i);
-                $Cgst = $this->input->post('Cgst'.$i);
-                $Sgst = $this->input->post('Sgst'.$i);
-                $Igst = $this->input->post('Igst'.$i);
-                $AfterCgst = $this->input->post('AfterCgst'.$i);
-                $AfterSgst = $this->input->post('AfterSgst'.$i);
-                $AfterIgst = $this->input->post('AfterIgst'.$i);
-              
-                $OtherAmt = $this->input->post('OtherAmt'.$i);
-                $SkipInsert = "False";         
-                if( count($comma_separated) > 0)
-                {
-                   for($j = 1; $j < count($comma_separated); $j++)
-                   {  
-                    $deletedRow =   $comma_separated[$j]  ;
-                  
-                    if($deletedRow == $i  )
-                    {
-                      $SkipInsert = "True";
-                      break;
-                    }            
-                    
-                  }
-                 }
-                 if($SkipInsert == "False")
-                  {
-                    $POLineItemList = array('PONO'=>$PONO, 'ReqNo'=>$Reqnumber,'MaterialCode'=>$MaterialCode,'Quantity'=>$Quantity,'Rate'=>$itemRate,'Status'=>$LineItemStatus,'CreatedBy'=>$CreateBy,'CreatedDate'=>$createddt,'CostCenterCode'=>$CostCenter);
-              
-                    $POLineItem = $this->purchaseorder_model->addPOLineItem($POLineItemList);
-              
-                    $LineItemNo = '';
-                    if(count($POLineItem)>0)
-                    {
-                      $LineItemNo =  $POLineItem[0]['LineItemNo'];
-                    }
-                    //echo $LineItemNo; 
-                    
-                    if(trim($POType) == CAPITAL )
-                    {
-                     if($CapitalRange=='1')
-                    {
-                     $ServiceTaxList = array('LineItemNo'=>$LineItemNo, 'CGST'=>$Cgst,'After_CGST'=>$AfterCgst,'SGST'=>$Sgst,'After_SGST'=>$AfterSgst,'IGST'=>$Igst,'After_IGST'=>$AfterIgst,'otherallowance'=>$OtherAmt,'TotalValue'=>$TotalOrderValue, 'CreatedBy'=>$CreateBy,'CreatedDate'=>$createddt);
-                      
-                                  $ServiceTax = $this->purchaseorder_model->addServiceTax($ServiceTaxList);
-                               
-                                  }
-                    if($CapitalRange=='0')
-                    {
-                      //echo "dsc";
-                      //die();
-                        $ImportTaxList = array('LineItemNo'=>$LineItemNo,'BasicPriceInMTon'=>$BasicPriceinmton,'ProductPrice'=>$Productprice,'LandingCharge'=>$LandingCharge,'AfterLandingCharge'=>$AfterLandingCharge,'AfterHighSeasSalesCharge'=>$AfterHighSeas,'HighSeasSalesCharge'=>$HighSeas,'CustomDuty'=>$CustomDuty,'AfterCustomDuty'=>$AfterCustomDuty,'ExciseDuty'=>$ExciseDuty,'AfterExciseDuty'=>$AfterExciseDuty,'ExciseDutyEdCess'=>$ExciseDutyEd,'AfterExciseDutyEdCess'=>$AfterExciseDutyEd,'ExciseDutySHCess'=>$ExciseDutySH,'CustomEdCess'=>$CustomEd,'CustomSHCess'=>$CustomSH,'AddlExciseDuty'=>$AddAdtional,'CreatedBy'=>$CreateBy,'CreatedDate'=>$createddt,'AfterExciseDutySHCess'=>$AfterExciseDutySH,'AfterAddlExciseDuty'=>$AfterAddAdtional,'Grossdutypayable'=>$Grossdutypayable,'AvailableModvat'=>$AvailableModvat,'Grossexpensesduetocustomduty'=>$Grossexpensesduetocustomduty,'purchaseratePerKG'=>$purchaseratePerKG,'CustomDutyExpensesPerKG'=>$CustomDutyExpensesPerKG,'RMCIncludingCustomersPerKG'=>$RMCIncludingCustomersPerKG,'QuantityKG'=>$QuantityKG,'AfterCustomSHCess'=>$AfterCustomSH,'AfterCustomEdCess'=>$AfterCustomEd,'TotalValue'=>$Totalvalueitem);
-
-                       //print_r( $ImportTaxList);
-                      //die();
-                    
-                    
-                    $ImportList = $this->purchaseorder_model->addImportTax($ImportTaxList);
-                                                                               }
-                                                                                
-                    
-                    }
-                }
-                
-              }             
-          echo 'Purchase Order Created Successfully! PO Number Is: '.$PONO ;
-    }
-
-
-/*Edit Capital po*/
- function EditCapitalPurchaseOrder()
-    {
- 
-       
-        $PONO =$this->input->post('txtPONO');
-        $POdt =$this->input->post('PODate');
-        $PODate =  $this->getDateformat($POdt);
-        $SupplierID = $this->input->post('drpSupplier');  
-        $DeliveryAddr = $this->input->post('DeliveryAddr');
-        $dt = $this->input->post('Deliverydt');
-        
-        $POType = $this->input->post('POType');
-        $PoRange = $this->input->post('txtPoRange');
-
-       /* $DeliveryOption = $this->input->post('DateRange');
-                     if($DeliveryOption==1){
-                  $Deliverydt = '';
-                $DeliverySchedule = $this->input->post('Scheduleby');
-                  }
-                  else{
-                   //$Deliverydt = $this->getDateformat($dt);
-                   $Deliverydt = '';
-                  $DeliverySchedule = '';
-                   } */
-
-
-        $DeliveryOption = $this->input->post('DateRange');
-           
-                $DeliverySchedule='';
-                $Dispatch='';
-                $Deliverydt='';
-                if($DeliveryOption==1)
-                {
-                   $Dispatch='';
-                   $Deliverydt='';
-                   $DeliverySchedule = $this->input->post('Scheduleby');
-                }
-                else if($DeliveryOption==2)
-                {
-                   $Deliverydt='';
-                   $DeliverySchedule = '';
-                   $Dispatch = $this->input->post('Dispatch');
-                }
-                    
-                else
-                {
-                   $Dispatch = '';
-                   $DeliverySchedule = '';
-                   $Deliverydt = $this->getDateformat($dt);
-                }
-
-
-        
-                            $capitalType = $this->input->post('capitalType');
-                                $currencytypeID = $this->input->post('currencytype');
-                    if($capitalType=='1'){
-                       $CapitalRange = '1';
-                          $ExchangeRateOn = '';
-                    $ExchangeRate='';
-                    
-                        }
-                     else{
-                             
-                       $CapitalRange = '0';
-                          $ExchangeRateOn = $this->input->post('ExchangeRateOn');
-                    $ExchangeRate=$this->input->post('ExchangeRt');
-                        }
-                    $PaymentMethod = $this->input->post('PaymentMethod');
-                  $OtherPayment=$this->input->post('Otherpayment');
-                   
-
-                    
-        $SpcialInstruction = $this->input->post('txtSpcialInstruction');
-        $TotalOrder = $this->input->post('CapitalToatlOrder');
-          $POStatus = $this->input->post('txtStatus');
-          $Palaceoforigin=$this->input->post('PlaceOforigin');
-       
-
-                           $CreateBy = $this->session->userdata ( 'userId' );
-        $RowCount =  $this->input->post('txtRowCount'); 
-
-        $DeletedRow =  $this->input->post('txtDeletedRow'); 
-        
-        $comma_separated = explode(':', $DeletedRow); 
-        
-        $dt = new DateTime('now', new DateTimeZone('Asia/Kolkata'));        
-        $createddt =  $dt->format('Y-m-d H:i:s');       
-        $updateddt =  $dt->format('Y-m-d H:i:s');
-       
-
-        $POList = array('SupplierID'=>$SupplierID, 'TotalOrderValue'=>$TotalOrder,'PODate'=>$PODate,'Status'=>$POStatus,'PORange'=>$PoRange,'ExchangeRate'=>$ExchangeRate,'ExchangeRateCalculatedon'=>$ExchangeRateOn,'PaymentTerms'=>$PaymentMethod,'ServiceDescription'=>$SpcialInstruction,'CreatedBy'=>$CreateBy,'DeliveryAddress'=>$DeliveryAddr,'CreatedDate'=>$createddt,'DeliverySchedule'=>$DeliverySchedule,'DeliveryOption'=>$DeliveryOption,'CurrencyType'=>$currencytypeID,'DeliverySchedule'=>$DeliverySchedule,'Import_PlaceofOrgin'=>$Palaceoforigin,'Import_DispatchDetails'=>$Dispatch,'DeliveryDate'=>$Deliverydt,'PaymentOtherDescription'=>$OtherPayment);
-
-          
-          $POMaster  = $this->purchaseorder_model->updatePOMaster($PONO,$POList);       
-        
-          $LineItemStatus = REQITEM_NEW;
-          
-          
-        
-          
-            for ($i = 1; $i <= $RowCount; $i++)
-              { 
-              
-                  $MaterialCode = $this->input->post('materialCode'.$i);
-                $Quantity = $this->input->post('quantity'.$i); 
-                $Reqnumber = $this->input->post('Reqnumber'.$i);
-                $itemRate = $this->input->post('itemRate'.$i);
-
-                $Exchangerate = $this->input->post('echangeRate'.$i);
-                $BasicPriceinmton = $this->input->post('rateInUs'.$i); 
-                $Productprice = $this->input->post('basicvalInINR'.$i);
-                $LandingCharge = $this->input->post('beforeLanding'.$i);
-                $AfterLandingCharge = $this->input->post('landingCharge'.$i);
-                $HighSeas = $this->input->post('beforeHighSeasSalesCharge'.$i);
-                $AfterHighSeas = $this->input->post('HighSeasSalesCharge'.$i);
-
-                $CustomDuty = $this->input->post('beforeCustomDuty'.$i);
-                $AfterCustomDuty = $this->input->post('CustomDuty'.$i);
-
-                $ExciseDuty = $this->input->post('beforeExciseDuty'.$i);
-                $AfterExciseDuty = $this->input->post('ExciseDuty'.$i);
-                $ExciseDutyEd = $this->input->post('beforeExciseDutyEDCess'.$i);
-                $AfterExciseDutyEd = $this->input->post('ExciseDutyEDCess'.$i);
-
-                $ExciseDutySH = $this->input->post('beforeExciseDutySHCess'.$i);
-                $AfterExciseDutySH = $this->input->post('ExciseDutySHCess'.$i);
-
-                $CustomEd= $this->input->post('beforeCustomEDCess'.$i); 
-                $AfterCustomEd= $this->input->post('CustomEDCess'.$i); 
-
-                $CustomSH = $this->input->post('beforeCustomSHCess'.$i);
-                $AfterCustomSH = $this->input->post('CustomSHCess'.$i);
-
-                $AddAdtional = $this->input->post('beforeAdditionalExciseDuty'.$i);
-                $AfterAddAdtional = $this->input->post('AdditionalExciseDuty'.$i);
-
-                $Grossdutypayable = $this->input->post('GrossDutyPayable'.$i);
-                $AvailableModvat = $this->input->post('AvailableModvat'.$i);
-                $Grossexpensesduetocustomduty = $this->input->post('GrossExpensesDuetoCustom'.$i);
-                $purchaseratePerKG = $this->input->post('purchaseRate'.$i);
-                $CustomDutyExpensesPerKG = $this->input->post('CustomDutyExpenses'.$i);
-                $RMCIncludingCustomersPerKG = $this->input->post('RMCIncludingCustomers'.$i);
-                $QuantityKG = $this->input->post('PurQuantity'.$i);
-
-                 
-                $Totalvalueitem=$this->input->post('PerKgExpense'.$i);
-
-                //echo $BasicPriceinmton;
-                $CostCenter = $this->input->post('CPCostCode'.$i);
-               
-                $TotalOrderValue = $this->input->post('TotalOrderValue'.$i);
-                $POLineItemNo = $this->input->post('LineItemNo'.$i);
-                       $Cgst = $this->input->post('Cgst'.$i);
-                $Sgst = $this->input->post('Sgst'.$i);
-                $Igst = $this->input->post('Igst'.$i);
-                $AfterCgst = $this->input->post('AfterCgst'.$i);
-                $AfterSgst = $this->input->post('AfterSgst'.$i);
-                $AfterIgst = $this->input->post('AfterIgst'.$i);
-              
-                $OtherAmt = $this->input->post('OtherAmt'.$i);                                              
-                 $SkipInsert = "False";        
-                   if( count($comma_separated) > 0)
-                   {
-                   for($j = 1; $j < count($comma_separated); $j++)
-                   {  
-                    $deletedRow =   $comma_separated[$j]  ;
-                  
-                    if($deletedRow == $i)
-                    {
-                      $SkipInsert = "True";
-                      break;
-                    }            
-                    
-                  }
-                   }
-                     if($SkipInsert == "False")
-                  {
-                if(strlen($POLineItemNo) == 0)
-                {
-                  $POLineItemList = array('PONO'=>$PONO, 'ReqNo'=>$Reqnumber,'MaterialCode'=>$MaterialCode,'Quantity'=>$Quantity,'Rate'=>$itemRate,'Status'=>$LineItemStatus,'CreatedBy'=>$CreateBy,'CreatedDate'=>$createddt,'CostCenterCode'=>$CostCenter);
-              
-                    $POLineItem = $this->purchaseorder_model->addPOLineItem($POLineItemList);
-              
-                    $LineItemNo = '';
-                    if(count($POLineItem)>0)
-                    {
-                      $LineItemNo =  $POLineItem[0]['LineItemNo'];
-                    }
-                   
-                    
-                    if(trim($POType) == CAPITAL )
-                    {
-                    if($capitalType=='1')
-                    {
-                     $ServiceTaxList = array('LineItemNo'=>$LineItemNo, 'CGST'=>$Cgst,'After_CGST'=>$AfterCgst,'SGST'=>$Sgst,'After_SGST'=>$AfterSgst,'IGST'=>$Igst,'After_IGST'=>$AfterIgst,'otherallowance'=>$OtherAmt,'TotalValue'=>$TotalOrderValue, 'CreatedBy'=>$CreateBy,'CreatedDate'=>$createddt);
-                      
-                    $ServiceTax = $this->purchaseorder_model->addServiceTax($ServiceTaxList);
-                    }
-                    if($capitalType=='0')
-                    {
-                    $ImportTaxList = array('LineItemNo'=>$LineItemNo, 'BasicPriceInMTon'=>$BasicPriceinmton,'ProductPrice'=>$Productprice,'LandingCharge'=>$LandingCharge,'AfterLandingCharge'=>$AfterLandingCharge,'AfterHighSeasSalesCharge'=>$AfterHighSeas,'HighSeasSalesCharge'=>$HighSeas,'CustomDuty'=>$CustomDuty,'AfterCustomDuty'=>$AfterCustomDuty,'ExciseDuty'=>$ExciseDuty,'AfterExciseDuty'=>$AfterExciseDuty,'ExciseDutyEdCess'=>$ExciseDutyEd,'AfterExciseDutyEdCess'=>$AfterExciseDutyEd,'ExciseDutySHCess'=>$ExciseDutySH,'CustomEdCess'=>$CustomEd,'CustomSHCess'=>$CustomSH,'AddlExciseDuty'=>$AddAdtional,'CreatedBy'=>$CreateBy,'CreatedDate'=>$createddt,'AfterExciseDutySHCess'=>$AfterExciseDutySH,'AfterAddlExciseDuty'=>$AfterAddAdtional,'Grossdutypayable'=>$Grossdutypayable,'AvailableModvat'=>$AvailableModvat,'Grossexpensesduetocustomduty'=>$Grossexpensesduetocustomduty,'purchaseratePerKG'=>$purchaseratePerKG,'CustomDutyExpensesPerKG'=>$CustomDutyExpensesPerKG,'RMCIncludingCustomersPerKG'=>$RMCIncludingCustomersPerKG,'QuantityKG'=>$QuantityKG,'AfterCustomSHCess'=>$AfterCustomSH,'AfterCustomEdCess'=>$AfterCustomEd,'TotalValue'=>$Totalvalueitem);
-                   $ImportList = $this->purchaseorder_model->addImportTax($ImportTaxList);
-                       }                  
-                    
-                    
-                    
-                    }
-          
-                }
-                else
-                {
-                  $LineItemNo = $POLineItemNo;
-
-                                  
-              
-                  $POLineItemList = array('PONO'=>$PONO, 'ReqNo'=>$Reqnumber,'MaterialCode'=>$MaterialCode,'Quantity'=>$Quantity,'Rate'=>$itemRate,'Status'=>$LineItemStatus,'CreatedBy'=>$CreateBy,'CreatedDate'=>$createddt,'CostCenterCode'=>$CostCenter);
-                  $POLineItem = $this->purchaseorder_model->updatePOLineItem($PONO,$LineItemNo,$POLineItemList);  
-                   if($capitalType=='1')
-                    {               
-                 $ServiceTaxList = array('CGST'=>$Cgst,'After_CGST'=>$AfterCgst,'SGST'=>$Sgst,'After_SGST'=>$AfterSgst,'IGST'=>$Igst,'After_IGST'=>$AfterIgst,'otherallowance'=>$OtherAmt,'TotalValue'=>$TotalOrderValue, 'UpdateBY'=>$CreateBy,'UpdatedOn'=>$createddt);
-            
-                $ServiceTax = $this->purchaseorder_model->updateServiceTax($LineItemNo,$ServiceTaxList); 
-                }
-                if($capitalType=='0')
-                    {
-                $ImportTaxList = array('LineItemNo'=>$LineItemNo,'BasicPriceInMTon'=>$BasicPriceinmton,'ProductPrice'=>$Productprice,'LandingCharge'=>$LandingCharge,'AfterLandingCharge'=>$AfterLandingCharge,'AfterHighSeasSalesCharge'=>$AfterHighSeas,'HighSeasSalesCharge'=>$HighSeas,'CustomDuty'=>$CustomDuty,'AfterCustomDuty'=>$AfterCustomDuty,'ExciseDuty'=>$ExciseDuty,'AfterExciseDuty'=>$AfterExciseDuty,'ExciseDutyEdCess'=>$ExciseDutyEd,'AfterExciseDutyEdCess'=>$AfterExciseDutyEd,'ExciseDutySHCess'=>$ExciseDutySH,'CustomEdCess'=>$CustomEd,'CustomSHCess'=>$CustomSH,'AddlExciseDuty'=>$AddAdtional,'CreatedBy'=>$CreateBy,'CreatedDate'=>$createddt,'AfterExciseDutySHCess'=>$AfterExciseDutySH,'AfterAddlExciseDuty'=>$AfterAddAdtional,'Grossdutypayable'=>$Grossdutypayable,'AvailableModvat'=>$AvailableModvat,'Grossexpensesduetocustomduty'=>$Grossexpensesduetocustomduty,'purchaseratePerKG'=>$purchaseratePerKG,'CustomDutyExpensesPerKG'=>$CustomDutyExpensesPerKG,'RMCIncludingCustomersPerKG'=>$RMCIncludingCustomersPerKG,'QuantityKG'=>$QuantityKG,'AfterCustomSHCess'=>$AfterCustomSH,'AfterCustomEdCess'=>$AfterCustomEd,'TotalValue'=>$Totalvalueitem);
-                  
-
-                  $ImportList= $this->purchaseorder_model->updateImportTax($LineItemNo,$ImportTaxList); 
-              }
-                }
-                
-               }                
-                
-              }             
-          
-          echo 'Purchase Order Updated Successfully! PO Number Is: '.$PONO ;
-    }
-  
-             /* capital po print/pdf*/
-
-    public function CapitalPoPrint($PONO) 
-  {
-    
-        
-            // Load the pdf page with multiviews
-            $data['CompanyDetails'] =  $this->purchaseorder_model->getCompanyInformation();
-            
-            $data['POItem'] = $this->purchaseorder_model->GetCapitalPurchaseOrderDetailsForPDF($PONO);
-                    
-                      $data['releasedetails'] = $this->purchaseorder_model->GetReleasedDetails($PONO);
-                        
-                      $CurrencyType='';
-                       if(!empty($data['POItem'])){
-                           $CurrencyType=$data['POItem'][0]->CurrencyType; 
-                         }
-                       
-                      
-                       if($CurrencyType=='' OR $CurrencyType=='0'){
-                         $data['CurrencySymbol']=$this->purchaseorder_model->GerCurrencyCodeName('INR');
-                       
-                        $TotalOrderValue=$data['POItem'][0]->TotalOrderValue;              
-                       
-                        $totalAmt=sprintf("%.2f", $TotalOrderValue);
-                    
-                        $data['TotalAmountInWords']= $this->convertNumber($totalAmt);
-                        }
-                      
-                    
-                        else{
-                       $data['CurrencySymbol']=$this->purchaseorder_model->GerCurrencyCodeName($CurrencyType);
-                       $SymbolCurrency=$data['CurrencySymbol'][0]->FontCode2000;
-                       $SymbolCurrencyName=$data['CurrencySymbol'][0]->Currency;
-                        $PaiseVal=$data['CurrencySymbol'][0]->PaiseVal;
-                      
-                           $TotalOrderValue=$data['POItem'][0]->TotalOrderValue;              
-                       
-                        $totalAmt=sprintf("%.2f", $TotalOrderValue);
-                    
-                        $data['TotalAmountInWords']= $this->convertNumberSymbol($totalAmt,$SymbolCurrency,$SymbolCurrencyName,$PaiseVal);
-                           }
-                      
-        
-            
-                       
-                       
-            
-                        $data['RequistionDetails'] = $this->purchaseorder_model->GetPdfRequistionDetails($PONO);
-                       
-                         
-                     
-                        $this->load->View("capitalpopdf", $data);
-            
-            // Add header to pdf
-            //$this->load->view('includes/pdffooter');
-            
-            // Get output html
-            $php = $this->output->get_output();
-            
-            // Load library
-            $this->load->library('dompdf_gen');
-            
-            // Convert to PDF
-            $this->dompdf->load_html($php);
-            $this->dompdf->render();
-            $data['Attachment'] = FALSE;
-            $this->dompdf->stream("CapitalPOReport.pdf",$data,$php);
-          
-}
-
-
-
-
-  public function mrirCapitalPoPrint($PONO) 
-  {
-    
-        
-            // Load the pdf page with multiviews
-            $data['CompanyDetails'] =  $this->purchaseorder_model->getCompanyInformation();
-            
-            $data['POItem'] = $this->purchaseorder_model->GetCapitalPurchaseOrderDetailsForPDF($PONO);
-                    
-                      $data['releasedetails'] = $this->purchaseorder_model->GetReleasedDetails($PONO);
-                        
-                      $CurrencyType='';
-                       if(!empty($data['POItem'])){
-                           $CurrencyType=$data['POItem'][0]->CurrencyType; 
-                         }
-                       
-                      
-                       if($CurrencyType=='' OR $CurrencyType=='0'){
-                         $data['CurrencySymbol']=$this->purchaseorder_model->GerCurrencyCodeName('INR');
-                       
-                        $TotalOrderValue=$data['POItem'][0]->TotalOrderValue;              
-                       
-                        $totalAmt=sprintf("%.2f", $TotalOrderValue);
-                    
-                        $data['TotalAmountInWords']= $this->convertNumber($totalAmt);
-                        }
-                      
-                    
-                        else{
-                       $data['CurrencySymbol']=$this->purchaseorder_model->GerCurrencyCodeName($CurrencyType);
-                       $SymbolCurrency=$data['CurrencySymbol'][0]->FontCode2000;
-                       $SymbolCurrencyName=$data['CurrencySymbol'][0]->Currency;
-                        $PaiseVal=$data['CurrencySymbol'][0]->PaiseVal;
-                      
-                           $TotalOrderValue=$data['POItem'][0]->TotalOrderValue;              
-                       
-                        $totalAmt=sprintf("%.2f", $TotalOrderValue);
-                    
-                        $data['TotalAmountInWords']= $this->convertNumberSymbol($totalAmt,$SymbolCurrency,$SymbolCurrencyName,$PaiseVal);
-                           }
-                      
-        
-            
-                       
-                       
-            
-                        $data['RequistionDetails'] = $this->purchaseorder_model->GetPdfRequistionDetails($PONO);
-                       
-                         
-                     
-                        $this->load->View("mrircapitalpopdf", $data);
-            
-            // Add header to pdf
-            //$this->load->view('includes/pdffooter');
-            
-            // Get output html
-            $php = $this->output->get_output();
-            
-            // Load library
-            $this->load->library('dompdf_gen');
-            
-            // Convert to PDF
-            $this->dompdf->load_html($php);
-            $this->dompdf->render();
-            $data['Attachment'] = FALSE;
-            $this->dompdf->stream("CapitalPOReport.pdf",$data,$php);
-          
-}
-
-
-
-
-            /*This function is used to convert amount(digit) into words*/
-
-        public function convertNumber($amt){
-$ShowPaise='0';
-$totalAmt=explode(".",$amt);
-
-$number = $totalAmt[0];
-   $no = $number;
-			
-if(!empty($totalAmt[1]) && $totalAmt[1]!=0){
-$point = $totalAmt[1];
-	$ShowPaise='1';
-}
-   else{
-$point=0;
-	   $ShowPaise='0';
-}
-
-
-   $hundred = null;
-   $digits_1 = strlen($no);
-
-   $i = 0;
-   $str = array();
-   $words = array('0' => '', '1' => 'one', '2' => 'two',
-    '3' => 'three', '4' => 'four', '5' => 'five', '6' => 'six',
-    '7' => 'seven', '8' => 'eight', '9' => 'nine',
-    '10' => 'ten', '11' => 'eleven', '12' => 'twelve',
-    '13' => 'thirteen', '14' => 'fourteen',
-    '15' => 'fifteen', '16' => 'sixteen', '17' => 'seventeen',
-    '18' => 'eighteen', '19' =>'nineteen', '20' => 'twenty',
-    '30' => 'thirty', '40' => 'forty', '50' => 'fifty',
-    '60' => 'sixty', '70' => 'seventy',
-    '80' => 'eighty', '90' => 'ninety');
-   $digits = array('', 'hundred', 'thousand', 'lakh', 'crore');
-   while ($i < $digits_1) {
-     $divider = ($i == 2) ? 10 : 100;
-     $number = floor($no % $divider);
-     $no = floor($no / $divider);
-     $i += ($divider == 10) ? 1 : 2;
-     if ($number) {
-        $plural = (($counter = count($str)) && $number > 9) ? 's' : null;
-        $hundred = ($counter == 1 && $str[0]) ? ' and ' : null;
-        $str [] = ($number < 21) ? $words[$number] .
-            " " . $digits[$counter] . $plural . " " . $hundred
-            :
-            $words[floor($number / 10) * 10]
-            . " " . $words[$number % 10] . " "
-            . $digits[$counter] . $plural . " " . $hundred;
-     } else $str[] = null;
-  }
-  $str = array_reverse($str);
-  $result = implode('', $str);
-
-  $points = ($point) ?
-    " " . $words[$point / 10] . " " . 
-          $words[$point = $point % 10] : '';
-
-if($ShowPaise=='0'){
-
-$amountInWords = "Rupee " . $result." Only";
-}
-else{
-
-$amountInWords = "Rupee " . $result ." Paise ". $points." Only";
-}
-  
-
-  return $amountInWords;
-  }
-public function convertNumberSymbol($amt,$symbol,$name,$paise){
-$ShowPaise='0';
-$totalAmt=explode(".",$amt);
-
-$number = $totalAmt[0];
-   $no = $number;
-if(!empty($totalAmt[1]) && $totalAmt[1]!=0){
-$point = $totalAmt[1];
-	$ShowPaise='1';
-}
-   else{
-$point=0;
-	   $ShowPaise='0';
-}
-
-   $hundred = null;
-   $digits_1 = strlen($no);
-
-   $i = 0;
-   $str = array();
-   $words = array('0' => '', '1' => 'one', '2' => 'two',
-    '3' => 'three', '4' => 'four', '5' => 'five', '6' => 'six',
-    '7' => 'seven', '8' => 'eight', '9' => 'nine',
-    '10' => 'ten', '11' => 'eleven', '12' => 'twelve',
-    '13' => 'thirteen', '14' => 'fourteen',
-    '15' => 'fifteen', '16' => 'sixteen', '17' => 'seventeen',
-    '18' => 'eighteen', '19' =>'nineteen', '20' => 'twenty',
-    '30' => 'thirty', '40' => 'forty', '50' => 'fifty',
-    '60' => 'sixty', '70' => 'seventy',
-    '80' => 'eighty', '90' => 'ninety');
-   $digits = array('', 'hundred', 'thousand', 'lakh', 'crore');
-   while ($i < $digits_1) {
-     $divider = ($i == 2) ? 10 : 100;
-     $number = floor($no % $divider);
-     $no = floor($no / $divider);
-     $i += ($divider == 10) ? 1 : 2;
-     if ($number) {
-        $plural = (($counter = count($str)) && $number > 9) ? 's' : null;
-        $hundred = ($counter == 1 && $str[0]) ? ' and ' : null;
-        $str [] = ($number < 21) ? $words[$number] .
-            " " . $digits[$counter] . $plural . " " . $hundred
-            :
-            $words[floor($number / 10) * 10]
-            . " " . $words[$number % 10] . " "
-            . $digits[$counter] . $plural . " " . $hundred;
-     } else $str[] = null;
-  }
-  $str = array_reverse($str);
-  $result = implode('', $str);
-
-  $points = ($point) ?
-    " " . $words[$point / 10] . " " . 
-          $words[$point = $point % 10] : '';
-
-if($ShowPaise=='0'){
-$amountInWords = $name." " . $result." Only";
-}
-else{
-$amountInWords = $name." " . $result.$paise ." ". $points." Only";
-}
-  
-
-  return $amountInWords;
-  }
-
-
-
-function addadvancerequest()
-{
-   
-  $PONO =$this->input->post('PONO');
-  $AdvancePercentage=$this->input->post('AdvanceIn');
-  $AdvanceAmount=$this->input->post('AdvanceAmount');
-  $Remarks=$this->input->post('Remarks');
-  $dt = new DateTime('now', new DateTimeZone('Asia/Kolkata'));        
-  $createddt =  $dt->format('Y-m-d H:i:s');
-  $CreateBy = $this->session->userdata ( 'userId' );
- 
-
-  $advance=array('PONO'=>$PONO,'AdvancePercentage'=>$AdvancePercentage,'AdvanceAmount'=>$AdvanceAmount,'Remarks'=>$Remarks,'CreatedBy'=>$CreateBy ,'CreatedDt'=>$createddt);
-  $this->purchaseorder_model->addadvanceRequest($advance);
-
-   
-if($advance > 0)
-               {
-                  // $this->session->set_flashdata('success', 'New Asset created successfully');
-                     echo "<script>alert('Advance Request Created successfully!');</script>";
-                    redirect('purchaseorder/advancerequest','refresh');
-                    
-               }
-               
-}
-
-
-
-}
-
-?>
diff --git a/application/controllers/rawmaterialdetails.php b/application/controllers/rawmaterialdetails.php
index d4cc43d0..c28fc220 100644
--- a/application/controllers/rawmaterialdetails.php
+++ b/application/controllers/rawmaterialdetails.php
@@ -3,11 +3,11 @@
 require APPPATH . '/libraries/BaseController.php';
 
 /**
- * Class : RawMaterial (PurchaseorderController)
+ * Class : rawmaterialdetails (Raw Material Detail - Controller)
  * User Class to control all user related operations.
- * @author : Gandhimathi
+ * @author : Venba Info Tech - Gandhimathi
  * @version : 1.1
- * @since : 12 Apr 2017
+ * @since : 18 November 2017
  */
 class rawmaterialdetails extends BaseController
 {
@@ -232,7 +232,7 @@ class rawmaterialdetails extends BaseController
             $data['cfUOM'] = $this->rawmaterialdetails_model->getConversionfactorUOM();    
             $data['assetcode'] = $this->rawmaterialdetails_model->getAssetcode();    
             $this->global['pageTitle'] = 'Resico : Edit Material Master';
-            $this->loadViews("editOldRawmaterial", $this->global,$data, NULL);
+            $this->loadViews("editRawmaterial", $this->global,$data, NULL);
     }
     
     
diff --git a/application/controllers/report.php b/application/controllers/report.php
index e1395829..c9fdd07d 100644
--- a/application/controllers/report.php
+++ b/application/controllers/report.php
@@ -3,11 +3,11 @@
 require APPPATH . '/libraries/BaseController.php';
 
 /**
- * Class :  Inward Gate Register Controller (security)
+ * Class :report (Report Details - Controller)
  * User Class to control all user related operations.
- * @author : Saravana kumar
+ * @author : Venba Info Tech - Saravana kumar
  * @version : 1.1
- * @since : 10 Jun 2017
+ * @since : 18 November 2017
  */
 class report extends BaseController
 {
diff --git a/application/controllers/requisitionform.php b/application/controllers/requisitionform.php
index 501d9949..46d0c929 100644
--- a/application/controllers/requisitionform.php
+++ b/application/controllers/requisitionform.php
@@ -5,9 +5,9 @@ require APPPATH . '/libraries/BaseController.php';
 /**
  * Class : requisitionform (requisitionformController)
  * User Class to control all user related operations.
- * @author : VenbaMail Mali
+ * @author : Venba Info Tech -
  * @version : 1.1
- * @since : 15 Feb 2016
+ * @since : 18 November 2017
  */
 class requisitionform extends BaseController
 {
@@ -29,7 +29,7 @@ class requisitionform extends BaseController
      */
     function requisitionlisting()
      {
-		 $this->global['pageTitle'] = 'Siddharth : Requisition Listing';
+		 $this->global['pageTitle'] = 'Resico : Requisition Listing';
 		 
 		  $userID =  $this->session->userdata ( 'userId' );
 		 
@@ -47,7 +47,7 @@ class requisitionform extends BaseController
        
 	 function requisition()
 	 {
-		 $this->global['pageTitle'] = 'Siddharth : Raise Requisition';
+		 $this->global['pageTitle'] = 'Resico : Raise Requisition';
 		 
 		 $data['RequestType'] = $this->requistion_model->getConfigValue('C020');  
 		 
@@ -67,7 +67,7 @@ class requisitionform extends BaseController
 	 */
     function requisitionlistApproval()
      {
-		  $this->global['pageTitle'] = 'Siddharth : Requisition Approval';
+		  $this->global['pageTitle'] = 'Resico : Requisition Approval';
 		  
 		   $data['Status']= $this->requistion_model->getStatus();
 		 
@@ -86,7 +86,7 @@ class requisitionform extends BaseController
 	 */
     function EditRequistionForm()
     {
-           $this->global['pageTitle'] = 'Siddharth : Edit Requisition';
+           $this->global['pageTitle'] = 'Resico : Edit Requisition';
         
            $ReqNo=  $_GET['ReqNo'];
            $ReqType=  $_GET['ReqType'];
@@ -190,7 +190,7 @@ class requisitionform extends BaseController
         
 		    $data['AppList'] = $this->requistion_model->getApproverRequistList($userID,$Status,$FromDate, $ToDate);
 			
-			$this->global['pageTitle'] = 'Siddharth : Requisition Approval';
+			$this->global['pageTitle'] = 'Resico : Requisition Approval';
 		  
 			$data['Status']= $this->requistion_model->getStatus();	  		
            
@@ -661,7 +661,7 @@ class requisitionform extends BaseController
 	 
     function pageNotFound()
     {
-        $this->global['pageTitle'] = 'CodeInsect : 404 - Page Not Found';
+        $this->global['pageTitle'] = 'Resico : 404 - Page Not Found';
         
         $this->loadViews("404", $this->global, NULL, NULL);
     }
diff --git a/application/controllers/requisitionform.php~ b/application/controllers/requisitionform.php~
deleted file mode 100644
index a45f0e60..00000000
--- a/application/controllers/requisitionform.php~
+++ /dev/null
@@ -1,542 +0,0 @@
-<?php if(!defined('BASEPATH')) exit('No direct script access allowed');
-
-require APPPATH . '/libraries/BaseController.php';
-
-/**
- * Class : requisitionform (requisitionformController)
- * User Class to control all user related operations.
- * @author : VenbaMail Mali
- * @version : 1.1
- * @since : 15 Feb 2016
- */
-class requisitionform extends BaseController
-{
-    /**
-     * This is default constructor of the class
-     */
-    public function __construct()
-    {
-        parent::__construct();
-        $this->load->model('requistion_model');
-		
-       $this->load->library('session');
-	     $this->load->library('form_validation');
-		
-        $this->isLoggedIn();   
-    }
-     /**
-     * This function used to load the first screen of the Requistion
-     */
-    function requisitionlisting()
-     {
-		 $this->global['pageTitle'] = 'Siddharth : Requisition Listing';
-		 
-		  $userID =  $this->session->userdata ( 'userId' );
-		 
-		 // $data['ReqList'] = $this->requistion_model->getRequistListUserID($userID);  	  
-		  $data['Status'] = $this->requistion_model->CheckDraftStatus($userID);
-		
-          $data['TotNoOfLine'] =$this->requistion_model->getRequistionList($userID);
-
-
-         $this->loadViews("requisitionlisting", $this->global, $data, NULL);
-     }
-    /**
-     * This function used to load the first screen of the requisition Form
-     */   
-       
-	 function requisition()
-	 {
-		 $this->global['pageTitle'] = 'Siddharth : Raise Requisition';
-		 
-		 $data['RequestType'] = $this->requistion_model->getConfigValue('C020');  
-		 
-		 $data['EmpList'] = $this->requistion_model->getAllEmployees();  
-		  $data['ServiceOption'] = $this->requistion_model->getConfigValue('C022'); 
-		 $userID =  $this->session->userdata ( 'userId' );
-		 
-		 $data['Emp'] = $this->requistion_model->getEmpIdByUserID($userID);
-		   	 
-         $data['CostCenter'] = $this->requistion_model->getCostCenterUserID($userID);		 
-            
-         $this->loadViews("requisitionform", $this->global,  $data,null);
-	 }
-	 
-	  /**
-     * This function used to load the first screen of the Requistion List Approval Screen
-	 */
-    function requisitionlistApproval()
-     {
-		  $this->global['pageTitle'] = 'Siddharth : Requisition Approval';
-		  
-		   $data['Status']= $this->requistion_model->getStatus();
-		 
-		   $userID =  $this->session->userdata ( 'userId' );
-		 
-		   $data['AppList'] = $this->requistion_model->getApproverRequistList($userID);  	  
-		
-		
-           
-         $this->loadViews("requisitionlistapproval", $this->global, $data, NULL);
-     }
-	 
-	 
-	 /**
-     * This function used to load the Edit Requistion Form
-	 */
-    function EditRequistionForm()
-     {
-		   $this->global['pageTitle'] = 'Siddharth : Edit Requisition';
-		
- 		   $ReqNo=  $_GET['ReqNo'];
-		   $ReqType=  $_GET['ReqType'];
-		 
-		   $userID =  $this->session->userdata ( 'userId' );
-		 
-		   $data['ReqDetails'] = $this->requistion_model->getRequistDetails($ReqNo,'Yes');
-		   
-		   
-		   $data['LineItem'] = $this->requistion_model->getEditRequistItemList($ReqNo);  		   
-		   $data['CostCenter'] = $this->requistion_model->getCostCenterUserID($userID);  
-		   $data['MaterialCode'] = $this->requistion_model->EditMaterialCode($ReqNo, $ReqType);
-            $data['ServiceOption'] = $this->requistion_model->getConfigValue('C022');
-         $this->loadViews("editrequisitionform", $this->global, $data, NULL);
-     }
-	 
-	 /**
-     * This function used to load the Delete the Requistion Items
-	 */
-    function DeleteRequistionForm()
-     {
-		   	  
- 		   $ReqList=  $this->input->post('id');
-		    $ReqNo ='';
-		    $MaterialCode = '';
-		   if(count($ReqList) > 0) 
-		   {
-			   $ReqNo =  $ReqList[0];
-			    $MaterialCode =  $ReqList[1];
-		   }
-		 	   
-		   $this->requistion_model->DeleteRequistionLineItem( $ReqNo,$MaterialCode);
-		   
-           echo "Successfully Deleted the Line item".$ReqNo;		  
-        
-     }
-	 
-	  /**
-     * This function used to load the Delete the Requistion Items
-	 */
-    function DeleteReqNo()
-     {
-		   	  
- 		   $ReqNo=  $this->input->post('id');
-		  $dt = new DateTime('now', new DateTimeZone('Asia/Kolkata'));				
-				$updateddt =  $dt->format('Y-m-d H:i:s');
-		   $Request = array('Status'=>REQ_DELETED,'updatedOn'=>$updateddt);
-					 
-		   $this->requistion_model->UpdateRequistion( $Request,$ReqNo);
-		   
-           echo "Successfully Deleted the ".$ReqNo;		  
-        
-     }
-	 
-	 function SearchRequistList()
-	 {
-		  $userID =  $this->session->userdata ( 'userId' );
-		  $ReqValue = $this->input->post('SearchDate');
-       
-		  $Dt =  explode("-",$ReqValue);
-		
-		  $FromDate ='';
-		  $ToDate = '';
-		  $Status= ''; 
-		  if(count( $Dt)>1)
-		  {
-			   $FDate = $Dt[0]."-".$Dt[1]."-".$Dt[2];
-				$TDate = $Dt[3]."-".$Dt[4]."-".$Dt[5];
-			    $FromDate =  $this->getDateformat($FDate);
-				$ToDate =  $this->getDateformat($TDate);
-		   } 
-		  
-		   $St =  $this->input->post('RequisitionStatus');
-		  
-		   if($St == "-1")
-		   {
-			   $Status = '';
-		   }
-		   else
-		   {
-			   $Status = $St; 
-		   }		  
-        
-		    $data['AppList'] = $this->requistion_model->getApproverRequistList($userID,$Status,$FromDate, $ToDate);
-			
-			$this->global['pageTitle'] = 'Siddharth : Requisition Approval';
-		  
-			$data['Status']= $this->requistion_model->getStatus();	  		
-           
-			$this->loadViews("requisitionlistapproval", $this->global, $data, NULL);
-			
-	 }
-	 
-	 
-	 
-	 function getDateformat($Val)
-	{
-		       $date = new DateTime($Val);
-				$retDate = $date->format('Y-m-d H:i:s');
-				return $retDate;
-	}
-	 /**
-     * This function used to load the Employee details based on the EmpID selection
-     */
-	 function GetSelectedEmpDetails()
-	 {
-		   $ReqType =  $_GET['ReqType'];
-		   $EmpID =  $this->input->post('id');		  
-		   $empDetails = $this->requistion_model->GetEmployeeDetails( $EmpID );  
-		   $DeptCode =  $empDetails[0]['DEPCode'];
-		   $CostList = $this->requistion_model->GetCostCenterByDept( $DeptCode);
-		   $HTML = "<option value='-1'>Select Cost center</option>";
-		    $BudAmount = "";
-		   if(count($CostList) > 0)
-		   {
-             for ($j = 0; $j < count($CostList); $j++)
-			  {
-				$Code = $CostList[$j]['CostCenterCode'];
-				$Name = $CostList[$j]['CostCenterName'];
-				$HTML .="<option value='".$Code."'>".$Code."-".$Name."</option>";
-				}	
-		   }	
-           if(count($CostList) == 1)
-		   {
-			    $dt = new DateTime('now', new DateTimeZone('Asia/Kolkata'));
-				
-				$Year =  $dt->format('Y');
-				$CostCode = $CostList[0]['CostCenterCode'];
-				
-			   $Cost = $this->requistion_model->GetAvailableBudgetAmount( $CostCode,$Year,$ReqType);
-			   if(count($Cost) >0)
-			   {
-				$BudAmount = $Cost[0]['BudgetAmount'];
-			   }
-		   }			   
-		   die(json_encode(array('emp' => $empDetails,'Cost' => $HTML,'AvlAmount'  => $BudAmount)));
-	 }
-	 
-	 function getAvailableBudAmount()
-	 {		 
-		   $ReqType =  $_GET['ReqType'];
-		   $CostCode=  $this->input->post('id');
-		   $dt = new DateTime('now', new DateTimeZone('Asia/Kolkata'));
-				
-			$Year =  $dt->format('Y');
-			
-		   $Cost = $this->requistion_model->GetAvailableBudgetAmount( $CostCode,$Year,$ReqType);
-		
-			die(json_encode(array('Cost' =>$Cost)));
-	 }
-	// To get the Material code based on the Request type
-	function getMaterialCode()
-	 {		 
-		  
-		    $ReqType=  $this->input->post('id');	  
-			
-		    $MaterialCode = $this->requistion_model->GetMaterialCode( $ReqType);
-			$MaterialName = "";
-			$UOM = "";
-		    $HTML = "<option value='-1'>Select Material Type</option>";
-		   
-		   if(count($MaterialCode) > 0)
-		   {
-             for ($j = 0; $j < count($MaterialCode); $j++)
-			  {
-				$Code = $MaterialCode[$j]['MaterialCode'];
-				$Name = $MaterialCode[$j]['MaterialName'];
-				$HTML .="<option value='".$Code."'>".$Code."-".$Name."</option>";
-				
-				}
-				$MaterialName = $MaterialCode[0]['MaterialName'];
-				$UOM = $MaterialCode[0]['UOM'];					
-		   }   
-		   
-			die(json_encode(array('Material' =>$HTML,'MaterialName'=>$MaterialName,'UOM'=>$UOM)));
-	 }
-	
-	// To get the Material value based on the MaterialCode
-	function getMaterialDetails()
-	 {		 
-		  
-		   $Material=  $this->input->post('id');	  
-			
-		   $MaterialDetails = $this->requistion_model->getRawMaterialList($Material);   
-		  
-			   
-		   die(json_encode(array('MatDetail' =>$MaterialDetails)));
-	 }
-	 
-	 /*
-	 To Insert the Requistion Details to Database	 
-	 */
-	 /**
-     * This function is used to add new Cost to the system
-     */
-    function addNewRequistion()
-    {                  
-          
-            $this->form_validation->set_rules('RequestType','RequestType','trim|required');
-            $this->form_validation->set_rules('EmpID','EmpID','trim|required');            
-         
-            if($this->form_validation->run() == FALSE)
-            {
-                $this->requisition();
-            }
-            else
-            {
-                                    $Status= $_GET['ID'];
-                    $RequestType = strtoupper(trim($this->input->post('RequestType')));
-                    $Requestedby = strtoupper(trim($this->input->post('EmpID'))); 
-				$CostCenter = $this->input->post('CostCenter'); 		
-                $CreateBy = $this->session->userdata ( 'userId' );
-				$dt = new DateTime('now', new DateTimeZone('Asia/Kolkata'));				
-				$createddt =  $dt->format('Y-m-d H:i:s');
-				
-				$DeletedRow =  $this->input->post('txtDeletedRow'); 
-				$RowCount =  $this->input->post('txtRowCount'); 
-				
-				$comma_separated = explode(':', $DeletedRow);	
-				$serviceSchedule = $this->input->post('serviceSchedule'); 
-                                $servicePeriod = $this->input->post('servicePeriod'); 
-                                $noOfService = $this->input->post('noOfService'); 
-				
-				 $IsExists = $this->requistion_model->RequistionIsExists($Requestedby);
-				// print_r($IsExists);
-				 
-				 if(count( $IsExists) == 0)
-				 {		
-			        //echo 'Not Exists';
-					$Request = array('ReqType'=>$RequestType, 'Requestedby'=>$Requestedby,'ReqDate'=>$createddt,'CostCenterCode'=>$CostCenter,'Status'=>$Status,'CreatedDate'=>$createddt,'CreatedBy'=>$CreateBy,'Schedule_Type'=>$serviceSchedule,'NumberOfService'=>$noOfService,'Service_Period'=>$servicePeriod);
-					
-					//print_r($Request);
-					
-					$Req  = $this->requistion_model->addRequistion($Request);
-				 }
-				 else
-				 {
-					   //echo 'Exists';
-					 $Request = array('ReqType'=>$RequestType, 'Requestedby'=>$Requestedby,'ReqDate'=>$createddt,'Status'=>$Status,'CreatedDate'=>$createddt,'CreatedBy'=>$CreateBy,'CostCenterCode'=>$CostCenter,'Schedule_Type'=>$serviceSchedule,'NumberOfService'=>$noOfService,'Service_Period'=>$servicePeriod);
-					 $UpdateReq  = $this->requistion_model->UpdateRequistion($Request,$IsExists[0]['ReqNo']);
-				 }
-				 $ReqNumber = '';
-				if(count($Req)>0)
-				{
-					 $ReqNumber =  $Req[0]['ReqNo'];
-				}
-				else
-				{
-					 $ReqNumber = $IsExists[0]['ReqNo'];
-				}
-							
-			       $SkipInsert = False;
-					for ($i = 1; $i <= $RowCount; $i++)
-					 {	
-						$SkipInsert = "False";				 
-                       if( count($comma_separated) > 0)
-					   {
-					   for($j = 1; $j < count($comma_separated); $j++)
-					   {	
-                          $deletedRow = 	$comma_separated[$j]	;
-						
-						  if($deletedRow == $i  )
-						  {
-							  $SkipInsert = "True";
-							  break;
-						  }						 
-                          
-						}
-					   }
-					 
-					    if($SkipInsert == "False")
-						   {
-							$MaterialCode = $this->input->post('MaterialCode'.$i);
-							$Quantity = $this->input->post('Quantity'.$i); 
-					 
-							$ReqDetails = array('ReqNo'=>$ReqNumber, 'MaterialCode'=>$MaterialCode,'Quantity'=>$Quantity);
-								$this->requistion_model->addRequistionDetails($ReqDetails);
-						   } 								
-					 
-					}	
-					if($Status == REQ_DRAFT)
-					{
-					    echo 'Successfully Saved the Requistion details';
-					}
-					else
-					{
-						echo 'Successfully Created the Requistion details';
-					} 
-          
-            }
-        
-    }
-	function EditRequistion()
-    {            
-                $Status = $this->input->post('txtStatus');	
-                $ReqNumber = $this->input->post('txtReqNo');
-				$CostCenter = $this->input->post('CostCenter'); 	
-                $UpdatedBy = $this->session->userdata ( 'userId' );
-				$dt = new DateTime('now', new DateTimeZone('Asia/Kolkata'));				
-				$updatedDate =  $dt->format('Y-m-d H:i:s');
-				
-				$DeletedRow =  $this->input->post('txtDeletedRow'); 
-				$RowCount =  $this->input->post('txtRowCount'); 
-				$serviceSchedule = $this->input->post('serviceSchedule'); 
-                                $servicePeriod = $this->input->post('servicePeriod'); 
-                                $noOfService = $this->input->post('noOfService'); 
-				if(strlen($Status) > 1)
-				{
-					$Request = array( 'Status'=>$Status,'CreatedDate'=>$updatedDate,'CreatedBy'=>$UpdatedBy,'CostCenterCode'=>$CostCenter,'Schedule_Type'=>$serviceSchedule,'NumberOfService'=>$noOfService,'Service_Period'=>$servicePeriod);
-					 $UpdateReq  = $this->requistion_model->UpdateRequistion($Request, $ReqNumber);
-				}
-				else
-				{
-						$Request = array( 'Status'=>REQ_PENDING_APPROVAL,'updatedOn'=>$updatedDate,'CostCenterCode'=>$CostCenter,'Schedule_Type'=>$serviceSchedule,'NumberOfService'=>$noOfService,'Service_Period'=>$servicePeriod);
-					 $UpdateReq  = $this->requistion_model->UpdateRequistion($Request, $ReqNumber);
-				}
-				
-				
-				$comma_separated = explode(':', $DeletedRow);	
-								 
-					/* Table value update and Insert in the table */			
-					//echo  "RowCOunt:"	.$RowCount;
-			       $SkipInsert = False;
-					for ($i = 1; $i <= $RowCount; $i++)
-					 {	
-						$SkipInsert = "False";				 
-                       if( count($comma_separated) > 0)
-					   {
-					   for($j = 1; $j < count($comma_separated); $j++)
-					   {	
-                          $deletedRow = 	$comma_separated[$j]	;
-						
-						  if($deletedRow == $i  )
-						  {
-							  $SkipInsert = "True";
-							  break;
-						  }						 
-                          
-						}
-					   }
-					 
-					    if($SkipInsert == "False")
-						   {
-							$MaterialCode = $this->input->post('MaterialCode'.$i);
-							$Quantity = $this->input->post('Quantity'.$i); 
-					        $IsExists = $this->requistion_model->LineItemIsExists($ReqNumber,$MaterialCode);
-							if(count( $IsExists) == 0)
-							{	
-						       $ReqDetails = array('ReqNo'=>$ReqNumber, 'MaterialCode'=>$MaterialCode,'Quantity'=>$Quantity,'UpdatedBy'=>$UpdatedBy,'UpdatedOn'=>$updatedDate);
-							  
-								$this->requistion_model->addRequistionDetails($ReqDetails);
-							}
-							else
-							{
-								$ReqDetails = array('ReqNo'=>$ReqNumber, 'MaterialCode'=>$MaterialCode,'Quantity'=>$Quantity,'UpdatedBy'=>$UpdatedBy,'UpdatedOn'=>$updatedDate);
-								
-								$this->requistion_model->UpdateRequistionLineItem($ReqDetails,$ReqNumber,$MaterialCode);
-							}								
-							
-							
-						   } 								
-					 
-					}						
-						 echo 'Successfully updated the Requistion details';
-					    // $this->requisitionlisting();
-						
-                     
-            
-        
-    }
-/* To Edit the request*/	
-	 function ViewRequest()
-     {
-		 
-		 $ReqNo= $this->input->post('id');
-         $result =  $this->requistion_model->getRequistItemList($ReqNo);
-		 $ReqList = $this->requistion_model->getRequistDetails($ReqNo);
-		 $DepNo = $ReqList[0]['DEPCode'];
-		 //$CostList = $this->requistion_model->GetCostCenterByDept($DepNo);
-		  $HTML="";	
-   		  for ($i = 0; $i < count($result); $i++)
-			 {
-					$SNo = $i + 1;
-					$MaterialCode = $result[$i]['MaterialCode'];
-					$MaterialName = $result[$i]['MaterialName'];
-					$UOM = $result[$i]['UOM'];					
-					$Quantity = $result[$i]['Quantity'];
-					$Quantity = $result[$i]['Quantity'];
-					$POQTY = $result[$i]['POQTY'];
-					$StatusName= $result[$i]['StatusName'];
-					$HTML.="<tr  id='".$i."'>
-							<td align='left'>".$SNo."</td>
-							<td align='left'>". $MaterialCode."</td>
-													                      
-							<td align='left'>".$MaterialName."</td>
-							
-							<td align='left'>".$UOM."</td>	
-								<td align='left'>".$Quantity."</td>	
-							<td	align='left'>".$POQTY."</td>
-							<td align='left'>".$StatusName."</td>								
-							</tr>";
-
-					//$index =  $index + 1;
-   
-			}
-			$CostCode = '';
-			$ReqType = '';
-			$dt = new DateTime('now', new DateTimeZone('Asia/Kolkata'));
-				
-			$Year =  $dt->format('Y');
-			if(count($ReqList)>0)
-			{
-			
-				$ReqType = $ReqList[0]['ReqType'];
-				
-				$CostCode = $ReqList[0]['CostCenterCode'];	
-			}
-			$this->load->model('purchaseorder_model');
-		    $AvlBudget = $this->purchaseorder_model->GetAvailableBudgetAmount($CostCode,$Year,$ReqType);
-			 //print_r($result);
-		    $AvilBudAmt = '0';
-			if(count($AvlBudget)>0)
-			{
-         		$AvilBudAmt = $AvlBudget[0]['BudgetAmount'] -  $AvlBudget[0]['Totalvalue'];
-			}
-           //echo 	$AvilBudAmt;		
-			die(json_encode(array('Items' =>$HTML,'Requist'=>$ReqList,'AvilBudAmount'=>number_format($AvilBudAmt,2))));	
-     }
-	 
-	function ApproveRequest()
-	{
-		  $Status= Trim($_GET['Status']);
-		  
-		  $ReqNo= $_GET['ReqNo'];
-		  $Remarks = trim($this->input->post('id'));
-		  $ApprovedBy = $this->session->userdata ( 'userId' );
-				$dt = new DateTime('now', new DateTimeZone('Asia/Kolkata'));				
-				$ApprovedDate =  $dt->format('Y-m-d H:i:s');
-		  $Request = array('Status'=>$Status,'Comments'=>$Remarks,'ApprovedOn'=>$ApprovedDate,'Approvedby'=>$ApprovedBy);
-		  $this->requistion_model->UpdateRequistion($Request,$ReqNo); 
-		 echo "Successfully Updated the Requistion No: ".$ReqNo;
-		 
-  }	
-	 
-    function pageNotFound()
-    {
-        $this->global['pageTitle'] = 'CodeInsect : 404 - Page Not Found';
-        
-        $this->loadViews("404", $this->global, NULL, NULL);
-    }
-}
-
-?>
\ No newline at end of file
diff --git a/application/controllers/servicepurchaseorder.php b/application/controllers/servicepurchaseorder.php
index 179ef65f..3e6f0cde 100644
--- a/application/controllers/servicepurchaseorder.php
+++ b/application/controllers/servicepurchaseorder.php
@@ -5,11 +5,11 @@
 require APPPATH . '/libraries/BaseController.php';
 
 /**
- * Class : purchaseorder (PurchaseorderController)
+ * Class : servicepurchaseorder (Service Purchase Order Details - Controller)
  * User Class to control all user related operations.
- * @author : VenbaMail Mali
+ * @author : Venba Info Tech -
  * @version : 1.1
- * @since : 15 Feb 2016
+ * @since : 15 November 2017
  */
 class servicepurchaseorder extends BaseController
 {
@@ -30,7 +30,7 @@ class servicepurchaseorder extends BaseController
    function viewServicePOReportForBilling()
 	 {
 		 
-			$this->global['pageTitle'] = 'Siddharth : Service Purchase Order for Billing';
+			$this->global['pageTitle'] = 'Resico : Service Purchase Order for Billing';
 			
 			$data["Billing"] = $this->purchaseorder_model->GetServicePOListforBilling();
 
@@ -42,7 +42,7 @@ class servicepurchaseorder extends BaseController
 	 
 	 function UpdateServicePOStatus()
 	 {
-			$this->global['pageTitle'] = 'Siddharth : Update Service PO Status';
+			$this->global['pageTitle'] = 'Resico : Update Service PO Status';
 			  $data['PO'] = $this->purchaseorder_model->GetServicePOListforStatusUpdate();
 			  $data['WorkStatus']=$this->purchaseorder_model->getStatus(7);
 			           
@@ -487,7 +487,7 @@ $result = $this->purchaseorder_model->GetPODetailforBillingServicePO($PO);
 	}
     function pageNotFound()
     {
-        $this->global['pageTitle'] = 'CodeInsect : 404 - Page Not Found';
+        $this->global['pageTitle'] = 'Resico : 404 - Page Not Found';
         
         $this->loadViews("404", $this->global, NULL, NULL);
     }
diff --git a/application/controllers/servicepurchaseorder.php~ b/application/controllers/servicepurchaseorder.php~
deleted file mode 100644
index b645cb8e..00000000
--- a/application/controllers/servicepurchaseorder.php~
+++ /dev/null
@@ -1,325 +0,0 @@
-
-
-<?php if(!defined('BASEPATH')) exit('No direct script access allowed');
-
-require APPPATH . '/libraries/BaseController.php';
-
-/**
- * Class : purchaseorder (PurchaseorderController)
- * User Class to control all user related operations.
- * @author : VenbaMail Mali
- * @version : 1.1
- * @since : 15 Feb 2016
- */
-class servicepurchaseorder extends BaseController
-{
-    /**
-     * This is default constructor of the class
-     */
-    public function __construct()
-    {
-        parent::__construct();
-        $this->load->model('purchaseorder_model');
-		
-       $this->load->library('session');
-	     $this->load->library('form_validation');
-		$this->load->model('requistion_model');
-        $this->isLoggedIn();   
-    }
-    
-   
-	// To get the available Budget Amount
-	function AvilBudgetAmount()
-	 {		
-          // echo 'Controller called';	 
-		   $CostCode = $this->input->post('id');
-		   $ReqType =  $_GET['ReqType']; 
-		   
-		
-		   $dt = new DateTime('now', new DateTimeZone('Asia/Kolkata'));
-				
-			$Year =  $dt->format('Y');
-			$this->load->model('purchaseorder_model');
-		    $result = $this->purchaseorder_model->GetAvailableBudgetAmount($CostCode,$Year,$ReqType);
-			 //print_r($result);
-		    $AvilBudAmt = '0';
-			if(count($result)>0)
-			{
-         		$AvilBudAmt = $result[0]['BudgetAmount'] -  $result[0]['Totalvalue'];
-			}				
-		   
-		  //  echo 'Test';
-		   print_r($AvilBudAmt);
-			//die(json_encode(array('Cost' => $AvilBudAmt)));
-	 }
-	 
-	 
-	 function getDateformat($Val)
-	{
-		       $date = new DateTime($Val,new DateTimeZone('Asia/Kolkata'));
-			 //  print_r($date);
-				$retDate = $date->format('Y-m-d H:i:s');
-				return $retDate;
-	}
-	
-	//This used to Create Service Purchase Order
-	function addNewServicePurchaseOrder()
-	{
-              
-				$POdt =$this->input->post('PODate');
-				$PODate =  $this->getDateformat($POdt);
-                                $SupplierID = $this->input->post('drpSupplier');  
-				$DeliveryAddr = $this->input->post('DeliveryAddr');
-				$dt = $this->input->post('Deliverydt');
-				//$Deliverydt = $this->getDateformat($dt);
-                                $DeliveryOption = $this->input->post('DateRange');
-                                if($DeliveryOption==1)
-                                {
-                                        $Deliverydt = '';
-                                        $DeliverySchedule = $this->input->post('Scheduleby');
-                                }
-                                else{
-                                        $Deliverydt = $this->getDateformat($dt);
-                                        $DeliverySchedule = '';
-                                        }
-
-                                $PaymentTerms=$this->input->post('PaymentTerms');
-				
-
-				$POType = $this->input->post('POType');
-								
-				$SpcialInstruction = $this->input->post('ScopeOfWork');
-				$TotalOrderValueSummary = $this->input->post('txtTotalOrderValueSummary');
-			      $POStatus = $this->input->post('txtStatus');
-
-                               $CreateBy = $this->session->userdata ( 'userId' );
-				$RowCount =  $this->input->post('txtRowCount'); 
-				$DeletedRow =  $this->input->post('txtDeletedRow'); 
-				
-				$comma_separated = explode(':', $DeletedRow);	
-				
-				$dt = new DateTime('now', new DateTimeZone('Asia/Kolkata'));				
-				$createddt =  $dt->format('Y-m-d H:i:s');
-
-				$WorkStatus=$this->input->post('workstatus');
-				// PO Master
-				$POList = array('SupplierID'=>$SupplierID, 'TotalOrderValue'=>$TotalOrderValueSummary,'PODate'=>$PODate,'Status'=>$POStatus, 'DeliverySchedule'=>$DeliverySchedule,'DeliveryOption'=>$DeliveryOption, 'ServiceDescription'=>$SpcialInstruction,'CreatedBy'=>$CreateBy,'DeliveryAddress'=>$DeliveryAddr,'DeliveryDate'=>$Deliverydt,'CreatedDate'=>$createddt,'PaymentTerms'=>$PaymentTerms,'ServiceWorkStatus'=>$WorkStatus,'POType'=>$POType );
-				
-					$POMaster  = $this->purchaseorder_model->addPOMaster($POList);
-					
-					 $PONO = '';
-					if(count($POMaster)>0)
-					{
-					 $PONO =  $POMaster[0]['PONO'];
-					}
-					
-					// PO Line Items
-					$LineItemStatus = REQITEM_NEW;
-					
-						for ($i = 1; $i <= $RowCount; $i++)
-							{	
-							
-								$MaterialCode = $this->input->post('materialCode'.$i);
-								$Quantity = $this->input->post('quantity'.$i); 
-								$Reqnumber = $this->input->post('Reqnumber'.$i);
-								$itemRate = $this->input->post('itemRate'.$i);
-								$Cgst = $this->input->post('Cgst'.$i);
-								$Sgst = $this->input->post('Sgst'.$i);
-								$Igst = $this->input->post('Igst'.$i);
-								$AfterCgst = $this->input->post('AfterCgst'.$i);
-								$AfterSgst = $this->input->post('AfterSgst'.$i);
-								$AfterIgst = $this->input->post('AfterIgst'.$i);
-								$CostCenter	= $this->input->post('costCode'.$i);
-								$ServiceFrequency=$this->input->post('Frequency'.$i);
-								$ItemDescription = $this->input->post('ItemDescription'.$i);
-                                                                $OtherAmt = $this->input->post('OtherAmt'.$i);
-								$TotalOrderValue = $this->input->post('TotalOrderValue'.$i);							
-								
-								$SkipInsert = "False";				 
-								if( count($comma_separated) > 0)
-								{
-								   for($j = 1; $j < count($comma_separated); $j++)
-								   {	
-									  $deletedRow = 	$comma_separated[$j]	;
-									
-									  if($deletedRow == $i  )
-									  {
-										  $SkipInsert = "True";
-										  break;
-									  }						 
-									  
-									}
-								 }
-								  if($SkipInsert == "False")
-									{
-								
-								$POLineItemList = array('PONO'=>$PONO, 'ReqNo'=>$Reqnumber,'MaterialCode'=>$MaterialCode,'Quantity'=>$Quantity,'Rate'=>$itemRate,'Status'=>$LineItemStatus,'CreatedBy'=>$CreateBy,'CreatedDate'=>$createddt,'CostCenterCode'=>$CostCenter,'ServiceFrequency'=>$ServiceFrequency,'ServiceMaterialDescription'=>$ItemDescription);
-								//print_r($POLineItemList);
-								//die();
-					
-								$POLineItem = $this->purchaseorder_model->addPOLineItem($POLineItemList);
-					
-								$LineItemNo = '';
-								
-								if(count($POLineItem)>0)
-								{
-									$LineItemNo =  $POLineItem[0]['LineItemNo'];
-								}
-								//echo $LineItemNo; 
-								
-								if(trim($POType) == SERVICE )
-								{
-								//	echo 'Success';
-								$ServiceTaxList = array('LineItemNo'=>$LineItemNo, 'CGST'=>$Cgst,'After_CGST'=>$AfterCgst,'SGST'=>$Sgst,'After_SGST'=>$AfterSgst,'IGST'=>$Igst,'After_IGST'=>$AfterIgst,'TotalValue'=>$TotalOrderValue, 'CreatedBy'=>$CreateBy,'CreatedDate'=>$createddt,'otherallowance'=>$OtherAmt);
-								
-								$ServiceTax = $this->purchaseorder_model->addServiceTax($ServiceTaxList);
-								
-								}
-									}
-								
-							}							
-					echo 'Service Purchase Order Created Successfully!The PO NO Is: '.$PONO;
-					
-	}
-	function UpdateServicePurchaseOrder()
-	{
-				$PONO =$this->input->post('txtPONO');
-				//echo $PONO;
-				$POdt =$this->input->post('PODate');
-				$PODate =  $this->getDateformat($POdt);
-				
-                $SupplierID = $this->input->post('drpSupplier');  
-				$DeliveryAddr = $this->input->post('txtDeliveryAddress');
-				$dt = $this->input->post('Deliverydt');
-				  $DeliveryOption = $this->input->post('DateRange');
-        if($DeliveryOption==1){
-         $Deliverydt = '';
-        $DeliverySchedule = $this->input->post('Scheduleby');
-        }
-         else{
-         $Deliverydt = $this->getDateformat($dt);
-        $DeliverySchedule = '';
-        }
-
-
-              
-
-                $PaymentTerms=$this->input->post('PaymentTerms');
-				$Payableat=$this->input->post('PayableAT');
-				
-				$POType = $this->input->post('POType');
-								
-				$SpcialInstruction = $this->input->post('ScopeofWork');
-				$TotalOrderValueSummary = $this->input->post('txtTotalOrderValueSummary');
-			    $POStatus = $this->input->post('txtStatus');
-
-                $updatedBy = $this->session->userdata ( 'userId' );
-				$RowCount =  $this->input->post('txtRowCount'); 
-				$DeletedRow =  $this->input->post('txtDeletedRow'); 
-				
-				$comma_separated = explode(':', $DeletedRow);
-				$dt = new DateTime('now', new DateTimeZone('Asia/Kolkata'));				
-				$updateddt =  $dt->format('Y-m-d H:i:s');
-				$WorkStatus=$this->input->post('workstatus');
-				
-				
-				// PO Master
-				$POList = array('SupplierID'=>$SupplierID, 'TotalOrderValue'=>$TotalOrderValueSummary,'PODate'=>$PODate,'Status'=>$POStatus,'DeliverySchedule'=>$DeliverySchedule,'DeliveryOption'=>$DeliveryOption,'ServiceDescription'=>$SpcialInstruction,'UpdateBY'=>$updatedBy,'DeliveryAddress'=>$DeliveryAddr,'DeliveryDate'=>$Deliverydt,'UpdatedOn'=>$updateddt,'PaymentTerms'=>$PaymentTerms,'ServiceWorkStatus'=>$WorkStatus );
-
-				$POMaster  = $this->purchaseorder_model->updatePOMaster($PONO,$POList);				
-				
-				$LineItemStatus = REQITEM_NEW;
-				
-				for ($i = 1; $i <= $RowCount; $i++)
-				{								
-					$MaterialCode = $this->input->post('materialCode'.$i);
-					$Quantity = $this->input->post('quantity'.$i); 
-					$Reqnumber = $this->input->post('Reqnumber'.$i);
-					$itemRate = $this->input->post('itemRate'.$i);
-					$Cgst = $this->input->post('Cgst'.$i);
-                                        $Sgst = $this->input->post('Sgst'.$i);
-                                        $Igst = $this->input->post('Igst'.$i);
-                                        $AfterCgst = $this->input->post('AfterCgst'.$i);
-                                        $AfterSgst = $this->input->post('AfterSgst'.$i);
-                                        $AfterIgst = $this->input->post('AfterIgst'.$i);
-                                        $CostCenter	= $this->input->post('costCode'.$i);
-                                        $ServiceFrequency=$this->input->post('Frequency'.$i);
-					$POLineItemNo = $this->input->post('LineItemNo'.$i);
-					$TotalOrderValue = $this->input->post('TotalOrderValue'.$i);
-					$ItemDescription = $this->input->post('ItemDescription'.$i);
-                                        $OtherAmt = $this->input->post('OtherAmt'.$i);			
-					
-					$POLineItem = array();
-					$LineItemNo = '';
-					$SkipInsert = "False";				 
-								   if( count($comma_separated) > 0)
-								   {
-								   for($j = 1; $j < count($comma_separated); $j++)
-								   {	
-									  $deletedRow = 	$comma_separated[$j]	;
-									
-									  if($deletedRow == $i  )
-									  {
-										  $SkipInsert = "True";
-										  break;
-									  }						 
-									  
-									}
-								   }
-					 if($SkipInsert == "False")
-				{
-					if(strlen($POLineItemNo) == 0)
-					{
-						$POLineItemList = array('PONO'=>$PONO, 'ReqNo'=>$Reqnumber,'MaterialCode'=>$MaterialCode,'Quantity'=>$Quantity,'Rate'=>$itemRate,'Status'=>$LineItemStatus,'CreatedBy'=>$updatedBy,'CreatedDate'=>$updateddt,'CostCenterCode'=>$CostCenter,'ServiceFrequency'=>$ServiceFrequency,'ServiceMaterialDescription'=>$ItemDescription);
-						$POLineItem = $this->purchaseorder_model->addPOLineItem($POLineItemList);
-						if(count($POLineItem)>0)
-						{
-							$LineItemNo =  $POLineItem[0]['LineItemNo'];
-						}
-					
-					}
-					else
-					{
-						$LineItemNo = $POLineItemNo;	
-						
-						$POLineItemList = array('PONO'=>$PONO, 'ReqNo'=>$Reqnumber,'MaterialCode'=>$MaterialCode,'Quantity'=>$Quantity,'Rate'=>$itemRate,'Status'=>$LineItemStatus,'UpdateBY'=>$updatedBy,'UpdatedOn'=>$updateddt,'CostCenterCode'=>$CostCenter,'ServiceMaterialDescription'=>$ItemDescription);
-						$POLineItem = $this->purchaseorder_model->updatePOLineItem($PONO,$POLineItemNo,$POLineItemList);					
-						
-					}
-
-					
-					
-					if(trim($POType) == SERVICE )
-					{
-					$isExists = $this->purchaseorder_model->LineItemExists($LineItemNo); 
-					
-					if(count($isExists) == 0)
-					{
-					$ServiceTaxList = array('LineItemNo'=>$LineItemNo, 'CGST'=>$Cgst,'After_CGST'=>$AfterCgst,'SGST'=>$Sgst,'After_SGST'=>$AfterSgst,'IGST'=>$Igst,'After_IGST'=>$AfterIgst,'TotalValue'=>$TotalOrderValue, 'CreatedBy'=>$updatedBy,'CreatedDate'=>$updateddt,'otherallowance'=>$OtherAmt);
-					
-					  $this->purchaseorder_model->addServiceTax($ServiceTaxList);
-					
-					}
-					else
-					{
-						$ServiceTaxList1 = array('CGST'=>$Cgst,'After_CGST'=>$AfterCgst,'SGST'=>$Sgst,'After_SGST'=>$AfterSgst,'IGST'=>$Igst,'After_IGST'=>$AfterIgst,'TotalValue'=>$TotalOrderValue, 'UpdateBY'=>$updatedBy,'UpdatedOn'=>$updateddt,'otherallowance'=>$OtherAmt);
-						
-						$this->purchaseorder_model->updateServiceTax($LineItemNo,$ServiceTaxList1); 
-						
-					}
-					
-					}
-					
-				} 				
-				}
-				echo 'Successfully updated the Service Purchase Order';	
-	}
-    function pageNotFound()
-    {
-        $this->global['pageTitle'] = 'CodeInsect : 404 - Page Not Found';
-        
-        $this->loadViews("404", $this->global, NULL, NULL);
-    }
-}
-
-?>
diff --git a/application/controllers/storerequisition.php b/application/controllers/storerequisition.php
index 37d43f32..b40563e5 100644
--- a/application/controllers/storerequisition.php
+++ b/application/controllers/storerequisition.php
@@ -3,11 +3,11 @@
 require APPPATH . '/libraries/BaseController.php';
 
 /**
- * Class : Cost Center (Cost Center Controller)
+ * Class :storerequisition (Store Requisition Detail - Controller )
  * User Class to control all user related operations.
- * @author : VenbaMail Mali
+ * @author : Venba Info Tech -
  * @version : 1.1
- * @since : 15 Feb 2016
+ * @since : 18 November 2017
  */
 class storerequisition extends BaseController
 {
@@ -29,38 +29,38 @@ class storerequisition extends BaseController
      */
     public function index()
     {
-        //$this->global['pageTitle'] = 'Siddharth : storesrequisitionslip';
+        //$this->global['pageTitle'] = 'Resico : storesrequisitionslip';
         
         //$this->loadviews('storesrequisitionslip',$this->global);  
     }
 
     function  addstorerequisitionslip()
     {
-        $this->global['pageTitle'] = 'Siddharth : Add Store Requisition';
+        $this->global['pageTitle'] = 'Resico : Add Store Requisition';
         
         $this->loadviews('addstorerequisitionslip',$this->global);  
     }
      function  storerequisitionlist()
     {
-        $this->global['pageTitle'] = 'Siddharth : Store Requisition List';
+        $this->global['pageTitle'] = 'Resico : Store Requisition List';
         
         $this->loadviews('storerequisitionlist',$this->global);  
     }
 	 function  storerequisitionlisting()
     {
-        $this->global['pageTitle'] = 'Siddharth : Store Requisition Listing';
+        $this->global['pageTitle'] = 'Resico : Store Requisition Listing';
         
         $this->loadviews('storerequisitionlisting',$this->global);  
     }
 	 function  approvalstorerequisition()
     {
-        $this->global['pageTitle'] = 'Siddharth : Approval Store Requisition';
+        $this->global['pageTitle'] = 'Resico : Approval Store Requisition';
         
         $this->loadviews('approvalstorerequisitionslip',$this->global);  
     }
 	 function pageNotFound()
     {
-        $this->global['pageTitle'] = 'Siddharth : 404 - Page Not Found';
+        $this->global['pageTitle'] = 'Resico : 404 - Page Not Found';
         
         $this->loadViews("404", $this->global, NULL, NULL);
     }
diff --git a/application/controllers/storerequisitionlist.php b/application/controllers/storerequisitionlist.php
index dbfe0acc..49780dc4 100644
--- a/application/controllers/storerequisitionlist.php
+++ b/application/controllers/storerequisitionlist.php
@@ -3,11 +3,11 @@
 require APPPATH . '/libraries/BaseController.php';
 
 /**
- * Class : Cost Center (Cost Center Controller)
+ * Class :storerequisitionlist (Store Stock list details - Controller)
  * User Class to control all user related operations.
- * @author : VenbaMail Mali
+ * @author : Venba Info Tech - 
  * @version : 1.1
- * @since : 15 Feb 2016
+ * @since : 18 November 2017
  */
 class storerequisitionlist extends BaseController
 {
@@ -32,7 +32,7 @@ class storerequisitionlist extends BaseController
     
     {
         
-        $this->global['pageTitle'] = 'Siddharth : StoreRequisition Listing';
+        $this->global['pageTitle'] = 'Resico : StoreRequisition Listing';
      	     	$userId= $this->session->userdata ('userId');
      	$data['DEPCode'] = $this->session->userdata('DEPCode');
         $data['DepName'] = $this->session->userdata('DepartmentName');
@@ -48,7 +48,7 @@ class storerequisitionlist extends BaseController
      function addstore()    
     {
         
-        $this->global['pageTitle'] = 'Siddharth : StoreRequisition Listing';     
+        $this->global['pageTitle'] = 'Resico : StoreRequisition Listing';     
      	$userId= $this->session->userdata ('userId');
      	$data['Store'] = $this->storerequistion_model->Storeall($userId);
      	
@@ -78,7 +78,7 @@ class storerequisitionlist extends BaseController
      	$StoreReqNo = $_GET['StoreReqNo'];
 
      	//$StoreReqNo=  $this->input->post('id');
-        $this->global['pageTitle'] = 'Siddharth : StoreRequisition Listing';
+        $this->global['pageTitle'] = 'Resico : StoreRequisition Listing';
      	$this->load->model('storerequistion_model');
         $data['cost'] = $this->storerequistion_model->editRequistDetails($StoreReqNo);
 		
@@ -191,7 +191,7 @@ class storerequisitionlist extends BaseController
     
     function addstorerequisitionlist()
     {
-        $this->global['pageTitle'] = 'Siddharth : StoreRequisition Listing';
+        $this->global['pageTitle'] = 'Resico : StoreRequisition Listing';
      	$this->load->model('storerequistion_model');
      	
 		$data['Status']= $this->storerequistion_model->getStatus();
@@ -206,7 +206,7 @@ class storerequisitionlist extends BaseController
     function issuestorerequisition()
     {
 				
-        $this->global['pageTitle'] = 'Siddharth : Issue StoreRequisition';
+        $this->global['pageTitle'] = 'Resico : Issue StoreRequisition';
      	$this->load->model('storerequistion_model');
      	
 		 $StoreReqNo= $_GET['ReqNo'];
@@ -359,7 +359,7 @@ class storerequisitionlist extends BaseController
         
 		    $data['AppList'] = $this->storerequistion_model->getApproverRequistList($userID);
 			//print_r($data['AppList']);
-		 $this->global['pageTitle'] = 'Siddharth :  ApprovalStoreRequisitionSlip';	
+		 $this->global['pageTitle'] = 'Resico :  ApprovalStoreRequisitionSlip';	
 			$data['Status']= $this->storerequistion_model->getStatus();	  		
            
 			$this->loadViews("approvalstorerequisitionslip", $this->global, $data, NULL);
@@ -390,7 +390,7 @@ class storerequisitionlist extends BaseController
 	 */
     function requisitionlistApproval()
      {
-		  $this->global['pageTitle'] = 'Siddharth :Approvalstorerequisitionlist';
+		  $this->global['pageTitle'] = 'Resico :Approvalstorerequisitionlist';
 		  
 		   //$data['Status']= $this->storerequistion_model->getStatus();
 		 
diff --git a/application/controllers/storestatus.php b/application/controllers/storestatus.php
index aa36f56c..1ae0acc0 100644
--- a/application/controllers/storestatus.php
+++ b/application/controllers/storestatus.php
@@ -3,11 +3,11 @@
 require APPPATH . '/libraries/BaseController.php';
 
 /**
- * Class : Supplier Controller (supplier)
+ * Class : storestatus (Store Stock Status -Controller)
  * User Class to control all user related operations.
- * @author : Saravana kumar
+ * @author : Venba Info Tech - Saravana kumar
  * @version : 1.1
- * @since : 4 July 2017
+ * @since : 18 November 2017
  */
 class storestatus extends BaseController
 {
@@ -28,7 +28,7 @@ class storestatus extends BaseController
      */
 	public function index()
     {
-         $this->global['pageTitle'] = 'Siddharth Industries : Store Status';
+         $this->global['pageTitle'] = 'Resico Industries : Store Status';
           
         $this->loadViews("storestatus", $this->global, NULL , NULL);
     }
@@ -44,7 +44,7 @@ class storestatus extends BaseController
                       
             //$data['userRecords'] = $this->supplier_model->supplierListing();
             
-            $this->global['pageTitle'] = 'Siddharth Industries : Store Status';
+            $this->global['pageTitle'] = 'Resico Industries : Store Status';
 			//viewStock
             $data['Stock'] = $this->store_model->viewStock();
 
@@ -150,7 +150,7 @@ class storestatus extends BaseController
 	
     function pageNotFound()
     {
-        $this->global['pageTitle'] = 'Siddharth : 404 - Page Not Found';
+        $this->global['pageTitle'] = 'Resico : 404 - Page Not Found';
         
         $this->loadViews("404", $this->global, NULL, NULL);
     }
diff --git a/application/controllers/supplier.php b/application/controllers/supplier.php
index e513dcfe..a3a37533 100644
--- a/application/controllers/supplier.php
+++ b/application/controllers/supplier.php
@@ -3,11 +3,11 @@
 require APPPATH . '/libraries/BaseController.php';
 
 /**
- * Class : Supplier Controller (supplier)
+ * Class : supplier (Supplier Details - Controller)
  * User Class to control all user related operations.
- * @author : Gandhimathi
+ * @author :Venba Info Tech - Gandhimathi
  * @version : 1.1
- * @since : 12 Apr 2017
+ * @since : 18 November 2017
  */
 class supplier extends BaseController
 {
@@ -415,7 +415,7 @@ class supplier extends BaseController
             $data['supplier'] = $this->supplier_model->getSupplierInfo($supplierID);
             //$data['payment'] = $this->supplier_model->getpayment($Payment );
             $data['payment'] = $this->supplier_model->getPaymentTerms($Payment);
-            $this->global['pageTitle'] = 'Siddharth : Edit Supplier'; 
+            $this->global['pageTitle'] = 'Resico : Edit Supplier'; 
             
             $this->loadViews("editSupplier", $this->global,$data, NULL);        
     }   
diff --git a/application/controllers/supplier.php~ b/application/controllers/supplier.php~
deleted file mode 100644
index 56422769..00000000
--- a/application/controllers/supplier.php~
+++ /dev/null
@@ -1,513 +0,0 @@
-<?php if(!defined('BASEPATH')) exit('No direct script access allowed');
-
-require APPPATH . '/libraries/BaseController.php';
-
-/**
- * Class : Supplier Controller (supplier)
- * User Class to control all user related operations.
- * @author : Gandhimathi
- * @version : 1.1
- * @since : 12 Apr 2017
- */
-class supplier extends BaseController
-{
-    /**
-     * This is default constructor of the class
-     */
-     public function __construct()
-    {
-        parent::__construct();
-        $this->load->model('supplier_model');
-        $this->load->library('form_validation');  
-        $this->load->library('pagination'); 
-        $this->load->library('Excel');
-        $this->isLoggedIn();   
-    }
-    /**
-     * This function used to load the first screen of the user
-     */
-    public function index()
-    {
-        $this->global['pageTitle'] = 'Siddharth : Supplier';
-        
-        $this->loadViews("supplierListing", $this->global, NULL , NULL);
-    }
-    
-    /**
-     * This function is used to load the Supplier list
-     */
-    function supplierListing()
-    {
-        
-            $this->load->model('supplier_model');
-                       
-            $data['userRecords'] = $this->supplier_model->supplierListing();
-            
-            $this->global['pageTitle'] = 'Siddharth Industries : Supplier Listing';
-            
-            $this->loadViews("supplierListing", $this->global, $data, NULL);
-        
-    }
-    /**
-     * This function is used to load the add new supplier    */
-    function addsupplier()
-    {
-           
-            //$data['payment'] = $this->supplier_model->getpayment();
-            $data['payment'] = $this->supplier_model->getPaymentTerms();
-            //$data['users'] = $this->purchaseorder_model->getusers();
-            
-            $this->global['pageTitle'] = 'siddharth : Add New Supplier';
-
-            $this->loadViews("addsupplier", $this->global,$data,  NULL);
-        
-    }
-    /**
-     * This function is used to check whether PAN already exist or not
-    */
-     
-        function CheckPAN()
-    {
-    
-          $id = $this->input->post('id');
-        
-          $query = $this->supplier_model->checkPAN($id );
-            
-          $query =  $query[0]['PAN'];               
-          
-          print_r($query);          
-                  
-    }
-
-     /* To Check the Pan Number is exists in the database or not for the selected Supplier */
-      function checkPanValidateSupplier()     {   
-    
-          $SupplierID = $this->input->post('SupplierID');   
-          $PanNo = $this->input->post('panno');
-         // echo  'Sup'. $SupplierID ;
-          $query = $this->supplier_model->checkPAN($PanNo,$SupplierID);
-          if (count($query)> 0)
-          {
-             $this->form_validation->set_message('checkPanValidateSupplier', 'The Entered PAN Number is already exists in the Database.');
-             return false;
-          }
-          else
-          {
-              return true;
-          }
-      }
-    
-     /* To Check the Pan Number is exists in the database or not */
-      function checkPanValidate()
-      {
-     // alert('validation pan');   
-        
-          $PanNo = $this->input->post('panno');
-         
-          $query = $this->supplier_model->checkPAN($PanNo);
-          if (count($query)> 0)
-          {
-             $this->form_validation->set_message('checkPanValidate', 'The Entered PAN Number is  already exists in the Database.');
-             return false;
-          }
-          else
-          {
-              return true;
-          }
-      }
-
-
-
-        function CheckGST()
-    {
-          //alert('check validation GST');
-          $id = $this->input->post('id');
-          $query = $this->supplier_model->checkGST($id);
-          $query =  $query[0]['GSTNO'];               
-          print_r($query);          
-                  
-    }
-
-
-       /* To Check the GST Number is exists in the database or not for the selected Supplier */
-      function checkGstValidateSupplier()     {   
-          //alert(' gst validation GST');
-          $SupplierID = $this->input->post('SupplierID');   
-          $GstNo = $this->input->post('GSTNo');
-          //echo  'Sup'. $SupplierID ;
-          $query = $this->supplier_model->checkGST($GstNo,$SupplierID);
-          if (count($query)> 0)
-          {
-             $this->form_validation->set_message('checkGstValidateSupplier', 'The Entered GST Number is already exists in the Database.');
-             return false;
-          }
-          else
-          {
-              return true;
-          }
-      }
-    
-
-      /* To Check the GST Number is exists in the database or not */
-      function checkGstValidate()
-      {  
-        
-          $GstNo = $this->input->post('GSTNo');  
-          $query = $this->supplier_model->checkGST($GstNo);
-          if (count($query)> 0)
-          {
-             $this->form_validation->set_message('checkGstValidate', 'The Entered GST Number is  already exists in the Database.');
-             return false;
-          }
-          else
-          {
-              return true;
-          }
-      }
-    
-    
-    /**
-     * This function is used to add new Supplier to the system
-     */
-    function addNewsupplier()
-    {
-        
-        
-            $this->form_validation->set_rules('SupplierName','Supplier Name','trim|required');
-            $this->form_validation->set_rules('Address','Address','trim|required|');
-            $this->form_validation->set_rules('ContactNumber','Contact Number','trim|required|max_length[13]');
-            $this->form_validation->set_rules('AlternateContactNumber','Alternate Contact Number','trim|max_length[13]');
-            $this->form_validation->set_rules('emailid','emailid', 'valid_email|max_length[128]|required');
-            $this->form_validation->set_rules('TIN','TIN','trim|required|max_length[11]');
-            $this->form_validation->set_rules('panno', 'panno', 'trim|required|max_length[10]');//|callback_checkPanValidate');
-            $this->form_validation->set_rules('GSTNo','GSTNo','trim|requried|max_length[15]|callback_checkGstValidate');
-            
-            if($this->form_validation->run() == FALSE)
-            {
-                $this->addsupplier();
-            }
-            else
-            {
-                $SupplierName = $this->input->post('SupplierName');
-                $Address = $this->input->post('Address');                
-                $ContactNumber = $this->input->post('ContactNumber');
-                $AlternateContactNumber = $this->input->post('AlternateContactNumber');
-                $EmailAddress = $this->input->post('emailid');
-                $Exiseregistration = $this->input->post('Exciseregistration');
-                $TIN = $this->input->post('TIN');
-                $PAN = strtoupper($this->input->post('panno'));
-                $GSTNo = strtoupper($this->input->post('GSTNo'));
-                $GSTRange = $this->input->post('GSTRange');
-                $CollectrateAddress = $this->input->post('CollectrateAddress');
-                $UANumber = $this->input->post('UANumber');
-                //$PaymentTerms = $this->input->post('paymentname');
-                //$Payment = $this->input->post('Payment');
-                //$PayableAT = $this->input->post('PayableAT');
-                $CSTNo = $this->input->post('CSTNo');
-                 
-                 $CSTDt = $this->input->post('dateofCST');
-                 
-                 if($CSTDt != '')
-                {
-                $CSTDate =  $this->getDateformat($CSTDt);
-                }
-                else
-                {
-                    $CSTDate = null;
-                }
-
-                $EMSNo = $this->input->post('EMSNo');
-                $TSNo = $this->input->post('TSNo');
-                $IMSNo = $this->input->post('IMSNo');
-                $ISONo = $this->input->post('ISONo');
-                $OSHASNo = $this->input->post('OSHASNo');
-                $accno = $this->input->post('accno');
-                $ifsc = $this->input->post('ifsc');
-                $branchname = $this->input->post('branchname');
-                $bankaddress = $this->input->post('bankaddress');
-                $Createdby = $this->session->userdata ( 'userId' );
-                $date = new DateTime('now', new DateTimeZone('Asia/Kolkata'));               
-                $createddate =  $date->format('Y-m-d H:i:s');
-                $service = $this->input->post('service');
-                $rawmaterial =$this->input->post('rawmaterial');
-                $maintenance = $this->input->post('maintanance');
-                $PaymentId = $this->input->post('paymentid');
-                
-            
-                $supplier = array('SupplierName'=>$SupplierName, 'Address'=>$Address, 'ContactNumber'=>$ContactNumber, 'AlternateContactNumber'=> $AlternateContactNumber,'EmailAddress'=>$EmailAddress,'Exiseregistration'=>$Exiseregistration,'TIN'=>$TIN,'PAN'=>$PAN,'GSTNo'=>$GSTNo,'GSTRange'=>$GSTRange,'CollectrateAddress'=>$CollectrateAddress,'UANumber'=>$UANumber,'PaymentID'=>$PaymentId,'CSTNo'=>$CSTNo,'CSTDate'=>$CSTDate,'CSTNo'=>$CSTNo,'CSTDate'=>$CSTDate,'Cert_EMS'=>$EMSNo, 'Cert_TS'=>$TSNo, 'Cert_IMS'=>$IMSNo, 'Cert_ISO'=>$ISONo, 'Cert_OSHAS'=>$OSHASNo, 'BankAcNumber'=>$accno, 'IFSCCode'=>$ifsc, 'BranchName'=>$branchname, 'BankAddress'=>$bankaddress,'Createdby'=>$Createdby,'IsService'=>$service,'IsMaintanance'=>$maintenance,'IsRawMaterial'=>$rawmaterial); //,'PaymentTerms'=>$PaymentTerms,'PaymentDays'=>$Payment,'PayableAT'=>$PayableAT);    
-                //print_r($supplier);die();
-                $result = $this->supplier_model->addNewsupplier($supplier);
-
-              
-                if($result > 0)
-                {
-                     redirect('supplierListing','refresh');
-                     echo "<script>alert('New Supplier Created successfully!');</script>";
-                }
-                
-                else
-                {
-                     redirect('supplierListing','refresh');
-                    echo "<script>alert('Supplier Record Not Created!');</script>";
-                }
-            }
-        
-    }
-    
-    function getDateformat($Val)
-    {
-               $date = new DateTime($Val);
-                $retDate = $date->format('Y-m-d H:i:s');
-                return $retDate;
-    }
-    /**
-     * This function is used to edit the Supplier information
-     */
-    function editsupplier()
-    {            
-            $this->form_validation->set_rules('SupplierName','Supplier Name','trim|required');
-            $this->form_validation->set_rules('Address','Address','trim|required|');
-            $supplierID = $this->input->post('SupplierID');
-            //echo 'supID' . $supplierID ;
-            $this->form_validation->set_rules('ContactNumber','Contact Number','trim|required|max_length[13]');
-            $this->form_validation->set_rules('AlternateContactNumber','Alternate Contact Number','trim|max_length[13]');
-            $this->form_validation->set_rules('emailid','emailid','valid_email|max_length[128]|required');
-            $this->form_validation->set_rules('TIN','TIN','trim|required|max_length[11]');
-            $this->form_validation->set_rules('panno', 'panno', 'trim|required|max_length[10]|callback_checkPanValidateSupplier');
-            $this->form_validation->set_rules('GSTNo','GSTNo','trim|requried|max_length[15]|callback_checkGstValidateSupplier');
-
-    
-            
-            if($this->form_validation->run() == FALSE)
-            {
-                $this->viewsupplier($supplierID);
-            }
-            else
-            {
-
-                $SupplierName = $this->input->post('SupplierName');
-                $Address = $this->input->post('Address');                
-                $ContactNumber = $this->input->post('ContactNumber');
-                $AlternateContactNumber = $this->input->post('AlternateContactNumber');
-                $EmailAddress = $this->input->post('emailid');
-                $Exiseregistration = $this->input->post('Exciseregistration');
-                $TIN = $this->input->post('TIN');
-                $PAN = strtoupper($this->input->post('panno'));
-                $GSTNo = strtoupper($this->input->post('GSTNo'));
-                $GSTRange = $this->input->post('GSTRange');
-                $CollectrateAddress = $this->input->post('CollectrateAddress');
-                $UANumber = $this->input->post('UANumber');
-                $PaymentTerms = $this->input->post('paymentname');
-                //print_r($PaymentTerms);
-                $UpdatedBy = $this->session->userdata ( 'userId' );                             
-                $chked =  $this->input->post('isactive');
-                
-                    if( $chked != '')
-                    {
-                        $IsActive = '1';
-                    }
-                    else
-                    {
-                        $IsActive = '0';
-                    }
-                    
-                 $CSTNo = $this->input->post('CSTNo');
-                 $CSTDt = $this->input->post('dateofCST');
-        
-                 if($CSTDt != '')
-                {
-                $CSTDate =  $this->getDateformat($CSTDt);
-                }
-                else
-                {
-                    $CSTDate = null;
-                }
-
-                $EMSNo = $this->input->post('EMSNo');
-                $TSNo = $this->input->post('TSNo');
-                $IMSNo = $this->input->post('IMSNo');
-                $ISONo = $this->input->post('ISONo');
-                $OSHASNo = $this->input->post('OSHASNo');
-                $accno = $this->input->post('accno');
-                $ifsc = $this->input->post('ifsc');
-                $branchname = $this->input->post('branchname');
-                $bankaddress = $this->input->post('bankaddress');
-                $service = $this->input->post('service');
-                $rawmaterial =$this->input->post('rawmaterial');
-                $maintanance = $this->input->post('maintanance');
-                $PaymentId = $this->input->post('paymentid');
-
-                $supplier = array();
-                $supplier = array('SupplierName'=>$SupplierName, 'Address'=>$Address, 'ContactNumber'=>$ContactNumber, 'AlternateContactNumber'=> $AlternateContactNumber,'EmailAddress'=>$EmailAddress,'Exiseregistration'=>$Exiseregistration,'TIN'=>$TIN,'PAN'=>$PAN,'GSTNo'=>$GSTNo,'GSTRange'=>$GSTRange,'CollectrateAddress'=>$CollectrateAddress,'UANumber'=>$UANumber,'PaymentID'=>$PaymentId,'CSTNo'=>$CSTNo,'CSTDate'=>$CSTDate,'Cert_EMS'=>$EMSNo, 'Cert_TS'=>$TSNo, 'Cert_IMS'=>$IMSNo, 'Cert_ISO'=>$ISONo, 'Cert_OSHAS'=>$OSHASNo, 'BankAcNumber'=>$accno, 'IFSCCode'=>$ifsc, 'BranchName'=>$branchname, 'BankAddress'=>$bankaddress,'UpdatedBy'=>$UpdatedBy,'IsActive'=>$IsActive,'IsService'=>$service,'IsMaintanance'=>$maintanance,'IsRawMaterial'=>$rawmaterial); //'PaymentTerms'=>$PaymentTerms,'PaymentDays'=>$Payment);
-                //SupplierID, SupplierName, Address, ContactNumber, AlternateContactNumber, EmailAddress, Exiseregistration, TIN, PAN, CSTNO, CSTDate, GSTNO, GSTRange, CollectrateAddress, UANumber, PaymentTerms, PaymentDays, PayableAT, Cert_EMS, Cert_TS, Cert_IMS, Cert_ISO, Cert_OSHAS, BankAcNumber, IFSCCode, BranchName, BankAddress, Createdby, UpdatedBy, Updatedon, CreatedOn, IsActive);    
-                // print_r($supplier);die();
-                 $result = $this->supplier_model->UpdateSupplier($supplier, $supplierID);
-               
-                                                
-               if($result == True)
-                {
-                     redirect('supplierListing','refresh');
-                     echo "<script>alert('Supplier updated successfully!');</script>";
-                }
-                
-                else
-                {
-                    redirect('supplierListing','refresh');
-                    echo "<script>alert('Supplier Record Not updated!');</script>";
-                }
-            }
-        
-    }
-    
-    function viewsupplier($SID = '')
-    {        
-            $Payment = '';    
-            if($SID == '')
-            {
-             $supplierID =  $_GET['SID']; 
-             $Payment   = $_GET['Payment'];  
-            }
-            else
-            {
-                
-              $supplierID  = $SID;  
-            }            
-            
-           
-            $data['supplier'] = $this->supplier_model->getSupplierInfo($supplierID);
-            //$data['payment'] = $this->supplier_model->getpayment($Payment );
-            $data['payment'] = $this->supplier_model->getPaymentTerms($Payment);
-            $this->global['pageTitle'] = 'Siddharth : Edit Supplier'; 
-            
-            $this->loadViews("editSupplier", $this->global,$data, NULL);        
-    }   
-    
-    /** this function can be use for excel report **/
-    
-    function export_supplierdetails(){
-        
-        
-        $this->load->library('excel');
-        $this->excel->setActiveSheetIndex(0);
-
-        $this->excel->getActiveSheet()->setTitle('supplier details');                                   
-        $this->excel->getActiveSheet()->setCellValue('A1', 'SupplierID');
-        $this->excel->getActiveSheet()->setCellValue('B1', 'SupplierName');
-        $this->excel->getActiveSheet()->setCellValue('C1', 'Address');
-        $this->excel->getActiveSheet()->setCellValue('D1', 'ContactNumber');
-        $this->excel->getActiveSheet()->setCellValue('E1', 'AlternateContactNumber');
-        $this->excel->getActiveSheet()->setCellValue('F1', 'EmailAddress');
-        $this->excel->getActiveSheet()->setCellValue('G1', 'Exiseregistration');
-        $this->excel->getActiveSheet()->setCellValue('H1', 'TIN');
-        $this->excel->getActiveSheet()->setCellValue('I1', 'PAN');
-        $this->excel->getActiveSheet()->setCellValue('J1', 'CSTNO');
-        $this->excel->getActiveSheet()->setCellValue('K1', 'CST Date');
-        $this->excel->getActiveSheet()->setCellValue('L1', 'GST NO');
-        $this->excel->getActiveSheet()->setCellValue('M1', 'GST Range');
-        $this->excel->getActiveSheet()->setCellValue('N1', 'Collectrate Address');
-        $this->excel->getActiveSheet()->setCellValue('O1', 'UANumber');
-        $this->excel->getActiveSheet()->setCellValue('P1', 'PaymentTerms');
-       
-        $this->excel->getActiveSheet()->setCellValue('Q1', 'Createdby');
-        $this->excel->getActiveSheet()->setCellValue('R1', 'UpdatedBy');
-        $this->excel->getActiveSheet()->setCellValue('S1', 'IsActive');
-        
-        
-
-
-        $this->excel->getActiveSheet()->getStyle('A1')->getFont()->setSize(12);
-        $this->excel->getActiveSheet()->getStyle('A1')->getFont()->setBold(true);
-        $this->excel->getActiveSheet()->getStyle('B1')->getFont()->setSize(12);
-        $this->excel->getActiveSheet()->getStyle('B1')->getFont()->setBold(true);
-        $this->excel->getActiveSheet()->getStyle('C1')->getFont()->setSize(12);
-        $this->excel->getActiveSheet()->getStyle('C1')->getFont()->setBold(true);
-        $this->excel->getActiveSheet()->getStyle('D1')->getFont()->setSize(12);
-        $this->excel->getActiveSheet()->getStyle('D1')->getFont()->setBold(true);
-        $this->excel->getActiveSheet()->getStyle('E1')->getFont()->setSize(12);
-        $this->excel->getActiveSheet()->getStyle('E1')->getFont()->setBold(true);
-        $this->excel->getActiveSheet()->getStyle('F1')->getFont()->setSize(12);
-        $this->excel->getActiveSheet()->getStyle('F1')->getFont()->setBold(true);
-        $this->excel->getActiveSheet()->getStyle('G1')->getFont()->setSize(12);
-        $this->excel->getActiveSheet()->getStyle('G1')->getFont()->setBold(true);
-        $this->excel->getActiveSheet()->getStyle('H1')->getFont()->setSize(12);
-        $this->excel->getActiveSheet()->getStyle('H1')->getFont()->setBold(true);
-        $this->excel->getActiveSheet()->getStyle('I1')->getFont()->setSize(12);
-        $this->excel->getActiveSheet()->getStyle('I1')->getFont()->setBold(true);
-        $this->excel->getActiveSheet()->getStyle('J1')->getFont()->setSize(12);
-        $this->excel->getActiveSheet()->getStyle('J1')->getFont()->setBold(true);
-        $this->excel->getActiveSheet()->getStyle('K1')->getFont()->setSize(12);
-        $this->excel->getActiveSheet()->getStyle('K1')->getFont()->setBold(true);
-        $this->excel->getActiveSheet()->getStyle('L1')->getFont()->setSize(12);
-        $this->excel->getActiveSheet()->getStyle('L1')->getFont()->setBold(true);
-        $this->excel->getActiveSheet()->getStyle('M1')->getFont()->setSize(12);
-        $this->excel->getActiveSheet()->getStyle('M1')->getFont()->setBold(true);
-        $this->excel->getActiveSheet()->getStyle('N1')->getFont()->setSize(12);
-        $this->excel->getActiveSheet()->getStyle('N1')->getFont()->setBold(true);
-        $this->excel->getActiveSheet()->getStyle('O1')->getFont()->setSize(12);
-        $this->excel->getActiveSheet()->getStyle('O1')->getFont()->setBold(true);
-        $this->excel->getActiveSheet()->getStyle('P1')->getFont()->setSize(12);
-        $this->excel->getActiveSheet()->getStyle('P1')->getFont()->setBold(true);
-        $this->excel->getActiveSheet()->getStyle('Q1')->getFont()->setSize(12);
-        $this->excel->getActiveSheet()->getStyle('Q1')->getFont()->setBold(true);
-        $this->excel->getActiveSheet()->getStyle('R1')->getFont()->setSize(12);
-        $this->excel->getActiveSheet()->getStyle('R1')->getFont()->setBold(true);
-        $this->excel->getActiveSheet()->getStyle('S1')->getFont()->setSize(12);
-        $this->excel->getActiveSheet()->getStyle('S1')->getFont()->setBold(true);
-      
-        
-
-       $exportData = $this->supplier_model->export_excel();
-
-        if ($exportData) {
-            $i = 2;
-            $s = 1;
-            foreach ($exportData as $data) {
-                
-                $this->excel->getActiveSheet()->setCellValue('A' .  $i,$data['SupplierID']);
-                $this->excel->getActiveSheet()->setCellValue('B' .  $i,$data['SupplierName']);
-                $this->excel->getActiveSheet()->setCellValue('C' .  $i,$data['Address']);
-                $this->excel->getActiveSheet()->setCellValue('D' .  $i,$data['ContactNumber']);
-                $this->excel->getActiveSheet()->setCellValue('E' .  $i,$data['AlternateContactNumber']);
-                $this->excel->getActiveSheet()->setCellValue('F' .  $i,$data['EmailAddress']);
-                $this->excel->getActiveSheet()->setCellValue('G' .  $i,$data['Exiseregistration']);
-                $this->excel->getActiveSheet()->setCellValue('H' .  $i,$data['TIN']);
-                $this->excel->getActiveSheet()->setCellValue('I' .  $i,$data['PAN']);
-                $this->excel->getActiveSheet()->setCellValue('J' .  $i,$data['CSTNO']);
-                $this->excel->getActiveSheet()->setCellValue('K' .  $i,$data['CSTDate']);
-                $this->excel->getActiveSheet()->setCellValue('L' .  $i,$data['GSTNO']);
-                $this->excel->getActiveSheet()->setCellValue('M' .  $i,$data['GSTRange']);
-                $this->excel->getActiveSheet()->setCellValue('N' .  $i,$data['CollectrateAddress']);
-                $this->excel->getActiveSheet()->setCellValue('O' .  $i,$data['UANumber']);
-                $this->excel->getActiveSheet()->setCellValue('P' .  $i,$data['PaymentTerms']);
-               
-                $this->excel->getActiveSheet()->setCellValue('Q' .  $i,$data['firstname']);
-                $this->excel->getActiveSheet()->setCellValue('R' .  $i,$data['Update_by']);
-                $this->excel->getActiveSheet()->setCellValue('S' .  $i,$data['IsActive']);
-
-                $i++;
-                $s++;
-            }
-        }
-
-        $filename = 'supplierdetails' .' '.  '.xls'; //save our workbook as this file name
-        header('Content-Type: application/vnd.ms-excel'); //mime type
-        header('Content-Disposition: attachment;filename="' . $filename . '"'); //tell browser what's the file name
-        header('Cache-Control: max-age=0'); //no cache
-        $objWriter = PHPExcel_IOFactory::createWriter($this->excel, 'Excel5');
-        if (ob_get_contents()) ob_end_clean();
-        ob_start();
-        $objWriter->save('php://output');
-
-
-    }
-    
-    
-    function pageNotFound()
-    {
-        $this->global['pageTitle'] = 'Siddharth : 404 - Page Not Found';
-        
-        $this->loadViews("404", $this->global, NULL, NULL);
-    }
-}
-
-?>
\ No newline at end of file
diff --git a/application/controllers/user.php b/application/controllers/user.php
index d1c796e0..f6c52b1f 100644
--- a/application/controllers/user.php
+++ b/application/controllers/user.php
@@ -3,11 +3,11 @@
 require APPPATH . '/libraries/BaseController.php';
 
 /**
- * Class : User (UserController)
+ * Class : user (User Details - Controller)
  * User Class to control all user related operations.
- * @author : Kishor Mali
+ * @author : Venba Info Tech -
  * @version : 1.1
- * @since : 15 November 2016
+ * @since : 18 November 2017
  */
 class user extends BaseController
 {
@@ -388,7 +388,7 @@ class user extends BaseController
 
     function pageNotFound()
     {
-        $this->global['pageTitle'] = 'Resico Industries : 404 - Page Not Found';
+        $this->global['pageTitle'] = 'Resico : 404 - Page Not Found';
         
         $this->loadViews("404", $this->global, NULL, NULL);
     }
diff --git a/application/models/purchaseorder_model.php~ b/application/models/purchaseorder_model.php~
deleted file mode 100644
index 18615f1e..00000000
--- a/application/models/purchaseorder_model.php~
+++ /dev/null
@@ -1,1545 +0,0 @@
-<?php if(!defined('BASEPATH')) exit('No direct script access allowed');
-
-class purchaseorder_model extends CI_Model
-{
-	function GetServicePOListforStatusUpdate()
-	{
-		$this->db->distinct();
-		$this->db->select('PO.PONO');
-        $this->db->from('T_PurchaseOrder_Master PO');
-		 $this->db->Join('T_PurchaseOrder_LineItem Line','PO.PONO = Line.PONO');
-		  $this->db->Join('T_Requestion_Master Req','Req.ReqNo = Line.ReqNo');
-		  $this->db->Join('T_Employee_Details Emp','Emp.EmpID= Req.Requestedby');
-		 $this->db->where('PO.POType',SERVICE);
-		 $this->db->where('PO.status',PO_RELEASED);
-		 $this->db->where('Emp.Departmentcode',$this->session->userdata('DEPCode'));
-        $query = $this->db->get();
-        
-        return $query->result();
-	}
-	
-	function GetPODetailforBillingServicePO($PONO)
-	{
-		
-		$subQuery ='select mast.ReqNo,mast.ReqDate,supp.SupplierName,PODate,st.StatusName as WorkStatus,ServiceWorkStatus,POMast.PaymentTerms,
-					POMast.ServiceWorkStatus,LineItem.*,mat.MaterialName,mat.UOM,emp.FirstName,emp.LastName,POMast.TotalOrderValue
-					from  T_PurchaseOrder_Master POMast
-					join  T_PurchaseOrder_LineItem LineItem on LineItem.PONO = POMast.PONO 
-					join  T_SupplierDetailsN supp on supp.SupplierID = POMast.SupplierID
-					join T_MaterialMaster mat on mat.MaterialCode = LineItem.MaterialCode
-					join T_Status  Stat on Stat.StatusCode = POMast.Status
-					join T_Status st on st.StatusCode = POMast.ServiceWorkStatus
-					join T_Requestion_Master mast on mast.ReqNo = LineItem.ReqNo
-					join tbl_users users on users.userId =  mast.CreatedBy
-					join T_Employee_Details emp on emp.EmpID = users.EmpID
-					where POMast.POType=? and POMast.PONO=?';
-
-		 $query = $this->db->query($subQuery,array(SERVICE,$PONO));			 
-		
-        return $query->result_array();	
-		
-	}
-	
-	function GetServicePOListforBilling()
-	{
-		$subQuery ='select POMast.PONO,supp.SupplierName,PODate,POMast.PaymentTerms,POMast.ServiceWorkStatusRemarks,
-					LineItem.*,mat.MaterialName,mat.UOM,emp.FirstName,emp.LastName,Tax.TotalValue,Cost.CostCenterName,AdvanceAmount
-					,Dept.DepartmentName from  T_PurchaseOrder_Master POMast
-					join  T_PurchaseOrder_LineItem LineItem on LineItem.PONO = POMast.PONO 
-					join T_Service_Tax  Tax on Tax.LineItemNo = LineItem.LineItemNo
-					left join T_PurchaseOrder_AdvanceRequest PUADV on POMast.PONO=PUADV.PONO
-					join  T_SupplierDetailsN supp on supp.SupplierID = POMast.SupplierID
-					join T_MaterialMaster mat on mat.MaterialCode = LineItem.MaterialCode
-					join T_Status  Stat on Stat.StatusCode = POMast.Status
-					join T_Requestion_Master mast on mast.ReqNo = LineItem.ReqNo
-					join tbl_users users on users.userId =  POMast.CreatedBy
-					join T_Employee_Details emp on emp.EmpID = mast.Requestedby
-					join T_DepartmentDetails Dept on Dept.DEPCode = emp.Departmentcode
-					join T_CostCenter_Master Cost on Cost.CostCenterCode=LineItem.CostCenterCode
-				      where POMast.POType=? and ServiceWorkStatus=?';
-				
-         $query = $this->db->query($subQuery,array(SERVICE,SERVICE_COMPLETED));	
-
-         //print_r( $this->db->last_query());
-		 return $query->result();
-
-	}
-	
-    /**
-     * This function is used to get the user listing count
-     * @param string $searchText : This is optional search text
-     * @return number $count : This is row count
-     */
-    function purchaseorderListingCount()
-    {
-        $this->db->distinct();
-        $this->db->select('POMast.PONO,supp.SupplierName,TotalOrderValue,PODate,Stat.StatusName,Req.ReqType,DeliveryDate');
-        $this->db->from('T_PurchaseOrder_Master POMast');
-        $this->db->join('T_SupplierDetailsN supp', 'supp.SupplierID = POMast.SupplierID');
-        $this->db->join('T_Status Stat', 'Stat.StatusCode = POMast.Status');
-		$this->db->join('T_PurchaseOrder_LineItem LineItem', 'POMast.PONO = LineItem.PONO');
-		$this->db->join('T_Requestion_Master Req', 'Req.ReqNo = LineItem.ReqNo');	
-       // print_r( $this->db->last_query());
-        $query = $this->db->get();
-     
-        return count($query->result());
-    }
-    
-    /**
-     * This function is used to get the user listing count
-     * @param string $searchText : This is optional search text
-     * @param number $page : This is pagination offset
-     * @param number $segment : This is pagination limit
-     * @return array $result : This is result
-     */
- 
-function purchaseorderListing($forwhat='')
-   {
-        $this->db->distinct();
-       $this->db->select('POMast.PONO,supp.SupplierName,TotalOrderValue,PODate,Stat.StatusName,Stat.StatusCode,POMast.POType as ReqType,DeliveryDate,DeliverySchedule,DeliveryOption,POMast.CapitalRange');
-       $this->db->from('T_PurchaseOrder_Master POMast');
-       $this->db->join('T_SupplierDetailsN supp', 'supp.SupplierID = POMast.SupplierID');
-       $this->db->join('T_Status Stat', 'Stat.StatusCode = POMast.Status');
-        $this->db->join('T_PurchaseOrder_LineItem LineItem', 'POMast.PONO = LineItem.PONO');
-        $this->db->join('T_Requestion_Master Req', 'Req.ReqNo = LineItem.ReqNo');
-        if($forwhat=='amendment')
-        {
-        $this->db->where('POMast.Status',PO_RELEASED);
-        }
-		else
-		{
-			 $this->db->where('POMast.Status !=',PO_AMENDED);
-			// $this->db->order_by('POMast.Status !=',PO_AMENDED);
-		}
-       $query = $this->db->get();
-       //print_r( $this->db->last_query());
-       $result = $query->result();        
-       return $result;
-   }
-    
-    /**
-     * This function is used to get the SupplierID and SupplierName information
-     * @return array $result : This is result of the query
-     */
-    function getSupplierName($supID='')
-    {
-        $this->db->select('SupplierID, SupplierName,Address,PaymentID');
-        $this->db->from('T_SupplierDetailsN');
-		if($supID != '')
-		{
-			$this->db->where('SupplierID',$supID);
-		}
-        //$this->db->where('roleId !=', 1);
-        $query = $this->db->get();
-        
-        return $query->result();
-    }
-	/**
-     * This function is used to get the userId information
-     * @return array $result : This is result of the query
-     */
-    function getusers()
-    {
-        $this->db->select('userId, name');
-        $this->db->from('tbl_users');
-        //$this->db->where('roleId !=', 1);
-        $query = $this->db->get();
-        
-        return $query->result();
-    }
-/**
-     * This function is used to get the Raw Material  information
-     * @return array $result : This is result of the query
-     */
-	function getRawPOMaterialList($ReqNo,$IsArray='')
-    {
-		
-		$result =   $this->db-> query("CALL P_GET_REQUISTIONLIST('".$ReqNo."')")  or die(mysql_error());
-		
-		$result ->next_result();
-		
-		//print_r($this->db->last_query());
-		
-		if ($result->num_rows > 0) 
-		{
-			//echo 'PO Line item Inserted successfully';
-			if($IsArray != '')
-			{				
-				 return $result->result_array();
-			}
-			else
-			{
-             return $result->result();
-			}
-		}		
-       
-    }
-	
-	/** 
-	This Function to get the List of Requistion which require to create PO
-	*/
-	function getAllRequistionListToCreatePO()
-    {
-		  $result =   $this->db-> query("CALL P_PURCHASEORDER_DETAILS()")  or die(mysql_error());
-        
-        $result ->next_result();
-        
-       
-        if ($result->num_rows > 0) 
-        {
-           
-             return $result->result();
-		}
-	}
-	
-	/**
-     * This function is used to get the Raw Material  information
-     * @return array $result : This is result of the query
-     */
-	function getRawMaterialList($MatType='',$ReqNoList='')
-    {
-		
-		$this->db->select('ReqNo,Req.MaterialCode,MaterialName,UOM,Req.Quantity');
-		$this->db->from('T_Requestion_Details Req');
-		$this->db->join('T_MaterialMaster mat', 'Req.MaterialCode = mat.MaterialCode');
-		$this->db->where('mat.MaterialType', $MatType);	
-		$this->db->where_in('Req.ReqNo', $ReqNoList);		
-        
-		$query = $this->db->get();
-		//print_r($this->db->last_query());
-		return $query->result();
-    }
-	/**
-     * This function is used to get the Raw Material  information
-     * @return array $result : This is result of the query
-     */
-	function getRawMaterialListForPO($MatType='',$ReqNo='')
-    {	
-		$subQuery ='SELECT ReqNo,Req.MaterialCode,MaterialName,UOM,Req.Quantity 
-					FROM T_Requestion_Details Req
-					JOIN T_MaterialMaster mat ON Req.MaterialCode = mat.MaterialCode
-					where mat.MaterialType = ?
-					AND Req.ReqNo = ? 
-					AND mat.MaterialCode !=  (SELECT MaterialCode FROM T_PurchaseOrder_LineItem WHERE ReqNo =?
-					)';
-
-		 $query = $this->db->query($subQuery,array($MatType,$ReqNo,$ReqNo));			 
-		
-        return $query->result_array();			
-		
-		
-    }
-	function GetAvailableBudgetAmount($CostCode,$Year,$BudgetType)
-    {
-		/* $this->db->select('BudgetAmount');
-         $this->db->from('T_CostCenter_Budget');
-		 $this->db->where('CostCenterCode',$CostCode );
-		  $this->db->where('BudgetYear',$Year );
-		   $this->db->where('BudgetType',$BudgetType );
-		 $query = $this->db->get();
-        
-         return $query->result_array(); */
-		 
-		/* $subQuery ='select BudgetAmount, (select ifnull(sum(TotalOrderValue),0) as Totalvalue from 
-					 T_PurchaseOrder_Master PO join  T_PurchaseOrder_LineItem  Item on
-					 Item.PONO = PO.PONO  join T_Requestion_Master mast on mast.ReqNo = Item.ReqNo where Item.CostCenterCode=?  and mast.ReqType=?)as Totalvalue 
-					from T_CostCenter_Budget Bud where Bud.CostCenterCode=? and 
-					BudgetYear = ? and BudgetType =?'; */
-					
-					$subQuery ='select BudgetAmount, (select ifnull(sum(Quantity*Rate)-tax.AfterDiscount,0) as Totalvalue from 
-					T_PurchaseOrder_LineItem  Item join T_Requestion_Master mast 
-					on mast.ReqNo = Item.ReqNo left  join T_Revenue_Tax tax on 
-					tax.LineItemNo = Item.LineItemNo where Item.CostCenterCode=?  and mast.ReqType=?)as Totalvalue 
-					from T_CostCenter_Budget Bud where Bud.CostCenterCode=? and 
-					BudgetYear = ? and BudgetType =?';
-		 
-	$query = $this->db->query($subQuery,array($CostCode,$BudgetType,$CostCode,$Year,$BudgetType));			 
-		//print_r($this->db->last_query());
-        return $query->result_array();	
-		 
-    }
-
-   
-    function GetAvailableImportBudgetAmount($CostCode,$Year,$BudgetType)
-    {
-        $subQuery='select BudgetAmount,(select ifnull(sum((Quantity*Rate*ExchangeRate)),0)as TValue from T_PurchaseOrder_LineItem LineItem
-            join T_PurchaseOrder_Master Mast on Mast.PONO=LineItem.PONO where POType=? 
-            and CostCenterCode=?)as TotalValue from T_CostCenter_Budget Bud where Bud.CostCenterCode=? and BudgetYear=? and BudgetType=?';
-          $query = $this->db->query($subQuery,array($BudgetType,$CostCode,$CostCode,$Year,$BudgetType));			 
-		//print_r($this->db->last_query());
-        return $query->result_array();
-
-
-    }
-	
-	/**
-     * This function is used to get the Requsition List for the login user
-     * @return array $result : This is result of the query
-     */
-	function getRequistDetails($ReqNoList='')  
-	{
-		$this->db->distinct();
-		$this->db->select('ReqNo,ReqType,Status,Requestedby,mast.CreatedDate,mast.Schedule_Type,mast.NumberOfService,mast.Service_Period,emp.FirstName,emp.EmpID,emp.Designation, Dept.DEPCode,Dept.DepartmentName,mast.ReqDate,mast.CostCenterCode,mast.Status');
-		$this->db->from('T_Requestion_Master  mast');
-		$this->db->join('T_Employee_Details emp', 'mast.Requestedby = emp.EmpID');
-		$this->db->join('T_DepartmentDetails Dept', 'emp.Departmentcode = Dept.DEPCode');
-		$this->db->where_in('mast.ReqNo', $ReqNoList);		
-        
-		$query = $this->db->get();
-        //print_r($this->db->last_query());
-		return $query->result();
-    }
-	/**
-     * This function is used to get the Requsition List for the login user
-     * @return array $result : This is result of the query
-     */
-	function getRequistDetailsForPO($ReqNoList='')  
-	{
-		$this->db->distinct();
-		$this->db->select('ReqNo,ReqType,Status,Requestedby,mast.CreatedDate,emp.FirstName,emp.EmpID,emp.Designation, Dept.DEPCode,Dept.DepartmentName,mast.ReqDate');
-		$this->db->from('T_Requestion_Master  mast');
-		$this->db->join('T_Employee_Details emp', 'mast.Requestedby = emp.EmpID');
-		$this->db->join('T_DepartmentDetails Dept', 'emp.Departmentcode = Dept.DEPCode');
-		$this->db->where_in('mast.ReqNo', $ReqNoList);		
-
-		$query = $this->db->get();
-
-		return $query->result();
-    }
-	/**
-     * This function is used to get the Cost center  information
-     * @return array $result : This is result of the query
-     */
-	function getCostCenter()
-    {
-		
-        $this->db->select('CostName, Description');
-        $this->db->from('T_CostCentre');
-				
-        $query = $this->db->get();
-        
-        return $query->result();
-    }
-	
-	
-	 /**
-     * This function is used to get the CostCenter for the Selected Requistion Number
-     * @return array $result : This is result of the query
-     */
-	function getCostCenterbyRequist($ReqNo='',$BudYear='',$ReqType='')
-    {
-		
-		$this->db->distinct();
-		$this->db->select('Mast.CostCenterCode,Mast.CostCenterName,Bud.BudgetAmount,ReqNo');
-		$this->db->from('T_CostCenter_Master Mast');
-		$this->db->join('T_CostCenter_Departments CostDept', 'CostDept.CostCenterCode = Mast.CostCenterCode');
-		$this->db->join('T_CostCenter_Budget Bud', 'Bud.CostCenterCode = Mast.CostCenterCode');
-		$this->db->join('T_Employee_Details emp', 'CostDept.DEPCode = emp.Departmentcode');
-		$this->db->join('T_Requestion_Master req', 'req.Requestedby = emp.EmpID');
-
-		$this->db->where('BudgetType ',$ReqType );
-		$this->db->where('BudgetYear ',$BudYear );
-		if($ReqNo != '')
-		{
-		$this->db->where('ReqNo ',$ReqNo);
-		}
-
-		$query = $this->db->get();
-		return $query->result();
-    }
-	
-/**
-     * This function is used to get the Config value from configuration table
-     * @return array $result : This is result of the query
-     */
-	function getRequistionNoFromPO($PONO='')
-    {
-		$this->db->distinct();
-        $this->db->select('ReqNo,');
-        $this->db->from('T_PurchaseOrder_LineItem');
-		if($PONO != '')
-		{
-		 $this->db->where('PONO ',$PONO );
-		}
-		 
-        $query = $this->db->get();
-        
-        return $query->result();
-    }
-	
-
-	/**
-     * This function is used to get the Config value from configuration table
-     * @return array $result : This is result of the query
-     */
-	function getConfigValue($ConfigID ,$ConfigValue = '')
-    {
-		
-        $this->db->select('ConfigValue');
-        $this->db->from('T_ConfigDetails');
-		 $this->db->where('Config_id ',$ConfigID );
-		 if($ConfigValue != '')
-		 {
-			  $this->db->where('ConfigValue != ',$ConfigValue );
-		 }
-        $query = $this->db->get();
-        
-        return $query->result();
-    }
-
-
-
-	
-	/**
-     * This function is used to get the Company information from T_Company_Details table
-     * @return array $result : This is result of the query
-     */
-	function getCompanyInformation()
-    {
-		
-        $this->db->select('CompanyName,Address');
-        $this->db->from('T_Company_Details');
-		
-        $query = $this->db->get();
-        
-        return $query->result();
-    }
-	/**
-     * This function is used to get the Employee List
-     * @return array $result : This is result of the query
-     */
-	function getAllEmployees()
-    {
-		$this->db->select('EmpID,FirstName,LastName');
-        $this->db->from('T_Employee_Details');
-		$query = $this->db->get();
-        
-        return $query->result();
-    }
- 
- /**
-     * This function is used to get the Employee List
-     * @return array $result : This is result of the query
-     */
-	function getLastCreatedPODate()
-    {
-		$this->db->select('max(PODate) as PODate');
-        $this->db->from('T_PurchaseOrder_Master');
-		$query = $this->db->get();
-        
-        return $query->result();
-    }
-  
-    function getLastReleasedPODate()
-    {
-		$this->db->select('max(ReleasedOn) as PODate');
-        $this->db->from('T_PurchaseOrder_Master');
-		$query = $this->db->get();
-        
-        return $query->result();
-    }
-    /**
-     * This function is used to add New Purchase order to  the system
-    
-     */
-    function addPOMaster($POMaster)
-	{
-			$this->db->trans_start();
-			$this->db->insert('T_PurchaseOrder_Master', $POMaster);        
-			$insert_id = $this->db->affected_rows();         
-			$this->db->trans_complete();
-			// print_r($this->db->last_query());		
-			if($insert_id>0)
-			{
-				$subQuery = 'select max(PONO) as PONO from T_PurchaseOrder_Master';   
-          
-				$query = $this->db->query($subQuery);
-        
-				return $query->result_array();
-			}
-	}
-	
-	
-	function addAmendPOMaster($POMaster,$CreatedBy,$ParentPO)
-	{ 
-	       // print_r($POMaster);
-		    $this->db->trans_start();
-			$this->db->insert('T_PurchaseOrder_Master', $POMaster);        
-			$insert_id = $this->db->affected_rows();         
-			$this->db->trans_complete();
-			// print_r($this->db->last_query());		
-			if($insert_id>0)
-			{
-				$subQuery = 'select max(PONO) as PONO from T_PurchaseOrder_Master where CreatedBy=? and ParentPO=?';   
-          
-				$query = $this->db->query($subQuery,array($CreatedBy,$ParentPO));
-        
-				return $query->result_array();
-			}
-	}
-	
-     /**
-     * This function is used to add New Purchase order Line Item to  the system    
-     */
-    function addPOLineItem($POLineItem)
-	{
-			$this->db->trans_start();
-			$this->db->insert('T_PurchaseOrder_LineItem', $POLineItem);        
-			$insert_id = $this->db->affected_rows();         
-			$this->db->trans_complete();
-			// print_r($this->db->last_query());		
-			if($insert_id>0)
-			{
-				$subQuery = 'select max(LineItemNo) as LineItemNo from T_PurchaseOrder_LineItem';   
-          
-				$query = $this->db->query($subQuery);
-        
-				return $query->result_array();
-			}
-	}
-    
-     /**
-     * This function is used to add Revenue Tax  to  the system    
-     */
-    function addRevenueTax($RevenueTaxList)
-	{
-			$this->db->trans_start();
-			$this->db->insert('T_Revenue_Tax', $RevenueTaxList);        
-			$insert_id = $this->db->affected_rows();         
-			$this->db->trans_complete();
-			return $insert_id;
-	}
-	 /**
-     *  This function is used to add Service Tax  to  the system      
-     */
-    function addServiceTax($ServiceTaxList)
-	{
-			$this->db->trans_start();
-			$this->db->insert('T_Service_Tax', $ServiceTaxList);        
-			$insert_id = $this->db->affected_rows();         
-			$this->db->trans_complete();
-			return $insert_id;
-	}	
-	
-	
-	/**
-     *  This function is used to add Service Tax  to  the system      
-     */
-    function addImportTax($ImportTaxList)
-	{
-			$this->db->trans_start();
-			$this->db->insert('T_Import_Tax', $ImportTaxList);        
-			$insert_id = $this->db->affected_rows();         
-			$this->db->trans_complete();
-			return $insert_id;
-	}
-
-
-
-	function addadvanceRequest($advance)
-	{
-           $this->db->trans_start();
-		   $this->db->insert('T_PurchaseOrder_AdvanceRequest', $advance);        
-		   $insert_id = $this->db->affected_rows();         
-		   $this->db->trans_complete();
-		   return $insert_id;
-       
-
-	}
-	
-	
-    /**
-     * This function used to get user information by id
-     * @param number $userId : This is user id
-     * @return array $result : This is user information
-     */
-    function getuserInfo($PO)
-    {
-        $this->db->select('POType, PODate, SupplierID,SpecialOrder,UserID,RequestedDate,RequesterEmail,RequesterPh, PurchasingCategory,BudgetManager,BudgetManagerDepartment,');
-        $this->db->from('T_PurchaseOrderDetails');      
-        $this->db->where('PONO', $PO);
-        $query = $this->db->get();
-        
-        return $query->result();
-    }
-	
-	// This Method to get the Service PO Details for Edit the Item
-	
-    function GetServicePurchaseOrder($PONO = '')
-    {
-      $this->db->distinct();
-      $this->db->select('ReqNo,POMast.PONO,POMast.PaymentTerms,POMast.PaymentOtherDescription,ServiceDescription,supp.SupplierID,supp.SupplierName,supp.Address,PODate,Stat.StatusName,DeliveryOption,DeliverySchedule,DeliveryDate,DeliveryAddress,POMast.PaymentTerms,POMast.ExchangeRate,POMast.UpdatedOn,Stat.StatusCode,POMast.ServiceWorkStatus,POMast.*');
-      $this->db->from('T_PurchaseOrder_Master POMast');
-      $this->db->join('T_SupplierDetailsN supp', 'supp.SupplierID = POMast.SupplierID');
-      $this->db->join('T_Status Stat', 'Stat.StatusCode = POMast.Status');
-      $this->db->join('T_PurchaseOrder_LineItem LineItem', 'POMast.PONO = LineItem.PONO');
-      
-     $this->db->where('POMast.PONO', $PONO);
-      $query = $this->db->get();
-      
-      $result = $query->result();        
-    
-      return $result;    
-    }
-    
-	// This Method to get the Service PO  Child Details for Edit the Item
-	
-	
-// This Method to get the Service PO  Child Details for Edit the Item
-	function GetServicePurchaseOrderDetails($PONO = '')
-	{
-	     
-	$subQuery ='SELECT distinct LineItem.LineItemNo,LineItem.ReqNo,Mat.MaterialCode,Mat.MaterialName,Mat.UOM,Quantity,ReceivedQuantity,Rate,LineItem.Status,(Quantity *Rate) as BasicValue ,(After_CGST + After_SGST + After_IGST) as Taxamount
-				,TotalValue,CGST,After_CGST,SGST,After_SGST,IGST,After_IGST,otherallowance,LineItem.CostCenterCode,LineItem.ServiceFrequency,LineItem.ServiceMaterialDescription,Req.Schedule_Type,Req.NumberOfService,Req.Service_Period
-				FROM T_PurchaseOrder_LineItem LineItem 
-				join T_MaterialMaster Mat on Mat.MaterialCode = LineItem.MaterialCode
-				join T_Service_Tax Tax on Tax.LineItemNo = LineItem.LineItemNo
-                                join T_Requestion_Master Req on Req.ReqNo = LineItem.ReqNo
-				where LineItem.PONO =?';
-
-		 $query = $this->db->query($subQuery,array($PONO));			 
-		
-        return $query->result();	  
-	 
-			
-	}
-		// This Method to get the Service PO  Child Details for Edit the Item
-	function GetServicePurchaseOrderDetailsForPrint($PONO = '')
-	{
-	     
-	$subQuery ='SELECT distinct LineItem.LineItemNo,LineItem.ReqNo,LineItem.ServiceMaterialDescription,Mat.MaterialCode,Mat.MaterialName,Mat.UOM,Mat.HSNCODE,
-				LineItem.Quantity,LineItem.Rate,(LineItem.Quantity *LineItem.Rate) as BasicValue ,(After_CGST + After_SGST + After_IGST) as Taxamount
-				,TotalValue,CGST,SGST,IGST,After_CGST,After_SGST,After_IGST,otherallowance,LineItem.CostCenterCode,sup.SupplierName,sup.Address,POMaster.DeliveryAddress,POMaster.DeliveryDate,POMaster.Status,POMaster.PODate,POMaster.PONO,POMaster.ServiceDescription,POMaster.PaymentOtherDescription,POMaster.DeliveryOption,POMaster.DeliverySchedule,ReqMat.NumberOfService,ReqMat.Service_Period,ReqMat.Schedule_Type,Payment.PaymentID,Payment.PaymentTerms,AdvanceAmount FROM 
-				T_PurchaseOrder_LineItem LineItem 
-				join T_MaterialMaster Mat on Mat.MaterialCode = LineItem.MaterialCode
-				join T_Service_Tax Tax on Tax.LineItemNo = LineItem.LineItemNo
-				join T_PurchaseOrder_Master POMaster on POMaster.PONO = LineItem.PONO
-				join T_SupplierDetailsN sup on sup.SupplierID = POMaster.SupplierID
-				join T_Requestion_Master ReqMat on ReqMat.ReqNo = LineItem.ReqNo
-				join T_PaymentTerms Payment on Payment.PaymentID = POMaster.PaymentTerms
-				left join T_PurchaseOrder_AdvanceRequest PurAdv on POMaster.PONO=PurAdv.PONO
-				where LineItem.PONO =?';
-
-		 $query = $this->db->query($subQuery,array($PONO));			 
-		
-        return $query->result();	  
-	 
-			
-	}
-	
-	function GetServicePurchaseOrderAmendDetailsforPdfprint($PONO = '')
-		{
-			 
-		
-					
-					$subQuery ='SELECT distinct LineItem.LineItemNo,LineItem.ReqNo,LineItem.ServiceMaterialDescription,Mat.MaterialCode,Mat.MaterialName,
-				Mat.UOM,Quantity,Rate,ROUND((Quantity 	*Rate),2 ) as BasicValue,POMaster.AmendedDetails,LineItem.AmendedDetails as lineamenddetails,
-				ROUND(( Tax.After_SGST + Tax.After_CGST + Tax.After_IGST ) ,2)as  Taxamount,ReqMat.NumberOfService,ReqMat.Schedule_Type,ReqMat.Service_Period,
-				TotalValue,Tax.*,LineItem.CostCenterCode ,POMaster.*,sup.SupplierName,sup.Address,Payment.PaymentTerms
-				FROM T_PurchaseOrder_LineItem LineItem 
-				join T_MaterialMaster Mat on Mat.MaterialCode = LineItem.MaterialCode
-				join T_Service_Tax Tax on Tax.LineItemNo = LineItem.LineItemNo
-				join T_PurchaseOrder_Master POMaster on POMaster.PONO = LineItem.PONO
-				join T_SupplierDetailsN sup on sup.SupplierID = POMaster.SupplierID
-				join T_PaymentTerms Payment on Payment.PaymentID = POMaster.PaymentTerms
-				join T_Requestion_Master ReqMat on ReqMat.ReqNo = LineItem.ReqNo
-				where LineItem.PONO =?';
-
-			 $query = $this->db->query($subQuery,array($PONO));			 
-			
-			return $query->result();	  
-		 
-				
-		}
-	
-	// This Method to get the Revenue PO  Child Details for Edit the Item
-		function GetRevenuePurchaseOrderDetails($PONO = '')
-	{
-	     
-	$subQuery ='SELECT distinct LineItem.LineItemNo,Req.ReqNo,Mat.MaterialCode,Mat.MaterialName,Mat.UOM,Quantity,ReceivedQuantity,Rate,Req.Status,(Quantity *Rate) as BasicValue , ((AfterPackagingValue + AfterFreightValue + AfterSGST + AfterCGST + 
-			AfterIGST  + Insurance)) as  Taxamount ,TotalValue,Tax.*,Req.CostCenterCode,Dept.DepartmentName
-                                FROM T_PurchaseOrder_LineItem LineItem 
-				join T_MaterialMaster Mat on Mat.MaterialCode = LineItem.MaterialCode
-				join T_Revenue_Tax Tax on Tax.LineItemNo = LineItem.LineItemNo
-				join T_Requestion_Master Req on  Req.ReqNo = LineItem.ReqNo 
-				join T_Employee_Details emp  on Req.Requestedby = emp.EmpID
-				join T_DepartmentDetails Dept on  emp.Departmentcode = Dept.DEPCode
-				where LineItem.PONO =?';
-
-		 $query = $this->db->query($subQuery,array($PONO));			 
-		
-        return $query->result();	  
-	 
-			
-	}
-	
-	// This Method to get the Revenue PO  Child Details for Edit the Item
-	function GetRevenuePurchaseOrderDetailsForPDF($PONO = '')
-	{
-	     
-			$subQuery ='SELECT distinct LineItem.LineItemNo,ReqNo,Mat.MaterialCode,Mat.MaterialName,
-			Mat.UOM,Mat.HSNCODE,Quantity,Rate,(Quantity *Rate) as BasicValue ,
-			(AfterPackagingValue + AfterFreightValue + AfterSGST + AfterCGST + 
-			AfterIGST  + Insurance) as  Taxamount,AdvanceAmount,
-			TotalValue,Tax.*,LineItem.CostCenterCode ,POMaster.*,sup.SupplierName,sup.Address,Payment.PaymentID,Payment.PaymentTerms
-			FROM T_PurchaseOrder_LineItem LineItem 
-			join T_MaterialMaster Mat on Mat.MaterialCode = LineItem.MaterialCode
-			join T_Revenue_Tax Tax on Tax.LineItemNo = LineItem.LineItemNo
-			join T_PurchaseOrder_Master POMaster on POMaster.PONO = LineItem.PONO
-			join T_SupplierDetailsN sup on sup.SupplierID = POMaster.SupplierID
-                       
-            join T_PaymentTerms Payment on Payment.PaymentID = POMaster.PaymentTerms
-            left join T_PurchaseOrder_AdvanceRequest PurAdv on POMaster.PONO=PurAdv.PONO
-			where LineItem.PONO =?';
-
-		 $query = $this->db->query($subQuery,array($PONO));			 
-		
-        return $query->result();	  
-	 
-			
-	}
-// This Method to get the Revenue PO  Child Details for Edit the Item
-	function GetRevenuePurchaseOrderDetailsForAmendPDF($PONO = '')
-	{
-	     
-			$subQuery ='SELECT distinct LineItem.LineItemNo,ReqNo,Mat.MaterialCode,Mat.MaterialName,POMaster.PaymentOtherDescription,
-			Mat.UOM,Quantity,Rate,ROUND((Quantity 	*Rate),2 ) as BasicValue ,
-			ROUND(((AfterPackagingValue + AfterFreightValue + AfterSGST + AfterCGST + 
-			AfterIGST  + Insurance)) ,2)as  Taxamount,
-			TotalValue,Tax.*,LineItem.CostCenterCode ,POMaster.*,sup.SupplierName,sup.Address,LineItem.AmendedDetails as LineAmend,Payment.PaymentTerms
-			FROM T_PurchaseOrder_LineItem LineItem 
-			join T_MaterialMaster Mat on Mat.MaterialCode = LineItem.MaterialCode
-			join T_Revenue_Tax Tax on Tax.LineItemNo = LineItem.LineItemNo
-			join T_PurchaseOrder_Master POMaster on POMaster.PONO = LineItem.PONO
-			join T_SupplierDetailsN sup on sup.SupplierID = POMaster.SupplierID
-			join T_PaymentTerms Payment on Payment.PaymentID = POMaster.PaymentTerms
-			where LineItem.PONO =?';
-
-		 $query = $this->db->query($subQuery,array($PONO));			 
-		
-        return $query->result();	  
-	 
-			
-	}
-
-function GetImportPurchaseOrderDetailsForPDF($PONO = '')
-	{
-	     
-			// $subQuery ='SELECT distinct LineItem.LineItemNo,LineItem.ReqNo,Mat.MaterialCode,Mat.MaterialName,
-			// Mat.UOM,Quantity,ReqMas.Requestedby,Rate,ROUND((RMCIncludingCustomersPerKG*Quantity),2)as  Taxamount,
-			// ProductPrice,Tax.*,LineItem.CostCenterCode ,	POMaster.*,sup.SupplierName,sup.Address
-			// FROM T_PurchaseOrder_LineItem LineItem 
-			// join T_Requestion_Master ReqMas on ReqMas.ReqNo=LineItem.ReqNo
-			// join T_MaterialMaster Mat on Mat.MaterialCode = LineItem.MaterialCode
-			// join T_Import_Tax Tax on Tax.LineItemNo = LineItem.LineItemNo
-			// join T_PurchaseOrder_Master POMaster on POMaster.PONO = LineItem.PONO
-			// join T_SupplierDetailsN sup on sup.SupplierID = POMaster.SupplierID
-			// where LineItem.PONO =?';
-
-		$subQuery='SELECT distinct LineItem.LineItemNo,LineItem.ReqNo,Mat.MaterialCode,Mat.MaterialName,Import_DispatchDetails,
-Mat.UOM,Quantity,ReqMas.Requestedby,Rate,ROUND((RMCIncludingCustomersPerKG*Quantity),2)as  Taxamount 	,
-ProductPrice,Tax.*,LineItem.CostCenterCode ,Date(ReqMast.ReqDate) as ReqDate,POMaster.*,sup.SupplierName,sup.Address,LineItem.AmendedDetails as LineAmend,AdvanceAmount, Pay.PaymentTerms as Pay
-FROM T_PurchaseOrder_LineItem LineItem 
-join T_Requestion_Master ReqMas on ReqMas.ReqNo=LineItem.ReqNo
-join T_MaterialMaster Mat on Mat.MaterialCode = LineItem.MaterialCode
-join T_Import_Tax Tax on Tax.LineItemNo = LineItem.LineItemNo
-join T_PurchaseOrder_Master POMaster on POMaster.PONO = LineItem.PONO
-join T_SupplierDetailsN sup on sup.SupplierID = POMaster.SupplierID
-left join T_PurchaseOrder_AdvanceRequest PurAdv on POMaster.PONO=PurAdv.PONO
-join T_Requestion_Master ReqMast on LineItem.ReqNo=ReqMast.ReqNo
-join T_PaymentTerms Pay on POMaster.PaymentTerms=Pay.PaymentID
-where LineItem.PONO =?';
-
-		 $query = $this->db->query($subQuery,array($PONO));	
-		 //print_r($this->db->last_query());		 
-		
-        return $query->result();	  
-	 
-			
-	}
-
-
-	function GetCurrencyDetail($Currency='')
-	{
-
-    $subQuery='SELECT * from T_Currency_Details where Currency_Code=?';
-    $query=$this->db->query($subQuery,array($Currency));
-    //print_r($query);
-    return $query->result();
-
-	}
-
-
-	function GerRequesterName($Requester='')
-	{
-       $subQuery='SELECT EmpID,FirstName,Departmentcode from T_Employee_Details where EmpID=?';
-
-       $query=$this->db->query($subQuery,array($Requester));
-
-       return $query->result();
-	}
-
-
-	function GerRequesterDep($Depcode='')
-	{
-      $subQuery='SELECT DepartmentName from T_DepartmentDetails where DEPCode=?';
-      $query=$this->db->query($subQuery,array($Depcode));
-
-       return $query->result();
-
-	}
-
-	function GerCurrencyCodeName($Currencycode='')
-	{
-		$subQuery='SELECT * from T_Currency_Details where Currency_Code=?';
-		$query=$this->db->query($subQuery,array($Currencycode));
-		//print_r($this->db->last_query());
-			return $query->result();
-		
-	}
-
-
-	function GetPOStatus($Status='')
-	{
-		$subQuery='SELECT StatusName from T_Status where StatusCode=?';
-		$query=$this->db->query($subQuery,array($Status));
-		return $query->result();
-
-	}
-
-
-	function GetPaymentTerms($PONO='')
-	{
-      $subQuery='SELECT PaymentTerms from T_PurchaseOrder_Master where PONO=?';
-      $query=$this->db->query($subQuery,array($PONO));
-    //print_r($query);
-    return $query->result();
-
-	}
-
-
-
-
-	// function getSupplierPayment($Currency='')
-	// {
-
- //    $subQuery='select distinct PaymentTerms from T_SupplierDetailsN';
- //    $query=$this->db->query($subQuery,array($Currency));
- //    //print_r($this->db->last_query());
- //    return $query->result();
-
-	// }
-
-	function getSupplierPayment($Config_ID='')
-    {
-
-  // $subQuery='select distinct PaymentTerms from T_SupplierDetailsN';
-    $subQuery='select ConfigValue from T_ConfigDetails where Config_ID=?';
-   $query=$this->db->query($subQuery,array($Config_ID));
-   //print_r($this->db->last_query());
-   return $query->result();
-
-    }
-
-	function GetWorkStatus($Config_ID='')
-    {
-      $subQuery = 'select ConfigValue from T_ConfigDetails where Config_ID=?';
-      $query=$this->db->query($subQuery,array($Config_ID));
-      //print_r($query);
-       return $query->result();
-    }
-
-   
-
-
-
-function GetImportPurchaseOrderDetails($PONO = '')
-	{
-	     
-	$subQuery ='SELECT distinct LineItem.LineItemNo,Req.ReqNo,Mat.MaterialCode,Mat.MaterialName,
-Mat.UOM,Quantity,Rate,Req.Status,ROUND((Quantity *Rate),2 ) as BasicValue,ReceivedQuantity,
-QuantityRejected,ROUND(ReceivedQuantity-QuantityRejected)as PendingQty,
- ROUND((RMCIncludingCustomersPerKG*Quantity),2)as Taxamount,LandingCharge,HighSeasSalesCharge,CustomDuty,ExciseDuty,ExciseDutyEdCess,CustomEdCess,POMast.ExchangeRate,AfterLandingCharge,AfterHighSeasSalesCharge,AfterCustomDuty,AfterExciseDuty,AfterExciseDutyEdCess,AddlExciseDuty,AfterAddlExciseDuty,Grossdutypayable,AvailableModvat,Grossexpensesduetocustomduty,purchaseratePerKG,CustomDutyExpensesPerKG,RMCIncludingCustomersPerKG,QuantityKG,BasicPriceInMTon,ProductPrice,CustomSHCess,AfterCustomSHCess,AfterExciseDutySHCess,ExciseDutySHCess,AfterCustomEdCess,ROUND((Quantity *Rate)+(RMCIncludingCustomersPerKG*Quantity),2)as TotalOrderValue,ROUND((POMast.ExchangeRate*BasicPriceInMTon),2) as BasicINRValue,TotalValue,CurrencyType,ReceivedQuantity,
- 
- Req.CostCenterCode,Dept.DepartmentName FROM T_PurchaseOrder_LineItem LineItem 
- join T_PurchaseOrder_Master POMast on POMast.PONO = LineItem.PONO
- join T_MaterialMaster Mat on Mat.MaterialCode = LineItem.MaterialCode 
- join T_Import_Tax Tax on Tax.LineItemNo = LineItem.LineItemNo 
- join T_Requestion_Master Req on Req.ReqNo = LineItem.ReqNo 
- join T_Employee_Details emp on Req.Requestedby = emp.EmpID 
- 
- left join T_MRIR_Details Det on Det.MaterialCode=LineItem.MaterialCode
- 
- join T_DepartmentDetails Dept on emp.Departmentcode = Dept.DEPCode where LineItem.PONO =?';
-				//print_r($subQuery);
-
-		 $query = $this->db->query($subQuery,array($PONO));			 
-		
-        return $query->result();	  
-	 
-			
-	}
-	
-	function GetCapitalAmendPurchaseOrderDetailsForprintPDF($PONO = '')
-    {
-        //echo $PONO;
-		
-            $subQuery ='SELECT distinct LineItem.PONO,LineItem.AmendedDetails as lineamd,LineItem.LineItemNo,SUP.SupplierName,SUP.Address,POMast.DeliveryAddress,POMast.DeliveryDate,POMast.PODate,POMast.DeliveryOption,POMast.ServiceDescription,POMast.ServiceDescription,POMast.Import_DispatchDetails,POMast.Import_PlaceofOrgin,POMast.AmendedDetails,POMast.DeliverySchedule,POMast.TotalOrderValue,Req.ReqNo,Mat.MaterialCode,Mat.MaterialName,LineItem.ServiceMaterialDescription,LineItem.ServiceFrequency,
-Mat.UOM,Quantity,Rate,POMast.Status,POMast.ExchangeRate,POMast.ExchangeRateCalculatedon,POMast.PaymentOtherDescription,POMast.TotalOrderValue as BasicValue,POMast.CapitalRange,POMast.CurrencyType,Payment.PaymentTerms,
- Req.CostCenterCode FROM T_PurchaseOrder_LineItem LineItem 
- join T_PurchaseOrder_Master POMast on POMast.PONO = LineItem.PONO
- join T_SupplierDetailsN  SUP on SUP.SupplierID=POMast.SupplierID
-join T_MaterialMaster Mat on Mat.MaterialCode = LineItem.MaterialCode 
- join T_Service_Tax ServiceTax on ServiceTax.LineItemNo = LineItem.LineItemNo
- join T_Import_Tax Tax on Tax.LineItemNo = LineItem.LineItemNo 
- join T_Requestion_Master Req on Req.ReqNo = LineItem.ReqNo 
- join T_PaymentTerms Payment on Payment.PaymentID = POMast.PaymentTerms
- join T_Employee_Details emp on Req.Requestedby = emp.EmpID where LineItem.PONO =?';
-         $query = $this->db->query($subQuery,array($PONO));            
-       //print_r ($query->result());
-       return $query->result();  
-    
-            
-   }
-
-
-
-function GetCurrencytype()
- {
-			
-	$subQuery = 'select * from T_Currency_Details';
-	
-    $query = $this->db->query($subQuery);
-     
-    return $query->result();
- }
-
- function GetINRCurrencytype($Currency_Code='')
- {
-   $subQuery='select * from T_Currency_Details where Currency_Code=?';
-   $query=$this->db->query($subQuery,array($Currency_Code));
-   //print_r($this->db->last_query());
-   return $query->result();
-
- }
-
-
-
-
-
-
-	// To Update the PO
-	function updatePOMaster($PONO,$PODetails)    
-	{
-	     $this->db->where('PONO', $PONO);
-         $this->db->update('T_PurchaseOrder_Master', $PODetails);
-        
-        return TRUE;
-	}
-	
-	
-	// To update Parent PO as Amended PO
-	function updateAmendPOMaster($PONO,$PODetail)    
-	{
-		//echo $PONO."from model";
-		
-		 
-	     $this->db->where('PONO', $PONO);
-         $this->db->update('T_PurchaseOrder_Master', $PODetail);
-		 $insert_id = $this->db->affected_rows();         
-        
-        return $insert_id;
-	}
-	/**
-     * This function is used to check the Line Item is already available in the database 
-     * @return array $result : This is result of the query
-     */
-	function LineItemExists($LineItemNo)
-    {
-		$this->db->select('LineItemNo,TaxID');
-        $this->db->from('T_Service_Tax');
-		$this->db->where('LineItemNo ',$LineItemNo );
-		//$this->db->where('Requestedby ',$ReqBy );
-		$query = $this->db->get();
-        
-        if ($query->num_rows > 0) {
-			//echo $result->num_rows;
-            return $query->result_array();
-		}       
-    }
-	/**
-     * This function is used to check the Revenue Line Item is already available in the database 
-     * @return array $result : This is result of the query
-     */
-	function LineItemExistsinRevenueTax($LineItemNo)
-    {
-		$this->db->select('LineItemNo');
-        $this->db->from('T_Revenue_Tax');
-		$this->db->where('LineItemNo ',$LineItemNo );
-		$query = $this->db->get();
-        
-        if ($query->num_rows > 0) {
-			 return $query->result_array();
-		}       
-    }
-
-
-    function LineItemExistsinImportTax($LineItemNo)
-    {
-		$this->db->select('LineItemNo');
-        $this->db->from('T_Import_Tax');
-		$this->db->where('LineItemNo ',$LineItemNo );
-		$query = $this->db->get();
-        
-        if ($query->num_rows > 0) {
-			 return $query->result_array();
-		}       
-    }
-	// To Update the PO Line Item
-	function updatePOLineItem($PONO,$LineItemNo,$PODetails)    
-	{
-	     $this->db->where('PONO', $PONO);
-		 $this->db->where('LineItemNo', $LineItemNo);
-         $this->db->update('T_PurchaseOrder_LineItem', $PODetails);
-        
-        return TRUE;
-	}
-	/*// To Update the Service Tax Item */
-	function updateServiceTax($LineItemNo,$PODetails)    
-	{
-	    
-		   $this->db->where('LineItemNo', $LineItemNo);
-         $this->db->update('T_Service_Tax', $PODetails);
-		 
-		// print_r($this->db->last_query());
-        
-        return TRUE;
-	}
-	
-	/*// To Update the Revenue Tax Item */
-	function updateRevenueTax($LineItemNo,$PODetails)    
-	{
-	      $this->db->where('LineItemNo', $LineItemNo);
-         $this->db->update('T_Revenue_Tax', $PODetails);
-		 
-		// print_r($this->db->last_query());
-        
-        return TRUE;
-	}
-
-	function updateImportTax($LineItemNo,$PODetails)    
-	{
-	      $this->db->where('LineItemNo', $LineItemNo);
-         $this->db->update('T_Import_Tax', $PODetails);
-		 
-		// print_r($this->db->last_query());
-        
-        return TRUE;
-	}
-  
-	function getLastInsertedPO()
-	{
-		$this->db->select('max(PONO) as PO');
-		$this->db->from('T_PurchaseOrderDetails');    		
-		$query = $this->db->get();
-        
-		return $query->result_array();
-	}
-  
-  
-  /* This Method to get all the Department name for the requistion	*/
-	function getDepartmentListForAllReq()
-	{
-		$subQuery ='SELECT DISTINCT DEPT.DEPCode,DEPT.DepartmentName FROM T_Requestion_Master REQ
-					JOIN T_Employee_Details EMP ON REQ.Requestedby = EMP.EmpID
-					JOIN T_DepartmentDetails DEPT ON EMP.Departmentcode = DEPT.DEPCode WHERE REQ.Status not in(?,?,?,?)';
-
-		 $query = $this->db->query($subQuery,array(REQ_DRAFT,REQ_PENDING_APPROVAL,REQ_DELETED,REQ_REJECTED));			 
-		//print_r($query);
-        return $query->result();
-	}
-	/*
-	This Method to get all department list
-	*/
-	function getDepartmentAllList()
-	{
-		$subQuery ='SELECT DISTINCT DEPCode,DepartmentName FROM T_DepartmentDetails';
-
-		 $query = $this->db->query($subQuery);			 
-		//print_r($query);
-        return $query->result();
-	}
-	
-	
-	function getStatusListforAllReq()
-	{
-		$subQuery ='SELECT DISTINCT STAT.StatusCode, STAT.StatusName FROM T_Requestion_Master REQ
-					JOIN T_Status STAT on REQ.Status = STAT.StatusCode where STAT.StatusCode not in (?,?,?,?)';
-	   $query = $this->db->query($subQuery,array(REQ_DRAFT,REQ_PENDING_APPROVAL,REQ_DELETED,REQ_REJECTED));
-
-         // print_r( $this->db->last_query());	   
-		
-        return $query->result();
-	}
-	
-	function getStatusByDepartment($DepNo='')
-	{
-		
-		$subQuery ='SELECT DISTINCT STAT.StatusCode ,STAT.StatusName FROM T_Requestion_Master REQ
-					JOIN T_Employee_Details EMP ON REQ.Requestedby = EMP.EmpID
-					JOIN T_DepartmentDetails DEPT ON EMP.Departmentcode = DEPT.DEPCode
-					JOIN T_Status STAT ON REQ.Status = STAT.StatusCode 
-					WHERE DEPT.DEPCode=? AND REQ.Status NOT IN (?,?,?,?)';
-	   $query = $this->db->query($subQuery,array($DepNo,REQ_DRAFT,REQ_PENDING_APPROVAL,REQ_DELETED,REQ_REJECTED));
-    	
-        return $query->result_array();
-	}
-	
-	function getRequistionListbySearch($Depid='',$Status='',$FromDate='',$ToDate='')
-	{
-		$subQuery =' SELECT  ReqNo,ReqType,Requestedby,EMP.FirstName,EMP.Designation,STAT.StatusCode ,STAT.StatusName,ReqDate,DEPT.DEPCode,DEPT.DepartmentName FROM T_Requestion_Master REQ
-			JOIN T_Employee_Details EMP ON REQ.Requestedby = EMP.EmpID
-		JOIN T_DepartmentDetails DEPT ON EMP.Departmentcode = DEPT.DEPCode
-		JOIN T_Status STAT on REQ.Status = STAT.StatusCode 
-		where REQ.Status  NOT IN (?,?,?,?,?)';
-		
-		$appendQuery = $subQuery ;
-		
-		if($Depid != '' && $Status  != '' && $FromDate != '' && $ToDate != '')
-		{
-		 $appendQuery .= ' AND DEPT.DEPCode=? AND STAT.StatusCode=? AND 	ReqDate >= ?  AND   ReqDate <= ?';
-		//echo "$appendQuery";die();
-		 $query = $this->db->query($appendQuery,array(REQ_DRAFT,REQ_PENDING_APPROVAL,REQ_DELETED,REQ_REJECTED,REQ_PO_CREATED,$Depid ,$Status,$FromDate,$ToDate));
-    	 //print_r($this->db->last_query());
-         return $query->result_array();
-		}
-		else if($Depid != '' && $Status  == '' && $FromDate == '' && $ToDate == '')
-		{
-			$appendQuery .= ' AND DEPT.DEPCode=?';
-		 
-		 $query = $this->db->query($appendQuery,array(REQ_DRAFT,REQ_PENDING_APPROVAL,REQ_DELETED,REQ_REJECTED,REQ_PO_CREATED,$Depid));
-    	 //print_r($this->db->last_query());
-         return $query->result_array();
-		}
-		else if($Depid == '' && $Status  != '' && $FromDate == '' && $ToDate == '')
-		{
-			$appendQuery .= ' AND STAT.StatusCode=?';
-		 
-		 $query = $this->db->query($appendQuery,array(REQ_DRAFT,REQ_PENDING_APPROVAL,REQ_DELETED,REQ_REJECTED,REQ_PO_CREATED,$Status));
-    	 //print_r($this->db->last_query());
-         return $query->result_array();
-		}
-		else if($Depid == '' && $Status  == '' && $FromDate != '' && $ToDate != '')
-		{
-			$appendQuery .= ' AND 	ReqDate >= ?  AND   ReqDate <= ?';
-		 
-		   $query = $this->db->query($appendQuery,array(REQ_DRAFT,REQ_PENDING_APPROVAL,REQ_DELETED,REQ_REJECTED,REQ_PO_CREATED,$FromDate,$ToDate));
-    	 //print_r($this->db->last_query());
-           return $query->result_array();
-		}
-		else if($Depid != '' && $Status  != '' && $FromDate == '' && $ToDate == '')
-		{
-			$appendQuery .= ' AND DEPT.DEPCode=? AND STAT.StatusCode=?';
-		 
-		   $query = $this->db->query($appendQuery,array(REQ_DRAFT,REQ_PENDING_APPROVAL,REQ_DELETED,REQ_REJECTED,REQ_PO_CREATED,$Depid ,$Status));
-    	// print_r($this->db->last_query());
-           return $query->result_array();
-		}
-		else if($Depid != '' && $Status  == '' && $FromDate != '' && $ToDate != '')
-		{
-			$appendQuery .= ' AND DEPT.DEPCode=? AND 	ReqDate >= ?  AND   ReqDate <= ?';
-		 
-		   $query = $this->db->query($appendQuery,array(REQ_DRAFT,REQ_PENDING_APPROVAL,REQ_DELETED,REQ_REJECTED,REQ_PO_CREATED,$Depid ,$FromDate,$ToDate));
-    	 //print_r($this->db->last_query());
-           return $query->result_array();
-		}
-		else if($Depid == '' && $Status  != '' && $FromDate != '' && $ToDate != '')
-		{
-			$appendQuery .= ' AND STAT.StatusCode=? AND 	ReqDate >= ?  AND   ReqDate <= ?';
-		 
-		   $query = $this->db->query($appendQuery,array(REQ_DRAFT,REQ_PENDING_APPROVAL,REQ_DELETED,REQ_REJECTED,REQ_PO_CREATED,$Status ,$FromDate,$ToDate));
-    	// print_r($this->db->last_query());
-           return $query->result_array();
-		}
-		else
-		{
-			 $query = $this->db->query($subQuery,array(REQ_DRAFT,REQ_PENDING_APPROVAL,REQ_DELETED,REQ_REJECTED,REQ_PO_CREATED));
-			//print_r($this->db->last_query());
-             return $query->result();
-		}
-	
-	}
-	
-	function UpdateRequistItemStatus()
-	{
-		$query = $this->db->query("update T_Requestion_Details REQ
-						JOIN T_PurchaseOrder_LineItem line ON REQ.ReqNo = line.ReqNo
-						JOIN T_PurchaseOrder_Master PO ON PO.PONO = line.PONO 
-						set    REQ.Status = CASE WHEN REQ.Quantity = line.Quantity THEN 'ST022' WHEN REQ.Quantity > line.Quantity THEN 'ST023' ELSE 'ST003' END ,
-						REQ.updatedOn= CURRENT_TIMESTAMP 
-						where  PO.Status ='".PO_CREATED."'");
-		
-		//$query ->next_result();	
-		
-	}
-	function UpdateRequistionStatus()
-	{
-		$result =   $this->db-> query("CALL P_UPDATE_REQUISTIONSTATUS_New()")  or die(mysql_error());
-		
-		$result ->next_result();	
-		
-	}
-	/**
-     * This function is used to delete the Line item from details into Database
-     * @return array $result : This is result of the query
-     */
-	function DeletePOLineItem( $LineItem='',$ReqNo='',$MaterialCode='')
-    {
-        $this->db->where('LineItemNo', $LineItem);
-		 $this->db->where('ReqNo', $ReqNo);		  
-		 $this->db->where('MaterialCode', $MaterialCode);
-        $this->db->delete('T_PurchaseOrder_LineItem');
-        
-        return TRUE;
-    }
-	
-	/**
-     * This function is used to delete the Revenue item from details into Database
-     * @return array $result : This is result of the query
-     */
-	function DeletePORevenueTax( $LineItem='')
-    {
-        $this->db->where('LineItemNo', $LineItem);
-		$this->db->delete('T_Revenue_Tax');
-        
-        return TRUE;
-    }
-	
-	/**
-     * This function is used to delete Service Tax from details into Database
-     * @return array $result : This is result of the query
-     */
-	function DeletePOServiceTax( $LineItem='')
-    {
-        $this->db->where('LineItemNo', $LineItem);
-		$this->db->delete('T_Service_Tax');
-        
-        return TRUE;
-    }
-	
-
-	function DeletePOImportTax( $LineItem='')
-    {
-        $this->db->where('LineItemNo', $LineItem);
-		$this->db->delete('T_Import_Tax');
-        
-        return TRUE;
-    }
-	
-	/**
-     * This function is used to get the List of  PO details to the approver
-     * @return array $result : This is result of the query
-	 join T_DepartmentDetails Dept on  emp.Departmentcode = Dept.DEPCode 
-     */
-	function getPOList($Amendment)
-    {
-		
-		  $this->db->distinct();
-		  $this->db->select('mast.PONO,mast.TotalOrderValue,st.StatusCode,st.StatusName,emp.FirstName,mast.CreatedDate,ccm.CostCenterName,ccm.CostCenterCode,mast.POType as ReqType,mast.Remarks,DepartmentName,mast.ApprovedBy,(select EmpID from tbl_users where userId=mast.ApprovedBy )as EID,
-(select FirstName from T_Employee_Details where EmpID=EID)as Approver');
-		  $this->db->from('T_PurchaseOrder_Master mast');
-		 // $this->db->order_by('mast.Status',"PO_CREATED");
-		  $this->db->join('T_Status st', 'st.StatusCode=mast.Status');
-		  
-		  $this->db->join('T_PurchaseOrder_LineItem req', 'req.PONO= mast.PONO');
-		  $this->db->join('T_Requestion_Master rmast','rmast.ReqNo=req.ReqNo');
-		  //$this->db->join('T_CostCenter_Budget bud','bud.CostCenterCode = req.CostCenterCode and bud.BudgetType = rmast.ReqType');
-		  $this->db->join('T_CostCenter_Master ccm','ccm.CostCenterCode = req.CostCenterCode');
-		  $this->db->join('tbl_users tbl', 'rmast.createdby=tbl.userid');
-		  $this->db->join('T_Employee_Details as emp', 'emp.empid=tbl.empid');
-		  $this->db->join('T_DepartmentDetails as Dep','Dep.DEPCode=emp.Departmentcode');
-		 // $this->db->where('mast.Status',PO_AMENDED); // EMERGENGY PO
-		  if($Amendment=='A'){ //A- Approved
-		  $this->db->or_where('mast.Status',PO_CREATED);//PO CREATED
-		  $this->db->or_where('mast.Status',PO_ONHOLD);//ON HOLD
-		  $this->db->or_where('mast.Status',PO_AWAITING_RELEASE);// PO APPROVED
-		  $this->db->or_where('mast.Status',PO_RELEASED);//PO RELEASED
-		  $this->db->or_where('mast.Status',REQITEM_Emergency_PO_CREATED);
-		  $this->db->order_by('mast.Status'); // EMERGENGY PO
-		 // $this->db->or_where('mast.Status',PO_AMENDED); // EMERGENGY PO
-		  }
-		  else if($Amendment=='R'){ // R -RELEASED
-		  $this->db->or_where('mast.Status',PO_AWAITING_RELEASE);// PO APPROVED
-		   $this->db->or_where('mast.Status',PO_RELEASED);
-		   $this->db->order_by('mast.Status','asc');
-		  }
-		  $result=$this->db->get();
-         // print_r($this->db->last_query());
-		  return $result->result();
-	
-	  }
-	
-	
-	function UpdatePO($store, $PONO)
-    {
-		
-        $this->db->where('PONO', $PONO);
-        $this->db->update('T_PurchaseOrder_Master', $store);
-        
-        return TRUE;
-    }
-	
-	function GetReleasedDetails($PONO){
-	$this->db->select('mast.ReleasedOn,re.FirstName');
-	$this->db->from('T_PurchaseOrder_Master mast');
-	$this->db->join('tbl_users tbl','mast.ReleasedBy=tbl.userid');
-	$this->db->join('T_Employee_Details re','re.EmpID=tbl.EmpID');
-	$this->db->where('mast.PONO',$PONO);
-	$result=$this->db->get();
-	//print_r($this->db->last_query());
-//die();
-	return $result->result();  
-	
-	}
-	//This is get the capital po list for edit
-
-function getCapitalPurchaseOrderDetails($PONO = '')
-	{
-	     
-	$subQuery ='SELECT distinct LineItem.LineItemNo,Req.ReqNo,Mat.MaterialCode,Mat.MaterialName,LineItem.ServiceMaterialDescription,LineItem.ServiceFrequency,
-Mat.UOM,Quantity,ReceivedQuantity,Rate,Req.Status,
- ROUND((RMCIncludingCustomersPerKG*Quantity),2)as Taxamount,LandingCharge,HighSeasSalesCharge,CustomDuty,ExciseDuty,ExciseDutyEdCess,CustomEdCess,POMast.ExchangeRate,POMast.ExchangeRateCalculatedon,POMast.TotalOrderValue as BasicValue,POMast.CapitalRange,AfterLandingCharge,AfterHighSeasSalesCharge,AfterCustomDuty,AfterExciseDuty,AfterExciseDutyEdCess,AddlExciseDuty,AfterAddlExciseDuty,Grossdutypayable,AvailableModvat,Grossexpensesduetocustomduty,purchaseratePerKG,CustomDutyExpensesPerKG,RMCIncludingCustomersPerKG,QuantityKG,BasicPriceInMTon,ProductPrice,CustomSHCess,AfterCustomSHCess,AfterExciseDutySHCess,ExciseDutySHCess,AfterCustomEdCess,ROUND((POMast.ExchangeRate*BasicPriceInMTon*Quantity),2) as BasicINRValue,Tax.TotalValue as ImportTotalValue,POMast.CurrencyType,
- 
- Req.CostCenterCode,Dept.DepartmentName FROM T_PurchaseOrder_LineItem LineItem 
- join T_PurchaseOrder_Master POMast on POMast.PONO = LineItem.PONO
-join T_MaterialMaster Mat on Mat.MaterialCode = LineItem.MaterialCode 
-
- join T_Import_Tax Tax on Tax.LineItemNo = LineItem.LineItemNo 
- join T_Requestion_Master Req on Req.ReqNo = LineItem.ReqNo 
- join T_Employee_Details emp on Req.Requestedby = emp.EmpID
-
- join T_DepartmentDetails Dept on emp.Departmentcode = Dept.DEPCode where LineItem.PONO =?';
-				//print_r($subQuery);
-
-		 $query = $this->db->query($subQuery,array($PONO));			 
-		
-        return $query->result();	  
-	 
-			
-	}
-
-// This Method to get the Capital PO  Details for pdf
-		function GetCapitalPurchaseOrderDetailsForPDF($PONO = '')
-    {
-         
-            $subQuery ='SELECT distinct LineItem.LineItemNo,ReqNo,Mat.MaterialCode,Mat.MaterialName,
-            Mat.UOM,Mat.HSNCODE,Quantity,Rate,ROUND((Quantity   *Rate),2 ) as BasicValue ,
-            LineItem.CostCenterCode ,  POMaster.*,sup.SupplierName,sup.Address,Payment.PaymentID,Payment.PaymentTerms
-            FROM T_PurchaseOrder_LineItem LineItem 
-            join T_MaterialMaster Mat on Mat.MaterialCode = LineItem.MaterialCode
-            
-            join T_PurchaseOrder_Master POMaster on POMaster.PONO = LineItem.PONO
-            join T_SupplierDetailsN sup on sup.SupplierID = POMaster.SupplierID
-            join T_PaymentTerms Payment on Payment.PaymentID = POMaster.PaymentTerms
-            where LineItem.PONO =?';
-         $query = $this->db->query($subQuery,array($PONO));            
-        
-        return $query->result();   
-     
-            
-    }
-	// get requested by details
-  function GetRequesedByDetails($PONO){
-	$this->db->select('mast.CreatedBy,re.FirstName,Dept.DEPCode,Dept.DepartmentName');
-	$this->db->from('T_PurchaseOrder_Master mast');
-	$this->db->join('tbl_users tbl','mast.CreatedBy=tbl.userid');
-	$this->db->join('T_Employee_Details re','re.EmpID=tbl.EmpID');
-        $this->db->join('T_DepartmentDetails Dept', 're.Departmentcode = Dept.DEPCode');
-        
-	$this->db->where('mast.PONO',$PONO);
-	$result=$this->db->get();
-	
-	return $result->result();  
-	
-	}
-	
-	 // get domestic capital po list
-
-      
-       function getDomesticCapitalPurchaseOrderDetails($PONO = '')
-	{
-	     
-	$subQuery ='SELECT distinct LineItem.LineItemNo,Req.ReqNo,Mat.MaterialCode,Mat.MaterialName,LineItem.ServiceMaterialDescription,LineItem.ServiceFrequency,
-        Mat.UOM,Quantity,ReceivedQuantity,Rate,Req.Status,ROUND((ServiceTax.After_CGST + ServiceTax.After_SGST + ServiceTax.After_IGST + ServiceTax.otherallowance),2) as ServiceTaxamount
-				,ServiceTax.TotalValue,ServiceTax.CGST,ServiceTax.After_CGST,ServiceTax.SGST,ServiceTax.After_SGST,ServiceTax.IGST,ServiceTax.After_IGST,ServiceTax.otherallowance,
-         POMast.ExchangeRate,POMast.ExchangeRateCalculatedon,POMast.TotalOrderValue as BasicValue,POMast.CapitalRange,ROUND((POMast.TotalOrderValue),2) as BasicINRValue,POMast.CurrencyType,
-
-         Req.CostCenterCode,Dept.DepartmentName FROM T_PurchaseOrder_LineItem LineItem 
-         join T_PurchaseOrder_Master POMast on POMast.PONO = LineItem.PONO
-         join T_MaterialMaster Mat on Mat.MaterialCode = LineItem.MaterialCode 
-         join T_Service_Tax ServiceTax on ServiceTax.LineItemNo = LineItem.LineItemNo
-         join T_Requestion_Master Req on Req.ReqNo = LineItem.ReqNo 
-         join T_Employee_Details emp on Req.Requestedby = emp.EmpID
-
-         join T_DepartmentDetails Dept on emp.Departmentcode = Dept.DEPCode where LineItem.PONO =?';
-				//print_r($subQuery);
-
-		 $query = $this->db->query($subQuery,array($PONO));			 
-		
-        return $query->result();	  
-	 
-			
-	}
-	  //get pdf po requistion details
-
-         
-	 function GetPdfRequistionDetails($PONO){
-                    $this->db->select('LineItem.ReqNo');
-                    $this->db->from('T_PurchaseOrder_LineItem LineItem');
-                    $this->db->where('LineItem.PONO',$PONO);
-                    $result=$this->db->get();
-                        $ReqNo='';
-                    
-                     foreach ($result->result() as $res){
-                  
-                       if($ReqNo==$res->ReqNo){
-                       
-                           }
-                       else{
-                      $ReqNo = $res->ReqNo;
-                      $this->db->select('ReqMast.ReqNo,ReqMast.CostCenterCode,ReqMast.ReqDate,ReqMast.Schedule_Type,ReqMast.NumberOfService,ReqMast.Service_Period,re.FirstName,Dept.DEPCode,Dept.DepartmentName');
-                   $this->db->from('T_Requestion_Master ReqMast');
-                    $this->db->join('T_Employee_Details re','re.EmpID=ReqMast.Requestedby');
-                    $this->db->join('T_DepartmentDetails Dept', 're.Departmentcode = Dept.DEPCode');
-                    $this->db->where('ReqMast.ReqNo',$ReqNo);
-                    $Reqresult=$this->db->get();
-                    $Details['RequistionNo']= $Reqresult->result()[0]->ReqNo;
-                    $Detaisl['ReqDate']=$Reqresult->result()[0]->ReqDate;
-                    $Details['RequestedName']= $Reqresult->result()[0]->FirstName;
-                    $Details['RequestedDept']= $Reqresult->result()[0]->DepartmentName;
-                    $Details['CostCenterCode']= $Reqresult->result()[0]->CostCenterCode;
-                    $date = new DateTime($Reqresult->result()[0]->ReqDate,new DateTimeZone('Asia/Kolkata'));
-		   				 $retDate = $date->format('d-m-Y');
-                    $Details['ReqDate']= $retDate;
-                    $ScheduleType = $Reqresult->result()[0]->Schedule_Type;
-                    if($ScheduleType!='Recurring'){
-                     $Details['Frequency']= $Reqresult->result()[0]->Schedule_Type;
-                   
-                      }
-                      else{
-                       $Details['Frequency']= $Reqresult->result()[0]->Service_Period.' - '.$Reqresult->result()[0]->NumberOfService;
-                            }
-                   
-                    $ResultArray[]=$Details;
-                        }
-                   
-                           }
- 
-                   $RequistionDetails =  $ResultArray;
-                    return $RequistionDetails;  
-             }
-	 function GetLineItemReceivedQty($ParentPO,$MaterialCode)
-	{
-		$this->db->select('ReceivedQuantity');
-		$this->db->from('T_PurchaseOrder_LineItem');
-	
-		$this->db->where('PONO',$ParentPO);
-		$this->db->where('MaterialCode',$MaterialCode);
-		$result=$this->db->get();
-	
-		return $result->result_array();  
-	}
-	
-             //get paymentTerms details
-
-             function getPaymentTermsDetails($Payment_ID='')
-    {
-
-  
-    $getpaymentQuery='select distinct PaymentID,PaymentTerms,Details from T_PaymentTerms';
-   $paymentQuery=$this->db->query($getpaymentQuery);
-  
-   return $paymentQuery->result();
-
-    }
-	 /**
-     * This function is used to get status in status table
-    
-     */
-    function getStatus($StatusType = '')
-    {
-        $this->db->select('StatusCode,StatusName ');
-        $this->db->from('T_Status');
-        $this->db->where('StatusType', $StatusType);
-        $query = $this->db->get();
-        
-        return $query->result();
-    }
-
-
-     function edit_mrir($MrirNo)
-    {
-      $this->db->distinct();
-      $this->db->select('TMM.MRIRNO,TMM.PONO,TMM.IGRNO,TMM.Createdon,TMD.ActualQuantityReceived,IGRM.DeliveryChellanOrInvoiceNo,IGRM.DeliveryChellanDate,IGRM.VehicleNo,IGRM.CourierNo,IGRM.CreatedDate,IGRD.QuantityAsPerInvoice,SUPP.SupplierName,SUPP.Address,POMR.PODate,POMR.DeliveryDate,POMR.ServiceDescription,TMD.MaterialCode,MM.MaterialName,MM.UOM,POLT.Quantity,POLT.ReceivedQuantity,ED.FirstName as PORasiedbyName,ED1.FirstName as MRIRRasiedbyName, ED2.FirstName as IGRRasiedbyName,TMM.MRIRStatus,TMM.Createdon as MRIRCreatedon,POLT.CostCenterCode,CostCenterName,QuantityAccepted,QuantityRejected,TMD.Remarks');
-      $this->db->from ('T_MRIR_Master TMM'); 
-      $this->db->join ('T_MRIR_Details TMD','TMM.MRIRNO = TMD.MRIRNO','left');//to get IGRNO,PONO,MRIRNO,mrirdate,
-      $this->db->join ('T_IGR_Master IGRM', 'IGRM.IGRNO = TMM.IGRNO','left');//to get actualquantity,deliverydate,Invoicedate,vechileno,courierno,igrdate,
-      $this->db->join ('T_PurchaseOrder_Master  POMR ','IGRM.PONO = POMR.PONO','left');//to get podate,deliverydate,servicedescription
-      $this->db->join ('T_PurchaseOrder_LineItem POLT','IGRM.PONO=POLT.PONO','left');//to get receivedquantity,quantity
-      
-      $this->db->join ('T_IGR_Details IGRD','IGRD.IGRNO = IGRM.IGRNO','left');//to get invoicequantity
-      $this->db->join ('T_MaterialMaster  MM','IGRD.MaterialCode = MM.MaterialCode','left');
-      $this->db->join ('T_SupplierDetailsN SUPP','POMR.SupplierID = SUPP.SupplierID','left');//to get suppliername,supplieraddress
-      $this->db->join ('tbl_users user','user.userid = POMR.CreatedBy','left');//to get poraisedby
-      $this->db->join ('T_Employee_Details  ED','ED.EmpID = user.EmpID','left');
-      $this->db->join ('tbl_users user1','user1.userid=TMM.CreatedBy','left');//to get mrirraisedby
-      $this->db->join ('T_Employee_Details  ED1','ED1.EmpID = user1.EmpID','left');
-      $this->db->join ('tbl_users user2','user2.userid=IGRM.CreatedBy','left');//to get igrraisedby
-      $this->db->join ('T_Employee_Details  ED2','ED2.EmpID = user2.EmpID','left');
-      $this->db->join('T_CostCenter_Master TCOST','POLT.CostCenterCode=TCOST.CostCenterCode');
-      $this->db->where('TMM.MRIRNO',$MrirNo);
-	   $this->db->group_by('TMM.MRIRNO,TMD.MaterialCode');
-      $query = $this->db->get();
-      $result = $query->result();   
-     //print_r( $this->db->last_query());	  
-      return $result; 
-
-  }
-
-
-
-
-
-     function getadvancePONO($Status='')
-    {
-        $this->db->select ('Mast.PONO,POType,Mast.CreatedDate,Mast.ReleasedOn,Mast.TotalOrderValue,Mast.SupplierID,DeliveryDate,DeliverySchedule,DeliveryOption,Mast.PaymentTerms as Paycode,Payterm.PaymentTerms,LineItem.ReqNo,Requestedby,Departmentcode,DepartmentName,LineItem.CostCenterCode,SupDet.SupplierName,Import_DispatchDetails,CurrencyType,AdvancePercentage,AdvanceAmount,POAdv.Remarks');
-        $this->db->from('T_PurchaseOrder_Master Mast');
-        $this->db->join('T_PurchaseOrder_LineItem LineItem','Mast.PONO=LineItem.PONO');
-        $this->db->join('T_Requestion_Master ReqMa','LineItem.ReqNo=ReqMa.ReqNo');
-        $this->db->join('T_Employee_Details EmpDet','ReqMa.Requestedby=EmpDet.EmpID');
-        $this->db->join('T_DepartmentDetails DepDet','EmpDet.Departmentcode=DepDet.DEPCode');
-        $this->db->join('T_SupplierDetailsN SupDet','Mast.SupplierID=SupDet.SupplierID');
-        $this->db->join('T_PurchaseOrder_AdvanceRequest POAdv','Mast.PONO=POAdv.PONO','left');
-        $this->db->join('T_PaymentTerms Payterm','Mast.PaymentTerms=Payterm.PaymentID');
-        $this->db->where('Mast.Status',$Status);
-        $query = $this->db->get();
-        //print_r($this->db->last_query());
-        return $query->result();
-
-    }
-    //get available budget for capital
-	 function GetAvailableCapitalBudgetAmount($CostCode,$Year,$BudgetType)
-            {
-			
-                  $subQuery ='select BudgetAmount, (select ifnull(sum(IF(POMaster.ExchangeRate>0,Quantity*Rate*POMaster.ExchangeRate,Quantity*Rate)),0) as Totalvalue from 
-					T_PurchaseOrder_LineItem  Item join T_Requestion_Master mast 
-					on mast.ReqNo = Item.ReqNo join T_PurchaseOrder_Master POMaster on POMaster.PONO=Item.PONO where Item.CostCenterCode=?  and mast.ReqType=?)as Totalvalue 
-					from T_CostCenter_Budget Bud where Bud.CostCenterCode=? and 
-					BudgetYear = ? and BudgetType =?';
-		 
-	$query = $this->db->query($subQuery,array($CostCode,$BudgetType,$CostCode,$Year,$BudgetType));			 
-		
-        return $query->result_array();	
-
-            }
-}
diff --git a/application/models/requistion_model.php~ b/application/models/requistion_model.php~
deleted file mode 100644
index eb896e9c..00000000
--- a/application/models/requistion_model.php~
+++ /dev/null
@@ -1,500 +0,0 @@
-<?php if(!defined('BASEPATH')) exit('No direct script access allowed');
-
-class requistion_model extends CI_Model
-{
-   
-    /**
-     * This function is used to get the SupplierID and SupplierName information
-     * @return array $result : This is result of the query
-     */
-    function getSupplierName()
-    {
-        $this->db->select('SupplierID, SupplierName,ADeleteRequistionLineItemddress');
-        $this->db->from('T_SupplierDetailsN');
-        //$this->db->where('roleId !=', 1);
-        $query = $this->db->get();
-        
-        return $query->result();
-    }
-	/**
-     * This function is used to get the userId information
-     * @return array $result : This is result of the query
-     */
-    function getusers()
-    {
-        $this->db->select('userId, name');
-        $this->db->from('tbl_users');
-        //$this->db->where('roleId !=', 1);
-        $query = $this->db->get();
-        
-        return $query->result();
-    }
- /* This function is used to  getEditRequistItemList view the information
-     * @return array $result : This is result of the query
-     */
-	function getEditRequistItemList($ReqNo)
-    {
-
-		/* $result =   $this->db-> query("CALL P_GET_REQUISTITEMLIST('".$ReqNo."')")  or die(mysql_error());
-		
-		
-			//echo 'REQUISTITEMLIST Line item view successfully';
-		
-	 
-
-		$result ->next_result();
-
-		if($result->num_rows > 0)
-        {
-          
-             return $result->result();
-        }
-
-     */
-	 $subQuery ='select distinct Req.ReqNo, Mat.MaterialCode,Mat.MaterialName,Mat.UOM, Req.Quantity,if (Po.Quantity is null,0,Po.Quantity)  as POQTY,sta.StatusName 	from T_MaterialMaster Mat join T_Requestion_Details Req on Req.MaterialCode = Mat.MaterialCode
-       left join T_PurchaseOrder_LineItem Po on Po.ReqNo =  Req.ReqNo and Po.MaterialCode = Req.MaterialCode
-        left join T_Status sta on sta.StatusCode = Req.Status
-        where Req.ReqNo = ?';
-			
-			 $query = $this->db->query($subQuery, array($ReqNo));	
-		 
-		   // print_r($this->db->last_query()); 
-			return $query->result();
-       
-    }
-
-	/**
-     * This function is used to get the userId information
-     * @return array $result : This is result of the query
-     */
-    function getStatus()
-    {
-        $this->db->select('StatusCode,StatusName ');
-        $this->db->from('T_Status');
-		 $this->db->where('StatusType', REQUISTSTATUS);
-        $this->db->where('StatusCode !=', REQ_DRAFT);
-        $query = $this->db->get();
-        
-        return $query->result();
-    }
-    /* This function is used to get the Raw Material  information
-     * @return array $result : This is result of the query
-     */
-	function getRequistionList($ReqNo,$IsArray='')
-    {
-
-		$result =   $this->db-> query("CALL P_GET_AllREQUISTION('".$ReqNo."')")  or die(mysql_error());
-		
-		{
-			//echo 'PO Line item Inserted successfully';
-			if($IsArray != '')
-			{				
-				
-				 return $result->result_array();
-			}
-			else
-			{
-             return $result->result();
-			}
-		}
-		
-       
-    }
-	
-	/**
-     * This function is used to get Employee details based on Employee ID Selection
-     * @return array $result : This is result of the query
-     */
-	function GetEmployeeDetails($EmpID)
-    {
-		
-		 $this->db->select(' EMP.EmpID,EMP.Designation,DEPT.DEPCode,DEPT.DepartmentName');
-         $this->db->from('T_Employee_Details EMP');
-		 $this->db->join('T_DepartmentDetails DEPT', 'EMP.Departmentcode = DEPT.DEPCode');
-		 $this->db->where('EMP.EmpID ',$EmpID );
-		 $query = $this->db->get();
-        
-         return $query->result_array();
-    }
-	
-	/**
-     * This function is used to get the Cost Center details for the Login user department
-     * @return array $result : This is result of the query
-     */
-	function GetCostCenterByDept($DeptId)
-    {
-		
-		 $this->db->select('Mast.CostCenterCode,Mast.CostCenterName');
-         $this->db->from('T_CostCenter_Master Mast ');
-		 $this->db->join('T_CostCenter_Departments COST', 'COST.CostCenterCode = Mast.CostCenterCode');
-		 $this->db->where('COST.DEPCode ',$DeptId );
-		 $query = $this->db->get();
-        // print_r( $this->db->last_query());
-         return $query->result_array();
-    }
-	/**
-     * This function is used to get the Available BudgetAmount for the Cost center
-     * @return array $result : This is result of the query
-     */
-	function GetAvailableBudgetAmount($CostCode,$Year,$BudgetType)
-    {
-		 $this->db->select('BudgetAmount');
-         $this->db->from('T_CostCenter_Budget');
-		 $this->db->where('CostCenterCode',$CostCode );
-		  $this->db->where('BudgetYear',$Year );
-		   $this->db->where('BudgetType',$BudgetType );
-		 $query = $this->db->get();
-        
-         return $query->result_array();
-    }
-	
-	function EditMaterialCode($ReqNo,$ReqType)
-	{
-			$subQuery ='SELECT Mat.MaterialCode,Mat.MaterialName,Mat.UOM
-			from T_MaterialMaster Mat where  Mat.MaterialCode not in (select Req.MaterialCode from T_Requestion_Details Req
-			join  T_Requestion_Master mast on Req.ReqNo = mast.ReqNo where mast.ReqNo=? and mast.ReqType=?
-			) and Mat.MaterialType=?';
-			
-			 $query = $this->db->query($subQuery, array($ReqNo,$ReqType,$ReqType));	
-		 
-		
-			return $query->result();
-			
-	}
-	
-	
-	/**
-     * This function is used to get the Material details for the Request type
-     * @return array $result : This is result of the query
-     */
-	function GetMaterialCode($ReqType,$NotArray='')
-    {
-		 $this->db->select('MaterialCode, MaterialName,UOM');
-         $this->db->from('T_MaterialMaster');
-		 $this->db->where('MaterialType',$ReqType );
-		 
-		 $query = $this->db->get();
-         if($NotArray == '')
-		 {
-         return $query->result_array();
-		 }
-		 else
-		 {
-			 return $query->result(); 
-		 }
-    }
-	/**
-     * This function is used to get the Raw Material  information
-     * @return array $result : This is result of the query
-     */
-	function getRawMaterialList($MaterialCode)
-    {		
-        $this->db->select('MaterialName,UOM');
-        $this->db->from('T_MaterialMaster');
-		 $this->db->where('MaterialCode',$MaterialCode );		
-        $query = $this->db->get();
-        
-        return $query->result_array();
-    }
-	
-		/**
-     * This function is used to get the Config value from configuration table
-     * @return array $result : This is result of the query
-     */
-	function getConfigValue($ConfigID ,$ConfigValue = '')
-    {
-		
-        $this->db->select('ConfigValue');
-        $this->db->from('T_ConfigDetails');
-		 $this->db->where('Config_id ',$ConfigID );
-		 if($ConfigValue != '')
-		 {
-			  $this->db->where('ConfigValue != ',$ConfigValue );
-		 }
-        $query = $this->db->get();
-        
-        return $query->result();
-    }
-	
-	
-	/**
-     * This function is used to get the All employees
-     * @return array $result : This is result of the query
-     */
-	function getAllEmployees()
-    {
-		$this->db->select('EmpID,FirstName,LastName');
-        $this->db->from('T_Employee_Details');
-		$query = $this->db->get();
-        
-        return $query->result();
-    }
- 
-  /**
-     * This function is used to get the Employee Details
-     * @return array $result : This is result of the query
-     */
-	function getEmpIdByUserID($UserID)
-    {
-		$subQuery ='SELECT   EMP.EmpID,EMP.FirstName,EMP.Designation,DEPT.DEPCode,DEPT.DepartmentName 
-		FROM T_Employee_Details EMP	JOIN T_DepartmentDetails DEPT ON
-		EMP.Departmentcode = DEPT.DEPCode
-		WHERE EMP.EmpID=(select EmpID from tbl_users where userId=?)';
-
-		 $query = $this->db->query($subQuery, array($UserID));	
-		 
-		
-        return $query->result();
-    }
-	
-	 /**
-     * This function is used to get the CostCenter for the Selected Employee
-     * @return array $result : This is result of the query
-     */
-	function getCostCenterUserID($UserID)
-    {
-		$subQuery ='SELECT  Mast.CostCenterCode,Mast.CostCenterName from T_CostCenter_Master Mast 
-		LEFT JOIN T_CostCenter_Departments COST ON COST.CostCenterCode = Mast.CostCenterCode
-		WHERE COST.DEPCode=(select Departmentcode from T_Employee_Details where EmpID = (select EmpID from tbl_users where userId=?))';
-
-		  $query = $this->db->query($subQuery, array($UserID));	
-		//print_r($this->db->last_query());
-        return $query->result();
-    }
-	
-	/**
-     * This function is used to get the Purchase order Type
-     * @return array $result : This is result of the query
-     */
-	function CheckDraftStatus($UserID)
-    {
-		
-		$subQuery = 'select count(ReqNo) as cnt,ReqNo from T_Requestion_Master where 
-						Requestedby= ( select EmpID from tbl_users where userId=?) and status=?';   
-          
-        $query = $this->db->query($subQuery, array($UserID,REQ_DRAFT));		
-		  
-        return $query->result();
-    }
-	/**
-     * This function is used to get the Requsition List for the login user
-     * @return array $result : This is result of the query
-     */
-	function getRequistDetails($ReqID,$NoArray='')  
-	{
-		
-			$subQuery = 'select distinct ReqNo,ReqType,Status,Requestedby,DATE_FORMAT(mast.CreatedDate, "%d-%m-%Y") as CreatedDate,Schedule_Type,NumberOfService,Service_Period ,emp.FirstName,emp.EmpID,emp.Designation, Dept.DEPCode,Dept.DepartmentName,DATE_FORMAT(mast.ReqDate, "%d-%m-%Y") as  ReqDate,CostCenterCode
-						from T_Requestion_Master  mast
-						join T_Employee_Details emp  on mast.Requestedby = emp.EmpID
-						join T_DepartmentDetails Dept on  emp.Departmentcode = Dept.DEPCode
-						where ReqNo=?';   
-          
-        $query = $this->db->query($subQuery, array($ReqID));		
-		  if($NoArray == '')
-		  {
-			return $query->result_array();
-		  }
-		  else
-		  {
-			  return $query->result();
-		  }
-    }
-	 /**
-     * This function is used to get the Requsition List for the login user
-     * @return array $result : This is result of the query
-     */
-	function getRequistListUserID($UserID)
-    {
-		
-			$subQuery = 'select ReqNo, ReqType ,Status,CreatedDate ,StatusName from  T_Requestion_Master mast
-						join T_Status st on st.StatusCode= mast.Status  where 
-						Requestedby = ( select EmpID from tbl_users where userId=?) and Status != ? ';   
-          
-        $query = $this->db->query($subQuery, array($UserID,REQ_DELETED));		
-		  
-        return $query->result();
-    }
-	 /**
-     * This function is used to get the Requsition List for the login user
-     * @return array $result : This is result of the query
-     */
-	function getRequistItemList($ReqID,$NoArray='')
-    {
-		
-			$subQuery = 'select  distinct  Req.ReqNo, Mat.MaterialCode,Mat.MaterialName,Mat.UOM, Req.Quantity,sum(Po.Quantity) as POQTY,sta.StatusName from T_MaterialMaster Mat  
-	left join T_Requestion_Details Req on Req.MaterialCode = Mat.MaterialCode
-      left join T_PurchaseOrder_LineItem Po on Po.ReqNo =  Req.ReqNo and Po.MaterialCode = Req.MaterialCode
-	   left join T_Status sta on sta.StatusCode = Req.Status where Req.ReqNo=?  group by Po.ReqNo,Req.MaterialCode';
-  
-          
-         $query = $this->db->query($subQuery, array($ReqID));		
-		  if($NoArray == '')
-		  {
-			return $query->result_array();
-		  }
-		  else
-		  {
-			  return $query->result();
-		  }
-    }
-	
-	/**
-     * This function is used to add the Requistion into the Database
-     * @return array $result : This is result of the query
-     */
-    function addRequistion($Requistion)
-    {
-        $this->db->trans_start();
-        $this->db->insert('T_Requestion_Master', $Requistion);        
-        $insert_id = $this->db->affected_rows();         
-        $this->db->trans_complete();      
-      	if($insert_id>0)
-		{
-		$subQuery = 'select max(ReqNo) as ReqNo from T_Requestion_Master';   
-          
-        $query = $this->db->query($subQuery);
-        
-        return $query->result_array();
-		}
-	    
-    }
-	/**
-     * This function is used to check the Request is in Draft status 
-     * @return array $result : This is result of the query
-     */
-	function RequistionIsExists($ReqBy)
-    {
-		$this->db->select('ReqNo');
-        $this->db->from('T_Requestion_Master');
-		$this->db->where('Status ',REQ_DRAFT );
-		$this->db->where('Requestedby ',$ReqBy );
-		$query = $this->db->get();
-        
-        if ($query->num_rows > 0) {
-			//echo $result->num_rows;
-            return $query->result_array();
-		}       
-    }
-	/**
-     * This function is used to check the Request Line Item is in Draft status 
-     * @return array $result : This is result of the query
-     */
-	function LineItemIsExists($ReqNo,$MaterialCode)
-    {
-		$this->db->select('ReqNo');
-        $this->db->from('T_Requestion_Details');
-		$this->db->where('ReqNo ',$ReqNo );
-		$this->db->where('MaterialCode ',$MaterialCode );
-		$query = $this->db->get();
-        
-        if ($query->num_rows > 0) {
-			//echo $result->num_rows;
-            return $query->result_array();
-		}       
-    }
-	/**
-     * This function is used to add the Line item details to the Database
-     * @return array $result : This is result of the query
-     */
-    function addRequistionDetails($Requistion)
-    {
-        $this->db->trans_start();
-        $this->db->insert('T_Requestion_Details', $Requistion);        
-        $insert_id = $this->db->affected_rows();         
-        $this->db->trans_complete();
-        // print_r($this->db->last_query());		
-      	return $insert_id;
-	    
-    }
-	 /**
-     * This function is used to delete the Line item from details into Database
-     * @return array $result : This is result of the query
-     */
-	function DeleteRequistionLineItem( $ReqNo,$MaterialCode)
-    {
-        $this->db->where('ReqNo', $ReqNo);
-		 $this->db->where('MaterialCode', $MaterialCode);
-        $this->db->delete('T_Requestion_Details');
-        
-        return TRUE;
-    }
-	
-	 /**
-     * This function is used to update the details into Database
-     * @return array $result : This is result of the query
-     */
-	function UpdateRequistionLineItem($Requist, $ReqNo,$MaterialCode)
-    {
-        $this->db->where('ReqNo', $ReqNo);
-		 $this->db->where('MaterialCode', $MaterialCode);
-        $this->db->update('T_Requestion_Details',$Requist);
-        
-        return TRUE;
-    }
-	
-    /**
-     * This function is used to update the details into Database
-     * @return array $result : This is result of the query
-     */
-	function UpdateRequistion($Requistion, $ReqNo)
-    {
-        $this->db->where('ReqNo', $ReqNo);
-        $this->db->update('T_Requestion_Master', $Requistion);
-        
-        return TRUE;
-    }
-	
-	
-	
-	 /**
-     * This function is used to get the List of  Requist details to the approver
-     * @return array $result : This is result of the query
-     */
-	function getApproverRequistList($UserID,$Status = '',$FromDate='' ,$ToDate='')
-    {
-		// echo 'UserId: '.$UserID . 'From: '.$FromDate .'TO: '. $ToDate. 'Status: '. $Status;
-		
-			$subQuery = 'select distinct ReqNo,Status,mast.CreatedDate,Requestedby,emp.FirstName,mast.Comments,st.StatusName
-						from T_Requestion_Master  mast join T_Employee_Details emp  on mast.Requestedby = emp.EmpID
-						join T_DepartmentDetails Dept on  emp.Departmentcode = Dept.DEPCode
-						join T_Status st on st.StatusCode = mast.Status
-						where  status not in(?,?,?) and emp.Departmentcode  in (select DEPCode from T_DepartmentDetails where  HeadDept= 
-						(select HeadDept from T_DepartmentDetails where DEPCode = (select Departmentcode from T_Employee_Details where 
-						EmpID=(select EmpID from tbl_users where userId=?))))';
-			$subQuery1 = $subQuery;
-			$query ='';
-			
-         if($FromDate != '' && $ToDate != '' && $Status !='' )
-			 {
-			
-			 $Where = 'and 	mast.CreatedDate >= ?  and   mast.CreatedDate <= ? and Status=?';
-			 $subQuery1 .= $Where;
-			 $query = $this->db->query($subQuery1, array(REQ_DRAFT,REQ_DELETED,REQ_REJECTED,$UserID,$FromDate,$ToDate,$Status));
-		 }	
-		 else if($FromDate != '' && $ToDate != '' &&  $Status =='')
-		 {
-			  $Where = 'and 	mast.CreatedDate >= ?  and   mast.CreatedDate <= ? ';
-			  $subQuery1 .= $Where;
-			  $query = $this->db->query($subQuery1, array(REQ_DRAFT,REQ_DELETED,REQ_REJECTED,$UserID,$FromDate,$ToDate));
-		 }
-          else if($Status != '' && $FromDate == '' && $ToDate == '')
-		 {
-			  $Where = 'and Status = ?';
-			  $subQuery1 .= $Where;
-			  $query = $this->db->query($subQuery1, array(REQ_DRAFT,REQ_DELETED,REQ_REJECTED,$UserID,$Status));
-		 } 
-		
-		else
-		{
-			$query = $this->db->query($subQuery, array(REQ_DRAFT,REQ_DELETED,REQ_REJECTED,$UserID));	
-		}		
-		  
-		  //print_r($this->db->last_query());
-        return $query->result();
-    }
-	
-	
-	
-}
-
-  
\ No newline at end of file
diff --git a/application/views/Editmaterialinspectionreport.php~ b/application/views/Editmaterialinspectionreport.php~
deleted file mode 100644
index c32229d9..00000000
--- a/application/views/Editmaterialinspectionreport.php~
+++ /dev/null
@@ -1,507 +0,0 @@
-<?php
-$MRIRNO="";
-$mrirdate="";
-$MRIRRasiedbyName=""; 
-$IGRNO="";
-$igrdate="";
-$IGRRasiedbyName="";
-$PONO="";
-$podate="";
-$PORasiedbyName="";
-$VehicleNo="";
-$CourierNo="";
-$DeliveryChellanOrInvoiceNo="";
-$SupplierName="";
-$dcdate="";
-$Address=""; 
-$CreatedBy="";
-$ServiceDescription="";
-$RowCount = 0;
-$MRIRStatus = '';
-if(!empty($MRIRDetails))
-{
-
-    foreach ($MRIRDetails as $MRIR)
-    {
-    	$MRIRNO = $MRIR->MRIRNO;
-    	$MRIRDate=$MRIR->MRIRCreatedon;
-    	$mrir_date = strtotime( $MRIRDate );
-		$mrirdate = date( 'd/m/Y', $mrir_date );
-		$MRIRRasiedbyName=$MRIR->MRIRRasiedbyName; 
-    	$IGRNO = $MRIR->IGRNO;
-    	$IGRDate = $MRIR->IGRCreated;
-    	$igr_date = strtotime( $IGRDate );
-		$igrdate = date( 'd/m/Y', $igr_date );
-    	$IGRRasiedbyName=$MRIR->IGRRasiedbyName; 
-    	$PONO = $MRIR->PONO;
-    	$PODate=$MRIR->PODate;
-    	$PORasiedbyName=$MRIR->PORasiedbyName;	
-    	$po_date = strtotime( $PODate );
-		$podate = date( 'd/m/Y', $po_date );
-    	$VehicleNo = $MRIR->VehicleNo;
-		$CourierNo= $MRIR->CourierNo;
-		$DeliveryChellanOrInvoiceNo=$MRIR->DeliveryChellanOrInvoiceNo;
-		$SupplierName=$MRIR->SupplierName;
-		$DeliveryChellanDate=$MRIR->DeliveryChellanDate;
-		$dc_date = strtotime( $DeliveryChellanDate );
-		$dcdate = date( 'd/m/Y', $dc_date );
-		$Address=$MRIR->Address;
-		//$CreatedBy=$MRIR->CreatedBy;
-		$ServiceDescription=$MRIR->ServiceDescription;
-		$MRIRStatus = $MRIR->MRIRStatus;
-    }
-}
-  ?>
- <script>
-
- $(document).ready(function(){
-
- 		//$("#IGRNO").select2();
-		$("#QualityIncharge").select2();
-		$("#plantIncharge").select2();
-		
- });//ready closed.
- </script>
-
-
- <style>
-    .modal
-	{
-		padding-right:25% ! important;
-	}
-	.select2
-	{
-		width: 100% ! important;
-	}
-	.num{
-		text-align:right;
-	}
-	.dataTables_wrapper {
-    padding-bottom: 0px;
-	}
- </style>
-<div class="content-wrapper" style="min-height:537px;">
-    <!-- Content Header (Page header) -->
-    <section class="content-header">
-      <h1>
-        <center>Siddharth Industries - Edit Material Receipt And Inspection Report (MRIR) -<?php echo $MRIRNO ;?></center>        
-      </h1>	
-      
-      <?php
-                     $attributes = array('class' => 'form-label-left MRIR ','name'  => 'MRIR','id'  => 'MRIR');
-                        echo form_open($this->config->base_url().'/MRIRcontroller/generateMRIR/',$attributes); ?>  	  	 
-    </section>    
-    <section class="content"><br/>
-    <div id ="content"></div>  
-	<div class="row" style="font-size:12px;">
-		 
-		<div class="col-md-12" style="padding:0px;">
-		
-			<!--<div class="col-md-2">
-					<label for="MRIRNO">MRIR Number</label>
-                                        <div class="form-group">
-                                        	 <?php
-												 $data = array('name' => 'MRIRNO','value' => set_value('MRIRNO',$MRIRNO),'id'=>'MRIRNO',  'class' => 'form-control' ,'readonly' => 'true');
-												echo form_input($data);
-											?>
-                                       
-                     </div>
-            </div> --> 
-			<div class="col-md-2">
-				<label for="SupplierName">Supplier Name </label>
-											<div class="form-group">
-												<?php
-												 $data = array('name' => 'SupplierName','value' => set_value('SupplierName',$SupplierName),'id'=>'SupplierName',  'class' => 'form-control' ,'readonly' => 'true');
-												 echo form_input($data);
-												?> 
-
-											</div>
-			</div>
-            <div class="col-md-2">   
-                    <label for="MRIRDate">MRIR Date</label>
-                                        <div class="form-group">
-                                        	 <?php
-												 $data = array('name' => 'MRIRDate','value' => set_value('MRIRDate',$mrirdate),'id'=>'MRIRDate',  'class' => 'form-control num' ,'readonly' => 'true');
-												echo form_input($data);
-											?>
-                                       
-                     </div>  
-            </div> 
-            <div class="col-md-2">   
-                    <label for="MRIRRasiedbyName">MRIR Created By</label>
-                                        <div class="form-group">
-                                        	 <?php
-												 $data = array('name' => 'MRIRRaisedby','value' => set_value('MRIRRaisedby',$MRIRRasiedbyName),'id'=>'MRIRDate',  'class' => 'form-control' ,'readonly' => 'true');
-												echo form_input($data);
-											?>
-                                       
-                     </div>  
-            </div> 
-			<div class="col-md-2" style="padding:0px;">
-					<label for="IGRNO">IGR Number</label>
-                                        <div class="form-group">
-                                        	 <?php
-												 $data = array('name' => 'IGRNO','value' => set_value('IGRNO',$IGRNO),'id'=>'IGRNO',  'class' => 'form-control' ,'readonly' => 'true');
-												echo form_input($data);
-												?>
-                                       
-                     </div>
-            </div>
-            <div class="col-md-2">
-				<label for="IGRDate">IGR Date</label>
-                                        <div class="form-group">
-                                        	<?php
-												 $data = array('name' => 'IGRDate','value' => set_value('IGRDate',$igrdate),'id'=>'IGRDate',  'class' => 'form-control num' ,'readonly' => 'true');
-												echo form_input($data);
-												?>
-
-                                        </div>
-                           </div>
-
-            <div class="col-md-2">
-				<label for="IGRRasiedbyName">IGR Created By</label>
-                                        <div class="form-group">
-                                        	<?php
-												 $data = array('name' => 'IGRRaisedBy','value' => set_value('IGRRaisedBy',$IGRRasiedbyName),'id'=>'IGRRaisedBy',  'class' => 'form-control' ,'readonly' => 'true');
-												echo form_input($data);
-												?>
-
-                                        </div>
-                           </div>
-            </div>  
-        
-		<div class="col-md-12" style="padding:0px;">
-			<div class="col-md-2">
-				<label for="PONO">PO Number</label>
-                                        <div class="form-group">
-                                        	<?php
-												 $data = array('name' => 'PONO','value' => set_value('PONO',$PONO),'id'=>'PONO',  'class' => 'form-control' ,'readonly' => 'true');
-												echo form_input($data);
-												?>
-											</div>
-			</div>
-			<div class="col-md-2">
-				<label for="PODate">PO Date</label>
-										<div class="from-group">
-											<?php
-													 $data = array('name' => 'PODate','value' => set_value('PODate',$podate),'id'=>'PODate',  'class' => 'form-control num' ,'readonly' => 'true'); 
-													echo form_input($data);
-													?>
-												</div>
-			</div>
-			<div class="col-md-2">
-				<label for="PORasiedbyName">PO Created By</label>
-										<div class="from-group">
-											<?php
-													 $data = array('name' => 'PORasiedbyName','value' => set_value('PORasiedbyName',$PORasiedbyName),'id'=>'PORasiedbyName',  'class' => 'form-control' ,'readonly' => 'true');
-													echo form_input($data);
-													?>
-										</div>
-			</div>
-			 	<div class="col-md-1" style="padding:0.9px;">
-				<label for="DeliveryChellanOrInvoiceNo">DC / IN NO</label>
-											<div class="form-group">
-												<?php
-													 $data = array('name' => 'DeliveryChellanOrInvoiceNo','value' => set_value('DeliveryChellanOrInvoiceNo',$DeliveryChellanOrInvoiceNo),'id'=>'DeliveryChellanOrInvoiceNo',  'class' => 'form-control' ,'readonly' => 'true');
-													echo form_input($data);
-												?>  
-											</div>
-			</div>
-			<div class="col-md-1" style="padding:0.9px;">
-			 	<label for="DeliveryChellanDate">DC / IN Date </label>
-											<div class="form-group">
-												<?php 
-													$data = array('name' => 'DeliveryChellanDate','value' => set_value('DeliveryChellanDate',$dcdate),'id'=>'DeliveryChellanDate',  'class' => 'form-control num','readonly' => 'true');
-												echo form_input($data);
-												?>
-											</div>
-			</div>
-			<div class="col-md-2">
-				  <label for="VehicleNo">Vehicle Number</label>
-                                <div class="form-group">
-                                        <?php
-							 				$data = array('name' => 'VehicleNo','value' => set_value('VehicleNo',$VehicleNo),'id'=>'VehicleNo',  'class' => 'form-control', 'readonly' => 'true','align' => 'left');
-											echo form_input($data);
-										?>
-							 </div>
-			</div>
-			<div class="col-md-2">
-			 <label for="CourierNo">Courier Number</label>
-                            <div class="form-group">
-                            	<?php
-										 $data = array('name' => 'CourierNo','value' => set_value('CourierNo',$CourierNo),'id'=>'CourierNo',  'class' => 'form-control' ,'readonly' => 'true');
-										echo form_input($data);
-								?>
-							 </div>
-			</div>
-		</div>
-		 
-	<div class="row" style="padding:1%;"> 
-		<div class="col-md-12">            								
-				<table id="mytable"  class="table table-bordered table-hover" style="background-color:#fff;font-size:12px;">
-					<thead style="background-color:#ddf">
-						<tr>
-						<th>S.NO</th> 
-						  <th>Item Code</th>
-						  <th>Material Name</th>
-						  <th>UOM</th>
-						  <th>Ordered Quantity</th>
-						  <th>Adviced Quantity</th>
-						  <th>Actual Quantity Received</th>
-						  <th>Accepted Quantity</th> 
-						  <th>Rejected Quantity</th >
-						  <th>Remarks</th>						  
-						</tr>
-					</thead>
-					<tbody id="tbleAppend">
-						<?php $SNo = 0;
-                              
-                              if(!empty($MRIRDetails))
-                               
-                               {
-                                   
-                                    foreach($MRIRDetails as $record)
-                                    {
-                                    	$SNo  =$SNo + 1;
-                                    	//print_r($MRIRDetails);
-                                       
-							              
-                            ?> 
-                        <tr id="<?php echo  $SNo?>">
-					    <td><?php echo $SNo?></td> 
-						<td><?php echo $record->MaterialCode?></td>
-						<input type="hidden" name="<?php echo 'MaterialCode'.$SNo ?>" id="<?php echo 'MaterialCode'.$SNo ?>"  value=" <?php echo $record->MaterialCode ?> "/>
-						<input type="hidden" name="<?php echo 'Lineitm'.$SNo ?>" id="<?php echo 'Lineitm'.$SNo ?>"  value=" <?php echo $record->MRIRItemNo ?> "/>
-						<td><?php echo $record->MaterialName?></td>
-						<td><?php echo $record->UOM?></td>
-						<td class="num"><?php echo $record->Quantity?></td>
-						<td class="num"><?php echo $record->QuantityAsPerInvoice?></td>
-						<input type="hidden" name="<?php echo 'QuantityAsPerInvoice'.$SNo ?>" id="<?php echo 'QuantityAsPerInvoice'.$SNo ?>" />
-						<td class="num" id="<?php echo 'ActualQuantityReced'.$SNo ?>"><?php echo $record->ActualQuantityReceived ?></td>
-						<input type="hidden" name="<?php echo 'ActualQuantityReceived'.$SNo ?>" id="<?php echo 'ActualQuantityReceived'.$SNo ?>" value="<?php echo $record->ActualQuantityReceived ?>"/>
-						<td><input type="text" id="<?php echo 'AcceptQuantity'.$SNo;?>" name="<?php echo 'AcceptQuantity'.$SNo;?>" onchange="setaccept('<?php echo $SNo;?>');" value="<?php echo $record->QuantityAccepted?>"></td>
-						<input type="hidden" name="<?php echo 'QuantityAccepted'.$SNo ?>" id="<?php echo 'QuantityAccepted'.$SNo ?>" />
-						<td><input type="text" id="<?php echo 'RejectQuantity'.$SNo;?>" name="<?php echo 'RejectQuantity'.$SNo;?>" onchange="setreject('<?php echo $SNo;?>');" value="<?php echo $record->QuantityRejected?>"></td>
-						<input type="hidden" name="<?php echo 'QuantityRejected'.$SNo ?>" id="<?php echo 'QuantityRejected'.$SNo ?>" />
-						<td><input type="text" id="<?php echo 'Remark'.$SNo ?>" name="<?php echo 'Remark'.$SNo ?>" onchange="setremark('<?php echo $SNo;?>');"></td>
-						<input type="hidden" name="<?php echo 'Remarks1'.$SNo ?>" id="<?php echo 'Remarks1'.$SNo ?>" />
-					</tr> 
-                        <?php 
-						// $SNo++;
-							
-					} 
-				}
-					$RowCount = $SNo;
-
-					 ?>						
-					</tbody>					
-				</table>
-				<div class="col-md-1 col-md-offset-10">
-                        <?php if($MRIRStatus == MRIR_CREATED)
-						{ ?>							
-						<a class="btn btn-primary" type="submit" onclick="updatemrir()">Update MRIR</a>
-						<?php } else {?>
-						<a class="btn btn-primary" onclick="Redirect()">OK</a>
-						<?php } ?>
-						<input type="hidden" name="RowCount" id="RowCount" value="<?php echo $RowCount ?>" />
-						<input type="hidden" name="MRIRNO" id="MRIRNO " value="<?php echo $MRIRNO ?>" />
-						<input type="hidden" name="status" id="status"  />
-				</div>
-		</div> 
-			
-	</div>
-       </div>   
-	 
-	</section>
-</div>
- <script>
-function Redirect()
-{
-	window.location ="ViewMRIR";
-}
-<!-- script for table , It works under the datatable plugin-->
- $(function () { 
-    $('#Inwardgateregistertable').DataTable({
-      "paging": false,
-      "lengthChange": false,
-      "searching": false,
-      "ordering": false,
-      "info": false,
-      "autoWidth": false
-	   
-    }); 
-  });
-
-  </script>
-  <script>
-function validate()
-{
-	var rowcount = $("#RowCount").val();
-		
-	var Noval = 0;
-	var isExceed = 0;
-	for(k=1;k<=rowcount ; k++)	
-	{
-		
-		var tr= document.getElementById(k);
-		var ActualQty = 0.0;
-	
-	
-		var cellval = tr.cells;
-	 
-	    ActualQty =  parseFloat(cellval[6].innerHTML);
-		
-		var AcceptQuantity =  parseFloat( $('#AcceptQuantity'+k).val() == '' ? '0.00' : $('#AcceptQuantity'+k).val()); 
-		
-		var RejectedQuantity =  parseFloat( $('#RejectQuantity'+k).val() == '' ? '0.00' : $('#RejectQuantity'+k).val()); 
-		
-		 if(AcceptQuantity != '0.00')
-		 {
-			 
-			 if(ActualQty < (AcceptQuantity+RejectedQuantity))
-			 {
-				isExceed = 1;				
-				return false;
-			 }
-			 Noval = 1;
-		 }
-		 else if(RejectedQuantity != 0)
-		 {
-			 if(ActualQty < (AcceptQuantity+RejectedQuantity))
-			 {
-				isExceed = 1;				
-				return false;
-			 }
-			 // Noval = 1;
-		 }
-	}
-	//alert(Noval);
-	if (Noval == 0 )
-	{
-		
-		alert('Accepted Quantity/ Rejected Quantity  is Empty.Please Enter the value');
-		return false;
-
-    }
-	else if(isExceed == 1 ){
-
-		alert("Accept/Reject Quantity is exceeding the Actual Quantity.Please correct the value to procced further ")
-		return false;
-    }	
-	else  
-	{
-	 return true;
-	}
-}
-function setaccept(rowId)
-{
-	
-	var accept = parseFloat($('#AcceptQuantity'+rowId).val());
-	 var tr= document.getElementById(rowId);
-	  var Actulqty = 0.0;
-	
-	
-	 var cellval = tr.cells;
-	 
-	  Actulqty =  parseFloat(cellval[6].innerHTML);
-	  
-		
-	var qtyAsperchellan = parseFloat($('#QuantityAsPerInvoice'+rowId).val());
-	var rejected = (Actulqty - accept);
-	
-	$('#RejectQuantity'+rowId).val(rejected) ;
-	$('#QuantityRejected'+rowId).val(rejected) ;
-	$('#QuantityAccepted'+rowId).val(accept) ;
-	
-	if(accept > Actulqty)
-	{
-				alert("Accept Quantity  is exceeding the Actual Quantity.Please change the AcceptQuantity ")
-				$("#AcceptQuantity"+rowId).focus();
-				$("#AcceptQuantity"+rowId).val('');
-				$("#RejectQuantity"+rowId).val('');
-				$("#QuantityRejected"+rowId).val('');
-    			return false;
-	}
-	else if(rejected > Actulqty )
-	{
-		        alert("Reject Quantity  is exceeding the Actual Quantity.Please change the AcceptQuantity ")
-				$("#RejectQuantity"+rowId).focus();
-				$("#RejectQuantity"+rowId).val('');
-				$("#QuantityRejected"+rowId).val('');
-				
-    			return false;
-	}
-	else
-	{
-	if(accept !='')
-	{
-		$('#status').val('<?php echo MRIR_APPROVED?>');
-	}
-	else
-	{
-		$('#status').val('<?php echo MRIR_REJECTED?>');
-	}
-	}
-	
-}
-
-function setreject(rowId)
-{
-	 var tr= document.getElementById(rowId);
-	  var Actulqty = 0.0;
-	
-	
-	 var cellval = tr.cells;
-	 
-	  Actulqty =  parseFloat(cellval[6].innerHTML);
-	var reject = parseFloat($('#RejectQuantity'+rowId).val());
-	if(reject > Actulqty )
-	{
-		        alert("Reject Quantity  is exceeding the Actual Quantity.Please change the AcceptQuantity ")
-				$("#RejectQuantity"+rowId).focus();
-				$("#RejectQuantity"+rowId).val('');
-				$("#QuantityRejected"+rowId).val('');
-				
-    			return false;
-	}
-}
-
-function setremark(rowId)
-{	
-	var remark = ($('#Remark'+rowId).val());
-	
-
-}
-</script>
-<script>
-function updatemrir()
- { 
- if(validate())
- {
- 	$('#content').loader('show');
- 	//alert("update function worked ");
- 	$.ajax({
- 		data:$('.MRIR').serialize(),
- 		type:"POST",
- 		url:"<?php echo base_url() ?>MRIRcontroller/updated_db",
-
-
- 		success:function(data){
- 			//alert("success function worked ");
- 			 if(data){
- 			 	$('#content').loader('hide');
- 			 	alert(data);
-				window.location ="ViewMRIR";
-			 }
- 			 else
- 			 {
- 			 	alert("value not updated");
- 			 }
-
- 		}//success function closed
-
- 	});//ajax function closed
- }
- }//update function closed
-
-</script>
\ No newline at end of file
diff --git a/application/views/EditservicePurchaseorder.php~ b/application/views/EditservicePurchaseorder.php~
deleted file mode 100644
index 8a5448fa..00000000
--- a/application/views/EditservicePurchaseorder.php~
+++ /dev/null
@@ -1,2803 +0,0 @@
-<?php 
-
-$DeliverOption='';
-		$SupId = '';
-        $SupName = '';
-		$Address = '';
-		$PODate = '';
-        
-		$DeliveryAddress ='';
-		$PONOStatus	 = 	'';
-		$PONO =  	'';
-		
-		$TotalCgst = 0.0;
-		$TotalSgst = 0.0;
-		$TotalIgst = 0.0;
-		$TotalSummary = 0.0;
-		$TotalBasicAmount = 0.0;
-		$ServiceDescription = '';
-                $OtherAmt = 0.0;
-$Deliverydt='';
-$DeliverSchedule='';
-$MaxPoDate = '';
-$AvlAmount = 0;
-$Value="&#8377;";
-
-$StatusName='';
-
-
-if(!empty($INRSYMBOL))
-{
-
-	foreach($INRSYMBOL as $INRS)
-	{
-      $INRSYM=$INRS->FontCode2000;
-
-	}
-}
-
-if(!empty($MaxPODate))
-{
-    foreach ($MaxPODate as $date)
-    {
-		$MaxPoDate = $date->PODate;
-              		
-	}
-}
-if(!empty($POMaster))
-{
-    foreach ($POMaster as $Req)
-    {
-
-		$SupId = $Req->SupplierID;
-        $SupName = $Req->SupplierName;
-		$Address = $Req->Address;
-		$pdt = new DateTime($Req->PODate);
-		$PODate =  $pdt->format('Y-m-d');
-		$DeliverOption = $Req->DeliveryOption;
-                $DeliverSchedule = $Req->DeliverySchedule;
-		$Ddt =	new DateTime($Req->DeliveryDate);
-		$Deliverydt =  $Ddt->format('Y-m-d');
-        
-		$DeliveryAddress =$Req->DeliveryAddress;
-		$PONOStatus	 = 	$Req->StatusCode;
-		$PONO = 	$Req->PONO;	
-		$ServiceDescription = $Req->ServiceDescription;	
-		
-      
-        $WrkStatus=$Req->ServiceWorkStatus;
-        $StatusName=$Req->StatusName;
-    }
-}
-
-
-if(!empty($RequistionDetails))
-{
-
-    foreach ($RequistionDetails as $ReqDet) 
-    {
-        // $Reqon=$ReqDet->ReqDate;
-        $Reqonn=new DateTime($ReqDet->ReqDate);
-        $Reqon=$Reqonn->format('Y-m-d');
-        $Requestedby=$ReqDet->Requestedby;
-        $RequesterName=$ReqDet->FirstName;
-        //$Status=$ReqDet->Status;
-    }
-}
-
-//echo "$WrkStatus";
-
-if(!empty($AvlBudAmt))
-{
-   
-		$AvlAmount = number_format($AvlBudAmt, 2, '.', '');		
-	
-}
-
-
-foreach ($PaymentTerms as $TER) 
-{
-    $Terms=$TER->PaymentTerms;
-}
-
-
-
-// foreach ($POSTATUS as $PST ) 
-// {
-//    $POStatus=$PST->StatusName;
-// }
-?>
-
-
-<script src="<?php echo base_url()?>assets/tinymce/js/tinymce/tinymce.min.js"></script>
-<script src="<?php echo base_url(); ?>assets/js/CreatePOValidation.js" type="text/javascript"></script>
-<script type="text/javascript">
-       tinymce.init({
-          selector: "textarea#ScopeOfWork",
-          
-           //plugins: "link image"
-        });
-      
-       </script>
-
- 
-<script>
-<script type="text/javascript">
-    var DelOpt = '<?php echo $DeliverOption; ?>';
-    var SchName = '<?php echo $DeliverSchedule; ?>';
-var DelDt = '<?php echo $Deliverydt; ?>';
-$(document).ready(function () {
-     if(DelOpt=="0"){
- $('#Deliverydtdiv').show();
-                    $('#Schedulediv').hide();
-$('#Deliverydt').val(DelDt);
- }
-
- else if(DelOpt=="1"){
- $('#Deliverydtdiv').hide();
-                    $('#Schedulediv').show();
-$('#Deliverydt').val('');
-
-$('#Scheduleby').val(SchName);
-}
-});
-</script>
-<script>
-     
-
-var RequistQuantity = '';
-var AvilBudAmt = '';
- var POMaxDate = '<?php echo $MaxPoDate;?>';
-  var d = new Date(POMaxDate);
-   var SelectedMaterialList = {
-    Mat: []
-};
- $(function() {   
-$("#PODate").datepicker({
-	minDate : d,
-	maxDate : 'now',
-	dateFormat: 'mm/dd/yy',changeMonth: true, changeYear: true,yearRange: '-100:+0'
-});
- $("#Deliverydt").datepicker({
-	minDate : 'now',	
-	dateFormat: 'mm/dd/yy',changeMonth: true, changeYear: true,yearRange: '0:+10'
-});	  
- $("#Requeston").datepicker({
-	//minDate : d,
-	maxDate : 'now',
-	dateFormat: 'mm/dd/yy',changeMonth: true, changeYear: true,yearRange: '-100:+0'
-});
-$('#drpSupplier').change(function() {
-    
- var id = $('#drpSupplier').val();
-
- $("#SupAddress").val('');
- 
-		if(id != '0')
-		{
-			var y = <?php echo json_encode($Suplist, JSON_PRETTY_PRINT) ?>;
-
-	 			
-		$.each(y, function(idx, obj) {
-			if(obj.SupplierID === id)
-			{
-				$("#SupAddress").val(obj.Address);
-				 $("#PaymentTerms").val(obj.PaymentID);
-               
-                
-                
-				
-			}
-			
-		});
-			
-		}
-		else
-		{
-			alert('Please select the SupplierID');
-			return false;
-		}
-  
-});	
-
-$('#ReqNo').change(function() {
-  
- var id = $('#ReqNo').val();
- $("#AvlBudAmt").val('');
-  $("#CostCenter").val('');
-  $("#MaterialCode").empty();
-  $("#deptName").val('');
- $("#UOM").val('');
-$("#Quantity").val('');
-$("#ItemName").val('');
-$("#Rate").val('');
-$("#txtBasicValue").val('');
- clearTaxField();
-		if(id != '0')
-		{
-			var y = <?php echo json_encode($RequistionDetails, JSON_PRETTY_PRINT) ?>;
-		
-			var Material = <?php echo json_encode($MaterialList, JSON_PRETTY_PRINT) ?>;
-			var AvlBudAmt = '<?php echo $AvlAmount ?>'; 
-			//ServiceTable
-                   var rows =  document.getElementById('ServiceTable').rows.length;
-
-if(DeletedMaterialCode!=undefined && DeletedMaterialCode!=''){
-  
-                                                                                $("#MaterialCode").append( $('<option></option>').val(DeletedMaterialCode).html(DeletedMaterialCode + "-" + DeletedMaterialName));
-
-}
-
-for(i=2;i<=rows;i++){
-
-//var j=1;
-  $.each(Material[i], function(idx, obj) {
-
-    // j=j+1;
-           var materialCode = $('#materialCode'+i);
-
-
-
-
-                                    if(obj.materialCode == materialCode )
-                                    {
-                                    $("#MaterialCode").val('');
-                                    }
-
-                                 
-                                
-                               else{
-                                                                                $("#MaterialCode").append( $('<option></option>').val(obj.MaterialCode).html(obj.MaterialCode + "-" + obj.MaterialName));
-
-                        }
-
-
-                    });
-
-
-
-
-}		// For Binding DepartmentName	           			
-		$.each(y, function(idx, obj) {
-			if(obj.ReqNo === id)
-			{
-				$("#deptName").val(obj.DepartmentName);
-				$("#CostCenter").val(obj.CostCenterCode);
-                                 if(obj.Service_Period!='' && obj.Service_Period!=null){
-                                $("#Frequency").val(obj.Service_Period +'-' + obj.NumberOfService);
-                                $("#FrequencyNo").val(obj.NumberOfService);
-                                
-                               }
-                           else{
-                            var text='One Time';
-                              $("#Frequency").val(text);
-                              $("#FrequencyNo").val(1);
-                               }
-			}			
-		});
-			$("#AvlBudAmt").val(parseFloat(AvlBudAmt).toFixed(2));	
-		// For Binding Material list center for the selected Requistion Number	
-		$("#MaterialCode").append( $('<option></option>').val("0").html("Select Material Code") );
-		var isAdded = "0";
-		 for(i=0;i<Material.length;i++)
-		{
-		$.each(Material[i], function(idx, obj) {
-			
-				if(obj.ReqNo === id )
-				{
-									   
-						$.each(SelectedMaterialList.Mat, function(idx1, el){															
-							if (id == el.ReqNo )
-							{
-															
-								if(el.materialCode == obj.MaterialCode)
-								{
-										isAdded  = "1";
-										return false;																		
-								}
-								else
-								{
-									isAdded  = "0";
-								}
-								
-							}
-					});
-					
-					 
-						if(isAdded  == "0")
-						{
-
-							
-							$("#MaterialCode").append( $('<option></option>').val(obj.MaterialCode).html(obj.MaterialCode + "-" + obj.MaterialName));
-						}
-												
-				}
-			
-			
-		});
-		}
-		}
-		else
-		{
-			alert('Please select the Requisition Number');
-			return false;
-		}
-		id = '';
-  
-});
-	
-$('#MaterialCode').change(function() {
-    
- var id = $('#MaterialCode').val();
- RequistQuantity = '';
- clearTaxField();
-		if(id != '0')
-		{
-			var y = <?php echo json_encode($MaterialList, JSON_PRETTY_PRINT) ?>;
-			
-	   for(i=0;i<y.length;i++)
-                    {
-		$.each(y[i], function(idx, obj) {
-
-			if(obj.MaterialCode == id)
-			{
-                         
-                               
-				$("#ItemName").val(obj.MaterialName);
-				$("#UOM").val(obj.UOM);
-				$("#Quantity").val(obj.Quantity);
-				RequistQuantity	= 	obj.Quantity;		
-			}			
-		});
-                }			
-		}
-		else
-		{
-			alert('Please select the MaterialCode');
-			return false;
-		}
-  
-});
-$('#EditMaterialCode').change(function() {
-    
- var id = $('#EditMaterialCode').val();
-
- $("#EditItemName").val('');
-$("#EditUOM").val('');
-$("#EditQuantity").val('');
-//$("#EditRate").val('');
-//$("#txtEditBasicValue").val('');
- RequistQuantity = '';
- //clearEditTaxField();
-		if(id != '0')
-		{
-			var Material = <?php echo json_encode($MaterialList, JSON_PRETTY_PRINT) ?>;
-			
-	  for(i=0;i<Material.length;i++)
-		{
-		$.each(Material[i], function(idx, obj) {
-			if(obj.MaterialCode === id)
-			{
-
-				$("#EditItemName").val(obj.MaterialName);
-				$("#EditUOM").val(obj.UOM);
-				$("#EditQuantity").val(obj.Quantity);
-				RequistQuantity	= 	obj.Quantity;		
-			}			
-		});			
-		}
-		
-		}
-		else
-		{
-			alert('Please select the MaterialCode');
-			return false;
-		}
-  
-});
-
-});
-
-function Ratechange(){
-	 
-		if($('#ReqNo').val() == "0")
-		 {
-			 alert('Please select the Requisition Number');
-			 $('#ReqNo').focus();
-			 return false;
-		 }
-		 else if($('#MaterialCode').val() == "0")
-		 {
-			alert('Please select the Material Code');
-			$('#MaterialCode').focus();
-		   return false;
-		 }
-		 else if($('#CostCenter').val() == "0")
-		 {
-				alert('Please select the CostCenterCode');
-				$('#CostCenter').focus();
-			return false;
-		 }
-	 ExceedQuantityCheck();
-	  
-	 if($('#Quantity').val() != '' && $('#Rate').val() != '')
-	 {	  
-      var txtQuantity = parseFloat( $('#Quantity').val());
-	  var txtUnitPrice = parseFloat($('#Rate').val());
-          var frequencyValue = parseFloat($('#FrequencyNo').val());
-	  var Tot =  txtQuantity * frequencyValue * txtUnitPrice;
-	  $('#txtBasicValue').val(parseFloat(Tot).toFixed(2));
-	  
-	 //Service Tax calculation
-        
-        $('#AfterCgst').val(calculateCgstTax($('#txtBasicValue').val(),$('#Cgst').val()));
-        $('#AfterSgst').val(calculateSgstTax($('#txtBasicValue').val(),$('#Sgst').val()));
-         $('#AfterIgst').val(calculateIgstTax($('#txtBasicValue').val(),$('#Igst').val()));
-	
-
-	 calculateTotalOrdervalue();
-	 
-	 var res = ExceedBudget($('#TotalOrderValue').val(), $('#AvlBudAmt').val());
-      if(!res)
-	  {
-		 $('#Rate').focus();
-		 return false;
-	  }
-	 }
-	 
-}
-
-function EditRatechange(){
-	 
-		if($('#EditCostCenter').val() == "0")
-		 {
-				alert('Please select the CostCenterCode');
-				$('#EditCostCenter').focus();
-			return false;
-		 }
-	 EditExceedQuantityCheck();
-	  
-	 if($('#EditQuantity').val() != '' && $('#EditRate').val() != '')
-	 {	  
-      var txtQuantity = parseFloat( $('#EditQuantity').val());
-	  var txtUnitPrice = parseFloat($('#EditRate').val());
-         var frequencyValue = parseFloat($('#EditFrequencyNo').val());
-
-	  var Tot =  txtQuantity * frequencyValue * txtUnitPrice
-	  $('#txtEditBasicValue').val(parseFloat(Tot).toFixed(2));
-	    ExceedBudget(Tot, $('#EditAvlBudAmt').val());	 
-	 
-	 
-        $('#EditAfterCgst').val(calculateCgstTax($('#txtEditBasicValue').val(),$('#EditCgst').val()));
-        $('#EditAfterSgst').val(calculateSgstTax($('#txtEditBasicValue').val(),$('#EditSgst').val()));
-         $('#EditAfterIgst').val(calculateIgstTax($('#txtEditBasicValue').val(),$('#EditIgst').val()));
-	  calculateTotalEditOrdervalue();
-	 }
-	 
-}
-
-function ExceedQuantityCheck()
- {
-	var EnterQuantity =   $("#Quantity").val()== '' ? "0.00" :  parseFloat($("#Quantity").val());
-	var ReqQuantity = parseFloat(RequistQuantity);
-	if(EnterQuantity > ReqQuantity)
-	{
-		 alert('Your exceeding the Quantity from the Requisition Quantity:'+ RequistQuantity  +'.Please adjust the Quantity to proceed further.');
-		
-		  $('#Quantity').focus();
-		 return false;
-	}
-	else {
-		return true;
-	}
- }
- function EditExceedQuantityCheck()
- {
-	// RequistQuantity
-	var EnterQuantity =   $("#EditQuantity").val()== '' ? "0.00" :  parseFloat($("#EditQuantity").val());
-	var ReqQuantity = parseFloat(RequistQuantity);
-	//alert(ReqQuantity);
-	if(EnterQuantity > ReqQuantity)
-	{
-		 alert('Your exceeding the Quantity from the Requisition Quantity:'+ RequistQuantity  +'.Please adjust the Quantity to proceed further.');
-		
-		  $('#EditQuantity').focus();
-		 return false;
-	}
- }
- 
- function ExceedBudget(ValuetoCheck,budgetAmount)
- {
-	 var ReqAmount = parseFloat(ValuetoCheck);
-	 var BudAmount = parseFloat(budgetAmount);
-	 
-	 if(ReqAmount > BudAmount )
-	 {
-		alert('Your exceeding the Avaiable Budget :'+ AvilBudAmt  +'.Please adjust the Product to proceed further.');
-		return false; 
-	 }
-	 else
-	 {
-		 return true;
-	 }
- }
- function calculateServiceTax(varBasicValue)
- {
-	
-		 var basicValue = parseFloat(varBasicValue);
-			 
-		 var ServiceTaxValue = 0.0;  
-		 
-		 ServiceTaxValue = <?php echo SERVICETAX_SERVICETAX_14PERCENT; ?>;
-		
-	     var TAXval =  parseFloat(ServiceTaxValue).toFixed(2);
-	 
-		return   TAXval;//  $('#AfterServiceTax').val(TAXval); 
-		 
- }
-  function calculateEduess(varAfterServiceTax)
- {
-		 var ServiceTaxAmount = parseFloat(varAfterServiceTax);
-			 
-		 var ServiceTaxValue = 0.0;  
-		 
-		 ServiceTaxValue = <?php echo SERVICETAX_EDUCESS_2PERCENT; ?>;
-		
-	     var TAXval =  parseFloat(ServiceTaxValue).toFixed(2);
-	 
-		 return TAXval;// $('#AfterEduCess').val(TAXval); 
- }
-   function calculateHigherEdu(varAfterServiceTax)
- {
-	     var ServiceTaxAmount = parseFloat(varAfterServiceTax);
-			 
-		 var ServiceTaxValue = 0.0;  
-		 
-		 ServiceTaxValue = <?php echo SERVICETAX_HIGHEREDUCESS_1PERCENT; ?>;
-		
-	     var TAXval =  parseFloat(ServiceTaxValue).toFixed(2);
-	 
-		  return TAXval;//$('#AfterSecHighTax').val(TAXval); 
- }
- function calculateKrishiKalyantax(varBasicValue)
- {
-	     var basicValue = parseFloat(varBasicValue);
-			 
-		 var ServiceTaxValue = 0.0;  
-		 
-		 ServiceTaxValue = <?php echo SERVICETAX_KRISHIKALYAN; ?>;
-		
-	     var TAXval =  parseFloat(ServiceTaxValue).toFixed(2);
-	 
-		 return TAXval;//$('#AfterKrishiTax').val(TAXval); 
- }
- function calculateSwachhBharattax(varBasicValue)
- {
-		var basicValue = parseFloat(varBasicValue);
-			 
-		 var ServiceTaxValue = 0.0;  
-		 
-		 ServiceTaxValue = <?php echo SERVICETAX_SWACHHBHARAT; ?>;
-		
-	     var TAXval =  parseFloat(ServiceTaxValue).toFixed(2);
-	 
-		return TAXval; //$('#AfterSwachhTax').val(TAXval); 
- }
- 
- function calculateTotalOrdervalue()
- {
-	var basicValue = parseFloat($('#txtBasicValue').val());
-	var Cgst = parseFloat($('#AfterCgst').val());
-	var Sgst = parseFloat($('#AfterSgst').val());
-	var Igst = parseFloat($('#AfterIgst').val());
- var OtherAmt = parseFloat($('#OtherAllowances').val());
-
-	var TotAmt = basicValue + Cgst+ Sgst + Igst + OtherAmt;
-
-	$('#TotalOrderValue').val( parseFloat(TotAmt).toFixed(2));   
-		 
- }
- function calculateTotalEditOrdervalue()
- {
-	var basicValue = parseFloat($('#txtEditBasicValue').val());
-	var Cgst = parseFloat($('#EditAfterCgst').val());
-	var Sgst = parseFloat($('#EditAfterSgst').val());
-	var Igst = parseFloat($('#EditAfterIgst').val());
-         var OtherAmt = parseFloat($('#EditOtherAllowances').val());
-
-	var TotAmt = basicValue + Cgst+ Sgst + Igst + OtherAmt;
-
-	$('#EditTotalOrderValue').val( parseFloat(TotAmt).toFixed(2));
-
-		 
- }
- 
- function calculateTaxValue()
- {
-	var Cgst = parseFloat($('#AfterCgst').val());
-	var Sgst = parseFloat($('#AfterSgst').val());
-	var Igst = parseFloat($('#AfterIgst').val());
-
-	var TottaxAmt = Cgst+ Sgst + Igst;
-	return parseFloat(TottaxAmt).toFixed(2); 
- }
- 
-function clearTaxField()
-{
-	$('#txtBasicValue').val('');
-	$('#AfterCgst').val(0);
-	$('#AfterSgst').val(0);
-	$('#AfterIgst').val(0);
-	$('#Cgst').val(0);
-	$('#Sgst').val(0);
-        $('#Igst').val(0);
-	$('#TotalOrderValue ').val('');
-	$('#Rate').val(0);
-	
-	$("#ItemName").val('');
-	$("#UOM").val('');
-	$("#Quantity").val('');
-	RequistQuantity	= '';	
-	
-}
-function clearEditTaxField()
-{
-	$('#txtEditBasicValue').val('');
-	$('#EditAfterEduCess').val('');
-	$('#EditAfterSecHighTax').val('');
-	$('#EditAfterServiceTax').val('');
-	$('#EditAfterKrishiTax').val('');
-	$('#EditAfterSwachhTax').val('');
-	$('#EditTotalOrderValue ').val('');
-	$('#EditRate').val('');
-	
-	$("#EditItemName").val('');
-	$("#EditUOM").val('');
-	$("#EditQuantity").val('');
-	RequistQuantity	= 	'';	
-	
-}
-$(document).ready(function () {
-                $('#Date').click(function () {
-                    //for Date range selection
-                    $('#Schedulediv').hide();
-                    $('#Deliverydtdiv').show();
-                });
-                $('#Schedule').click(function () {
-                    //for schedule range selection
-                    $('#Deliverydtdiv').hide();
-                    $('#Schedulediv').show();
-                });
-            });
-</script>
-<style>
-.modal
-{
-	padding-right:25% ! important;
-}
-.num {
-	text-align:right;
-}
-</style>
-<div class="content-wrapper">
-     <?php
-                      $attributes = array('class' => 'form-label-left ServicePO ','name'  => 'ServicePO','id'  => 'ServicePO');
-                        
-                        echo form_open($this->config->base_url().'/purchaseorder/addPO/',$attributes); ?>
- 
-	 <section class="content">
-         <div id="content"></div>
-		<div style="border:2px solid #333">
-			<div id="content"></div>
-			<div><center><b><h2>Siddharth Industries - Edit Service Purchase Order - <?php echo $PONO;?></h2></b></center></div>
-			<div class="container-fluid">		
-							<div class="row">
-						<div class="col-md-12">
-							<div class="col-md-3">
-								<div class="col-md-12">
-									<label>Requistion No</label>
-												 
-												
-													<?php
-													 
-													  $options = array("0"=>'Selected Requisition Numbers'); 
-														 if(!empty($ReqList))
-												{
-												foreach ($ReqList as $SID):
-												  
-													   $options[$SID->ReqNo] = $SID->ReqNo ;
-												   endforeach;
-												}	
-													echo form_multiselect('RequistionNo', $options,set_value('RequistionNo'),'id="RequistionNo"' , 'required="true"');
-
-													?>
-									</div>
-								<div class="col-md-12">
-										<label>Purchase Order Date</label>
-												<div class="form-group">
-															<?php
-													 $data = array('name' => 'PODate','value' => set_value('PODate',$PODate),'id'=>'PODate',  'class' => 'form-control num' ,'required' => 'true','onkeypress'=>'return false;');
-													echo form_input($data);
-													?>   							    
-												</div>
-								</div>							
-												 
-							</div>
-							<div class="col-md-9" style="padding:0px;">
-							<div class="col-md-4">
-								<div class="col-md-12">
-									<label>Supplier</label>
-										  <?php
-											$options = array("0"=>'Select Supplier');     
-											//print_r(  $options);
-											
-											if(!empty($Suplist))
-											{
-											foreach ($Suplist as $SID):
-											  
-										   
-											  $options[$SID->SupplierID] =  $SID->SupplierID.' '.' - '.' '.$SID->SupplierName;
-
-											endforeach;
-											}										
-								
-											echo form_dropdown('drpSupplier', $options,set_value('drpSupplier',$SupId ),'id="drpSupplier"'  ,'required="true"' ,'class="form-control select2');
-
-											?>						 
-										 
-								</div>
-								<div class="col-md-12"><br/>
-									<label>Address</label>
-										<div class="form-group">
-													<?php
-											 $data = array('name' => 'SupAddress','value' => set_value('SupAddress',$Address),'id'=>'SupAddress',  'class' => 'form-control' ,'readonly' => 'true','rows' => '3', 'cols' => '40');
-											echo Form_textarea($data);
-											?>   
-										</div>
-								</div>
-							</div>
-							<div class="col-md-4">
-								<div class="col-md-12">
-									 <label>Purchase Order Type</label>
-											<div class="form-group">
-											
-														<?php
-												 $data = array('name' => 'POType','value' => set_value('POType',SERVICE),'id'=>'POType',  'class' => 'form-control' ,'readonly' => 'true');
-												echo form_input($data);
-												?>   
-											</div>
-								</div>
-								<div class="col-md-12">
-									 <label>Delivery Address</label>
-										<div class="form-group">
-													<?php
-											 $data = array('name' => 'DeliveryAddr','value' => set_value('DeliveryAddr',$DeliveryAddress),'id'=>'DeliveryAddr',  'class' => 'form-control' ,'required' => 'true', 'rows' => '3', 'cols' => '40');
-											echo Form_textarea($data);
-											?><input type="hidden" name="txtDeliveryAddress" id="txtDeliveryAddress"  value="<?php echo $DeliveryAddress;?>"> 
-											   
-										</div>
-								</div>
-							</div>
-							<div class="col-md-4" style="padding:0px;">
-								<div class="col-md-6" style="padding:0px;">
-									<b><u>Select Delivery By</u></b><br/>
-										<tr>
-											<td>
-												  <?php echo form_label('Date', 'Date') . "&nbsp;&nbsp;". form_radio(array('name' => 'DateRange', 'value' => '0', 'checked' => ('0' == $DeliverOption) ? TRUE : FALSE, 'id' => 'Date')); ?>
-											</td>
-
-											<td>
-												  <?php echo form_label('Schedule', 'Schedule') . "&nbsp;&nbsp;". form_radio(array('name' => 'DateRange', 'value' => '1', 'checked' => ('1' == $DeliverOption) ? TRUE : FALSE, 'id' => 'Schedule')); ?>
-												 
-											</td>					   
-										</tr>
-								</div>
-								<div class="col-md-6">
-									<label>Work Status</label>
-									   <?php
-								
-									
-						
-						                if(!empty($WorkStatus))
-						                  {
-
-                                                               foreach ($WorkStatus as $WorkSID):
-						   if($WrkStatus==$WorkSID->StatusCode){
-                                                       $optionsWork[$WorkSID->StatusCode] =  $WorkSID->StatusName;
-                                                         }
-                                           
-
-						                    endforeach;
-						                    foreach ($WorkStatus as $SID):
-						   if($WrkStatus!=$SID->StatusCode){
-                                                       $optionsWork[$SID->StatusCode] =  $SID->StatusName;
-                                                         }
-                                           
-
-						                    endforeach;
-						                  }										
-			
-						echo form_dropdown('workstatus', $optionsWork,set_value('workstatus'),'id="workstatus"'  ,'required="true"' ,'class="form-control select2');
-
-											?>	
-								</div>
-								<div class="col-md-12" id="Deliverydtdiv"><br/>
-									<label>Delivery Date</label>
-										<div class="form-group">
-													<?php
-											 $data = array('name' => 'Deliverydt','value' => set_value('Deliverydt',$Deliverydt),'id'=>'Deliverydt',  'class' => 'form-control num' ,'required' => 'true', 'onkeypress'=>'return false;');
-											echo form_input($data);
-											?>   
-										</div>
-								</div>
-								<div class="col-md-12" id="Schedulediv" style="display:none;"><br/>
-										<label >Schedule :</label>					 
-										<?php
-										$data = array('name' => 'Scheduleby','value' => set_value('Scheduleby'),'id'=>'Scheduleby',  'class' => 'form-control' ,'required' => 'true' ,'rows' => '3', 'cols' => '40');
-										echo Form_textarea($data);
-										?>
-
-								</div>
-							</div>
-							
-						</div>
-							<div class="col-md-12">
-								<legend>Payment Details</legend>
-							<!-- Text input-->
-								<div class="col-md-4">
-			    <label>Payment Terms</label> 
-				  
-                                            <?php
-                                                       
-                                                
-                                               
-                                                    if(!empty($Payment))
-                                                    {
-                                                 
-                                                foreach ($Payment as $pay2):
-                                                      
-                                                     if($Terms==$pay2->PaymentID){
-                                                     
-                                                       $optionsPay[$pay2->PaymentID] =  $pay2->PaymentTerms;
-                                                       
-                                                     }
-                                                    endforeach;
-                                                     foreach ($Payment as $pay1):
-                                                      
-                                                     if($Terms!=$pay1->PaymentID){
-                                                     
-                                                       $optionsPay[$pay1->PaymentID] =  $pay1->PaymentTerms;
-                                                       
-                                                     }
-                                                    endforeach;
-                                                    }										
-
-                                                    echo form_dropdown('PaymentTerms', $optionsPay,set_value('PaymentTerms'),'id="PaymentTerms"'  ,'required="true"' ,'class="form-control select2');
-
-                                                    ?>
-              
-
-                                    
-
-            </div>
-								 
-							</div>
-						</div>
-						</div>	
-							<div class="container-fluid">   	 
-						<div style="padding-right:10px">
-						<div align="right">
-							<a data-toggle="modal" ><button type="submit"  onclick="myFunction();" class="btn btn-primary" id="abcd" >Select Line Item</button> </a> 
-				  
-							<!-- Model for servicepo -->
-							<div class="modal fade" id="SERVICE" role="dialog">
-								<div class="modal-dialog">
-							   <!-- Modal content-->
-							 <form>
-								  <div class="modal-content" style="width:900px;">
-									<div class="modal-header" style="background-color: #3c8dbc;color:#fff;"> 
-									  <center><h4>Add Service Purchase Order Item </h4></center>				
-									</div>
-									<div align="left"> 
-									 
-											<div class="col-md-12">
-														 <div class="col-md-3">
-														 <label>Req No</label>
-																	<div>
-																		 <?php
-																			$RL = array("0"=>'Select Req No');     
-																			if(!empty($RequistionDetails))
-																			{
-																			foreach ($RequistionDetails as $SID):			   
-																				$RL[$SID->ReqNo] =  $SID->ReqNo.' '.' - '.' '.$SID->DepartmentName;
-																			endforeach;
-																			}
-															
-																			echo form_dropdown('ReqNo', $RL,set_value('ReqNo'),'id="ReqNo"' ,'class="form-control"');
-
-																		?>						 
-																	</div>
-																</div>
-														 
-														  <div class="col-md-3">
-														   <label>Department Name</label>
-																	<div class="form-group">
-																				<?php
-																		 $data = array('name' => 'deptName','value' => set_value('deptName'),'id'=>'deptName',  'class' => 'form-control');
-																		echo form_input($data);
-																		?>   
-																	</div>
-														 </div>
-														  <div class="col-md-3">
-														   <label>Cost Center Name</label>
-																	<div class="form-group">
-																				<?php
-														$data = array('name' => 'CostCenter','value' => set_value('CostCenter'),'id'=>'CostCenter',  'class' => 'form-control' ,'readonly' => 'true');
-																				echo form_input($data);
-
-														?>		
-																	</div>
-														 </div>
-														  <div class="col-md-3">
-														   <label>Avail Budget Amount In INR</label>
-																	<div class="form-group">
-																				<?php
-																		 $data = array('name' => 'AvlBudAmt','value' => set_value('AvlBudAmt'),'id'=>'AvlBudAmt',  'class' => 'form-control num' ,'readonly' => 'true');
-																		echo form_input($data);
-																		?>   
-																	</div>
-														 </div>
-										 </div>
-											<div class="col-md-12">
-														<div class="col-md-3">
-														  <label>Item Code</label>
-																	<div>
-																		 <?php
-																		$options = array("0"=>'Item Code');     
-																		//print_r(  $options);
-																		
-																											
-															
-																		echo form_dropdown('MaterialCode', $options,set_value('MaterialCode'),'id="MaterialCode"' ,'class="form-control"');
-
-																		?>						 
-																	</div>
-													   </div>
-														<div class="col-md-3">
-														  <label>Item Name</label>
-																	<div class="form-group">
-																				<?php
-																		 $data = array('name' => 'ItemName','value' => set_value('ItemName'),'id'=>'ItemName',  'class' => 'form-control' ,'readonly' => 'true');
-																		echo form_input($data);
-																		?>   
-																	</div>
-														 </div>
-														 <div class="col-md-6">
-															<label>Service Description </label>	<?php
-																 $data = array('name' => 'txtSpcialInstruction','value' => set_value('txtSpcialInstruction'),'id'=>'txtSpcialInstruction',  'class' => 'form-control');
-																echo form_input($data);
-																?>  
-																
-														</div>
-														
-										</div>
-											<div class="col-md-12">
-											<div class="col-md-2">
-														  <label>UOM</label>
-																	<div class="form-group">
-																				<?php
-																		 $data = array('name' => 'UOM','value' => set_value('UOM'),'id'=>'UOM',  'class' => 'form-control' ,'readonly' => 'true');
-																		echo form_input($data);
-																		?>   
-																	</div>
-														 </div>
-														<div class="col-md-2">
-														  <label>Frequency</label>
-																	<div>
-																		<?php
-																		 $data = array('name' => 'Frequency','value' => set_value('Frequency'),'id'=>'Frequency',  'class' => 'form-control','readonly' => 'true' );
-																		echo form_input($data);
-																		?> 
-                                                                       <input type="hidden" name="FrequencyNo" id="FrequencyNo" value="FrequencyNo" />
-																	</div>
-													   </div>
-														<div class="col-md-2">
-														  <label>Quantity</label>
-																	<div class="form-group">
-																				<?php
-																		 $data = array('name' => 'Quantity','value' => set_value('Quantity'),'id'=>'Quantity',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'Ratechange()');
-																		echo form_input($data);
-																		?>   
-																	</div>
-														 </div>
-														 <div class="col-md-2">
-														  <label><?php echo "Rate ($INRSYM)";?></label>
-																	<div class="form-group">
-																				<?php
-																		 $data = array('name' => 'Rate','value' => set_value('Rate'),'id'=>'Rate',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);' ,'onchange'=>'Ratechange()' );
-																		echo form_input($data);
-																		?>   
-																	</div>
-														 </div>
-														 <div class="col-md-4">
-														  <label><?php echo "Basic Amount ($INRSYM)"?></label>
-																	<div class="form-group">
-																				<?php
-																		 $data = array('name' => 'txtBasicValue','value' => set_value('txtBasicValue'),'id'=>'txtBasicValue',  'class' => 'form-control num' ,'readonly' => 'true');
-																		echo form_input($data);
-																		?>   
-																	</div>
-														 </div>
-										 
-										</div>
-						 
-							<div class="col-md-12">
-								<div class="col-md-6" align="right">
-										 
-							CGST In %
-								</div>	
-								
-								<div class="col-md-3">
-										 <div class="form-group">
-										 
-															<?php
-													 $data = array('name' => 'Cgst','value' => set_value('Cgst',0),'id'=>'Cgst',  'class' => 'form-control num' ,'placeholder' => 'CGST TAX PERCENTAGE','onchange'=>'Ratechange()');
-													echo form_input($data);
-													?>   
-												</div>
-						 
-								</div>	
-								<div class="col-md-3">
-										 <div class="form-group">
-										 
-															<?php
-													 $data = array('name' => 'AfterCgst','value' => set_value('AfterCgst'),'id'=>'AfterCgst',  'class' => 'form-control num' ,'placeholder' => 'After CGST','readonly' => 'true');
-													echo form_input($data);
-													?>   
-												</div>
-						 
-								</div>						
-					 
-							</div>		 
-							<div class="col-md-12">
-								<div class="col-md-6" align="right">
-										 
-							SGST In %
-								</div>	
-								
-								<div class="col-md-3">
-										 <div class="form-group">
-										 
-															<?php
-													 $data = array('name' => 'Sgst','value' => set_value('Sgst',0),'id'=>'Sgst',  'class' => 'form-control num' ,'placeholder' => 'SGST TAX PERCENTAGE','onchange'=>'Ratechange()');
-													echo form_input($data);
-													?>   
-												</div>
-						 
-								</div>	
-								<div class="col-md-3">
-										 <div class="form-group">
-										 
-															<?php
-													 $data = array('name' => 'AfterSgst','value' => set_value('AfterSgst'),'id'=>'AfterSgst',  'class' => 'form-control num' ,'placeholder' => 'After SGST','readonly' => 'true');
-													echo form_input($data);
-													?>   
-												</div>
-						 
-								</div>						
-					 
-							</div>
-					 
-							<div class="col-md-12">
-								<div class="col-md-6" align="right">
-										 
-							IGST In %
-								</div>	
-								
-								<div class="col-md-3">
-										 <div class="form-group">
-										 
-															<?php
-													 $data = array('name' => 'Igst','value' => set_value('Igst',0),'id'=>'Igst',  'class' => 'form-control num' ,'placeholder' => 'IGST TAX PERCENTAGE','onchange'=>'Ratechange()');
-													echo form_input($data);
-													?>   
-												</div>
-						 
-								</div>	
-								<div class="col-md-3">
-										 <div class="form-group">
-										 
-															<?php
-													 $data = array('name' => 'AfterIgst','value' => set_value('AfterIgst'),'id'=>'AfterIgst',  'class' => 'form-control num' ,'placeholder' => 'After IGST','readonly' => 'true');
-													echo form_input($data);
-													?>   
-												</div>
-						 
-								</div>						
-					 
-							</div>
-											
-						 
-						<div class="col-md-12">
-												 <div class="col-md-5 col-md-offset-4" align="right">
-													<label>Other Allowances In INR</label>		 
-															</div>	
-												<div class="col-md-3">
-																	 <div class="form-group">
-																							<?php
-																					 $data = array('name' => 'OtherAllowances','value' => set_value('OtherAllowances',0),'id'=>'OtherAllowances',  'class' => 'form-control num' ,'placeholder' => 'Other Allowances','onchange'=>'Ratechange()');
-																					echo form_input($data);
-																					?>   
-																				</div>
-																	 </div>
-											</div>
-										<div class="col-md-12">
-												 <div class="col-md-5 col-md-offset-4" align="right">
-													<label><?php echo "Total Order Value ($INRSYM)";?></label>		 
-															</div>	
-												<div class="col-md-3">
-																	 <div class="form-group">
-																							<?php
-																					 $data = array('name' => 'TotalOrderValue','value' => set_value('TotalOrderValue'),'id'=>'TotalOrderValue',  'class' => 'form-control num' ,'placeholder' => 'Total value','readonly' => 'true');
-																					echo form_input($data);
-																					?>   
-																				</div>
-																	 </div>
-											</div>
-									
-							
-									<div class="modal-footer">
-									<div class="col-md-12">
-									<a class="btn btn-primary font AddService"  ID="AddService" ><i class="fa fa-plus"></i>&nbsp;&nbsp;<span class="bold">Add Service</span></a>
-												<a class="btn btn-primary" data-dismiss="modal"  value="Cancel">Cancel</a>
-									</div>
-									</div>
-								  </div>
-								 </form>
-									 
-								  </div>
-							</div>	
-						  </div>
-						   <!-- Edit Modal content-->
-							<div class="modal fade" id="EDITSERVICE" role="dialog">
-								<div class="modal-dialog">
-							   <!-- Modal content-->
-							 <form>
-								  <div class="modal-content" style="width:900px;">
-									<div class="modal-header" style="background-color: #3c8dbc;color:#fff;"> 
-									  <center><h4>Edit Service Purchase Order Item </h4></center>				
-									</div>
-									<div align="left"> 
-									 
-									<div class="col-md-12">
-												 <div class="col-md-3">
-												 <label>Req No</label>
-															<div>
-																 <?php
-																	
-																$data = array('name' => 'EditReqNo','value' => set_value('EditReqNo'),'id'=>'EditReqNo',  'class' => 'form-control','readonly'=>'true');
-																echo form_input($data);
-																?>	
-																
-															</div>
-														</div>
-												 
-												  <div class="col-md-3">
-												   <label>Department Name</label>
-															<div class="form-group">
-																		<?php
-																 $data = array('name' => 'EditdeptName','value' => set_value('EditdeptName'),'id'=>'EditdeptName',  'class' => 'form-control','readonly'=>'true');
-																echo form_input($data);
-																?>   
-															</div>
-												 </div>
-												  <div class="col-md-3">
-												   <label>Cost Center Name</label>
-															<div class="form-group">
-																		<?php
-												$data = array('name' => 'EditCostCenter','value' => set_value('EditCostCenter'),'id'=>'EditCostCenter',  'class' => 'form-control' ,'readonly' => 'true');
-																		echo form_input($data);
-
-												?>		
-															</div>
-												 </div>
-												  <div class="col-md-3">
-												   <label>Avail Budget Amount In INR</label>
-															<div class="form-group">
-																		<?php
-																 $data = array('name' => 'EditAvlBudAmt','value' => set_value('EditAvlBudAmt'),'id'=>'EditAvlBudAmt',  'class' => 'form-control num' ,'readonly' => 'true');
-																echo form_input($data);
-																?>   
-															</div>
-												 </div>
-								 </div>
-								 <div class="col-md-12">
-												  <div class="col-md-3">
-												  <label>Item Code</label>
-															<div>
-																 <?php
-																$options = array("0"=>'Item Code');     
-																//print_r(  $options);
-																
-																echo form_dropdown('EditMaterialCode', $options,set_value('EditMaterialCode'),'id="EditMaterialCode"' ,'class="form-control"');
-
-																?>						 
-															</div>
-											   </div>
-												<div class="col-md-3">
-												  <label>Item Name</label>
-															<div class="form-group">
-																		<?php
-																 $data = array('name' => 'EditItemName','value' => set_value('EditItemName'),'id'=>'EditItemName',  'class' => 'form-control' ,'readonly' => 'true');
-																echo form_input($data);
-																?>   
-															</div>
-												 </div>
-												  <div class="col-md-6">
-								<label>Service Description</label>	<?php
-									 $data = array('name' => 'EdittxtSpcialInstruction','value' => set_value('EdittxtSpcialInstruction',$ServiceDescription),'id'=>'EdittxtSpcialInstruction',  'class' => 'form-control');
-									echo form_input($data);
-									?>  <input type="hidden" name="SpcialInstruction" id="SpcialInstruction"  value="<?php echo $ServiceDescription;?>"> 
-							</div>
-												
-								</div>
-								<div class="col-md-12">
-								 <div class="col-md-2">
-												  <label>UOM</label>
-															<div class="form-group">
-																		<?php
-																 $data = array('name' => 'EditUOM','value' => set_value('EditUOM'),'id'=>'EditUOM',  'class' => 'form-control' ,'readonly' => 'true');
-																echo form_input($data);
-																?>   
-															</div>
-												 </div>
-												<div class="col-md-2">
-												  <label>Frequency</label>
-															<div>
-																<?php
-																 $data = array('name' => 'EditFrequency','value' => set_value('EditFrequency'),'id'=>'EditFrequency',  'class' => 'form-control' ,'readonly' => 'true');
-																echo form_input($data);
-																?>  
-                                                             <input type="hidden" name="EditFrequencyNo" id="EditFrequencyNo" value="EditFrequencyNo" /> 
-															</div>
-											   </div>
-												<div class="col-md-2">
-												  <label>Quantity</label>
-															<div class="form-group">
-																		<?php
-																 $data = array('name' => 'EditQuantity','value' => set_value('EditQuantity'),'id'=>'EditQuantity',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'EditRatechange()');
-																echo form_input($data);
-																?>   
-															</div>
-												 </div>
-												 <div class="col-md-2">
-												  <label><?php echo "Rate ($INRSYM)";?></label>
-															<div class="form-group">
-																		<?php
-																 $data = array('name' => 'EditRate','value' => set_value('EditRate'),'id'=>'EditRate',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);' ,'onchange'=>'EditRatechange()' );
-																echo form_input($data);
-																?>   
-															</div>
-												 </div>
-												 <div class="col-md-4">
-												  <label><?php echo "Basic Amount ($INRSYM)";?></label>
-															<div class="form-group">
-																		<?php
-																 $data = array('name' => 'txtEditBasicValue','value' => set_value('txtEditBasicValue'),'id'=>'txtEditBasicValue',  'class' => 'form-control num' ,'readonly' => 'true');
-																echo form_input($data);
-																?>   
-															</div>
-												 </div>
-								 
-								</div>
-								 
-				<div class="col-md-12">
-					<div class="col-md-6" align="right">
-							 
-				CGST In %
-					</div>	
-					
-					<div class="col-md-3">
-							 <div class="form-group">
-							 
-												<?php
-										 $data = array('name' => 'EditCgst','value' => set_value('EditCgst'),'id'=>'EditCgst',  'class' => 'form-control num' ,'placeholder' => 'CGST TAX PERCENTAGE','onchange'=>'EditRatechange()');
-										echo form_input($data);
-										?>   
-									</div>
-			 
-					</div>	
-					<div class="col-md-3">
-							 <div class="form-group">
-							 
-												<?php
-										 $data = array('name' => 'EditAfterCgst','value' => set_value('EditAfterCgst'),'id'=>'EditAfterCgst',  'class' => 'form-control num' ,'placeholder' => 'After CGST','readonly' => 'true');
-										echo form_input($data);
-										?>   
-									</div>
-			 
-					</div>						
-		 
-				</div>		 
-				<div class="col-md-12">
-					<div class="col-md-6" align="right">
-							 
-				SGST In %
-					</div>	
-					
-					<div class="col-md-3">
-							 <div class="form-group">
-							 
-												<?php
-										 $data = array('name' => 'EditSgst','value' => set_value('EditSgst'),'id'=>'EditSgst',  'class' => 'form-control num' ,'placeholder' => 'SGST TAX PERCENTAGE','onchange'=>'EditRatechange()');
-										echo form_input($data);
-										?>   
-									</div>
-			 
-					</div>	
-					<div class="col-md-3">
-							 <div class="form-group">
-							 
-												<?php
-										 $data = array('name' => 'EditAfterSgst','value' => set_value('EditAfterSgst'),'id'=>'EditAfterSgst',  'class' => 'form-control num' ,'placeholder' => 'After SGST','readonly' => 'true');
-										echo form_input($data);
-										?>   
-									</div>
-			 
-					</div>						
-		 
-				</div>
-		 
-				<div class="col-md-12">
-					<div class="col-md-6" align="right">
-							 
-				IGST In %
-					</div>	
-					
-					<div class="col-md-3">
-							 <div class="form-group">
-							 
-												<?php
-										 $data = array('name' => 'EditIgst','value' => set_value('EditIgst'),'id'=>'EditIgst',  'class' => 'form-control num' ,'placeholder' => 'IGST TAX PERCENTAGE','onchange'=>'EditRatechange()');
-										echo form_input($data);
-										?>   
-									</div>
-			 
-					</div>	
-					<div class="col-md-3">
-							 <div class="form-group">
-							 
-												<?php
-										 $data = array('name' => 'EditAfterIgst','value' => set_value('EditAfterIgst'),'id'=>'EditAfterIgst',  'class' => 'form-control num' ,'placeholder' => 'After IGST','readonly' => 'true');
-										echo form_input($data);
-										?>   
-									</div>
-			 
-					</div>						
-		 
-				</div>
-				<div class="col-md-12">
-								 <div class="col-md-5  col-md-offset-4" align="right">
-								<label>Other Allowances In INR</label>>			 
-											</div>	
-								<div class="col-md-3">
-													 <div class="form-group">
-																			<?php
-																	 $data = array('name' => 'EditOtherAllowances','value' => set_value('EditOtherAllowances'),'id'=>'EditOtherAllowances',  'class' => 'form-control num','onchange'=>'EditRatechange()');
-																	echo form_input($data);
-																	?>   
-																</div>
-													 </div>
-								 </div>
-									<div class="col-md-12">
-								 <div class="col-md-5  col-md-offset-4" align="right">
-								<label><?php echo "Total Order Value ($INRSYM)";?></label>>			 
-											</div>	
-								<div class="col-md-3">
-													 <div class="form-group">
-																			<?php
-																	 $data = array('name' => 'EditTotalOrderValue','value' => set_value('EditTotalOrderValue'),'id'=>'EditTotalOrderValue',  'class' => 'form-control num' ,'readonly' => 'true');
-																	echo form_input($data);
-																	?>   
-																</div>
-													 </div>
-								 </div>
-								
-								 
-								
-									
-									  <br/>
-									   
-									<div class="modal-footer">
-									<div class="col-md-12">
-									<a class="btn btn-primary font EditService"  ID="Edit">&nbsp;&nbsp;<span class="bold">Update Service</span></a>
-												<a class="btn btn-primary" data-dismiss="modal"  value="Cancel">Cancel</a>
-									</div>
-									</div>
-								  </div>
-								 </form>
-									 
-								  </div>
-							</div>	
-						  </div>
-						  
-						</div>	
-						<br/>
- <!-- View Modal content-->
-							<div class="modal fade" id="VIEWSERVICE" role="dialog">
-								<div class="modal-dialog">
-							   <!-- Modal content-->
-							 <form>
-								  <div class="modal-content" style="width:900px;">
-									<div class="modal-header" style="background-color: #3c8dbc;color:#fff;"> 
-									  <center><h4>View Service Purchase Order Item </h4></center>				
-									</div>
-									<div align="left"> 
-									 
-									<div class="col-md-12">
-												 <div class="col-md-3">
-												 <label>Req No</label>
-															<div>
-																 <?php
-																	
-																$data = array('name' => 'ViewReqNo','value' => set_value('ViewReqNo'),'id'=>'ViewReqNo',  'class' => 'form-control','readonly'=>'true');
-																echo form_input($data);
-																?>	
-																
-															</div>
-														</div>
-												 
-												  <div class="col-md-3">
-												   <label>Department Name</label>
-															<div class="form-group">
-																		<?php
-																 $data = array('name' => 'ViewdeptName','value' => set_value('ViewdeptName'),'id'=>'ViewdeptName',  'class' => 'form-control','readonly'=>'true');
-																echo form_input($data);
-																?>   
-															</div>
-												 </div>
-												  <div class="col-md-3">
-												   <label>Cost Center Name</label>
-															<div class="form-group">
-																		<?php
-												$data = array('name' => 'ViewCostCenter','value' => set_value('ViewCostCenter'),'id'=>'ViewCostCenter',  'class' => 'form-control' ,'readonly' => 'true');
-																		echo form_input($data);
-
-												?>		
-															</div>
-												 </div>
-												 <!-- <div class="col-md-3">
-												   <label>Avail Budget Amount In INR</label>
-															<div class="form-group">
-																		<?php
-																 $data = array('name' => 'ViewAvlBudAmt','value' => set_value('ViewAvlBudAmt'),'id'=>'ViewAvlBudAmt',  'class' => 'form-control num' ,'readonly' => 'true');
-																echo form_input($data);
-																?>   
-															</div>
-												 </div>-->
-								 </div>
-								 <div class="col-md-12">
-												  <div class="col-md-3">
-												  <label>Item Code</label>
-															<div>
-																 <?php
-																//$options = array("0"=>'Item Code');     
-																//print_r(  $options);
-																
-																echo form_dropdown('ViewMaterialCode', $options,set_value('ViewMaterialCode'),'id="ViewMaterialCode"' ,'class="form-control"');
-
-																?>						 
-															</div>
-											   </div>
-												<div class="col-md-3">
-												  <label>Item Name</label>
-															<div class="form-group">
-																		<?php
-																 $data = array('name' => 'ViewItemName','value' => set_value('ViewItemName'),'id'=>'ViewItemName',  'class' => 'form-control' ,'readonly' => 'true');
-																echo form_input($data);
-																?>   
-															</div>
-												 </div>
-												  <div class="col-md-6">
-								<label>Service Description</label>	<?php
-									 $data = array('name' => 'ViewtxtSpcialInstruction','value' => set_value('ViewtxtSpcialInstruction'),'id'=>'ViewtxtSpcialInstruction',  'class' => 'form-control','readonly' => 'true');
-									echo form_input($data);
-									?>  
-							</div>
-												
-								</div>
-								<div class="col-md-12">
-								 <div class="col-md-2">
-												  <label>UOM</label>
-															<div class="form-group">
-																		<?php
-																 $data = array('name' => 'ViewUOM','value' => set_value('ViewUOM'),'id'=>'ViewUOM',  'class' => 'form-control' ,'readonly' => 'true');
-																echo form_input($data);
-																?>   
-															</div>
-												 </div>
-												<div class="col-md-2">
-												  <label>Frequency</label>
-															<div>
-																<?php
-																 $data = array('name' => 'ViewFrequency','value' => set_value('ViewFrequency'),'id'=>'ViewFrequency',  'class' => 'form-control' ,'readonly' => 'true');
-																echo form_input($data);
-																?>  
-                                                             
-															</div>
-											   </div>
-												<div class="col-md-2">
-												  <label>Quantity</label>
-															<div class="form-group">
-																		<?php
-																 $data = array('name' => 'ViewQuantity','value' => set_value('ViewQuantity'),'id'=>'ViewQuantity',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','readonly' => 'true');
-																echo form_input($data);
-																?>   
-															</div>
-												 </div>
-												 <div class="col-md-2">
-												  <label><?php echo "Rate ($INRSYM)";?></label>
-															<div class="form-group">
-																		<?php
-																 $data = array('name' => 'ViewRate','value' => set_value('ViewRate'),'id'=>'ViewRate',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);' ,'readonly' => 'true' );
-																echo form_input($data);
-																?>   
-															</div>
-												 </div>
-												 <div class="col-md-4">
-												  <label><?php echo "Basic Amount ($INRSYM)";?></label>
-															<div class="form-group">
-																		<?php
-																 $data = array('name' => 'txtViewBasicValue','value' => set_value('txtViewBasicValue'),'id'=>'txtViewBasicValue',  'class' => 'form-control num' ,'readonly' => 'true');
-																echo form_input($data);
-																?>   
-															</div>
-												 </div>
-								 
-								</div>
-								 
-				<div class="col-md-12">
-					<div class="col-md-6" align="right">
-							 
-				CGST In %
-					</div>	
-					
-					<div class="col-md-3">
-							 <div class="form-group">
-							 
-												<?php
-										 $data = array('name' => 'ViewCgst','value' => set_value('ViewCgst'),'id'=>'ViewCgst',  'class' => 'form-control num' ,'placeholder' => 'CGST TAX PERCENTAGE','readonly' => 'true');
-										echo form_input($data);
-										?>   
-									</div>
-			 
-					</div>	
-					<div class="col-md-3">
-							 <div class="form-group">
-							 
-												<?php
-										 $data = array('name' => 'ViewAfterCgst','value' => set_value('ViewAfterCgst'),'id'=>'ViewAfterCgst',  'class' => 'form-control num' ,'placeholder' => 'After CGST','readonly' => 'true');
-										echo form_input($data);
-										?>   
-									</div>
-			 
-					</div>						
-		 
-				</div>		 
-				<div class="col-md-12">
-					<div class="col-md-6" align="right">
-							 
-				SGST In %
-					</div>	
-					
-					<div class="col-md-3">
-							 <div class="form-group">
-							 
-												<?php
-										 $data = array('name' => 'ViewSgst','value' => set_value('ViewSgst'),'id'=>'ViewSgst',  'class' => 'form-control num' ,'placeholder' => 'SGST TAX PERCENTAGE','readonly' => 'true');
-										echo form_input($data);
-										?>   
-									</div>
-			 
-					</div>	
-					<div class="col-md-3">
-							 <div class="form-group">
-							 
-												<?php
-										 $data = array('name' => 'ViewAfterSgst','value' => set_value('ViewAfterSgst'),'id'=>'ViewAfterSgst',  'class' => 'form-control num' ,'placeholder' => 'After SGST','readonly' => 'true');
-										echo form_input($data);
-										?>   
-									</div>
-			 
-					</div>						
-		 
-				</div>
-		 
-				<div class="col-md-12">
-					<div class="col-md-6" align="right">
-							 
-				IGST In %
-					</div>	
-					
-					<div class="col-md-3">
-							 <div class="form-group">
-							 
-												<?php
-										 $data = array('name' => 'ViewIgst','value' => set_value('ViewIgst'),'id'=>'ViewIgst',  'class' => 'form-control num' ,'placeholder' => 'IGST TAX PERCENTAGE','readonly' => 'true');
-										echo form_input($data);
-										?>   
-									</div>
-			 
-					</div>	
-					<div class="col-md-3">
-							 <div class="form-group">
-							 
-												<?php
-										 $data = array('name' => 'ViewAfterIgst','value' => set_value('ViewAfterIgst'),'id'=>'ViewAfterIgst',  'class' => 'form-control num' ,'placeholder' => 'After IGST','readonly' => 'true');
-										echo form_input($data);
-										?>   
-									</div>
-			 
-					</div>						
-		 
-				</div>
-				<div class="col-md-12">
-								 <div class="col-md-5  col-md-offset-4" align="right">
-								<label>Other Allowances In INR</label>>			 
-											</div>	
-								<div class="col-md-3">
-													 <div class="form-group">
-																			<?php
-																	 $data = array('name' => 'ViewOtherAllowances','value' => set_value('ViewOtherAllowances'),'id'=>'ViewOtherAllowances',  'class' => 'form-control num','readonly' => 'true');
-																	echo form_input($data);
-																	?>   
-																</div>
-													 </div>
-								 </div>
-									<div class="col-md-12">
-								 <div class="col-md-5  col-md-offset-4" align="right">
-								<label><?php echo "Total Order Value ($INRSYM)";?></label>>			 
-											</div>	
-								<div class="col-md-3">
-													 <div class="form-group">
-																			<?php
-																	 $data = array('name' => 'ViewTotalOrderValue','value' => set_value('ViewTotalOrderValue'),'id'=>'ViewTotalOrderValue',  'class' => 'form-control num' ,'readonly' => 'true');
-																	echo form_input($data);
-																	?>   
-																</div>
-													 </div>
-								 </div>
-								
-								 
-								
-									
-									  <br/>
-									   
-									<div class="modal-footer">
-									<div class="col-md-12">
-									
-												<a class="btn btn-primary" data-dismiss="modal"  value="Cancel">Cancel</a>
-									</div>
-									</div>
-								  </div>
-								 </form>
-									 
-								  </div>
-							</div>	
-						  </div>
-						  
-						</div>	
-						<br/>
-						<div class="box-body" style="margin-top: -2%;">
-						<table id="ServiceTable" class="table table-bordered table-hover" style="background-color:#fff;font-size:12px;">
-							<thead style="background-color:#ddf">
-							<tr>
-								<th>SNo</th>
-								<th>Requisition No</th>
-                                <th>Item Code</th>
-								<th>Item Description</th>
-								<th>Quantity</th>
-								<th>UOM</th>                                                              
-								<th>Rate</th>
-								<th>Basic Amount</th>
-								<th>Tax Amount</th>
-								<th>Total Order Amount</th>
-								<th>Actual Quantity</th>
-								<th>Received Quantity</th>
-								<th>Pending Quantity</th>
-								<th>Action</th>
-							</tr>
-							</thead>				
-							   
-							<tbody id='ServiceAppend'>
-								  <?php
-
-								if(!empty($POItem))
-									{
-                                                                        
-									
-											$index = 0;
-										
-										foreach($POItem as $record)
-										{
-											$index = $index + 1;
-											if($record->Schedule_Type!='Recurring'){
-											$FrequencyNo=intval(1);
-											$Frequency='One Time';
-											}
-										else{
-										  $FrequencyNo=$record->NumberOfService;
-											$Frequency=$record->Service_Period;
-										}
-                                                                                        
-									?>
-									<tr id="<?php echo $index ; ?>">
-									<td align="left"><?php echo $index ; ?></td> 
-									<td><?php echo $record->ReqNo ?></td> 
-                                                                        <td><?php echo $record->MaterialCode ?></td> 
-									<td><?php echo $record->ServiceMaterialDescription ?></td> 
-									<td align="right"><?php echo $record->Quantity ?></td>   					
-									<td><?php echo $record->UOM ?></td> 
-                                                                        
-									<td align="right"><?php echo $record->Rate ?></td>                     
-									
-									<td align="right"><?php echo number_format($record->BasicValue * $FrequencyNo, 2, '.', ''); ?></td>    
-									  
-									<td align="right"><?php echo $record->Taxamount ?></td>
-									<td align="right"><?php echo $record->TotalValue ?></td>
-                                                                        <td align="right"><?php echo $record->Quantity ?></td>
-                                                                        <td align="right"><?php echo $record->ReceivedQuantity ?></td>
-                                                                        <td align="right"><?php echo number_format($record->Quantity - $record->ReceivedQuantity, 2, '.', ''); ?></td>
-									 <input type="hidden" name="<?php echo 'Reqnumber'.$index ?>" id="<?php echo 'Reqnumber'.$index ?>" value="<?php echo $record->ReqNo ; ?>" />
-									 <input type="hidden" name="<?php echo 'departmentName'.$index ?>" id="<?php echo 'departmentName'.$index ?>" value="<?php echo $record->ReqNo ; ?>" />
-									<input type="hidden" name="<?php echo 'AvilBudget'.$index ?>" id="<?php echo 'AvilBudget'.$index ?>" value="<?php echo $AvlAmount ; ?>" />					
-									<input type="hidden" name="<?php echo 'LineItemNo'.$index ?>" id="<?php echo 'LineItemNo'.$index ?>" value="<?php echo $record->LineItemNo ; ?>" />
-									 <input type="hidden" name="<?php echo 'costCode'.$index ?>" id="<?php echo 'costCode'.$index ?>" value="<?php echo $record->CostCenterCode ; ?>" />
-									 <input type="hidden" name="<?php echo 'materialCode'.$index ?>" id="<?php echo 'materialCode'.$index ?>" value="<?php echo $record->MaterialCode ; ?>" />
-									 <input type="hidden" name="<?php echo 'materialName'.$index ?>" id="<?php echo 'materialName'.$index ?>" value="<?php echo $record->MaterialName ; ?>" />
-									 <input type="hidden" name="<?php echo 'uom'.$index ?>" id="<?php echo 'uom'.$index ?>" value="<?php echo $record->UOM ; ?>" />
-									 <input type="hidden" name="<?php echo 'quantity'.$index ?>" id="<?php echo 'quantity'.$index ?>" value="<?php echo $record->Quantity ; ?>" />
-									 
-									  <input type="hidden" name="<?php echo 'itemRate'.$index ?>" id="<?php echo 'itemRate'.$index ?>" value="<?php echo $record->Rate ; ?>" />
-                                                                         <input type="hidden" name="<?php echo 'Cgst'.$index ?>" id="<?php echo 'Cgst'.$index ?>" value="<?php echo $record->CGST ; ?>" />
-									 <input type="hidden" name="<?php echo 'AfterCgst'.$index ?>" id="<?php echo 'AfterCgst'.$index ?>" value="<?php echo $record->After_CGST ; ?>" />
-									 <input type="hidden" name="<?php echo 'Sgst'.$index ?>" id="<?php echo 'Sgst'.$index ?>" value="<?php echo $record->SGST ; ?>" />
-									 <input type="hidden" name="<?php echo 'AfterSgst'.$index ?>" id="<?php echo 'AfterSgst'.$index ?>" value="<?php echo $record->After_SGST ; ?>" />
-                                                                         <input type="hidden" name="<?php echo 'Igst'.$index ?>" id="<?php echo 'Igst'.$index ?>" value="<?php echo $record->IGST ; ?>" />
-									 <input type="hidden" name="<?php echo 'AfterIgst'.$index ?>" id="<?php echo 'AfterIgst'.$index ?>" value="<?php echo $record->After_IGST ; ?>" />
-									 <input type="hidden" name="<?php echo 'TotalOrderValue'.$index ?>" id="<?php echo 'TotalOrderValue'.$index ?>" value="<?php echo $record->TotalValue ; ?>" />
-                                                                       
-									 <input type="hidden" name="<?php echo 'Frequency'.$index ?>" id="<?php echo 'Frequency'.$index ?>" value="<?php echo $Frequency; ?>" />
-                                                                        <input type="hidden" name="<?php echo 'FrequencyNo'.$index ?>" id="<?php echo 'FrequencyNo'.$index ?>" value="<?php echo $FrequencyNo ; ?>" />
-                                                                                <input type="hidden" name="<?php echo 'FrequencyValue'.$index ?>" id="<?php echo 'FrequencyValue'.$index ?>" value="<?php echo $FrequencyNo ; ?>" />
-                                                                                <input type="hidden" name="<?php echo 'ItemDescription'.$index ?>" id="<?php echo 'ItemDescription'.$index ?>" value="<?php echo $record->ServiceMaterialDescription ; ?>" />
-                                                                                <input type="hidden" name="<?php echo 'OtherAmt'.$index ?>" id="<?php echo 'OtherAmt'.$index ?>" value="<?php echo $record->otherallowance ; ?>" />
-
-                                                                        
-									<?php 
-											
-											if($PONOStatus == PO_DRAFT) 
-											{?>					
-									<td>    <a    data-target='#EDITSERVICE'	data-id="<?php echo $index ; ?>" data-userid="<?php echo $index ; ?>" data-toggle="modal" href="#EDITSERVICE"><i class="fa fa-pencil" data-toggle="tooltip" title="Click here to view/Edit the  <?php echo $record->ReqNo ; ?> Requisition details"></i>&nbsp;&nbsp;&nbsp;</a> <a href='#' onclick = "DeleteRow(<?php echo $index ; ?>)" class="link" data-id="<?php echo $index ; ?>" data-userid="<?php echo $index ; ?>"  id="Del" ><span class="glyphicon glyphicon-trash"></span></a>
-									  <?php
-										} else {?>	
-										<td>   <a    data-target='#VIEWSERVICE'	data-id="<?php echo $index ; ?>" data-userid="<?php echo $index ; ?>" data-toggle="modal" href="#VIEWSERVICE"><i class="fa fa-eye" data-toggle="tooltip" title="<?php echo $record->ReqNo; ?>  -  Click here to view Requistion details"></i>&nbsp;&nbsp;&nbsp;</a>  </td>  
-										 <?php  
-										}?>	
-									</tr>
-									 <?php
-												$TotalCgst = $TotalCgst + $record->After_CGST;
-												$TotalSgst = $TotalSgst + $record->After_SGST;
-												$TotalIgst = $TotalIgst + $record->After_IGST;
-												$OtherAmt =  $OtherAmt +  $record->otherallowance;
-												$TotalSummary = $TotalSummary + $record->TotalValue;
-																			   
-																				 
-												$TotalBasicAmount = $TotalBasicAmount + $record->BasicValue;
-												
-										}
-										?> <input type="hidden" name="txtRowCount" id="txtRowCount"  value="<?php echo $index;?>">
-										<?php 
-										   
-									}
-									?>
-							</tbody>
-						</table>
-					</div>
-				   
-					 
-						<div class="row" style="border: 1px solid">
-						<div class="col-md-12">
-							 
-								<div class="col-md-2">
-									 <label>Basic Amount In INR </label> 
-									 <?php
-											 $data = array('name' => 'txtTotBasicAmount','value' => set_value('txtTotBasicAmount',number_format($TotalBasicAmount, 2, '.', '')),'id'=>'txtTotBasicAmount',  'class' => 'form-control num'  ,'readonly' => 'true');
-											echo form_input($data);
-											?>   
-								</div>
-								<div class="col-md-2">
-									 <label>CGST In INR</label> 
-									 <?php
-											 $data = array('name' => 'txtTotCgst','value' => set_value('txtTotCgst',number_format($TotalCgst, 2, '.', '')),'id'=>'txtTotCgst',  'class' => 'form-control num'  ,'readonly' => 'true');
-											echo form_input($data);				
-											?>   
-								</div>
-							 
-							  
-								<div class="col-md-2">
-									 <label>SGST In INR</label> 
-									 <?php
-											 $data = array('name' => 'txtTotSgst','value' => set_value('txtTotSgst',number_format($TotalSgst, 2, '.', '')),'id'=>'txtTotSgst',  'class' => 'form-control num'  ,'readonly' => 'true');
-											echo form_input($data);				
-											?>   
-								</div>
-								<div class="col-md-2">
-									<label>IGST In INR</label> 
-									<?php
-											 $data = array('name' => 'txtTotIgst','value' => set_value('txtTotIgst',number_format($TotalIgst, 2, '.', '')),'id'=>'txtTotIgst',  'class' => 'form-control num'   ,'readonly' => 'true');
-											echo form_input($data);
-											?>   
-								</div>
-							 
-					<div class="col-md-2">
-							<label >Other Allowances  In INR </label>							
-								<?php
-								 $data = array('name' => 'ToatalOtherAllowances','value' => set_value('ToatalOtherAllowances',number_format($OtherAmt, 2, '.', '')),'id'=>'ToatalOtherAllowances',  'class' => 'form-control num'  ,'readonly' => 'true');
-								echo form_input($data);
-								?>   
-									
-							</div> 							
-							<div class="col-md-2">
-							<label >Total Order Value  In INR </label>							
-								<?php
-								 $data = array('name' => 'txtTotalOrderValueSummary','value' => set_value('txtTotalOrderValueSummary',number_format($TotalSummary, 2, '.', '')),'id'=>'txtTotalOrderValueSummary',  'class' => 'form-control num'  ,'readonly' => 'true');
-								echo form_input($data);
-								?>   
-									
-							</div> 
-						 
-						</div>
-					 
-						
-						<div class="col-md-12">
-							<div class="col-md-12">
-								<label>Scope Of Work</label>	<?php
-									 $data = array('name' => 'ScopeofWork','value' => set_value('ScopeofWork',$ServiceDescription),'id'=>'ScopeofWork',  'class' => 'form-control', 'rows' => '10', 'cols' => '40' );
-									echo form_textarea($data);
-									?>   
-							</div>
-							<!-- <div class="col-md-12">
-								<label>Special Instructions :</label>	<?php
-									 $data = array('name' => 'txtSpcialInstruction','value' => set_value('txtSpcialInstruction',$ServiceDescription),'id'=>'txtSpcialInstruction',  'class' => 'form-control', 'rows' => '10', 'cols' => '40' );
-									echo form_textarea($data);
-									?>  <input type="hidden" name="SpcialInstruction" id="SpcialInstruction"  value="<?php echo $ServiceDescription;?>"> 
-							</div>-->
-						</div>
-						<div class="col-md-12">
-							<div class="row"><br/>
-								<div align="right" style="padding-right:10px">
-								<input type="hidden" name="txtPONO" id="txtPONO"  value="<?php  echo $PONO; ?>"/> 
-								<input type="hidden" name="txtStatus" id="txtStatus" /> 		   
-								<input type="hidden" name="txtDeletedRow" id="txtDeletedRow" />  
-								<?php if($PONOStatus == PO_DRAFT) {?>   
-								<a class="btn btn-primary Save"  ID="Save" onclick="Save(0)" >&nbsp;&nbsp;<span class="bold">Save</span></a> 
-								<a class="btn btn-primary Save"  ID="Submit" onclick="Save(1)" >&nbsp;&nbsp;<span class="bold">Submit</span></a> 
-								<input type="reset" class="btn btn-primary" value="Reset">
-								<?php }else {?>
-								<a class="btn btn-primary"  ID="OK" href="<?php echo base_url().'purchaseorderListing'; ?>">&nbsp;&nbsp;<span class="bold">OK</span></a>  <?php } ?>
-								</div><br/>
-						   </div>
-						</div>
-						<br/>
-					 </div><br/>
-						<div class="col-md-12" style="padding:5px;">
-							<div class="col-md-4">
-								<span>Request On</span>								  
-								  <?php
-											 $data = array('name' => 'Requeston','value' => set_value('Requeston',$Reqon),'id'=>'Requeston',  'class' => 'form-control num' ,'required' => 'true', 'onkeypress'=>'return false;');
-											echo form_input($data);
-											?>   
-							</div>
-							<div class="col-md-4">
-								<span>Request By</span>								  
-								  <?php
-									 $data = array('name' => 'RequestBy','value' => set_value('RequestBy',$RequesterName),'id'=>'RequestBy',  'class' => 'form-control' ,'required' => 'true');
-									echo form_input($data);
-									?> 
-							</div>
-							<div class="col-md-4">
-								<span>Status</span>								  
-								 <?php
-									// $options = array("0"=>'Select Status');     
-									// echo form_dropdown('Status', $options,set_value('Status'),'id="Status"'  ,'required="true"' ,'class="form-control select2')
-								 // $options = array("0"=>$PONOStatus);     
-         //                            echo form_dropdown('Status', $options,set_value('Status',$StatusName),'id="Status"'  ,'required="true"' ,'class="form-control select2')
-
-                                    
-                                     $data = array('name' => 'Status','value' => set_value('Status',$StatusName),'id'=>'Status',  'class' => 'form-control' ,'readonly' => 'true');
-                                    echo form_input($data);
-								?>
-							</div> 
-						</div>
-						</div>
-					</div>
-
-</div>
-		</div>
-	</section>
-</div>
-<script type="text/html" id="ServiceList">
-<tr  id="<%=index%>">
-<td align="left"><%=index%></td>
- <td align="left"><%=ReqNo%></td>
- <td align="left"><%=MaterialCode%></td>
-  <td align="left"><%=MaterialName%></td>
-  <td align="left"><%=Quantity%></td> 
-  <td align="left"><%=UOM%></td>
-   <td align="left"><%=Rate%></td>
-    <td align="left"><%=BasicAmount%></td>
-	<td align="left"><%=Taxvalue%></td>
-	<td align="left"><%=TotalValue%></td>
-<td align="left"><%=ActualQuantity%></td>
-<td align="left"><%=ReceivedQuantity%></td>
-<td align="left"><%=PendingQuantity%></td>
-	
-   <td>
-                          <a    data-target='#EDITSERVICE'	data-id="<%=index%>" data-userid="<%=index%>" data-toggle="modal" href="#EDITSERVICE"><i class="fa fa-pencil" data-toggle="tooltip" title="Click here to view/Edit the  <%=ReqNo%> Requisition details"></i>&nbsp;&nbsp;&nbsp;</a> <a href='#' onclick = "DeleteRow(<%=index%>)" class="link" data-id="<%=index%>" data-userid="<%=index%>"  id="Del" ><span class="glyphicon glyphicon-trash"></span></a>
-						 
-						  
-                      </td>
-</tr>
-
-</script>
-<script>
-var index     = $('#txtRowCount').val();;
-var userid  = '';
- var SelectedMaterialCode = [];
- var CollIndex = 0;
-  var SelectedMaterialList = {
-    Mat: []
-};
-
-
-
-
-$("#EDITSERVICE").on("shown.bs.modal", function(e) {
-
-		userid = $(e.relatedTarget).data('userid');
-	
-		var tr= document.getElementById(userid);
-		var cellval = tr.cells;
-		var id= $('#Reqnumber'+userid).val();
-		
-		$('#EditReqNo').val($('#Reqnumber'+userid).val());
-		$('#EditdeptName').val($('#departmentName'+userid).val());
-		$("#EditCostCenter").val($('#costCode'+userid).val());
-		$('#EditAvlBudAmt').val($('#AvilBudget'+userid).val());
-		
-		$('#EditItemName').val($('#materialName'+userid).val());
-		$('#EditUOM').val($('#uom'+userid).val());
-		$('#EditQuantity').val($('#quantity'+userid).val());
-		RequistQuantity = $('#quantity'+userid).val();
-		$('#EditRate').val($('#itemRate'+userid).val());
-		$('#txtEditBasicValue').val(cellval[7].innerHTML);
-		$('#EditCgst').val($('#Cgst'+userid).val());
-		$('#EditSgst').val($('#Sgst'+userid).val());
-		$('#EditIgst').val($('#Igst'+userid).val());
-		$('#EditAfterCgst').val($('#AfterCgst'+userid).val());
-		$('#EditAfterSgst').val($('#AfterSgst'+userid).val());
-		$('#EditAfterIgst').val($('#AfterIgst'+userid).val());
-		  if($('#FrequencyValue'+userid).val()==1){
-                    $('#EditFrequency').val($('#Frequency'+userid).val());
-                     $("#EditFrequencyNo").val(1);
-                   }
-		else{
-                    $('#EditFrequency').val($('#Frequency'+userid).val()+'-'+$('#FrequencyNo'+userid).val());
-                    $("#EditFrequencyNo").val($('#FrequencyValue'+userid).val());
-                     }
-
-		$('#EditTotalOrderValue').val(cellval[9].innerHTML);
-                $('#EditOtherAllowances').val($('#OtherAmt'+userid).val());
-		$('#EdittxtSpcialInstruction').val($('#ItemDescription'+userid).val());
-		RequistQuantity = $('#quantity'+userid).val();
-		
-		
-		  
-		$("#EditMaterialCode").empty();
-		var Material = <?php echo json_encode($MaterialList, JSON_PRETTY_PRINT) ?>;
-		 // For Binding Material list center for the selected Requistion Number	
-		 
-		$("#EditMaterialCode").append( $('<option></option>').val($('#materialCode'+userid).val()).html($('#materialCode'+userid).val() + "-" + $('#materialName'+userid).val()  ) );
-		
-		var isAdded = "0";
-		 for(i=0;i<Material.length;i++)
-		{
-		$.each(Material[i], function(idx, obj) {
-			
-				if(obj.ReqNo === id )
-				{
-								   
-						$.each(SelectedMaterialList.Mat, function(idx1, el){															
-							if (id == el.ReqNo )
-							{
-								
-								if(el.materialCode == obj.MaterialCode)
-								{
-									
-										isAdded  = "1";
-										return false;																		
-								}
-								else
-								{
-									isAdded  = "0";
-								}
-								
-							}
-												
-					
-					});
-					
-					
-						if(isAdded  == "0")
-						{
-							
-							$("#EditMaterialCode").append( $('<option></option>').val(obj.MaterialCode).html(obj.MaterialCode + "-" + obj.MaterialName));
-						}
-												
-				}
-			
-			
-		});
-		}
-	   
-});
-$("#VIEWSERVICE").on("shown.bs.modal", function(e) {
-
-		userid = $(e.relatedTarget).data('userid');
-	
-		var tr= document.getElementById(userid);
-		var cellval = tr.cells;
-		var id= $('#Reqnumber'+userid).val();
-		
-		$('#ViewReqNo').val($('#Reqnumber'+userid).val());
-		$('#ViewdeptName').val($('#departmentName'+userid).val());
-		$("#ViewCostCenter").val($('#costCode'+userid).val());
-		//$('#ViewAvlBudAmt').val($('#AvilBudget'+userid).val());
-		
-		$('#ViewItemName').val($('#materialName'+userid).val());
-		$('#ViewUOM').val($('#uom'+userid).val());
-		$('#ViewQuantity').val($('#quantity'+userid).val());
-		RequistQuantity = $('#quantity'+userid).val();
-		$('#ViewRate').val($('#itemRate'+userid).val());
-		$('#txtViewBasicValue').val(cellval[7].innerHTML);
-		$('#ViewCgst').val($('#Cgst'+userid).val());
-		$('#ViewSgst').val($('#Sgst'+userid).val());
-		$('#ViewIgst').val($('#Igst'+userid).val());
-		$('#ViewAfterCgst').val($('#AfterCgst'+userid).val());
-		$('#ViewAfterSgst').val($('#AfterSgst'+userid).val());
-		$('#ViewAfterIgst').val($('#AfterIgst'+userid).val());
-		  if($('#FrequencyValue'+userid).val()==1){
-                    $('#ViewFrequency').val($('#Frequency'+userid).val());
-                     $("#ViewFrequencyNo").val(1);
-                   }
-		else{
-                    $('#ViewFrequency').val($('#Frequency'+userid).val()+'-'+$('#FrequencyNo'+userid).val());
-                    $("#ViewFrequencyNo").val($('#FrequencyValue'+userid).val());
-                     }
-
-		$('#ViewTotalOrderValue').val(cellval[9].innerHTML);
-                $('#ViewOtherAllowances').val($('#OtherAmt'+userid).val());
-		$('#ViewtxtSpcialInstruction').val($('#ItemDescription'+userid).val());
-		RequistQuantity = $('#quantity'+userid).val();
-		
-		
-		  
-		$("#ViewMaterialCode").empty();
-		var Material = <?php echo json_encode($MaterialList, JSON_PRETTY_PRINT) ?>;
-		 // For Binding Material list center for the selected Requistion Number	
-		 
-		$("#ViewMaterialCode").append( $('<option></option>').val($('#materialCode'+userid).val()).html($('#materialCode'+userid).val() + "-" + $('#materialName'+userid).val()  ) );
-		
-		var isAdded = "0";
-		 for(i=0;i<Material.length;i++)
-		{
-		$.each(Material[i], function(idx, obj) {
-			
-				if(obj.ReqNo === id )
-				{
-								   
-						$.each(SelectedMaterialList.Mat, function(idx1, el){															
-							if (id == el.ReqNo )
-							{
-								
-								if(el.materialCode == obj.MaterialCode)
-								{
-									
-										isAdded  = "1";
-										return false;																		
-								}
-								else
-								{
-									isAdded  = "0";
-								}
-								
-							}
-												
-					
-					});
-					
-					
-						if(isAdded  == "0")
-						{
-							
-							//$("#ViewMaterialCode").append( $('<option></option>').val(obj.MaterialCode).html(obj.MaterialCode + "-" + obj.MaterialName));
-						}
-												
-				}
-			
-			
-		});
-		}
-	   
-});
-
-$('.AddService').click(function(){
-        
-		
-      if(validateServiceTax())
-	  {
-		// alert('inside Addservice');
-		 var temp = parseInt(index) + 1;
-		 var Reqnumber = $('#ReqNo').val();
-		 var departmentName = $('#deptName').val();
-		 var AvilBudget = $('#AvlBudAmt').val();
-		 var costCode = $('#CostCenter').val();
-         var materialCode =$('#MaterialCode').val();
-         var materialName =  $("#ItemName").val();
-         var uom = $("#UOM").val();
-		 var quantity = $("#Quantity").val();
-		 var itemRate = parseFloat($("#Rate").val()).toFixed(2);
-		  
-		
-		  var Cgst = $("#Cgst").val();
-		  var AfterCgst = $("#AfterCgst").val();
-                  var Sgst = $("#Sgst").val();
-                  var AfterSgst = $("#AfterSgst").val();
-                  var Igst = $("#Igst").val();
-                  var AfterIgst = $("#AfterIgst").val();
-                  var FrequencyValue = $("#FrequencyNo").val();
-		
-		  var Frequency=$("#Frequency").val();
-		    var ServiceDescription = $('#txtSpcialInstruction').val();
-		var OtherAmt = $('#OtherAllowances').val();
-		  var TotalOrderValue = $("#TotalOrderValue ").val();
-		 
-		  
-		 var basicval = $("#txtBasicValue").val();
-	
-		
-		 var TotalTaxValue = calculateTaxValue();		 
-	   
-		 $('#MaterialCode option[value='+materialCode+']').remove();
-		  SelectedMaterialCode[CollIndex] = materialCode;
-			CollIndex = CollIndex + 1;
-			
-			SelectedMaterialList.Mat.push({ 
-        "materialCode" :  materialCode,
-        "ReqNo"  : Reqnumber,
-      
-		});	
-		 populateValueMainFormForServiceTax();	 
-		
-			
-		  index = parseInt(index)+1;		
-		 
-	      var template = jQuery("#ServiceList").html();
-	   
-	     
-          $('#ServiceAppend').append(_.template(template,{index:temp,ReqNo:Reqnumber,MaterialCode:materialCode,MaterialName:ServiceDescription,Quantity:quantity,UOM:uom,Rate:itemRate,BasicAmount:basicval,Taxvalue:TotalTaxValue,TotalValue:TotalOrderValue,ActualQuantity:quantity,ReceivedQuantity:0,PendingQuantity:quantity}));
-		  
-		
-		 
-		 var theForm = $(".ServicePO");
-		
-		 addHidden(theForm,"Reqnumber"+temp,Reqnumber );
-		 addHidden(theForm,"departmentName"+temp,departmentName );
-	     addHidden(theForm,"AvilBudget"+temp,AvilBudget );
-		 addHidden(theForm,"costCode"+temp,costCode );		
-		  addHidden(theForm,"materialCode"+temp,materialCode );
-		 addHidden(theForm,"materialName"+temp,materialName );
-	     addHidden(theForm,"uom"+temp,uom);
-		 addHidden(theForm,"quantity"+temp,quantity);
-		  addHidden(theForm,"itemRate"+temp,itemRate);
-		  addHidden(theForm,"Cgst"+temp,Cgst);
-		  addHidden(theForm,"AfterCgst"+temp,AfterCgst);
-	      addHidden(theForm,"Sgst"+temp,Sgst);
-	      addHidden(theForm,"AfterSgst"+temp,AfterSgst);
-		  addHidden(theForm,"Igst"+temp,Igst);
-                  addHidden(theForm,"AfterIgst"+temp,AfterIgst);
-		  addHidden(theForm,"Frequency"+temp,Frequency);
-                  addHidden(theForm,"FrequencyValue"+temp,FrequencyValue); 
-		  addHidden(theForm,"ItemDescription"+temp,ServiceDescription);
-                  addHidden(theForm,"OtherAmt"+temp,OtherAmt);		   
-		  addHidden(theForm,"TotalOrderValue"+temp,TotalOrderValue);
-                  addHidden(theForm,"LineItemNo"+temp,'');
-		
-		  $('#txtRowCount').val(temp); 
-		  clearServiceModalFields();
-      	  }	  
-   
- });
-
- $('.EditService').click(function(){
-         
-	
-        if( validateEditServiceTax())
-        {
-          		
-            var CostCode =  $("#EditCostCenter").val();
-			 var AvilBudget = $('#EditAvlBudAmt').val();
-			var editMaterialCode =  $("#EditMaterialCode").val();
-			var editDescription = $("#EditItemName").val();		
-			var editUOM = $('#EditUOM').val();
-			var editQuantity = $('#EditQuantity').val();
-			
-			 var itemRate = $("#EditRate").val();
-		  
-		  
-		   var Cgst = $("#EditCgst").val();
-		  var AfterCgst = $("#EditAfterCgst").val();
-                  var Sgst = $("#EditSgst").val();
-                  var AfterSgst = $("#EditAfterSgst").val();
-                  var Igst = $("#EditIgst").val();
-                  var AfterIgst = $("#EditAfterIgst").val();
-		
-		  var Frequency=$("#EditFrequency").val();
-		  var FrequencyValue=$("#EditFrequencyNo").val();
-		    var ServiceDescription = $('#EdittxtSpcialInstruction').val();
-		var OtherAmt = $('#EditOtherAllowances').val();
-		  var TotalOrderValue = $("#EditTotalOrderValue ").val();
-		 
-		  
-			var basicval = $("#txtEditBasicValue").val();
-	
-			var TotalTaxValue = calculateEditTaxValue();	
-			
-		
-		 
-            var tr= document.getElementById(userid);
-			var cellval = tr.cells;   
-			
-			   cellval[2].innerHTML = editMaterialCode;	
-			cellval[3].innerHTML = ServiceDescription;			
-			cellval[4].innerHTML = editQuantity;
-			cellval[5].innerHTML =editUOM;
-			cellval[6].innerHTML =parseFloat(itemRate).toFixed(2);
-			cellval[7].innerHTML =parseFloat(basicval).toFixed(2);
-			cellval[8].innerHTML =parseFloat(TotalTaxValue).toFixed(2);
-			cellval[9].innerHTML =parseFloat(TotalOrderValue).toFixed(2);
-					
-			
-			$('#materialCode'+userid).val(editMaterialCode);
-			$('#materialName'+userid).val(editDescription);
-			$('#uom'+userid).val(editUOM);
-			$('#CostCode'+userid).val(CostCode);
-			$('#quantity'+userid).val(editQuantity);
-                        $('#itemRate'+userid).val(itemRate);
-			$('#Cgst'+userid).val(Cgst);
-                        $('#AfterCgst'+userid).val(AfterCgst);
-			$('#Sgst'+userid).val(Sgst);
-			$('#AfterSgst'+userid).val(AfterSgst);	
-			$('#Igst'+userid).val(Igst);
-			$('#AfterIgst'+userid).val(AfterIgst);
-			$('#TotalOrderValue'+userid).val(TotalOrderValue);
-                         $('#ItemDescription'+userid).val(ServiceDescription);
-                        $('#OtherAmt'+userid).val(OtherAmt);
-		     populateValueMainFormForEditServiceTax();	 
-      }
-    
- });
- function addHidden(theForm, key, value) {
-    // Create a hidden input element, and append it to the form:
-    var input = document.createElement('input');
-    input.type = 'hidden';
-    input.name = key;'name-as-seen-at-the-server';
-    input.id = key;'name-as-seen-at-the-server';
-    input.value = value;
-    theForm.append(input);
-}
-
-function populateValueMainFormForServiceTax()
-{
-		var AfterCgst = $('#AfterCgst').val() == '' ? '0.00' : $('#AfterCgst').val();
-		var AfterSgst = $('#AfterSgst').val() == '' ? '0.00' : $('#AfterSgst').val();
-		var AfterIgst = $('#AfterIgst').val() == '' ? '0.00' : $('#AfterIgst').val();
-	       var OtherAmt = $('#OtherAllowances').val() == '' ? '0.00' : $('#OtherAllowances').val();
-		var TotalVal = $('#TotalOrderValue ').val() == '' ? '0.00' : $('#TotalOrderValue').val();
-		
-		var BasicVal = $('#txtBasicValue').val() == '' ? '0.00' : $('#txtBasicValue').val();
-		
-		
-		var TotalOrderValueSummary = $('#txtTotalOrderValueSummary').val() == '' ? '0.00' : $('#txtTotalOrderValueSummary').val();
-		
-		var totBasicAmt = $('#txtTotBasicAmount').val() == '' ? '0.00' : $('#txtTotBasicAmount').val();
-		var TotalCgst = $('#txtTotCgst').val() == '' ? '0.00' : $('#txtTotCgst').val();
-		var TotSgst = $('#txtTotSgst').val() == '' ? '0.00' : $('#txtTotSgst').val();
-		var TotalIgst = $('#txtTotIgst').val() == '' ? '0.00' : $('#txtTotIgst').val();
-		 var TotalAllowance = $('#ToatalOtherAllowances').val() == '' ? '0.00' : $('#ToatalOtherAllowances').val();
-		$('#txtTotBasicAmount').val((parseFloat(totBasicAmt) + parseFloat(BasicVal)).toFixed(2) );
-		$('#txtTotCgst').val((parseFloat(TotalCgst) + parseFloat(AfterCgst)).toFixed(2) );
-		$('#txtTotSgst').val((parseFloat(TotSgst) + parseFloat(AfterSgst)).toFixed(2) );
-		$('#txtTotIgst').val((parseFloat(TotalIgst) + parseFloat(AfterIgst)).toFixed(2) );
-		$('#ToatalOtherAllowances').val((parseFloat(TotalAllowance) + parseFloat(OtherAmt)).toFixed(2) );
-		$('#txtTotalOrderValueSummary').val((parseFloat(TotalOrderValueSummary) + parseFloat(TotalVal)).toFixed(2) );
-		
-}
-function populateValueMainFormForEditServiceTax()
-{
-	  
-		var rows =  document.getElementById('ServiceTable').rows.length;
-       
-		var TotCgst = 0;
-		var TotSgst = 0;
-		var TotIgst = 0;
-	       var TotOther = 0;
-		var TotSummary = 0;
-		var TotBasicAmout = 0;
-                var i = 0;
-                 do {
-		   i += 1;
-		   var tr= document.getElementById(i);
-			 //alert(tr);
-			 if(tr != null)
-			 {
-			 cells = tr.getElementsByTagName('td');
-					
-			
-		     var rowid = cells[0].innerHTML;
-			
-		var AfterCgst = $('#AfterCgst'+rowid).val() == '' ? '0.00' : $('#AfterCgst'+rowid).val();
-		var AfterSgst = $('#AfterSgst'+rowid).val() == '' ? '0.00' : $('#AfterSgst'+rowid).val();
-		var AfterIgst = $('#AfterIgst'+rowid).val() == '' ? '0.00' : $('#AfterIgst'+rowid).val();
-		var OtherAmt = $('#OtherAmt'+rowid).val() == '' ? '0.00' : $('#OtherAmt'+rowid).val();
-		var TotalVal =$('#TotalOrderValue'+rowid).val() == '' ? '0.00' : $('#TotalOrderValue'+rowid).val();
-		
-		var Quantity = $('#quantity'+rowid).val() == '' ? '0.00' : $('#quantity'+rowid).val();
-		var ItemRate = $('#itemRate'+rowid).val() == '' ? '0.00' : $('#itemRate'+rowid).val();
-                var FrequencyValue = $('#FrequencyValue'+rowid).val() == '' ? '1.00' : $('#FrequencyValue'+rowid).val();	
-		var BasicVal = parseFloat(Quantity) * parseFloat(ItemRate) *  parseFloat(FrequencyValue);
-		
-		TotCgst = parseFloat(TotCgst) + parseFloat(AfterCgst);
-		TotSgst = parseFloat(TotSgst) + parseFloat(AfterSgst);
-		TotIgst = parseFloat(TotIgst) + parseFloat(AfterIgst);
-		TotOther = parseFloat(TotOther) + parseFloat(OtherAmt);
-		TotSummary = parseFloat(TotSummary) + parseFloat(TotalVal);
-		TotBasicAmout = parseFloat(TotBasicAmout) + parseFloat(BasicVal);
-		
-		}    
-			
-		
-            }		while (i < rows);  	
-
-		$('#txtTotBasicAmount').val(parseFloat(TotBasicAmout).toFixed(2) );
-		$('#txtTotCgst').val(parseFloat(TotCgst).toFixed(2) );
-		$('#txtTotSgst').val(parseFloat(TotSgst).toFixed(2) );
-		$('#txtTotIgst').val(parseFloat(TotIgst).toFixed(2) );
-		$('#ToatalOtherAllowances').val(parseFloat(TotOther).toFixed(2) );
-		$('#txtTotalOrderValueSummary').val(parseFloat(TotSummary).toFixed(2) );
-		
-}
-
-function calculateEditTaxValue()
- {
-	var Cgst = parseFloat($('#EditAfterCgst').val());
-	var Sgst = parseFloat($('#EditAfterSgst').val());
-	var Igst = parseFloat($('#EditAfterIgst').val());
-	
-  
-	var TottaxAmt = Cgst + Sgst + Igst;
-	return parseFloat(TottaxAmt).toFixed(2); 
- }
-function clearServiceModalFields()
-{
-	// To reset the Modal controls
-	$('#ReqNo').val('0'); 	
-	$('#deptName').val('');	
-	$('#CostCenter').val("0");
-	$('#AvlBudAmt').val('');
-	$('#MaterialCode').val("0")	;
-	$("#ItemName").val('');		
-	$('#UOM').val(''); 
-	$('#Quantity').val('');       
-	$("#Rate").val('');			 
-
-	$("#txtBasicValue").val('');
-	$("#AfterCgst").val(0);
-	$("#AfterSgst").val(0);
-	$("#AfterIgst").val(0);
-	$("#Cgst").val(0);
-	$("#Sgst").val(0);
-	$("#Igst").val(0);
-        $("#OtherAllowances").val(0);
-        $("#txtSpcialInstruction").val('');
-	$("#TotalOrderValue ").val('');
-	$("#Frequency").val('');
-}
-var DeletedMaterialCode='';
-var DeletedMaterialName='';
-function DeleteRow(rowid)
-{
-
-	   var id = [];
-	   var DelRows  = $('#txtDeletedRow').val();
-	  
-	   var tr = document.getElementById(rowid);
-	  
-	   var MaterialCode = $('#materialCode'+rowid).val();
-	   var LineItemNo =$('#LineItemNo'+rowid).val();
-	   var ReqNo =$('#Reqnumber'+rowid).val();
-	   var POType ='<?php echo SERVICE ?>';
-		id[0]= LineItemNo;
-	    id[1]= ReqNo;
-		id[2]= MaterialCode;
-		id[3]= POType;
-		   
-
-	   var answer = confirm(" Do you want to delete the Item from the List?")
-		if (answer) 
-		{ 			
-			populateValueMainFormForDeleteItem(rowid);
-			tr.parentNode.removeChild(tr);
-			
-			var removeItem = $('#materialCode'+rowid).val();
-
-		var materialCode = $('#materialCode'+rowid).val();
-              
-
-			 var removeItem = $('#materialCode'+rowid).val();  
-		 var Material = <?php echo json_encode($MaterialList, JSON_PRETTY_PRINT) ?>;
- for(i=0;i<Material.length;i++)
-		{
-		$.each(Material[i], function (index, value) {
-
-
-      	if (value.MaterialCode==materialCode) {
-
-
-      		                                  //  $("#MaterialCode").append( $('<option></option>').val(value.MaterialCode).html(value.MaterialCode + "-" + value.MaterialName) );
-                      DeletedMaterialCode = $('#materialCode'+rowid).val();
-                    DeletedMaterialName = $('#materialName'+rowid).val();
-      	}
-});
-}
-		
-		  
-		   SelectedMaterialCode.splice( SelectedMaterialCode.indexOf('removeItem'), 1 );
-		   var x = <?php echo json_encode($POItem, JSON_PRETTY_PRINT) ?>; 
-		  
-		   var result = '0';
-		   $.each(x, function(idx, obj) {
-			 
-						if(obj.LineItemNo === LineItemNo)
-						{			 
-						   result = '1';
-						   return  false;	
-						}
-						
-					   });
-					   
-					  // alert(result);
-			if(result == '0')
-			{
-				var DelRows  = $('#txtDeletedRow').val();
-				//tr.parentNode.removeChild(tr);
-				if(DelRows != '')
-					{
-					DelRows = DelRows + ":" + rowid;
-					}
-				else
-					{
-					DelRows=  "0" + ":" + rowid;
-					}
-				$('#txtDeletedRow').val(DelRows);
-			}
-           	// To delete the value from Tables
-			else  if(result == '1')
-			{
-				var DelRows  = $('#txtDeletedRow').val();
-				//tr.parentNode.removeChild(tr);
-				if(DelRows != '')
-					{
-					DelRows = DelRows + ":" + rowid;
-					}
-				else
-					{
-					DelRows=  "0" + ":" + rowid;
-					}
-				$('#txtDeletedRow').val(DelRows);				
-					
-			 $.ajax({ 
-			data:{id:id},
-			type:"POST",
-			url:"<?php echo base_url() ?>purchaseorder/DeletePODetails", 
-			success:function(data) {
-			if(data)
-			{
-				$('#content').loader('hide'); 
-				alert(data);			
-			}
-			else
-			{
-				alert("Error");	
-			}			
-		
-		}});  
-			}		   
-		
-		  // populateValueMainFormForDeleteItem(rowid);
-		  
-		}
-       	
-} 
-function populateValueMainFormForDeleteItem(rowid)
-{
-	  
-		
-       // alert(rows);
-		var TotCgst = $('#txtTotCgst').val();
-		var TotSgst = $('#txtTotSgst').val();
-		var TotIgst = $('#txtTotIgst').val();
-		var TotOtherAmt = $('#ToatalOtherAllowances').val();
-		var TotSummary = $('#txtTotalOrderValueSummary').val();
-		var TotBasicAmout = $('#txtTotBasicAmount').val();
-		
-	  
-			
-		var AfterCgst = $('#AfterCgst'+rowid).val() == '' ? '0.00' : $('#AfterCgst'+rowid).val();
-		var AfterSgst = $('#AfterSgst'+rowid).val() == '' ? '0.00' : $('#AfterSgst'+rowid).val();
-		var AfterIgst = $('#AfterIgst'+rowid).val() == '' ? '0.00' : $('#AfterIgst'+rowid).val();
-		var OtherAmt =  $('#OtherAmt'+rowid).val() == '' ? '0.00' : $('#OtherAmt'+rowid).val();
-		var TotalVal =$('#TotalOrderValue'+rowid).val() == '' ? '0.00' : $('#TotalOrderValue'+rowid).val();
-		
-		var Quantity = $('#quantity'+rowid).val() == '' ? '0.00' : $('#quantity'+rowid).val();
-		var ItemRate = $('#itemRate'+rowid).val() == '' ? '0.00' : $('#itemRate'+rowid).val();	
-                 var FrequencyValue = $('#FrequencyValue'+rowid).val() == '' ? '1.00' : $('#FrequencyValue'+rowid).val();
-		var BasicVal = parseFloat(Quantity) * parseFloat(ItemRate) * parseFloat(FrequencyValue);
-		//alert(TotalVal);
-		
-		TotCgst = parseFloat(TotCgst) -  parseFloat(AfterCgst);
-		TotSgst = parseFloat(TotSgst) - parseFloat(AfterSgst);
-		TotIgst = parseFloat(TotIgst) - parseFloat(AfterIgst);
-		TotOtherAmt = parseFloat(TotOtherAmt) - parseFloat(OtherAmt);
-		TotSummary = parseFloat(TotSummary) - parseFloat(TotalVal);
-		TotBasicAmout = parseFloat(TotBasicAmout) - parseFloat(BasicVal);
-		
-			
-		$('#txtTotBasicAmount').val(parseFloat(TotBasicAmout).toFixed(2) );
-		$('#txtTotCgst').val(parseFloat(TotCgst).toFixed(2) );
-		$('#txtTotSgst').val(parseFloat(TotSgst).toFixed(2) );
-		$('#txtTotIgst').val(parseFloat(TotIgst).toFixed(2) );
-		$('#ToatalOtherAllowances').val(parseFloat(TotOtherAmt).toFixed(2) );
-		$('#txtTotalOrderValueSummary').val(parseFloat(TotSummary).toFixed(2) );	
-
-		
-		
-}
-function validateServiceTax()
- {  
-
-	if($('#ReqNo').val() == "0")
-	{
-		alert('Please select the Requisition Number');
-		$('#ReqNo').focus();
-		return false;
-	}
-	else if($('#CostCenter').val() == "0")
-	{
-		alert('Please select the Cost center');
-		$('#CostCenter').focus();
-		return false;
-	}
-	else if($('#MaterialCode').val() == "0")
-	{
-		alert('Please select the Material Code');
-		$('#MaterialCode').focus();
-		return false;
-	}		
-	else if($('#Quantity').val() == '')
-	{
-		alert('Please Enter the Quantity value');
-		$('#Quantity').focus();
-		return false;
-	}
-	else if($('#Rate').val() == '')
-	{
-		alert('Please Enter the Rate of the Item');
-		$('#Rate').focus();
-		return false;
-	}
-	else if(ExceedQuantityCheck() ==  false)
-	{  
-		return false;
-	}
-	else if(ExceedBudget($('#TotalOrderValue').val(),$('#AvlBudAmt').val()) == false)
-	{
-		 $('#Rate').focus(); 
-				return false;
-	}
-	else
-	{
-		return true;
-	}
-		
- }
- function validateEditServiceTax()
- {  
-
-	if($('#EditCostCenter').val() == "0")
-	{
-		alert('Please select the Cost center');
-		$('#EditCostCenter').focus();
-		return false;
-	}
-	else if($('#EditMaterialCode').val() == "0")
-	{
-		alert('Please select the Material Code');
-		$('#EditMaterialCode').focus();
-		return false;
-	}		
-	else if($('#EditQuantity').val() == '')
-	{
-		alert('Please Enter the Quantity value');
-		$('#EditQuantity').focus();
-		return false;
-	}
-	else if($('#EditRate').val() == '')
-	{
-		alert('Please Enter the Rate of the Item');
-		$('#EditRate').focus();
-		return false;
-	}
-	else if(EditExceedQuantityCheck() ==  false)
-	{  
-		return false;
-	}
-	else if(ExceedBudget($('#EditTotalOrderValue').val(),$('#EditAvlBudAmt').val()) == false)
-	{
-		 $('#EditRate').focus(); 
-		 return false;
-	}
-	else
-	{
-		return true;
-	}
-		
- }
-//
-</script>
-<script>
-
-function Save(status)
-{  
-if(status == '0')
-{
-	stat = '<?php echo PO_DRAFT; ?>';
-}
-else
-{
-	stat = '<?php echo PO_CREATED; ?>';
-}
-var splinstr = $('#txtSpcialInstruction').val();
-var deladd = $('#DeliveryAddr').val();
-$('#txtStatus').val(stat);
-
-tinyMCE.triggerSave();
-var splinstr = $('#ScopeOfWork').val();
-$('#ScopeOfWork').val(splinstr);
-$('#txtDeliveryAddress').val(deladd);
-
-	if(validate())
-		{ 
-	     	if(document.getElementById('ServiceTable').rows.length < 2)
-			{
-				alert('Please Select Line item to Create PO');
-				$('#Deliverydt').focus();
-				return false;
-			}
-			else
-			{	
-			$('#content').loader('show');
-		  $.ajax({ 
-			data:$('.ServicePO').serialize(),
-			type:"POST",
-			url:"<?php echo base_url() ?>servicepurchaseorder/UpdateServicePurchaseOrder", 
-			success:function(data) {
-			if(data)
-			{
-				$('#content').loader('hide'); 
-				alert(data);
-				$('#txtRowCount').val('');
-				$('#txtDeletedRow').val('');
-				$('#txtStatus').val('');
-				$('#SpcialInstruction').val('');
-				$('#txtDeliveryAddress').val('')
-				window.location =	"purchaseorderListing";
-			
-			}
-			else
-			{
-				$('#content').loader('hide'); 
-				alert("Error");	
-			}			
-		
-		}
-  
-});
-			}
-
-}
-}
-// this function is used to clear data changing schedule option
-$('#Scheduleby').change(function(){
-           
-             $("#Deliverydt").datepicker({
-            minDate : 'now',
-            dateFormat: 'mm/dd/yy',changeMonth: true, changeYear: true,yearRange: '0:+10'
-        });
-		
-                
-            });
-            $('#Deliverydt').change(function(){
-            
-           $('#Scheduleby').val('');
-                
-            });
-
-
-
-
-function calculateCgstTax(varBasicValue,Cgst)
- {
-	
-		 var basicValue = parseFloat(varBasicValue);
-		var Cgst = parseFloat(Cgst);	 
-		 var ServiceTaxValue = 0.0;  
-		 
-		 ServiceTaxValue = <?php echo SERVICETAX_CGST; ?>;
-		
-	     var TAXval =  parseFloat(ServiceTaxValue).toFixed(2);
-	 
-		return   TAXval;//  $('#AfterServiceTax').val(TAXval); 
-		 
- }
-function calculateSgstTax(varBasicValue,Sgst)
- {
-	
-		 var basicValue = parseFloat(varBasicValue);
-		var Sgst = parseFloat(Sgst);	 
-		 var ServiceTaxValue = 0.0;  
-		 
-		 ServiceTaxValue = <?php echo SERVICETAX_SGST; ?>;
-		
-	     var TAXval =  parseFloat(ServiceTaxValue).toFixed(2);
-	 
-		return   TAXval;//  $('#AfterServiceTax').val(TAXval); 
-		 
- }
-function calculateIgstTax(varBasicValue,Igst)
- {
-	
-		 var basicValue = parseFloat(varBasicValue);
-		var Igst = parseFloat(Igst);	 
-		 var ServiceTaxValue = 0.0;  
-		 
-		 ServiceTaxValue = <?php echo SERVICETAX_IGST; ?>;
-		
-	     var TAXval =  parseFloat(ServiceTaxValue).toFixed(2);
-	 
-		return   TAXval;//  $('#AfterServiceTax').val(TAXval); 
-		 
- }
-
-</script>
\ No newline at end of file
diff --git a/application/views/addCostCenter.php b/application/views/addCostCenter.php
index e521cfce..57b94a50 100644
--- a/application/views/addCostCenter.php
+++ b/application/views/addCostCenter.php
@@ -70,7 +70,7 @@ $(function() {
     <!-- Content Header (Page header) -->
     <section class="content-header">
       <h1>
-        <center>Siddharth Industries - Add Cost List</center>        
+        <center>Resico Industries - Add Cost List</center>        
       </h1>	  	  	 
     </section>    
     <section class="content">
diff --git a/application/views/addasset.php b/application/views/addasset.php
index 58f2363a..1c250a02 100644
--- a/application/views/addasset.php
+++ b/application/views/addasset.php
@@ -51,7 +51,7 @@ $(function() {
     <!-- Content Header (Page header) -->
     <section class="content-header">
       <h1>
-        <center>Siddharth Industries - Add Asset Details</center>
+        <center>Resico Industries - Add Asset Details</center>
         
       </h1>
     </section>
diff --git a/application/views/addcost.php b/application/views/addcost.php
deleted file mode 100644
index c7029a7c..00000000
--- a/application/views/addcost.php
+++ /dev/null
@@ -1,99 +0,0 @@
-<div class="content-wrapper" style="min-height: 537px;">
-    <!-- Content Header (Page header) -->
-    <section class="content-header">
-      <h1>
-        <center>Cost List</center>
-        
-      </h1>
-	  	  	 
-    </section>
-    
-    <section class="content">
-	<div style="text-align:right;">
-    <a href="<?php echo base_url() ?>costListing" class="btn btn-primary" value="Back"/>Back</a>
-	</div>
-	<br>
-    
-        <div class="row">
-            <!-- left column -->
-            <div class="col-md-12">
-              <!-- general form elements -->
-                
-                
-                
-                <div class="box box-primary">
-                    <div class="box-header">
-                        <center><h3 class="box-title">Add Cost Details</h3></center>
-                    </div><!-- /.box-header -->
-                    <!-- form start -->
-                    
-                    <form role="form" id="addUser" action="<?php echo base_url() ?>addNewcost" method="post" role="form">
-                        <div class="box-body">
-                            <div class="row">
-                                <!--<div class="col-md-6">                                
-                                    <div class="form-group">
-                                        <label for="CostCentreID">Cost Center ID</label>
-                                        <input type="text" class="form-control required" id="CostCentreID" name="CostCentreID" maxlength="128">
-                                    </div>
-                                    
-                                </div>-->
-                                <div class="col-md-6">
-                                    <div class="form-group">
-                                        <label for="CostName">Cost Name</label>
-                                        <input type="text" class="form-control required" id="CostName"  name="CostName" maxlength="128">
-                                    </div>
-                                </div>
-                            
-                           
-                                <div class="col-md-6">
-                                    <div class="form-group">
-                                        <label for="Description">Description</label>
-                                        <input type="text" class="form-control required  " id="Description"  name="Description" maxlength="255">
-                                    </div>
-                                </div>
-                                
-                                    
-                            </div>
-                        </div><!-- /.box-body -->
-    
-                        <div class="box-footer" style="text-align:right">
-                            <input type="submit" class="btn btn-primary" value="Submit" />
-                            <input type="reset" class="btn btn-primary" value="Cancel" />
-                        </div>
-                    </form>
-                </div>
-            </div>
-            <div class="col-md-4">
-                <?php
-                    $this->load->helper('form');
-                    $error = $this->session->flashdata('error');
-                    if($error)
-                    {
-                ?>
-                <div class="alert alert-danger alert-dismissable">
-                    <button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button>
-                    <?php echo $this->session->flashdata('error'); ?>                    
-                </div>
-                <?php } ?>
-                <?php  
-                    $success = $this->session->flashdata('success');
-                    if($success)
-                    {
-                ?>
-                <div class="alert alert-success alert-dismissable">
-                    <button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button>
-                    <?php echo $this->session->flashdata('success'); ?>
-                </div>
-                <?php } ?>
-                
-                <div class="row">
-                    <div class="col-md-12">
-                        <?php echo validation_errors('<div class="alert alert-danger alert-dismissable">', ' <button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button></div>'); ?>
-                    </div>
-                </div>
-            </div>
-        </div>    
-    </section>
-    
-</div>
-<script src="<?php echo base_url(); ?>assets/js/addUser.js" type="text/javascript"></script>
\ No newline at end of file
diff --git a/application/views/assetListing.php b/application/views/assetListing.php
index f048700f..e9227e83 100644
--- a/application/views/assetListing.php
+++ b/application/views/assetListing.php
@@ -4,7 +4,7 @@
     <section class="content">
      <div class="box">
      <div class="box-header">
-                 <CENTER><h3 class="box-title">Siddharth Industries -  Asset Details</h3></CENTER>                   
+                 <CENTER><h3 class="box-title">Resicos Industries -  Asset Details</h3></CENTER>                   
                 </div>
                  <div class="container-fluid">
         <div class="row">
diff --git a/application/views/costListing.php b/application/views/costListing.php
index 21fc3090..14dd7a1c 100644
--- a/application/views/costListing.php
+++ b/application/views/costListing.php
@@ -4,7 +4,7 @@
     <section class="content">
      <div class="box">
      <div class="box-header">
-                 <CENTER><h3 class="box-title">Siddharth Industries -  Cost Details</h3></CENTER>                   
+                 <CENTER><h3 class="box-title">Resico Industries -  Cost Details</h3></CENTER>                   
                 </div>
                  <div class="container-fluid">
         <div class="row">
diff --git a/application/views/editOldcost.php b/application/views/editCostCenter.php
similarity index 99%
rename from application/views/editOldcost.php
rename to application/views/editCostCenter.php
index 7048f2a6..a419ca82 100644
--- a/application/views/editOldcost.php
+++ b/application/views/editCostCenter.php
@@ -172,7 +172,7 @@ $( document ).ready(function() {
     <!-- Content Header (Page header) -->
     <section class="content-header">
       <h1>
-        <center>Siddharth Industries - Edit Cost  Center</center>
+        <center>Resico Industries - Edit Cost  Center</center>
         
       </h1>
 	  	  	 
diff --git a/application/views/editOldRawmaterial.php b/application/views/editRawmaterial.php
similarity index 100%
rename from application/views/editOldRawmaterial.php
rename to application/views/editRawmaterial.php
diff --git a/application/views/editRevenuepurchaseorder.php~ b/application/views/editRevenuepurchaseorder.php~
deleted file mode 100644
index 718c9be5..00000000
--- a/application/views/editRevenuepurchaseorder.php~
+++ /dev/null
@@ -1,4571 +0,0 @@
-<?php $ReqType =''; 
-$CompanyAddress = '';
-$dt = new DateTime('now', new DateTimeZone('Asia/Kolkata'));				
-$CurrentDate =  $dt->format('Y-m-d');
-$MaxPoDate = '';
-$AvlAmount = 0;
-$DeliverSchedule='';
-$DeliverOption='';
-$StatusName='';
-
-if(!empty($MaxPODate))
-{
-    foreach ($MaxPODate as $date)
-    {
-		$MaxPoDate = $date->PODate;		
-	}
-}
-if(!empty($CompanyDetails))
-{
-    foreach ($CompanyDetails as $Req)
-    {
-		$CompanyAddress = $Req->Address;
-	}
-}
-if(!empty($AvlBudAmt))
-{
-   
-		$AvlAmount = number_format($AvlBudAmt, 2, '.', '');		
-	
-}
-
-if(!empty($INRSYMBOL))
-{
-
-	foreach($INRSYMBOL as $INRS)
-	{
-      $INRSYM=$INRS->FontCode2000;
-
-	}
-}
-
-foreach ($PaymentTerms as $TER) 
-{
-    $Terms=$TER->PaymentTerms;
-}
-  
-		$SupId = '';
-        $SupName = '';
-		$Address = '';
-		$PODate = '';
-        $Deliverydt ='';
-		$DeliveryAddress ='';
-		$PONOStatus	 = 	'';
-		$PONO =  	'';
-		$totBasicAmt  = 0;
-		$totDiscountAmt  = 0.0;
-		$totPackagingAmt  = 0.0;
-		$totCgst = 0.0;
-                $totSgst = 0.0;
-                $totIgst = 0.0;
-		$totFreightAmt   = 0.0;
-		$totInsuranceAmt   = 0.0;
-		$totOrderSummaryAmt   = 0.0;
-		
-		$ServiceDescription = '';
-                $CapitalRange = '';
-                $otherPayment='';
-if(!empty($POMaster))
-{
-    foreach ($POMaster as $Req)
-    {
-		$SupId = $Req->SupplierID;
-        $SupName = $Req->SupplierName;
-		$Address = $Req->Address;
-		
-		$Pdt =	new DateTime($Req->PODate);
-		$PODate =  $Pdt->format('Y-m-d');
-		$DeliverOption = $Req->DeliveryOption;
-                $DeliverSchedule = $Req->DeliverySchedule;
-                
-		$Ddt =	new DateTime($Req->DeliveryDate);
-		$Deliverydt =  $Ddt->format('Y-m-d');
-		
-		$DeliveryAddress =$Req->DeliveryAddress;
-		$PONOStatus	 = 	$Req->StatusCode;
-		$PONO = 	$Req->PONO;	
-		$ServiceDescription = $Req->ServiceDescription;
-		$CapitalRange = $Req->CapitalRange;
-                $StatusName=$Req->StatusName;
-                $otherPayment = $Req->PaymentOtherDescription;
-    }
-}
-
-
-
-
-if(!empty($RequistionDetails))
-{
-
-    foreach ($RequistionDetails as $ReqDet) 
-    {
-        $Reqonn=new DateTime($ReqDet->ReqDate);
-        $Reqon=$Reqonn->format('Y-m-d');
-       
-  //       $Pdt =	new DateTime($Req->PODate);
-		// $PODate =  $Pdt->format('Y-m-d');
-        $Requestedby=$ReqDet->Requestedby;
-        $RequesterName=$ReqDet->FirstName;
-        //$Status=$ReqDet->Status;
-    }
-}
-
-
-// foreach ($POSTATUS as $PST ) 
-// {
-//    $POStatus=$PST->StatusName;
-// }
-
-?>
-<style>
-            
-			#packagingcalmodel {
-	margin-top:200px;
-	z-index: 1080 !important;
-}
-		#ExciseDutyCalModel {
-	margin-top:200px;
-	z-index: 1080 !important;
-}	
-#VatCalModel {
-	margin-top:200px;
-	z-index: 1080 !important;
-}	
-#CSTCalModel {
-	margin-top:200px;
-	z-index: 1080 !important;
-}	
-.modal
-{
-	padding-right:30% ! important;
-}
-
-            </style>
-<script src="<?php echo base_url(); ?>assets/js/CreatePOValidation.js" type="text/javascript"></script>
-  <script src="<?php echo base_url()?>assets/tinymce/js/tinymce/tinymce.min.js"></script>
- 
-<script type="text/javascript">
-      tinymce.init({
-          selector: "textarea#txtSpcialInstruction",
-          menubar: false,
-           statusbar: false,
-           toolbar: false
-        });
-      
-       </script>
-<script type="text/javascript">
-
-    var DelOpt = '<?php echo $DeliverOption; ?>';
-    var SchName = <?php echo json_encode($DeliverSchedule); ?>;
-    var DelDt = '<?php echo $Deliverydt; ?>';
-$(document).ready(function () {
-
-     if(DelOpt=="0"){
-
- $('#Deliverydtdiv').show();
-                    $('#Schedulediv').hide();
-$('#Deliverydt').val(DelDt);
- }
-
- else if(DelOpt=="1"){
-
- $('#Deliverydtdiv').hide();
-                    $('#Schedulediv').show();
-$('#Deliverydt').val('');
-
-$('#Scheduleby').val(SchName);
-}
-var PaymentOther = '<?php echo $otherPayment; ?>';
-var PayTerms = '<?php echo $Terms; ?>';
-if(PayTerms=='PT08'){
- $('#otheroptiondiv').show();
-                    $('#Otherpayment').val(PaymentOther);
-}
-else{
-$('#otheroptiondiv').hide();
-                    $('#Otherpayment').val('');
-}
-});
-</script>
-<script>
- var NilType = '<?php echo NILTYPE;?>';
- var PercentageType = '<?php echo PERCENTAGE;?>';
- var POMaxDate = '<?php echo $MaxPoDate;?>';
- var PackagingCalculation = '';
- var ExciseCalculation = '';
- var StateTaxCheck = '';
- var VatCalculation = '';
- var CSTCalculation = '';
- var RequistQuantity = '';
- var IsEdit = '0';
- var d = new Date(POMaxDate);
-var SelectedMaterialCode = [];
- var CollIndex = 0;	
-  var SelectedMaterialList = {
-    Mat: []
-};
-// alert(new Date(year,month,day));
-$(function() {
-	  
-  $("#PODate").datepicker({
-	minDate : d,
-	maxDate : 'now',
-	dateFormat: 'mm/dd/yy',changeMonth: true, changeYear: true,yearRange: '-100:+0'
-});
- $("#Deliverydt").datepicker({
-	minDate : 'now',	
-	dateFormat: 'mm/dd/yy',changeMonth: true, changeYear: true,yearRange: '0:+10'
-});
- 
-	
-$('#drpSupplier').change(function() {
-    
- var id = $('#drpSupplier').val();
- $("#SupAddress").val('');
- 
-		if(id != '0')
-		{
-			var y = <?php echo json_encode($Suplist, JSON_PRETTY_PRINT) ?>;
-                          var Payment = <?php echo json_encode($Payment, JSON_PRETTY_PRINT) ?>;
-                        var PaymentID='';
-	 	     $('#PaymentTerms').empty();
-	 			
-		$.each(y, function(idx, obj) {
-			if(obj.SupplierID === id)
-			{
-				$("#SupAddress").val(obj.Address);
-				 PaymentID = obj.PaymentID;
-              
-				
-			}
-			
-		});
-                 if(PaymentID!='PT08'){
-                 $('#otheroptiondiv').hide();  
-                    $('#Otherpayment').val('');
-                    }
-                 $.each(Payment, function(pay, payobj) {
-			if(payobj.PaymentID == PaymentID)
-			{
-                                
-                        
-                         $("#PaymentTerms").append($('<option></option>').val(payobj.PaymentID).html(payobj.PaymentTerms));
-				
-			}
-                      
-			
-		});
-                 $.each(Payment, function(pay, payobj) {
-			if(payobj.PaymentID == PaymentID)
-			{
-                               				
-			}
-                        else{
-                    $("#PaymentTerms").append( $('<option></option>').val(payobj.PaymentID).html(payobj.PaymentTerms));
-
-                           }
-			
-		});
-			
-		}
-		else
-		{
-			alert('Please select the SupplierID');
-			return false;
-		}
-  
-});	
-
-$('#ReqNo').change(function() {
-    
- var id = $('#ReqNo').val();
- $("#deptName").val('');
-  $("#CostCenter").val('');
-  $("#MaterialCode").empty();
-  $("#ItemName").val('');
-$("#UOM").val('');
-$("#Quantity").val('');
-$("#ItemName").val('');
-$("#Rate").val('');
-$("#txtBasicValue").val('');
-$("#AvlBudAmt").val('');	
- resetTaxField();
-		if(id != '0')
-		{
-			var y = <?php echo json_encode($RequistionDetails, JSON_PRETTY_PRINT) ?>;
-			
-			var Material = <?php echo json_encode($MaterialList, JSON_PRETTY_PRINT) ?>;
-
-
-			var AvlBudAmt = '<?php echo $AvlAmount ?>';  
-		// For Binding DepartmentName	           			
-		$.each(y, function(idx, obj) {
-			if(obj.ReqNo === id)
-			{
-				$("#deptName").val(obj.DepartmentName);
-				$("#CostCenter").val(obj.CostCenterCode);
-			}			
-		});
-			$("#AvlBudAmt").val(AvlBudAmt);		
-		// For Binding Material list center for the selected Requistion Number	
-		$("#MaterialCode").append( $('<option></option>').val("0").html("Select Material Code") );
-	
-		var isAdded = "0";
-		 for(i=0;i<Material.length;i++)
-		{
-		$.each(Material[i], function(idx, obj) {
-			
-				if(obj.ReqNo === id )
-				{
-									   
-						$.each(SelectedMaterialList.Mat, function(idx1, el){															
-							if (id == el.ReqNo )
-							{
-															
-								if(el.materialCode == obj.MaterialCode)
-								{
-										isAdded  = "1";
-										return false;																		
-								}
-								else
-								{
-									isAdded  = "0";
-								}
-								
-							}
-					});
-					
-					 
-						if(isAdded  == "0")
-						{
-							
-							$("#MaterialCode").append( $('<option></option>').val(obj.MaterialCode).html(obj.MaterialCode + "-" + obj.MaterialName));
-						}
-												
-				}
-			
-			
-		});
-		}
-		}
-		else
-		{
-			alert('Please select the Requisition Number');
-			return false;
-		}
-		id = '';
-  
-});	
-$('#MaterialCode').change(function() {
-    
- var id = $('#MaterialCode').val();
- $("#ItemName").val('');
-$("#UOM").val('');
-$("#Quantity").val('');
-$("#ItemName").val('');
-$("#Rate").val('');
-$("#txtBasicValue").val('');
- RequistQuantity = '';
- resetTaxField();
-		if(id != '0')
-		{
-			var Material = <?php echo json_encode($MaterialList, JSON_PRETTY_PRINT) ?>;
-			
-		  for(i=0;i<Material.length;i++)
-			{
-				$.each(Material[i], function(idx, obj) {
-					if(obj.MaterialCode === id)
-					{
-						$("#ItemName").val(obj.MaterialName);
-						$("#UOM").val(obj.UOM);
-						$("#Quantity").val(obj.Quantity);
-						RequistQuantity	= 	obj.Quantity;		
-					}			
-				});			
-			}
-		}
-		else
-		{
-			alert('Please select the MaterialCode');
-			return false;
-		}
-  
-});
-
-$('#EditMaterialCode').change(function() {
-    
- var id = $('#EditMaterialCode').val();
- $("#EditItemName").val('');
-$("#EditUOM").val('');
-$("#EditQuantity").val('');
-$("#EditRate").val('');
-$("#txtEditBasicValue").val('');
- RequistQuantity = '';
- resetTaxField();
-		if(id != '0')
-		{
-			var Material = <?php echo json_encode($MaterialList, JSON_PRETTY_PRINT) ?>;
-			
-		 for(i=0;i<Material.length;i++)
-			{
-				$.each(Material[i], function(idx, obj) {
-					if(obj.MaterialCode === id)
-					{
-						$("#EditItemName").val(obj.MaterialName);
-						$("#EditUOM").val(obj.UOM);
-						$("#EditQuantity").val(obj.Quantity);
-						RequistQuantity	= 	obj.Quantity;		
-					}			
-				});			
-			}
-		}
-		else
-		{
-			alert('Please select the MaterialCode');
-			return false;
-		}
-  
-});
-
-
-/* Revenue Tax calcualation */
-
- $('#DiscountType').change(function() {
-    selValue = $("#DiscountType").val(); 
-	 $('#txtDiscount').val('');
-	 $('#txtAfterDiscount').val(''); 
-	if (selValue == NilType)
-	{
-      
-		 $('#txtDiscount').attr('readonly', 'true');
-		 $('#txtDiscount').val('0.00');
-		 $('#txtAfterDiscount').val('0.00');
-		 
-	}
-	else
-	{
-		 $('#txtDiscount').removeAttr( 'readonly','true' );
-		 $('#txtDiscount').val('');
-		  $('#txtAfterDiscount').val('');
-	}
-
-change();
-  
-});
-
-
-
-$('#EditDiscountType').change(function() {
-    selValue = $("#EditDiscountType").val(); 
-	 $('#txtEditDiscount').val('');
-	 $('#txtEditAfterDiscount').val(''); 
-	if (selValue == NilType)
-	{
-      
-		 $('#txtEditDiscount').attr('readonly', 'true');
-		 $('#txtEditDiscount').val('0.00');
-		 $('#txtEditAfterDiscount').val('0.00');
-		 
-	}
-	else
-	{
-		 $('#txtEditDiscount').removeAttr( 'readonly','true' );
-		 $('#txtEditDiscount').val('');
-		  $('#txtEditAfterDiscount').val('');
-	}
-
-Editchange();
-  
-});
-
-$('#PackagingType').change(function() {
-	 $('#txtPackaging').val('');
-	 $('#txtAfterPackaging').val(''); 
-    selValue = $("#PackagingType").val() ;
-	if(selValue == PercentageType)
-	{		
-         var PackagingCalculation = '';
-		 $('#packagingcalmodel').modal('show');
-		 $('#txtPackaging').removeAttr( 'readonly','true' );
-	}
-	else
-	{
-	if (selValue == NilType)
-	{
-     
-		 $('#txtPackaging').attr('readonly', 'true');
-		 $('#txtPackaging').val('0.00');
-		}
-	else
-	{
-		 $('#txtPackaging').removeAttr( 'readonly','true' );
-	}
-	}
-calculatePackaging(0);
-
-  
-});
-$('#EditPackagingType').change(function() {
-	 $('#txtEditPackaging').val('');
-	 $('#txtEditAfterPackaging').val(''); 
-    selValue = $("#EditPackagingType").val() ;
-	if(selValue == PercentageType)
-	{		
-         var PackagingCalculation = '';
-		 $('#packagingcalmodel').modal('show');
-		 $('#txtEditPackaging').removeAttr( 'readonly','true' );
-	}
-	else
-	{
-	if (selValue == NilType)
-	{
-     
-		 $('#txtEditPackaging').attr('readonly', 'true');
-		 $('#txtEditPackaging').val('0.00');
-		}
-	else
-	{
-		 $('#txtEditPackaging').removeAttr( 'readonly','true' );
-	}
-	}
-calculatePackaging(1);
-
-  
-});
-
-$('#txtExciseDuty').change(function() {
-
-				
-		$('#ExciseDutyCalModel').modal('show');	
-});
-$('#txtEditExciseDuty').change(function() {
-				
-		$('#ExciseDutyCalModel').modal('show');	
-	
-	
-});
-$('#txtVat').change(function() {
-	
-				
-		$('#VatCalModel').modal('show');	
-	
-	
-});
-$('#txtEditVat').change(function() {
-	
-				
-		$('#VatCalModel').modal('show');	
-	
-	
-});
-
-$('#txtCST').change(function() {
-			
-		$('#CSTCalModel').modal('show');	
-	
-	
-});
-$('#txtEditCST').change(function() {
-	
-			
-		$('#CSTCalModel').modal('show');
-		
-		});
-$('#drpFreight').change(function() {
-	 var FreightType =$("#drpFreight").val();
-	
-	if (FreightType == "PER TRIP")
-				{
-					 
-					 $('#TripsValue').show();
-				}
-				else {
-					 
-					 $('#TripsValue').hide();	 
-				}
-	
-    selValue = $("#drpFreight").val() ;
-	 $('#txtFreight').val('');
-	  $('#txtAfterFreight').val('');
-	 
-	if (selValue == NilType)
-	{
-     
-		 $('#txtFreight').attr('readonly', 'true');
-		 $('#txtFreight').val('0.00');
-		
-	}
-	else
-	{
-		 $('#txtFreight').removeAttr( 'readonly','true' );
-		 $('#txtFreight').val('');
-		
-		
-	}
-  calculateFreight(0);
-
-});
-/* $('#drpViewFreight').change(function() {
-	var FreightType =$("#drpViewFreight").val();
-	 
-	if (FreightType == "PER TRIP")
-				{
-					 
-					 $('#ViewTripsValue').show();
-				}
-				else {
-					 
-					 $('#ViewTripsValue').hide();	 
-				}
-}); */
-$('#drpEditFreight').change(function() {
-  	var FreightType =$("#drpEditFreight").val();
-	
-	if (FreightType == "PER TRIP")
-				{
-					 
-					 $('#EditTripsValue').show();
-				}
-				else {
-					 
-					 $('#EditTripsValue').hide();	 
-				}  
-	
-    selValue = $("#drpEditFreight").val() ;
-	 $('#txtEditFreight').val('');
-	  $('#txtEditAfterFreight').val('');
-	 
-	if (selValue == NilType)
-	{
-     
-		 $('#txtEditFreight').attr('readonly', 'true');
-		 $('#txtEditFreight').val('0.00');
-		
-	}
-	else
-	{
-		 $('#txtEditFreight').removeAttr( 'readonly','true' );
-		 $('#txtEditFreight').val('');
-	}
-    calculateFreight(1);
-  
-});
-});
-
-/*
- * To calcuate the Discount  */
-function calculateDiscount(isEdit)
- {  
-	if(isEdit == '0')
-	{
-     if($('#MaterialCode').val() == "0")
-	 {
-		 alert('Please Select the Material Code');
-		$('#MaterialCode').focus();
-		return false;
-	 }
-	 else if($('#Rate').val() == '')
-	 {
-		  alert('Please Enter the Rate value');
-		  $('#Rate').focus();
-		  return false;
-	 }
-    if($('#Rate').val() != '' && $('#MaterialCode').val() != "0" )
-	{
-	
-	 var basicValue = parseFloat($('#txtBasicValue').val());
-	 var DiscountType =$("#DiscountType").val();
-	
-	 if(DiscountType == "0")
-	 {
-		alert('Please Select the discount Type');
-		$('#txtDiscount').val('');
-		$("#DiscountType").focus(); 
-	 }
-	 else  if ($('#txtDiscount').val() != '' && $('#txtDiscount').val() != '0')
-	 {
-	 var AfterDiscount = 0.0;
-	  var Discountval = parseFloat($('#txtDiscount').val());
-	 if(DiscountType == PercentageType)
-	 {
-		
-		AfterDiscount = <?php echo DIS_PERCENTAGE;?>;	
-		  	  
-	 }
-	 else if(DiscountType == NilType )
-	 {
-	    AfterDiscount = "0.00";				
-	 }
-	 else
-	 {
-		 AfterDiscount = <?php echo DIS_LUMPSUM;?>;			 	
-	 }
-		var discount = parseFloat(AfterDiscount).toFixed(2);
-		$('#txtAfterDiscount').val(discount);	 
-	 }
-	else
-	{
-		$('#txtAfterDiscount').val("0.00");	 
-	}
-	}
-		calculateTotalValue();	
-	}
-	else
-	{
-			if($('#EditMaterialCode').val() == "0")
-			 {
-				 alert('Please Select the Material Code');
-				$('#EditMaterialCode').focus();
-				return false;
-			 }
-			 else if($('#EditRate').val() == '')
-			 {
-				  alert('Please Enter the Rate value');
-				  $('#EditRate').focus();
-				  return false;
-			 }
-			if($('#EditRate').val() != '' && $('#EditMaterialCode').val() != "0" )
-			{
-			
-			 var basicValue = parseFloat($('#txtEditBasicValue').val());
-			 var DiscountType =$("#EditDiscountType").val();
-			
-			 if(DiscountType == "0")
-			 {
-				alert('Please Select the discount Type');
-				$('#txtEditDiscount').val('');
-				$("#EditDiscountType").focus(); 
-			 }
-			 else  if ($('#txtEditDiscount').val() != '' && $('#txtEditDiscount').val() != '0')
-			 {
-			 var AfterDiscount = 0.0;
-			  var Discountval = parseFloat($('#txtEditDiscount').val());
-			 if(DiscountType == PercentageType)
-			 {
-				
-				AfterDiscount = <?php echo DIS_PERCENTAGE;?>;	
-					  
-			 }
-			 else if(DiscountType == NilType )
-			 {
-				AfterDiscount = "0.00";				
-			 }
-			 else
-			 {
-				 AfterDiscount = <?php echo DIS_LUMPSUM;?>;			 	
-			 }
-				var discount = parseFloat(AfterDiscount).toFixed(2);
-				$('#txtEditAfterDiscount').val(discount);	 
-			 }
-			else
-			{
-				$('#txtEditAfterDiscount').val("0.00");	 
-			}
-			}
-				calculateEditTotalValue();	
-	}
- }
- /*
- * To calcuate the Packaging  */
-function calculatePackaging(isEdit)
- {
-	if(isEdit == '0')
-	{ 
-			  if($('#MaterialCode').val() == "0")
-			 {
-				 alert('Please Select the Material Code');
-				$('#MaterialCode').focus();
-				return false;
-			 }
-			 else if($('#Rate').val() == '')
-			 {
-				  alert('Please Enter the Rate value');
-				  $('#Rate').focus();
-				  return false;
-			 }			 
-			 else
-			 {
-			 
-			 var basicValue = parseFloat($('#txtBasicValue').val());
-			  
-			 var PackagingType =$("#PackagingType").val();
-			 
-			  if(PackagingType == "0")
-			  {
-				  alert('Please select the Packaging Type');
-				  $('#txtPackaging').val('');
-				  $("#PackagingType").focus();
-			  }
-			
-			 else if($('#txtPackaging').val() != '' && $('#txtPackaging').val() !='0')
-			 {
-				 var Packagingvalue = parseFloat($('#txtPackaging').val()); 
-			     var AfterPackaging = 0.0;
-			 
-			 if(PackagingType == PercentageType)
-			 {
-				 if($(PackagingCalculation  != 0 && '#txtAfterDiscount').val() == '')
-				{
-				  alert('Please Enter the Discount value');
-				  $('#txtPackaging').val('');
-				  $('#DiscountType').focus();
-				  
-				  return false;
-				}
-				else
-				{
-					var AfterDiscount =parseFloat($('#txtAfterDiscount').val());
-					AfterPackaging = PackagingCalculation == 0 ? <?php echo PACKAGING_PERCENTAGE_BYBASICVALUE ;?> : <?php echo PACKAGING_PERCENTAGE_BYDISCOUNTVALUE;?> ;
-				}
-				
-			 }
-			 else if(PackagingType == NilType )
-			 {
-				AfterPackaging = "0.00";
-				
-			 }
-			 else
-			 {
-				 
-				 
-				AfterPackaging = PackagingCalculation == 0 ?  <?php echo PACKAGING_LUMPSUM_BYBASICVALUE ;?>:<?php echo PACKAGING_LUMPSUM_BYDISCOUNTVALUE;?> ;
-				
-			 }
-				var Packaging =  parseFloat(AfterPackaging).toFixed(2);
-			 
-				$('#txtAfterPackaging').val(Packaging); 
-			 }
-			 else
-			 {
-				 $('#txtAfterPackaging').val("0.00"); 
-			 }
-		   }
-		   calculateTotalValue();	
-	}
-	else
-	{
-		 if($('#EditMaterialCode').val() == "0")
-			 {
-				 alert('Please Select the Material Code');
-				$('#EditMaterialCode').focus();
-				return false;
-			 }
-			 else if($('#EditRate').val() == '')
-			 {
-				  alert('Please Enter the Rate value');
-				  $('#EditRate').focus();
-				  return false;
-			 }
-			 
-			 else
-			 {
-			 
-			 var basicValue = parseFloat($('#txtEditBasicValue').val());
-			  
-			 var PackagingType =$("#EditPackagingType").val();
-			 
-			  if(PackagingType == "0")
-			  {
-				  alert('Please select the Packaging Type');
-				  $('#txtEditPackaging').val('');
-				  $("#EditPackagingType").focus();
-			  }
-			
-			 else if($('#txtEditPackaging').val() != '' && $('#txtEditPackaging').val() !='0')
-			 {
-				 var Packagingvalue = parseFloat($('#txtEditPackaging').val()); 
-				var AfterPackaging = 0.0;
-			 
-			 if(PackagingType == PercentageType)
-			 {
-				if(PackagingCalculation  != 0 &&$('#txtEditAfterDiscount').val() == '')
-				{
-				  alert('Please Enter the Discount value');
-				  $('#EditDiscountType').focus();
-				  $('#txtEditPackaging').val('');
-				  return false;
-				}
-				else
-				{
-					var AfterDiscount =parseFloat($('#txtEditAfterDiscount').val());
-					AfterPackaging = PackagingCalculation == 0 ? <?php echo PACKAGING_PERCENTAGE_BYBASICVALUE ;?> : <?php echo PACKAGING_PERCENTAGE_BYDISCOUNTVALUE;?> ;
-				}
-				
-			 }
-			 else if(PackagingType == NilType )
-			 {
-				AfterPackaging = "0.00";
-			 }
-			 else
-			 {
-				 				 
-				AfterPackaging = PackagingCalculation == 0 ?  <?php echo PACKAGING_LUMPSUM_BYBASICVALUE ;?>:<?php echo PACKAGING_LUMPSUM_BYDISCOUNTVALUE;?> ;
-				
-			 }
-				var Packaging =  parseFloat(AfterPackaging).toFixed(2);
-			 
-				$('#txtEditAfterPackaging').val(Packaging); 
-			 }
-			 else
-			 {
-				 $('#txtEditAfterPackaging').val("0.00"); 
-			 }
-		   }
-		   calculateEditTotalValue();	
-	}
- }
- 
- function calculateExcise(isEdit)
- {
-	 if(isEdit == '0')
-	{ 
-	
-	if($('#MaterialCode').val() == "0")
-	 {
-		 alert('Please Select the Material Code');
-		$('#MaterialCode').focus();
-		$('#txtExciseDuty').val('');
-		return false;
-	 }
-	 else if($('#Rate').val() == '')
-	 {
-		  alert('Please Enter the Rate value');
-		  $('#txtExciseDuty').val('');
-		  $('#Rate').focus();
-		  return false;
-	 }
-	 
-	 else
-	 {
-		 var basicValue = parseFloat($('#txtBasicValue').val());	
-		
-		
-		 if($('#txtExciseDuty').val() != '' && $('#txtExciseDuty').val() != '0')
-		 {
-		 var AfterExciseDuty = 0.0;  
-		 var ExciseDuty = parseFloat($('#txtExciseDuty').val());
-		if(ExciseCalculation == '0')
-		{
-			AfterExciseDuty = <?php echo EXCISE_ONBASICVALUE; ?>;
-		}
-		else if(ExciseCalculation == '1')
-		{
-			 if($('#txtAfterDiscount').val() == '')
-			{
-				alert('Please Enter the Discount value');
-				$('#DiscountType').focus();
-				$('#txtExciseDuty').val('');
-			return false;
-			}
-			else
-			{
-			 var AfterDiscount =parseFloat($('#txtAfterDiscount').val());
-			 AfterExciseDuty = <?php echo EXCISE_ONBASIC_DISCOUNT; ?>;
-			}
-		}
-		else if(ExciseCalculation == '2')
-		{
-			 if($('#txtAfterDiscount').val() == '')
-			{
-				alert('Please Enter the Discount value');
-				$('#DiscountType').focus();
-				$('#txtExciseDuty').val('');
-			   return false;
-			}
-			 else if($('#txtAfterPackaging').val() == '')
-			{
-				alert('Please Enter the Packaging value');
-				$('#PackagingType').focus();
-				$('#txtExciseDuty').val('');
-				return false;
-				
-			}
-			else
-			{
-				var AfterDiscount =parseFloat($('#txtAfterDiscount').val());
-				 var AfterPackaging = parseFloat($('#txtAfterPackaging').val());
-				AfterExciseDuty = <?php echo EXCISE_ONBASIC_DISCOUNT_PACKAGING; ?>;
-			}
-		}
-		else
-		{
-			if($('#txtAfterPackaging').val() == '')
-			{
-				alert('Please Enter the Packaging value');
-				$('#PackagingType').focus();
-				$('#txtExciseDuty').val('');
-				return false;
-			}
-			else
-			{
-				 AfterExciseDuty = <?php echo EXCISE_ONBASIC_PACKAGING; ?>;
-				 var AfterPackaging = parseFloat($('#txtAfterPackaging').val());
-			}
-		}
-		var ExciseVal =  parseFloat(AfterExciseDuty).toFixed(2);
-	 
-		$('#txtAfterExciseDuty').val(ExciseVal); 
-		 }
-		 else
-		 {
-			 $('#txtAfterExciseDuty').val("0.00"); 
-		 }
-		
-	 } 
-	    calculateTotalValue();	
-	}
-	else
-	{
-		if($('#EditMaterialCode').val() == "0")
-	 {
-		 alert('Please Select the Material Code');
-		$('#EditMaterialCode').focus();
-		return false;
-	 }
-	 else if($('#EditRate').val() == '')
-	 {
-		  alert('Please Enter the Rate value');
-		  $('#EditRate').focus();
-		  return false;
-	 }
-	 
-	 else
-	 {
-		 
-		 var basicValue = parseFloat($('#txtEditBasicValue').val());
-		
-		
-		
-		 if($('#txtEditExciseDuty').val() != '' && $('#txtEditExciseDuty').val() != '0')
-		 {
-			var AfterExciseDuty = 0.0;  
-		  var ExciseDuty = parseFloat($('#txtEditExciseDuty').val());
-		if(ExciseCalculation == '0')
-		{
-			AfterExciseDuty = <?php echo EXCISE_ONBASICVALUE; ?>;
-		}
-		else if(ExciseCalculation == '1')
-		{
-			 if($('#txtEditAfterDiscount').val() == '')
-			{
-				alert('Please Enter the Discount value');
-				$('#EditDiscountType').focus();
-				$('#txtEditExciseDuty').val('');
-				return false;
-			}
-			else
-			{
-				 var AfterDiscount =parseFloat($('#txtEditAfterDiscount').val());
-				 AfterExciseDuty = <?php echo EXCISE_ONBASIC_DISCOUNT; ?>;
-			}
-		}
-		else if(ExciseCalculation == '2')
-		{
-			 if($('#txtEditAfterDiscount').val() == '')
-			{
-				alert('Please Enter the Discount value');
-				$('#EditDiscountType').focus();
-				$('#txtEditExciseDuty').val('');
-				return false;
-			}
-			else if($('#txtEditAfterPackaging').val() == '')
-			{
-				alert('Please Enter the Packaging value');
-				$('#EditPackagingType').focus();
-				$('#txtEditExciseDuty').val('');
-				return false;
-			}
-			else
-			{
-				var AfterDiscount =parseFloat($('#txtEditAfterDiscount').val());
-				 var AfterPackaging = parseFloat($('#txtEditAfterPackaging').val());
-				AfterExciseDuty = <?php echo EXCISE_ONBASIC_DISCOUNT_PACKAGING; ?>;
-			}
-		}
-		else
-		{
-			if($('#txtEditAfterPackaging').val() == '')
-			{
-				alert('Please Enter the Packaging value');
-				$('#EditPackagingType').focus();
-				$('#txtEditExciseDuty').val('');
-				return false;
-			}
-			else
-			{
-				var AfterPackaging = parseFloat($('#txtEditAfterPackaging').val());
-				AfterExciseDuty = <?php echo EXCISE_ONBASIC_PACKAGING; ?>;
-			}
-		}
-		var ExciseVal =  parseFloat(AfterExciseDuty).toFixed(2);
-	 
-		$('#txtEditAfterExciseDuty').val(ExciseVal); 
-		 }
-		 else
-		 {
-			 $('#txtEditAfterExciseDuty').val("0.00"); 
-		 }
-		
-	 } 
-	 calculateEditTotalValue();	
-	}
-	 
- }
- 
- function calculateVat(isEdit)
- {
-	 if(isEdit == '0')
-	{ 
-		if($('#MaterialCode').val() == "0")
-		 {
-			 alert('Please Select the Material Code');
-			$('#MaterialCode').focus();
-			return false;
-		 }
-		 else if($('#Rate').val() == '')
-		 {
-			  alert('Please Enter the Rate value');
-			  $('#Rate').focus();
-			  return false;
-		 }	 
-		
-		 else
-		 {		
-        	 var basicValue = parseFloat($('#txtBasicValue').val());			
-				var AfterVat = 0.0;
-			 if(VatCalculation != 0 && $('#txtVat').val() != '' )
-			 {
-			  
-					if($('#txtAfterExciseDuty').val() == '')
-						{
-							alert('Please Enter the Excise value');
-							$('#txtExciseDuty').focus();
-							$('#txtVat').val('');
-							return false;
-						}
-						else
-						{
-							var ExciseDuty = parseFloat($('#txtAfterExciseDuty').val()); 
-							vatValue = parseFloat($('#txtVat').val());
-							AfterVat = <?php echo VAT_ONEXICSEVALUE; ?>;
-							var Vatval =  parseFloat(AfterVat).toFixed(2);
-		 
-							$('#txtAfterVat').val(Vatval); 
-						}
-			 }
-			 else if(VatCalculation == 0 && $('#txtVat').val() != '')
-			 {
-					vatValue = parseFloat($('#txtVat').val());
-					AfterVat =  <?php echo VAT_ONBASICVALUE; ?>;
-					var Vatval =  parseFloat(AfterVat).toFixed(2);
-		 
-					$('#txtAfterVat').val(Vatval); 
-			 }				
-			 
-			 else
-			 {
-				 $('#txtAfterVat').val("0.00"); 
-			 }
-		  	calculateTotalValue();		
-		 } 
-		 
-	}
-	else
-	{
-		if($('#EditMaterialCode').val() == "0")
-		 {
-			 alert('Please Select the Material Code');
-			$('#EditMaterialCode').focus();
-			return false;
-		 }
-		 else if($('#EditRate').val() == '')
-		 {
-			  alert('Please Enter the Rate value');
-			  $('#EditRate').focus();
-			  return false;
-		 }	 
-		 
-		 else
-		 {
-			 var basicValue = parseFloat($('#txtEditBasicValue').val());
-			 var ExciseDuty = parseFloat($('#txtEditAfterExciseDuty').val());
-			  var AfterVat = 0.0; 
-			  if(VatCalculation != 0 && $('#txtEditVat').val() != '' )
-			 {
-			  
-					if($('#txtEditAfterExciseDuty').val() == '')
-						{
-							alert('Please Enter the Excise value');
-							$('#txtEditAfterExciseDuty').focus();
-							$('#txtEditVat').val('');
-							return false;
-						}
-						else
-						{
-							var ExciseDuty = parseFloat($('#txtEditAfterExciseDuty').val()); 
-							vatValue = parseFloat($('#txtEditVat').val());
-							AfterVat = <?php echo VAT_ONEXICSEVALUE; ?>;
-							var Vatval =  parseFloat(AfterVat).toFixed(2);
-		 
-							$('#txtEditAfterVat').val(Vatval); 
-						}
-			 }
-			 else if(VatCalculation == 0 && $('#txtEditVat').val() != '')
-			 {
-					vatValue = parseFloat($('#txtEditVat').val());
-					AfterVat =  <?php echo VAT_ONBASICVALUE; ?>;
-					var Vatval =  parseFloat(AfterVat).toFixed(2);
-		 
-					$('#txtEditAfterVat').val(Vatval); 
-			 }				
-			 
-			 else
-			 {
-				 $('#txtEditAfterVat').val("0.00"); 
-			 }
-			 
-			calculateEditTotalValue();	
-		 } 
-		 
-	}
- }
- function calculateCST(isEdit)
- {
-	 if(isEdit == '0')
-	{ 
-			if($('#MaterialCode').val() == "0")
-			 {
-				 alert('Please Select the Material Code');
-				$('#MaterialCode').focus();
-				return false;
-			 }
-			 else if($('#Rate').val() == '')
-			 {
-				  alert('Please Enter the Rate value');
-				  $('#Rate').focus();
-				  return false;
-			 }	 
-			 
-			 else
-			 {
-				 var basicValue = parseFloat($('#txtBasicValue').val());
-				  var AfterCST = 0.0; 
-				  if(CSTCalculation != 0 && $('#txtCST').val() != '' )
-				{
-			  
-					if($('#txtAfterExciseDuty').val() == '')
-						{
-							alert('Please Enter the Excise value');
-							$('#txtExciseDuty').focus();
-							$('#txtAfterCST').val('');
-							return false;
-						}
-						else
-						{
-							var ExciseDuty = parseFloat($('#txtAfterExciseDuty').val()); 
-							var CSTValue= parseFloat($('#txtCST').val()); 
-							AfterCST = <?php echo CST_ONBASICVALUE; ?>;
-							var Vatval =  parseFloat(AfterCST).toFixed(2);
-		 
-							$('#txtAfterCST').val(Vatval); 
-						}
-			 }
-			 else if(CSTCalculation == 0 && $('#txtCST').val() != '')
-			 {
-					var CSTValue= parseFloat($('#txtCST').val()); 
-					AfterCST =  <?php echo CST_ONBASICVALUE; ?>;
-					var Vatval =  parseFloat(AfterCST).toFixed(2);
-		 
-					$('#txtAfterCST').val(Vatval); 
-			 }				
-			 
-			 else
-			 {
-				 $('#txtAfterCST').val("0.00"); 
-			 }				
-				calculateTotalValue();
-			 }
-		
-		}
-		else
-		{
-			if($('#EditMaterialCode').val() == "0")
-			 {
-				 alert('Please Select the Material Code');
-				$('#EditMaterialCode').focus();
-				return false;
-			 }
-			 else if($('#EditRate').val() == '')
-			 {
-				  alert('Please Enter the Rate value');
-				  $('#EditRate').focus();
-				  return false;
-			 }	 
-			 
-			 else
-			 {
-				 
-				 var basicValue = parseFloat($('#txtEditBasicValue').val());
-				  var AfterCST = 0.0; 
-				  if(CSTCalculation != 0 && $('#txtEditCST').val() != '' )
-				{
-			  
-					if($('#txtEditAfterExciseDuty').val() == '')
-						{
-							alert('Please Enter the Excise value');
-							$('#txtEditAfterExciseDuty').focus();
-							$('#txtEditCST').val('');
-							return false;
-						}
-						else
-						{
-							var ExciseDuty = parseFloat($('#txtEditAfterExciseDuty').val()); 
-							var CSTValue= parseFloat($('#txtEditCST').val()); 
-							AfterCST = <?php echo CST_ONBASICVALUE; ?>;
-							var Vatval =  parseFloat(AfterCST).toFixed(2);
-		 
-							$('#txtEditAfterCST').val(Vatval); 
-						}
-			 }
-			 else if(CSTCalculation == 0 && $('#txtEditCST').val() != '')
-			 {
-				 var CSTValue= parseFloat($('#txtEditCST').val()); 
-					AfterCST =  <?php echo CST_ONBASICVALUE; ?>;
-					var Vatval =  parseFloat(AfterCST).toFixed(2);
-		 
-					$('#txtEditAfterCST').val(Vatval); 
-			 }				
-			 
-			 else
-			 {
-				 $('#txtEditAfterCST').val("0.00"); 
-			 }				
-				 
-				calculateEditTotalValue();
-			 }
-		
-		}
- }
- function calculateGST(isEdit)
- {
-	 if(isEdit == '0')
-	{ 
-			if($('#MaterialCode').val() == "0")
-			 {
-				 alert('Please Select the Material Code');
-				$('#MaterialCode').focus();
-				return false;
-			 }
-			 else if($('#Rate').val() == '')
-			 {
-				  alert('Please Enter the Rate value');
-				  $('#Rate').focus();
-				  return false;
-			 }		
-			 else
-			 {
-				 var basicValue = parseFloat($('#txtBasicValue').val());
-				
-				 if($('#txtGST').val() != "0"  && 	 $('#txtGST').val() != '')
-				 {	
-					var GSTValue =  parseFloat($('#txtGST').val());
-				 
-				  var AfterGST = 0.0;  	 
-					AfterGST = <?php echo GSTTAX; ?>;
-				
-					var GSTval =  parseFloat(AfterGST).toFixed(2);
-			 
-					$('#txtAfterGST').val(GSTval); 
-				 }
-				 else
-				 {
-					$('#txtAfterGST').val("0.00");  
-				 }	 
-				
-			 } 
-			 calculateTotalValue();	
-	}
-	else
-	{
-		if($('#EditMaterialCode').val() == "0")
-			 {
-				 alert('Please Select the Material Code');
-				$('#EditMaterialCode').focus();
-				return false;
-			 }
-			 else if($('#EditRate').val() == '')
-			 {
-				  alert('Please Enter the Rate value');
-				  $('#EditRate').focus();
-				  return false;
-			 }		
-			 else
-			 {
-				 var basicValue = parseFloat($('#txtEditBasicValue').val());
-				
-				 if($('#txtEditGST').val() != "0"  && 	 $('#txtEditGST').val() != '')
-				 {	
-					var GSTValue =  parseFloat($('#txtEditGST').val());
-				 
-				  var AfterGST = 0.0;  	 
-					AfterGST = <?php echo GSTTAX; ?>;
-				
-					var GSTval =  parseFloat(AfterGST).toFixed(2);
-			 
-					$('#txtEditAfterGST').val(GSTval); 
-				 }
-				 else
-				 {
-					$('#txtEditAfterGST').val("0.00");  
-				 }	 
-				
-			 } 
-			 calculateEditTotalValue();	
-		
-	}
- }
-  function calculateOtherTaxes(isEdit)
- {
-	 if(isEdit == '0')
-	{ 
-		if($('#MaterialCode').val() == "0")
-		 {
-			 alert('Please Select the Material Code');
-			$('#MaterialCode').focus();
-			return false;
-		 }
-		 else if($('#Rate').val() == '')
-		 {
-			  alert('Please Enter the Rate value');
-			  $('#Rate').focus();
-			  return false;
-		 }		
-		 else
-		 {
-			 var basicValue = parseFloat($('#txtBasicValue').val());
-			
-			 
-			 if($('#txtOtherTax').val() != "0"  && 	 $('#txtOtherTax').val() != '')
-			 {	
-				var OtherTaxValue =  parseFloat($('#txtOtherTax').val());
-			 
-				var AfterOtherTaxes = 0.0;	 
-				AfterOtherTaxes = <?php echo OTHERTAX; ?>;
-			
-				var Otherval =  parseFloat(AfterOtherTaxes).toFixed(2);
-		 
-				$('#txtAfterOtherTax').val(Otherval); 
-			 }
-			 else
-			 {
-				$('#txtAfterOtherTax').val("0.00");  
-			 }
-			  calculateTotalValue();
-			
-		 } 
-	}
-	else
-	{
-		if($('#EditMaterialCode').val() == "0")
-		 {
-			 alert('Please Select the Material Code');
-			$('#EditMaterialCode').focus();
-			return false;
-		 }
-		 else if($('#EditRate').val() == '')
-		 {
-			  alert('Please Enter the Rate value');
-			  $('#EditRate').focus();
-			  return false;
-		 }		
-		 else
-		 {
-			 var basicValue = parseFloat($('#txtEditBasicValue').val());
-			
-			 
-			 if($('#txtEditOtherTax').val() != "0"  && 	 $('#txtEditOtherTax').val() != '')
-			 {	
-				var OtherTaxValue =  parseFloat($('#txtEditOtherTax').val());
-			 
-				var AfterOtherTaxes = 0.0;	 
-				AfterOtherTaxes = <?php echo OTHERTAX; ?>;
-			
-				var Otherval =  parseFloat(AfterOtherTaxes).toFixed(2);
-		 
-				$('#txtEditAfterOtherTax').val(Otherval); 
-			 }
-			 else
-			 {
-				$('#txtEditAfterOtherTax').val("0.00");  
-			 }
-			   calculateEditTotalValue();
-			
-		 } 
-		
-	}
- }
- 
- function calculateFreight(isEdit)
- {
-	 if(isEdit == '0')
-	{ 
-		if($('#MaterialCode').val() == "0")
-		 {
-			 alert('Please Select the Material Code');
-			$('#MaterialCode').focus();
-			return false;
-		 }
-		 else if($('#Rate').val() == '')
-		 {
-			  alert('Please Enter the Rate value');
-			  $('#Rate').focus();
-			  return false;
-		 }		
-		 else
-		 {
-			 var basicValue = parseFloat($('#txtBasicValue').val());
-			 var FreightType =$("#drpFreight").val();
-			 if(FreightType == "0")
-			 {
-				 alert('Please select Freight Type');
-				 $('#txtFreight').val('');
-				 $("#drpFreight").focus();
-			 }
-			 else if( $('#txtFreight').val() != "0"  && 	 $('#txtFreight').val() != '')
-			 {	
-				var FreightValue =  parseFloat($('#txtFreight').val());
-				var UOM          = parseFloat($('#UOM').val());
-				var Quantity          = parseFloat($('#Quantity').val());
-				//alert(FreightType);
-				var AfterFreight = 0.0;	
-				if(FreightType == PercentageType)
-				{		
-					AfterFreight = <?php echo FREIGHT_PERCENTAGE;?>;		  	  
-				}
-				else if(FreightType == NilType)
-				{		
-					AfterFreight = 0.0;	 		  	  
-				}
-				else if(FreightType == '<?php echo LUMPSUM;?>')
-				{		
-					AfterFreight = <?php echo FREIGHT_LUMPSUM;?>;		  	  
-				}
-				else if(FreightType == '<?php echo PERUOM;?>')
-				{		
-					AfterFreight = <?php echo FREIGHT_PERUOM;?>;		  	  
-				}
-				else if(FreightType == '<?php echo PERTRIP;?>')
-				{
-                                        if($('#NOOfTrips').val()==''){
-                                             alert('Please Enter No of Trip');
-				
-				 $("#NOOfTrips").focus();
-                                 $('#txtFreight').val(0)
-                                 AfterFreight=0;
-                                 $('#txtAfterFreight').val("0.00");
-                                 return false;
-                                            }
-                                            else{
-                                            var noOftrip = $("#NOOfTrips").val();
-                                            AfterFreight = <?php echo FREIGHT_PERTRIP;?>;
-                                            AfterFreight = parseFloat(AfterFreight * noOftrip).toFixed(2);
-                                                }
-                                             
-							  	  
-				}
-                                else {
-				AfterFreight = $("#txtFreight").val();
-				}
-				var AfterFreightval =  parseFloat(AfterFreight).toFixed(2);
-		 
-				$('#txtAfterFreight').val(AfterFreightval); 
-			 }
-			 else
-			 {
-				$('#txtAfterFreight').val("0.00");  
-			 }
-			
-		 } 
-		 calculateTotalValue();	
-	}
-	else
-	{
-		if($('#EditMaterialCode').val() == "0")
-		 {
-			 alert('Please Select the Material Code');
-			$('#EditMaterialCode').focus();
-			return false;
-		 }
-		 else if($('#EditRate').val() == '')
-		 {
-			  alert('Please Enter the Rate value');
-			  $('#EditRate').focus();
-			  return false;
-		 }		
-		 else
-		 {
-			 var basicValue = parseFloat($('#txtEditBasicValue').val());
-			 var FreightType =$("#drpEditFreight").val();
-			 if(FreightType == "0")
-			 {
-				 alert('Please select Freight Type');
-				 $('#txtEditFreight').val('');
-				 $("#drpEditFreight").focus();
-			 }
-			 else if( $('#txtEditFreight').val() != "0"  && 	 $('#txtEditFreight').val() != '')
-			 {	
-				var FreightValue =  parseFloat($('#txtEditFreight').val());
-				var UOM          = parseFloat($('#EditUOM').val());
-				var Quantity          = parseFloat($('#EditQuantity').val());
-				//alert(FreightType);
-				var AfterFreight = 0.0;	
-				if(FreightType == PercentageType)
-				{		
-					AfterFreight = <?php echo FREIGHT_PERCENTAGE;?>;		  	  
-				}
-				else if(FreightType == NilType)
-				{		
-					AfterFreight = 0.0;	 		  	  
-				}
-				else if(FreightType == '<?php echo LUMPSUM;?>')
-				{		
-					AfterFreight = <?php echo FREIGHT_LUMPSUM;?>;		  	  
-				}
-				else if(FreightType == '<?php echo PERUOM;?>')
-				{		
-					AfterFreight = <?php echo FREIGHT_PERUOM;?>;		  	  
-				}
-				else if(FreightType == '<?php echo PERTRIP;?>')
-				{		
-					 if($('#EditNOOfTrips').val()==''){
-                                             alert('Please Enter No of Trip');
-				
-				 $("#EditNOOfTrips").focus();
-                                 $('#txtEditFreight').val(0)
-                                 AfterFreight=0;
-                                 $('#txtEditAfterFreight').val("0.00");
-                                 return false;
-                                            }
-                                            else{
-                                            var noOftrip = $("#EditNOOfTrips").val();
-                                            AfterFreight = <?php echo FREIGHT_PERTRIP;?>;
-                                            AfterFreight = parseFloat(AfterFreight * noOftrip).toFixed(2);
-                                                }		  	  
-				}
-                                else {
-				AfterFreight = $("#txtEditFreight").val();
-				}
-				var AfterFreightval =  parseFloat(AfterFreight).toFixed(2);
-		 
-				$('#txtEditAfterFreight').val(AfterFreightval); 
-			 }
-			 else
-			 {
-				$('#txtEditAfterFreight').val("0.00");  
-			 }
-			
-		 } 
-		 calculateEditTotalValue();	
-
-	}
- }
- 
- /* Set the Packaging calculation option for calculating Packaging */
- function SetPackagingOption()
- {
-	 PackagingCalculation = $("input:radio[name='optPackaging']:checked").val();
-	 $('#packagingcalmodel').modal('hide');	
-	 calculatePackaging($('#isEdit').val());
- }
- /* Set the Packaging calculation option for calculating Packaging */
- function SetExciseCalculation()
- {
-	 ExciseCalculation = $("input:radio[name='optExcise']:checked").val();
-	 $('#ExciseDutyCalModel').modal('hide');	
-	 calculateExcise($('#isEdit').val());
- }
- /* Set the Packaging calculation option for calculating Packaging */
-
-
- function SetVatorCST()
- {
-	  StateTaxCheck = $("input:radio[name='Range']:checked").val();
-	  $('#txtPoRange').val(StateTaxCheck) ; 
-	  //alert('Radio clicke:'+StateTaxCheck);
-	  if(StateTaxCheck == "0")
-	  {
-		  // style="display:none;"
-			$('#Vat').removeAttr("style");
-			$('#TotSCST').removeAttr("style");
-		   $('#CST').attr("style","display:none;");
-		    $('#TotICST').attr("style","display:none;");
-			 $('#IGSTEditModel').attr("style","display:none;");
-					  $('#SGSTEditModel').removeAttr("style");
-					   $('#IGSTViewModel').attr("style","display:none;");
-					  $('#SGSTViewModel').removeAttr("style");
-					  
-					 $('#IGSTAddModel').attr("style","display:none;");
-					  $('#SGSTAddModel').removeAttr("style");
-	  }
-	  else
-	  {
-		   
-		   $('#CST').removeAttr("style");
-		   $('#TotICST').removeAttr("style");
-		   $('#Vat').attr("style","display:none;");
-		   $('#TotSCST').attr("style","display:none;");
-		    $('#IGSTEditModel').removeAttr("style");
-					  $('#SGSTEditModel').attr("style","display:none;");
-					   $('#IGSTViewModel').removeAttr("style");
-					  $('#SGSTViewModel').attr("style","display:none;");
-					  $('#IGSTAddModel').removeAttr("style");
-					  $('#SGSTAddModel').attr("style","display:none;");
-	  }
- }
-  $(document).ready(function () {
-	   $("#PaymentTerms").select2();
-	   
-                $('#Date').click(function () {
-                    //for Date range selection
-                    $('#Schedulediv').attr("style","display:none;");
-                    $('#Deliverydtdiv').removeAttr("style");
-                });
-                $('#Schedule').click(function () {
-                    //for schedule range selection
-                    $('#Deliverydtdiv').attr("style","display:none;");
-                    $('#Schedulediv').removeAttr("style");
-                });
-SetVatorCST();
-            });
- function SetVatCalculation()
- {
-	  VatCalculation = $("input:radio[name='optVat']:checked").val();
-	 $('#VatCalModel').modal('hide');	
-	  calculateVat($('#isEdit').val());
- }
- function SetCSTCalculation()
- {
-	  CSTCalculation = $("input:radio[name='optCST']:checked").val();
-	  $('#CSTCalModel').modal('hide');	
-	  calculateCST($('#isEdit').val());
- }
- 
- function ExceedQuantityCheck()
- {
-	// RequistQuantity
-	var EnterQuantity =   $("#Quantity").val()== '' ? "0.00" :  parseFloat($("#Quantity").val());
-	var ReqQuantity = parseFloat(RequistQuantity);
-	if(EnterQuantity > ReqQuantity)
-	{
-		 alert('Your exceeding the Quantity from the Requisition Quantity:'+ RequistQuantity  +'.Please adjust the Quantity to proceed further.');
-		 //$('#Quantity').val(RequistQuantity);
-		  $('#Quantity').focus();
-		 return false;
-	}
-        else{
-        return true;
- }
- }
- 
- function ExceedEditQuantityCheck()
- {
-	// RequistQuantity
-	var EnterQuantity =   $("#EditQuantity").val()== '' ? "0.00" :  parseFloat($("#EditQuantity").val());
-	var ReqQuantity = parseFloat(RequistQuantity);
-	if(EnterQuantity > ReqQuantity)
-	{
-		 alert('Your exceeding the Quantity from the Requisition Quantity:'+ RequistQuantity  +'.Please adjust the Quantity to proceed further.');
-		  $('#EditQuantity').focus();
-		 return false;
-	}
-        else{
-        return true;
-        }
- }
- // To Reset the Tax calculation
- function resetTaxField()
- {
-
-		 $("#ItemName").val('');
-		$("#UOM").val('');
-		$("#Quantity").val('');
-		$("#Rate").val('');
-		$("#DiscountType").val("0");
-		$("#txtDiscount").val('');
-		$('#txtAfterDiscount').val('');
-		 $("#PackagingType").val("0")
-		$("#txtPackaging").val('');
-		$('#txtAfterPackaging').val('');
-		$("#txtExciseDuty").val('');
-		$('#txtAfterExciseDuty').val('');
-		$("#txtVat").val('');
-		$('#txtAfterVat').val('');
-		$("#txtCST").val('');
-		$('#txtAfterCST').val('');
-		$("#txtGST").val('');
-		$('#txtAfterGST').val('');
-		$("#txtOtherTax").val('');
-		$('#txtAfterOtherTax').val('');
-		$("#drpFreight").val("0")
-		$("#txtFreight").val('');
-		$('#txtAfterFreight').val('');
-		$('#txtInsurance').val('');
-		$('#txtTotalOrderValue').val('');
-		ExciseCalculation = '';
-		PackagingCalculation = '';
-		VatCalculation = '';
-		CSTCalculation = '';
- }
- 
- function Editchange(){
-	  ExceedEditQuantityCheck();	  
-	 if($('#EditQuantity').val() != '' && $('#EditRate').val() != '')
-	 {	  
-		  var txtQuantity = parseFloat( $('#EditQuantity').val());
-		  var txtUnitPrice = parseFloat($('#EditRate').val());
-		  var Tot =  txtQuantity * txtUnitPrice
-		  $('#txtEditBasicValue').val(parseFloat(Tot).toFixed(2));
-                   if ($("#EditDiscountType").val()!=0) {
-              calculateDiscount(1);
-          }
-        if($("#EditCgst").val()!=''){
-		
-		 $('#EditAfterCgst').val(calculateSgstTax($('#txtEditBasicValue').val(),$('#EditCgst').val(),$('#txtEditAfterDiscount').val() == '' ? '0.00' : $('#txtEditAfterDiscount').val()));
-	}
-            if($("#EditSgst").val()!=''){
-		
-		 $('#EditAfterSgst').val(calculateSgstTax($('#txtEditBasicValue').val(),$('#EditSgst').val(),$('#txtEditAfterDiscount').val() == '' ? '0.00' : $('#txtEditAfterDiscount').val()));
-	}
-  
-        if($("#EditIgst").val()!=''){
-		
-		$('#EditAfterIgst').val(calculateIgstTax($('#txtEditBasicValue').val(),$('#EditIgst').val(),$('#txtEditAfterDiscount').val() == '' ? '0.00' : $('#txtEditAfterDiscount').val()));
-	}
-     
-          if ($("#EditPackagingType").val()!=0) {
-            calculatePackaging(1);
-                        }
-    if($("#drpEditFreight").val()!=0){
-        calculateFreight(1);
-        
-    }
-		  calculateEditTotalValue($('#isEdit').val());
- 
-	}
-} 
-
-function validateEditExceedLimit()
- {
-	 var avalbudAmt = parseFloat($('#EditAvlBudAmt').val());
-	 var basicAmountRate = parseFloat($('#txtEditBasicValue').val()); 
-	 var totalAmount =  parseFloat($('#txtEditTotalOrderValue').val()); 
-	 
-	 if(basicAmountRate > avalbudAmt || totalAmount > avalbudAmt)
-	 {
-		 alert('Basic amount is exceeding the Budget Limit.Please adjust the product value.');
-		 $('#EditRate').focus();
-		 return false;
-	 }
-	 else
-	 {
-		return true; 
-	 }
-	  
- }
- function calculateEditTotalValue()
- {
-	 var Packaging = $('#txtEditAfterPackaging').val() == '' ? '0.00' : $('#txtEditAfterPackaging').val();
-	 var AfterCgst = $("#EditAfterCgst").val();
-                
-                  var AfterSgst = $("#EditAfterSgst").val();
-                
-                  var AfterIgst = $("#EditAfterIgst").val();
-		var Freight = $('#txtEditAfterFreight').val() == '' ? '0.00' : $('#txtEditAfterFreight').val();
-		var Insurance = $('#txtEditInsurance').val() == '' ? '0.00' : $('#txtEditInsurance').val();
-		var Discount = $('#txtEditAfterDiscount').val() == '' ? '0.00' : $('#txtEditAfterDiscount').val();
-		var BasicVal = $('#txtEditBasicValue').val() == '' ? '0.00' : $('#txtEditBasicValue').val();
-	
-	 var totvalue = ( parseFloat(BasicVal) + parseFloat(Packaging)+ parseFloat(AfterCgst)+ parseFloat(AfterSgst) + parseFloat(AfterIgst) + parseFloat(Freight) + parseFloat(Insurance)) - parseFloat(Discount);
-	 
-	 var tot =  parseFloat(totvalue).toFixed(2);
-	    		
-	 $('#txtEditTotalOrderValue').val(tot);
-	 validateEditExceedLimit();
-	 ExceedEditQuantityCheck();
- }
-function calculateEditTaxValue()
- {
-	 var Packaging = $('#txtEditAfterPackaging').val() == '' ? '0.00' : $('#txtEditAfterPackaging').val();
-	  var AfterCgst = $("#EditAfterCgst").val();
-                
-                  var AfterSgst = $("#EditAfterSgst").val();
-                
-                  var AfterIgst = $("#EditAfterIgst").val();
-		var Freight = $('#txtEditAfterFreight').val() == '' ? '0.00' : $('#txtEditAfterFreight').val();
-		var Insurance = $('#txtEditInsurance').val() == '' ? '0.00' : $('#txtEditInsurance').val();
-		var Discount = $('#txtEditAfterDiscount').val() == '' ? '0.00' : $('#txtEditAfterDiscount').val();
-		
-	
-	 var totvalue = parseFloat(Packaging)+ parseFloat(AfterCgst)+ parseFloat(AfterSgst) + parseFloat(AfterIgst) + parseFloat(Freight) + parseFloat(Insurance)  ;
-	 
-	 var tot =  parseFloat(totvalue).toFixed(2);
-	    //alert('tot:'+tot);		
-	return tot;
- } 
-
-</script>
-<style>
- 
-.pagination {
-	margin :0px ! important;
-}
-.box-body {
-	padding:0px ! important;
-} 
-.num {
-	text-align:right;
-}
-</style>
-<div class="content-wrapper">
-     <?php
-                      $attributes = array('class' => 'form-label-left CreatePO ','name'  => 'CreatePO','id'  => 'CreatePO');
-                        
-                        echo form_open($this->config->base_url().'/purchaseorder/addPO/',$attributes); ?>
- 
-	 <section class="content">
-	 <div style="border:2px solid #333">
-	  <div id="content"></div>
-	 <div>
-         <center><b><h2>Siddharth Industries - Edit Revenue Purchase Order - <?php echo $PONO;?></h2></b></center></div> 
-         <div class="container-fluid">		
-	<div class="row">
-		<div class="col-md-12">
-		<div class="col-md-3">
-			<div class="col-md-12">
-				<label>Requistion No</label>
-						<?php							 
-							  $options = array("0"=>'Selected Requisition Numbers'); 
-								 if(!empty($ReqList))
-						{
-						foreach ($ReqList as $SID):
-					 
-						   $options[$SID->ReqNo] = $SID->ReqNo ;
-                           //$ReqType = $SID->ReqType;
-						endforeach;
-						}							 
-							echo form_multiselect('RequistionNo', $options,set_value('RequistionNo'),'id="RequistionNo"' ,'required="true"' , 'height="400px"' );
-							?>	
-			</div>
-			<div class="col-md-12">
-				<label>Purchase Order Date</label>
-						<div class="form-group">
-									<?php
-							 $data = array('name' => 'PODate','value' => set_value('PODate',$PODate),'id'=>'PODate',  'class' => 'form-control num' ,'required' => 'true','onkeypress'=>'return false;');
-							echo form_input($data);
-							?>   
-						</div>
-						</div>
-		</div>
-		<div class="col-md-9">
-			<div class="row">
-				<div class="col-md-4">
-					<label>Select Supplier</label> 
-						 <?php
-						$options = array("0"=>'Select Supplier');     
-						//print_r(  $options);
-						
-						if(!empty($Suplist))
-						{
-						foreach ($Suplist as $SID):
-						  
-					   
-						  $options[$SID->SupplierID] =  $SID->SupplierID.' '.' - '.' '.$SID->SupplierName;
-
-						endforeach;
-						}										
-			
-						echo form_dropdown('drpSupplier', $options,set_value('drpSupplier',$SupId),'id="drpSupplier"'  ,'required="true"' ,'class="form-control select2');
-
-						?>						 					 
-				</div>
-				<div class="col-md-4">
-					 <label>Purchase Order Type</label>
-						<div class="form-group">
-						
-									<?php
-							 $data = array('name' => 'POType','value' => set_value('POType',REVENUE),'id'=>'POType',  'class' => 'form-control' ,'readonly' => 'true');
-							echo form_input($data);
-							?>   
-						</div>
-				</div>
-				<div class="col-md-2" style="padding:0px;">										 	
-						<div id="div1" style="display:block;">
-							<b><u>Select Tax Range</u></b><br/> 
-							<tr>
-							
-<td>
-												  <?php echo form_label('Local', 'Local') . "&nbsp;&nbsp;". form_radio(array('name' => 'Range', 'value' => '0', 'checked' => ('0' == $CapitalRange) ? TRUE : FALSE, 'id' => 'Local','onchange'=>'SetVatorCST();')); ?>
-											</td>
-
-											<td>
-												  <?php echo form_label('Inter state', 'Inter state') . "&nbsp;&nbsp;". form_radio(array('name' => 'Range', 'value' => '1', 'checked' => ('1' == $CapitalRange) ? TRUE : FALSE, 'id' => 'Inter_state','onchange'=>'SetVatorCST();')); ?>
-												 
-											</td> 
-							</tr>
-						</div>
-						<div id="div2" style="display:none;">    
-						</div>
-						<div id="div4" style="display:none;">
-						</div>
-				</div>
-				<div class="col-md-2" style="padding:0px;">
-
-                            <b><u>Select Delivery By</u></b><br/>
-                            <tr>
-                                                       <td>
-  <?php echo form_label('Date', 'Date') . "&nbsp;&nbsp;". form_radio(array('name' => 'DateRange', 'value' => '0', 'checked' => ('0' == $DeliverOption) ? TRUE : FALSE, 'id' => 'Date')); ?> </td>
-
-<td>
-  <?php echo form_label('Schedule', 'Schedule') . form_radio(array('name' => 'DateRange', 'value' => '1', 'checked' => ('1' == $DeliverOption) ? TRUE : FALSE, 'id' => 'Schedule')); ?>
-
-
-</td>
-                            </tr>
-                        </div>
-			</div>
-			<div class="row">
-				<div class="col-md-4">
-					 <label>Supplier Address</label>
-					<div class="form-group">
-								<?php
-						 $data = array('name' => 'SupAddress','value' => set_value('SupAddress',$Address),'id'=>'SupAddress',  'class' => 'form-control' ,'readonly' => 'true' ,'rows' => '3', 'cols' => '40');
-						echo Form_textarea($data);
-						?>   
-					</div>
-				</div>
-				<div class="col-md-4">
-					<label>Delivery Address</label>
-					<div class="form-group">
-								<?php
-						 $data = array('name' => 'DeliveryAddr','value' => set_value('DeliveryAddr',$DeliveryAddress),'id'=>'DeliveryAddr',  'class' => 'form-control' ,'required' => 'true' ,'rows' => '3', 'cols' => '40');
-						echo Form_textarea($data);
-						?>   <input type="hidden" name="txtDeliveryAddress" id="txtDeliveryAddress"  value="<?php echo $DeliveryAddress;?>">
-					</div>
-				</div>
-				<div class="col-md-4" id="Deliverydtdiv" style="padding:0%;">
-					 <label>Delivery Date</label>		
-						<div class="form-group">
-								<?php
-						 $data = array('name' => 'Deliverydt','value' => set_value('Deliverydt',$Deliverydt),'id'=>'Deliverydt',  'class' => 'form-control num' ,'required' => 'true','onkeypress'=>'return false;');
-						echo form_input($data);
-						?>   
-					
-						</div>
-					</div> 
-					<div class="col-md-4" id="Schedulediv" style="display:none;padding:0%;">
-					<label >Schedule By</label>                                 
-					<?php
-					$data = array('name' => 'Scheduleby','value' => set_value('Scheduleby',$DeliverSchedule),'id'=>'Scheduleby',  'class' => 'form-control' ,'required' => 'true' ,'rows' => '3', 'cols' => '40');
-					echo Form_textarea($data);
-					?>
-                </div> 					 				
-			</div>
-		</div>
-		 	 <div class="row">
-		
-			 <div class="col-md-12">
-			<legend>Payment Details</legend>
-          <!-- Text input-->
-		    
-		<div class="col-md-4">
-			    <label>Payment Terms</label> 
-				  
-                        <?php
-                                                       
-                                                
-                                               
-                                                    if(!empty($Payment))
-                                                    {
-                                                  
-                                                    foreach ($Payment as $pay):
-                                                      
-
-                                                     
-                                                       $options6[$pay->PaymentID] =  $pay->PaymentTerms;
-                                                       
-
-                                                    endforeach;
-                                                    }										
-
-                                                    echo form_dropdown('PaymentTerms', $options6,set_value('PaymentTerms',$Terms),'id="PaymentTerms"'  ,'required="true"' ,'class="form-control select2');
-
-                                                    ?>
-              
-
-                                    
-
-            </div>	
-			<div class="col-md-4" id="otheroptiondiv" style="display:none;">
-					  <label>Description of Payable Terms<span class="badge" style="color:red;text-align:right;background-color: #ecf0f5 ;">*</span></label>
-						<div class="form-group">						
-							<?php
-							 $data = array('name' => 'Otherpayment','Otherpayment' => set_value('Otherpayment'),'id'=>'Otherpayment',  'class' => 'form-control' ,'required' => 'true');
-							echo form_input($data);
-							?>   
-						</div>
-				</div>
-         
-		</div>
-		</div>
-    </div>
-	 <!-- Modal for Packing Calculation -->
-  <div  id="packagingcalmodel" class="modal fade" data-backdrop-limit="1" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" >
-    <div class="modal-dialog">
-    
-      <!-- Modal content-->
-      <div class="modal-content">
-        <div class="modal-header">
-          <button type="button" class="close" data-dismiss="modal">&times;</button>
-          <h4 class="modal-title">Packing Calculation On</h4>
-        </div>
-        <div class="modal-body">
-          <form>
-    
-      <div class="radio">
-      <label><input type="radio" name="optPackaging" checked="checked" value='0'  id="optPackaging"> Basic Amount</label>
-    </div>
-    <div class="radio">
-      <label><input type="radio" name="optPackaging" id="optPackaging" value='1' > After Discount Amount</label>
-    </div>
-  </form>
-        </div>
-        <div class="modal-footer">
-        
-		  <a class="btn btn-primary"  ID="PackagingOption" onclick="SetPackagingOption();"  style="margin-top: -24px;">&nbsp;&nbsp;<span class="bold">Ok</span></a>
-			<a class="btn btn-primary" data-dismiss="modal" style="margin-top: -24px;" value="Cancel">Cancel</a>
-        </div>
-      </div>
-      
-    </div>
-  </div>
-  
-  <!-- Modal for Excise Duty Calculation-->
-  <div class="modal fade" id="ExciseDutyCalModel" role="dialog">
-    <div class="modal-dialog">
-    
-      <!-- Modal content-->
-      <div class="modal-content">
-        <div class="modal-header">
-          <button type="button" class="close" data-dismiss="modal">&times;</button>
-          <h4 class="modal-title">Excise Duty Calculation On</h4>
-        </div>
-        <div class="modal-body">
-          <form>
-		  <div class="radio">
-      <label><input type="radio" name="optExcise" checked="checked" value="0"  id="optExcise">From Basic Amount</label>
-    </div>
-    <div class="radio">
-      <label><input type="radio" name="optExcise" value="1"  id="optExcise">Basic Amount - Discount Amount</label>
-    </div>
-	<div class="radio">
-      <label><input type="radio" name="optExcise" value="2"  id="optExcise">(Basic Amount - Discount Amount ) + Packing Cost</label>
-    </div>
-    <div class="radio">
-      <label><input type="radio" name="optExcise" value="3"  id="optExcise">Basic Amount + Packing Cost</label>
-    </div>
-     
-  </form>
-        </div>
-        <div class="modal-footer">
-           <a class="btn btn-primary"  ID="ExciseOption" onclick="SetExciseCalculation();"  style="margin-top: -24px;">&nbsp;&nbsp;<span class="bold">Ok</span></a>
-			<a class="btn btn-primary" data-dismiss="modal" style="margin-top: -24px;" value="Cancel">Cancel</a>
-        </div>
-      </div>
-      
-    </div>
-  </div>
-  
-  
-   <!-- Modal for Vat Calculation -->
-  <div class="modal fade" id="VatCalModel" role="dialog">
-    <div class="modal-dialog">
-    
-      <!-- Modal content-->
-      <div class="modal-content">
-        <div class="modal-header">
-          <button type="button" class="close" data-dismiss="modal">&times;</button>
-          <h4 class="modal-title">Vat Calculation On</h4>
-        </div>
-        <div class="modal-body">
-          <form>
-     
-     <div class="radio">
-      <label><input type="radio" name="optVat" checked="checked" value="0"  id="optVat">Basic Amount</label>
-    </div>
-    <div class="radio">
-      <label><input type="radio" name="optVat" value="1"  id="optVat">Excise Duty</label>
-    </div>
-  </form>
-        </div>
-        <div class="modal-footer">
-         <a class="btn btn-primary"  ID="VatOption" onclick="SetVatCalculation();"  style="margin-top: -24px;">&nbsp;&nbsp;<span class="bold">Ok</span></a>
-			<a class="btn btn-primary" data-dismiss="modal" style="margin-top: -24px;" value="Cancel">Cancel</a>
-        </div>
-      </div>
-      
-    </div>
-  </div>
-   <!-- Modal for CST Calculation -->
-  <div class="modal fade" id="CSTCalModel" role="dialog">
-    <div class="modal-dialog">
-    
-      <!-- Modal for CST Calculation-->
-      <div class="modal-content">
-        <div class="modal-header">
-          <button type="button" class="close" data-dismiss="modal">&times;</button>
-          <h4 class="modal-title">CST Calculation On</h4>
-        </div>
-        <div class="modal-body">
-          <form>
-     
-     <div class="radio">
-      <label><input type="radio" name="optCST" checked="checked" value="0"  id="optCST">Basic Amount</label>
-    </div>
-    <div class="radio">
-      <label><input type="radio" name="optCST" value="1"  id="optCST">Excise Duty</label>
-    </div>
-  </form>
-        </div>
-        <div class="modal-footer">
-         <a class="btn btn-primary"  ID="CSTOption" onclick="SetCSTCalculation();"  style="margin-top: -24px;">&nbsp;&nbsp;<span class="bold">Ok</span></a>
-			<a class="btn btn-primary" data-dismiss="modal" style="margin-top: -24px;" value="Cancel">Cancel</a>
-        </div>
-      </div>
-      
-    </div>
-  </div>
-          <div class="container-fluid">  
- 	 
-  <div align="right">
-	<div align="right">
-	  <a data-toggle="modal" ><button type="submit"  onclick="myFunction();" class="btn btn-primary" id="abcd" >Select Line Item</button> </a> 
-	</div> 
-  
-  <!-- Model for revenue po -->
-     <div  id="REVENUE" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
-		<div class="modal-dialog">
-	   <!-- Modal content-->
-	 <form>
-		  <div class="modal-content" style="width:1100px;">
-			<div class="modal-header" style="background-color: #3c8dbc;color:#fff;">			   
-			  <center><h4>Select Revenue Purchase Order Line Item </h4></center>				
-			</div>
-		 	<div align="left"> 
-				<div>
-					<div class="col-md-12" >
-								 <div class="col-md-3">
-								 <label>Req No</label>
-											<div >
-												 <?php
-													$RL = array("0"=>'Select Req No');     
-													if(!empty($RequistionDetails))
-													{
-													foreach ($RequistionDetails as $SID):			   
-														$RL[$SID->ReqNo] =  $SID->ReqNo.' '.' - '.' '.$SID->DepartmentName;
-													endforeach;
-													}
-									
-													echo form_dropdown('ReqNo', $RL,set_value('ReqNo'),'id="ReqNo"' ,'class="form-control"');
-
-												?>						 
-											</div>
-										</div>
-								 
-								  <div class="col-md-3">
-								   <label>Department Name</label>
-											<div class="form-group">
-														<?php
-												 $data = array('name' => 'deptName','value' => set_value('deptName'),'id'=>'deptName',  'class' => 'form-control' ,'readonly' => 'true');
-												echo form_input($data);
-												?>   
-											</div>
-								 </div>
-								  <div class="col-md-3">
-								   <label>Cost Center Code</label>
-											<div class="form-group">
-														<?php
-								$data = array('name' => 'CostCenter','value' => set_value('CostCenter'),'id'=>'CostCenter',  'class' => 'form-control' ,'readonly' => 'true');
-												echo form_input($data);
-
-								?>		
-											</div>
-								 </div>
-								  <div class="col-md-3">
-								   <label>Avl Bud Amt In INR</label>
-											<div class="form-group">
-														<?php
-												 $data = array('name' => 'AvlBudAmt','value' => set_value('AvlBudAmt'),'id'=>'AvlBudAmt',  'class' => 'form-control num' ,'readonly' => 'true');
-												echo form_input($data);
-												?>   
-											</div>
-								 </div>
-						</div>		
-					<div class="col-md-12">
-							  <div class="col-md-2">
-							  <label>Item Code</label>
-										<div  >
-											 <?php
-											$options = array("0"=>'Item Code');     
-																	
-								
-											echo form_dropdown('MaterialCode', $options,set_value('MaterialCode'),'id="MaterialCode"' ,'class="form-control"');
-
-											?>						 
-										</div>
-						   </div>
-						  
-							 <div class="col-md-2">
-							  <label>Item Name</label>
-										<div class="form-group">
-													<?php
-											 $data = array('name' => 'ItemName','value' => set_value('ItemName'),'id'=>'ItemName',  'class' => 'form-control'  ,'readonly' => 'true');
-											echo form_input($data);
-											?>   
-										</div>
-							 </div>
-							 <div class="col-md-2">
-							  <label>UOM</label>
-										<div class="form-group">
-													<?php
-											 $data = array('name' => 'UOM','value' => set_value('UOM'),'id'=>'UOM',  'class' => 'form-control' ,'readonly' => 'true');
-											echo form_input($data);
-											?>   
-										</div>
-							 </div>
-							 <div class="col-md-2">
-							  <label>Quantity</label>
-										<div class="form-group">
-													<?php
-											 $data = array('name' => 'Quantity','value' => set_value('Quantity'),'id'=>'Quantity',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'change();');
-											echo form_input($data);
-											?>   
-										</div>
-							 </div>
-							 <div class="col-md-2">
-							  <label><?php echo "Rate In ($INRSYM)";?></label>
-										<div class="form-group">
-													<?php
-											 $data = array('name' => 'Rate','value' => set_value('Rate'),'id'=>'Rate',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'change();' );
-											echo form_input($data);
-											?>   
-										</div>
-							 </div>
-							 <div class="col-md-2">
-							  <label><?php echo "Basic Amount ($INRSYM)";?></label>
-										<div class="form-group">
-													<?php
-											 $data = array('name' => 'txtBasicValue','value' => set_value('txtBasicValue'),'id'=>'txtBasicValue',  'class' => 'form-control num' ,'readonly' => 'true');
-											echo form_input($data);
-											?>   
-										</div>
-							 </div>
-				</div>
-				</div><br/>				
-				<div class="col-md-12" style="padding:0px;">
-                                                 
-                                                    <div class="col-md-12">
-                                                        <div class="col-md-4">
-                                                            <label>Discount Type </label>
-                                                            <div>
-                                                                <?php
-                                                                $options = array("0"=>'Select Discount Type');
-                                                                //print_r(  $options);
-
-                                                                if(!empty($TaxType))
-                                                                {
-                                                                    foreach ($TaxType as $SID):
-
-
-                                                                        $options[$SID->ConfigValue] =  $SID->ConfigValue;
-
-                                                                    endforeach;
-                                                                }
-
-                                                                echo form_dropdown('DiscountType', $options,set_value('DiscountType'),'id="DiscountType"' ,'class="form-control"');
-
-                                                                ?>
-                                                            </div>
-                                                        </div>
-                                                        <div class="col-md-2">
-                                                            <label>Discount Rate </label>
-                                                            <div class="form-group">
-                                                                <?php
-                                                                $data = array('name' => 'txtDiscount','value' => set_value('txtDiscount'),'id'=>'txtDiscount',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);' ,'onchange'=>'change();calculateDiscount(0);');
-                                                                echo form_input($data);
-                                                                ?>
-                                                            </div>
-                                                        </div>
-                                                        <div class="col-md-2">
-                                                            <label>Discounted Amt In INR</label>
-                                                            <div class="form-group">
-                                                                <?php
-                                                                $data = array('name' => 'txtAfterDiscount','value' => set_value('txtAfterDiscount'),'id'=>'txtAfterDiscount',  'class' => 'form-control num' ,'readonly' => 'true');
-                                                                echo form_input($data);
-                                                                ?>
-                                                            </div>
-                                                        </div>
-                                                          
-                                                            <div class="col-md-2" >
-                                                                <label>CGST In %</label>
-                                                                <div class="form-group">
-                                                                    <?php
-                                                                    $data = array('name' => 'Cgst','value' => set_value('Cgst',0),'id'=>'Cgst',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);' ,'onchange'=>'change();');
-                                                                    echo form_input($data);
-                                                                    ?>
-                                                                </div>
-                                                            </div>
-                                                            <div class="col-md-2" >
-                                                                <label>CGST Amt  In INR</label>
-                                                                <div class="form-group">
-                                                                    <?php
-                                                                    $data = array('name' => 'AfterCgst','value' => set_value('AfterCgst',0),'id'=>'AfterCgst',  'class' => 'form-control num' ,'readonly' => 'true');
-                                                                    echo form_input($data);
-                                                                    ?>
-                                                                </div>
-                                                            </div>
-														 															
-                                                    </div>
-                                                 
-                                                    <div class="col-md-12" style="text-align:left;">
-                                                        <div class="col-md-4">
-                                                            <label>Packaging Type </label>
-                                                            <div>
-                                                                <?php
-                                                                $options = array("0"=>'Select Packaging Type');
-                                                                //print_r(  $options);
-
-                                                                if(!empty($TaxType))
-                                                                {
-                                                                    foreach ($TaxType as $SID):
-
-
-                                                                        $options[$SID->ConfigValue] =  $SID->ConfigValue;
-
-                                                                    endforeach;
-                                                                }
-
-                                                                echo form_dropdown('PackagingType', $options,set_value('PackagingType'),'id="PackagingType"' ,'class="form-control "');
-
-                                                                ?>
-                                                            </div>
-                                                        </div>
-                                                        <div class="col-md-2">
-                                                            <label>Packaging Rate </label>
-                                                            <div class="form-group">
-                                                                <?php
-                                                                $data = array('name' => 'txtPackaging','value' => set_value('txtPackaging'),'id'=>'txtPackaging',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'calculatePackaging(0);');
-                                                                echo form_input($data);
-                                                                ?>
-                                                            </div>
-                                                        </div>
-                                                        <div class="col-md-2">
-                                                            <label>Packaging Amt  In INR</label>
-                                                            <div class="form-group">
-                                                                <?php
-                                                                $data = array('name' => 'txtAfterPackaging','value' => set_value('txtAfterPackaging'),'id'=>'txtAfterPackaging',  'class' => 'form-control num' ,'readonly' => 'true');
-                                                                echo form_input($data);
-                                                                ?>
-                                                            </div>
-                                                        </div>
-														<div id="SGSTAddModel">
-                                                        <div class="col-md-2">
-                                                            <label>SGST In %</label>
-                                                            <div class="form-group">
-                                                                <?php
-                                                                $data = array('name' => 'Sgst','value' => set_value('Sgst',0),'id'=>'Sgst',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'change();');
-                                                                echo form_input($data);
-                                                                ?>
-                                                            </div>
-                                                        </div>
-                                                        <div class="col-md-2">
-                                                            <label>SGST Amt  In INR</label>
-                                                            <div class="form-group">
-                                                                <?php
-                                                                $data = array('name' => 'AfterSgst','value' => set_value('AfterSgst',0),'id'=>'AfterSgst',  'class' => 'form-control num' ,'readonly' => 'true');
-                                                                echo form_input($data);
-                                                                ?>
-                                                            </div>
-                                                        </div>
-													</div>
-													<div id="IGSTAddModel" style="display:none;">
-													<div class="col-md-2">
-                                                            <label>IGST In %</label>
-                                                            <div class="form-group">
-                                                                <?php
-                                                                $data = array('name' => 'Igst','value' => set_value('Igst',0),'id'=>'Igst',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);' ,'onchange'=>'change();');
-                                                                echo form_input($data);
-                                                                ?>
-                                                            </div>
-                                                        </div>
-                                                        <div class="col-md-2">
-                                                            <label>IGST Amt In INR</label>
-                                                            <div class="form-group">
-                                                                <?php
-                                                                $data = array('name' => 'AfterIgst','value' => set_value('AfterIgst',0),'id'=>'AfterIgst',  'class' => 'form-control num' ,'readonly' => 'true');
-                                                                echo form_input($data);
-                                                                ?>
-                                                            </div>
-                                                        </div>
-														</div>
-                                                    </div>
-                                                 
-                                                    <div class="col-md-12"  >
-                                                        <div class="col-md-2">
-                                                            <label>Freight Type </label>
-                                                            <div>
-                                                                <?php
-                                                                $options = array("0"=>'Select Freight Type');
-                                                                //print_r(  $options);
-
-                                                                if(!empty($FreightType))
-                                                                {
-                                                                    foreach ($FreightType as $SID):
-
-
-                                                                        $options[$SID->ConfigValue] =  $SID->ConfigValue;
-
-                                                                    endforeach;
-                                                                }
-
-                                                                echo form_dropdown('drpFreight', $options,set_value('drpFreight'),'id="drpFreight"' ,'class="form-control "');
-
-                                                                ?>
-                                                            </div>
-                                                        </div>
-														<div class="col-md-2" id="TripsValue" style="display:none;">
-                                                            <label>NO Of Trips</label>
-                                                            <div class="form-group">
-                                                                <?php
-                                                                $data = array('name' => 'NOOfTrips','value' => set_value('NOOfTrips'),'id'=>'NOOfTrips',  'class' => 'form-control num','onchange'=>'calculateFreight(0);' );
-                                                                echo form_input($data);
-                                                                ?>
-                                                            </div>
-                                                        </div>
-                                                        <div class="col-md-2">
-                                                            <label>Freight Rate </label>
-                                                            <div class="form-group">
-                                                                <?php
-                                                                $data = array('name' => 'txtFreight','value' => set_value('txtFreight'),'id'=>'txtFreight',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'calculateFreight(0);');
-                                                                echo form_input($data);
-                                                                ?>
-                                                            </div>
-                                                        </div>
-														
-                                                        <div class="col-md-2">
-                                                            <label>Freight Amt In INR</label>
-                                                            <div class="form-group">
-                                                                <?php
-                                                                $data = array('name' => 'txtAfterFreight','value' => set_value('txtAfterFreight'),'id'=>'txtAfterFreight',  'class' => 'form-control num' ,'readonly' => 'true');
-                                                                echo form_input($data);
-                                                                ?>
-                                                            </div>
-                                                        </div>
-														<div class="col-md-4">
-                                                            <label> Insurance  In INR (if Any)</label>
-                                                            <div class="form-group">
-                                                                <?php
-                                                                $data = array('name' => 'txtInsurance','value' => set_value('txtInsurance'),'id'=>'txtInsurance',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'calculateTotalValue(0);');
-                                                                echo form_input($data);
-                                                                ?>
-                                                            </div>
-                                                        </div> 
-                                                        
-
-
-                                                    </div>
-                                                
-                                                    <div class="col-md-12" >
-														
-                                                        <div class="col-md-4 ">
-														 <label><?php echo "Total Order Amt In ($INRSYM)";?></label>
-                                                            <div class="form-group">
-                                                                <?php
-                                                                $data = array('name' => 'txtTotalOrderValue','value' => set_value('txtTotalOrderValue'),'id'=>'txtTotalOrderValue',  'class' => 'form-control num' ,'readonly' => 'true');
-                                                                echo form_input($data);
-                                                                ?>
-                                                            </div>
-                                                        </div>
-                                                        <div class="col-md-4 col-md-offset-4"><br/>
-                                                            <a class="btn btn-primary font AddRevenue"  ID="AddRevenue"><i class="fa fa-plus"></i>&nbsp;&nbsp;<span class="bold">Add Revenue</span></a> &nbsp;&nbsp;&nbsp;&nbsp;<a class="btn btn-primary" data-dismiss="modal"  value="Cancel">Cancel</a>
-                                                        </div>
-														 
-                                                    </div>
-                                                 
-                                            </div>
-				 
-				<br/><br/>				
-				<!-- footer for revenue po -->
-			<div class="modal-footer">
-					
-			</div>
-			</div>
- 		  
-		 </div>
-		 </form>			 
-	</div>	  
-	</div>	   
-   
-   <br/>
-     <div  id="EDITREVENUE" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
-		<div class="modal-dialog">
-	   <!-- Modal content-->
-	 <form>
-		  <div class="modal-content" style="width:1100px;">
-			<div class="modal-header" style="background-color: #3c8dbc;color:#fff;">			   
-			  <center><h4>Edit Revenue Purchase Order Line Item </h4></center>				
-			</div>
-		 	<div align="left"> 
-				<div>
-					<div class="col-md-12" >
-								 <div class="col-md-3">
-								 <label>Req No</label>
-											<div >
-												 <?php													
-													
-													 $data = array('name' => 'EditReqNo','value' => set_value('EditReqNo'),'id'=>'EditReqNo',  'class' => 'form-control' ,'readonly' => 'true');
-												echo form_input($data);
-
-												?>						 
-											</div>
-										</div>
-								 
-								  <div class="col-md-3">
-								   <label>Department Name</label>
-											<div class="form-group">
-														<?php
-												 $data = array('name' => 'EditdeptName','value' => set_value('EditdeptName'),'id'=>'EditdeptName',  'class' => 'form-control' ,'readonly' => 'true');
-												echo form_input($data);
-												?>   
-											</div>
-								 </div>
-								  <div class="col-md-3">
-								   <label>Cost Center Code</label>
-											<div class="form-group">
-														<?php
-								$data = array('name' => 'EditCostCenter','value' => set_value('EditCostCenter'),'id'=>'EditCostCenter',  'class' => 'form-control' ,'readonly' => 'true');
-												echo form_input($data);
-
-								?>		
-											</div>
-								 </div>
-								  <div class="col-md-3">
-								   <label>Avl Bud Amt In INR</label>
-											<div class="form-group">
-														<?php
-												 $data = array('name' => 'EditAvlBudAmt','value' => set_value('EditAvlBudAmt'),'id'=>'EditAvlBudAmt',  'class' => 'form-control num' ,'readonly' => 'true');
-												echo form_input($data);
-												?>   
-											</div>
-								 </div>
-						</div>		
-					<div class="col-md-12">
-							  <div class="col-md-2">
-							  <label>Item Code</label>
-										<div  >
-											 <?php
-											$options = array("0"=>'Item Code');     
-																	
-								
-											echo form_dropdown('EditMaterialCode', $options,set_value('EditMaterialCode'),'id="EditMaterialCode"' ,'class="form-control"');
-
-											?>						 
-										</div>
-						   </div>
-						  
-							 <div class="col-md-2">
-							  <label>Item Name</label>
-										<div class="form-group">
-													<?php
-											 $data = array('name' => 'EditItemName','value' => set_value('EditItemName'),'id'=>'EditItemName',  'class' => 'form-control'  ,'readonly' => 'true');
-											echo form_input($data);
-											?>   
-										</div>
-							 </div>
-							 <div class="col-md-2">
-							  <label>UOM</label>
-										<div class="form-group">
-													<?php
-											 $data = array('name' => 'EditUOM','value' => set_value('EditUOM'),'id'=>'EditUOM',  'class' => 'form-control' ,'readonly' => 'true');
-											echo form_input($data);
-											?>   
-										</div>
-							 </div>
-							 <div class="col-md-2">
-							  <label>Quantity</label>
-										<div class="form-group">
-													<?php
-											 $data = array('name' => 'EditQuantity','value' => set_value('EditQuantity'),'id'=>'EditQuantity',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'Editchange();','style'=>'text-align:right;');
-											echo form_input($data);
-											?>   
-										</div>
-							 </div>
-							 <div class="col-md-2">
-							 <label><?php echo "Rate In ($INRSYM)";?></label>
-										<div class="form-group">
-													<?php
-											 $data = array('name' => 'EditRate','value' => set_value('EditRate'),'id'=>'EditRate',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'Editchange();','style'=>'text-align:right;' );
-											echo form_input($data);
-											?>   
-										</div>
-							 </div>
-							 <div class="col-md-2">
-							  <label><?php echo "Basic Amount ($INRSYM)";?></label>
-										<div class="form-group">
-													<?php
-											 $data = array('name' => 'txtEditBasicValue','value' => set_value('txtEditBasicValue'),'id'=>'txtEditBasicValue',  'class' => 'form-control num' ,'readonly' => 'true','style'=>'text-align:right;');
-											echo form_input($data);
-											?>   
-										</div>
-							 </div>
-				</div>
-				</div><br/>				
-				 	 
-					<div class="col-md-12">
-												<div class="col-md-4">
-															  <label>Discount Type </label>
-																		<div>
-																			 <?php
-																			$options = array("0"=>'Select Discount Type');     
-																			//print_r(  $options);
-																			
-																			if(!empty($TaxType))
-																			{
-																			foreach ($TaxType as $SID):
-																			  
-																		   
-																			  $options[$SID->ConfigValue] =  $SID->ConfigValue;
-
-																			endforeach;
-																			}										
-																
-																			echo form_dropdown('EditDiscountType', $options,set_value('EditDiscountType'),'id="EditDiscountType"' ,'class="form-control"');
-
-																			?>						 
-																		</div>
-											 </div>
-											 <div class="col-md-2">
-															  <label>Discount Rate </label>
-															  <div class="form-group">
-																					<?php
-																			 $data = array('name' => 'txtEditDiscount','value' => set_value('txtEditDiscount'),'id'=>'txtEditDiscount',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);' ,'onchange'=>'Editchange();calculateDiscount(1);','style'=>'text-align:right;');
-																			echo form_input($data);
-																			?>   
-																		</div> 
-											</div>
-											 <div class="col-md-2">
-															  <label>Discounted Amt In INR  </label>
-															  <div class="form-group">
-																					<?php
-																			 $data = array('name' => 'txtEditAfterDiscount','value' => set_value('txtEditAfterDiscount'),'id'=>'txtEditAfterDiscount',  'class' => 'form-control num' ,'readonly' => 'true','style'=>'text-align:right;');
-																			echo form_input($data);
-																			?>   
-																		</div> 
-											</div>					
-											 
-											  
-											 <div class="col-md-2" >
-                                                                <label>CGST In %</label>
-                                                                <div class="form-group">
-                                                                   <?php
-                                                                    $data = array('name' => 'EditCgst','value' => set_value('EditCgst',0),'id'=>'EditCgst',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'Editchange();');
-                                                                    echo form_input($data);
-                                                                    ?>
-                                                                </div>
-                                                            </div>
-                                                            <div class="col-md-2" >
-                                                                <label>CGST Amt In INR</label>
-                                                                <div class="form-group">
-                                                                     <?php
-                                                                    $data = array('name' => 'EditAfterCgst','value' => set_value('EditAfterCgst',0),'id'=>'EditAfterCgst',  'class' => 'form-control num' ,'readonly' => 'true');
-                                                                    echo form_input($data);
-                                                                    ?>
-                                                                </div>
-                                                            </div> 
-											  
-											</div>
-										<div class="col-md-12" style="text-align:left;">
-																	<div class="col-md-4">
-															  <label>Packaging Type </label>
-																		<div>
-																			 <?php
-																			$options = array("0"=>'Select Packaging Type');     
-																			//print_r(  $options);
-																			
-																			if(!empty($TaxType))
-																			{
-																			foreach ($TaxType as $SID):
-																			  
-																		   
-																			  $options[$SID->ConfigValue] =  $SID->ConfigValue;
-
-																			endforeach;
-																			}										
-																
-																			echo form_dropdown('EditPackagingType', $options,set_value('EditPackagingType'),'id="EditPackagingType"' ,'class="form-control "');
-
-																			?>						 
-																		</div>
-											 </div>
-											 <div class="col-md-2">
-															  <label>Packaging Rate </label>
-															  <div class="form-group">
-																					<?php
-																			 $data = array('name' => 'txtEditPackaging','value' => set_value('txtEditPackaging'),'id'=>'txtEditPackaging',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'calculatePackaging(1);','style'=>'text-align:right;');
-																			echo form_input($data);
-																			?>   
-																		</div> 
-											</div>
-											 <div class="col-md-2">
-															  <label>Packaging Amt In INR </label>
-															  <div class="form-group">
-																					<?php
-																			 $data = array('name' => 'txtEditAfterPackaging','value' => set_value('txtEditAfterPackaging'),'id'=>'txtEditAfterPackaging',  'class' => 'form-control num' ,'readonly' => 'true','style'=>'text-align:right;');
-																			echo form_input($data);
-																			?>   
-																		</div> 
-											</div>  
-											<div id="SGSTEditModel">
-											<div class="col-md-2">
-                                                            <label>SGST In %</label>
-                                                            <div class="form-group">
-                                                               <?php
-                                                                $data = array('name' => 'EditSgst','value' => set_value('EditSgst',0),'id'=>'EditSgst',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>' Editchange();');
-                                                                echo form_input($data);
-                                                                ?>
-                                                            </div>
-                                                        </div>
-                                                        <div class="col-md-2">
-                                                            <label>SGST Amt In INR</label>
-                                                            <div class="form-group">
-                                                                <?php
-                                                                $data = array('name' => 'EditAfterSgst','value' => set_value('EditAfterSgst',0),'id'=>'EditAfterSgst',  'class' => 'form-control num' ,'readonly' => 'true');
-                                                                echo form_input($data);
-                                                                ?>
-                                                            </div>
-                                                        </div>
-											</div>
-											<div id="IGSTEditModel" style="display:none;">
-											<div class="col-md-2">
-                                                            <label>IGST In %</label>
-                                                            <div class="form-group">
-                                                                <?php
-                                                                $data = array('name' => 'EditIgst','value' => set_value('EditIgst',0),'id'=>'EditIgst',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>' Editchange();');
-                                                                echo form_input($data);
-                                                                ?>
-                                                            </div>
-                                                        </div>
-                                                        <div class="col-md-2">
-                                                            <label>IGST Amt In INR</label>
-                                                            <div class="form-group">
-                                                               <?php
-                                                                $data = array('name' => 'EditAfterIgst','value' => set_value('EditAfterIgst',0),'id'=>'EditAfterIgst',  'class' => 'form-control num' ,'readonly' => 'true');
-                                                                echo form_input($data);
-                                                                ?>
-                                                            </div>
-                                                        </div>
-											</div>
-											</div> 
-										<div class="col-md-12">
-															<div class="col-md-2">
-															  <label>Freight Type </label>
-																		<div>
-																			 <?php
-																			$options = array("0"=>'Select Freight Type');     
-																			//print_r(  $options);
-																			
-																			if(!empty($FreightType))
-																			{
-																			foreach ($FreightType as $SID):
-																			  
-																		   
-																			  $options[$SID->ConfigValue] =  $SID->ConfigValue;
-
-																			endforeach;
-																			}										
-																
-																			echo form_dropdown('drpEditFreight', $options,set_value('drpEditFreight'),'id="drpEditFreight"' ,'class="form-control "');
-
-																			?>						 
-																		</div>
-											 </div>
-											  <div class="col-md-2" id="EditTripsValue" style="display:none;">
-                                                            <label>NO Of Trips</label>
-                                                            <div class="form-group">
-                                                                <?php
-                                                                $data = array('name' => 'EditNOOfTrips','value' => set_value('EditNOOfTrips'),'id'=>'EditNOOfTrips',  'class' => 'form-control num' ,'onchange'=>'calculateFreight(1);');
-                                                                echo form_input($data);
-                                                                ?>
-                                                            </div>
-                                                        </div>
-											 <div class="col-md-2">
-															  <label>Freight Rate </label>
-															  <div class="form-group">
-																					<?php
-																			 $data = array('name' => 'txtEditFreight','value' => set_value('txtEditFreight'),'id'=>'txtEditFreight',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'calculateFreight(1);','style'=>'text-align:right;');
-																			echo form_input($data);
-																			?>   
-																		</div> 
-											</div>
-											 <div class="col-md-2">
-															  <label>Freight Amt In INR</label>
-															  <div class="form-group">
-																					<?php
-																			 $data = array('name' => 'txtEditAfterFreight','value' => set_value('txtEditAfterFreight'),'id'=>'txtEditAfterFreight',  'class' => 'form-control num' ,'readonly' => 'true','style'=>'text-align:right;');
-																			echo form_input($data);
-																			?>   
-																		</div> 
-											</div> 
-											
-											
-											<div class="col-md-4">
-												  <label> Insurance Amt In INR (if Any)</label>
-												  <div class="form-group">
-																		<?php
-																 $data = array('name' => 'txtEditInsurance','value' => set_value('txtEditInsurance'),'id'=>'txtEditInsurance',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'calculateEditTotalValue(1);','style'=>'text-align:right;');
-																echo form_input($data);
-																?>   
-															</div>
-												</div>
-												 
-											
-											</div>
-												 				
-				
-					 <div class="col-md-12" >
-						<div class="col-md-4">
-							<label><?php echo "Total Order Amt In ($INRSYM)";?></label> 						
-							<div class="form-group">
-											<?php
-									 $data = array('name' => 'txtEditTotalOrderValue','value' => set_value('txtEditTotalOrderValue'),'id'=>'txtEditTotalOrderValue',  'class' => 'form-control num' ,'readonly' => 'true','style'=>'text-align:right;');
-									echo form_input($data);
-									?>   
-							</div> 
-						</div>
-					 <div class="col-md-4 col-md-offset-4"><br/>
-					 		<a class="btn btn-primary EditRevenue"  ID="EditRevenue"><i class="fa fa-plus"></i>&nbsp;&nbsp;<span class="bold">Edit Revenue</span></a>&nbsp;&nbsp;&nbsp;&nbsp;<a class="btn btn-primary" data-dismiss="modal"  value="Cancel">Cancel</a>
-										 
-					</div>
-					 
-					</div> 
-					 			 				
-					</div>
-				<br/><br/>				
-				<!-- footer for revenue po -->
-			<div class="modal-footer">
-					
-			</div>
-			</div>
- 		  
-		 </div>
-		 </form>			 
-	</div>	  
-	</div>	   
-	    </br>
-<div  id="VIEWREVENUE" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
-		<div class="modal-dialog">
-	   <!-- Modal content-->
-	 <form>
-		  <div class="modal-content" style="width:1100px;">
-			<div class="modal-header" style="background-color: #3c8dbc;color:#fff;">			   
-			  <center><h4>View Revenue Purchase Order Line Item </h4></center>				
-			</div>
-		 	<div align="left"> 
-				 
-					<div class="col-md-12" >
-								 <div class="col-md-3">
-								 <label>Req No</label>
-											<div >
-												 <?php													
-													
-													 $data = array('name' => 'ViewReqNo','value' => set_value('ViewReqNo'),'id'=>'ViewReqNo',  'class' => 'form-control' ,'readonly' => 'true');
-												echo form_input($data);
-
-												?>						 
-											</div>
-										</div>
-								 
-								  <div class="col-md-3">
-								   <label>Department Name</label>
-											<div class="form-group">
-														<?php
-												 $data = array('name' => 'ViewdeptName','value' => set_value('ViewdeptName'),'id'=>'ViewdeptName',  'class' => 'form-control' ,'readonly' => 'true');
-												echo form_input($data);
-												?>   
-											</div>
-								 </div>
-								  <div class="col-md-3">
-								   <label>Cost Center Code</label>
-											<div class="form-group">
-														<?php
-								$data = array('name' => 'ViewCostCenter','value' => set_value('ViewCostCenter'),'id'=>'ViewCostCenter',  'class' => 'form-control' ,'readonly' => 'true');
-												echo form_input($data);
-
-								?>		
-											</div>
-								 </div>
-								  <div class="col-md-3">
-								   <label>Avl Bud Amt In INR</label>
-											<div class="form-group">
-														<?php
-												 $data = array('name' => 'ViewAvlBudAmt','value' => set_value('ViewAvlBudAmt'),'id'=>'ViewAvlBudAmt',  'class' => 'form-control num' ,'readonly' => 'true');
-												echo form_input($data);
-												?>   
-											</div>
-								 </div>  
-						</div>		
-					<div class="col-md-12">
-							  <div class="col-md-2">
-							  <label>Item Code</label>
-										<div>
-											
-                                                                                       		<?php
-												 $data = array('name' => 'ViewMaterialCode','value' => set_value('ViewMaterialCode'),'id'=>'ViewMaterialCode',  'class' => 'form-control num' ,'readonly' => 'true');
-												echo form_input($data);
-												?> 
-										</div>
-						   </div>
-						  
-							 <div class="col-md-2">
-							  <label>Item Name</label>
-										<div class="form-group">
-													<?php
-											 $data = array('name' => 'ViewItemName','value' => set_value('ViewItemName'),'id'=>'ViewItemName',  'class' => 'form-control'  ,'readonly' => 'true');
-											echo form_input($data);
-											?>   
-										</div>
-							 </div>
-							 <div class="col-md-2">
-							  <label>UOM</label>
-										<div class="form-group">
-													<?php
-											 $data = array('name' => 'ViewUOM','value' => set_value('ViewUOM'),'id'=>'ViewUOM',  'class' => 'form-control' ,'readonly' => 'true');
-											echo form_input($data);
-											?>   
-										</div>
-							 </div>
-							 <div class="col-md-2">
-							  <label>Quantity</label>
-										<div class="form-group">
-													<?php
-											 $data = array('name' => 'ViewQuantity','value' => set_value('ViewQuantity'),'id'=>'ViewQuantity',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','style'=>'text-align:right;','readonly' => 'true');
-											echo form_input($data);
-											?>   
-										</div>
-							 </div>
-							 <div class="col-md-2">
-							 <label><?php echo "Rate In ($INRSYM)";?></label>
-										<div class="form-group">
-													<?php
-											 $data = array('name' => 'ViewRate','value' => set_value('ViewRate'),'id'=>'ViewRate',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','readonly' => 'true','style'=>'text-align:right;' );
-											echo form_input($data);
-											?>   
-										</div>
-							 </div>
-							 <div class="col-md-2">
-							  <label><?php echo "Basic Amount ($INRSYM)";?></label>
-										<div class="form-group">
-													<?php
-											 $data = array('name' => 'txtViewBasicValue','value' => set_value('txtViewBasicValue'),'id'=>'txtViewBasicValue',  'class' => 'form-control num' ,'readonly' => 'true','style'=>'text-align:right;');
-											echo form_input($data);
-											?>   
-										</div>
-							 </div>
-				</div>
-				 				
-				<div class="col-md-12" style="padding:0px;">		 	 				 
-					 
-					 <div class="col-md-12">
-											<div class="col-md-4">
-									  <label>Discount Type </label>
-												<div>
-													
-                                                                                                                <?php
-											 $data = array('name' => 'ViewDiscountType','value' => set_value('ViewDiscountType'),'id'=>'ViewDiscountType',  'class' => 'form-control num' ,'readonly' => 'true','style'=>'text-align:right;');
-											echo form_input($data);
-											?>   
-												</div>
-					 </div>
-					 <div class="col-md-2">
-									  <label>Discount Rate </label>
-									  <div class="form-group">
-															<?php
-													 $data = array('name' => 'txtViewDiscount','value' => set_value('txtViewDiscount'),'id'=>'txtViewDiscount',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);' ,'style'=>'text-align:right;','readonly' => 'true');
-													echo form_input($data);
-													?>   
-												</div> 
-					</div>
-					 <div class="col-md-2">
-									  <label><?php echo "Discounted Amt In ($INRSYM)";?></label>
-									  <div class="form-group">
-															<?php
-													 $data = array('name' => 'txtViewAfterDiscount','value' => set_value('txtViewAfterDiscount'),'id'=>'txtViewAfterDiscount',  'class' => 'form-control num' ,'readonly' => 'true','style'=>'text-align:right;','readonly' => 'true');
-													echo form_input($data);
-													?>   
-												</div> 
-					</div>	
-  
-											 <div class="col-md-2" >
-                                                                <label>CGST In %</label>
-                                                                <div class="form-group">
-                                                                    <?php
-                                                                    $data = array('name' => 'ViewCGST','value' => set_value('tViewCGST'),'id'=>'ViewCGST',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'calculateCST(0);');
-                                                                    echo form_input($data);
-                                                                    ?>
-                                                                </div>
-                                                            </div>
-                                                            <div class="col-md-2" >
-                                                                <label>CGST Amt In INR</label>
-                                                                <div class="form-group">
-                                                                    <?php
-                                                                    $data = array('name' => 'ViewAfterCGST','value' => set_value('ViewAfterCGST'),'id'=>'ViewAfterCGST',  'class' => 'form-control num' ,'readonly' => 'true');
-                                                                    echo form_input($data);
-                                                                    ?>
-                                                                </div>
-                                                            </div> 					
-					
-					</div>
-					 
-					 <div class="col-md-12" style="text-align:left;">
-											<div class="col-md-4">
-									  <label>Packaging Type </label>
-												<div>
-													 
-                                                                                                        	<?php
-													 $data = array('name' => 'ViewPackagingType','value' => set_value('ViewPackagingType'),'id'=>'ViewPackagingType',  'class' => 'form-control num' ,'readonly' => 'true','style'=>'text-align:right;');
-													echo form_input($data);
-													?> 
-												</div>
-					 </div>
-					 <div class="col-md-2">
-									  <label>Packaging Rate </label>
-									  <div class="form-group">
-															<?php
-													 $data = array('name' => 'txtViewPackaging','value' => set_value('txtViewPackaging'),'id'=>'txtViewPackaging',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','style'=>'text-align:right;','readonly' => 'true');
-													echo form_input($data);
-													?>   
-												</div> 
-					</div>
-					 <div class="col-md-2">
-									   <label><?php echo "Packaging Amt ($INRSYM)";?> </label>
-									  <div class="form-group">
-															<?php
-													 $data = array('name' => 'txtViewAfterPackaging','value' => set_value('txtViewAfterPackaging'),'id'=>'txtViewAfterPackaging',  'class' => 'form-control num' ,'readonly' => 'true','style'=>'text-align:right;');
-													echo form_input($data);
-													?>   
-												</div> 
-					</div>  
-					<div id="SGSTViewModel">
-											<div class="col-md-2">
-                                                            <label>SGST In %</label>
-                                                            <div class="form-group">
-                                                                <?php
-                                                                $data = array('name' => 'ViewSGST','value' => set_value('ViewSGST'),'id'=>'ViewSGST',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>' calculateGST(0);');
-                                                                echo form_input($data);
-                                                                ?>
-                                                            </div>
-                                                        </div>
-                                                        <div class="col-md-2">
-                                                            <label>SGST Amt In INR</label>
-                                                            <div class="form-group">
-                                                                <?php
-                                                                $data = array('name' => 'ViewAfterSGST','value' => set_value('ViewAfterSGST'),'id'=>'ViewAfterSGST',  'class' => 'form-control num' ,'readonly' => 'true');
-                                                                echo form_input($data);
-                                                                ?>
-                                                            </div>
-                                                        </div>
-											</div>
-											<div id="IGSTViewModel" style="display:none;">
-											<div class="col-md-2">
-                                                            <label>IGST In %</label>
-                                                            <div class="form-group">
-                                                                <?php
-                                                                $data = array('name' => 'ViewIGST','value' => set_value('tViewIGST'),'id'=>'ViewIGST',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>' calculateGST(0);');
-                                                                echo form_input($data);
-                                                                ?>
-                                                            </div>
-                                                        </div>
-                                                        <div class="col-md-2">
-                                                            <label>IGST Amt In INR</label>
-                                                            <div class="form-group">
-                                                                <?php
-                                                                $data = array('name' => 'ViewAfterIGST','value' => set_value('ViewAfterIGST'),'id'=>'ViewAfterIGST',  'class' => 'form-control num' ,'readonly' => 'true');
-                                                                echo form_input($data);
-                                                                ?>
-                                                            </div>
-                                                        </div>
-											</div>
-					
-					</div> 					 
-					 
-					<div class="col-md-12"  >
-									<div class="col-md-4">
-									  <label>Freight Type </label>
-												<div>
-													
-                                                                                         <?php
-													 $data = array('name' => 'drpViewFreight','value' => set_value('drpViewFreight'),'id'=>'drpViewFreight',  'class' => 'form-control num' ,'readonly' => 'true','style'=>'text-align:right;');
-													echo form_input($data);
-													?>  						 
-												</div>
-					 </div>
-					 <div class="col-md-2" id="ViewTripsValue" style="display:none;">
-                                                            <label>NO Of Trips</label>
-                                                            <div class="form-group">
-                                                                <?php
-                                                                $data = array('name' => 'ViewNOOfTrips','value' => set_value('ViewNOOfTrips'),'id'=>'ViewNOOfTrips',  'class' => 'form-control num' ,'readonly' => 'true');
-                                                                echo form_input($data);
-                                                                ?>
-                                                            </div>
-                                                        </div>
-					 <div class="col-md-2">
-									  <label>Freight Rate </label>
-									  <div class="form-group">
-															<?php
-													 $data = array('name' => 'txtViewFreight','value' => set_value('txtViewFreight'),'id'=>'txtViewFreight',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','style'=>'text-align:right;','readonly' => 'true');
-													echo form_input($data);
-													?>   
-												</div> 
-					</div>
-					 <div class="col-md-2">
-									 <label><?php echo "Freight Amt ($INRSYM)";?> </label>
-									  <div class="form-group">
-															<?php
-													 $data = array('name' => 'txtViewAfterFreight','value' => set_value('txtViewAfterFreight'),'id'=>'txtViewAfterFreight',  'class' => 'form-control num' ,'readonly' => 'true','style'=>'text-align:right;');
-													echo form_input($data);
-													?>   
-												</div> 
-					</div> 
-					 <div class="col-md-4">
-									  <label> Insurance In INR (if Any)</label>
-									  <div class="form-group">
-															<?php
-													 $data = array('name' => 'txtViewInsurance','value' => set_value('txtViewInsurance'),'id'=>'txtViewInsurance',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','style'=>'text-align:right;','readonly' => 'true');
-													echo form_input($data);
-													?>   
-												</div>
-					</div>
-					
-					
-					</div>
-					
-				 
-					 <div class="col-md-12" >
-					   <div class="col-md-4">  <label><?php echo "Total Order Amt In ($INRSYM)";?></label>
-							<div class="form-group">
-											<?php
-									 $data = array('name' => 'txtViewTotalOrderValue','value' => set_value('txtViewTotalOrderValue'),'id'=>'txtViewTotalOrderValue',  'class' => 'form-control num' ,'readonly' => 'true','style'=>'text-align:right;');
-									echo form_input($data);
-									?>   
-							</div> 
-						</div>
-					  <div class="col-md-2 col-md-offset-6"><br/>
-					 		 
-					<a class="btn btn-primary" data-dismiss="modal"  value="Cancel">Cancel</a>					 
-					</div> 
-					</div> 
-					 			 				
-					</div>
-				 				
-				<!-- footer for revenue po -->
-			<div class="modal-footer">
-					
-			</div>
-			</div>
- 		  
-		 </div>
-		 </form>			 
-	</div>	  
-	</div>	 
-           
-            <div class="box-body">
-              <table id="revenueTax" class="table table-bordered table-hover" style="background-color:#fff;font-size:12px;">
-                <thead style="background-color:#ddf">
-                <tr>
-					<th>SNo</th>
-					<th>Requisition No</th>
-                     <th>Item Code</th>
-					<th>Item Description</th>
-					<th>Quantity</th>
-					<th>UOM</th>
-					<th>RateIn INR</th>
-					<th>Basic Amount In INR</th>
-					 <th>Tax Amount In INR</th>
-					<th>Total Order Amount In INR</th>
-                     <th>Actual Quantity</th>
-					<th>Received Quantity</th>
-					<th>Pending Quantity</th>
-					<th>Action</th>
-                </tr>
-                </thead>				
-               
-             <tbody id='RevenueAppend'>     
-     <?php
-
-    if(!empty($POItem))
-                    {
-						 $index = 0;
-					
-                        foreach($POItem as $record)
-                        {
-							$index = $index + 1;
-                    ?>
-					<tr id="<?php echo $index ; ?>">
-					<td align="left"><?php echo $index ; ?></td> 
-					<td><?php echo $record->ReqNo ?></td> 
-                                        <td><?php echo $record->MaterialCode ?></td> 
-					<td><?php echo $record->MaterialName ?></td> 
-					<td align="right"><?php echo $record->Quantity ?></td>   					
-					<td><?php echo $record->UOM ?></td>                     
-					<td align="right"><?php echo $record->Rate ?></td>                     
-					
-					<td align="right"><?php echo number_format($record->BasicValue, 2, '.', ''); ?></td>    
-					  
-					<td align="right"><?php echo $record->Taxamount ?></td>
-					<td align="right"><?php echo $record->TotalValue ?></td>
-                                        <td align="right"><?php echo $record->Quantity ?></td>
-                                                                        <td align="right"><?php echo $record->ReceivedQuantity ?></td>
-                                                                        <td align="right"><?php echo number_format($record->Quantity - $record->ReceivedQuantity, 2, '.', ''); ?></td>
-					 <input type="hidden" name="<?php echo 'Reqnumber'.$index ?>" id="<?php echo 'Reqnumber'.$index ?>" value="<?php echo $record->ReqNo ; ?>" />
-					 <input type="hidden" name="<?php echo 'departmentName'.$index ?>" id="<?php echo 'departmentName'.$index ?>" value="<?php echo $record->DepartmentName ; ?>" />
-					<input type="hidden" name="<?php echo 'AvilBudget'.$index ?>" id="<?php echo 'AvilBudget'.$index ?>" value="<?php echo $AvlAmount ; ?>" />					
-					<input type="hidden" name="<?php echo 'LineItemNo'.$index ?>" id="<?php echo 'LineItemNo'.$index ?>" value="<?php echo $record->LineItemNo ; ?>" />
- <input type="hidden" name="<?php echo 'costCode'.$index ?>" id="<?php echo 'costCode'.$index ?>" value="<?php echo $record->CostCenterCode ; ?>" />
- <input type="hidden" name="<?php echo 'materialCode'.$index ?>" id="<?php echo 'materialCode'.$index ?>" value="<?php echo $record->MaterialCode ; ?>" />
- <input type="hidden" name="<?php echo 'materialName'.$index ?>" id="<?php echo 'materialName'.$index ?>" value="<?php echo $record->MaterialName ; ?>" />
- <input type="hidden" name="<?php echo 'uom'.$index ?>" id="<?php echo 'uom'.$index ?>" value="<?php echo $record->UOM ; ?>" />
- <input align="right" type="hidden" name="<?php echo 'quantity'.$index ?>" id="<?php echo 'quantity'.$index ?>" value="<?php echo $record->Quantity ; ?>" />
- 
-  <input  align="right" type="hidden" name="<?php echo 'itemRate'.$index ?>" id="<?php echo 'itemRate'.$index ?>" value="<?php echo $record->Rate ; ?>" />
-  
- <input align="right" type="hidden" name="<?php echo 'DisType'.$index ?>" id="<?php echo 'DisType'.$index ?>" value="<?php echo $record->DiscountType ; ?>" />
- <input align="right" type="hidden" name="<?php echo 'DisVal'.$index ?>" id="<?php echo 'DisVal'.$index ?>" value="<?php echo $record->DiscountValue ; ?>" />
- <input align="right" type="hidden" name="<?php echo 'AfterDisVal'.$index ?>" id="<?php echo 'AfterDisVal'.$index ?>" value="<?php echo $record->AfterDiscount ; ?>" />
- <input align="right" type="hidden" name="<?php echo 'PackOption'.$index ?>" id="<?php echo 'PackOption'.$index ?>" value="<?php echo $record->PackagingCalulatedOn ; ?>" />
-  <input align="right" type="hidden" name="<?php echo 'PackType'.$index ?>" id="<?php echo 'PackType'.$index ?>" value="<?php echo $record->PackagingType ; ?>" />
-  <input align="right" type="hidden" name="<?php echo 'PackVal'.$index ?>" id="<?php echo 'PackVal'.$index ?>" value="<?php echo $record->PackagingValue ; ?>" />
- <input align="right" type="hidden" name="<?php echo 'AfterPackVal'.$index ?>" id="<?php echo 'AfterPackVal'.$index ?>" value="<?php echo $record->AfterPackagingValue ; ?>" />
- <input align="right" type="hidden" name="<?php echo 'RevenueCgst'.$index ?>" id="<?php echo 'RevenueCgst'.$index ?>" value="<?php echo $record->CGST ; ?>" />
- <input align="right" type="hidden" name="<?php echo 'RevenueAfterCgst'.$index ?>" id="<?php echo 'RevenueAfterCgst'.$index ?>" value="<?php echo $record->AfterCGST ; ?>" />
-<input align="right" type="hidden" name="<?php echo 'RevenueSgst'.$index ?>" id="<?php echo 'RevenueSgst'.$index ?>" value="<?php echo $record->SGST ; ?>" />
-<input align="right" type="hidden" name="<?php echo 'RevenueAfterSgst'.$index ?>" id="<?php echo 'RevenueAfterSgst'.$index ?>" value="<?php echo $record->AfterSGST ; ?>" />
-<input align="right" type="hidden" name="<?php echo 'RevenueIgst'.$index ?>" id="<?php echo 'RevenueIgst'.$index ?>" value="<?php echo $record->IGST ; ?>" />
-<input align="right" type="hidden" name="<?php echo 'RevenueAfterIgst'.$index ?>" id="<?php echo 'RevenueAfterIgst'.$index ?>" value="<?php echo $record->AfterIGST ; ?>" />
-  <input align="right" type="hidden" name="<?php echo 'FreightType'.$index ?>" id="<?php echo 'FreightType'.$index ?>" value="<?php echo $record->FreightType ; ?>" />
-<input align="right" type="hidden" name="<?php echo 'NoOfTrip'.$index ?>" id="<?php echo 'NoOfTrip'.$index ?>" value="<?php echo $record->NoOfTrip ; ?>" />
- <input align="right" type="hidden" name="<?php echo 'FreightVal'.$index ?>" id="<?php echo 'FreightVal'.$index ?>" value="<?php echo $record->FreightValue ; ?>" />
- <input align="right" type="hidden" name="<?php echo 'AfterFreightVal'.$index ?>" id="<?php echo 'AfterFreightVal'.$index ?>" value="<?php echo $record->AfterFreightValue ; ?>" />
-  <input align="right"type="hidden" name="<?php echo 'basicval'.$index ?>" id="<?php echo 'basicval'.$index ?>"   value="<?php echo $record->BasicValue ; ?>"/> 
-  <input align="right" type="hidden" name="<?php echo 'Insval'.$index ?>" id="<?php echo 'Insval'.$index ?>" value="<?php echo $record->Insurance ; ?>" />
- <input align="right" type="hidden" name="<?php echo 'TotalOrderValue'.$index ?>" id="<?php echo 'TotalOrderValue'.$index ?>" value="<?php echo $record->TotalValue ; ?>" />
-                    <?php 
-					        
-							if($PONOStatus == PO_DRAFT || $PONOStatus == PO_CREATED) 
-							{?>					
-					<td>    <a    data-target='#EDITREVENUE'	data-id="<?php echo $index ; ?>" data-userid="<?php echo $index ; ?>" data-toggle="modal" href="#EDITREVENUE"><i class="fa fa-pencil" data-toggle="tooltip" title="Click here to view/Edit the  <?php echo $record->ReqNo ; ?> Requisition details"></i>&nbsp;&nbsp;&nbsp;</a> <a href='#' onclick = "DeleteRow(<?php echo $index ; ?>)" class="link" data-id="<?php echo $index ; ?>" data-userid="<?php echo $index ; ?>"  id="Del" ><span class="glyphicon glyphicon-trash"></span></a>
-                      <?php
-                        } else {?>	
-						<td>   <a    data-target='#VIEWREVENUE'	data-id="<?php echo $index ; ?>" data-userid="<?php echo $index ; ?>" data-toggle="modal" href="#VIEWREVENUE"><i class="fa fa-eye" data-toggle="tooltip" title="Click here to view the  <?php echo $record->ReqNo ; ?> Requisition details"></i>&nbsp;&nbsp;&nbsp;</a>	  </td>  
-					 
-
-<?php  
-                        }?>	
-                    </tr>
-					 <?php
-								
-								
-								$totBasicAmt  = $totBasicAmt + $record->BasicValue;
-								$totDiscountAmt  = $totDiscountAmt + $record->AfterDiscount;
-								$totPackagingAmt  = $totPackagingAmt + $record->AfterPackagingValue;
-								$totCgst  = $totCgst + $record->AfterCGST;
-								$totSgst  = $totSgst + $record->AfterSGST;
-								$totIgst  = $totIgst + $record->AfterIGST;
-								
-								$totFreightAmt   = $totFreightAmt + $record->AfterFreightValue;
-								$totInsuranceAmt   = $totInsuranceAmt + $record->Insurance;
-								$totOrderSummaryAmt   = $totOrderSummaryAmt +$record->TotalValue;
-								
-                        }
-						?> 
-						<?php 
-						   
-                    }
-                    ?>
-			</tbody>
-        </table>
-            </div>
-            <!-- /.box-body -->
-         
-
-       
- <div class="row" style="border:1px solid;">	 
-	<div class="col-md-12">
-		<div class="col-md-3">
-			  <label >Basic Amount  In INR</label> 
-				 								
-							<?php
-						 $data = array('name' => 'txtTotBasicAmount','value' => set_value('txtTotBasicAmount',number_format($totBasicAmt, 2, '.', '')),'id'=>'txtTotBasicAmount',  'class' => 'form-control'  ,'readonly' => 'true','style'=>'text-align:right;');
-						echo form_input($data);
-						?>   
-					
-				 	
-		</div>
-		<div class="col-md-3">
-			  <label >Total Discount Amount  In INR </label> 
-				 							
-							<?php
-						 $data = array('name' => 'txtTotalDiscount','value' => set_value('txtTotalDiscount',number_format($totDiscountAmt, 2, '.', '')),'id'=>'txtTotalDiscount',  'class' => 'form-control'   ,'readonly' => 'true','style'=>'text-align:right;');
-						echo form_input($data);
-						?>   					
-				 
-		</div>
-		<div class="col-md-3" id="TotSCST">
-			 <label >Total SGST Amount In INR</label> 
-				 							
-							<?php
-						 $data = array('name' => 'txtTotalSGST','value' => set_value('txtTotalSGST',number_format($totSgst, 2, '.', '')),'id'=>'txtTotalSGST',  'class' => 'form-control' ,'readonly' => 'true','style'=>'text-align:right;');
-						echo form_input($data);
-						?>   					
-				 
-		</div>
-		<div class="col-md-3"  id="TotICST" style="display:none;">
-			  <label >Total IGST Amount In INR </label> 
-				 							
-							<?php
-						 $data = array('name' => 'txtTotalIGST','value' => set_value('txtTotalIGST',number_format($totIgst, 2, '.', '')),'id'=>'txtTotalIGST',  'class' => 'form-control' ,'readonly' => 'true','style'=>'text-align:right;');
-						echo form_input($data);
-						?>   					
-				 
-		</div>
-		<div class="col-md-3">
-			  <label >Total CGST Amount In INR </label> 
-				 								
-							<?php
-						 $data = array('name' => 'txtTotalCGST','value' => set_value('txtTotalCGST',number_format($totCgst, 2, '.', '')),'id'=>'txtTotalCGST',  'class' => 'form-control' ,'readonly' => 'true','style'=>'text-align:right;');
-						echo form_input($data);
-						?>   					
-				 
-		</div>
-	</div>
-	<div class="col-md-12">
-		 
-		
-		<div class="col-md-3">
-			  <label >Total Packaging Amount In INR</label> 
-				 								
-							<?php
-						 $data = array('name' => 'txtTotalPackaing','value' => set_value('txtTotalPackaing',number_format($totPackagingAmt, 2, '.', '')),'id'=>'txtTotalPackaing',  'class' => 'form-control'  ,'readonly' => 'true','style'=>'text-align:right;');
-						echo form_input($data);
-						?>   				
-				 
-		</div>
-		<div class="col-md-3">
-		  <label >Total Insurance Amount In INR</label> 
-				 						
-							<?php
-						 $data = array('name' => 'txtTotalInsurance','value' => set_value('txtTotalInsurance',number_format($totInsuranceAmt, 2, '.', '')),'id'=>'txtTotalInsurance',  'class' => 'form-control' ,'readonly' => 'true','style'=>'text-align:right;');
-						echo form_input($data);
-						?>   					
-				 
-								
-		</div>
-		<div class="col-md-3">
-			  <label >Total Freight Amount In INR</label> 
-				 								
-							<?php
-						 $data = array('name' => 'txtTotalFreight','value' => set_value('txtTotalFreight',number_format($totFreightAmt, 2, '.', '')),'id'=>'txtTotalFreight',  'class' => 'form-control' ,'readonly' => 'true','style'=>'text-align:right;');
-						echo form_input($data);
-						?>   					
-				 
-		</div>
-		<div class="col-md-3">	
-			<label>Total Order Amount In INR</label>		
-					<?php
-				 $data = array('name' => 'txtTotalOrderValueSummary','value' => set_value('txtTotalOrderValueSummary',number_format($totOrderSummaryAmt, 2, '.', '')),'id'=>'txtTotalOrderValueSummary',  'class' => 'form-control'  ,'readonly' => 'true','style'=>'text-align:right;');
-				echo form_input($data);
-				?>   					
-		</div>
-	</div>
-	 
-	<div class="col-md-12">
-		<div class="col-md-12">
-							<label>Special Instructions </label>	<?php
-						 $data = array('name' => 'txtSpcialInstruction','value' => set_value('txtSpcialInstruction',$ServiceDescription),'id'=>'txtSpcialInstruction',  'class' => 'form-control' );
-						echo form_textarea($data);
-						?>
-<input type="hidden" name="SpcialInstruction" id="SpcialInstruction"  value="<?php echo $ServiceDescription;?>">   
-		</div>	 
-	</div> 
-	<div class="row" style="padding: 2% 0%">
-	   <div class="col-md-3 col-md-offset-9"><br/>
-	   <input type="hidden" name="txtPoRange" id="txtPoRange" /> 
-	    <input type="hidden" name="isEdit" id="isEdit" value="0" /> 
-	  <input type="hidden" name="txtStatus" id="txtStatus" /> 
-    <input type="hidden" name="txtRowCount" id="txtRowCount"  value="<?php echo $index;?>">
-   <input type="hidden" name="txtDeletedRow" id="txtDeletedRow" />   
-   <input type="hidden" name="txtPONO" id="txtPONO"  value="<?php  echo $PONO; ?>"/> 
-	 <?php if($PONOStatus == PO_DRAFT || $PONOStatus == PO_CREATED  ) {
-      if($PONOStatus == PO_DRAFT || $PONOStatus == PO_CREATED){?>  		 
-	<a class="btn btn-primary Save"  ID="Save" onclick="Save(0)" >&nbsp;&nbsp;<span class="bold">Save</span></a> <?php }?>
-	<a class="btn btn-primary Save"  ID="Submit" onclick="Save(1)" >&nbsp;&nbsp;<span class="bold">Submit</span></a> 
-    <input type="reset" class="btn btn-primary" value="Reset">
-    <?php }else {?>
-     <a class="btn btn-primary"  ID="OK" href="<?php echo base_url().'purchaseorderListing'; ?>">&nbsp;&nbsp;<span class="bold">OK</span></a>  <?php } ?>
- 
-    
-   
-	   </div><br/>
-	   </div>
-	   <div class="col-md-12">
-	   <div class="col-md-8">
-	   <div class="row">
-							<div class="col-md-2"><label>Request On</label></div>
-							<div class="col-md-4">
-																  
-								  <?php
-											 $data = array('name' => 'Requeston','value' => set_value('Requeston',$Reqon),'id'=>'Requeston',  'class' => 'form-control num' ,'required' => 'true', 'onkeypress'=>'return false;','readonly' => 'true');
-											echo form_input($data);
-											?>   
-							</div>
-							</div><br/>
-							 <div class="row">
-							 <div class="col-md-2"><label>Request By</label></div>
-							<div class="col-md-4"> 							  
-								  <?php
-									 $data = array('name' => 'RequestBy','value' => set_value('RequestBy', $RequesterName),'id'=>'RequestBy',  'class' => 'form-control' ,'required' => 'true','readonly' => 'true');
-									echo form_input($data);
-									?> 
-							</div>
-							</div><br/>
-							  
-							 <div class="row"><div class="col-md-2"><label>Status</label></div>
-							<div class="col-md-4"> 							  
-								 <?php
-								  
-                                     $data = array('name' => 'Status','value' => set_value('Status',$StatusName),'id'=>'Status',  'class' => 'form-control' ,'readonly' => 'true');
-                                    echo form_input($data);
-								?>
-							</div><br/>
-						</div>
-						</div>
-</div>
-</div>
-         </div>
-       
-</div>
-</div> </section></div>
-<script type="text/html" id="RevenueList">
-<tr  id="<%=index%>">
-<td align="left"><%=index%></td>
- <td align="left"><%=ReqNo%></td>
- <td align="left"><%=MaterialCode%></td>
-  <td align="left"><%=MaterialName%></td>
-  <td align="right"><%=Quantity%></td> 
-  <td align="left"><%=UOM%></td>
-   <td align="right"><%=Rate%></td>
-    <td align="right"><%=BasicAmount%></td>
-	<td align="right"><%=Taxvalue%></td>
-	<td align="right"><%=TotalValue%></td>
-	<td align="right"><%=ActualQuantity%></td>
-<td align="right"><%=ReceivedQuantity%></td>
-<td align="right"><%=PendingQuantity%></td>
-   <td>
-                          <a    data-target='#EDITREVENUE'	data-id="<%=index%>" data-userid="<%=index%>" data-toggle="modal" href="#EDITREVENUE"><i class="fa fa-pencil" data-toggle="tooltip" title="Click here to view/Edit the  <%=ReqNo%> Requisition details"></i>&nbsp;&nbsp;&nbsp;</a> <a href='#' onclick = "DeleteRow(<%=index%>)" class="link" data-id="<%=index%>" data-userid="<%=index%>"  id="Del" ><span class="glyphicon glyphicon-trash"></span></a>
-						 
-						  
-                      </td>
-</tr>
-</div>
-</section></div></script>
-<script>
-var index     = <?php echo $index; ?>;
-var userid  = '';
-
-$("#REVENUE").on("shown.bs.modal", function(e) {
-	
-	$('#isEdit').val(0);
-});
-$("#EDITREVENUE").on("shown.bs.modal", function(e) {
-	
-		userid = $(e.relatedTarget).data('userid');
-		$('#isEdit').val(1);
-	    //alert(userid);
-		var tr= document.getElementById(userid);
-		var cellval = tr.cells;
-		var id= $('#Reqnumber'+userid).val();
-		
-		$('#EditReqNo').val($('#Reqnumber'+userid).val());
-		$('#EditdeptName').val($('#departmentName'+userid).val());
-		$("#EditCostCenter").val($('#costCode'+userid).val());
-		$('#EditAvlBudAmt').val($('#AvilBudget'+userid).val());
-		//
-		
-		$('#EditItemName').val($('#materialName'+userid).val());
-		$('#EditUOM').val($('#uom'+userid).val());
-		$('#EditQuantity').val($('#quantity'+userid).val());
-		$('#EditRate').val($('#itemRate'+userid).val());
-		$('#txtEditBasicValue').val(cellval[7].innerHTML);
-		RequistQuantity = $('#quantity'+userid).val();
-		$('#txtEditDiscount').val($('#DisVal'+userid).val());
-		$('#txtEditAfterDiscount').val($('#AfterDisVal'+userid).val());
-		
-		$('#txtEditPackaging').val($('#PackVal'+userid).val());
-		$('#txtEditAfterPackaging').val($('#AfterPackVal'+userid).val());
-		
-		$('#txtEditFreight').val($('#FreightVal'+userid).val());
-		$('#txtEditAfterFreight').val($('#AfterFreightVal'+userid).val());
-                  var FreightType =$('#FreightType'+userid).val();
-              $('#EditNOOfTrips').val($('#NoOfTrip'+userid).val());
-	        if (FreightType == "PER TRIP"){
-                $('#EditTripsValue').show();
-                    }
-                    else{
-                    $('#EditTripsValue').hide();
-                    }
-		$('#txtEditInsurance').val($('#Insval'+userid).val());
-		
-		$('#txtEditTotalOrderValue').val($('#TotalOrderValue'+userid).val());
-		 $('#EditAfterCgst').val($('#RevenueAfterCgst'+userid).val());
-                $('#EditAfterSgst').val($('#RevenueAfterSgst'+userid).val());
-                $('#EditAfterIgst').val($('#RevenueAfterIgst'+userid).val());
-               $('#EditCgst').val($('#RevenueCgst'+userid).val());
-                $('#EditSgst').val($('#RevenueSgst'+userid).val());
-                $('#EditIgst').val($('#RevenueIgst'+userid).val());
-		
-		
-		
-		$("#EditMaterialCode").empty();
-		var Material = <?php echo json_encode($MaterialList, JSON_PRETTY_PRINT) ?>;
-		 // For Binding Material list center for the selected Requistion Number	
-		$("#EditMaterialCode").append( $('<option></option>').val($('#materialCode'+userid).val()).html($('#materialCode'+userid).val() + "-" + $('#materialName'+userid).val()  ) );
-		var isAdded = "0";
-		 for(i=0;i<Material.length;i++)
-		{
-		$.each(Material[i], function(idx, obj) {
-			
-				if(obj.ReqNo === id )
-				{
-								   
-						$.each(SelectedMaterialList.Mat, function(idx1, el){															
-							if (id == el.ReqNo )
-							{
-								
-								if(el.materialCode == obj.MaterialCode)
-								{
-									
-										isAdded  = "1";
-										return false;																		
-								}
-								else
-								{
-									isAdded  = "0";
-								}
-								
-							}
-												
-					
-					});
-					
-					
-						if(isAdded  == "0")
-						{
-							
-							$("#EditMaterialCode").append( $('<option></option>').val(obj.MaterialCode).html(obj.MaterialCode + "-" + obj.MaterialName));
-						}
-												
-				}
-			
-			
-		});
-		}
-		
-		$("#EditDiscountType").val($('#DisType'+userid).val());
-		$("#drpEditFreight").val($('#FreightType'+userid).val());
-		$("#EditPackagingType").val($('#PackType'+userid).val())
-		
-		$("input:radio[name='optPackaging'][value='"+$('#PackOption'+userid).val()+"']").prop('checked', 'checked');
-		$("input:radio[name='optExcise'][value='"+$('#ExciseOption'+userid).val()+"']").prop('checked', 'checked');
-		$("input:radio[name='optVat'][value='"+$('#VatOption'+userid).val()+"']").prop('checked', 'checked');
-		$("input:radio[name='optCST'][value='"+$('#CSTOption'+userid).val()+"']").prop('checked', 'checked');
-		
-	   
-});
-$("#VIEWREVENUE").on("shown.bs.modal", function(e) {
-	
-		userid = $(e.relatedTarget).data('userid');
-		$('#isEdit').val(1);
-	    //alert(userid);
-		var tr= document.getElementById(userid);
-		var cellval = tr.cells;
-		var id= $('#Reqnumber'+userid).val();
-		
-		$('#ViewReqNo').val($('#Reqnumber'+userid).val());
-		$('#ViewdeptName').val($('#departmentName'+userid).val());
-		$("#ViewCostCenter").val($('#costCode'+userid).val());
-		$('#ViewAvlBudAmt').val($('#AvilBudget'+userid).val());
-		//
-		
-		$('#ViewItemName').val($('#materialName'+userid).val());
-		$('#ViewUOM').val($('#uom'+userid).val());
-		$('#ViewQuantity').val($('#quantity'+userid).val());
-		$('#ViewRate').val($('#itemRate'+userid).val());
-		$('#txtViewBasicValue').val(cellval[7].innerHTML);
-		RequistQuantity = $('#quantity'+userid).val();
-		$('#txtViewDiscount').val($('#DisVal'+userid).val());
-		$('#txtViewAfterDiscount').val($('#AfterDisVal'+userid).val());
-		
-	
-		$('#txtViewPackaging').val($('#PackVal'+userid).val());
-		$('#txtViewAfterPackaging').val($('#AfterPackVal'+userid).val());
-		
-		$('#txtViewFreight').val($('#FreightVal'+userid).val());
-		$('#txtViewAfterFreight').val($('#AfterFreightVal'+userid).val());
-		$('#txtViewInsurance').val($('#Insval'+userid).val());
-		     var FreightType =$('#FreightType'+userid).val();
-              $('#ViewNOOfTrips').val($('#NoOfTrip'+userid).val());
-	        if (FreightType == "PER TRIP"){
-                $('#ViewTripsValue').show();
-                    }
-                    else{
-                    $('#ViewTripsValue').hide();
-                    }
-		$('#txtViewTotalOrderValue').val($('#TotalOrderValue'+userid).val());
-		 $('#ViewAfterCGST').val($('#RevenueAfterCgst'+userid).val());
-                $('#ViewAfterSGST').val($('#RevenueAfterSgst'+userid).val());
-                $('#ViewAfterIGST').val($('#RevenueAfterIgst'+userid).val());
-               $('#ViewCGST').val($('#RevenueCgst'+userid).val());
-                $('#ViewSGST').val($('#RevenueSgst'+userid).val());
-                $('#ViewIGST').val($('#RevenueIgst'+userid).val());
-		
-		
-		
-		$("#ViewMaterialCode").empty();
-		var Material = <?php echo json_encode($MaterialList, JSON_PRETTY_PRINT) ?>;
-		 // For Binding Material list center for the selected Requistion Number	
-		$("#ViewMaterialCode").val($('#materialCode'+userid).val());
-		
-		
-
-		$("#ViewDiscountType").val($('#DisType'+userid).val());
-		$("#drpViewFreight").val($('#FreightType'+userid).val());
-		$("#ViewPackagingType").val($('#PackType'+userid).val())
-		
-		$("input:radio[name='optPackaging'][value='"+$('#PackOption'+userid).val()+"']").prop('checked', 'checked');
-		$("input:radio[name='optExcise'][value='"+$('#ExciseOption'+userid).val()+"']").prop('checked', 'checked');
-		$("input:radio[name='optVat'][value='"+$('#VatOption'+userid).val()+"']").prop('checked', 'checked');
-		$("input:radio[name='optCST'][value='"+$('#CSTOption'+userid).val()+"']").prop('checked', 'checked');
-		
-	   
-});
-$('.AddRevenue').click(function(){
-         
-      if(validateRevenueTax() && validateExceedLimit()  && ExceedQuantityCheck())
-	  {
-		 var temp = parseInt(index)+1;
-		 var Reqnumber = $('#ReqNo').val();
-		 var departmentName = $('#deptName').val();
-		 var AvilBudget = $('#AvlBudAmt').val();
-		 var costCode = $('#CostCenter').val();
-         var materialCode =$('#MaterialCode').val();
-         var materialName =  $("#ItemName").val();
-         var uom = $("#UOM").val();
-		 var quantity = parseFloat($("#Quantity").val()).toFixed(2);
-		 var itemRate = parseFloat($("#Rate").val()).toFixed(2);
-		  
-		  var DisType = $("#DiscountType").val();
-		  var DisVal = $("#txtDiscount").val();
-		  var AfterDisVal = $("#txtAfterDiscount").val();
-		  
-		  var PackOption = PackagingCalculation ;
-		  var PackType = $("#PackagingType").val();
-		  var PackVal = $("#txtPackaging").val();
-		  var AfterPackVal = $("#txtAfterPackaging").val();
-		  
-		 var Cgst = $("#Cgst").val();
-		  var AfterCgst = $("#AfterCgst").val();
-                  var Sgst = $("#Sgst").val();
-                  var AfterSgst = $("#AfterSgst").val();
-                  var Igst = $("#Igst").val();
-                  var AfterIgst = $("#AfterIgst").val();
-		 
-	      var FreightType = $("#drpFreight").val();
-		  var FreightVal = $("#txtFreight").val();
-		  var AfterFreightVal = $("#txtAfterFreight").val();
-		   var NoOfTrip = $("#NOOfTrips").val();
-		 var basicval = $("#txtBasicValue").val();
-		 var Insval = $("#txtInsurance").val();
-		 var TotalOrderValue = $("#txtTotalOrderValue").val();
-		 
-		 var TotalTaxValue = calculateTaxValue();
-		 
-	    // $('#ReqNo').val(Reqnumber).remove();
-		// $('#ReqNo option[value='+Reqnumber+']').remove();
-		 $('#MaterialCode option[value='+materialCode+']').remove();
-		  SelectedMaterialCode[CollIndex] = materialCode;
-			CollIndex = CollIndex + 1;	
-			 SelectedMaterialList.Mat.push({ 
-        "materialCode" :  materialCode,
-        "ReqNo"  : Reqnumber,
-      
-		});	
-			index = parseInt(index)+1;		
-		 
-	      var template = jQuery("#RevenueList").html();
-	   
-	     
-          $('#RevenueAppend').append(_.template(template,{index:temp,ReqNo:Reqnumber,MaterialCode:materialCode,MaterialName:materialName,Quantity:quantity,UOM:uom,Rate:itemRate,BasicAmount:basicval,Taxvalue:TotalTaxValue,TotalValue:TotalOrderValue,ActualQuantity:quantity,ReceivedQuantity:0,PendingQuantity:quantity}));
-		  
-		  	
-		  var theForm = $(".CreatePO");
-		
-		 addHidden(theForm,"Reqnumber"+temp,Reqnumber );
-		 addHidden(theForm,"departmentName"+temp,departmentName );
-	     addHidden(theForm,"AvilBudget"+temp,AvilBudget );
-		 addHidden(theForm,"costCode"+temp,costCode );		
-		  addHidden(theForm,"materialCode"+temp,materialCode );
-		 addHidden(theForm,"materialName"+temp,materialName );
-	     addHidden(theForm,"uom"+temp,uom);
-		 addHidden(theForm,"quantity"+temp,quantity);
-		  addHidden(theForm,"itemRate"+temp,itemRate);
-		 addHidden(theForm,"DisType"+temp,DisType);
-	     addHidden(theForm,"DisVal"+temp,DisVal);
-		 addHidden(theForm,"AfterDisVal"+temp,AfterDisVal);
-		  addHidden(theForm,"PackOption"+temp,PackOption);
-		 addHidden(theForm,"PackType"+temp,PackType);
-	     addHidden(theForm,"PackVal"+temp,PackVal);
-		 addHidden(theForm,"AfterPackVal"+temp,AfterPackVal);
-		 
-	     addHidden(theForm,"FreightType"+temp,FreightType);
-		 addHidden(theForm,"FreightVal"+temp,FreightVal);
-		 addHidden(theForm,"AfterFreightVal"+temp,AfterFreightVal);
-                 addHidden(theForm,"NoOfTrip"+temp,NoOfTrip);
-		 addHidden(theForm,"basicval"+temp,basicval);
-	     addHidden(theForm,"Insval"+temp,Insval);
-		 addHidden(theForm,"TotalOrderValue"+temp,TotalOrderValue);		
-		addHidden(theForm,"RevenueCgst"+temp,Cgst);
-		  addHidden(theForm,"RevenueAfterCgst"+temp,AfterCgst);
-	      addHidden(theForm,"RevenueSgst"+temp,Sgst);
-	      addHidden(theForm,"RevenueAfterSgst"+temp,AfterSgst);
-		  addHidden(theForm,"RevenueIgst"+temp,Igst);
-                  addHidden(theForm,"RevenueAfterIgst"+temp,AfterIgst);
-                   addHidden(theForm,"LineItemNo"+temp,'');
-		 $('#txtRowCount').val(temp); 	
-		// $('#REVENUE').modal('hide');	
-		  populateValueMainFormForRevenue();
-clearRevenueModalFields();
-      	  }	  
-   
- });
- $('.EditRevenue').click(function(){
-         
-   		
-       if(validateEditRevenueTax() && validateEditExceedLimit() &&  ExceedEditQuantityCheck())	  
-        {
-            //alert('inside Add');			
-            var CostCode =  $("#EditCostCenter").val();
-			 var AvilBudget = $('#EditAvlBudAmt').val();
-			var editMaterialCode =  $("#EditMaterialCode").val();
-			var editDescription = $("#EditItemName").val();		
-			var editUOM = $('#EditUOM').val();
-			var editQuantity = $('#EditQuantity').val();
-			
-			 var itemRate = $("#EditRate").val();
-		  
-		
-		  var DisType = $("#EditDiscountType").val();
-		  var DisVal = $("#txtEditDiscount").val();
-		  var AfterDisVal = $("#txtEditAfterDiscount").val();
-		  
-		  var PackOption = PackagingCalculation ;
-		  var PackType = $("#EditPackagingType").val();
-		  var PackVal = $("#txtEditPackaging").val();
-		  var AfterPackVal = $("#txtEditAfterPackaging").val();
-		  
-		var Cgst = $("#EditCgst").val();
-		  var AfterCgst = $("#EditAfterCgst").val();
-                  var Sgst = $("#EditSgst").val();
-                  var AfterSgst = $("#EditAfterSgst").val();
-                  var Igst = $("#EditIgst").val();
-                  var AfterIgst = $("#EditAfterIgst").val();
-		  
-	      var FreightType = $("#drpEditFreight").val();
-		  var FreightVal = $("#txtEditFreight").val();
-		  var AfterFreightVal = $("#txtEditAfterFreight").val();
-		   var NoOfTrip = $("#EditNOOfTrips").val();
-		 var basicval = $("#txtEditBasicValue").val();
-		 var Insval = $("#txtEditInsurance").val();
-		 var TotalOrderValue = $("#txtEditTotalOrderValue").val();
-		 
-		  var TotalTaxValue = calculateEditTaxValue();
-	
-					
-		
-		 
-            var tr= document.getElementById(userid);
-			var cellval = tr.cells;   
-			
-			cellval[2].innerHTML = editMaterialCode;		
-			cellval[3].innerHTML = editDescription;			
-			cellval[4].innerHTML = editQuantity;
-			cellval[5].innerHTML =editUOM;
-			cellval[6].innerHTML =itemRate;
-			cellval[7].innerHTML =basicval;
-			cellval[8].innerHTML =TotalTaxValue;
-			cellval[9].innerHTML =TotalOrderValue;
-					
-			
-			$('#materialCode'+userid).val(editMaterialCode);
-			$('#materialName'+userid).val(editDescription);
-			$('#uom'+userid).val(editUOM);
-			$('#quantity'+userid).val(editQuantity);
-            $('#itemRate'+userid).val(itemRate);
-			$('#DisType'+userid).val(DisType);
-			$('#DisVal'+userid).val(DisVal);
-			$('#AfterDisVal'+userid).val(AfterDisVal);	
-			$('#PackOption'+userid).val(PackOption);
-			$('#PackType'+userid).val(PackType);
-			$('#PackVal'+userid).val(PackVal);
-			$('#AfterPackVal'+userid).val(AfterPackVal);
-			$('#RevenueCgst'+userid).val(Cgst);
-                    $('#RevenueAfterCgst'+userid).val(AfterCgst);
-                    $('#RevenueAfterSgst'+userid).val(AfterSgst);
-                    $('#RevenueSgst'+userid).val(Sgst);
-                    $('#RevenueIgst'+userid).val(Igst);
-                    $('#RevenueAfterIgst'+userid).val(AfterIgst);
-			$('#FreightType'+userid).val(FreightType);
-			$('#FreightVal'+userid).val(FreightVal);	
-			$('#AfterFreightVal'+userid).val(AfterFreightVal);
-                        $('#NoOfTrip'+userid).val(NoOfTrip);
-			$('#basicval'+userid).val(basicval);
-			$('#Insval'+userid).val(Insval);
-			$('#AvilBudget'+userid).val(AvilBudget);	
-			$('#costCode'+userid).val(CostCode);
-			$('#TotalOrderValue'+userid).val(TotalOrderValue);	
-
-  				
-		  populateValueMainFormForEditRevenueTax();	 
-      }
-    
- });
- function addHidden(theForm, key, value) {
-    // Create a hidden input element, and append it to the form:
-    var input = document.createElement('input');
-    input.type = 'hidden';
-    input.name = key;'name-as-seen-at-the-server';
-    input.id = key;'name-as-seen-at-the-server';
-    input.value = value;
-    theForm.append(input);
-}
-function populateValueMainFormForRevenue()
-{
-		var Packaging = $('#txtAfterPackaging').val() == '' ? '0.00' : $('#txtAfterPackaging').val();
-		  var Cgst = $('#AfterCgst').val() == '' ? '0.00' : $("#AfterCgst").val();
-                var Sgst = $('#AfterSgst').val() == '' ? '0.00' : $("#AfterSgst").val();
-                  var Igst = $('#AfterIgst').val() == '' ? '0.00' : $("#AfterIgst").val();
-		var Freight = $('#txtAfterFreight').val() == '' ? '0.00' : $('#txtAfterFreight').val();
-		var Insurance = $('#txtInsurance').val() == '' ? '0.00' : $('#txtInsurance').val();
-		var Discount = $('#txtAfterDiscount').val() == '' ? '0.00' : $('#txtAfterDiscount').val();
-		var BasicVal = $('#txtBasicValue').val() == '' ? '0.00' : $('#txtBasicValue').val();
-		var TotalVal = $('#txtTotalOrderValue').val() == '' ? '0.00' : $('#txtTotalOrderValue').val();
-		
-		var TotalOrderValueSummary = $('#txtTotalOrderValueSummary').val() == '' ? '0.00' : $('#txtTotalOrderValueSummary').val();
-		
-		var totBasicAmt = $('#txtTotBasicAmount').val() == '' ? '0.00' : $('#txtTotBasicAmount').val();
-		var totDiscountAmt = $('#txtTotalDiscount').val() == '' ? '0.00' : $('#txtTotalDiscount').val();
-		var totPackagingAmt = $('#txtTotalPackaing').val() == '' ? '0.00' : $('#txtTotalPackaing').val();
-		    var txtTotalCGST = $('#txtTotalCGST').val() == '' ? '0.00' : $('#txtTotalCGST').val();
-              
-                var txtTotalSGST = $('#txtTotalSGST').val() == '' ? '0.00' : $('#txtTotalSGST').val();
-                var txtTotalIGST = $('#txtTotalIGST').val() == '' ? '0.00' : $('#txtTotalIGST').val();
-		var totFreightAmt = $('#txtTotalFreight').val() == '' ? '0.00' : $('#txtTotalFreight').val();
-		var totInsuranceAmt = $('#totInsuranceAmt').val() == '' ? '0.00' : $('#totInsuranceAmt').val();
-		var totOrderSummaryAmt = $('#txtTotalOrderValueSummary').val() == '' ? '0.00' : $('#txtTotalOrderValueSummary').val();
-		
-		$('#txtTotBasicAmount').val((parseFloat(totBasicAmt) + parseFloat(BasicVal)).toFixed(2) );
-		$('#txtTotalDiscount').val((parseFloat(totDiscountAmt) + parseFloat(Discount)).toFixed(2) );
-		$('#txtTotalPackaing').val((parseFloat(totPackagingAmt) + parseFloat(Packaging)).toFixed(2) );
-		 $('#txtTotalCGST').val((parseFloat(txtTotalCGST) + parseFloat(Cgst)).toFixed(2) );
-                $('#txtTotalSGST').val((parseFloat(txtTotalSGST) + parseFloat(Sgst)).toFixed(2) );
-                $('#txtTotalIGST').val((parseFloat(txtTotalIGST) + parseFloat(Igst)).toFixed(2) );
-		$('#txtTotalFreight').val((parseFloat(totFreightAmt) + parseFloat(Freight)).toFixed(2) );
-		$('#totInsuranceAmt').val((parseFloat(totInsuranceAmt) + parseFloat(Insurance)).toFixed(2) );
-		$('#txtTotalOrderValueSummary').val((parseFloat(totOrderSummaryAmt) + parseFloat(TotalVal)).toFixed(2) );
-		
-}
-function populateValueMainFormForEditRevenueTax()
-{
-	  
-		var rows =  document.getElementById('revenueTax').rows.length;
-        //alert(rows);
-		var totBasicAmt = 0;
-		var totDiscountAmt = 0;
-		var totPackagingAmt = 0;
-		var totCgst = 0;
-		var totSgst = 0;
-                var totIgst = 0;
-		var totFreightAmt = 0;
-		var totInsuranceAmt = 0;
-		var totOrderSummaryAmt = 0;
-		var i = 0;
-	   do {
-		   i += 1;
-		    
-			 
-			 var tr= document.getElementById(i);
-			 //alert(tr);
-			 if(tr != null)
-			 {
-			 cells = tr.getElementsByTagName('td');
-					
-			
-		     var rowid = cells[0].innerHTML;
-			// alert(rowid);
-		var Packaging = $('#AfterPackVal'+rowid).val() == '' ? '0.00' : $('#AfterPackVal'+rowid).val();
-		  var Cgst = $('#RevenueAfterCgst'+rowid).val() == '' ? '0.00' : $('#RevenueAfterCgst'+rowid).val();
-                var Sgst = $('#RevenueAfterSgst'+rowid).val() == '' ? '0.00' : $('#RevenueAfterSgst'+rowid).val();
-             var Igst = $('#RevenueAfterIgst'+rowid).val() == '' ? '0.00' : $('#RevenueAfterIgst'+rowid).val();
-		var Freight  = $('#AfterFreightVal'+rowid).val() == '' ? '0.00' : $('#AfterFreightVal'+rowid).val();
-		var Insurance    = $('#Insval'+rowid).val() == '' ? '0.00' : $('#Insval'+rowid).val();
-		var Discount   =$('#AfterDisVal'+rowid).val() == '' ? '0.00' : $('#AfterDisVal'+rowid).val();
-	    var BasicVal   = $('#basicval'+rowid).val() == '' ? '0.00' : $('#basicval'+rowid).val();
-		var TotalVal =$('#TotalOrderValue'+rowid).val() == '' ? '0.00' : $('#TotalOrderValue'+rowid).val();
-		//alert(TotalVal);
-		
-		
-		totBasicAmt  = parseFloat(totBasicAmt ) + parseFloat(BasicVal);
-		totDiscountAmt  = parseFloat(totDiscountAmt ) + parseFloat(Discount);
-		totPackagingAmt  = parseFloat(totPackagingAmt) + parseFloat(Packaging);
-		totCgst = parseFloat(totCgst ) + parseFloat(Cgst);
-                totSgst = parseFloat(totSgst ) + parseFloat(Sgst);
-                totIgst = parseFloat(totIgst ) + parseFloat(Igst);
-		totFreightAmt  = parseFloat(totFreightAmt ) + parseFloat(Freight);
-		totInsuranceAmt  = parseFloat(totInsuranceAmt ) + parseFloat(Insurance);
-		totOrderSummaryAmt  = parseFloat(totOrderSummaryAmt ) + parseFloat(TotalVal);
-			 }
-		
- }		while (i < rows);  
-	  		
-       
-		$('#txtTotBasicAmount').val(parseFloat(totBasicAmt).toFixed(2)  );
-		$('#txtTotalDiscount').val(parseFloat(totDiscountAmt).toFixed(2)  );
-		$('#txtTotalPackaing').val(parseFloat(totPackagingAmt).toFixed(2)  );
-		$('#txtTotalCGST').val(parseFloat(totCgst).toFixed(2)  );
-		$('#txtTotalSGST').val(parseFloat(totSgst).toFixed(2) );
-		$('#txtTotalIGST').val(parseFloat(totIgst).toFixed(2)  );
-		$('#txtTotalFreight').val(parseFloat(totFreightAmt).toFixed(2) );
-		$('#txtTotalInsurance').val(parseFloat(totInsuranceAmt).toFixed(2) );
-		$('#txtTotalOrderValueSummary').val(parseFloat(totOrderSummaryAmt).toFixed(2)  );
-		
-}
-function clearRevenueModalFields()
-{
-		// To reset the Modal controls
-		$('#ReqNo').val('0'); 	
-		$('#deptName').val('');	
-		$('#CostCenter').val("0");
-		$('#AvlBudAmt').val('');
-		$('#MaterialCode').val("0")	;
-		$("#ItemName").val('');		
-		$('#UOM').val(''); 
-		$('#Quantity').val('');       
-		$("#Rate").val('');
-
-		$("#DiscountType").val('0');
-		$("#txtDiscount").val('');
-		$("#txtAfterDiscount").val('');
-
-
-		$("#PackagingType").val('0');
-		$("#txtPackaging").val('');
-		$("#txtAfterPackaging").val('');
-
-		$("input:radio[name='optPackaging'][value='0']").prop('checked', 'checked');
-		$("input:radio[name='optExcise'][value='0']").prop('checked', 'checked');
-		$("input:radio[name='optVat'][value='0']").prop('checked', 'checked');
-		$("input:radio[name='optCST'][value='0']").prop('checked', 'checked');
-
-		$("#Cgst").val('0');
-                $("#Sgst").val('0');
-                $("#Igst").val('0');
-                $("#AfterCgst").val('0');
-                $("#AfterSgst").val('0');
-                $("#AfterIgst").val('0');
-
-		$("#drpFreight").val('0');
-		$("#txtFreight").val('');
-		$("#txtAfterFreight").val('');
-                $("#NOOfTrips").val('');
-		$("#txtBasicValue").val('');
-		$("#txtInsurance").val('');
-		$("#txtTotalOrderValue").val('');
-}
-function validateEditRevenueTax()
- {  
-	 if($('#EditCostCenter').val() == "0")
-	{
-		alert('Please select the Cost center');
-		$('#EditCostCenter').focus();
-		return false;
-	}
-	else if($('#EditMaterialCode').val() == "0")
-	{
-		alert('Please select the Material Code');
-		$('#EditMaterialCode').focus();
-		return false;
-	}		
-	else if($('#EditQuantity').val() == '')
-	{
-		alert('Please Enter the Quantity value');
-		$('#EditQuantity').focus();
-		return false;
-	}
-	else if($('#EditRate').val() == '')
-	{
-		alert('Please Enter the Rate of the Item');
-		$('#EditRate').focus();
-		return false;
-	}
-	else
-	{
-		return true;
-	}	
- }
-function calculateCgstTax(varBasicValue,Cgst,discount)
-              {
-                                var discount = discount;
-                              var basicValue = parseFloat(varBasicValue-discount);
-                             var Cgst = parseFloat(Cgst);	 
-                              var ServiceTaxValue = 0.0;  
-
-                              ServiceTaxValue = <?php echo SERVICETAX_CGST; ?>;
-
-                          var TAXval =  parseFloat(ServiceTaxValue).toFixed(2);
-
-                             return   TAXval;//  $('#AfterServiceTax').val(TAXval); 
-
-              }
-            function calculateSgstTax(varBasicValue,Sgst,discount)
-             {
-                            var discount = discount;
-                             var basicValue = parseFloat(varBasicValue-discount);
-                            var Sgst = parseFloat(Sgst);	 
-                             var ServiceTaxValue = 0.0;  
-
-                             ServiceTaxValue = <?php echo SERVICETAX_SGST; ?>;
-
-                         var TAXval =  parseFloat(ServiceTaxValue).toFixed(2);
-
-                            return   TAXval;//  $('#AfterServiceTax').val(TAXval); 
-
-             }
-            function calculateIgstTax(varBasicValue,Igst,discount)
-             {
-                            var discount = discount;
-                             var basicValue = parseFloat(varBasicValue-discount);
-                            var Igst = parseFloat(Igst);	 
-                             var ServiceTaxValue = 0.0;  
-                        
-                             ServiceTaxValue = <?php echo SERVICETAX_IGST; ?>;
-
-                         var TAXval =  parseFloat(ServiceTaxValue).toFixed(2);
-                 
-                            return   TAXval;//  $('#AfterServiceTax').val(TAXval); 
-
-             }
-</script>
-<script>
-function validateBudgetExceedLimit()
- {
-	 var rows  = document.getElementById('revenueTax').rows.length;
-	 var ReqType = '<?php echo REVENUE ?>';
-	 
-	  for (i = 1; i < rows; i++) { 
-		var costcode = 	$('#costCode'+i).val();
-		var basicAmountRate  = 	parseFloat($('#basicval'+i).val());
-		var totalAmount =  parseFloat($('#TotalOrderValue'+i).val());
-		var avalbudAmt = '';
-		$.ajax({ 
-			data:{id:costcode},
-			type:"POST",
-			url:"<?php echo base_url() ?>servicepurchaseorder/AvilBudgetAmount?ReqType="+ReqType, 
-			success:function(data) {
-			if(data)
-			{
-				//alert(data);
-				avalbudAmt = parseFloat(data);
-				if(basicAmountRate > avalbudAmt || totalAmount > avalbudAmt)
-				{
-					alert('Basic amount is exceeding the Budget Limit.Please adjust the product value.');
-					$('#Rate').focus();
-					return false;
-					
-				}
-				else
-				{
-					return true; 
-				}
-				
-				}
-						
-		
-		   }
-		  });	
-	  }
-	
-	  
- }
-function DeleteRow(rowid)
-{
-		var id = [];
-	   var DelRows  = $('#txtDeletedRow').val();
-	  //alertMaterialListrowid);
-	   var tr = document.getElementById(rowid);
-	  // var cellval = tr.cells;
-	   var MaterialCode = $('#materialCode'+rowid).val();
-	   var LineItemNo =$('#LineItemNo'+rowid).val();
-	   var ReqNo =$('#Reqnumber'+rowid).val();
-	   var POType ='<?php echo REVENUE ?>';
-		id[0]= LineItemNo;
-	    id[1]= ReqNo;
-		id[2]= MaterialCode;
-		id[3]= POType;
-		
-	   var answer = confirm(" Do you want to delete the Item from the List?")
-		if (answer) 
-		{ 			
-			
-			tr.parentNode.removeChild(tr);
-			
-			var removeItem = $('#materialCode'+rowid).val();		
-		  
-		   SelectedMaterialCode.splice( SelectedMaterialCode.indexOf('removeItem'), 1 );
-		   $.each(SelectedMaterialList.Mat, function(i, el){
-	    
-			if (this.materialCode == removeItem){//Type = '';
-		          SelectedMaterialList.Mat.splice(i, 1);
-		}
-		});
-		   var x = <?php echo json_encode($POItem, JSON_PRETTY_PRINT) ?>; 
-		  
-		   var result = '0';
-		   $.each(x, function(idx, obj) {
-			 
-						if(obj.LineItemNo === LineItemNo)
-						{			 
-						   result = '1';
-						   return  false;	
-						}
-						
-					   });
-					   
-					  // alert(result);
-			if(result == '0')
-			{
-				var DelRows  = $('#txtDeletedRow').val();
-				//tr.parentNode.removeChild(tr);
-				if(DelRows != '')
-					{
-					DelRows = DelRows + ":" + rowid;
-					}
-				else
-					{
-					DelRows=  "0" + ":" + rowid;
-					}
-				$('#txtDeletedRow').val(DelRows);
-			}
-           	// To delete the value from Tables
-			else  if(result == '1')
-			{
-				var DelRows  = $('#txtDeletedRow').val();
-				//tr.parentNode.removeChild(tr);
-				if(DelRows != '')
-					{
-					DelRows = DelRows + ":" + rowid;
-					}
-				else
-					{
-					DelRows=  "0" + ":" + rowid;
-					}
-				$('#txtDeletedRow').val(DelRows);				
-				
-			 $.ajax({ 
-			data:{id:id},
-			type:"POST",
-			url:"<?php echo base_url() ?>purchaseorder/DeletePODetails", 
-			success:function(data) {
-			if(data)
-			{
-				$('#content').loader('hide'); 
-				alert(data);			
-			}
-			else
-			{
-				alert("Error");	
-			}			
-		
-		}});  
-			}		   
-		
-		   populateValueMainFormForDeleteItem(rowid);	
-		  
-		}
-       	
-} 
-function populateValueMainFormForDeleteItem(rowid)
-{
-	  
-		
-       // alert(rows);
-		var totBasicAmt = $('#txtTotBasicAmount').val();
-		var totDiscountAmt = $('#txtTotalDiscount').val();
-		var totPackagingAmt = $('#txtTotalPackaing').val();
-		var totCgst = $('#txtTotalCGST').val();
-		var totSgst = $('#txtTotalSGST').val();
-		var totIgst = $('#txtTotalIGST').val();
-		var totFreightAmt = $('#txtTotalFreight').val();
-		var totInsuranceAmt = $('#totInsuranceAmt').val();
-		var totOrderSummaryAmt = $('#txtTotalOrderValueSummary').val();
-		
-	  
-			
-		var Packaging = $('#AfterPackVal'+rowid).val() == '' ? '0.00' : $('#AfterPackVal'+rowid).val();
-		
-		var Freight  = $('#AfterFreightVal'+rowid).val() == '' ? '0.00' : $('#AfterFreightVal'+rowid).val();
-		var Insurance    = $('#Insval'+rowid).val() == '' ? '0.00' : $('#Insval'+rowid).val();
-		var Discount   =$('#AfterDisVal'+rowid).val() == '' ? '0.00' : $('#AfterDisVal'+rowid).val();
-	    var BasicVal   = $('#basicval'+rowid).val() == '' ? '0.00' : $('#basicval'+rowid).val();
-
-		var TotalVal =$('#TotalOrderValue'+rowid).val() == '' ? '0.00' : $('#TotalOrderValue'+rowid).val();
-		//alert(TotalVal);
-		var Cgst  = $('#RevenueAfterCgst'+rowid).val() == '' ? '0.00' : $('#RevenueAfterCgst'+rowid).val();
-		var Sgst  =$('#RevenueAfterSgst'+rowid).val() == '' ? '0.00' : $('#RevenueAfterSgst'+rowid).val();
-	        var Igst  = $('#RevenueAfterIgst'+rowid).val() == '' ? '0.00' : $('#RevenueAfterIgst'+rowid).val();
-		
-		totBasicAmt  = parseFloat(totBasicAmt ) - parseFloat(BasicVal);
-
-		totDiscountAmt  = parseFloat(totDiscountAmt ) - parseFloat(Discount);
-		totPackagingAmt  = parseFloat(totPackagingAmt) - parseFloat(Packaging);
-		
-		totFreightAmt  = parseFloat(totFreightAmt ) - parseFloat(Freight);
-		totInsuranceAmt  = parseFloat(totInsuranceAmt ) - parseFloat(Insurance);
-		totOrderSummaryAmt  = parseFloat(totOrderSummaryAmt ) - parseFloat(TotalVal);
-		totCgst  = parseFloat(totCgst ) - parseFloat(Cgst);
-		totSgst  = parseFloat(totSgst ) - parseFloat(Sgst);
-		totIgst  = parseFloat(totIgst ) - parseFloat(Igst);
-		   
-				
-
-		$('#txtTotBasicAmount').val((parseFloat(totBasicAmt)).toFixed(2)  );
-		$('#txtTotalDiscount').val((parseFloat(totDiscountAmt)).toFixed(2)  );
-		$('#txtTotalPackaing').val((parseFloat(totPackagingAmt)).toFixed(2)  );
-		$('#txtTotalCGST').val((parseFloat(totCgst)).toFixed(2)  );
-		$('#txtTotalSGST').val((parseFloat(totSgst)).toFixed(2) );
-		$('#txtTotalIGST').val((parseFloat(totIgst)).toFixed(2)  );
-		$('#txtTotalFreight').val((parseFloat(totFreightAmt)).toFixed(2) );
-		$('#totInsuranceAmt').val((parseFloat(totInsuranceAmt)).toFixed(2) );
-		$('#txtTotalOrderValueSummary').val((parseFloat(totOrderSummaryAmt)).toFixed(2)  );
-		
-}
-function Save(status)
-{  
-if(status == '0')
-{
-	stat = '<?php echo PO_DRAFT; ?>';
-}
-else
-{
-	stat = '<?php echo PO_CREATED; ?>';
-}
-
-var deladd = $('#DeliveryAddr').val();
-$('#txtStatus').val(stat);
-tinyMCE.triggerSave();
-var splinstr = $('#txtSpcialInstruction').val();
-$('#SpcialInstruction').val(splinstr);
-
-$('#txtDeliveryAddress').val(deladd);
-var AvlBudAmt = '<?php echo $AvlAmount ?>'; 
-var txtTotalOrderValueSummary = $('#txtTotalOrderValueSummary').val();
-
-	if(validate())
-		{ 	
-		if(document.getElementById('revenueTax').rows.length < 2)
-			{
-				alert('Please Select Line item to Create PO');
-				$('#Deliverydt').focus();
-				return false;
-			}
-			//else if(validateBudgetExceedLimit())
-			//{
-			//	return false;
-			//}
-                          else if(parseInt(AvlBudAmt) < parseInt(txtTotalOrderValueSummary)) {
-                 alert('Total Order Amount is exceeding the Budget Limit.Please adjust the product value.');
-                       
-                        return false;
-                     }
-
-                         else if($('#Otherpayment').val()=='' && $('#PaymentTerms').val()=='PT08'){
-                            alert('Please Enter Payable Terms Description');
-				$('#Otherpayment').focus();
-				return false;
-                               }
-			else
-			{
-			$('#content').loader('show');
-		  $.ajax({ 
-			data:$('.CreatePO').serialize(),
-			type:"POST",
-			url:"<?php echo base_url() ?>purchaseorder/EditRevenuePurchaseOrder", 
-			success:function(data) {
-			if(data)
-			{
-				$('#content').loader('hide'); 
-				alert(data);
-				$('#txtRowCount').val('');
-				$('#txtDeletedRow').val('');
-				$('#txtStatus').val('');
-				$('#SpcialInstruction').val('');
-				$('#txtDeliveryAddress').val('')
-			window.location ="purchaseorderListing";
-			
-			}
-			else
-			{
-				$('#content').loader('hide'); 
-				alert("Error");	
-			}			
-		
-		}
-  
-});
-			}
-
-}
-}
-// this function is used to clear data changing schedule option
-$('#Scheduleby').change(function(){
-            
-             $("#Deliverydt").datepicker({
-            minDate : 'now',
-            dateFormat: 'mm/dd/yy',changeMonth: true, changeYear: true,yearRange: '0:+10'
-        });
-                
-            });
-            $('#Deliverydt').change(function(){
-            
-           $('#Scheduleby').val('');
-                
-            });
- 
- $(function () {
-   
-    $('#revenueTax').DataTable({
-      "paging": false,
-      "lengthChange": false,
-      "searching": false,
-      //"ordering": true,
-     // "info": true,
-      "autoWidth": false
-	   
-    }); 
-  });
-function change(){
-
-	  ExceedQuantityCheck();	  
-	 if($('#Quantity').val() != '' && $('#Rate').val() != '')
-	 {	  
-		  var txtQuantity = parseFloat( $('#Quantity').val());
-		  var txtUnitPrice = parseFloat($('#Rate').val());
-		  var Tot =  txtQuantity * txtUnitPrice
-		  $('#txtBasicValue').val(parseFloat(Tot).toFixed(2));
-                   if ($("#DiscountType").val()!=0) {
-              calculateDiscount(0);
-          }
-                  if($("#Cgst").val()!=''){
-		$('#AfterCgst').val(calculateCgstTax($('#txtBasicValue').val(),$('#Cgst').val(),$('#txtAfterDiscount').val() == '' ? '0.00' : $('#txtAfterDiscount').val()));
-	}
-	if($("#Sgst").val()!=''){
-		
-		 $('#AfterSgst').val(calculateSgstTax($('#txtBasicValue').val(),$('#Sgst').val(),$('#txtAfterDiscount').val() == '' ? '0.00' : $('#txtAfterDiscount').val()));
-	}
-  
-        if($("#Igst").val()!=''){
-		
-		$('#AfterIgst').val(calculateIgstTax($('#txtBasicValue').val(),$('#Igst').val(),$('#txtAfterDiscount').val() == '' ? '0.00' : $('#txtAfterDiscount').val()));
-	}
-
-           
-          if ($("#PackagingType").val()!=0) {
-            calculatePackaging(0);
-                        }
-    if($("#drpFreight").val()!=0){
-        calculateFreight(0);
-        
-    }
-		  calculateTotalValue();
- 
-	}
-	
-}
-function calculateTotalValue()
- {
-	 var Packaging = $('#txtAfterPackaging').val() == '' ? '0.00' : $('#txtAfterPackaging').val();
-	 var Cgst = $('#AfterCgst').val() == '' ? '0.00' : $('#AfterCgst').val();
-	   var Sgst = $('#AfterSgst').val() == '' ? '0.00' : $('#AfterSgst').val();
-	    var Igst = $('#AfterIgst').val() == '' ? '0.00' : $('#AfterIgst').val();
-		var Freight = $('#txtAfterFreight').val() == '' ? '0.00' : $('#txtAfterFreight').val();
-		var Insurance = $('#txtInsurance').val() == '' ? '0.00' : $('#txtInsurance').val();
-		var Discount = $('#txtAfterDiscount').val() == '' ? '0.00' : $('#txtAfterDiscount').val();
-		var BasicVal = $('#txtBasicValue').val() == '' ? '0.00' : $('#txtBasicValue').val();
-	
-	 	 var totvalue = ( parseFloat(BasicVal) + parseFloat(Packaging)+ parseFloat(Cgst) + parseFloat(Sgst)+ parseFloat(Igst) + parseFloat(Freight) + parseFloat(Insurance)) - parseFloat(Discount);
-	 
-	 var tot =  parseFloat(totvalue).toFixed(2);
-	    		
-	 $('#txtTotalOrderValue').val(tot);
-	
-	 validateExceedLimit();
-	  ExceedQuantityCheck();
- }
-function calculateTaxValue()
- {
-	 var Packaging = $('#txtAfterPackaging').val() == '' ? '0.00' : $('#txtAfterPackaging').val();
-	
-		  var AfterCgst = $("#AfterCgst").val();
-                 
-                  var AfterSgst = $("#AfterSgst").val();
-                  
-                  var AfterIgst = $("#AfterIgst").val();
-		var Freight = $('#txtAfterFreight').val() == '' ? '0.00' : $('#txtAfterFreight').val();
-		var Insurance = $('#txtInsurance').val() == '' ? '0.00' : $('#txtInsurance').val();
-		var Discount = $('#txtAfterDiscount').val() == '' ? '0.00' : $('#txtAfterDiscount').val();
-		
-	
-	 var totvalue =  parseFloat(Packaging)+ parseFloat(AfterCgst)+ parseFloat(AfterSgst) + parseFloat(AfterIgst) + parseFloat(Freight) + parseFloat(Insurance) ;
-	 
-	 var tot =  parseFloat(totvalue).toFixed(2);
-	    //alert('tot:'+tot);		
-	return tot;
- }
- //If others is the payment terms to display mandatory field
-$("#PaymentTerms").change(function() { 
-				if ($('#PaymentTerms').val().trim()=='PT08')
-				{
-					 $('#otheroptiondiv').show();
-				}
-				else {
-					 $('#otheroptiondiv').hide();
-                                         $('#Otherpayment').val('');
-				}
-			});
-</script>
\ No newline at end of file
diff --git a/application/views/editServiceAmendPO.php~ b/application/views/editServiceAmendPO.php~
deleted file mode 100644
index 05c6f270..00000000
--- a/application/views/editServiceAmendPO.php~
+++ /dev/null
@@ -1,2013 +0,0 @@
-<?php 
-
-$DeliverOption='';
-		$SupId = '';
-        $SupName = '';
-		$Address = '';
-		$PODate = '';
-        
-		$DeliveryAddress ='';
-		$PONOStatus	 = 	'';
-		$PONO =  	'';
-		
-		$TotalCgst = 0.0;
-		$TotalSgst = 0.0;
-		$TotalIgst = 0.0;
-		$TotalSummary = 0.0;
-		$Totalotherallowance=0.0;
-		$TotalBasicAmount = 0.0;
-		$ServiceDescription = '';
-				$PaymentOtherDescription='';
-
-		$ServiceMaterialDescription='';
-
-$Deliverydt='';
-$DeliverSchedule='';
-$MaxPoDate = '';
-$AvlAmount = 0;
-$Value="&#8377;";
-
-$StatusName='';
-
-
-if(!empty($INRSYMBOL))
-{
-
-	foreach($INRSYMBOL as $INRS)
-	{
-      $INRSYM=$INRS->FontCode2000;
-
-	}
-}
-
-if(!empty($MaxPODate))
-{
-    foreach ($MaxPODate as $date)
-    {
-		$MaxPoDate = $date->PODate;
-              		
-	}
-}
-
-
-if(!empty($POMaster))
-{
-    foreach ($POMaster as $Req)
-    {
-
-		$SupId = $Req->SupplierID;
-        $SupName = $Req->SupplierName;
-		$Address = $Req->Address;
-		$pdt = new DateTime($Req->PODate);
-		$PODate =  $pdt->format('Y-m-d');
-		$DeliverOption = $Req->DeliveryOption;
-        $DeliverSchedule = $Req->DeliverySchedule;
-	//	echo "*" . $Req->DeliveryDate . "*";
-		$Ddt =	new DateTime($Req->DeliveryDate);
-		$Deliverydt =  $Ddt->format('Y-m-d');
-      //  echo "-" . $Deliverydt . "-";	
-		$DeliveryAddress =$Req->DeliveryAddress;
-		$PONOStatus	 = 	$Req->StatusCode;
-		$PONO = 	$Req->PONO;	
-		$ServiceDescription = $Req->ServiceDescription;	
-		//Terms=$Req->PaymentTerms;
-      	$PaymentOtherDescription=$Req->PaymentOtherDescription;
-        $WrkStatus=$Req->ServiceWorkStatus;
-        $StatusName=$Req->StatusName;
-    }
-}
-
-
-if(!empty($RequistionDetails))
-{
-
-    foreach ($RequistionDetails as $ReqDet) 
-    {
-        // $Reqon=$ReqDet->ReqDate;
-        $Reqonn=new DateTime($ReqDet->ReqDate);
-        $Reqon=$Reqonn->format('Y-m-d');
-        $Requestedby=$ReqDet->Requestedby;
-        $RequesterName=$ReqDet->FirstName;
-        //$Status=$ReqDet->Status;
-    }
-}
-
-//echo "$WrkStatus";
-
-if(!empty($AvlBudAmt))
-{
-   
-		$AvlAmount = number_format($AvlBudAmt, 2, '.', '');		
-	
-}
-
-
-foreach ($PaymentTerms as $TER) 
-{
-	//print_r($PaymentTerms);
-	//print_r($Payment);
-    $Terms=$TER->PaymentTerms;
-	
-	//echo "CURRENT TERMS :" . $Terms;
-}
-
-
-
-// foreach ($POSTATUS as $PST ) 
-// {
-//    $POStatus=$PST->StatusName;
-// }
-?>
-
-<script src="<?php echo base_url(); ?>assets/js/CreatePOValidation.js" type="text/javascript"></script>
-<script src="<?php echo base_url()  ?>assets/tinymce/js/tinymce/tinymce.min.js"></script>
-
-<script type="text/javascript">
-
-
-tinymce.init({
-          selector: "textarea#ScopeofWork",
-           menubar: false,
-            statusbar: false,
-            toolbar: false,
-          // plugins: "link image"
-        });
-    var DelOpt = '<?php echo $DeliverOption; ?>';
-    var SchName = '<?php echo $DeliverSchedule; ?>';
-	var others ='<?php echo $PaymentOtherDescription;?>';
-var DelDt = '<?php echo $Deliverydt; ?>';
-$(document).ready(function () {
-     if(DelOpt=="0"){
- $('#Deliverydtdiv').show();
-                    $('#Schedulediv').hide();
-$('#Deliverydt').val(DelDt);
- }
-
- else if(DelOpt=="1"){
- $('#Deliverydtdiv').hide();
-                    $('#Schedulediv').show();
-$('#Deliverydt').val('');
-
-$('#Scheduleby').val(SchName);
-
-}
-
-if($('#PaymentTerms').val()== 'PT08')
-{
-
-$('#otheroptiondiv').show();	
-$('#Otherpayment').val(others);
-
-}
-});
-</script>
-
-
-	
-
-<script>
-     
-
-var RequistQuantity = '';
-var AvilBudAmt = '';
- var POMaxDate = '<?php echo $MaxPoDate;?>';
-  var d = new Date(POMaxDate);
-   var SelectedMaterialList = {
-    Mat: []
-};
- $(function() {   
-$("#PODate").datepicker({
-	minDate : d,
-	maxDate : 'now',
-	dateFormat: 'mm/dd/yy',changeMonth: true, changeYear: true,yearRange: '-100:+0'
-});
- $("#Deliverydt").datepicker({
-	minDate : 'now',	
-	dateFormat: 'mm/dd/yy',changeMonth: true, changeYear: true,yearRange: '0:+10'
-});	  
- 
-$('#drpSupplier').change(function() {
-    
- var id = $('#drpSupplier').val();
-
- $("#SupAddress").val('');
- 
-		if(id != '0')
-		{
-			var y = <?php echo json_encode($Suplist, JSON_PRETTY_PRINT) ?>;
-
-	 			
-		$.each(y, function(idx, obj) {
-			if(obj.SupplierID === id)
-			{
-				$("#SupAddress").val(obj.Address);
-				 $("#PaymentTerms").val(obj.PaymentID);
-               
-                
-                
-				
-			}
-			
-		});
-			
-		}
-		else
-		{
-			alert('Please select the SupplierID');
-			return false;
-		}
-  
-});	
-
-$('#ReqNo').change(function() {
-  
- var id = $('#ReqNo').val();
- $("#AvlBudAmt").val('');
-  $("#CostCenter").val('');
-  $("#MaterialCode").empty();
-  $("#deptName").val('');
- $("#UOM").val('');
-$("#Quantity").val('');
-$("#ItemName").val('');
-$("#Rate").val('');
-$("#txtBasicValue").val('');
- clearTaxField();
-		if(id != '0')
-		{
-			var y = <?php echo json_encode($RequistionDetails, JSON_PRETTY_PRINT) ?>;
-		
-			var Material = <?php echo json_encode($MaterialList, JSON_PRETTY_PRINT) ?>;
-			var AvlBudAmt = '<?php echo $AvlAmount ?>'; 
-			//ServiceTable
-                   var rows =  document.getElementById('ServiceTable').rows.length;
-
-if(DeletedMaterialCode!=undefined && DeletedMaterialCode!=''){
-  
-                                                                                $("#MaterialCode").append( $('<option></option>').val(DeletedMaterialCode).html(DeletedMaterialCode + "-" + DeletedMaterialName));
-
-}
-
-for(i=2;i<=rows;i++){
-
-//var j=1;
-  $.each(Material[i], function(idx, obj) {
-
-    // j=j+1;
-           var materialCode = $('#materialCode'+i);
-
-
-
-
-                                    if(obj.materialCode == materialCode )
-                                    {
-                                    $("#MaterialCode").val('');
-                                    }
-
-                                 
-                                
-                               else{
-                                                                                $("#MaterialCode").append( $('<option></option>').val(obj.MaterialCode).html(obj.MaterialCode + "-" + obj.MaterialName));
-
-                        }
-
-
-                    });
-
-
-
-
-}		// For Binding DepartmentName	           			
-		$.each(y, function(idx, obj) {
-			if(obj.ReqNo === id)
-			{
-				$("#deptName").val(obj.DepartmentName);
-				$("#CostCenter").val(obj.CostCenterCode);
-                                 if(obj.Service_Period!='' && obj.Service_Period!=null){
-                                $("#Frequency").val(obj.Service_Period +'-' + obj.NumberOfService);
-                                $("#FrequencyNo").val(obj.NumberOfService);
-                                
-                               }
-                           else{
-                            var text='One Time';
-                              $("#Frequency").val(text);
-                              $("#FrequencyNo").val(1);
-                               }
-			}			
-		});
-			$("#AvlBudAmt").val(parseFloat(AvlBudAmt).toFixed(2));	
-		// For Binding Material list center for the selected Requistion Number	
-		$("#MaterialCode").append( $('<option></option>').val("0").html("Select Material Code") );
-		var isAdded = "0";
-		 for(i=0;i<Material.length;i++)
-		{
-		$.each(Material[i], function(idx, obj) {
-			
-				if(obj.ReqNo === id )
-				{
-									   
-						$.each(SelectedMaterialList.Mat, function(idx1, el){															
-							if (id == el.ReqNo )
-							{
-															
-								if(el.materialCode == obj.MaterialCode)
-								{
-										isAdded  = "1";
-										return false;																		
-								}
-								else
-								{
-									isAdded  = "0";
-								}
-								
-							}
-					});
-					
-					 
-						if(isAdded  == "0")
-						{
-
-							
-							$("#MaterialCode").append( $('<option></option>').val(obj.MaterialCode).html(obj.MaterialCode + "-" + obj.MaterialName));
-						}
-												
-				}
-			
-			
-		});
-		}
-		}
-		else
-		{
-			alert('Please select the Requisition Number');
-			return false;
-		}
-		id = '';
-  
-});
-	
-$('#MaterialCode').change(function() {
-    
- var id = $('#MaterialCode').val();
- RequistQuantity = '';
- clearTaxField();
-		if(id != '0')
-		{
-			var y = <?php echo json_encode($MaterialList, JSON_PRETTY_PRINT) ?>;
-			
-	   for(i=0;i<y.length;i++)
-                    {
-		$.each(y[i], function(idx, obj) {
-
-			if(obj.MaterialCode == id)
-			{
-                         
-                               
-				$("#ItemName").val(obj.MaterialName);
-				$("#UOM").val(obj.UOM);
-				$("#Quantity").val(obj.Quantity);
-				RequistQuantity	= 	obj.Quantity;		
-			}			
-		});
-                }			
-		}
-		else
-		{
-			alert('Please select the MaterialCode');
-			return false;
-		}
-  
-});
-$('#EditMaterialCode').change(function() {
-    
- var id = $('#EditMaterialCode').val();
-
- $("#EditItemName").val('');
-$("#EditUOM").val('');
-$("#EditQuantity").val('');
-//$("#EditRate").val('');
-//$("#txtEditBasicValue").val('');
- RequistQuantity = '';
- //clearEditTaxField();
-		if(id != '0')
-		{
-			var Material = <?php echo json_encode($MaterialList, JSON_PRETTY_PRINT) ?>;
-			
-	  for(i=0;i<Material.length;i++)
-		{
-		$.each(Material[i], function(idx, obj) {
-			if(obj.MaterialCode === id)
-			{
-
-				$("#EditItemName").val(obj.MaterialName);
-				$("#EditUOM").val(obj.UOM);
-				$("#EditQuantity").val(obj.Quantity);
-				RequistQuantity	= 	obj.Quantity;		
-			}			
-		});			
-		}
-		
-		}
-		else
-		{
-			alert('Please select the MaterialCode');
-			return false;
-		}
-  
-});
-
-});
-
-function Ratechange(){
-	 
-		if($('#ReqNo').val() == "0")
-		 {
-			 alert('Please select the Requisition Number');
-			 $('#ReqNo').focus();
-			 return false;
-		 }
-		 else if($('#MaterialCode').val() == "0")
-		 {
-			alert('Please select the Material Code');
-			$('#MaterialCode').focus();
-		   return false;
-		 }
-		 else if($('#CostCenter').val() == "0")
-		 {
-				alert('Please select the CostCenterCode');
-				$('#CostCenter').focus();
-			return false;
-		 }
-	 ExceedQuantityCheck();
-	  
-	 if($('#Quantity').val() != '' && $('#Rate').val() != '')
-	 {	  
-      var txtQuantity = parseFloat( $('#Quantity').val());
-	  var txtUnitPrice = parseFloat($('#Rate').val());
-          var frequencyValue = parseFloat($('#FrequencyNo').val());
-	  var Tot =  txtQuantity * frequencyValue * txtUnitPrice;
-	  $('#txtBasicValue').val(parseFloat(Tot).toFixed(2));
-	  
-	 //Service Tax calculation
-        
-        $('#AfterCgst').val(calculateCgstTax($('#txtBasicValue').val(),$('#Cgst').val()));
-        $('#AfterSgst').val(calculateSgstTax($('#txtBasicValue').val(),$('#Sgst').val()));
-         $('#AfterIgst').val(calculateIgstTax($('#txtBasicValue').val(),$('#Igst').val()));
-	
-
-	 calculateTotalOrdervalue();
-	 
-	 var res = ExceedBudget($('#TotalOrderValue').val(), $('#AvlBudAmt').val());
-      if(!res)
-	  {
-		 $('#Rate').focus();
-		 return false;
-	  }
-	 }
-	 
-}
-
-function EditRatechange(){
-	 
-		if($('#EditCostCenter').val() == "0")
-		 {
-				alert('Please select the CostCenterCode');
-				$('#EditCostCenter').focus();
-			return false;
-		 }
-	 //EditExceedQuantityCheck();
-	  
-	 if($('#EditQuantity').val() != '' && $('#EditRate').val() != '')
-	 {	  
-      var txtQuantity = parseFloat( $('#EditQuantity').val());
-	  var txtUnitPrice = parseFloat($('#EditRate').val());
-         var frequencyValue = parseFloat($('#EditFrequencyNo').val());
-
-	  var Tot =  txtQuantity * frequencyValue * txtUnitPrice
-	  $('#txtEditBasicValue').val(parseFloat(Tot).toFixed(2));
-	    ExceedBudget(Tot, $('#EditAvlBudAmt').val());	 
-	 
-	 
-        $('#EditAfterCgst').val(calculateCgstTax($('#txtEditBasicValue').val(),$('#EditCgst').val()));
-        $('#EditAfterSgst').val(calculateSgstTax($('#txtEditBasicValue').val(),$('#EditSgst').val()));
-         $('#EditAfterIgst').val(calculateIgstTax($('#txtEditBasicValue').val(),$('#EditIgst').val()));
-	  calculateTotalEditOrdervalue();
-	 }
-	 
-}
-
-
- // function EditExceedQuantityCheck()
- // {
-	// // RequistQuantity
-	// var EnterQuantity =   $("#EditQuantity").val()== '' ? "0.00" :  parseFloat($("#EditQuantity").val());
-	// var ReqQuantity = parseFloat(RequistQuantity);
-	// //alert(ReqQuantity);
-	// if(EnterQuantity > ReqQuantity)
-	// {
-		 // alert('Your exceeding the Quantity from the Requisition Quantity:'+ RequistQuantity  +'.Please adjust the Quantity to proceed further.');
-		
-		  // $('#EditQuantity').focus();
-		 // return false;
-	// }
- // }
- 
- function ExceedBudget(ValuetoCheck,budgetAmount)
- {
-	 var ReqAmount = parseFloat(ValuetoCheck);
-	 var BudAmount = parseFloat(budgetAmount);
-	 
-	 if(ReqAmount > BudAmount )
-	 {
-		alert('Your exceeding the Avaiable Budget :'+ AvilBudAmt  +'.Please adjust the Product to proceed further.');
-		return false; 
-	 }
-	 else
-	 {
-		 return true;
-	 }
- }
- 
- 
- 
- function calculateTotalEditOrdervalue()
- {
-	var basicValue = parseFloat($('#txtEditBasicValue').val());
-	var Cgst = parseFloat($('#EditAfterCgst').val());
-	var Sgst = parseFloat($('#EditAfterSgst').val());
-	var Igst = parseFloat($('#EditAfterIgst').val());
-     var otherallowance= parseFloat($('#otherallowance').val());
-
-	var TotAmt = basicValue + Cgst+ Sgst + Igst +otherallowance;
-
-	
-
-	$('#EditTotalOrderValue').val( parseFloat(TotAmt).toFixed(2));
-
-		 
- }
- 
- function calculateTaxValue()
- {
-	var Cgst = parseFloat($('#AfterCgst').val());
-	var Sgst = parseFloat($('#AfterSgst').val());
-	var Igst = parseFloat($('#AfterIgst').val());
-
-	var TottaxAmt = Cgst+ Sgst + Igst;
-	return parseFloat(TottaxAmt).toFixed(2); 
- }
- 
-
-function clearEditTaxField()
-{
-	$('#txtEditBasicValue').val('');
-	$('#EditAfterEduCess').val('');
-	$('#EditAfterSecHighTax').val('');
-	$('#EditAfterServiceTax').val('');
-	$('#EditAfterKrishiTax').val('');
-	$('#EditAfterSwachhTax').val('');
-	$('#EditTotalOrderValue ').val('');
-	$('#EditRate').val('');
-	
-	$("#EditItemName").val('');
-	$("#EditUOM").val('');
-	$("#EditQuantity").val('');
-	RequistQuantity	= 	'';	
-	
-}
-$(document).ready(function () {
-	 $("#PaymentTerms").select2();
-                $('#Date').click(function () {
-                    //for Date range selection
-                    $('#Schedulediv').hide();
-                    $('#Deliverydtdiv').show();
-                });
-                $('#Schedule').click(function () {
-                    //for schedule range selection
-                    $('#Deliverydtdiv').hide();
-                    $('#Schedulediv').show();
-                });
-            });
-</script>
-<style>
-.modal
-{
-	padding-right:25% ! important;
-}
-.num {
-	text-align:right;
-}
-</style>
-<div class="content-wrapper">
-     <?php
-                      $attributes = array('class' => 'form-label-left ServicePO ','name'  => 'ServicePO','id'  => 'ServicePO');
-                        
-                        echo form_open($this->config->base_url().'/purchaseorder/addPO/',$attributes); ?>
- 
-	 <section class="content">
-		<div style="border:2px solid #333">
-			<div id="content"></div>
-			<div><center><b><h2>Siddharth Industries - Amendment Service Purchase Order - <?php echo $PONO;?></h2></b></center></div>
-			<div class="container-fluid">		
-							<div class="row">
-						<div class="col-md-12">
-							<div class="col-md-3">
-								<div class="col-md-12">
-									<label>Requistion No</label>
-												 
-												
-													<?php
-													 
-													  $options = array("0"=>'Selected Requisition Numbers'); 
-														 if(!empty($ReqList))
-												{
-												foreach ($ReqList as $SID):
-												  
-													   $options[$SID->ReqNo] = $SID->ReqNo ;
-												   endforeach;
-												}	
-													echo form_multiselect('RequistionNo', $options,set_value('RequistionNo'),'id="RequistionNo"' , 'required="true"');
-
-													?>
-									</div>
-								<div class="col-md-12">
-										<label>Purchase Order Date</label>
-												<div class="form-group">
-															<?php
-													 $data = array('name' => 'PODate','value' => set_value('PODate',$PODate),'id'=>'PODate',  'class' => 'form-control num' ,'required' => 'true','onkeypress'=>'return false;');
-													echo form_input($data);
-													?>   							    
-												</div>
-								</div>							
-												 
-							</div>
-							<div class="col-md-9" style="padding:0px;">
-							<div class="col-md-4">
-								<div class="col-md-12">
-									<label>Supplier</label>
-										  <?php
-											$options = array("0"=>'Select Supplier');     
-											//print_r(  $options);
-											
-											if(!empty($Suplist))
-											{
-											foreach ($Suplist as $SID):
-											  
-										   
-											  $options[$SID->SupplierID] =  $SID->SupplierID.' '.' - '.' '.$SID->SupplierName;
-
-											endforeach;
-											}										
-								
-											echo form_dropdown('drpSupplier', $options,set_value('drpSupplier',$SupId ),'id="drpSupplier"'  ,'required="true"' ,'class="form-control select2');
-
-											?>						 
-										 
-								</div>
-								<div class="col-md-12"><br/>
-									<label>Address</label>
-										<div class="form-group">
-													<?php
-											 $data = array('name' => 'SupAddress','value' => set_value('SupAddress',$Address),'id'=>'SupAddress',  'class' => 'form-control' ,'readonly' => 'true','rows' => '3', 'cols' => '40');
-											echo Form_textarea($data);
-											?>   
-										</div>
-								</div>
-							</div>
-							<div class="col-md-4">
-								<div class="col-md-12">
-									 <label>Purchase Order Type</label>
-											<div class="form-group">
-											
-														<?php
-												 $data = array('name' => 'POType','value' => set_value('POType',SERVICE),'id'=>'POType',  'class' => 'form-control' ,'readonly' => 'true');
-												echo form_input($data);
-												?>   
-											</div>
-								</div>
-								<div class="col-md-12">
-									 <label>Delivery Address</label>
-										<div class="form-group">
-													<?php
-											 $data = array('name' => 'DeliveryAddr','value' => set_value('DeliveryAddr',$DeliveryAddress),'id'=>'DeliveryAddr',  'class' => 'form-control' ,'required' => 'true', 'rows' => '3', 'cols' => '40');
-											echo Form_textarea($data);
-											?><input type="hidden" name="txtDeliveryAddress" id="txtDeliveryAddress"  value="<?php echo $DeliveryAddress;?>"> 
-											   
-										</div>
-								</div>
-							</div>
-							<div class="col-md-4" style="padding:0px;">
-								<div class="col-md-6" style="padding:0px;">
-									<b><u>Select Delivery By</u></b><br/>
-										<tr>
-											<td>
-												  <?php echo form_label('Date', 'Date') . "&nbsp;&nbsp;". form_radio(array('name' => 'DateRange', 'value' => '0', 'checked' => ('0' == $DeliverOption) ? TRUE : FALSE, 'id' => 'Date')); ?>
-											</td>
-
-											<td>
-												  <?php echo form_label('Schedule', 'Schedule') . "&nbsp;&nbsp;". form_radio(array('name' => 'DateRange', 'value' => '1', 'checked' => ('1' == $DeliverOption) ? TRUE : FALSE, 'id' => 'Schedule')); ?>
-												 
-											</td>					   
-										</tr>
-								</div>
-								<div class="col-md-6">
-									<label>Work Status</label>
-									   <?php
-								
-									
-						
-						                if(!empty($WorkStatus))
-						                  {
-											//print_r($WorkStatus);
-                                                               foreach ($WorkStatus as $WorkSID):
-						                                 if($WrkStatus==$WorkSID->StatusName){
-															 
-                                                       $optionsWork[$WorkSID->StatusName] =  $WorkSID->StatusName;
-                                                         }
-                                           
-
-						                    endforeach;
-						                    foreach ($WorkStatus as $SID):
-						   if($WrkStatus!=$SID->StatusName){
-                                                       $optionsWork[$SID->StatusName] =  $SID->StatusName;
-                                                         }
-                                           
-
-						                    endforeach;
-						                  }										
-			
-						echo form_dropdown('workstatus', $optionsWork,set_value('workstatus'),'id="workstatus"'  ,'required="true"' ,'class="form-control select2');
-
-											?>	
-								</div>
-								<div class="col-md-12" id="Deliverydtdiv"><br/>
-									<label>Delivery Date</label>
-									<?php if($DeliverOption==1){
-										$Deliverydt=null;
-										}?>
-									<input type="hidden" name="beforeDeliverydt" value="<?php echo $Deliverydt?>">
-										<div class="form-group">
-													<?php
-											 $data = array('name' => 'Deliverydt','value' => set_value('Deliverydt',$Deliverydt),'id'=>'Deliverydt',  'class' => 'form-control num' ,'required' => 'true', 'onkeypress'=>'return false;');
-											echo form_input($data);
-											?>   
-										</div>
-								</div>
-								<div class="col-md-12" id="Schedulediv" style="display:none;"><br/>
-										<label >Schedule :</label>
-										<input type="hidden" name="beforeScheduleby" value="<?php echo $DeliverSchedule?>">
-										<?php
-										$data = array('name' => 'Scheduleby','value' => set_value('Scheduleby',$DeliverSchedule),'id'=>'Scheduleby',  'class' => 'form-control' ,'required' => 'true' ,'rows' => '3', 'cols' => '40');
-										echo Form_textarea($data);
-										?>
-
-								</div>
-							</div>
-							
-						</div>
-							<div class="col-md-12">
-								<legend>Payment Details</legend>
-							<!-- Text input-->
-								<div class="col-md-4">
-			    <label>Payment Terms</label> 
-				<input type="hidden" name="beforePaymentTerms" value="<?php echo $Terms?>">
-				
-				  
-                                            <?php
-                                                       
-                                                
-                                               
-                                                    if(!empty($Payment))
-                                                    {
-                                                 //print_r($Payment);
-                                                foreach ($Payment as $pay2)
-                                                      
-                                                    if($Terms==$pay2->PaymentID){
-														?>
-														<input type="hidden" id="beforePaymentTermsText" name="beforePaymentTermsText" value="<?php echo $pay2->PaymentTerms?>">
-                                                     <?php
-                                                       $optionsPay[$pay2->PaymentID] =  $pay2->PaymentTerms;
-                                                       
-                                                     }
-                                                   
-                                                     foreach ($Payment as $pay1):
-                                                      
-                                                     if($Terms!=$pay1->PaymentID){
-                                                    
-                                                       $optionsPay[$pay1->PaymentID] =  $pay1->PaymentTerms;
-                                                       
-                                                     }
-                                                    endforeach;
-                                                    }										
-													
-                                                    echo form_dropdown('PaymentTerms', $optionsPay,set_value('PaymentTerms'),'id="PaymentTerms"'  ,'required="true"' ,'class="form-control select2');
-
-                                                    ?>
-              
-
-                                    
-
-            </div>
-			<div class="col-md-4" id="otheroptiondiv" style="display:none;">
-                      <label>Description of Payable Terms<span class="badge" style="color:red;text-align:right;background-color: #ecf0f5 ;">*</span></label>
-                      
-                        <div class="form-group">                        
-                            <?php
-							
-                             $data = array('name' => 'Otherpayment','Otherpayment' => set_value('Otherpayment'),'id'=>'Otherpayment',  'class' => 'form-control' ,'required' => 'true');
-                            echo form_input($data);
-                            ?>   
-                        </div>
-                </div>
-								 
-							</div>
-						</div>
-						</div>	
-							<div class="container-fluid">   	 
-						<div style="padding-right:10px">
-						<div align="right">
-							<!-- <a data-toggle="modal" ><button type="submit"  onclick="myFunction();" class="btn btn-primary" id="abcd" >Select Line Item</button> </a> -->
-				  
-							<!-- Model for servicepo -->
-							
-							<div class="modal fade" id="EDITSERVICE" role="dialog">
-								<div class="modal-dialog">
-							   <!-- Modal content-->
-							 <form>
-								  <div class="modal-content" style="width:900px;">
-									<div class="modal-header" style="background-color: #3c8dbc;color:#fff;"> 
-									  <center><h4>Edit Service Purchase Order Item </h4></center>				
-									</div>
-									<div align="left"> 
-									 
-									<div class="col-md-12">
-												 <div class="col-md-3">
-												 <label>Req No</label>
-															<div>
-																 <?php
-																	
-																$data = array('name' => 'EditReqNo','value' => set_value('EditReqNo'),'id'=>'EditReqNo',  'class' => 'form-control','readonly'=>'true');
-																echo form_input($data);
-																?>	
-																
-															</div>
-														</div>
-												 
-												  <div class="col-md-3">
-												   <label>Department Name</label>
-															<div class="form-group">
-																		<?php
-																 $data = array('name' => 'EditdeptName','value' => set_value('EditdeptName'),'id'=>'EditdeptName',  'class' => 'form-control','readonly'=>'true');
-																echo form_input($data);
-																?>   
-															</div>
-												 </div>
-												  <div class="col-md-3">
-												   <label>Cost Center Name</label>
-															<div class="form-group">
-																		<?php
-												$data = array('name' => 'EditCostCenter','value' => set_value('EditCostCenter'),'id'=>'EditCostCenter',  'class' => 'form-control' ,'readonly' => 'true');
-																		echo form_input($data);
-
-												?>		
-															</div>
-												 </div>
-												  <div class="col-md-3">
-												   <label>Avail Budget Amount In INR</label>
-															<div class="form-group">
-																		<?php
-																 $data = array('name' => 'EditAvlBudAmt','value' => set_value('EditAvlBudAmt'),'id'=>'EditAvlBudAmt',  'class' => 'form-control num' ,'readonly' => 'true');
-																echo form_input($data);
-																?>   
-															</div>
-												 </div>
-								 </div>
-								 <div class="col-md-12">
-												  <div class="col-md-3">
-												  <label>Item Code</label>
-															<div>
-																 <?php
-																$options = array("0"=>'Item Code');     
-																//print_r(  $options);
-																
-																echo form_dropdown('EditMaterialCode', $options,set_value('EditMaterialCode'),'id="EditMaterialCode"' ,'class="form-control"');
-
-																?>						 
-															</div>
-											   </div>
-												<div class="col-md-3">
-												  <label>Item Name</label>
-															<div class="form-group">
-																		<?php
-																 $data = array('name' => 'EditItemName','value' => set_value('EditItemName'),'id'=>'EditItemName',  'class' => 'form-control' ,'readonly' => 'true');
-																echo form_input($data);
-																?>   
-															</div>
-												 </div>
-												  <div class="col-md-6">
-								<label>Service Description</label>	<?php
-									 $data = array('name' => 'EdittxtSpcialInstruction','value' => set_value('EdittxtSpcialInstruction',$ServiceMaterialDescription),'id'=>'EdittxtSpcialInstruction',  'class' => 'form-control');
-									echo form_input($data);
-									?>  <input type="hidden" name="beforeEdittxtSpcialInstruction" id="beforeSpcialInstruction"  value="<?php echo $ServiceMaterialDescription;?>"> 
-							</div>
-												
-								</div>
-								<div class="col-md-12">
-								 <div class="col-md-2">
-												  <label>UOM</label>
-															<div class="form-group">
-																		<?php
-																 $data = array('name' => 'EditUOM','value' => set_value('EditUOM'),'id'=>'EditUOM',  'class' => 'form-control' ,'readonly' => 'true');
-																echo form_input($data);
-																?>   
-															</div>
-												 </div>
-												<div class="col-md-2">
-												  <label>Frequency</label>
-															<div>
-																<?php
-																 $data = array('name' => 'EditFrequency','value' => set_value('EditFrequency'),'id'=>'EditFrequency',  'class' => 'form-control' ,'readonly' => 'true');
-																echo form_input($data);
-																?>  
-                                                             <input type="hidden" name="EditFrequencyNo" id="EditFrequencyNo" value="EditFrequencyNo" /> 
-															</div>
-											   </div>
-												<div class="col-md-2">
-												  <label>Quantity</label>
-															<div class="form-group">
-																		<?php
-																 $data = array('name' => 'EditQuantity','value' => set_value('EditQuantity'),'id'=>'EditQuantity',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'EditRatechange()');
-																echo form_input($data);
-																?>   
-															</div>
-												 </div>
-												 <div class="col-md-2">
-												  <label><?php echo "Rate ($INRSYM)";?></label>
-															<div class="form-group">
-																		<?php
-																 $data = array('name' => 'EditRate','value' => set_value('EditRate'),'id'=>'EditRate',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);' ,'onchange'=>'EditRatechange()' );
-																echo form_input($data);
-																?>   
-															</div>
-												 </div>
-												 <div class="col-md-4">
-												  <label><?php echo "Basic Amount ($INRSYM)";?></label>
-															<div class="form-group">
-																		<?php
-																 $data = array('name' => 'txtEditBasicValue','value' => set_value('txtEditBasicValue'),'id'=>'txtEditBasicValue',  'class' => 'form-control num' ,'readonly' => 'true');
-																echo form_input($data);
-																?>   
-															</div>
-												 </div>
-								 
-								</div>
-								 
-				<div class="col-md-12">
-					<div class="col-md-6" align="right">
-							 
-				CGST In %
-					</div>	
-					
-					<div class="col-md-3">
-							 <div class="form-group">
-							 
-												<?php
-										 $data = array('name' => 'EditCgst','value' => set_value('EditCgst'),'id'=>'EditCgst',  'class' => 'form-control num' ,'placeholder' => 'CGST TAX PERCENTAGE','onchange'=>'EditRatechange()');
-										echo form_input($data);
-										?>   
-									</div>
-			 
-					</div>	
-					<div class="col-md-3">
-							 <div class="form-group">
-							 
-												<?php
-										 $data = array('name' => 'EditAfterCgst','value' => set_value('EditAfterCgst'),'id'=>'EditAfterCgst',  'class' => 'form-control num' ,'placeholder' => 'After CGST','readonly' => 'true');
-										echo form_input($data);
-										?>   
-									</div>
-			 
-					</div>						
-		 
-				</div>		 
-				<div class="col-md-12">
-					<div class="col-md-6" align="right">
-							 
-				SGST In %
-					</div>	
-					
-					<div class="col-md-3">
-							 <div class="form-group">
-							 
-												<?php
-										 $data = array('name' => 'EditSgst','value' => set_value('EditSgst'),'id'=>'EditSgst',  'class' => 'form-control num' ,'placeholder' => 'SGST TAX PERCENTAGE','onchange'=>'EditRatechange()');
-										echo form_input($data);
-										?>   
-									</div>
-			 
-					</div>	
-					<div class="col-md-3">
-							 <div class="form-group">
-							 
-												<?php
-										 $data = array('name' => 'EditAfterSgst','value' => set_value('EditAfterSgst'),'id'=>'EditAfterSgst',  'class' => 'form-control num' ,'placeholder' => 'After SGST','readonly' => 'true');
-										echo form_input($data);
-										?>   
-									</div>
-			 
-					</div>						
-		 
-				</div>
-		 
-				<div class="col-md-12">
-					<div class="col-md-6" align="right">
-							 
-				IGST In %
-					</div>	
-					
-					<div class="col-md-3">
-							 <div class="form-group">
-							 
-												<?php
-										 $data = array('name' => 'EditIgst','value' => set_value('EditIgst'),'id'=>'EditIgst',  'class' => 'form-control num' ,'placeholder' => 'IGST TAX PERCENTAGE','onchange'=>'EditRatechange()');
-										echo form_input($data);
-										?>   
-									</div>
-			 
-					</div>	
-					<div class="col-md-3">
-							 <div class="form-group">
-							 
-												<?php
-										 $data = array('name' => 'EditAfterIgst','value' => set_value('EditAfterIgst'),'id'=>'EditAfterIgst',  'class' => 'form-control num' ,'placeholder' => 'After IGST','readonly' => 'true');
-										echo form_input($data);
-										?>   
-									</div>
-			 
-					</div>						
-		 
-				</div>
-				<div class="col-md-12">
-								 <div class="col-md-5  col-md-offset-4" align="right">
-								<label>Other Allowances In INR</label>			 
-											</div>	
-								<div class="col-md-3">
-													 <div class="form-group">
-																			<?php
-																	 $data = array('name' => 'otherallowance','value' => set_value('otherallowance'),'id'=>'otherallowance',  'class' => 'form-control num','onchange'=>'EditRatechange()');
-																	echo form_input($data);
-																	?>   
-																</div>
-													 </div>
-								 </div>
-									<div class="col-md-12">
-								 <div class="col-md-5  col-md-offset-4" align="right">
-								<label><?php echo "Total Order Value ($INRSYM)";?></label>		 
-											</div>	
-								<div class="col-md-3">
-													 <div class="form-group">
-																			<?php
-																	 $data = array('name' => 'EditTotalOrderValue','value' => set_value('EditTotalOrderValue'),'id'=>'EditTotalOrderValue',  'class' => 'form-control num' ,'readonly' => 'true');
-																	echo form_input($data);
-																	?>   
-																</div>
-													 </div>
-								 </div>
-								
-								 
-								
-									
-									  <br/>
-									   
-									<div class="modal-footer">
-									<div class="col-md-12">
-									<a class="btn btn-primary font EditService"  ID="Edit">&nbsp;&nbsp;<span class="bold">Update Service</span></a>
-												<a class="btn btn-primary" data-dismiss="modal"  value="Cancel">Cancel</a>
-									</div>
-									</div>
-								  </div>
-								 </form>
-									 
-								  </div>
-							</div>	
-						  </div>
-						  
-						</div>	
-						<br/>
-						<div class="box-body" style="margin-top: -2%;">
-						<table id="ServiceTable" class="table table-bordered table-hover" style="background-color:#fff;font-size:12px;">
-							<thead style="background-color:#ddf">
-							<tr>
-								<th>SNo</th>
-								<th>Requisition No</th>
-                                <th>Item Code</th>
-								<th>Item Description</th>
-								<th>Quantity</th>
-								<th>UOM</th>                                                              
-								<th>Rate</th>
-								<th>Basic Amount</th>
-								<th>Tax Amount</th>
-								<th>Total Order Amount</th>
-								<th>Actual Quantity</th>
-								<th>Received Quantity</th>
-								<th>Pending Quantity</th>
-								<th>Action</th>
-							</tr>
-							</thead>				
-							   
-							<tbody id='ServiceAppend'>
-								  <?php
-
-								if(!empty($POItem))
-									{
-										//print_r($POItem);
-                                                                        
-									
-											$index = 0;
-										
-										foreach($POItem as $record)
-										{
-											$index = $index + 1;
-											if($record->Schedule_Type!='Recurring'){
-											$FrequencyNo=intval(1);
-											$Frequency='One Time';
-											}
-										else{
-										  $FrequencyNo=$record->NumberOfService;
-											$Frequency=$record->Service_Period;
-										}
-                                                                                        
-									?>
-									<tr id="<?php echo $index ; ?>">
-									<td align="left"><?php echo $index ; ?></td> 
-									<td><?php echo $record->ReqNo ?></td> 
-                                                                        <td><?php echo $record->MaterialCode ?></td> 
-									<td><?php echo $record->MaterialName ?></td> 
-									<td align="right"><?php echo $record->Quantity ?></td>   					
-									<td><?php echo $record->UOM ?></td> 
-                                                                        
-									<td align="right"><?php echo $record->Rate ?></td>                     
-									
-									<td align="right"><?php echo number_format($record->BasicValue * $FrequencyNo, 2, '.', ''); ?></td>    
-									  
-									<td align="right"><?php echo $record->Taxamount ?></td>
-									<td align="right"><?php echo $record->TotalValue ?></td>
-                                                                        <td align="right"><?php echo $record->Quantity ?></td>
-                                                                        <td align="right"><?php echo $record->ReceivedQuantity ?></td>
-                                                                        <td align="right"><?php echo number_format($record->Quantity - $record->ReceivedQuantity, 2, '.', ''); ?></td>
-									 <input type="hidden" name="<?php echo 'Reqnumber'.$index ?>" id="<?php echo 'Reqnumber'.$index ?>" value="<?php echo $record->ReqNo ; ?>" />
-									 <input type="hidden" name="<?php echo 'departmentName'.$index ?>" id="<?php echo 'departmentName'.$index ?>" value="<?php echo $record->ReqNo ; ?>" />
-									<input type="hidden" name="<?php echo 'AvilBudget'.$index ?>" id="<?php echo 'AvilBudget'.$index ?>" value="<?php echo $AvlAmount ; ?>" />					
-									<input type="hidden" name="<?php echo 'LineItemNo'.$index ?>" id="<?php echo 'LineItemNo'.$index ?>" value="<?php echo $record->LineItemNo ; ?>" />
-									 <input type="hidden" name="<?php echo 'costCode'.$index ?>" id="<?php echo 'costCode'.$index ?>" value="<?php echo $record->CostCenterCode ; ?>" />
-									 <input type="hidden" name="<?php echo 'materialCode'.$index ?>" id="<?php echo 'materialCode'.$index ?>" value="<?php echo $record->MaterialCode ; ?>" />
-									 <input type="hidden" name="<?php echo 'materialName'.$index ?>" id="<?php echo 'materialName'.$index ?>" value="<?php echo $record->MaterialName ; ?>" />
-									 <input type="hidden" name="<?php echo 'uom'.$index ?>" id="<?php echo 'uom'.$index ?>" value="<?php echo $record->UOM ; ?>" />
-									 <input type="hidden" name="<?php echo 'quantity'.$index ?>" id="<?php echo 'quantity'.$index ?>" value="<?php echo $record->Quantity ; ?>" />
-									 <input type="hidden" name="<?php echo 'beforequantity'.$index ?>" id="<?php echo 'beforequantity'.$index ?>" value="<?php echo $record->Quantity ; ?>" />
-									 <input type="hidden" name="<?php echo 'itemRate'.$index ?>" id="<?php echo 'itemRate'.$index ?>" value="<?php echo $record->Rate ; ?>" />
-									 <input type="hidden" name="<?php echo 'beforeitemRate'.$index ?>" id="<?php echo 'beforeitemRate'.$index ?>" value="<?php echo $record->Rate ; ?>" />
-									 
-                                     <input type="hidden" name="<?php echo 'Cgst'.$index ?>" id="<?php echo 'Cgst'.$index ?>" value="<?php echo $record->CGST ; ?>" />
-									 <input type="hidden" name="<?php echo 'beforeCgst'.$index ?>" id="<?php echo 'beforeCgst'.$index ?>" value="<?php echo $record->CGST ; ?>" />
-									 <input type="hidden" name="<?php echo 'AfterCgst'.$index ?>" id="<?php echo 'AfterCgst'.$index ?>" value="<?php echo $record->After_CGST ; ?>" />
-									 <input type="hidden" name="<?php echo 'beforeCgstvalue'.$index ?>" id="<?php echo 'beforeCgstvalue'.$index ?>" value="<?php echo $record->After_CGST ; ?>" />
-									 
-									 <input type="hidden" name="<?php echo 'Sgst'.$index ?>" id="<?php echo 'Sgst'.$index ?>" value="<?php echo $record->SGST ; ?>" />
-									 <input type="hidden" name="<?php echo 'beforeSgst'.$index ?>" id="<?php echo 'beforeSgst'.$index ?>" value="<?php echo $record->SGST ; ?>" />
-									 <input type="hidden" name="<?php echo 'AfterSgst'.$index ?>" id="<?php echo 'AfterSgst'.$index ?>" value="<?php echo $record->After_SGST ; ?>" />
-									 <input type="hidden" name="<?php echo 'beforeSgstvalue'.$index ?>" id="<?php echo 'beforeSgstvalue'.$index ?>" value="<?php echo $record->After_SGST ; ?>" />
-									 
-                                     <input type="hidden" name="<?php echo 'Igst'.$index ?>" id="<?php echo 'Igst'.$index ?>" value="<?php echo $record->IGST ; ?>" />
-									 <input type="hidden" name="<?php echo 'beforeIgst'.$index ?>" id="<?php echo 'beforeIgst'.$index ?>" value="<?php echo $record->IGST ; ?>" />
-									 <input type="hidden" name="<?php echo 'AfterIgst'.$index ?>" id="<?php echo 'AfterIgst'.$index ?>" value="<?php echo $record->After_IGST ; ?>" />
-									 <input type="hidden" name="<?php echo 'beforeIgstvalue'.$index ?>" id="<?php echo 'beforeIgstvalue'.$index ?>" value="<?php echo $record->After_IGST ; ?>" />
-									 
-									 <input type="hidden" name="<?php echo 'otherallowance'.$index ?>" id="<?php echo 'otherallowance'.$index ?>" value="<?php echo $record->otherallowance ; ?>" />
-									 <input type="hidden" name="<?php echo 'beforeotherallowance'.$index ?>" id="<?php echo 'beforeotherallowance'.$index ?>" value="<?php echo $record->otherallowance ; ?>" />
-									 <input type="hidden" name="<?php echo 'TotalOrderValue'.$index ?>" id="<?php echo 'TotalOrderValue'.$index ?>" value="<?php echo $record->TotalValue ; ?>" />
-									 <input type="hidden" name="<?php echo 'servicematerialdescription'.$index ?>" id="<?php echo 'servicematerialdescription'.$index ?>" value="<?php echo $record->ServiceMaterialDescription ; ?>" />
-									 <input type="hidden" name="<?php echo 'Frequency'.$index ?>" id="<?php echo 'Frequency'.$index ?>" value="<?php echo $Frequency; ?>" />
-                                                                        <input type="hidden" name="<?php echo 'FrequencyNo'.$index ?>" id="<?php echo 'FrequencyNo'.$index ?>" value="<?php echo $FrequencyNo ; ?>" />
-                                                                                <input type="hidden" name="<?php echo 'FrequencyValue'.$index ?>" id="<?php echo 'FrequencyValue'.$index ?>" value="<?php echo $FrequencyNo ; ?>" />
-
-                                                                        
-									<?php 
-											
-											//if($PONOStatus == PO_DRAFT) 
-											//{?>					
-									<td>    <a    data-target='#EDITSERVICE'	data-id="<?php echo $index ; ?>" data-userid="<?php echo $index ; ?>" data-toggle="modal" href="#EDITSERVICE"><i class="fa fa-pencil" data-toggle="tooltip" title="Click here to view/Edit the  <?php echo $record->ReqNo ; ?> Requisition details"></i>&nbsp;&nbsp;&nbsp;<!-- </a> <a href='#' onclick = "DeleteRow(<?php echo $index ; ?>)" class="link" data-id="<?php echo $index ; ?>" data-userid="<?php echo $index ; ?>"  id="Del" ><span class="glyphicon glyphicon-trash"></span></a>-->
-									  <?php
-										//} else {?>	
-									<!--	<td>   <a  	data-toggle="tooltip"  href="#"><i class="fa fa-eye" data-toggle="tooltip" title="<?php echo $record->ReqNo; ?>  -  Click here to view Requistion details"></i>&nbsp;&nbsp;&nbsp;</a>  </td>  -->
-										 <?php  
-										//}?>	
-									</tr>
-									 <?php
-												$TotalCgst = $TotalCgst + $record->After_CGST;
-												$TotalSgst = $TotalSgst + $record->After_SGST;
-												$TotalIgst = $TotalIgst + $record->After_IGST;
-												$Totalotherallowance=$Totalotherallowance+ $record->otherallowance;
-												$TotalSummary = $TotalSummary + $record->TotalValue;
-																			   
-																				 
-												$TotalBasicAmount = $TotalBasicAmount + $record->BasicValue;
-												
-										}
-										?> <input type="hidden" name="txtRowCount" id="txtRowCount"  value="<?php echo $index;?>">
-										<?php 
-										   
-									}
-									?>
-							</tbody>
-						</table>
-					</div>
-				   
-					 
-						<div class="row" style="border: 1px solid">
-						<div class="col-md-12">
-							 
-								<div class="col-md-2">
-									 <label>Basic Amount In INR </label> 
-									 <?php
-											 $data = array('name' => 'txtTotBasicAmount','value' => set_value('txtTotBasicAmount',number_format($TotalBasicAmount, 2, '.', '')),'id'=>'txtTotBasicAmount',  'class' => 'form-control num'  ,'readonly' => 'true');
-											echo form_input($data);
-											?>   
-								</div>
-								<div class="col-md-2">
-									 <label>CGST In INR</label> 
-									 <?php
-											 $data = array('name' => 'txtTotCgst','value' => set_value('txtTotCgst',number_format($TotalCgst, 2, '.', '')),'id'=>'txtTotCgst',  'class' => 'form-control num'  ,'readonly' => 'true');
-											echo form_input($data);				
-											?>   
-								</div>
-							 
-							  
-								<div class="col-md-2">
-									 <label>SGST In INR</label> 
-									 <?php
-											 $data = array('name' => 'txtTotSgst','value' => set_value('txtTotSgst',number_format($TotalSgst, 2, '.', '')),'id'=>'txtTotSgst',  'class' => 'form-control num'  ,'readonly' => 'true');
-											echo form_input($data);				
-											?>   
-								</div>
-								<div class="col-md-2">
-									<label>IGST In INR</label> 
-									<?php
-											 $data = array('name' => 'txtTotIgst','value' => set_value('txtTotIgst',number_format($TotalIgst, 2, '.', '')),'id'=>'txtTotIgst',  'class' => 'form-control num'   ,'readonly' => 'true');
-											echo form_input($data);
-											?>   
-								</div>
-							 
-					<div class="col-md-2">
-							<label >Other Allowances  In INR </label>							
-								<?php
-								 $data = array('name' => 'ToatalOtherAllowances','value' => set_value('ToatalOtherAllowances',number_format($Totalotherallowance, 2, '.', '')),'id'=>'ToatalOtherAllowances',  'class' => 'form-control num'  ,'readonly' => 'true');
-								echo form_input($data);
-								?>   
-									
-							</div> 							
-							<div class="col-md-2">
-							<label >Total Order Value  In INR </label>	
-								<input type="hidden" name="preTotalordervalue" value="<?php echo $TotalSummary;?>">
-								<?php
-								 $data = array('name' => 'txtTotalOrderValueSummary','value' => set_value('txtTotalOrderValueSummary',number_format($TotalSummary, 2, '.', '')),'id'=>'txtTotalOrderValueSummary',  'class' => 'form-control num'  ,'readonly' => 'true');
-								echo form_input($data);
-								?>   
-									
-							</div> 
-						 
-						</div>
-					 
-						
-						<div class="col-md-12">
-							<div class="col-md-12">
-								<label>Scope Of Work</label>	<?php
-									 $data = array('name' => 'ScopeofWork','value' => set_value('ScopeofWork',$ServiceDescription),'id'=>'ScopeofWork',  'class' => 'form-control', 'rows' => '10', 'cols' => '40' );
-									echo form_textarea($data);
-									?>  
-							</div>
-							
-						</div>
-						<div class="col-md-12">
-							<div class="row"><br/>
-								<div align="right" style="padding-right:10px">
-								<input type="hidden" name="txtPONO" id="txtPONO"  value="<?php  echo $PONO; ?>"/> 
-								<input type="hidden" name="txtStatus" id="txtStatus" /> 		   
-								<input type="hidden" name="txtDeletedRow" id="txtDeletedRow" />  
-								
-								<!-- <a class="btn btn-primary Save"  ID="Save" onclick="Save(0)" >&nbsp;&nbsp;<span class="bold">Save</span></a> -->
-								<a class="btn btn-primary Save"  ID="Submit" onclick="Save()" >&nbsp;&nbsp;<span class="bold">Submit</span></a> 
-								<input type="reset" class="btn btn-primary" value="Reset">
-								
-								
-								</div><br/>
-						   </div>
-						</div>
-						<br/>
-					 </div><br/> 
-					<div class="col-md-12">
-					   <div class="col-md-8">
-					   <div class="row">
-							<div class="col-md-2"><label>Request On</label></div>
-							<div class="col-md-4">
-																  
-								  <?php
-											 $data = array('name' => 'Requeston','value' => set_value('Requeston',$Reqon),'id'=>'Requeston',  'class' => 'form-control num' ,'required' => 'true','readonly' => 'true');
-											echo form_input($data);
-											?>   
-							</div>
-							</div><br/>
-							 <div class="row">
-							 <div class="col-md-2"><label>Request By</label></div>
-							<div class="col-md-4"> 							  
-								  <?php
-									 $data = array('name' => 'RequestBy','value' => set_value('RequestBy', $RequesterName),'id'=>'RequestBy',  'class' => 'form-control' ,'required' => 'true','readonly' => 'true');
-									echo form_input($data);
-									?> 
-							</div>
-							</div><br/>
-							  
-							 <div class="row"><div class="col-md-2"><label>Status</label></div>
-							<div class="col-md-4"> 							  
-								  <?php
-								  
-                                     $data = array('name' => 'Status','value' => set_value('Status',$StatusName),'id'=>'Status',  'class' => 'form-control' ,'readonly' => 'true');
-                                    echo form_input($data);
-								?>
-							</div><br/>
-						</div>
-						</div>
-		</div>
-					 </div>
-					</div>
-
-</div>
-		</div>
-	</section>
-</div>
-<script type="text/html" id="ServiceList">
-<tr  id="<%=index%>">
-<td align="left"><%=index%></td>
- <td align="left"><%=ReqNo%></td>
- <td align="left"><%=MaterialCode%></td>
-  <td align="left"><%=MaterialName%></td>
-  <td align="left"><%=Quantity%></td> 
-  <td align="left"><%=UOM%></td>
-   <td align="left"><%=Rate%></td>
-    <td align="left"><%=BasicAmount%></td>
-	<td align="left"><%=Taxvalue%></td>
-	<td align="left"><%=TotalValue%></td>
-<td align="left"><%=ActualQuantity%></td>
-<td align="left"><%=ReceivedQuantity%></td>
-<td align="left"><%=PendingQuantity%></td>
-	
-   <td>
-                          <a    data-target='#EDITSERVICE'	data-id="<%=index%>" data-userid="<%=index%>" data-toggle="modal" href="#EDITSERVICE"><i class="fa fa-pencil" data-toggle="tooltip" title="Click here to view/Edit the  <%=ReqNo%> Requisition details"></i>&nbsp;&nbsp;&nbsp;</a> <a href='#' onclick = "DeleteRow(<%=index%>)" class="link" data-id="<%=index%>" data-userid="<%=index%>"  id="Del" ><span class="glyphicon glyphicon-trash"></span></a>
-						 
-						  
-                      </td>
-</tr>
-
-</script>
-<script>
-var index     = $('#txtRowCount').val();;
-var userid  = '';
- var SelectedMaterialCode = [];
- var CollIndex = 0;
-  var SelectedMaterialList = {
-    Mat: []
-};
-
-
-
-
-$("#EDITSERVICE").on("shown.bs.modal", function(e) {
-
-		userid = $(e.relatedTarget).data('userid');
-	
-		var tr= document.getElementById(userid);
-		var cellval = tr.cells;
-		var id= $('#Reqnumber'+userid).val();
-		
-		$('#EditReqNo').val($('#Reqnumber'+userid).val());
-		$('#EditdeptName').val($('#departmentName'+userid).val());
-		$("#EditCostCenter").val($('#costCode'+userid).val());
-		$('#EditAvlBudAmt').val($('#AvilBudget'+userid).val());
-		$('#EdittxtSpcialInstruction').val($('#servicematerialdescription'+userid).val());
-		$('#EditItemName').val($('#materialName'+userid).val());
-		$('#EditUOM').val($('#uom'+userid).val());
-		$('#EditQuantity').val($('#quantity'+userid).val());
-		RequistQuantity = $('#quantity'+userid).val();
-		$('#EditRate').val($('#itemRate'+userid).val());
-		$('#txtEditBasicValue').val(cellval[7].innerHTML);
-		$('#EditCgst').val($('#Cgst'+userid).val());
-		$('#EditSgst').val($('#Sgst'+userid).val());
-		$('#EditIgst').val($('#Igst'+userid).val());
-		$('#EditAfterCgst').val($('#AfterCgst'+userid).val());
-		$('#EditAfterSgst').val($('#AfterSgst'+userid).val());
-		$('#EditAfterIgst').val($('#AfterIgst'+userid).val());
-		$('#otherallowance').val($('#otherallowance'+userid).val());
-		
-		  if($('#FrequencyValue'+userid).val()==1){
-                    $('#EditFrequency').val($('#Frequency'+userid).val());
-                     $("#EditFrequencyNo").val(1);
-                   }
-		else{
-                    $('#EditFrequency').val($('#Frequency'+userid).val()+'-'+$('#FrequencyNo'+userid).val());
-                    $("#EditFrequencyNo").val($('#FrequencyValue'+userid).val());
-                     }
-
-		$('#EditTotalOrderValue').val(cellval[9].innerHTML);
-		
-		RequistQuantity = $('#quantity'+userid).val();
-		
-		
-		  
-		$("#EditMaterialCode").empty();
-		var Material = <?php echo json_encode($MaterialList, JSON_PRETTY_PRINT) ?>;
-		 // For Binding Material list center for the selected Requistion Number	
-		 
-		$("#EditMaterialCode").append( $('<option></option>').val($('#materialCode'+userid).val()).html($('#materialCode'+userid).val() + "-" + $('#materialName'+userid).val()  ) );
-		
-		var isAdded = "0";
-		 for(i=0;i<Material.length;i++)
-		{
-		$.each(Material[i], function(idx, obj) {
-			
-				if(obj.ReqNo === id )
-				{
-								   
-						$.each(SelectedMaterialList.Mat, function(idx1, el){															
-							if (id == el.ReqNo )
-							{
-								
-								if(el.materialCode == obj.MaterialCode)
-								{
-									
-										isAdded  = "1";
-										return false;																		
-								}
-								else
-								{
-									isAdded  = "0";
-								}
-								
-							}
-												
-					
-					});
-					
-					
-						if(isAdded  == "0")
-						{
-							
-							$("#EditMaterialCode").append( $('<option></option>').val(obj.MaterialCode).html(obj.MaterialCode + "-" + obj.MaterialName));
-						}
-												
-				}
-			
-			
-		});
-		}
-	   
-});
-
-
-
- $('.EditService').click(function(){
-         
-	
-        if( validateEditServiceTax())
-        {
-          		//alert('worked');
-            var CostCode =  $("#EditCostCenter").val();
-			 var AvilBudget = $('#EditAvlBudAmt').val();
-			var editMaterialCode =  $("#EditMaterialCode").val();
-			var editDescription = $("#EditItemName").val();		
-			var editUOM = $('#EditUOM').val();
-			var editQuantity = $('#EditQuantity').val();
-			var otherallowance=$('#otherallowance').val();
-			//alert(otherallowance);
-			 var itemRate = $("#EditRate").val();
-		     //alert(itemRate);
-		  var materialspecialinstruction=$('#EdittxtSpcialInstruction').val();
-		   var Cgst = $("#EditCgst").val();
-		  var AfterCgst = $("#EditAfterCgst").val();
-                  var Sgst = $("#EditSgst").val();
-                  var AfterSgst = $("#EditAfterSgst").val();
-                  var Igst = $("#EditIgst").val();
-                  var AfterIgst = $("#EditAfterIgst").val();
-		
-		  var Frequency=$("#EditFrequency").val();
-		  var FrequencyValue=$("#EditFrequencyNo").val();
-		  
-		  var TotalOrderValue = $("#EditTotalOrderValue ").val();
-		 
-		  
-			var basicval = $("#txtEditBasicValue").val();
-	
-			var TotalTaxValue = calculateEditTaxValue();	
-			
-		
-		 
-            var tr= document.getElementById(userid);
-			var cellval = tr.cells;   
-			
-			   cellval[2].innerHTML = editMaterialCode;	
-			cellval[3].innerHTML = editDescription;			
-			cellval[4].innerHTML = editQuantity;
-			cellval[5].innerHTML =editUOM;
-			cellval[6].innerHTML =parseFloat(itemRate).toFixed(2);
-			cellval[7].innerHTML =parseFloat(basicval).toFixed(2);
-			cellval[8].innerHTML =parseFloat(TotalTaxValue).toFixed(2);
-			cellval[9].innerHTML =parseFloat(TotalOrderValue).toFixed(2);
-					
-			
-			$('#materialCode'+userid).val(editMaterialCode);
-			$('#materialName'+userid).val(editDescription);
-			$('#uom'+userid).val(editUOM);
-			$('#CostCode'+userid).val(CostCode);
-			$('#quantity'+userid).val(editQuantity);
-                        $('#itemRate'+userid).val(itemRate);
-						$('#servicematerialdescription'+userid).val(materialspecialinstruction);
-			$('#Cgst'+userid).val(Cgst);
-                        $('#AfterCgst'+userid).val(AfterCgst);
-			$('#Sgst'+userid).val(Sgst);
-			$('#AfterSgst'+userid).val(AfterSgst);	
-			$('#Igst'+userid).val(Igst);
-			$('#AfterIgst'+userid).val(AfterIgst);
-			$('#otherallowance'+userid).val(otherallowance);
-			$('#TotalOrderValue'+userid).val(TotalOrderValue);			
-		     populateValueMainFormForEditServiceTax();	 
-      }
-    
- });
- 
-
-
-function populateValueMainFormForEditServiceTax()
-{
-	  
-		var rows =  document.getElementById('ServiceTable').rows.length;
-       
-		var TotCgst = 0;
-		var TotSgst = 0;
-		var TotIgst = 0;
-	    var otherallowance=0;
-		var TotSummary = 0;
-		var TotBasicAmout = 0;
-                var i = 0;
-                 do {
-		   i += 1;
-		   var tr= document.getElementById(i);
-			 //alert(tr);
-			 if(tr != null)
-			 {
-			 cells = tr.getElementsByTagName('td');
-					
-			
-		     var rowid = cells[0].innerHTML;
-			
-		var AfterCgst = $('#AfterCgst'+rowid).val() == '' ? '0.00' : $('#AfterCgst'+rowid).val();
-		var AfterSgst = $('#AfterSgst'+rowid).val() == '' ? '0.00' : $('#AfterSgst'+rowid).val();
-		var AfterIgst = $('#AfterIgst'+rowid).val() == '' ? '0.00' : $('#AfterIgst'+rowid).val();
-		var newotherallowance = $('#otherallowance'+rowid).val() == '' ? '0.00' : $('#otherallowance'+rowid).val();
-		var TotalVal =$('#TotalOrderValue'+rowid).val() == '' ? '0.00' : $('#TotalOrderValue'+rowid).val();
-		
-		var Quantity = $('#quantity'+rowid).val() == '' ? '0.00' : $('#quantity'+rowid).val();
-		var ItemRate = $('#itemRate'+rowid).val() == '' ? '0.00' : $('#itemRate'+rowid).val();
-                var FrequencyValue = $('#FrequencyValue'+rowid).val() == '' ? '1.00' : $('#FrequencyValue'+rowid).val();	
-		var BasicVal = parseFloat(Quantity) * parseFloat(ItemRate) *  parseFloat(FrequencyValue);
-		
-		TotCgst = parseFloat(TotCgst) + parseFloat(AfterCgst);
-		TotSgst = parseFloat(TotSgst) + parseFloat(AfterSgst);
-		TotIgst = parseFloat(TotIgst) + parseFloat(AfterIgst);
-		otherallowance=parseFloat(otherallowance)+parseFloat(newotherallowance);
-		TotSummary = parseFloat(TotSummary) + parseFloat(TotalVal);
-		TotBasicAmout = parseFloat(TotBasicAmout) + parseFloat(BasicVal);
-		
-		}    
-			
-		
-            }		while (i < rows);  	
-
-		$('#txtTotBasicAmount').val(parseFloat(TotBasicAmout).toFixed(2) );
-		$('#txtTotCgst').val(parseFloat(TotCgst).toFixed(2) );
-		$('#txtTotSgst').val(parseFloat(TotSgst).toFixed(2) );
-		$('#txtTotIgst').val(parseFloat(TotIgst).toFixed(2) );
-		$('#ToatalOtherAllowances').val(parseFloat(otherallowance).toFixed(2) );
-		$('#txtTotalOrderValueSummary').val(parseFloat(TotSummary).toFixed(2) );
-		
-}
-
-function calculateEditTaxValue()
- {
-	var Cgst = parseFloat($('#EditAfterCgst').val());
-	var Sgst = parseFloat($('#EditAfterSgst').val());
-	var Igst = parseFloat($('#EditAfterIgst').val());
-	
-  
-	var TottaxAmt = Cgst + Sgst + Igst;
-	return parseFloat(TottaxAmt).toFixed(2); 
- }
-function clearServiceModalFields()
-{
-	// To reset the Modal controls
-	$('#ReqNo').val('0'); 	
-	$('#deptName').val('');	
-	$('#CostCenter').val("0");
-	$('#AvlBudAmt').val('');
-	$('#MaterialCode').val("0")	;
-	$("#ItemName").val('');		
-	$('#UOM').val(''); 
-	$('#Quantity').val('');       
-	$("#Rate").val('');			 
-
-	$("#txtBasicValue").val('');
-	$("#AfterCgst").val(0);
-	$("#AfterSgst").val(0);
-	$("#AfterIgst").val(0);
-	$("#Cgst").val(0);
-	$("#Sgst").val(0);
-	$("#Igst").val(0);
-	$("#TotalOrderValue ").val('');
-	$("#Frequency").val('');
-}
-var DeletedMaterialCode='';
-var DeletedMaterialName='';
-function DeleteRow(rowid)
-{
-
-	   var id = [];
-	   var DelRows  = $('#txtDeletedRow').val();
-	  
-	   var tr = document.getElementById(rowid);
-	  
-	   var MaterialCode = $('#materialCode'+rowid).val();
-	   var LineItemNo =$('#LineItemNo'+rowid).val();
-	   var ReqNo =$('#Reqnumber'+rowid).val();
-	   var POType ='<?php echo SERVICE ?>';
-		id[0]= LineItemNo;
-	    id[1]= ReqNo;
-		id[2]= MaterialCode;
-		id[3]= POType;
-		   
-
-	   var answer = confirm(" Do you want to delete the Item from the List?")
-		if (answer) 
-		{ 			
-			populateValueMainFormForDeleteItem(rowid);
-			tr.parentNode.removeChild(tr);
-			
-			var removeItem = $('#materialCode'+rowid).val();
-
-		var materialCode = $('#materialCode'+rowid).val();
-              
-
-			 var removeItem = $('#materialCode'+rowid).val();  
-		 var Material = <?php echo json_encode($MaterialList, JSON_PRETTY_PRINT) ?>;
- for(i=0;i<Material.length;i++)
-		{
-		$.each(Material[i], function (index, value) {
-
-
-      	if (value.MaterialCode==materialCode) {
-
-
-      		                                  //  $("#MaterialCode").append( $('<option></option>').val(value.MaterialCode).html(value.MaterialCode + "-" + value.MaterialName) );
-                      DeletedMaterialCode = $('#materialCode'+rowid).val();
-                    DeletedMaterialName = $('#materialName'+rowid).val();
-      	}
-});
-}
-		
-		  
-		   SelectedMaterialCode.splice( SelectedMaterialCode.indexOf('removeItem'), 1 );
-		   var x = <?php echo json_encode($POItem, JSON_PRETTY_PRINT) ?>; 
-		  
-		   var result = '0';
-		   $.each(x, function(idx, obj) {
-			 
-						if(obj.LineItemNo === LineItemNo)
-						{			 
-						   result = '1';
-						   return  false;	
-						}
-						
-					   });
-					   
-					  // alert(result);
-			if(result == '0')
-			{
-				var DelRows  = $('#txtDeletedRow').val();
-				//tr.parentNode.removeChild(tr);
-				if(DelRows != '')
-					{
-					DelRows = DelRows + ":" + rowid;
-					}
-				else
-					{
-					DelRows=  "0" + ":" + rowid;
-					}
-				$('#txtDeletedRow').val(DelRows);
-			}
-           	// To delete the value from Tables
-			else  if(result == '1')
-			{
-				var DelRows  = $('#txtDeletedRow').val();
-				//tr.parentNode.removeChild(tr);
-				if(DelRows != '')
-					{
-					DelRows = DelRows + ":" + rowid;
-					}
-				else
-					{
-					DelRows=  "0" + ":" + rowid;
-					}
-				$('#txtDeletedRow').val(DelRows);				
-					
-			 $.ajax({ 
-			data:{id:id},
-			type:"POST",
-			url:"<?php echo base_url() ?>purchaseorder/DeletePODetails", 
-			success:function(data) {
-			if(data)
-			{
-				$('#content').loader('hide'); 
-				alert(data);			
-			}
-			else
-			{
-				alert("Error");	
-			}			
-		
-		}});  
-			}		   
-		
-		  // populateValueMainFormForDeleteItem(rowid);
-		  
-		}
-       	
-} 
-function populateValueMainFormForDeleteItem(rowid)
-{
-	  
-		
-       // alert(rows);
-		var TotCgst = $('#txtTotCgst').val();
-		var TotSgst = $('#txtTotSgst').val();
-		var TotIgst = $('#txtTotIgst').val();
-		
-		var TotSummary = $('#txtTotalOrderValueSummary').val();
-		var TotBasicAmout = $('#txtTotBasicAmount').val();
-		
-	  
-			
-		var AfterCgst = $('#AfterCgst'+rowid).val() == '' ? '0.00' : $('#AfterCgst'+rowid).val();
-		var AfterSgst = $('#AfterSgst'+rowid).val() == '' ? '0.00' : $('#AfterSgst'+rowid).val();
-		var AfterIgst = $('#AfterIgst'+rowid).val() == '' ? '0.00' : $('#AfterIgst'+rowid).val();
-		
-		var TotalVal =$('#TotalOrderValue'+rowid).val() == '' ? '0.00' : $('#TotalOrderValue'+rowid).val();
-		
-		var Quantity = $('#quantity'+rowid).val() == '' ? '0.00' : $('#quantity'+rowid).val();
-		var ItemRate = $('#itemRate'+rowid).val() == '' ? '0.00' : $('#itemRate'+rowid).val();	
-                 var FrequencyValue = $('#FrequencyValue'+rowid).val() == '' ? '1.00' : $('#FrequencyValue'+rowid).val();
-		var BasicVal = parseFloat(Quantity) * parseFloat(ItemRate) * parseFloat(FrequencyValue);
-		//alert(TotalVal);
-		
-		TotCgst = parseFloat(TotCgst) -  parseFloat(AfterCgst);
-		TotSgst = parseFloat(TotSgst) - parseFloat(AfterSgst);
-		TotIgst = parseFloat(TotIgst) - parseFloat(AfterIgst);
-		
-		TotSummary = parseFloat(TotSummary) - parseFloat(TotalVal);
-		TotBasicAmout = parseFloat(TotBasicAmout) - parseFloat(BasicVal);
-		
-			
-		$('#txtTotBasicAmount').val(parseFloat(TotBasicAmout).toFixed(2) );
-		$('#txtTotCgst').val(parseFloat(TotCgst).toFixed(2) );
-		$('#txtTotSgst').val(parseFloat(TotSgst).toFixed(2) );
-		$('#txtTotIgst').val(parseFloat(TotIgst).toFixed(2) );
-		
-		$('#txtTotalOrderValueSummary').val(parseFloat(TotSummary).toFixed(2) );	
-
-		
-		
-}
-function validateServiceTax()
- {  
-
-	if($('#ReqNo').val() == "0")
-	{
-		alert('Please select the Requisition Number');
-		$('#ReqNo').focus();
-		return false;
-	}
-	else if($('#CostCenter').val() == "0")
-	{
-		alert('Please select the Cost center');
-		$('#CostCenter').focus();
-		return false;
-	}
-	else if($('#MaterialCode').val() == "0")
-	{
-		alert('Please select the Material Code');
-		$('#MaterialCode').focus();
-		return false;
-	}		
-	else if($('#Quantity').val() == '')
-	{
-		alert('Please Enter the Quantity value');
-		$('#Quantity').focus();
-		return false;
-	}
-	else if($('#Rate').val() == '')
-	{
-		alert('Please Enter the Rate of the Item');
-		$('#Rate').focus();
-		return false;
-	}
-	else if(ExceedQuantityCheck() ==  false)
-	{  
-		return false;
-	}
-	else if(ExceedBudget($('#TotalOrderValue').val(),$('#AvlBudAmt').val()) == false)
-	{
-		 $('#Rate').focus(); 
-				return false;
-	}
-	else
-	{
-		return true;
-	}
-		
- }
- function validateEditServiceTax()
- {  
-
-	if($('#EditCostCenter').val() == "0")
-	{
-		alert('Please select the Cost center');
-		$('#EditCostCenter').focus();
-		return false;
-	}
-	else if($('#EditMaterialCode').val() == "0")
-	{
-		alert('Please select the Material Code');
-		$('#EditMaterialCode').focus();
-		return false;
-	}		
-	else if($('#EditQuantity').val() == '')
-	{
-		alert('Please Enter the Quantity value');
-		$('#EditQuantity').focus();
-		return false;
-	}
-	else if($('#EditRate').val() == '')
-	{
-		alert('Please Enter the Rate of the Item');
-		$('#EditRate').focus();
-		return false;
-	}
-	// else if(EditExceedQuantityCheck() ==  false)
-	// {  
-		// return false;
-	// }
-	else if(ExceedBudget($('#EditTotalOrderValue').val(),$('#EditAvlBudAmt').val()) == false)
-	{
-		 $('#EditRate').focus(); 
-		 return false;
-	}
-	else
-	{
-		return true;
-	}
-		
- }
-//
-</script>
-<script>
-// $('#PaymentTerms').change(function() {
-	// var data=$('#PaymentTerms option:selected').text();
-	// $('#beforePaymentTermsText').val(data);
-  // alert( data );
-// });
-// </script>
-<script>
-
-function Save()
-{  
-//alert("worked");
-	stat = '<?php echo PO_CREATED; ?>';
-tinyMCE.triggerSave();
-var splinstr = $('#ScopeofWork').val();
-var deladd = $('#DeliveryAddr').val();
-$('#txtStatus').val(stat);
-
-
-//$('#SpcialInstruction').val(splinstr);
-$('#txtDeliveryAddress').val(deladd);
-
-	if(validate())
-		{ 
-	     	//alert('inside if');
-			$('#content').loader('show');
-		  $.ajax({ 
-			data:$('.ServicePO').serialize(),
-			type:"POST",
-			url:"<?php echo base_url() ?>amendmentpurchaseorder/UpdateAmendServicePurchaseOrder", 
-			success:function(data) {
-			if(data)
-			{
-				$('#content').loader('hide'); 
-				alert(data);
-				$('#txtRowCount').val('');
-				$('#txtDeletedRow').val('');
-				$('#txtStatus').val('');
-				$('#SpcialInstruction').val('');
-				$('#txtDeliveryAddress').val('')
-				window.location =	"amendmentpurchaseorder";
-			
-			}
-			else
-			{
-				$('#content').loader('hide'); 
-				alert("Error");	
-			}			
-		
-		}
-  
-});
-			
-
-}
-}
-// this function is used to clear data changing schedule option
-$('#Scheduleby').change(function(){
-           
-             $("#Deliverydt").datepicker({
-            minDate : 'now',
-            dateFormat: 'mm/dd/yy',changeMonth: true, changeYear: true,yearRange: '0:+10'
-        });
-		
-                
-            });
-            $('#Deliverydt').change(function(){
-            
-           $('#Scheduleby').val('');
-                
-            });
-
-
-
-
-function calculateCgstTax(varBasicValue,Cgst)
- {
-	
-		 var basicValue = parseFloat(varBasicValue);
-		var Cgst = parseFloat(Cgst);	 
-		 var ServiceTaxValue = 0.0;  
-		 
-		 ServiceTaxValue = <?php echo SERVICETAX_CGST; ?>;
-		
-	     var TAXval =  parseFloat(ServiceTaxValue).toFixed(2);
-	 
-		return   TAXval;//  $('#AfterServiceTax').val(TAXval); 
-		 
- }
-function calculateSgstTax(varBasicValue,Sgst)
- {
-	
-		 var basicValue = parseFloat(varBasicValue);
-		var Sgst = parseFloat(Sgst);	 
-		 var ServiceTaxValue = 0.0;  
-		 
-		 ServiceTaxValue = <?php echo SERVICETAX_SGST; ?>;
-		
-	     var TAXval =  parseFloat(ServiceTaxValue).toFixed(2);
-	 
-		return   TAXval;//  $('#AfterServiceTax').val(TAXval); 
-		 
- }
-function calculateIgstTax(varBasicValue,Igst)
- {
-	
-		 var basicValue = parseFloat(varBasicValue);
-		var Igst = parseFloat(Igst);	 
-		 var ServiceTaxValue = 0.0;  
-		 
-		 ServiceTaxValue = <?php echo SERVICETAX_IGST; ?>;
-		
-	     var TAXval =  parseFloat(ServiceTaxValue).toFixed(2);
-	 
-		return   TAXval;//  $('#AfterServiceTax').val(TAXval); 
-		 
- }
-$("#PaymentTerms").change(function() { 
-                if ($('#PaymentTerms').val().trim()=='PT08')
-                {
-                     $('#otheroptiondiv').show();
-                }
-                else {
-                     $('#otheroptiondiv').hide();     
-                }
-            });
-</script>
\ No newline at end of file
diff --git a/application/views/editOldasset.php b/application/views/editasset.php
similarity index 99%
rename from application/views/editOldasset.php
rename to application/views/editasset.php
index befb3ad3..059e00a8 100644
--- a/application/views/editOldasset.php
+++ b/application/views/editasset.php
@@ -153,7 +153,7 @@ $(function() {
     <!-- Content Header (Page header) -->
     <section class="content-header">
       <h1>
-        <center>Siddharth Industries - Edit Asset Details-<?php echo $AssetCode ; ?></center>        
+        <center>Resico Industries - Edit Asset Details-<?php echo $AssetCode ; ?></center>        
       </h1>
     </section>
     
diff --git a/application/views/editrequisitionform.php~ b/application/views/editrequisitionform.php~
deleted file mode 100644
index 0a482937..00000000
--- a/application/views/editrequisitionform.php~
+++ /dev/null
@@ -1,1047 +0,0 @@
-
-<?php
-                $ReqNo = '';
-                $ReqType = '';
-                $Requestedby = '';
-                $FirstName ='';
-		$Designation ='';
-		$DepartmentName = '';
-		$Status = '';
-		$CostCenterCode = '';
-	 	$RowCount = '';
-                $serviceSchedule='';
-                $servicePeriod='';
-                $noOfService='';
-		
-if(!empty($ReqDetails))
-{
-
-    foreach ($ReqDetails as $Req)
-    {
-		$ReqNo = $Req->ReqNo;
-                $ReqType = $Req->ReqType;
-                $Requestedby = $Req->Requestedby;
-                $FirstName =$Req->FirstName;
-		$Designation =$Req->Designation;
-		$DepartmentName = $Req->DepartmentName;
-		$Status	 = 	$Req->Status;	
-		$CostCenterCode = $Req->CostCenterCode;	
-                 $serviceSchedule=$Req->Schedule_Type;
-
-                $servicePeriod=$Req->Service_Period;
-                $noOfService=$Req->NumberOfService;
-
-    }
-}
-
-
-?>
-   
-<script type="text/javascript">
-   window.onload = function()
-{
-    var serviceScheduleType  = '<?php echo $serviceSchedule; ?>';
-    if(serviceScheduleType != '')
-    {
-        if(serviceScheduleType!='Recurring'){
-         document.getElementById('DisplayScheduleDiv').style.display = 'block';
-        document.getElementById('ServicePeriodOption').style.display = 'none';
-        document.getElementById('NoServices').style.display = 'none';
-       
-          }
-       else{
-        document.getElementById('DisplayScheduleDiv').style.display = 'block';
-        document.getElementById('ServicePeriodOption').style.display = 'block';
-        document.getElementById('NoServices').style.display = 'block';
-      
-       }
-      
-        
-
-    }
-    else
-    {
-       document.getElementById('DisplayScheduleDiv').style.display = 'none';
-        document.getElementById('ServicePeriodOption').style.display = 'none';
-        document.getElementById('NoServices').style.display = 'none';
-  
-    }
-}
-</script>
-<div class="content-wrapper">
-    
- 
-	 <section class="content">
-	  
-	 <div>
-         <center><b><h2>Siddharth Industries - Edit Requisition Form</h2></b></center>
-         <div class="container-fluid">
-		  <div id="content"></div>
-		
-		   <?php
-                      $attributes = array('class' => 'form-label-left requistion ','name'  => 'requistion','id'  => 'requistion');
-                        
-                        echo form_open($this->config->base_url().'requisitionform/EditRequistion',$attributes); ?>
-	 <div class="row">
-	 <div class="col-md-12">
-	   <div class="row" align="right">
-		   <a class="btn btn-primary"  href="<?php echo base_url(); ?>Requisition" ID="cancel">&nbsp;&nbsp;<span class="bold">Back</span></a> 
-</div>
-		 <div class="col-md-3">
-		 <label>Request Type</label>
-			<div class="form-group">
-				  
-				<?php
-                                         $data = array('name' => 'RequestType','value' => set_value('RequestType',$ReqType),'id'=>'RequestType',  'class' => 'form-control' ,'readonly' => 'true');
-                                        echo form_input($data);
-										
-                                        ?>  
-										
-			 <input type="hidden" name="txtReqNo" id="txtReqNo"  value="<?php echo $ReqNo?>"/>	 
-			</div>
-		 </div>
-		 <div class="col-md-3">
-		 <label>Requested By</label>
-			<div class="form-group">
-			 
-				<?php
-                                         $data = array('name' => 'EmpID','value' => set_value('EmpID',$FirstName),'id'=>'EmpID',  'class' => 'form-control' ,'readonly' => 'true');
-                                        echo form_input($data);
-										
-                                        ?>  
-				 
-			</div>
-		 </div>
-		 <div class="col-md-3">
-		 <label>Department Name</label>
-		 	<div class="form-group">
-									<?php
-                                         $data = array('name' => 'DeptName','value' => set_value('DeptName',$DepartmentName),'id'=>'DeptName',  'class' => 'form-control' ,'readonly' => 'true');
-                                        echo form_input($data);
-                                        ?>   
-                                </div>
-		 </div>
-		 <div class="col-md-3">
-		 <label>Designation</label>
-		 	<div class="form-group">
-									<?php
-                                         $data = array('name' => 'Designation','value' => set_value('Designation',$Designation),'id'=>'Designation',  'class' => 'form-control' ,'readonly' => 'true');
-                                        echo form_input($data);
-                                        ?>   
-                                </div>
-		 </div>
-	 </div>
-	 <div class="col-md-12">
-	
-	  <div class="col-md-3">
-		 <label>Cost Center Name</label>
-		 
-				<div class="form-group">
-									 <?php
-				$Costs = array($CostCenterCode=>$CostCenterCode);
-				//print_r(  $options);		
-												
-					if(!empty($CostCenter))
-										{
-									    foreach ($CostCenter as $SID):
-                                         // echo $SID->ConfigValue;
-									   	  $Costs[$SID->CostCenterCode] =  $SID->CostCenterCode .'-'. $SID->CostCenterName ;
-
-										endforeach;
-											
-										}
-				echo form_dropdown('CostCenter', $Costs,set_value('CostCenter'),'id="CostCenter"' ,'class = "form-control"');
-
-		?> 
-                                </div> 
-			</div>
-		  
-	 <div class="col-md-3">
-		 <label>Available Budget Amount</label>&nbsp;<img id="AlertImg"  src="<?php echo base_url(); ?>assets/dist/img/red.png" alt="your image" width="25px"  style="display:none"/>
-		 	<div class="form-group">
-				<?php
-					 $data = array('name' => 'AvlBudgetAmount','value' => set_value('AvlBudgetAmount'),'id'=>'AvlBudgetAmount',  'class' => 'form-control' ,'readonly' => 'true');
-					echo form_input($data);
-					?>  
-					
-			</div>
-			
-		 </div>
-                <div class="col-md-3" id="DisplayScheduleDiv" style="display:none;">
-		 <label>Select Service Schedule Type</label>
-		 	<div class="form-group">
-				 <?php
-				$Schdule =array("One Time", "Recurring");
-					
-												
-					if(!empty($Schdule))
-                                           
-										{
-                                                                      
-                                                                         foreach ($Schdule as $seletedSch):
-                                                                         if($serviceSchedule==$seletedSch){
-                                                                            $SchType[$seletedSch] =  $seletedSch ;
-                                                                            }
-                                                                            endforeach;
-									    foreach ($Schdule as $Sch):
-                                                                            if($serviceSchedule!=$Sch){
-									   	  $SchType[$Sch] =  $Sch ;
-                                                                                  }
-										endforeach;
-											
-										}
-				echo form_dropdown('ScheduleType', $SchType,set_value('ScheduleType'),'id="ScheduleType"' ,'class = "form-control"');
-
-		?>  
-			</div>
-		 </div>
-    <div class="col-md-3" id="ServicePeriodOption" style="display:none;">
-		 <label>Select Service Period Option</label>
-		 	<div class="form-group">
-				 <?php
-				
-					
-												
-                                                                            if(!empty($ServiceOption))
-										
-                                                                                	{
-                                                                                   foreach ($ServiceOption as $SerOptionsel):
-                                                                                 
-                                                                                 if($servicePeriod==$SerOptionsel->ConfigValue){
-                                                                                  
-									   	  $ServiceOptions[$SerOptionsel->ConfigValue] =  $SerOptionsel->ConfigValue;
-                                                                                  }
-										endforeach;
-									
-									    foreach ($ServiceOption as $SerOption):
-                                                                                 if($servicePeriod!=$SerOption->ConfigValue){
-									   	  $ServiceOptions[$SerOption->ConfigValue] =  $SerOption->ConfigValue;
-                                                                                  }
-										endforeach;
-											
-										}
-				echo form_dropdown('ServiceOptions', $ServiceOptions,set_value('ServiceOptions'),'id="ServiceOptions"' ,'class = "form-control"');
-
-		?>  
-			</div>
-		 </div>
-<div class="col-md-3" id="NoServices" style="display:none;">
-		 <label>Number of Services</label>
-		 	<div class="form-group">
-				 <?php
-                                     
-                                                            $data = array('name' => 'ServiceNo','value' => set_value('ServiceNo',$noOfService),'id'=>'ServiceNo',  'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);');
-                                                            echo form_input($data);
-                                                            ?>
-			</div>
-		 </div>
-		 	
-	 </div>
-	 
-	 </div>
-         </div>
-		
-          <div class="container-fluid">    
-  <table class="table table-bordered" style="border:1px solid #333">
-  <div align="right" style="padding-right:10px">
-<div align="right">
-<?php if(count($MaterialCode) != 0)
-{ 
-?>
-  <a data-toggle="modal" data-target="#myModal1"  class="btn btn-primary">Add Line Item</a>
-<?php } ?>
-  <div class="modal fade" id="myModal1" role="dialog">
-		<div class="modal-dialog">
-		
-		  <!-- Modal content-->
-		  <div class="modal-content">
-			<div class="modal-header">
-			  <button type="button" class="close" data-dismiss="modal">&times;</button>
-			  <center><h4>Add Line Item </h4></center>				
-			</div>
-			<div align="left"> 
-			 
-			 <div class="col-md-6">
-				<label>Material Code</label>
-					<div >
-						 <?php
-						$options = array("0"=>'Material Code');     
-						//print_r(  $options);
-						
-						if(!empty($MaterialCode))
-						{
-						foreach ($MaterialCode as $MID):
-						  
-					   
-						  $options[$MID->MaterialCode] =  $MID->MaterialCode.' '.' - '.' '.$MID->MaterialName;
-
-						endforeach;
-						}										
-			
-						echo form_dropdown('drpMaterial', $options,set_value('drpMaterial'),'id="drpMaterial"' ,'class="form-control"');
-
-						?>						 
-					</div>
-			</div>
-
-			<div class="col-md-6">
-				<label>Description</label>
-				<div class="form-group">
-						<?php
-						 $data = array('name' => 'Description','value' => set_value('Description'),'id'=>'Description',  'class' => 'form-control','readonly' => 'true' );
-						echo form_input($data);
-						?>   
-				</div>
-			</div>
-			<div class="col-md-6">
-				<label>UOM</label>
-					<div>
-					<?php
-						 $data = array('name' => 'UOM','value' => set_value('UOM'),'id'=>'UOM',  'class' => 'form-control','readonly' => 'true' );
-						echo form_input($data);
-						?>  
-									 
-					</div>
-			</div>
-			<div class="col-md-6">
-				<label>Quantity</label>
-					<div class="form-group">
-								<?php
-						 $data = array('name' => 'Quantity','value' => set_value('Quantity'),'id'=>'Quantity',  'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event)','maxlength'=>'20');
-						echo form_input($data);
-						?>   
-					</div>
-			</div>
-			
-		 
-			</div>
-			
-			<div class="modal-footer">
-			<a class="btn btn-info font addClick"  ID="addClick"  ><i class="fa fa-plus"></i>&nbsp;&nbsp;<span 	class="bold">Add</span></a>
-						<a  class="btn btn-info" data-dismiss="modal"  value="Cancel">cancel</a>
-			</div>
-		  </div>
-						  
-						</div>
-					  </div>
-   
-  
-  </div><br/> <div class="modal fade" id="EditItem" role="dialog">
-		<div class="modal-dialog">
-		
-		  <!-- Modal content-->
-		  <div class="modal-content">
-			<div class="modal-header">
-			  <button type="button" class="close" data-dismiss="modal">&times;</button>
-			  <center><h4>Edit Line Item </h4></center>				
-			</div>
-			<div align="left"> 
-			 
-			 <div class="col-md-6">
-				<label>Material Code</label>
-					<div >						
-							<?php
-                                         $data = array('name' => 'EditMaterialCode', 'value' => set_value('EditMaterialCode'),'id'=>'EditMaterialCode', 'class' => 'form-control','readonly'=>'true');
-                                        echo form_input($data);
-                                        ?>  						
-					</div>
-			</div>
-
-			<div class="col-md-6">
-				<label>Description</label>
-				<div class="form-group">
-						<?php
-						 $data = array('name' => 'EditDescription','value' => set_value('EditDescription'),'id'=>'EditDescription',  'class' => 'form-control','readonly' => 'true' );
-						echo form_input($data);
-						?>   
-				</div>
-			</div>
-			<div class="col-md-6">
-				<label>UOM</label>
-					<div>
-					<?php
-						 $data = array('name' => 'EditUOM','value' => set_value('EditUOM'),'id'=>'EditUOM',  'class' => 'form-control','readonly' => 'true' );
-						echo form_input($data);
-						?>  
-									 
-					</div>
-			</div>
-			<div class="col-md-6">
-				<label>Quantity</label>
-					<div class="form-group">
-								<?php
-						 $data = array('name' => 'EditQuantity','value' => set_value('EditQuantity'),'id'=>'EditQuantity',  'class' => 'form-control','onkeypress'=>'return isNumberKey(event)','maxlength'=>'20');
-						echo form_input($data);
-						?>   
-					</div>
-			</div>
-			
-		 
-			</div>
-			
-			<div class="modal-footer">
-			<a class="btn btn-info font EditClick"  ID="EditClick"  ><i class="fa fa-plus"></i>&nbsp;&nbsp;<span 	class="bold">Edit</span></a>
-						<a  class="btn btn-info" data-dismiss="modal"  value="Cancel">Cancel</a>
-			</div>
-		  </div>
-						  
-						</div>
-					  </div>
-   
-  
-  </div></br>
-  
-   <table id="Items" class="table table-bordered table-hover" style="background-color:#fff;font-size:12px;">
-                <thead style="background-color:#ddf">
-        <tr>
-        <th>SNo</th>
-        <th>Material Code</th>
-        <th>Material Name</th>
-        <th>Uom</th>
-		
-<th>RequestedQuantity</th>
-		<th>PoQuantity</th>
-		<th>Status</th>
-         <th>Action</th>
-      </tr>
-    </thead>
-    <tbody id="tempAppend">
-<?php
-                    if(!empty($LineItem))
-                    { 
-				        $index = 0;
-                        foreach($LineItem as $record)
-                        {	
-							$index = $index + 1;
-                    ?>
-							<tr  id="<?php echo $index ; ?>">
-							<td align="left"><?php echo $index ; ?></td> 
-							 <input type="hidden" name="<?php echo 'te'.$index ?>" id="<?php echo 'te'.$index ?>" value="<?php echo $record->MaterialCode ; ?>" />
-							 <input type="hidden" name="<?php echo 'te'.$index ?>" id="<?php echo 'tes'.$index ?>" value="<?php echo $record->Quantity ; ?>" />
-							   
-					<td align="left"><?php echo $record->MaterialCode ; ?></td>
-					<td align="left"><?php echo $record->MaterialName ; ?></td>
- 
-					<td align="left"><?php echo $record->UOM ; ?></td>
-  
-					<td align="left"><?php echo $record->Quantity ; ?></td>
-					<td align="left"><?php echo $record->POQTY ; ?></td>
-					<td align="left"><?php echo $record->StatusName ;?></td>
-						<td>
-                          <a   data-id="<?php echo $index ; ?>" data-userid="<?php echo $index ; ?>" data-target='#EditItem'	 data-toggle="modal" href="#EditItem"><i class="fa fa-pencil" data-toggle="tooltip" title="Click here to view/Edit the  <?php echo $record->MaterialCode ; ?> Material details"></i>&nbsp;&nbsp;&nbsp;</a> <a  onclick = "DeleteRow(<?php echo $index ; ?>)" class="link" data-id="<?php echo $record->MaterialCode  ; ?>" data-userid="<?php echo $index ; ?>"  id="Del" ><span class="glyphicon glyphicon-trash"></span></a>
-						 
-						  
-                      </td>
-</tr>
-						<?php $RowCount  = $index;  }
-						?>
-						  
-						<?php
-					}?>
-    </tbody>
-	
-  </table>
-         
- <div align="right" style="padding-right:10px">
-    <input type="hidden" name="txtStatus" id="txtStatus" />
-   <input type="hidden" name="txtDeletedRow" id="txtDeletedRow" />
-   <input type="hidden" name="txtRowCount" id="txtRowCount"  value="<?php echo $RowCount ; ?>"/>
-   <?php if($Status == REQ_DRAFT)
-   { ?>
-		<a class="btn btn-primary Save"  ID="Save" onclick="Save(0)" >&nbsp;&nbsp;<span class="bold">Save</span></a> 
-		<a class="btn btn-primary submit"  ID="submit" onclick="Save(1)" >&nbsp;&nbsp;<span class="bold">Submit</span></a> 
-		
-		<input type="reset" class="btn btn-primary">
-    <?php }
-	else if($Status == REQ_PENDING_APPROVAL)
-	{?>
-  <!--<a class="btn btn-primary"  ID="update" onclick="update()" >&nbsp;&nbsp;<span class="bold">Update</span></a> 
-  <a class="btn btn-primary"  href="<?php echo base_url(); ?>Requisition" ID="cancel">&nbsp;&nbsp;<span class="bold">Cancel</span></a> -->
-  <a class="btn btn-primary Save"  ID="submit" onclick="Save(1)" >&nbsp;&nbsp;<span class="bold">Update</span></a> 
-   <input type="reset" class="btn btn-primary">
-	<?php } ?>
-  
-  
-   
-  </div>
-         <br>
-	 </div>
-         </div>
-         
-        </section>
-</div>
-
-<script> 
-function isNumberKey(evt)
-       {
-          var charCode = (evt.which) ? evt.which : evt.keyCode;
-          if (charCode != 46 && charCode > 31 
-            && (charCode < 48 || charCode > 57))
-             return false;
-
-          return true;
-       }
-	
-$(function() {
-	
-	var j=0;
-	var ReqLineItem  = <?php echo json_encode($LineItem, JSON_PRETTY_PRINT) ?>;
-	$.each(ReqLineItem, function(idx, obj) {
-			
-				//$("#SupAddress").val(obj.Address);
-				j= j +1 ;
-			$('<input>').attr({
-			type: 'hidden',
-			id: 'MaterialCode' + j,
-			name: 'MaterialCode'+ j,
-			value:obj.MaterialCode
-			
-		}).appendTo('form');
-		
-		$('<input>').attr({
-			type: 'hidden',
-			id: 'Quantity' + j,	
-			name: 'Quantity'+ j,
-			value:obj.Quantity
-		}).appendTo('form');
-			
-		});
-	
-    $( ".datePicker" ).datepicker({ dateFormat: 'dd/mm/yy' });
-
-    //Initialize Select2 Elements
-    $(".select2").select2();
-	
-	var id = '<?php echo  $CostCenterCode?>';
-	var ReqType = '<?php echo  $ReqType?>';
-	$.ajax({ 
-			data:{id:id},
-			type:"POST",
-			url:"<?php echo base_url() ?>servicepurchaseorder/AvilBudgetAmount?ReqType="+ReqType, 
-			success:function(data) {
-			if(data)
-			{
-				$('#content').loader('hide'); 
-				$("#AvlBudgetAmount").val(parseFloat(data).toFixed(2));
-				
-				if(parseFloat($("#AvlBudgetAmount").val()) <= 0)
-				{
-					$('#AlertImg').removeAttr("style");					
-				}
-				else
-				{
-					 $('#AlertImg').attr("style","display:none;");
-				}
-			}
-			else
-			{
-				$('#content').loader('hide'); 
-				alert("Error");	
-			}
-			}			
-			  
-			});	
- 
-
-$('#CostCenter').change(function() {
-    
- var id = $('#CostCenter').val();
- $("#AvlBudgetAmount").val('');
- var ReqType = $('#RequestType').val();
-		if(id != '-1')
-		{
-			$('#content').loader('show');
-		  $.ajax({ 
-			data:{id:id},
-			type:"POST",
-			url:"<?php echo base_url() ?>servicepurchaseorder/AvilBudgetAmount?ReqType="+ReqType, 
-			success:function(data) {
-			if(data)
-			{
-				$('#content').loader('hide'); 
-				$("#AvlBudgetAmount").val(parseFloat(data).toFixed(2));
-				
-				if(parseFloat($("#AvlBudgetAmount").val()) <= 0)
-				{
-					$('#AlertImg').removeAttr("style");					
-				}
-				else
-				{
-					 $('#AlertImg').attr("style","display:none;");
-				}
-			}
-			else
-			{
-				$('#content').loader('hide'); 
-				alert("Error");	
-			}
-			}			
-			  
-			});	
-			
-		}
-		else
-		{
-			alert('Please select the Employee details');
-			return false;
-		}
-  
-});
-	$('#RequestType').change(function() 
-	{
-		
-	$('#txtRowCount').val('');
-	$('#txtDeletedRow').val('');	
-    $("#Description").val('');
-	$("#UOM").val('');
-	removeHiddenRows($('#Items').find('tr').length);
-	var id = $('#RequestType').val(); 
-
-		if(id != '-1')
-		{
-			$('#content').loader('show');
-
-			$.ajax({
-			data:{id:id},
-			dataType: 'json',
-			type:"POST",
-			url:"<?php echo base_url();?>requisitionform/getMaterialCode",
-			success:function(json) {		
-			$('#content').loader('hide');
-				
-				$("#drpMaterial").empty();
-				$("#drpMaterial").append(json.Material);
-               // $("#Description").val(json.MaterialName);	
-				//$("#UOM").val(json.UOM);					
-		      }
-			  
-			});	
-			//$('#content').loader('hide');
-		}
-		else
-		{
-			alert('Please select the RequestType');
-			return false;
-		}
-  
-});
-
-$('#drpMaterial').change(function() {
-    
-	 var id = $('#drpMaterial').val(); 
-
-$("#Description").val('');	
-$("#UOM").val('');	
-		if(id != '-1')
-		{
-			$('#content').loader('show');
-
-			$.ajax({
-			data:{id:id},
-			dataType: 'json',
-			type:"POST",
-			url:"<?php echo base_url();?>requisitionform/getMaterialDetails",
-			success:function(json) {		
-			$('#content').loader('hide');
-			//alert(json.MatDetail);
-					$("#Description").val(json.MatDetail[0]['MaterialName']);	
-					$("#UOM").val(json.MatDetail[0]['UOM']);									
-		      }
-			  
-			});	
-			//$('#content').loader('hide');
-		}
-		else
-		{
-			alert('Please select the RequestType');
-			return false;
-		}
-	
-	
-});
-});
-	</script>
-	<script type="text/html" id="tempList">
-<tr  id="<%=index%>">
-<td align="left"><%=index%></td>
- <td align="left"><%=MaterialCode%></td>
- 
-  <td align="left"><%=MaterialName%></td>
-  
-  <td align="left"><%=UOM%></td>
-
-  <td align="left"><%=Quantity%></td> 
-   <td align="left">0.00</td> 
-    <td align="left">NEW</td> 
-   <td>
-                          <a    data-target='#EditItem'	data-id="<%=index%>" data-userid="<%=index%>" data-toggle="modal" href="#EditItem"><i class="fa fa-pencil" data-toggle="tooltip" title="Click here to view/Edit the  <%=MaterialCode%> Material details"></i>&nbsp;&nbsp;&nbsp;</a> <a href='#' onclick = "DeleteRow(<%=index%>)" class="link" data-id="<%=index%>" data-userid="<%=index%>"  id="Del" ><span class="glyphicon glyphicon-trash"></span></a>
-						 
-						  
-                      </td>
-</tr>
-</script>
-<script>
-var index     = $('#txtRowCount').val();
-var userid  = '';
-function removeHiddenRows(rowcount)
-{
-	var step;
-	//alert(rowcount);
-for (step = 1; step < rowcount-1; step++) {
-	var td = document.getElementById(step);
-	td.parentNode.removeChild(td);
-	$("#MaterialCode"+step).remove();
-	$("#Description"+step).remove();
-	$("#UOM"+step).remove();
-	$("#Quantity"+step).remove();
-	index     = '1';
-	userid  = '';	
-}
-}
-
-
-
-function Save(status)
-{  
-if(status == '0')
-{
-	stat = '<?php echo REQ_DRAFT; ?>';
-}
-else
-{
-	stat = '<?php echo REQ_PENDING_APPROVAL; ?>';
-}
-  //alert($('#MaterialCode4').val());
-  
-	if(validate())
-		{ 	
-			if(document.getElementById('Items').rows.length < 2)
-			{
-				alert('Please Select Line item to update the Requisition');
-				$('#Deliverydt').focus();
-				return false;
-			}
-			else
-			{
-			//alert(document.getElementById('Items').rows.length);
-			$('#content').loader('show');
-				$('#txtStatus').val(stat);
-
-                                 var serviceSchedule='';
-                       var servicePeriod='';
-                       var noOfService='';
-                        if($('#RequestType').val()=='SERVICE'){
-                           if($('#ScheduleType').val()=='Recurring'){
-                             serviceSchedule=$('#ScheduleType').val();
-                           servicePeriod=$('#ServiceOptions').val();
-                            noOfService=$('#ServiceNo').val();
-                              }
-                         else{
-                              serviceSchedule=$('#ScheduleType').val();
-                           servicePeriod='';
-                            noOfService=0;
-                           }
-                          
-                             }
-                               else{
-                            var serviceSchedule='';
-                            var servicePeriod='';
-                            var noOfService='';
-                             }
-		    $.ajax({ 
-			data:$('.requistion').serialize()+"&serviceSchedule="+serviceSchedule+"&servicePeriod="+servicePeriod+"&noOfService="+noOfService,
-			type:"POST",
-			url:"<?php echo base_url() ?>requisitionform/EditRequistion", 
-			success:function(data) {
-			if(data)
-			{
-				$('#content').loader('hide'); 
-				alert(data);
-				$('#txtRowCount').val('');
-				$('#txtDeletedRow').val('');
-				
-			 window.location =	"Requisition";
-			
-			}
-			else
-			{
-				alert("Error");	
-			}			
-		
-		}
-  
-});  
-			}
-}
-}
-function validate()
-{
-	
-	if($("option:selected", $("#RequestType")).val() == '-1')
-	{
-		alert('Please Select ReqType Names');
-		return false;
-	}
-	else if($("option:selected", $("#EmpID")).val() == '-1')
-	{
-		alert('Please Select Reqby');
-		return false;
-	}
-	else if(index < 1)
-	{
-		alert('Please Add Line Item');
-		return false;
-	}
-	else
-	{
-	return true;
-	}
-	
-}	
-function DeleteRow(rowid)
-{
-	
-	    var id = [];
-	     var tr= document.getElementById(rowid);
-		 var cellval = tr.cells;
-		 var MaterialCode = cellval[1].innerHTML;
-		// alert(cellval[1].innerHTML);
-		 id[0] = $('#txtReqNo').val();		 
-		 id[1] = MaterialCode;
-	    var answer = confirm(" Do you want to delete the Item from the List?")
-		if (answer) 
-		{ 	
-	        // To delete the item from list
-				
-				var x = <?php echo json_encode($LineItem, JSON_PRETTY_PRINT) ?>;
-	            var result = '0';
-					//alert(x);
-					//alert(MaterialCode);
-				if(MaterialCode != "0")
-				{			
-					$.each(x, function(idx, obj) {
-						if(obj.MaterialCode === MaterialCode)
-						{			 
-						  result = '1';
-						   return  false;	
-						}
-						
-					   });
-				   }
-				  
-				   
-			if(result == '0')
-			{
-				var DelRows  = $('#txtDeletedRow').val();
-				tr.parentNode.removeChild(tr);
-				if(DelRows != '')
-					{
-					DelRows = DelRows + ":" + rowid;
-					}
-				else
-					{
-					DelRows=  "0" + ":" + rowid;
-					}
-				$('#txtDeletedRow').val(DelRows);
-			}
-           	// To delete the value from Tables
-			else  if(result == '1')
-			{
-				var DelRows  = $('#txtDeletedRow').val();
-				tr.parentNode.removeChild(tr);
-				if(DelRows != '')
-					{
-					DelRows = DelRows + ":" + rowid;
-					}
-				else
-					{
-					DelRows=  "0" + ":" + rowid;
-					}
-				$('#txtDeletedRow').val(DelRows);				
-					
-			 $.ajax({ 
-			data:{id:id},
-			type:"POST",
-			url:"<?php echo base_url() ?>requisitionform/DeleteRequistionForm", 
-			success:function(data) {
-			if(data)
-			{
-				$('#content').loader('hide'); 
-				alert(data);
-				
-				
-			
-			}
-			else
-			{
-				alert("Error");	
-			}			
-		
-		}}); 
-			}
-		}
-       	
-} 
-
-
-$('.addClick').click(function(){
-         
-       if ($("#drpMaterial option:selected").val() =='-1' )
-		{
-			 alert('Please Select the MaterialCode ');
-		}	
-			
-    	if(document.getElementById('Quantity').value == '' )
-		{
-		  alert('Please Enter the Quantity');
-		  
-		}	  
-		
-        if ($("#drpMaterial option:selected").val() !='-1' &&  $('#Quantity').val() != ''  )
-        {		       
-         var temp = parseInt(index) + 1;
-         var materialCode = $("#drpMaterial option:selected").val();
-         var materialName =  $("#Description").val();
-         var uom = $("#UOM").val();
-		 var quantity = $("#Quantity").val();
-		 
-		$('#drpMaterial option[value='+materialCode+']').remove();
-		 $('#Description').val(''); 
-		  $('#UOM').val(''); 
-		   $('#Quantity').val('');       
-			
-			index = parseInt(index)+1;		
-		  
-		 
-	      var template = jQuery("#tempList").html();
-	   
-	     
-          $('#tempAppend').append(_.template(template,{index:temp,MaterialCode:materialCode,MaterialName:materialName,UOM:uom,Quantity:quantity}));
-		  
-		  
-		 var theForm = $(".requistion");
-		
-		 //addHidden(theForm,"MaterialCode"+temp,materialCode);
-		 //addHidden(theForm,"Description"+temp,materialName);
-	     //addHidden(theForm,"UOM"+temp,uom);
-		 //addHidden(theForm,"Quantity"+temp,quantity);		
-		 
-		 $('<input>').attr({
-			type: 'hidden',
-			id: 'MaterialCode' + temp,	
-			name: 'MaterialCode'+ temp,
-			value:materialCode
-		}).appendTo('form');
-		
-		$('<input>').attr({
-			type: 'hidden',
-			id: 'Description' + temp,	
-			name: 'Description'+ temp,
-			value:materialName
-		}).appendTo('form');
-		
-		$('<input>').attr({
-			type: 'hidden',
-			id: 'UOM' + temp,	
-			name: 'UOM'+ temp,
-			value:uom
-		}).appendTo('form');
-		
-		$('<input>').attr({
-			type: 'hidden',
-			id: 'Quantity' + temp,	
-			name: 'Quantity'+ temp,
-			value:quantity
-		}).appendTo('form');
-		 
-		 $('#txtRowCount').val(temp); 			
-		
-      }    
-   
- });
- function addHidden(theForm, key, value) {
-    // Create a hidden input element, and append it to the form:
-    var input = document.createElement('input');
-    input.type = 'hidden';
-    input.name = key;'name-as-seen-at-the-server';
-    input.id = key;'name-as-seen-at-the-server';
-    input.value = value;
-    theForm.append(input);
-}
-$("#myModal1").on("shown.bs.modal", function(e) {
-    if($("option:selected", $("#RequestType")).val() == '-1')
-	{
-		alert('Please select the Request Type ');
-		e.close();
-	}
-});
-
-$("#EditItem").on("shown.bs.modal", function(e) {
-     userid = $(e.relatedTarget).data('userid');
-	// alert(userid);
-	 var tr= document.getElementById(userid);
-	 var cellval = tr.cells;
-	 //alert(x[1].innerHTML);
-	$('#EditMaterialCode').val(cellval[1].innerHTML);
-	$('#EditDescription').val(cellval[2].innerHTML);
-   $('#EditUOM').val(cellval[3].innerHTML);
-    $('#EditQuantity').val(cellval[4].innerHTML);
-});
-
-$('.EditClick').click(function(){
-         
-   		if(document.getElementById('EditQuantity').value == '' )
-		{
-		  alert('Please Enter the Quantity' );
-		 }  
-		
-        if ( $('#EditQuantity').val() != '' )
-        {	
-      
-			var editMaterialCode =  $("#EditMaterialCode").val();
-			var editDescription = $("#EditDescription").val();		
-			var editUOM = $('#EditUOM').val();
-			var editQuantity = $('#EditQuantity').val();
-     	
-            var tr= document.getElementById(userid);
-			var cellval = tr.cells;   
-			cellval[1].innerHTML = editMaterialCode;
-			cellval[2].innerHTML = editDescription;
-			cellval[3].innerHTML =editUOM;
-			cellval[4].innerHTML = editQuantity;
-			
-			$('#MaterialCode'+userid).val(editMaterialCode);
-			$('#Description'+userid).val(editDescription);
-			$('#UOM'+userid).val(editUOM);
-			$('#Quantity'+userid).val(editQuantity);
-            			
-		
-      }
-    
- });
- $(function () {  
-    $('#Items').DataTable({
-      "paging": true,
-      "lengthChange": true,
-      "searching": true,
-      "ordering": true,
-     "info": true,
-      "autoWidth": true
-	   
-    }); 
-  });
-$("#ScheduleType").change(function(){
-if($('#ScheduleType').val().trim()!='Recurring'){
-document.getElementById('ServicePeriodOption').style.display = 'none';
-document.getElementById('NoServices').style.display = 'none';
-               
-                     
-}
-else{
-document.getElementById('ServicePeriodOption').style.display = 'block';
-document.getElementById('NoServices').style.display = 'block';
-
-}
- 
-});
-</script>
diff --git a/application/views/inwardgateregister.php~ b/application/views/inwardgateregister.php~
deleted file mode 100644
index 30c44c9f..00000000
--- a/application/views/inwardgateregister.php~
+++ /dev/null
@@ -1,576 +0,0 @@
- 
-<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery.inputmask/3.3.4/jquery.inputmask.bundle.min.js"></script>
- <script>
-
- $(document).ready(function(){
- 
-        $("#PONO").select2();
-    	
-		
-        $("#InvoiceDate").datepicker({
-          
-            maxDate : 'now',
-            dateFormat: 'mm/dd/yy',changeMonth: true, changeYear: true,yearRange: '-100:+0'
-        });
-   
-   });
- //jquery for vechicle masking 
-  $(document).ready(function(){
-Inputmask("A{2,3} 9{1,2} A{1,2} 9{4}").mask($("#VehicleNo"));
- });
-</script>
- 
-<style>
-.modal {
-  text-align: center;
-  padding: 0!important;
-}
-
-.modal:before {
-  content: '';
-  display: inline-block;
-  height: 100%;
-  vertical-align: middle;
-  margin-right: -4px;
-}
-
-.modal-dialog {
-  display: inline-block;
-  text-align: left;
-  vertical-align: middle;
-}
-.select2 {
-  width: 100% ! important;
-}
-.num {
-  text-align:right;
-}
-.dataTables_wrapper {
-    padding-bottom: 0px;
-}
- </style>
-
-<div class="content-wrapper" style="min-height:537px;">
-    <!-- Content Header (Page header) -->
-    <section class="content-header">
-      <h1>
-        <center>Siddharth Industries - Inward Gate Register (IGR) Entry</center>        
-      </h1>	  	  	 
-    </section>    
-    <section class="content"><br/>  
-	<div class="row"  >
-	 <div id="content" > </div> 
-		<div class="col-md-12">
-			  <div class="col-md-2">			
-					<?php
-                      $attributes = array('class' => 'form-label-left IGR ','name'  => 'IGR','id'  => 'IGR');
-                        
-                        echo form_open($this->config->base_url().'/inwardgateregister/addNewigr/',$attributes); ?>			  
-						<label>Select Purchase Order NO </label>	
-						 								 									 
-							 <?php
-									$options = array("-1"=>'Purchase Order No'); 
-									
-													if(!empty($PO_NO))
-										{
-											//print_r($PO_NO);
-									    foreach ($PO_NO as $SI):
-												
-									   	  $options[$SI->PONO] =  $SI->PONO .'-'. $SI->SupplierName ;
-										  $PONO = $SI->PONO;
-										
-													
-											endforeach;
-											
-										}
-					
-									echo form_dropdown('PONO', $options,set_value('PONO'),'id="PONO"' ,'class="form-control select2"' , 'required="true"');
-									?>									
-	 	  
-					</div>
-					 
-					 <div class="col-md-2">
-						   <label>Supplier Name </label>
-									<div class="form-group">
-												<?php
-										 $data = array('name' => 'SupplierName','value' => set_value('SupplierName'),'id'=>'Sup',  'class' => 'form-control' ,'readonly' => 'true');
-										echo form_input($data);
-										?>   
-									</div>
-						 </div>
-					
-					 
-		 
-		 
-			<div class="col-md-2">
-			<label>Delivery Challan/Invoice NO</label>
-			<?php
-				 $data = array('name' => 'InvoiceNo','value' => set_value('InvoiceNo'),'id'=>'InvoiceNo',  'class' => 'form-control', 'required=>"true"' );
-				 
-				echo form_input($data);
-				?> 
-			</div>
-			<div class="col-md-2">
-			<label>Delivery Challan/Invoice Date</label>
-			<?php
-				 $data = array('name' => 'InvoiceDate','value' => set_value('InvoiceDate'),'id'=>'InvoiceDate',  'class' => 'form-control num', 'required'=>'true' );
-				echo form_input($data);
-				?> 
-				
-			</div>
-			 
-			<div class="col-md-2">
-			<label>Vechicle NO</label>
-			<?php
-				 $data = array('name' => 'VehicleNo','value' => set_value('VehicleNo'), 'id'=>'VehicleNo',  'class' => 'form-control',  );
-				echo form_input($data);
-				?>
-				<span pattern="" required="true"></span>
-			</div>
-			<div class="col-md-2">
-			<label>Courier NO</label>
-			<?php
-				 $data = array('name' => 'CourierNo','value' => set_value('CourierNo'),'id'=>'CourierNo',  'class' => 'form-control' );
-				echo form_input($data);
-				?>
-			</div>								
-		</div>
-		</div>
-			
-        <div class="row"> 
-		<div class="col-md-12">
-            								
-				<table id="Inwardgateregistertable"  class="table table-bordered table-hover editabletable IGR_Line" style="background-color:#fff;font-size:12px;">
-					<thead style="background-color:#ddf">
-						<tr>
-						<th>S.NO</th>						 	
-						  <th>Item Code</th>
-						  <th>Material</th>
-						  <th>UOM</th>
-						  <th>Ordered Quantity</th>	
-						   <th>Received Quantity</th>	
-						   <th>Pending Quantity</th>						  
-						  <th>Advised Quantity</th>
-						  
-						  <th>Remarks</th>
-						   
-						</tr>
-					</thead>
-					<tbody id ="IGRappend">
-					
-					</tbody>
-					
-					
-					
-										
-				</table>
-				<input type="hidden" name="txtRowCount" id="txtRowCount" />
-				
-				
-				</div>
-			<div class="col-md-1 col-md-offset-10">
-
-						<!--<a class="btn btn-primary" type="submit" id="Save" onclick="Save(0);">Generate IGR</a>-->
-						<a class="btn btn-primary" id='IGRLink' name='IGRLink' onclick="Save();">Generate IGR</a>
-					</div>
-			</div> 
-			
-
-			
-			<div class="modal fade" id="generateIGR" role="dialog">
-				<div class="modal-dialog modal_style">
-					<!-- Modal content-->
-					<form>
-						
-						<div class="modal-content">
-
-							<div class="modal-header" style="background-color: #3c8dbc;color:#fff;">
-							<button type="button" class="close" data-dismiss="modal">&times;</button>
-							<center><h4>Inward Gate Register Number</h4></center> 
-							</div>
-							<div class="col-md-12"> <br/>
-								 <center></center>
-								<center><label style="font-size:40px;" id="finaligr" >Default</label> <center>
-								
-							</div>
-							<div class="modal-footer">
-								<center>
- 									<button type="reset" value="Reset" onClick="window.location.reload()"> OK</button>
-								</center>
-							</div><!-- footer div closed -->
-						</div><!-- modal content div closed-->
-					</form><!-- form closed-->
-				</div><!-- modal content closed-->
-			</div><!-- modal fade closed-->	 
-		<!-- new modal ended-->
-
-						
-
-<!-- new modal ended-->
-
- 
-        </div>  
-		
-			 
-		</section>
-	</div>
-
-
-
-	
-		
- 
-	
-	<script>
-	
-<!-- script for table , It works under the datatable plugin-->
-function validate_Vechicle(){
-	
-	var reg = /^^[A-Z]{2}\s[0-9]{2}\s[A-Z]{2}\s[0-9]{4}$/;
-         // alert();
-			var VehicleNo = $('#VehicleNo').val();
-			if(VehicleNo != "")
-			{
-            if (reg.test(VehicleNo) == false) 
-            {
-                alert('Please Enter Valid Vehicle Number');
-                return (false);
-            }
-			else
-			{
-				return true;
-			}
-			}
-	
-}
-function validate()
-{
-	var rowcount = $("#txtRowCount").val();
-		
-	var Noval = 0;
-	var isExceed = 0;
-	for(k=1;k<=rowcount ; k++)	
-	{
-		var AdvisedQty = parseFloat( $('#QuantityAsPerInvoice'+k).val() == '' ? '0.00' : $('#QuantityAsPerInvoice'+k).val()); 
-		var RecQty =  parseFloat( $('#txtReceivedQuantity'+k).val() == '' ? '0.00' : $('#txtReceivedQuantity'+k).val()); 
-		var OrderedQty =parseFloat($('#Quantity_1'+k).text());
-		 if(AdvisedQty != '0.00')
-		 {
-			 
-			 if(OrderedQty < (AdvisedQty+RecQty))
-			 {
-				isExceed = 1;				
-				return false;
-			 }
-			 Noval = 1;
-		 }
-	}
-		
-
-	if($('#PONO').val()=='-1')
-	{
-		
-		alert("Please select PurchaseOrder");
-		$('#PONO').focus();
-		return false;
-	}
-	else if($('#InvoiceNo').val() == '' )
-	{
-		  alert('Please Enter Invoice Number' );
-		  $('#InvoiceNo').focus();
-		  return false;
-	} 
- 	else if($('#InvoiceDate').val() == '' )
-	{
-		  alert('Please Enter Invoice Date' );
-		  $('#InvoiceDate').focus();
-		  return false;
-	} 
-	else if (Noval == 0 )
-	{
-		
-		alert('Advised Quantity is Empty.Please Enter the value');
-		return false;
-
-    }
-	else if($('#VehicleNo').val() == '' && $('#CourierNo').val() == '')
-	{
-		alert('Please Enter the Vechicle / Courier Number');
-		return false;
-	}
-    else if(isExceed == 1 ){
-
-		alert("Advised Quantity is exceeding the Ordered Quantity.Please Contact Purchase Team for further Process ")
-		return false;
-    }	
-	else  
-	{
-	 return true;
-	}
-}
-	</script>
-	<script>
- $(function () { 
-    $('#Inwardgateregistertable').DataTable({
-      "paging": false,
-      "lengthChange": false,
-      "searching": false,
-      "ordering": false,
-      "info": false,
-      "autoWidth": false
-	   
-    }); 
-  });
-  </script>   
-                        
-  <script>
-   // $(function() {
-  	  function removeHidden()
-	  {
-		  var rowcount = $("#txtRowCount").val();
-		  for(k=1;k<=rowcount ; k++)	
-		  {
-			   $("#MaterialCode"+k).remove();
-			    $("#txtQuantityAsPerInvoice"+k).remove();
-				 $("#OrderedQuantity"+k).remove();
-				  $("#txtReceivedQuantity"+k).remove();
-				   $("#txtRemarks"+k).remove();
-				    $("#txtPendingQty"+k).remove();
-		  }
-	  }
-	  
-  $('#PONO').change(function() {
-	  removeHidden();
-	 $("#IGRappend").empty();
-	 $('#txtRowCount').val('');
-	 
- var id = $('#PONO').val();
- var status= '';
-   if(id != '-1')
-   {
-	  
-	  $('#content').loader('show'); 
-	var y = <?php echo json_encode($PO_NO, JSON_PRETTY_PRINT) ?>;
-	
-	$.each(y, function(idx, obj) {
-			
-			 if(id == obj.PONO)
-			 {
-				$("#po").val(obj.PONO);
-				$("#Sup").val(obj.SupplierName);
-				//$("#Add").val(obj.Address);
-				$("#del").val(obj.DeliveryDate);
-				//$("#ser").val(obj.ServiceDescription);
-				status = obj.status;
-			 }		
-		});
-		
-	
-	$.ajax({ 
-			data:{id:id},
-			type:"POST",
-			url:"<?php echo base_url() ?>inwardgateregister/IGRITEM", 
-			
-			success:function(data) {
-				
-				//alert(data);
-				
-				$('#content').loader('hide'); 
-		               //alert(data);
-						var trHTML = '';
-						
-							$.each(JSON.parse(data), function (i, item) {
-								
-								i=i+1;
-									trHTML += '<tr>' +
-										'<td align="right">' + i + '</td>' +
-										'<td name="MaterialName" id="MaterialCode" >' + item.MaterialCode + '</td>' +
-										'<td>' + item.MaterialName + '</td>' +
-										'<td name="UOM">' + item.UOM + '</td>' +
-										'<td  name="Quantity1'+i+'" id="Quantity_1'+i+'">' + item.Quantity + '</td>' +
-										'<td name="ReceivedQuantity'+i+'" id="ReceivedQuantity'+i+'">'+ item.ReceivedQuantity +'</td>'+
-										'<td name="PendingQuantity'+i+'" id="PendingQuantity'+i+'">'+ item.PendingQty +'</td>'+
-										'<td  data-name="sel" ><input type="text" onchange="validateReceivedQuantity('+i+')"id="QuantityAsPerInvoice'+ i +'" name="QuantityAsPerInvoice'+ i +'"  value="" onkeypress="return isNumberKey(event);"></td>' +
-										
-										'<td><input type="text" id="Remark'+ i +'" name="Remark'+ i +'" class="form" onchange="SetRemarks('+i+')"> </td>' +
-												'</tr>';
-												$('#txtRowCount').val(i);
-												
-												$('<input>').attr({
-    type: 'hidden',
-    id: 'MaterialCode'+i,
-	value:item.MaterialCode,
-    name: 'MaterialCode'+i
-}).appendTo('form');
-$('<input>').attr({
-    type: 'hidden',
-    id: 'txtQuantityAsPerInvoice'+i,
-	name: 'txtQuantityAsPerInvoice'+i
-}).appendTo('form');
-$('<input>').attr({
-    	type: 'hidden',
-    	id: 'OrderedQuantity'+i,
-    	
-		value:item.Quantity,
-    	name: 'OrderedQuantity'+i
-
-	}).appendTo('form');
-
-	$('<input>').attr({
-		type: 'hidden',
-		id: 'txtReceivedQuantity'+i,
-		name: 'txtReceivedQuantity'+i,
-		value:item.ReceivedQuantity
-	}).appendTo('form');
-
-	$('<input>').attr({
-		type: 'hidden',
-		id: 'txtRemarks'+i,
-		name: 'txtRemarks'+i
-	}).appendTo('form');
-	
-	$('<input>').attr({
-		type: 'hidden',
-		id: 'txtPendingQty'+i,
-		name: 'txtPendingQty'+i,
-		value:item.PendingQty
-	}).appendTo('form');
-	//alert(item.PendingQty);
-	if(item.PendingQty == 0.00)
-	{
-		//alert('inside if');
-		$('#QuantityAsPerInvoice'+i).attr('readonly', 'true');
-		// $('#txtEditFreight').attr('readonly', 'true');
-	}
-												
-							});
-
-
-							
-				$("#IGRappend").empty();
-				
-				
-				$('#IGRappend').append(trHTML);
-				
-				
-				
-				} 
-				
-			});
-		 
-			
-			if(status == '<?php echo IGR_CREATED ?>' || status == '<?php echo MRIR_CREATED ?>' || status == '<?php echo MRIR_APPROVED ?>' )
-			{ 
-		       alert('The Order is completed!!');
-				$("#IGRLink").hide();
-			} 
-			else
-			{
-				$("#IGRLink").show();
-			}
-			
-   }
-   else
-   {
-	   alert('Please Select the Purchase Order Number to Create IGR');
-   }
-	});
-  
- function SetRemarks(RowId)
- {
-	  var remks = $("#Remark"+RowId).val();
-	 if( remks != '')
-	 {
-		  $("#txtRemarks"+RowId).val(remks);
-	 }
- }
-function validateReceivedQuantity(Rowid){
-	//alert(Rowid);
-	
-	var InvoiceQty = parseFloat( $('#QuantityAsPerInvoice'+Rowid).val() == '' ? '0.00' : $('#QuantityAsPerInvoice'+Rowid).val()); 
-
-    var PendingQty =  parseFloat( $('#PendingQuantity'+Rowid).text() == '' ? '0.00' : $('#PendingQuantity'+Rowid).text());  
-
-    var RecQty = 	parseFloat( $('#txtReceivedQuantity'+Rowid).val() == '' ? '0.00' : $('#txtReceivedQuantity'+Rowid).val());  
-	
-	var OrderedQty =parseFloat($("#Quantity_1"+Rowid).text());
-	
-	var r =$("#Remark"+Rowid).val();
-	  //  alert(RecQty);
-    	//alert(InvoiceQty);
-    		 if((InvoiceQty+RecQty) >  OrderedQty){
-
-    			alert("Advised Quantity is exceeding the Ordered Quantity.Please Contact Purchase Team for further Process ")
-				$("#QuantityAsPerInvoice"+Rowid).focus();
-				$("#QuantityAsPerInvoice"+Rowid).val('');
-    			return false;
-
-
-    		}
-			else if(((InvoiceQty+RecQty) - OrderedQty)  > 0.00){
-				alert("Order is completed.")
-				$("#QuantityAsPerInvoice"+Rowid).focus();
-				$('#QuantityAsPerInvoice'+Rowid).val('');
-    			return false; 
-			}
-
-		else {
-		//	alert(RecQty);
-	     $('#PendingQuantity'+Rowid).text((OrderedQty - (InvoiceQty+RecQty)).toFixed(2));
-		 $('#txtPendingQty'+Rowid).val(OrderedQty - (InvoiceQty+RecQty));
-	     $("#ReceivedQuantity"+Rowid).val(InvoiceQty+RecQty);
-		  $("#txtQuantityAsPerInvoice"+Rowid).val(InvoiceQty);
-		// InvoiceQty
-        return true;
-    }
-
-
-    
-}
-</script>
-
-<script>
-
-function isNumberKey(evt)
-       {
-          var charCode = (evt.which) ? evt.which : evt.keyCode;
-          if (charCode != 46 && charCode > 31 
-            && (charCode < 48 || charCode > 57))
-             return false;
-
-          return true;
-       }
-function Save()
-{ 
-	//alert("save function worked ");
-	
-    if (validate())
-	{
-       // alert($('#Inwardgateregistertable').rows.count);
-		//alert(" if condition validation part ");
-		$('#content').loader('show');
-				$.ajax({ 
-		 		data:$('.IGR').serialize(),		
-		 		type:"POST",
-		 		url:"<?php echo base_url() ?>inwardgateregister/addNewigr", 
-			
-		 			success:function(data) {
-		 				
-		 				if(data){
-							
-		 				   	$('#content').loader('hide');
-		 							 					
-		 					document.getElementById('finaligr').innerHTML=data;
-							$('#generateIGR').modal('show');
-						}
-		 				else
-		 				{
-		 					alert("Error");	
-		 				}	
-		 				
-   						
- 					}//success function closed
- 		 	});//ajax closed
-		}//validate if closed
-}//save function closed
-</script>
\ No newline at end of file
diff --git a/application/views/materialinspectionreport.php~ b/application/views/materialinspectionreport.php~
deleted file mode 100644
index e81f2d2d..00000000
--- a/application/views/materialinspectionreport.php~
+++ /dev/null
@@ -1,394 +0,0 @@
-<?php 
-$IGRNO="";
-$PONO="";
-$VehicleNo="";
-$CourierNo="";
-$DeliveryChellanOrInvoiceNo="";
-$SupplierName="";
-$DeliveryChellanDate="";
-$dcdate="";
-$Address=""; 
-$PORasiedbyName="";
-$PODate="";
-$podate="";
-$IGRDate="";
-$igrdate="";
-$ServiceDescription="";
-$RowCount = 0;
-
-if(!empty($IGRDetails))
-{
-
-    foreach ($IGRDetails as $IGR)
-    {
-    	$IGRNO = $IGR->IGRNO;
-    	$PONO = $IGR->PONO;
-    	$VehicleNo = $IGR->VehicleNo;
-		$CourierNo= $IGR->CourierNo;
-		$DeliveryChellanOrInvoiceNo=$IGR->DeliveryChellanOrInvoiceNo;
-		$SupplierName=$IGR->SupplierName;
-		//$DeliveryChellanDate=$IGR->DeliveryChellanDate;
-		  
-		$dc_date = new DateTime( $IGR->DeliveryChellanDate );
-		$dcdate = $dc_date->format('d/m/Y');;
-		$Address=$IGR->Address;
-		$PORasiedbyName=$IGR->FirstName;		
-		$PODate=$IGR->PODate;
-		$po_date = strtotime( $PODate );
-		$podate = date( 'd/m/Y', $po_date );
-		$IGRDate=$IGR->CreatedDate;
-		$igr_date = strtotime( $IGRDate );
-		$igrdate = date( 'd/m/Y', $igr_date );
-		$ServiceDescription=$IGR->ServiceDescription;
-
-
-		
-    }
-}
-
-  ?>
- <script>
-
- $(document).ready(function(){
-
-		$("#QualityIncharge").select2();
-		$("#plantIncharge").select2();
-		
- });//ready closed.
- </script>
-
- <style>
-    .modal
-	{
-		padding-right:25% ! important;
-	}
-	.select2
-	{
-		width: 100% ! important;
-	}
-	.num{
-		text-align:right;
-	}
-	.dataTables_wrapper {
-    padding-bottom: 0px;
-	}
- </style>
-<div class="content-wrapper"  style="min-height:537px;">
-    <!-- Content Header (Page header) -->
-    <section class="content-header">
-      <h1>
-        <center>Siddharth Industries - Material Receipt And Inspection Report (MRIR)</center>        
-      </h1>	
-      
-      <?php
-                    $attributes = array('class' => 'form-label-left MRIR ','name'  => 'MRIR','id'  => 'MRIR');
-                    echo form_open($this->config->base_url().'/MRIRcontroller/generateMRIR/',$attributes); ?>  	  	 
-    </section>    
-    <section class="content"><br/>
-    <div id="content"></div>  
-	<div class="row">
-		 
-		<div class="col-md-12 col-sm-12">
-			<div class="col-md-3 col-sm-3">
-				<label for="IGRNO">Inward Gate Register Number</label>
-                                        <div class="form-group">
-                                        	 <?php
-												$data = array('name' => 'IGRNO','value' => set_value('IGRNO',$IGRNO),'id'=>'IGRNO',  'class' => 'form-control' ,'readonly' => 'true');
-												echo form_input($data);
-											?>
-                                       
-                     					</div>      
-			</div>
-			<div class="col-md-2 col-sm-2">
-				<label for="IGRNO">Inward Gate Register Date</label>
-                                        <div class="form-group">
-                                        	<?php
-												 $data = array('name' => 'IGRDate','value' => set_value('IGRDate',$igrdate),'id'=>'IGRDate',  'class' => 'form-control num' ,'readonly' => 'true');
-												echo form_input($data);
-												?>
-                                        </div>
-                           
-			</div>
-			
-			<div class="col-md-2 col-sm-2">
-				
-                                        <label for="PONO">Purchase Order Number</label>
-                                        <div class="form-group"><?php
-												 $data = array('name' => 'PONO','value' => set_value('PONO',$PONO),'id'=>'PONO',  'class' => 'form-control' ,'readonly' => 'true');
-												echo form_input($data);
-												?>
-											</div>
-			</div>
-			<div class="col-md-2 col-sm-2">
-				<label for="PODate">Purchase Order Date</label>
-										<div class="from-group">
-											<?php
-													 $data = array('name' => 'PODate','value' => set_value('PODate',$podate),'id'=>'PODate',  'class' => 'form-control num' ,'readonly' => 'true'); 
-													echo form_input($data);
-													?>
-												</div>
-			</div>
-			<div class="col-md-3 col-sm-3">
-				<label for="PORasiedbyName">Purchase Order Created By</label>
-										<div class="from-group"><?php
-													 $data = array('name' => 'PORasiedbyName','value' => set_value('PORasiedbyName',$PORasiedbyName),'id'=>'PORasiedbyName',  'class' => 'form-control' ,'readonly' => 'true');
-													echo form_input($data);
-													?>
-										</div>
-			</div>
-			</div>
-		 
-		<div class="col-md-12 col-sm-12">
-		<div class="col-md-3 col-sm-3">
-				<label for="SupplierName">Supplier Name </label>
-											<div class="form-group">
-												<?php
-												 $data = array('name' => 'SupplierName','value' => set_value('SupplierName',$SupplierName),'id'=>'SupplierName',  'class' => 'form-control' ,'readonly' => 'true');
-												 echo form_input($data);
-												?> 
-											</div>
-			</div>
-			<div class="col-md-2 col-sm-2">
-				<label for="DeliveryChellanOrInvoiceNo">DC / Inv Number</label>
-											<div class="form-group">
-												<?php
-
-												 $data = array('name' => 'DeliveryChellanOrInvoiceNo','value' => set_value('DeliveryChellanOrInvoiceNo',$DeliveryChellanOrInvoiceNo),'id'=>'DeliveryChellanOrInvoiceNo',  'class' => 'form-control' ,'readonly' => 'true');
-												echo form_input($data);
-												?>  
-											</div>
-			</div>
-			<div class="col-md-2 col-sm-2">
-			 <label for="DeliveryChellanDate">DC / Inv Date </label>
-											<div class="form-group"><?php 
-											$data = array('name' => 'DeliveryChellanDate','value' => set_value('DeliveryChellanDate',$dcdate),'id'=>'DeliveryChellanDate',  'class' => 'form-control num','readonly' => 'true');
-											echo form_input($data);
-											?>
-										</div>
-			</div>
-			 <div class="col-md-2 col-sm-2">
-				  <label for="VehicleNo">Vehicle Number</label>
-                                        <div class="form-group">
-                                        <?php
-							 $data = array('name' => 'VehicleNo','value' => set_value('VehicleNo',$VehicleNo),'id'=>'VehicleNo',  'class' => 'form-control' ,'readonly' => 'true','align' => 'left');
-							echo form_input($data);
-							?>
-							 </div>
-			</div>
-			<div class="col-md-3 col-sm-3">
-			 <label for="CourierNo">Courier Number</label>
-                                        <div class="form-group"><?php
-							 $data = array('name' => 'CourierNo','value' => set_value('CourierNo',$CourierNo),'id'=>'CourierNo',  'class' => 'form-control','readonly' => 'true');
-							echo form_input($data);
-							?>
-							 </div>
-			</div>
-			 
-			</div>
-		 
-		 
- 
-</div>
-		
-
-	<div class="row" style="padding:1%;"> 
-		<div class="col-md-12 col-sm-12">            								
-				<table id="mytable"  class="table table-bordered table-hover" style="background-color:#fff;font-size:12px;">
-					<thead style="background-color:#ddf">
-						<tr>
-						<th>S.NO</th> 
-						  <th>Item Code</th>
-						  <th>Material</th>
-						  <th>UOM</th>
-						  <th>Ordered Quantity</th>
-						  <th>Adviced Quantity as per the Challan</th>
-						  <th>Actual Quantity Received</th>
-						  <!--<th>Accepted_Quantity</th>-->
-						  <!--<th>Rejected_Quantity</th>-->
-						  <th>Remarks</th>						  
-						</tr>
-					</thead>
-					<tbody id="tbleAppend">
-						<?php $SNo =0;
-                              
-                              if(!empty($IGRDetails))
-                               
-                               {
-                                   
-                                    foreach($IGRDetails as $record)
-                                    {
-                                      $SNo  =$SNo + 1; 
-
-							              
-                            ?> 
-                             <tr id="<?php echo $SNo?>">
-					    
-
-					    <td><?php echo $SNo?></td> 
-						<td><?php echo $record->MaterialCode?></td>
-						<input type="hidden" name="<?php echo 'MaterialCode'.$SNo ?>" id="<?php echo 'MaterialCode'.$SNo ?>"  value=" <?php echo $record->MaterialCode ?> "/>
-						<td><?php echo $record->MaterialName?></td>
-						<td><?php echo $record->UOM?></td>
-						<td class="num"><?php echo $record->Quantity?></td>
-						<td class="num"><?php echo $record->QuantityAsPerInvoice?></td>
-						<input type="hidden" name="<?php echo 'QuantityAsPerInvoice'.$SNo ?>" id="<?php echo 'QuantityAsPerInvoice'.$SNo ?>" />
-						<td><input type="text" id="<?php echo 'ActualQuantity'.$SNo;?>" name="<?php echo 'ActualQuantity'.$SNo;?>" onchange="setactual('<?php echo $SNo;?>');"></td>
-						<input type="hidden" name="<?php echo 'ActualQuantityReceived'.$SNo ?>" id="<?php echo 'ActualQuantityReceived'.$SNo ?>" value=""/>
-						<td><input type="text" id="<?php echo 'Remark'.$SNo ?>" name="<?php echo 'Remark'.$SNo ?>" onchange="setremark('<?php echo $SNo;?>');"></td>
-						<input type="hidden" name="<?php echo 'Remarks'.$SNo ?>" id="<?php echo 'Remarks'.$SNo ?>" />
-						</tr> 
-						<?php 
-						
-							
-					} //echo $SNo; 
-				}
-
-					$RowCount = $SNo;
-
-					 ?>			
-					</tbody>					
-				</table>
-				<div id="content"></div>
-				<div class="col-md-1 col-md-offset-10">			 
-						<a class="btn btn-primary" type="submit" onclick="savemrir()">Generate MRIR</a>
-						<input type="hidden" name="RowCount" id="RowCount" value="<?php echo $RowCount ?>" />
-			</div>
-
-		</div>			
-	</div>
-          
-	 
-	</section>
-	</div>
- <script>
-
-<!-- script for table , It works under the datatable plugin-->
- $(function () { 
-    $('#Inwardgateregistertable').DataTable({
-      "paging": true,
-      "lengthChange": true,
-      "searching": true,
-      "ordering": true,
-      "info": true,
-      "autoWidth": true
-	   
-    }); 
-  });
-
-  </script>
-
- 
-  <script>
-function validate()
-{
-	var rowcount = $("#RowCount").val();
-	//alert(rowcount);	
-	var Noval = 0;
-	var isExceed = 0;
-	for(k=1;k<=rowcount; k++)	
-	{
-		var ActualQty = parseFloat( $('#ActualQuantity'+k).val() == '' ? '0.00' : $('#ActualQuantity'+k).val()); 
-		//var RecQty =  parseFloat( $('#txtReceivedQuantity'+k).val() == '' ? '0.00' : $('#txtReceivedQuantity'+k).val()); 
-		//var OrderedQty =parseFloat($('#Quantity_1'+k).text());
-		var tr= document.getElementById(k);
-		var InvoiceQty = 0.0;
-	
-	
-		var cellval = tr.cells;
-	 
-	    InvoiceQty =  parseFloat(cellval[5].innerHTML);
-		
-		
-	    // alert('act'+ActualQty);
-		 if(ActualQty != '0.00')
-		 {
-			// alert('inside loop');
-			 if(ActualQty > InvoiceQty)
-			 {
-				isExceed = 1;				
-				return false;
-			 }
-			 Noval = 1;
-		 }
-	}
-	//alert(Noval);
-	if (Noval == 0 )
-	{
-		
-		alert('Actual Quantity is Empty.Please Enter the value');
-		return false;
-
-    }
-	else if(isExceed == 1 ){
-
-		alert("Actual Quantity is exceeding the Invoice Quantity.Please adjust for further Process ")
-		return false;
-    }	
-	else  
-	{
-	 return true;
-	}
-}
-function setactual(rowId)
-{
-	 var tr= document.getElementById(rowId);
-	  var InvoiceQty = 0.0;
-	
-	
-	 var cellval = tr.cells;
-	 
-	  InvoiceQty =  parseFloat(cellval[5].innerHTML);
-	
-	var actual = parseFloat($('#ActualQuantity'+rowId).val());
-	
-	
-	if(InvoiceQty < actual)
-	{
-		       alert("Actual Quantity  is exceeding the Invoice Quantity.Please change the Actual Quantity ")
-				$("#ActualQuantity"+rowId).focus();
-				$("#ActualQuantity"+rowId).val('');
-				
-    			return false;
-	}
-}
-function setremark(rowId)
-{
-	var remark = ($('#Remark'+rowId).val());
-	//alert(remark);
-
-}
-</script>
-
-<script>
-      function savemrir()
- { 
-    if(validate())
-	{
- 	//alert("save function worked ");
-		$("#content").load('show');
- 
-  				$.ajax({ 
-  		 		data:$('.MRIR').serialize(),		
-  		 		type:"POST",
-  		 		url:"<?php echo base_url() ?>MRIRcontroller/stored_db", 
-			
-  		 			success:function(data) {
-  		 				
- 		 				
-  		 				if(data){
-  		 					$("#content").load('hide');
-  		 					alert(data);
-  		 				
-  		 				window.location ="viewmaterialinspectionreport";
-  						}
-  		 				else
-  		 				{
-  		 					alert("Error");	
-  		 				}	
-		 					
-   						
-   					}//success function closed
-   		 	});//ajax closed
- }
- }//save function closed
-</script>
\ No newline at end of file
diff --git a/application/views/requisitionform.php~ b/application/views/requisitionform.php~
deleted file mode 100644
index 7964887f..00000000
--- a/application/views/requisitionform.php~
+++ /dev/null
@@ -1,901 +0,0 @@
-
-<?php
-$EmpID = "";
-$Designation = "";
-$DepartmentName = "";
-$FirstName = "";
-
-if(!empty($Emp))
-{
-    foreach ($Emp as $Emp)
-    {
-		$EmpID = $Emp->EmpID ;
-		$FirstName = $Emp->FirstName ;
-		$Designation = $Emp->Designation;
-		$DepartmentName =$Emp->DepartmentName;
-	}
-}
-?>
- 
-<div class="content-wrapper">
-    
- 
-	 <section class="content">
-	  
-	 <div>
-         <center><b><h2>Siddharth Industries - Requisition Form</h2></b></center>
-         <div class="container-fluid">
-		  <div id="content"></div>
-		   <?php
-                      $attributes = array('class' => 'form-label-left requistion ','name'  => 'requistion','id'  => 'requistion');
-                        
-                        echo form_open($this->config->base_url().'requisitionform/SearchRequistList',$attributes); ?>
-	 <div class="row">
-	 <div class="col-md-12">
-		 <div class="col-md-3">
-		 <label>Request Type</label>
-			<div>
-				 <?php
-				$options = array("-1"=>'Select Request Type');
-				
-				//print_r(  $options);
-				
-				if(!empty($RequestType))
-				{
-				foreach ($RequestType as $RID):
-				  
-			   
-				  $options[$RID->ConfigValue] =  $RID->ConfigValue;
-
-				endforeach;
-				}										
-	
-				echo form_dropdown('RequestType', $options,set_value('ConfigValue'),'id="RequestType"' ,'class = "form-control select2"','required="true"');
-
-				?>
-				 
-			</div>
-		 </div>
-		 <div class="col-md-3">
-		 <label>Requested By</label>
-			<div>
-				
-				 <?php
-                                         $data = array('name' => 'EmpID','value' => set_value('EmpID',$FirstName),'id'=>'EmpID',  'class' => 'form-control' ,'readonly' => 'true');
-                                        echo form_input($data);
-                                        ?>  
- <input type="hidden" name="EmpID" id="EmpID" value=<?php echo $EmpID?> />										
-			</div>
-		 </div>
-		 <div class="col-md-3">
-		 <label>Department Name</label>
-		 	<div class="form-group">
-									<?php
-                                         $data = array('name' => 'DeptName','value' => set_value('DeptName',$DepartmentName),'id'=>'DeptName',  'class' => 'form-control' ,'readonly' => 'true');
-                                        echo form_input($data);
-                                        ?>   
-                                </div>
-		 </div>
-		 <div class="col-md-3">
-		 <label>Designation</label>
-		 	<div class="form-group">
-									<?php
-                                         $data = array('name' => 'Designation','value' => set_value('Designation',$Designation),'id'=>'Designation',  'class' => 'form-control' ,'readonly' => 'true');
-                                        echo form_input($data);
-                                        ?>   
-                                </div>
-		 </div>
-	 </div>
-	 <div class="col-md-12">
-	
-	  <div class="col-md-3">
-		 <label>Cost Center Name</label>
-		 <div>
-				 <?php
-				$Costs = array("-1"=>'Select Cost Center Name');
-				//print_r(  $options);		
-												
-					if(!empty($CostCenter))
-										{
-									    foreach ($CostCenter as $SID):
-                                         // echo $SID->ConfigValue;
-									   	  $Costs[$SID->CostCenterCode] =  $SID->CostCenterCode .'-'. $SID->CostCenterName ;
-
-										endforeach;
-											
-										}
-				echo form_dropdown('CostCenter', $Costs,set_value('CostCenter'),'id="CostCenter"' ,'class = "form-control"');
-
-		?>
-				 
-			</div>
-		 </div>
-	 <div class="col-md-3">
-		 <label>Available Budget Amount</label>&nbsp;<img id="AlertImg"  src="<?php echo base_url(); ?>assets/dist/img/red.png" alt="your image" width="25px"  style="display:none"/>
-		 	<div class="form-group">
-				<?php
-					 $data = array('name' => 'AvlBudgetAmount','value' => set_value('AvlBudgetAmount'),'id'=>'AvlBudgetAmount',  'class' => 'form-control' ,'readonly' => 'true');
-					echo form_input($data);
-					?>   
-			</div>
-		 </div>
-            <div class="col-md-3" id="DisplayScheduleDiv" style="display:none;">
-		 <label>Select Service Schedule Type</label>
-		 	<div class="form-group">
-				 <?php
-				$Schdule =array("One Time", "Recurring");
-					
-											
-					if(!empty($Schdule))
-										{
-									    foreach ($Schdule as $Sch):
-                                       
-									   	  $SchType[$Sch] =  $Sch ;
-
-										endforeach;
-											
-										}
-				echo form_dropdown('ScheduleType', $SchType,set_value('ScheduleType'),'id="ScheduleType"' ,'class = "form-control"');
-
-		?>  
-			</div>
-		 </div>
-    <div class="col-md-3" id="ServicePeriodOption" style="display:none;">
-		 <label>Select Service Period Option</label>
-		 	<div class="form-group">
-				 <?php
-				
-					
-												
-					if(!empty($ServiceOption))
-										{
-									    foreach ($ServiceOption as $SerOption):
-                                                                              
-									   	 
-                                                                                  $ServiceOptions[$SerOption->ConfigValue] =  $SerOption->ConfigValue;
-										endforeach;
-											
-										}
-				echo form_dropdown('ServiceOptions', $ServiceOptions,set_value('ServiceOptions'),'id="ServiceOptions"' ,'class = "form-control"');
-
-		?>  
-			</div>
-		 </div>
-<div class="col-md-3" id="NoServices" style="display:none;">
-		 <label>Number of Services</label>
-		 	<div class="form-group">
-				 <?php
-                                     
-                                                            $data = array('name' => 'ServiceNo','value' => set_value('ServiceNo'),'id'=>'ServiceNo',  'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);');
-                                                            echo form_input($data);
-                                                            ?>
-			</div>
-		 </div>
-
-		 	
-	 </div>
-		 	
-	 </div>
-	  
-		 	
-	 </div>
-	 </div>
-         </div>
-	 
-          <div class="container-fluid">    
-  <table class="table table-bordered" style="border:1px solid #333">
-  <div align="right" style="padding-right:10px">
-<div align="right">
-  <a  onclick="return validateBeforeAdd();"  class="btn btn-primary">Add Line Item</a>
-  
-  <div class="modal fade" id="myModal1" role="dialog">
-		<div class="modal-dialog">
-		
-		  <!-- Modal content-->
-		  <div class="modal-content">
-			<div class="modal-header">
-			  <button type="button" class="close" data-dismiss="modal">&times;</button>
-			  <center><h4>Add Line Item </h4></center>				
-			</div>
-			<div align="left"> 
-			 
-			 <div class="col-md-6">
-				<label>Material Code</label>
-					<div >
-						 <?php
-						$options = array("0"=>'Material Code');     
-						//print_r(  $options);
-						
-						if(!empty($MaterialList))
-						{
-						foreach ($MaterialList as $MID):
-						  
-					   
-						  $options[$MID->MaterialCode] =  $MID->MaterialCode.' '.' - '.' '.$MID->MaterialName;
-
-						endforeach;
-						}										
-			
-						echo form_dropdown('MaterialCode', $options,set_value('MaterialCode'),'id="MaterialCode"' ,'class="form-control"');
-
-						?>						 
-					</div>
-			</div>
-
-			<div class="col-md-6">
-				<label>Description</label>
-				<div class="form-group">
-						<?php
-						 $data = array('name' => 'Description','value' => set_value('Description'),'id'=>'Description',  'class' => 'form-control','readonly' => 'true' );
-						echo form_input($data);
-						?>   
-				</div>
-			</div>
-			<div class="col-md-6">
-				<label>UOM</label>
-					<div>
-					<?php
-						 $data = array('name' => 'UOM','value' => set_value('UOM'),'id'=>'UOM',  'class' => 'form-control','readonly' => 'true' );
-						echo form_input($data);
-						?>  
-									 
-					</div>
-			</div>
-			<div class="col-md-6">
-				<label>Quantity</label>
-					<div class="form-group">
-								<?php
-						 $data = array('name' => 'Quantity','value' => set_value('Quantity'),'id'=>'Quantity',  'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event)','maxlength'=>'20');
-						echo form_input($data);
-						?>   
-					</div>
-			</div>
-			
-		 
-			</div>
-			
-			<div class="modal-footer">
-			<a class="btn btn-info font addClick"   ID="addClick"  ><i class="fa fa-plus"></i>&nbsp;&nbsp;<span 	class="bold">Add</span></a>
-						<a  class="btn btn-info" data-dismiss="modal"  value="Cancel">cancel</a>
-			</div>
-		  </div>
-						  
-						</div>
-					  </div>
-   
-  
-  </div><br/> <div class="modal fade" id="EditItem" role="dialog">
-		<div class="modal-dialog">
-		
-		  <!-- Modal content-->
-		  <div class="modal-content">
-			<div class="modal-header">
-			  <button type="button" class="close" data-dismiss="modal">&times;</button>
-			  <center><h4>Edit Line Item </h4></center>				
-			</div>
-			<div align="left"> 
-			 
-			 <div class="col-md-6">
-				<label>Material Code</label>
-					<div >						
-							<?php
-                                         $data = array('name' => 'EditMaterialCode', 'value' => set_value('EditMaterialCode'),'id'=>'EditMaterialCode', 'class' => 'form-control','readonly'=>'true');
-                                        echo form_input($data);
-                                        ?>  						
-					</div>
-			</div>
-
-			<div class="col-md-6">
-				<label>Description</label>
-				<div class="form-group">
-						<?php
-						 $data = array('name' => 'EditDescription','value' => set_value('EditDescription'),'id'=>'EditDescription',  'class' => 'form-control','readonly' => 'true' );
-						echo form_input($data);
-						?>   
-				</div>
-			</div>
-			<div class="col-md-6">
-				<label>UOM</label>
-					<div>
-					<?php
-						 $data = array('name' => 'EditUOM','value' => set_value('EditUOM'),'id'=>'EditUOM',  'class' => 'form-control','readonly' => 'true' );
-						echo form_input($data);
-						?>  
-									 
-					</div>
-			</div>
-			<div class="col-md-6">
-				<label>Quantity</label>
-					<div class="form-group">
-								<?php
-						 $data = array('name' => 'EditQuantity','value' => set_value('EditQuantity'),'id'=>'EditQuantity',  'class' => 'form-control','onkeypress'=>'return isNumberKey(event)','maxlength'=>'20');
-						echo form_input($data);
-						?>   
-					</div>
-			</div>
-			
-		 
-			</div>
-			
-			<div class="modal-footer">
-			<a class="btn btn-info font EditClick"  ID="EditClick"  ><i class="fa fa-plus"></i>&nbsp;&nbsp;<span 	class="bold">Edit</span></a>
-						<a  class="btn btn-info" data-dismiss="modal"  value="Cancel">Cancel</a>
-			</div>
-		  </div>
-						  
-						</div>
-					  </div>
-   
-  
-  </div></br>
-  
-   <table id="Items" class="table table-bordered table-hover" style="background-color:#fff;font-size:12px;">
-                <thead style="background-color:#ddf">
-        <tr>
-        <th>SNo</th>
-        <th>Material Code</th>
-        <th>Material Name</th>
-        <th>Uom</th>
-		<th>Quantity</th>
-         <th>Action</th>
-      </tr>
-    </thead>
-    <tbody id="tempAppend">
-       
-     
-    </tbody>
-	
-  </table>
-         
- <div align="right" style="padding-right:10px">
-   <input type="hidden" name="txtRowCount" id="txtRowCount" />
-   <input type="hidden" name="txtDeletedRow" id="txtDeletedRow" />
-  <a class="btn btn-primary Save"  ID="Save" onclick="Save()" >&nbsp;&nbsp;<span class="bold">Save</span></a> 
- 
-  <input type="submit" class="btn btn-primary" >
-  <input type="reset" class="btn btn-primary">
-   
-  </div>
-         <br>
-	 </div>
-         </div>
-         
-        </section>
-</div>
-
-<script> 
-var isExceed = 0;
-function isNumberKey(evt)
-       {
-          var charCode = (evt.which) ? evt.which : evt.keyCode;
-          if (charCode != 46 && charCode > 31 
-            && (charCode < 48 || charCode > 57))
-             return false;
-
-          return true;
-       }
-	
-$(function() {
-	
-    $( ".datePicker" ).datepicker({ dateFormat: 'dd/mm/yy' });
-
-    //Initialize Select2 Elements
-    $(".select2").select2();
-	
-$('#CostCenter').change(function() {
-    
- var id = $('#CostCenter').val();
- $("#AvlBudgetAmount").val('');
-
- var ReqType = $('#RequestType').val();
-  
-		if(id != '-1' && ReqType != '-1')
-		{
-			
-			$('#content').loader('show');
-		  $.ajax({ 
-			data:{id:id},
-			type:"POST",
-			url:"<?php echo base_url() ?>servicepurchaseorder/AvilBudgetAmount?ReqType="+ReqType, 
-			success:function(data) {
-			if(data)
-			{
-				$('#content').loader('hide'); 
-				$("#AvlBudgetAmount").val(parseFloat(data).toFixed(2));
-				if(parseFloat($("#AvlBudgetAmount").val()) <= 0)
-				{
-					$('#AlertImg').removeAttr("style");	
-					isExceed = 1;					
-				}
-				else
-				{
-					 $('#AlertImg').attr("style","display:none;");
-					 isExceed =0;	
-				}
-			}
-			else
-			{
-				$('#content').loader('hide'); 
-				alert("Error");	
-			}
-			}			
-			  
-			});	
-			
-		}
-		else
-		{
-			alert('Please select the Requistion Type');
-			$('#CostCenter').val("-1");
-			return false;
-		}
-  
-});
-	$('#RequestType').change(function() 
-	{
-	 $("#AvlBudgetAmount").val('');	
-      $('#AlertImg').attr("style","display:none;");
-	$('#txtRowCount').val('');
-	$('#txtDeletedRow').val('');	
-      $("#Description").val('');
-	$("#UOM").val('');
-	$('#CostCenter').val("-1");
-		 
-	 removeHiddenRows($('#Items').find('tr').length);
-	 $('#tempAppend').empty();
-	var id = $('#RequestType').val(); 
-
-		if(id != '-1')
-		{
-			$('#content').loader('show');
-
-			$.ajax({
-			data:{id:id},
-			dataType: 'json',
-			type:"POST",
-			url:"<?php echo base_url();?>requisitionform/getMaterialCode",
-			success:function(json) {		
-			$('#content').loader('hide');
-				
-				$("#MaterialCode").empty();
-				$("#MaterialCode").append(json.Material);
-               // $("#Description").val(json.MaterialName);	
-				//$("#UOM").val(json.UOM);	
-                        if(id!='SERVICE'){
-                       $('#DisplayScheduleDiv').hide();
-                        $('#ServicePeriodOption').hide();
-                        $('#NoServices').hide();
-                       
- 
-                                            }
-                             else{
-                     $('#DisplayScheduleDiv').show();
-                     
-                              }
-                       				
-		      }
-			  
-			});	
-			//$('#content').loader('hide');
-		}
-		else
-		{
-			alert('Please select the RequestType');
-			return false;
-		}
-  
-});
-$('#MaterialCode').change(function() {
-    
- var id = $('#MaterialCode').val(); 
-
-$("#Description").val('');	
-$("#UOM").val('');	
-		if(id != '-1')
-		{
-			$('#content').loader('show');
-
-			$.ajax({
-			data:{id:id},
-			dataType: 'json',
-			type:"POST",
-			url:"<?php echo base_url();?>requisitionform/getMaterialDetails",
-			success:function(json) {		
-			$('#content').loader('hide');
-			//alert(json.MatDetail);
-					$("#Description").val(json.MatDetail[0]['MaterialName']);	
-					$("#UOM").val(json.MatDetail[0]['UOM']);									
-		      }
-			  
-			});	
-			//$('#content').loader('hide');
-		}
-		else
-		{
-			alert('Please select the RequestType');
-			return false;
-		}
-  
-});
-
-
-});
-	</script>
-	<script type="text/html" id="tempList">
-<tr  id="<%=index%>">
-<td align="left"><%=index%></td>
- <td align="left"><%=MaterialCode%></td>
- 
-  <td align="left"><%=MaterialName%></td>
-  
-  <td align="left"><%=UOM%></td>
-
-  <td align="left"><%=Quantity%></td> 
-   <td>
-                          <a    data-target='#EditItem'	data-id="<%=index%>" data-userid="<%=index%>" data-toggle="modal" href="#EditItem"><i class="fa fa-pencil" data-toggle="tooltip" title="Click here to view/Edit the  <%=MaterialCode%> Material details"></i>&nbsp;&nbsp;&nbsp;</a> <a href='#' onclick = "Deleterow(<%=index%>)" class="link" data-id="<%=index%>" data-userid="<%=index%>"  id="Del" ><span class="glyphicon glyphicon-trash"></span></a>
-						 
-						  
-                      </td>
-</tr>
-</script>
-<script>
-var index     = '1';
-var userid  = '';
-function removeHiddenRows(rowcount)
-{
-	var step;
-	
-	if(rowcount > 2)
-	{
-for (step = 1; step < rowcount ; step++) {
-	var td = document.getElementById(step);
-	td.parentNode.removeChild(td);
-	$("#MaterialCode"+step).remove();
-	$("#Description"+step).remove();
-	$("#UOM"+step).remove();
-	$("#Quantity"+step).remove();
-	index     = '1';
-	userid  = '';
-}	
-}
-}
-function Save()
-{  
-
- var id = '<?php echo REQ_DRAFT;?>'
-	if(validate())
-		{ 	
-			if(document.getElementById('Items').rows.length < 0)
-			{
-				alert('Please Select Line item to Create Requisition');
-				$('#Deliverydt').focus();
-				return false;
-			}
-			
-			else
-			{
-                       var serviceSchedule='';
-                       var servicePeriod='';
-                       var noOfService='';
-                        if($('#RequestType').val()=='SERVICE'){
-                           if($('#ScheduleType').val()=='Recurring'){
-                             serviceSchedule=$('#ScheduleType').val();
-                           servicePeriod=$('#ServiceOptions').val();
-                            noOfService=$('#ServiceNo').val();
-                              }
-                         else{
-                              serviceSchedule=$('#ScheduleType').val();
-                           servicePeriod='';
-                            noOfService=0;
-                           }
-                          
-                             }
-                               else{
-                            var serviceSchedule='';
-                            var servicePeriod='';
-                            var noOfService='';
-                             }
-				$('#content').loader('show');
-		  $.ajax({ 
-			data:$('.requistion').serialize()+"&serviceSchedule="+serviceSchedule+"&servicePeriod="+servicePeriod+"&noOfService="+noOfService,
-			type:"POST",
-			url:"<?php echo base_url() ?>requisitionform/addNewRequistion?ID="+id, 
-			success:function(data) {
-			if(data)
-			{
-				$('#content').loader('hide'); 
-				alert(data);
-				$('#txtRowCount').val('');
-				$('#txtDeletedRow').val('');
-				
-				window.location =	"Requisition";
-			
-			}
-			else
-			{
-				alert("Error");	
-			}			
-		
-		}
-  
-});
-			}
-
-}
-}
-function validate()
-{
-	if($("option:selected", $("#RequestType")).val() == '-1')
-	{
-		alert('Please Select ReqType Names');
-		return false;
-	}
-	else if($("option:selected", $("#EmpID")).val() == '-1')
-	{
-		alert('Please Select Reqby');
-		return false;
-	}
-	else if($("#txtRowCount").val().length < 1)
-	{
-		alert('Please Add Line Item');
-		return false;
-	}
-	else if(isExceed == 1)
-	{
-		alert('You dont have Budget and You cant Raise New Requisition');
-		return false;
-	}
-	else 
-	{
-	return true;
-	}
-	
-}	
-function Deleterow(rowid)
-{
-	   var DelRows  = $('#txtDeletedRow').val();
-	  
-	   var answer = confirm(" Do you want to delete the Item from the List?")
-		if (answer) 
-		{ 			
-			var td = document.getElementById(rowid);
-			td.parentNode.removeChild(td);
-	
-		  if(DelRows != '')
-		  {
-		  DelRows = DelRows + ":" + rowid;
-		  }
-		  else
-		  {
-			  DelRows=  "0" + ":" + rowid;
-		  }
-		  $('#txtDeletedRow').val(DelRows);
-		}
-       	
-} 
-function validateBeforeAdd()
-{
-	if($("option:selected", $("#RequestType")).val() == '-1')
-	{
-		alert('Please select the Request Type ');
-		$("#RequestType").focus();
-		return false;
-	}
-	else if($("#CostCenter").val() == '-1')
-	{
-		alert('Please select the Cost center to check the Budget Availablity ');
-		$("#CostCenter").focus();
-		return false;
-	}
-	else if( isExceed == '1')
-	{
-		alert('You dont have available Budget Amount. You cant raise new Requisition');
-		return false;
-	}	
-	else
-	{
-		 $('#myModal1').modal('show');
-	}
-}
-
-$('.addClick').click(function(){
-         
-       if ($("#MaterialCode option:selected").val() =='-1' )
-		{
-			 alert('Please Select the MaterialCode ');
-			 return false;
-		}	
-			
-    	if(document.getElementById('Quantity').value == '' )
-		{
-		  alert('Please Enter the Quantity');
-		  return false;
-		  
-		}	  
-		
-        if ($("#MaterialCode option:selected").val() !='-1' &&  $('#Quantity').val() != ''  )
-        {		       
-         var temp = index;
-         var materialCode = $("#MaterialCode option:selected").val();
-         var materialName =  $("#Description").val();
-         var uom = $("#UOM").val();
-		 var quantity = $("#Quantity").val();
-		 
-		$('#MaterialCode option[value='+materialCode+']').remove();
-		  
-		 $('#Description').val(''); 
-		  $('#UOM').val(''); 
-		   $('#Quantity').val('');       
-			
-			index = parseInt(index)+1;		
-		 
-	      var template = jQuery("#tempList").html();
-	   
-	     
-          $('#tempAppend').append(_.template(template,{index:temp,MaterialCode:materialCode,MaterialName:materialName,UOM:uom,Quantity:quantity}));
-		  
-		  
-		 var theForm = $(".requistion");
-		
-		 addHidden(theForm,"MaterialCode"+temp,materialCode);
-		 addHidden(theForm,"Description"+temp,materialName);
-	     addHidden(theForm,"UOM"+temp,uom);
-		 addHidden(theForm,"Quantity"+temp,quantity);		
-		 
-		 $('#txtRowCount').val(temp); 			
-		
-      }    
-   
- });
- function addHidden(theForm, key, value) {
-    // Create a hidden input element, and append it to the form:
-    var input = document.createElement('input');
-    input.type = 'hidden';
-    input.name = key;'name-as-seen-at-the-server';
-    input.id = key;'name-as-seen-at-the-server';
-    input.value = value;
-    theForm.append(input);
-}
-$("#myModal1").on("shown.bs.modal", function(e) {
-    if($("option:selected", $("#RequestType")).val() == '-1')
-	{
-		alert('Please select the Request Type ');
-		e.close();
-	}
-});
-
-$("#EditItem").on("shown.bs.modal", function(e) {
-     userid = $(e.relatedTarget).data('userid');
-	// alert(userid);
-	 var tr= document.getElementById(userid);
-	 var cellval = tr.cells;
-	 //alert(x[1].innerHTML);
-	$('#EditMaterialCode').val(cellval[1].innerHTML);
-	$('#EditDescription').val(cellval[2].innerHTML);
-   $('#EditUOM').val(cellval[3].innerHTML);
-    $('#EditQuantity').val(cellval[4].innerHTML);
-});
-
-$('.EditClick').click(function(){
-         
-   		if(document.getElementById('EditQuantity').value == '' )
-		{
-		  alert('Please Enter the Quantity' );
-		 }  
-		
-        if ( $('#EditQuantity').val() != '' )
-        {	
-      
-			var editMaterialCode =  $("#EditMaterialCode").val();
-			var editDescription = $("#EditDescription").val();		
-			var editUOM = $('#EditUOM').val();
-			var editQuantity = $('#EditQuantity').val();
-     	
-            var tr= document.getElementById(userid);
-			var cellval = tr.cells;   
-			cellval[1].innerHTML = editMaterialCode;
-			cellval[2].innerHTML = editDescription;
-			cellval[3].innerHTML =editUOM;
-			cellval[4].innerHTML = editQuantity;
-			
-			$('#MaterialCode'+userid).val(editMaterialCode);
-			$('#Description'+userid).val(editDescription);
-			$('#UOM'+userid).val(editUOM);
-			$('#Quantity'+userid).val(editQuantity);
-            			
-		
-      }
-    
- });
-  $(".requistion").submit(function(e) {
-        
-		var id='<?php echo REQ_PENDING_APPROVAL;?>'
-		e.preventDefault();
-		if(validate())
-		{
-			if(document.getElementById('Items').rows.length < 0)
-			{
-				alert('Please Select Line item to Create Requisition');
-				$('#Deliverydt').focus();
-				return false;
-			}
-			else
-			{
-                         var serviceSchedule='';
-                       var servicePeriod='';
-                       var noOfService='';
-                        if($('#RequestType').val()=='SERVICE'){
-                           if($('#ScheduleType').val()=='Recurring'){
-                             serviceSchedule=$('#ScheduleType').val();
-                           servicePeriod=$('#ServiceOptions').val();
-                            noOfService=$('#ServiceNo').val();
-                              }
-                         else{
-                              serviceSchedule=$('#ScheduleType').val();
-                           servicePeriod='';
-                            noOfService=0;
-                           }
-                          
-                             }
-                               else{
-                            var serviceSchedule='';
-                            var servicePeriod='';
-                            var noOfService='';
-                             }
-				$('#content').loader('show');
-		  $.ajax({ 
-			data:$('.requistion').serialize()+"&serviceSchedule="+serviceSchedule+"&servicePeriod="+servicePeriod+"&noOfService="+noOfService,
-			type:"POST",
-			url:"<?php echo base_url() ?>requisitionform/addNewRequistion?ID="+id, 
-			success:function(data) {
-			if(data)
-			{
-				$('#content').loader('hide'); 
-				alert(data);
-				$('#txtRowCount').val('');
-				$('#txtDeletedRow').val('');
-				
-				window.location =	"Requisition";
-			
-			}
-			else
-			{
-				alert("Error");	
-			}			
-		
-		}
-  
-	}); 
-	
-			}
-		}
-	
-		 });
-		 <!-- script for table , It works under the datatable plugin-->
- $(function () {  
-    $('#Items').DataTable({
-      "paging": false,
-      "lengthChange": true,
-      "searching": false,
-      "ordering": false,
-     "info": false,
-      "autoWidth": true
-	   
-    }); 
-  });
-
-$("#ScheduleType").change(function(){
-if($('#ScheduleType').val().trim()!='Recurring'){
-document.getElementById('ServicePeriodOption').style.display = 'none';
-document.getElementById('NoServices').style.display = 'none';
-               
-                        $('#ServiceNo').val('');
-}
-else{
-document.getElementById('ServicePeriodOption').style.display = 'block';
-document.getElementById('NoServices').style.display = 'block';
-document.getElementById('ServiceNo').value = 1;
-}
- 
-});
-</script>
diff --git a/application/views/revenuepopdf.php~ b/application/views/revenuepopdf.php~
deleted file mode 100644
index 4b69b338..00000000
--- a/application/views/revenuepopdf.php~
+++ /dev/null
@@ -1,326 +0,0 @@
-<?php
-    
-		$PONO = '';
-		$postatus ='';
-		$CompanyAddress = '';
-        $CompanyName = '';
-	    $SuplierName = '';
-		$SuplierAddress = '';
-		$DeliveryAddress = '';
-		$Podt = '';
-		$DeliveryDate ='';
-		$postatus='';
-		$ServiceDescription = '';
-                   $PaymentTerms = '';
-                 $PaymentDays='';
-                $PayableAT='';
-                $DeliverySchedule='';
-	if(!empty($CompanyDetails))
-		{
-    foreach ($CompanyDetails as $CO)
-    {
-		$CompanyName = $CO->CompanyName;
-		$CompanyAddress = $CO->Address;
-		
-	}
-        }	
-		if(!empty($POItem))
-		{
- 
-    foreach ($POItem as $PO)
-    {
-		 $PONO = $PO->PONO;
-		  $postatus= $PO->Status;
-		 $SuplierName = $PO->SupplierName;
-		$SuplierAddress = $PO->Address;
-		$DeliveryAddress = $PO->DeliveryAddress;
-		 $postatus= $PO->Status;
-		$dt = new DateTime($PO->PODate, new DateTimeZone('Asia/Kolkata'));				
-		$Podt =  $dt->format('d-m-Y');
-                if($PO->DeliveryOption=='1'){
-                 $DeliveryDate =  '';
-                 $DeliverySchedule =  $PO->DeliverySchedule;
-                    }
-                    else{
-            $dtDe = new DateTime($PO->DeliveryDate, new DateTimeZone('Asia/Kolkata'));				
-		$DeliveryDate =  $dtDe->format('d-m-Y');
-                $DeliverySchedule =  '';
-                    }
-		
-               
-		$ServiceDescription =$PO->ServiceDescription;
-                $PaymentTerms = $PO->PaymentTerms;
-                $PaymentDays=$PO->PaymentDays;
-                $PayableAT=$PO->PayableAT;
-		
-	}
-}
-		 $currencyName='INR';
-                $currencyCode ='';
-            if(!empty($CurrencySymbol))
-                            {
-                foreach ($CurrencySymbol as $Curr)
-                {
-                   
-                            $currencyCode = $Curr->FontCode2000;
-                            //$currencyName = $currencyName;
-                        
-
-                    }
-
-                    }
-
-             
-         ?>
-<style>
-	@page { margin: 280px 50px 30px 50px; }
-	.header { position: fixed; left: 0px; top: -280px; right: 0px; height: 550px;text-align: center; }
-	.footer { position: fixed; bottom: 0px; }
-	.pagenum:before { content: counter(page); }
-</style>
-<div class="footer">Page: <span class="pagenum"></span></div> 
-<div class="header">
-			<div style="text-align:right;">
-			<?php 
-				if ($postatus == 'ST026')
-				{}
-				else
-				{
-					echo '<div><b>DRAFT</b> </div>';
-					 
-				}
-
-				?>
-				</div>
-				 
-	<center> <span style="font-size:24px;">PURCHASE ORDER - <a style="color:#515151">PO NO:<?php echo $PONO?> </a></span></center>
-	 
- 
-<table style="border-collapse: collapse;font-size:12px;" border="1" width="100%" cellspacing="0" cellpadding="0">
-<tbody>
-<tr> 
- 
-<td colspan="2">
-<p style="color:#3c8dbc;font-size:16px;"><strong><?php echo $CompanyName; ?></strong></p>
-<p> <?php echo $CompanyAddress; ?></p>
-</td>
-<td align="right"><img  width="100" height="100"  src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAABQCAYAAACOEfKtAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA11JREFUeNrsnT9IHEEYxWfFw8rgpUhlo5URi2gTbIUUSrq1ui4oRLRIY9JIKrGKTQrBgJLuuutEi4CtSSOpPIuATdIEcid2YpN9C3sc8c6bf7uZmX0P7k7ultm7337zzXxvZjGaiaIfQoiqoHTUHk6eniSPUbLQUmUoebojB23dDZGBmQiQAAmQAAmQIkACJEACpAiweA3bbvDV5mb6+iKOxfTc3MDjf15dicbBQfr3591d7wBGM1H0J3l9bNLI84UFsby6mkIzFWACJMCafJ9PJyfSx29vbHQuoqJaxl34zc5O+mVtwIPi5EIcXV52IjnoLvx+by/9wXkIF8aHbq0dgYi4vOB1Q7QV2c4BXM4Z3r+RGBTAR9VqmqhVBoZnIyOdx9taTXqQGJ+YUDqXFwBV4WGU69aXRkNsr69LtyEzHfIKIKJCVl9PT3u+/63P+6bnC64SuWm3jdsYn5xkKcdamCJAAiwjQJcHAC8ATs/OBg1Qy0y4ub6WPhb1cuPwUFycn9/77OPWlvXzeQGw2QPGQ9o/PhZrS0v3IPpooFrpwgChYniidq6fnTnvrBSaA3Uc3A/1uvPuSmEA0f0uFLsyBKcZDjaisvSj8DsFW6pbcHPQpV12WQoBCHhri4taEOGwhJAXjeeBgFebn1eyp0LKi1Ym0rCsXieRqLk06HVetFqJwHmWnRz3yotHzabT9n0hpRxGZ0SjjpGKCEQkxgUtWDlbCyMfIi/qTHMgrDf7srCem5mQDS5YQNKRD2vCuQLMhCVM3bwIiK4PLIUYqrp5EXPFeGWFALO8CEdGddId7NYOHWFQUa1cUO4Fty78/fZW6tFrjx7gqfqAT0PbmWAqVCwq+bDUOxMeyokh6L8B1J1kE2BgIkACJMDyAbSx56/cACV3CoyOjfX9rNSrcrI7E/qVYYCnYhKY3LXkJECVOdx+Us51m6Nwm7HVQyUCf4UGEJuFZPMgIhC+XlYfw21WWQ/GxXJ50q09iBS1MSjYW73ww3SXMVXOobsk4MU80GQZc5DQbl5tOzWRRpS8nJqy1tUAzWZ7ecvKDdfdggWfTV0GbdnA4JB1UdhbHjo0LesAS6YWa2GaCQRIgARIESABEiABUgRIgARYRoAVYtBWBfcL/xb8hwS6av8VYADVjF2M5sTWJAAAAABJRU5ErkJggg=="></td> 
-</tr>
-<tr>
-<td>
-<p><strong>Vendor Address :</strong></p>
-<p><?php echo $SuplierName; ?><br /><?php  echo $SuplierAddress; ?></p>
-</td>
-<td colspan="2">
-<p><strong>Delivery To :</strong></p>
-<p><?php  echo $DeliveryAddress; ?></p>
-</td>
-</tr>
-<tr>
-<td>PO DATE :<?php echo $Podt; ?></td>
-<td colspan="2">DELIVERY DATE / SCHEDULE BY :<?php echo $DeliveryDate.$DeliverySchedule;?></td>
-</tr>
-</tbody>
-</table>
-	
-	 
-</div>
-<table style="border-collapse: collapse;" border="1" width="100%" cellspacing="0" cellpadding="0">
-<tbody>
-<tr>
-<td>Requistion Number</td>
-<td>Requested By</td>
-<td>Requested Department</td>
-<td>Cost Center &nbsp;</td>
-</tr>
-<?php
-				if(!empty($RequistionDetails))
-				{
-					
-					foreach($RequistionDetails as $ReqDetails)
-					{
-												  						
-				?>
-			<tr>
-			<td><?php echo $ReqDetails['RequistionNo']; ?></td>
-			<td><?php echo $ReqDetails['RequestedName']; ?></td>
-			<td><?php echo $ReqDetails['RequestedDept']; ?></td>
-			<td><?php echo $ReqDetails['CostCenterCode']; ?></td>
-			</tr> 
-			 <?php
-						}
-						}
-						
-					  ?>
-</tbody>
-</table>
-<p>&nbsp;</p>
-<p>&nbsp;</p>
-<table style="border-collapse: collapse;" border="1" width="100%" cellspacing="0" cellpadding="0">
-<tbody>
-<tr>
-<td>#</td>
-                <td>Item Name</td>
-                <td>UOM</td>
-                <td>Qty</td>
-                <td>Rate In INR</td>
-                <td>Basic Value In INR</td>
-                <td>Discount In INR</td>
-		<td>SGST In INR</td>
-		<td>CGST In INR</td>
-		<td>IGST In INR</td>
-		<td>Packaging In INR</td>		 
-		<td>Insurance In INR</td>
-		<td>Freight In INR</td>
-		<td>Total Amount In INR</td>
-</tr>
-<?php
-							if(!empty($POItem))
-							{
-
-								 $index = 0;
-								 $TotalAmount = 0;
-								 $OrderValue = 0;
-								  $TotalTax = 0;
-                                                                  $SubTotalAmount = 0;
-								foreach($POItem as $record)
-								{
-									$index = $index + 1;
-									$TotalAmount = $record->BasicValue+$record->Taxamount;
-							?>
-		<tr  style="line-height: 1.5em;">
-		<td><?php echo $index ; ?></td>
-		<td><?php echo $record->MaterialName ; ?></td>
-		<td align="right"><?php echo $record->UOM ; ?></td>
-		<td align="right"><?php echo $record->Quantity ; ?></td>
-		
-		<td align="right"><?php echo $record->Rate  ; ?></td>
-		<td align="right"><?php echo $record->BasicValue;?></td>
-                 <td align="right"><?php echo $record->AfterDiscount;?></td>
-                <td align="right"><?php echo $record->AfterSGST  ; ?></td>
-                <td align="right"><?php echo $record->AfterCGST ; ?></td>
-		
-		
-		<td align="right"><?php echo $record->AfterIGST  ; ?></td>
-		<td align="right"><?php echo $record->AfterPackagingValue;?></td>
-                <td align="right"><?php echo $record->AfterFreightValue;?></td>
-                <td align="right"><?php echo $record->Insurance;?></td>
-		<td align="right"><?php echo  number_format($TotalAmount,2)  ; ?></td>
-		</tr>
-								
-		 <?php
-		 						
-								$SubTotalAmount  = $SubTotalAmount + $record->BasicValue;
-								 $TotalTax = $TotalTax+$record->Taxamount;
-								$OrderValue = $SubTotalAmount + $TotalTax;
-								
-								}
-							
-								
-									
-							}
-							
-							?>
-
-</tbody>
-</table>
-<p>&nbsp;</p>
-
-
-
-
-
-<p>&nbsp;</p>
-
-<table style="border-collapse: collapse;" border="1" width="100%" cellspacing="0" cellpadding="0">
-
-<tbody>
-
-<tr>
-
-<td style="text-align: center;" rowspan="3">
-
-<p><strong>Total Amount In Words</strong><br /><br /><br /></p>
-
-<p><em><strong><?php echo $TotalAmountInWords;?></strong></em></p>
-
-</td>
-
-<td style="text-align: right;"><strong>Total Amount Before Tax In INR <?php echo number_format($SubTotalAmount,2);?></strong></td>
-
-</tr>
-
-<tr>
-
-<td style="text-align: right;"><strong>Total Tax Amount In INR <?php echo number_format($TotalTax,2);?></strong></td>
-
-</tr>
-
-<tr>
-
-<td style="text-align: right;"><strong>Total Amount After Tax In INR <?php echo number_format($OrderValue,2);?></strong></td>
-
-</tr>
-
-<tr>
-
-<td>
-
-<p><strong>Payment Terms&nbsp;</strong></p>
-
-<p><?php echo $PaymentTerms;?></p>
-
-</td>
-
-<td>
-
-<p style="text-align: center;">Certified that the particulars given&nbsp;above are true and correct</p>
-
-<p style="text-align: center;"><strong><?php echo $CompanyName; ?></strong></p>
-
-<p>&nbsp;</p>
-
-<p style="text-align: center;">Authorized Signatory</p>
-</td>
-</tr>
-</tbody>
-</table>
-<p><strong>Special Instruction:</strong></p>
-<p><?php echo $ServiceDescription;?></p>
-<?php 
-
-		if(!empty($releasedetails)){
-			
-			 $releasedOn = '';
-			foreach($releasedetails as $detail){
-                $releasedOn= new DateTime($detail->ReleasedOn, new DateTimeZone('Asia/Kolkata'));
-                      
-
-		?>
-	
-		
-		<!-- <table   width="100%">
-			<tbody>
-			<tr>
-			<td><b>Released By:</b></td>
-			<td style="text-align:right;"><b>Released On:</b></td>
-			</tr>
-			<tr>
-			<td><?php echo $detail->FirstName;?></td>
-			<td style="text-align:right;"><?php echo $releasedOn->format('d-m-Y');?></td>
-			</tr>
-			</tbody>
-		</table> -->
-		<p>&nbsp;</p>
-		 <div align="Left"> <b>Released By : </b><?php echo $detail->FirstName;?></div> 
-		 <div align="Left"> <b>Released On : </b><?php echo $releasedOn->format('d-m-Y');?></div> 
-		<?php 
-					}
-				}
-						 else {
-						
-					 
-				?>
-						  
- 
-						   <?php } ?>   
\ No newline at end of file
diff --git a/application/views/servicePurchaseorder.php~ b/application/views/servicePurchaseorder.php~
deleted file mode 100644
index 1a02c2f5..00000000
--- a/application/views/servicePurchaseorder.php~
+++ /dev/null
@@ -1,2136 +0,0 @@
-<?php $ReqType =''; 
-$CompanyAddress = '';
-$dt = new DateTime('now', new DateTimeZone('Asia/Kolkata'));				
-$CurrentDate =  $dt->format('Y-m-d');
-$MaxPoDate = '';
-$AvlAmount = 0;
-$Value="&#8377;";
-if(!empty($MaxPODate))
-{
-    foreach ($MaxPODate as $date)
-    {
-		$MaxPoDate = $date->PODate;		
-	}
-}
-if(!empty($CompanyDetails))
-{
-    foreach ($CompanyDetails as $Req)
-    {
-		$CompanyAddress = $Req->Address;
-	}
-}
-if(!empty($AvlBudAmt))
-{
-   
-		$AvlAmount = $AvlBudAmt;		
-	
-}
-
-
-if(!empty($INRSYMBOL))
-{
-
-	foreach($INRSYMBOL as $INRS)
-	{
-      $INRSYM=$INRS->FontCode2000;
-
-	}
-}
-
-
-?>
-<script src="<?php echo base_url()?>assets/tinymce/js/tinymce/tinymce.min.js"></script>
-<script src="<?php echo base_url(); ?>assets/js/CreatePOValidation.js" type="text/javascript"></script>
-<script type="text/javascript">
-       tinymce.init({
-          selector: "textarea#ScopeOfWork"//,
-          
-           //plugins: "link image"
-        });
-      
-       </script>
-
- 
-<script>
-
-var RequistQuantity = '';
-var AvilBudAmt = '';
- var POMaxDate = '<?php echo $MaxPoDate;?>';
-  var d = new Date(POMaxDate);
-   var SelectedMaterialCode = [];
- var CollIndex = 0;
-  var SelectedMaterialList = {
-    Mat: []
-};
- $(function() {  
- 
- $("#PODate").datepicker({
-	minDate : d,
-	maxDate : 'now',
-	dateFormat: 'mm/dd/yy',changeMonth: true, changeYear: true,yearRange: '-100:+0'
-});
- $("#Deliverydt").datepicker({
-	minDate : 'now',	
-	dateFormat: 'mm/dd/yy',changeMonth: true, changeYear: true,yearRange: '0:+10'
-});	 
-
-
-
-
-
-
-
-document.getElementById("Date").checked = true;
-	
-$('#drpSupplier').change(function() {
-    
- var id = $('#drpSupplier').val();
-
- $("#SupAddress").val('');
- 
-		if(id != '0')
-		{
-			var y = <?php echo json_encode($Suplist, JSON_PRETTY_PRINT) ?>;
-                   
-	 			
-		$.each(y, function(idx, obj) {
-			if(obj.SupplierID === id)
-			{
-				$("#SupAddress").val(obj.Address);
-
-				$("#SupAddress").val(obj.Address);
-                                PaymentID = obj.PaymentID;
-                          $("#PaymentTerms").val(obj.PaymentID);
-                         
-				
-			}
-			
-		});
-               
-			
-		}
-		else
-		{
-			alert('Please select the SupplierID');
-			return false;
-		}
-  
-});	
-
-$('#ReqNo').change(function() {
-
-    
- var id = $('#ReqNo').val();
- $("#AvlBudAmt").val('');
-
-  $("#MaterialCode").empty();
-  $("#deptName").val('');
- $("#UOM").val('');
-$("#Quantity").val('');
-$("#ItemName").val('');
-$("#Rate").val('');
-$("#txtBasicValue").val('');
- $("#CostCenter").val('');
- clearTaxField();
-		if(id != '0')
-		{
-			var y = <?php echo json_encode($RequistionDetails, JSON_PRETTY_PRINT) ?>;
-			
-			var Material = <?php echo json_encode($MaterialList, JSON_PRETTY_PRINT) ?>;
-			var AvlBudAmt = '<?php echo $AvlAmount ?>'; 
-			
-		// For Binding DepartmentName	           			
-		$.each(y, function(idx, obj) {
-			if(obj.ReqNo === id)
-			{
-				$("#deptName").val(obj.DepartmentName);
-				$("#CostCenter").val(obj.CostCenterCode);
-                                if(obj.Service_Period!='' && obj.Service_Period!=null){
-                                $("#Frequency").val(obj.Service_Period +'-' + obj.NumberOfService);
-                                $("#FrequencyNo").val(obj.NumberOfService);
-                                
-                               }
-                           else{
-                            var text='One Time';
-                              $("#Frequency").val(text);
-                              $("#FrequencyNo").val(1);
-                               }
-				
-			}			
-		});
-		$("#AvlBudAmt").val(parseFloat(AvlBudAmt).toFixed(2));	
-			
-			
-		// For Binding Material list center for the selected Requistion Number	
-		$("#MaterialCode").append( $('<option></option>').val("0").html("Select Material Code") );
-		var isAdded = "0";
-		 for(i=0;i<Material.length;i++)
-		{
-		$.each(Material[i], function(idx, obj) {
-			
-				if(obj.ReqNo === id )
-				{
-									   
-						$.each(SelectedMaterialList.Mat, function(idx1, el){															
-							if (id == el.ReqNo )
-							{
-															
-								if(el.materialCode == obj.MaterialCode)
-								{
-										isAdded  = "1";
-										return false;																		
-								}
-								else
-								{
-									isAdded  = "0";
-								}
-								
-							}
-					});
-					
-					 
-						if(isAdded  == "0")
-						{
-							
-							$("#MaterialCode").append( $('<option></option>').val(obj.MaterialCode).html(obj.MaterialCode + "-" + obj.MaterialName));
-						}
-												
-				}
-			
-			
-		});
-		}
-		}
-		else
-		{
-			alert('Please select the Requisition Number');
-			return false;
-		}
-		id = '';
-  
-});	
-$('#MaterialCode').change(function() {
-    
- var id = $('#MaterialCode').val();
-  $("#ItemName").val('');
-$("#UOM").val('');
-$("#Quantity").val('');
-$("#ItemName").val('');
-$("#Rate").val('');
-$("#txtBasicValue").val('');
- RequistQuantity = '';
- clearTaxField();
-		if(id != '0')
-		{
-			var Material = <?php echo json_encode($MaterialList, JSON_PRETTY_PRINT) ?>;
-			
-	 for(i=0;i<Material.length;i++)
-		{
-		$.each(Material[i], function(idx, obj) {
-			if(obj.MaterialCode === id)
-			{
-				$("#ItemName").val(obj.MaterialName);
-				$("#UOM").val(obj.UOM);
-				$("#Quantity").val(obj.Quantity);
-				RequistQuantity	= 	obj.Quantity;		
-			}			
-		});			
-		}
-		}
-		else
-		{
-			alert('Please select the MaterialCode');
-			return false;
-		}
-  
-});
-
-
-$('#EditMaterialCode').change(function() {
-    
- var id = $('#EditMaterialCode').val();
- $("#EditItemName").val('');
-$("#EditUOM").val('');
-$("#EditQuantity").val('');
-//$("#EditRate").val('');
-//$("#txtEditBasicValue").val('');
- RequistQuantity = '';
-// clearEditTaxField();
-		if(id != '0')
-		{
-			var Material = <?php echo json_encode($MaterialList, JSON_PRETTY_PRINT) ?>;
-			
-	  for(i=0;i<Material.length;i++)
-		{
-		$.each(Material[i], function(idx, obj) {
-			if(obj.MaterialCode === id)
-			{
-				$("#EditItemName").val(obj.MaterialName);
-				$("#EditUOM").val(obj.UOM);
-				$("#EditQuantity").val(obj.Quantity);
-				RequistQuantity	= 	obj.Quantity;		
-			}			
-		});			
-		}
-		
-		}
-		else
-		{
-			alert('Please select the MaterialCode');
-			return false;
-		}
-  
-});
-
-
-});	
-
-
-function Ratechange(){
-	 
-		if($('#ReqNo').val() == "0")
-		 {
-			 alert('Please select the Requisition Number');
-			 $('#ReqNo').focus();
-			 return false;
-		 }
-		 else if($('#MaterialCode').val() == "0")
-		 {
-			alert('Please select the Material Code');
-			$('#MaterialCode').focus();
-		   return false;
-		 }
-		 else if($('#CostCenter').val() == "0")
-		 {
-				alert('Please select the CostCenterCode');
-				$('#CostCenter').focus();
-			return false;
-		 }
-	 ExceedQuantityCheck();
-	  
-	 if($('#Quantity').val() != '' && $('#Rate').val() != '')
-	 {	  
-      var txtQuantity = parseFloat( $('#Quantity').val());
-	  var txtUnitPrice = parseFloat($('#Rate').val());
-          var frequencyValue = parseFloat($('#FrequencyNo').val());
-	  var Tot =  txtQuantity * frequencyValue * txtUnitPrice;
-	  $('#txtBasicValue').val(parseFloat(Tot).toFixed(2));
-	  
-	 //Service Tax calculation
-        
-        $('#AfterCgst').val(calculateCgstTax($('#txtBasicValue').val(),$('#Cgst').val()));
-        $('#AfterSgst').val(calculateSgstTax($('#txtBasicValue').val(),$('#Sgst').val()));
-         $('#AfterIgst').val(calculateIgstTax($('#txtBasicValue').val(),$('#Igst').val()));
-	
-
-	 calculateTotalOrdervalue();
-	 
-	 var res = ExceedBudget($('#TotalOrderValue').val(), $('#AvlBudAmt').val());
-      if(!res)
-	  {
-		 $('#Rate').focus();
-		 return false;
-	  }
-	 }
-	 
-}
-
-function EditRatechange(){
-	 
-		if($('#EditCostCenter').val() == "0")
-		 {
-				alert('Please select the CostCenterCode');
-				$('#EditCostCenter').focus();
-			return false;
-		 }
-	 EditExceedQuantityCheck();
-	  
-	 if($('#EditQuantity').val() != '' && $('#EditRate').val() != '')
-	 {	  
-      var txtQuantity = parseFloat( $('#EditQuantity').val());
-	  var txtUnitPrice = parseFloat($('#EditRate').val());
-         var frequencyValue = parseFloat($('#EditFrequencyNo').val());
-	  var Tot =  txtQuantity * frequencyValue * txtUnitPrice
-	  $('#txtEditBasicValue').val(parseFloat(Tot).toFixed(2));
-	    ExceedBudget(Tot, $('#EditAvlBudAmt').val());	 
-	 
-	 
-        $('#EditAfterCgst').val(calculateCgstTax($('#txtEditBasicValue').val(),$('#EditCgst').val()));
-        $('#EditAfterSgst').val(calculateSgstTax($('#txtEditBasicValue').val(),$('#EditSgst').val()));
-         $('#EditAfterIgst').val(calculateIgstTax($('#txtEditBasicValue').val(),$('#EditIgst').val()));
-	  calculateTotalEditOrdervalue();
-	 }
-	 
-}
-
-function ExceedQuantityCheck()
- {
-	var EnterQuantity =   $("#Quantity").val()== '' ? "0.00" :  parseFloat($("#Quantity").val());
-	var ReqQuantity = parseFloat(RequistQuantity);
-	//alert(ReqQuantity);
-	if(EnterQuantity > ReqQuantity)
-	{
-		 alert('Your exceeding the Quantity from the Requisition Quantity:'+ RequistQuantity  +'.Please adjust the Quantity to proceed further.');
-		
-		  $('#Quantity').focus();
-		 return false;
-	}
-	else {
-		return true;
-	}
- }
- function EditExceedQuantityCheck()
- {
-	// RequistQuantity
-	var EnterQuantity =   $("#EditQuantity").val()== '' ? "0.00" :  parseFloat($("#EditQuantity").val());
-	var ReqQuantity = parseFloat(RequistQuantity);
-	if(EnterQuantity > ReqQuantity)
-	{
-		 alert('Your exceeding the Quantity from the Requisition Quantity:'+ RequistQuantity  +'.Please adjust the Quantity to proceed further.');
-		
-		  $('#EditQuantity').focus();
-		 return false;
-	}
- }
- 
- function ExceedBudget(ValuetoCheck,budgetAmount)
- {
-	 var ReqAmount = parseFloat(ValuetoCheck);
-	 var BudAmount = parseFloat(budgetAmount);
-	 
-	 if(ReqAmount > BudAmount )
-	 {
-		alert('Your exceeding the Avaiable Budget :'+ AvilBudAmt  +'.Please adjust the Product to proceed further.');
-		return false; 
-	 }
-	 else
-	 {
-		 return true;
-	 }
- }
-
- 
- function calculateTotalOrdervalue()
- {
-	var basicValue = parseFloat($('#txtBasicValue').val());
-	var Cgst = parseFloat($('#AfterCgst').val());
-	var Sgst = parseFloat($('#AfterSgst').val());
-	var Igst = parseFloat($('#AfterIgst').val());
-      var OtherAmt = parseFloat($('#OtherAllowances').val());
-
-	var TotAmt = basicValue + Cgst+ Sgst + Igst + OtherAmt;
-
-	$('#TotalOrderValue').val( parseFloat(TotAmt).toFixed(2));   
-		 
- }
- function calculateTotalEditOrdervalue()
- {
-	var basicValue = parseFloat($('#txtEditBasicValue').val());
-	var Cgst = parseFloat($('#EditAfterCgst').val());
-	var Sgst = parseFloat($('#EditAfterSgst').val());
-	var Igst = parseFloat($('#EditAfterIgst').val());
-        var OtherAmt = parseFloat($('#EditOtherAllowances').val());
-
-	var TotAmt = basicValue + Cgst+ Sgst + Igst + OtherAmt;
-
-	$('#EditTotalOrderValue').val( parseFloat(TotAmt).toFixed(2));
-
-		 
- }
- 
- function calculateTaxValue()
- {
-	var Cgst = parseFloat($('#AfterCgst').val());
-	var Sgst = parseFloat($('#AfterSgst').val());
-	var Igst = parseFloat($('#AfterIgst').val());
-
-	var TottaxAmt = Cgst+ Sgst + Igst;
-	return parseFloat(TottaxAmt).toFixed(2); 
- }
- 
-function clearTaxField()
-{
-	$('#txtBasicValue').val('');
-	$('#AfterCgst').val(0);
-	$('#AfterSgst').val(0);
-	$('#AfterIgst').val(0);
-	$('#Cgst').val(0);
-	$('#Sgst').val(0);
-        $('#Igst').val(0);
-	$('#TotalOrderValue ').val('');
-	$('#Rate').val(0);
-	
-	$("#ItemName").val('');
-	$("#UOM").val('');
-	$("#Quantity").val('');
-	RequistQuantity	= '';	
-	
-}
-function clearEditTaxField()
-{
-	$('#txtEditBasicValue').val('');
-	
-	$('#EditTotalOrderValue ').val('');
-	$('#EditRate').val('');
-	$('#EditAfterCgst').val(0);
-	$('#EditAfterSgst').val(0);
-	$('#EditAfterIgst').val(0);
-	$('#EditCgst').val(0);
-	$('#EditSgst').val(0);
-        $('#EditIgst').val(0);
-	$("#EditItemName").val('');
-	$("#EditUOM").val('');
-	$("#EditQuantity").val('');
-	RequistQuantity	= 	'';	
-	
-}
- $(document).ready(function () {
-                $('#Date').click(function () {
-                    //for Date range selection
-                    $('#Schedulediv').hide();
-                    $('#Deliverydtdiv').show();
-                });
-                $('#Schedule').click(function () {
-                    //for schedule range selection
-                    $('#Deliverydtdiv').hide();
-                    $('#Schedulediv').show();
-                });
-            }); 
-</script>
-<style>
-.modal
-{
-	padding-right:25% ! important;
-}
-.dataTables_paginate
-{
-	    margin-top: -5%;
-}
-.dataTables_wrapper {
-    padding-bottom: 0px;
-}
-.num {
-	text-align:right;
-}
-</style>
-<div class="content-wrapper">
-     <?php
-                      $attributes = array('class' => 'form-label-left ServicePO ','name'  => 'ServicePO','id'  => 'ServicePO');
-                        
-                        echo form_open($this->config->base_url().'/purchaseorder/addPO/',$attributes); ?>
- 
-	 <section class="content" >
-	 <div style="border:2px solid #333">
-	  <div id="content"></div>
-	 <div>
-         <center><b><h2>Siddharth Industries - Service Purchase Order</h2></b></center></div>
-         <div class="container-fluid">
-		
-	<div class="row">
-	<div class="col-md-12">
-	<div class="col-md-3">
-	<div class="col-md-12">
-	<label>Requistion No</label>
-						 
-						
-							 <?php
-							 
-							  $options = array("0"=>'Selected Requisition Numbers'); 
-								 if(!empty($ReqList))
-                                              
-						{
-						foreach ($ReqList as $SID):
-						  
-					  // print_r($SID->ReqNo);
-						   $options[$SID->ReqNo] = $SID->ReqNo ."-". $SID->ReqBy;
-                           $ReqType = $SID->ReqType;
-						endforeach;
-						}	
-							echo form_multiselect('RequistionNo', $options,set_value('RequistionNo'),'id="RequistionNo"' , 'required="true"');
-
-							?>
-	</div>
-	<div class="col-md-12">
-		<label>Purchase Order Date</label>
-						<div class="form-group">
-									<?php
-							 $data = array('name' => 'PODate','value' => set_value('PODate',$CurrentDate),'id'=>'PODate',  'class' => 'form-control num' ,'required' => 'true', 'onkeypress'=>'return false;');
-							echo form_input($data);
-							?>   
-						</div>
-	</div>							
-						 
-	</div>
-	<div class="col-md-9" style="padding:0px;">
-		<div class="col-md-4">
-			<div class="col-md-12">
-				<label>Supplier</label>
-					 
-						 <?php
-						$options = array("0"=>'Select Supplier');     
-						//print_r(  $options);
-						
-						if(!empty($Suplist))
-						{
-						foreach ($Suplist as $SID):
-						  
-					   
-						  $options[$SID->SupplierID] =  $SID->SupplierID.' '.' - '.' '.$SID->SupplierName;
-
-						endforeach;
-						}										
-			
-						echo form_dropdown('drpSupplier', $options,set_value('drpSupplier'),'id="drpSupplier"'  ,'required="true"' ,'class="form-control select2');
-
-						?>						 
-					 
-			</div>
-			<div class="col-md-12"><br/>
-				<label>Address</label>
-					<div class="form-group">
-								<?php
-						 $data = array('name' => 'SupAddress','value' => set_value('SupAddress'),'id'=>'SupAddress',  'class' => 'form-control' ,'readonly' => 'true','rows' => '3', 'cols' => '40');
-						echo Form_textarea($data);
-						?>   
-					</div>
-			</div>
-		</div>
-		<div class="col-md-4">
-			<div class="col-md-12">
-				 <label>Purchase Order Type</label>
-						<div class="form-group">
-						
-									<?php
-							 $data = array('name' => 'POType','value' => set_value('POType',SERVICE),'id'=>'POType',  'class' => 'form-control' ,'readonly' => 'true');
-							echo form_input($data);
-							?>   
-						</div>
-			</div>
-			<div class="col-md-12">
-				 <label>Delivery Address</label>
-					<div class="form-group">
-								<?php
-						 $data = array('name' => 'DeliveryAddr','value' => set_value('DeliveryAddr',$CompanyAddress),'id'=>'DeliveryAddr',  'class' => 'form-control' ,'required' => 'true', 'rows' => '3', 'cols' => '40');
-						echo Form_textarea($data);
-						?>   
-					</div>
-			</div>
-		</div>
-		<div class="col-md-4" style="padding:0px;">
-			<div class="col-md-6" style="padding:0px;">
-				 <b><u>Select Delivery By</u></b><br/>
-                            <tr>
-                                <td>
-                                    <?php echo form_label('Date', 'Date') ."&nbsp;&nbsp;". form_radio(array("name"=>"DateRange", "id"=>"Date", "value"=>"0", 'checked'=>set_radio('DateRange', '0', TRUE))); ?></td>
-                                <td>
-                                    <?php echo form_label('Schedule', 'Schedule') ."&nbsp;&nbsp;". form_radio(array("name"=>"DateRange", "id"=>"Schedule", "value"=>"1", 'checked'=>set_radio('DateRange', '1', FALSE))); ?>
-
-                                </td>
-                     
-                            </tr>
-			</div>
-			<div class="col-md-6">
-				<label>Work Status</label>
-				   <?php
-
-				   $optionsWork = array("0"=>'Select Work Status');     
-						//print_r(  $options);
-						
-						if(!empty($WorkStatus))
-						{
-						foreach ($WorkStatus as $WID):
-						  
-					   
-						  $optionsWork[$WID->StatusCode] =  $WID->StatusName;
-
-						endforeach;
-						}										
-			
-						echo form_dropdown('workstatus', $optionsWork,set_value('workstatus'),'id="workstatus"'  ,'required="true"' ,'class="form-control select2');
-
-
-						?>	
-			</div>
-			<div class="col-md-12" id="Deliverydtdiv"> <br/>
-				<label>Delivery Date</label>
-					<div class="form-group">
-								<?php
-						 $data = array('name' => 'Deliverydt','value' => set_value('Deliverydt',$CurrentDate),'id'=>'Deliverydt',  'class' => 'form-control num' ,'required' => 'true', 'onkeypress'=>'return false;');
-						echo form_input($data);
-						?>   
-					</div>
-			</div>
-			<div class="col-md-12" id="Schedulediv" style="display:none;"><br/>
-					<label >Schedule By</label>					 
-					<?php
-					$data = array('name' => 'Scheduleby','value' => set_value('Scheduleby'),'id'=>'Scheduleby',  'class' => 'form-control' ,'required' => 'true' ,'rows' => '3', 'cols' => '40');
-					echo Form_textarea($data);
-					?>
-
-            </div>
-		</div>
-		
-	</div>
-	<div class="col-md-12">
-		  <legend>Payment Details</legend>
-          <!-- Text input-->
-		    <div class="col-md-4">
-			    <label>Payment Terms</label> 
-				  
-                        <?php
-                                                       
-                                                
-                                               
-                                                    if(!empty($Payment))
-                                                    {
-                                                    $options6 = array("0"=>'Select Payment Terms ');
-                                                    foreach ($Payment as $pay):
-                                                      
-
-                                                     
-                                                       $options6[$pay->PaymentID] =  $pay->PaymentTerms;
-                                                       
-
-                                                    endforeach;
-                                                    }										
-
-                                                    echo form_dropdown('PaymentTerms', $options6,set_value('PaymentTerms'),'id="PaymentTerms"'  ,'required="true"' ,'class="form-control select2');
-
-                                                    ?>
-              
-
-                                    
-
-            </div>
-			
-        
-			 
-	</div>
-	</div>	   
-    </div>
-	
-          <div class="container-fluid">  
- 	 <table class="table table-bordered" style="border:1px solid #333" id="ServiceTable">
-  <div style="padding-right:10px">
-<div align="right">
-  <a data-toggle="modal" ><button type="submit"  onclick="openModal();" class="btn btn-primary" id="abcd" >Select Line Item</button> </a> 
- 
-  
-  
-<!-- Model for Add servicepo -->
-    <div class="modal fade" id="SERVICE" role="dialog">
-		<div class="modal-dialog">
-	   <!-- Modal content-->
-	 <form>
-		  <div class="modal-content" style="width:900px;">
-			<div class="modal-header" style="background-color: #3c8dbc;color:#fff;"> 
-			  <center><h4>Add Service Purchase Order Item </h4></center>				
-			</div>
-			<div align="left"> 
-			 
-			<div class="col-md-12">
-						 <div class="col-md-3">
-						 <label>Req No</label>
-									<div>
-										 <?php
-											$RL = array("0"=>'Select Req No');     
-											if(!empty($RequistionDetails))
-											{
-											foreach ($RequistionDetails as $SID):			   
-												$RL[$SID->ReqNo] =  $SID->ReqNo.' '.' - '.' '.$SID->DepartmentName;
-											endforeach;
-											}
-							
-											echo form_dropdown('ReqNo', $RL,set_value('ReqNo'),'id="ReqNo"' ,'class="form-control"');
-
-										?>						 
-									</div>
-								</div>
-						 
-						  <div class="col-md-3">
-						   <label>Department Name</label>
-									<div class="form-group">
-												<?php
-										 $data = array('name' => 'deptName','value' => set_value('deptName'),'id'=>'deptName',  'class' => 'form-control');
-										echo form_input($data);
-										?>   
-									</div>
-						 </div>
-						  <div class="col-md-3">
-						   <label>Cost Center Name</label>
-									<div class="form-group">
-												<?php
-						$data = array('name' => 'CostCenter','value' => set_value('CostCenter'),'id'=>'CostCenter',  'class' => 'form-control' ,'readonly' => 'true');
-												echo form_input($data);
-
-						?>		
-									</div>
-						 </div>
-						  <div class="col-md-3">
-						   <label>Avail Budget Amount In INR</label>
-									<div class="form-group">
-												<?php
-										 $data = array('name' => 'AvlBudAmt','value' => set_value('AvlBudAmt'),'id'=>'AvlBudAmt',  'class' => 'form-control num' ,'readonly' => 'true');
-										echo form_input($data);
-										?>   
-									</div>
-						 </div>
-		 </div>
-		 <div class="col-md-12">
-						 <div class="col-md-3">
-						  <label>Item Code</label>
-									<div>
-										 <?php
-										$options = array("0"=>'Item Code');     
-										//print_r(  $options);
-										
-																			
-							
-										echo form_dropdown('MaterialCode', $options,set_value('MaterialCode'),'id="MaterialCode"' ,'class="form-control"');
-
-										?>						 
-									</div>
-					   </div>						  
-						 <div class="col-md-3">
-						  <label>Item Name</label>
-									<div class="form-group">
-												<?php
-										 $data = array('name' => 'ItemName','value' => set_value('ItemName'),'id'=>'ItemName',  'class' => 'form-control' ,'readonly' => 'true');
-										echo form_input($data);
-										?>   
-									</div>
-						 </div>
-						  <div class="col-md-6">
-							<label>Service Description </label>	<?php
-							$data = array('name' => 'txtSpcialInstruction','value' => set_value('txtSpcialInstruction'),'id'=>'txtSpcialInstruction',  'class' => 'form-control');
-							echo form_input($data); ?>
-						</div>
-						 
-		</div>
-                                <div class="col-md-12">
-								<div class="col-md-2">
-						  <label>UOM</label>
-									<div class="form-group">
-												<?php
-										 $data = array('name' => 'UOM','value' => set_value('UOM'),'id'=>'UOM',  'class' => 'form-control num' ,'readonly' => 'true');
-										echo form_input($data);
-										?>   
-									</div>
-						 </div>
-						 <div class="col-md-2">
-						  <label>Frequency</label>
-									<div>
-										<?php
-										 $data = array('name' => 'Frequency','value' => set_value('Frequency'),'id'=>'Frequency',  'class' => 'form-control' ,'readonly' => 'true');
-										echo form_input($data);
-										?> 
-                                             <input type="hidden" name="FrequencyNo" id="FrequencyNo" value="FrequencyNo" />
-									</div>
-					   </div>
-						 <div class="col-md-2">
-						  <label>Quantity</label>
-									<div class="form-group">
-												<?php
-										 $data = array('name' => 'Quantity','value' => set_value('Quantity'),'id'=>'Quantity',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'Ratechange()');
-										echo form_input($data);
-										?>   
-									</div>
-						 </div>
-						 <div class="col-md-2">
-						  <label><?php echo "Rate ($INRSYM)";?></label>
-									<div class="form-group">
-												<?php
-										 $data = array('name' => 'Rate','value' => set_value('Rate'),'id'=>'Rate',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);' ,'onchange'=>'Ratechange()' );
-										echo form_input($data);
-										?>   
-									</div>
-						 </div>
-						 <div class="col-md-4">
-						  <label><?php echo "Basic Amount ($INRSYM)";?></label>
-									<div class="form-group">
-												<?php
-										 $data = array('name' => 'txtBasicValue','value' => set_value('txtBasicValue'),'id'=>'txtBasicValue',  'class' => 'form-control num' ,'readonly' => 'true');
-										echo form_input($data);
-										?>   
-									</div>
-						 </div>		 
-		</div>
-		 
-				<div class="col-md-12">
-					<div class="col-md-6" align="right">
-							 
-				CGST In %
-					</div>	
-					
-					<div class="col-md-3">
-							 <div class="form-group">
-							 
-												<?php
-										 $data = array('name' => 'Cgst','value' => set_value('Cgst',0),'id'=>'Cgst',  'class' => 'form-control num' ,'placeholder' => 'CGST TAX PERCENTAGE','onchange'=>'Ratechange()');
-										echo form_input($data);
-										?>   
-									</div>
-			 
-					</div>	
-					<div class="col-md-3">
-							 <div class="form-group">
-							 
-												<?php
-										 $data = array('name' => 'AfterCgst','value' => set_value('AfterCgst'),'id'=>'AfterCgst',  'class' => 'form-control num' ,'placeholder' => 'After CGST','readonly' => 'true');
-										echo form_input($data);
-										?>   
-									</div>
-			 
-					</div>						
-		 
-				</div>		 
-				<div class="col-md-12">
-					<div class="col-md-6" align="right">
-							 
-				SGST In %
-					</div>	
-					
-					<div class="col-md-3">
-							 <div class="form-group">
-							 
-												<?php
-										 $data = array('name' => 'Sgst','value' => set_value('Sgst',0),'id'=>'Sgst',  'class' => 'form-control num' ,'placeholder' => 'SGST TAX PERCENTAGE','onchange'=>'Ratechange()');
-										echo form_input($data);
-										?>   
-									</div>
-			 
-					</div>	
-					<div class="col-md-3">
-							 <div class="form-group">
-							 
-												<?php
-										 $data = array('name' => 'AfterSgst','value' => set_value('AfterSgst'),'id'=>'AfterSgst',  'class' => 'form-control num' ,'placeholder' => 'After SGST','readonly' => 'true');
-										echo form_input($data);
-										?>   
-									</div>
-			 
-					</div>						
-		 
-				</div>
-		 
-				<div class="col-md-12">
-					<div class="col-md-6" align="right">
-							 
-				IGST In %
-					</div>	
-					
-					<div class="col-md-3">
-							 <div class="form-group">
-							 
-												<?php
-										 $data = array('name' => 'Igst','value' => set_value('Igst',0),'id'=>'Igst',  'class' => 'form-control num' ,'placeholder' => 'IGST TAX PERCENTAGE','onchange'=>'Ratechange()');
-										echo form_input($data);
-										?>   
-									</div>
-			 
-					</div>	
-					<div class="col-md-3">
-							 <div class="form-group">
-							 
-												<?php
-										 $data = array('name' => 'AfterIgst','value' => set_value('AfterIgst'),'id'=>'AfterIgst',  'class' => 'form-control num' ,'placeholder' => 'After IGST','readonly' => 'true');
-										echo form_input($data);
-										?>   
-									</div>
-			 
-					</div>						
-		 
-				</div>
-				  <div class="col-md-12">
-		 <div class="col-md-5 col-md-offset-4" align="right">
-							<label>Other Allowances In INR</label>			 
-					</div>	
-		<div class="col-md-3">
-							 <div class="form-group">
-													<?php
-											 $data = array('name' => 'OtherAllowances','value' => set_value('OtherAllowances',0),'id'=>'OtherAllowances',  'class' => 'form-control num' ,'placeholder' => 'Other Allowances','onchange'=>'Ratechange()');
-											echo form_input($data);
-											?>   
-										</div>
-							 </div>
-		 </div>
-		  <div class="col-md-12">
-		 <div class="col-md-5 col-md-offset-4" align="right">
-							<label><?php echo "Total Order value ($INRSYM)";?></label>			 
-					</div>	
-		<div class="col-md-3">
-							 <div class="form-group">
-													<?php
-											 $data = array('name' => 'TotalOrderValue','value' => set_value('TotalOrderValue'),'id'=>'TotalOrderValue',  'class' => 'form-control num' ,'placeholder' => 'Total value','readonly' => 'true');
-											echo form_input($data);
-											?>   
-										</div>
-							 </div>
-		 </div>
-		 
-		
-			
-			  <br/>
-			   <br/>
-			<div class="modal-footer">
-			<div class="col-md-12">
-			<a class="btn btn-primary font AddService"  ID="AddService" ><i class="fa fa-plus"></i>&nbsp;&nbsp;<span class="bold">Add Service</span></a>
-			<a class="btn btn-primary" data-dismiss="modal"  value="Cancel">Cancel</a>
-			</div>
-			</div>
-		  </div>
-		 </form>
-			 
-		  </div>
-	</div>	
-  </div>
-  <!-- END of model for Add servicepo -->
-   <!-- Edit Service po moddel-->
-  <div class="modal fade" id="EDITSERVICE" role="dialog">
-		<div class="modal-dialog">
-	   <!-- Modal content-->
-	 <form>
-		  <div class="modal-content" style="width:900px;">
-			<div class="modal-header" style="background-color: #3c8dbc;color:#fff;">
-			  <button type="button" class="close" data-dismiss="modal">&times;</button>
-			  <center><h4>Edit Service Purchase Order Item </h4></center>				
-			</div>
-			<div align="left"> 
-			 
-			<div class="col-md-12">
-						 <div class="col-md-3">
-						 <label>Req No</label>
-									<div>
-										 <?php
-											
-										$data = array('name' => 'EditReqNo','value' => set_value('EditReqNo'),'id'=>'EditReqNo',  'class' => 'form-control','readonly'=>'true');
-										echo form_input($data);
-										?>	
-										
-									</div>
-								</div>
-						 
-						  <div class="col-md-3">
-						   <label>Department Name</label>
-									<div class="form-group">
-												<?php
-										 $data = array('name' => 'EditdeptName','value' => set_value('EditdeptName'),'id'=>'EditdeptName',  'class' => 'form-control','readonly'=>'true');
-										echo form_input($data);
-										?>   
-									</div>
-						 </div>
-						  <div class="col-md-3">
-						   <label>Cost Center Name</label>
-									<div class="form-group">
-												<?php
-						$data = array('name' => 'EditCostCenter','value' => set_value('EditCostCenter'),'id'=>'EditCostCenter',  'class' => 'form-control' ,'readonly' => 'true');
-												echo form_input($data);
-
-						?>		
-									</div>
-						 </div>
-						  <div class="col-md-3">
-						   <label>Avail Budget Amount In INR</label>
-									<div class="form-group">
-												<?php
-										 $data = array('name' => 'EditAvlBudAmt','value' => set_value('EditAvlBudAmt'),'id'=>'EditAvlBudAmt',  'class' => 'form-control num' ,'readonly' => 'true');
-										echo form_input($data);
-										?>   
-									</div>
-						 </div>
-		 </div>
-		 <div class="col-md-12">
-						 <div class="col-md-3">
-						  <label>Item Code</label>
-									<div>
-										 <?php
-										$options = array("0"=>'Item Code');     
-										//print_r(  $options);
-										
-										echo form_dropdown('EditMaterialCode', $options,set_value('EditMaterialCode'),'id="EditMaterialCode"' ,'class="form-control"');
-
-										?>						 
-									</div>
-					   </div>
-						 <div class="col-md-3">
-						  <label>Item Name</label>
-									<div class="form-group">
-												<?php
-										 $data = array('name' => 'EditItemName','value' => set_value('EditItemName'),'id'=>'EditItemName',  'class' => 'form-control' ,'readonly' => 'true');
-										echo form_input($data);
-										?>   
-									</div>
-						 </div>
-						 <div class="col-md-6">
-				<label>Service Description </label>	<?php
-						 $data = array('name' => 'EdittxtSpcialInstruction','value' => set_value('EdittxtSpcialInstruction'),'id'=>'EdittxtSpcialInstruction',  'class' => 'form-control');
-						echo form_input($data); ?>
-			</div>
-						
-		</div>
-		<div class="col-md-12">
-		 <div class="col-md-2">
-						  <label>UOM</label>
-									<div class="form-group">
-												<?php
-										 $data = array('name' => 'EditUOM','value' => set_value('EditUOM'),'id'=>'EditUOM',  'class' => 'form-control num' ,'readonly' => 'true');
-										echo form_input($data);
-										?>   
-									</div>
-						 </div>
-						 <div class="col-md-2">
-						  <label>Frequency</label>
-							   <div>
-								<?php
-								$data = array('name' => 'EditFrequency','value' => set_value('EditFrequency'),'id'=>'EditFrequency',  'class' => 'form-control','readonly' => 'true' );
-									echo form_input($data);
-							   ?> 
-							<input type="hidden" name="EditFrequencyNo" id="EditFrequencyNo" value="EditFrequencyNo" />  					 
-							  </div>
-					   </div>
-						<div class="col-md-2">
-						  <label>Quantity</label>
-									<div class="form-group">
-												<?php
-										 $data = array('name' => 'EditQuantity','value' => set_value('EditQuantity'),'id'=>'EditQuantity',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'EditRatechange()');
-										echo form_input($data);
-										?>   
-									</div>
-						 </div>
-						 <div class="col-md-2">
-						  <label><?php echo "Rate($INRSYM)";?></label>
-									<div class="form-group">
-												<?php
-										 $data = array('name' => 'EditRate','value' => set_value('EditRate'),'id'=>'EditRate',  'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);' ,'onchange'=>'EditRatechange()' );
-										echo form_input($data);
-										?>   
-									</div>
-						 </div>
-						 <div class="col-md-4">
-						  <label><?php echo "Basic Amount ($INRSYM)";?></label>
-									<div class="form-group">
-												<?php
-										 $data = array('name' => 'txtEditBasicValue','value' => set_value('txtEditBasicValue'),'id'=>'txtEditBasicValue',  'class' => 'form-control num' ,'readonly' => 'true');
-										echo form_input($data);
-										?>   
-									</div>
-						 </div>
-		
-		</div>
-		 
-				<div class="col-md-12">
-					<div class="col-md-6" align="right">
-							 
-				CGST In %
-					</div>	
-					
-					<div class="col-md-3">
-							 <div class="form-group">
-							 
-												<?php
-										 $data = array('name' => 'EditCgst','value' => set_value('EditCgst'),'id'=>'EditCgst',  'class' => 'form-control num' ,'placeholder' => 'CGST TAX PERCENTAGE','onchange'=>'EditRatechange()');
-										echo form_input($data);
-										?>   
-									</div>
-			 
-					</div>	
-					<div class="col-md-3">
-							 <div class="form-group">
-							 
-												<?php
-										 $data = array('name' => 'EditAfterCgst','value' => set_value('EditAfterCgst'),'id'=>'EditAfterCgst',  'class' => 'form-control num' ,'placeholder' => 'After CGST','readonly' => 'true');
-										echo form_input($data);
-										?>   
-									</div>
-			 
-					</div>						
-		 
-				</div>		 
-				<div class="col-md-12">
-					<div class="col-md-6" align="right">
-							 
-				SGST In %
-					</div>	
-					
-					<div class="col-md-3">
-							 <div class="form-group">
-							 
-												<?php
-										 $data = array('name' => 'EditSgst','value' => set_value('EditSgst'),'id'=>'EditSgst',  'class' => 'form-control num' ,'placeholder' => 'SGST TAX PERCENTAGE','onchange'=>'EditRatechange()');
-										echo form_input($data);
-										?>   
-									</div>
-			 
-					</div>	
-					<div class="col-md-3">
-							 <div class="form-group">
-							 
-												<?php
-										 $data = array('name' => 'EditAfterSgst','value' => set_value('EditAfterSgst'),'id'=>'EditAfterSgst',  'class' => 'form-control num' ,'placeholder' => 'After SGST','readonly' => 'true');
-										echo form_input($data);
-										?>   
-									</div>
-			 
-					</div>						
-		 
-				</div>
-		 
-				<div class="col-md-12">
-					<div class="col-md-6" align="right">
-							 
-				IGST In %
-					</div>	
-					
-					<div class="col-md-3">
-							 <div class="form-group">
-							 
-												<?php
-										 $data = array('name' => 'EditIgst','value' => set_value('EditIgst'),'id'=>'EditIgst',  'class' => 'form-control num' ,'placeholder' => 'IGST TAX PERCENTAGE','onchange'=>'EditRatechange()');
-										echo form_input($data);
-										?>   
-									</div>
-			 
-					</div>	
-					<div class="col-md-3">
-							 <div class="form-group">
-							 
-												<?php
-										 $data = array('name' => 'EditAfterIgst','value' => set_value('EditAfterIgst'),'id'=>'EditAfterIgst',  'class' => 'form-control num' ,'placeholder' => 'After IGST','readonly' => 'true');
-										echo form_input($data);
-										?>   
-									</div>
-			 
-					</div>						
-		 
-				</div>
-				<div class="col-md-12">
-		 <div class="col-md-5 col-md-offset-4" align="right">
-							<label>Other Allowances In INR</label>			 
-					</div>	
-		<div class="col-md-3">
-							 <div class="form-group">
-													<?php
-											 $data = array('name' => 'EditOtherAllowances','value' => set_value('EditOtherAllowances',0),'id'=>'EditOtherAllowances',  'class' => 'form-control num' ,'placeholder' => 'Other Allowances','onchange'=>'EditRatechange()');
-											echo form_input($data);
-											?>   
-										</div>
-							 </div>
-		 </div>
-		  <div class="col-md-12">
-		 <div class="col-md-5 col-md-offset-4" align="right">
-							<label><?php echo "Total Order value ($INRSYM)";?></label>			 
-					</div>	
-		<div class="col-md-3">
-							 <div class="form-group">
-													<?php
-											 $data = array('name' => 'EditTotalOrderValue','value' => set_value('EditTotalOrderValue'),'id'=>'EditTotalOrderValue',  'class' => 'form-control num' ,'placeholder' => 'Total value','readonly' => 'true');
-											echo form_input($data);
-											?>   
-										</div>
-							 </div>
-		 </div>
-		 
-			 
-		
-			 
-			<div class="modal-footer">
-			<div class="col-md-12">
-			<a class="btn btn-primary font EditService"  ID="Edit">&nbsp;&nbsp;<span class="bold">Update Service</span></a>
-			<a class="btn btn-primary" data-dismiss="modal" value="Cancel">Cancel</a>
-			</div>
-			</div>
-		  </div>
-		 </form>
-			 
-		  </div>
-	</div>	
-  </div>
-  <!-- End of Model for EDIT servicepo -->
-</div>	
-    
-   <br/>
-  
-	<div class="box-body">
-              <table id="serviceTax" class="table table-bordered table-hover" style="background-color:#fff;font-size:12px;">
-                <thead style="background-color:#ddf">
-                <tr>
-					<th>SNo</th>
-					<th>Requisition No</th>
-                    <th>Item Code</th>
-					<th>Item Description</th>
-					<th>Quantity</th>
-					<th>UOM</th>
-					<th>Rate</th>
-					<th>Basic Amount</th>
-					<th>Tax Amount</th>
-					<th>Total Order Amount</th>
-					<th>Action</th>
-                </tr>
-                </thead>				
-               
-             <tbody id='ServiceAppend'>     
-    
-			</tbody>
-              </table>
-            </div>
-	   
-  </table>
-	<div class="row" style="border: 1px solid">
-		<div class="col-md-12">
-			 
-				<div class="col-md-2">
-					 <label>Basic Amount In INR</label> 
-					 <?php
-							 $data = array('name' => 'txtTotBasicAmount','value' => set_value('txtTotBasicAmount'),'id'=>'txtTotBasicAmount',  'class' => 'form-control num'  ,'readonly' => 'true');
-							echo form_input($data);				
-							?>   
-				</div>
-				<div class="col-md-2">
-					 <label>CGST In INR</label> 
-					 <?php
-							 $data = array('name' => 'txtTotCgst','value' => set_value('txtTotCgst'),'id'=>'txtTotCgst',  'class' => 'form-control num'  ,'readonly' => 'true');
-							echo form_input($data);				
-							?>   
-				</div>
-			 
-			 
-				<div class="col-md-2">
-					 <label>SGST In INR </label> 
-					 <?php
-							 $data = array('name' => 'txtTotSgst','value' => set_value('txtTotSgst'),'id'=>'txtTotSgst',  'class' => 'form-control num'  ,'readonly' => 'true');
-							echo form_input($data);				
-							?>   
-				</div>
-				<div class="col-md-2">
-					<label>IGST  In INR  </label> 
-					<?php
-							 $data = array('name' => 'txtTotIgst','value' => set_value('txtTotIgst'),'id'=>'txtTotIgst',  'class' => 'form-control num'   ,'readonly' => 'true');
-							echo form_input($data);
-							?>   
-				</div>
-			 
-			<div class="col-md-2">
-				<label>Other Allowances In INR   </label> 			
-				<?php
-				 $data = array('name' => 'TotalOtherAllowances','value' => set_value('TotalOtherAllowances'),'id'=>'TotalOtherAllowances',  'class' => 'form-control num'  ,'readonly' => 'true');
-				echo form_input($data);
-				?>   
-					
-			</div> 
-			<div class="col-md-2">
-				<label>Total Order Value  In INR  </label> 			
-				<?php
-				 $data = array('name' => 'txtTotalOrderValueSummary','value' => set_value('txtTotalOrderValueSummary'),'id'=>'txtTotalOrderValueSummary',  'class' => 'form-control num'  ,'readonly' => 'true');
-				echo form_input($data);
-				?>   
-					
-			</div> 
-		</div>
-		 <div class="col-md-12">
-			<div class="col-md-12">
-				<label>Scope Of Work</label>	<?php
-						 $data = array('name' => 'ScopeOfWork','value' => set_value('ScopeOfWork'),'id'=>'ScopeOfWork',  'class' => 'form-control' ,'rows' => '10', 'cols' => '40' );
-						echo form_textarea($data); ?>
-			</div>
-			<!-- <div class="col-md-12">
-				<label>Special Instructions :</label>	<?php
-						 $data = array('name' => 'txtSpcialInstruction','value' => set_value('txtSpcialInstruction'),'id'=>'txtSpcialInstruction',  'class' => 'form-control' ,'rows' => '10', 'cols' => '40' );
-						echo form_textarea($data); ?>
-			</div>-->
-		</div>
-		<div class="col-md-12">
-			<div class="row">
-				<br/>
-				<div align="right" style="padding-right:10px">
-					<input type="hidden" name="txtStatus" id="txtStatus" /> 
-					<input type="hidden" name="txtRowCount" id="txtRowCount" />
-					<input type="hidden" name="txtDeletedRow" id="txtDeletedRow" /> 
-					<input type="hidden" name="SpcialInstruction" id="SpcialInstruction" >  
-					<input type="hidden" name="txtDeliveryAddress" id="txtDeliveryAddress" >   
-					<a class="btn btn-primary Save"  ID="Save"onclick="Save(0)" >&nbsp;&nbsp;<span class="bold">Save</span></a> 
-					<a class="btn btn-primary Submit"  ID="Submit"onclick="Save(1)" >&nbsp;&nbsp;<span class="bold">Submit</span></a> 		 
-					<input type="reset" class="btn btn-primary">
-				</div><br/>
-			</div>
-		</div>
-		<br/>
-	 </div><br/>
- </div>
-       
-</div> 
-</div>
-</div>
-</section>
-</div>
-<script type="text/html" id="ServiceList">
-<tr  id="<%=index%>">
-<td align="left"><%=index%></td>
- <td align="left"><%=ReqNo%></td>
- <td align="left"><%=MaterialCode%></td>
-  <td align="left"><%=MaterialName%></td>
-  <td align="left"><%=Quantity%></td> 
-  <td align="left"><%=UOM%></td>
-   <td align="left"><%=Rate%></td>
-    <td align="left"><%=BasicAmount%></td>
-	<td align="left"><%=Taxvalue%></td>
-	<td align="left"><%=TotalValue%></td>
-	
-   <td>
-                          <a    data-target='#EDITSERVICE'	data-id="<%=index%>" data-userid="<%=index%>" data-toggle="modal" href="#EDITSERVICE"><i class="fa fa-pencil" data-toggle="tooltip" title="Click here to view/Edit the  <%=ReqNo%> Requisition details"></i>&nbsp;&nbsp;&nbsp;</a> <a href='#' onclick = "DeleteRow(<%=index%>)" class="link" data-id="<%=index%>" data-userid="<%=index%>"  id="Del" ><span class="glyphicon glyphicon-trash"></span></a>
-						 
-						  
-                      </td>
-</tr>
-</script>
-<script>
-var index     = '1';
-var userid  = '';
-$("#EDITSERVICE").on("shown.bs.modal", function(e) {
-		userid = $(e.relatedTarget).data('userid');
-		
-		var tr= document.getElementById(userid);
-		var cellval = tr.cells;
-		var id= $('#Reqnumber'+userid).val();
-		
-		$('#EditReqNo').val($('#Reqnumber'+userid).val());
-		$('#EditdeptName').val($('#departmentName'+userid).val());
-		$("#EditCostCenter").val($('#costCode'+userid).val());
-		$('#EditAvlBudAmt').val($('#AvilBudget'+userid).val());
-		
-		$('#EditItemName').val($('#materialName'+userid).val());
-		$('#EditUOM').val($('#uom'+userid).val());
-		$('#EditQuantity').val($('#quantity'+userid).val());
-		RequistQuantity = $('#quantity'+userid).val();
-		$('#EditRate').val($('#itemRate'+userid).val());
-		$('#txtEditBasicValue').val(cellval[7].innerHTML);
-		$('#EditCgst').val($('#Cgst'+userid).val());
-                $('#EditAfterCgst').val($('#AfterCgst'+userid).val());
-		$('#EditSgst').val($('#Sgst'+userid).val());
-                $('#EditAfterSgst').val($('#AfterSgst'+userid).val());
-                $('#EditIgst').val($('#Igst'+userid).val());
-                $('#EditAfterIgst').val($('#AfterIgst'+userid).val());
-                
-                if($('#FrequencyValue'+userid).val()==1){
-                    $('#EditFrequency').val($('#Frequency'+userid).val());
-                     $("#EditFrequencyNo").val(1);
-                   }
-		else{
-                    $('#EditFrequency').val($('#Frequency'+userid).val()+'-'+$('#FrequencyNo'+userid).val());
-                    $("#EditFrequencyNo").val($('#FrequencyValue'+userid).val());
-                     }
-                
-		$('#EditTotalOrderValue').val(cellval[9].innerHTML);
-		$('#EditOtherAllowances').val($('#OtherAmt'+userid).val());
-		$('#EdittxtSpcialInstruction').val($('#ItemDescription'+userid).val());
-		
-		$("#EditMaterialCode").empty();
-		var Material = <?php echo json_encode($MaterialList, JSON_PRETTY_PRINT) ?>;
-		 // For Binding Material list center for the selected Requistion Number	
-		$("#EditMaterialCode").append( $('<option></option>').val($('#materialCode'+userid).val()).html($('#materialCode'+userid).val() + "-" + $('#materialName'+userid).val()  ) );
-		var isAdded = "0";
-		 for(i=0;i<Material.length;i++)
-		{
-		$.each(Material[i], function(idx, obj) {
-			
-				if(obj.ReqNo === id )
-				{
-								   
-						$.each(SelectedMaterialList.Mat, function(idx1, el){															
-							if (id == el.ReqNo )
-							{
-								
-								if(el.materialCode == obj.MaterialCode)
-								{
-									
-										isAdded  = "1";
-										return false;																		
-								}
-								else
-								{
-									isAdded  = "0";
-								}
-								
-							}
-												
-					
-					});
-					
-					
-						if(isAdded  == "0")
-						{
-							
-							$("#EditMaterialCode").append( $('<option></option>').val(obj.MaterialCode).html(obj.MaterialCode + "-" + obj.MaterialName));
-						}
-												
-				}
-			
-			
-		});
-		}
-	   
-});
-
-$('.AddService').click(function(){
-        
-		
-      if(validateServiceTax())
-	  {
-		// alert('inside Addservice');
-		 var temp = index;
-		 var Reqnumber = $('#ReqNo').val();
-		 var departmentName = $('#deptName').val();
-		 var AvilBudget = $('#AvlBudAmt').val();
-		 var costCode = $('#CostCenter').val();
-                 var materialCode =$('#MaterialCode').val();
-                 
-                 var materialName =  $("#ItemName").val();
-                 var uom = $("#UOM").val();
-		 var quantity = $("#Quantity").val();
-		 RequistQuantity = $('#quantity'+userid).val();
-		 var itemRate = parseFloat($("#Rate").val()).toFixed(2)
-		  var ServiceDescription = $('#txtSpcialInstruction').val();
-		var OtherAmt = $('#OtherAllowances').val();
-		  var Cgst = $("#Cgst").val();
-		  var AfterCgst = $("#AfterCgst").val();
-                  var Sgst = $("#Sgst").val();
-                  var AfterSgst = $("#AfterSgst").val();
-                  var Igst = $("#Igst").val();
-                  var AfterIgst = $("#AfterIgst").val();
-                  var FrequencyValue = $("#FrequencyNo").val();
-		
-		  var Frequency=$("#Frequency").val();
-		  
-		  var TotalOrderValue = $("#TotalOrderValue ").val();
-		 
-		  
-		 var basicval = $("#txtBasicValue").val();
-	
-		
-		 var TotalTaxValue = calculateTaxValue();		 
-	   
-		 $('#MaterialCode option[value='+materialCode+']').remove();
-		 
-		  SelectedMaterialCode[CollIndex] = materialCode;
-			CollIndex = CollIndex + 1;
-			
-			SelectedMaterialList.Mat.push({ 
-        "materialCode" :  materialCode,
-        "ReqNo"  : Reqnumber,
-      
-		});	
-		 
-		 populateValueMainFormForServiceTax();	 
-		
-			
-		  index = parseInt(index)+1;		
-		 
-	      var template = jQuery("#ServiceList").html();
-	   
-	     
-          $('#ServiceAppend').append(_.template(template,{index:temp,ReqNo:Reqnumber,MaterialCode:materialCode,MaterialName:ServiceDescription,Quantity:quantity,UOM:uom,Rate:itemRate,BasicAmount:basicval,Taxvalue:TotalTaxValue,TotalValue:TotalOrderValue}));
-		  
-		
-		 
-		 var theForm = $(".ServicePO");
-		
-		 addHidden(theForm,"Reqnumber"+temp,Reqnumber );
-		 addHidden(theForm,"departmentName"+temp,departmentName );
-	     addHidden(theForm,"AvilBudget"+temp,AvilBudget );
-		 addHidden(theForm,"costCode"+temp,costCode );		
-		  addHidden(theForm,"materialCode"+temp,materialCode );
-		 addHidden(theForm,"materialName"+temp,materialName );
-	     addHidden(theForm,"uom"+temp,uom);
-		 addHidden(theForm,"quantity"+temp,quantity);
-		  addHidden(theForm,"itemRate"+temp,itemRate);
-		
-		  addHidden(theForm,"Cgst"+temp,Cgst);
-		  addHidden(theForm,"AfterCgst"+temp,AfterCgst);
-	      addHidden(theForm,"Sgst"+temp,Sgst);
-	      addHidden(theForm,"AfterSgst"+temp,AfterSgst);
-		  addHidden(theForm,"Igst"+temp,Igst);
-                  addHidden(theForm,"AfterIgst"+temp,AfterIgst);
-		  addHidden(theForm,"Frequency"+temp,Frequency);
-                  addHidden(theForm,"FrequencyValue"+temp,FrequencyValue);
-		  addHidden(theForm,"TotalOrderValue"+temp,TotalOrderValue);
-                  addHidden(theForm,"ItemDescription"+temp,ServiceDescription);
-                  addHidden(theForm,"OtherAmt"+temp,OtherAmt);
-			
-		
-		  $('#txtRowCount').val(temp); 
-		   clearServiceModalFields();
-		 
-      	  }	  
-   
- });
-
- $('.EditService').click(function(){
-         
-   		
-        if( validateEditServiceTax())
-        {
-            //alert('inside Add');			
-            var CostCode =  $("#EditCostCenter").val();
-			 var AvilBudget = $('#EditAvlBudAmt').val();
-			var editMaterialCode =  $("#EditMaterialCode").val();
-			var editDescription = $("#EditItemName").val();		
-			var editUOM = $('#EditUOM').val();
-			var editQuantity = $('#EditQuantity').val();
-			
-			 var itemRate = $("#EditRate").val();
-		  
-		
-		  
-		   var Cgst = $("#EditCgst").val();
-		  var AfterCgst = $("#EditAfterCgst").val();
-                  var Sgst = $("#EditSgst").val();
-                  var AfterSgst = $("#EditAfterSgst").val();
-                  var Igst = $("#EditIgst").val();
-                  var AfterIgst = $("#EditAfterIgst").val();
-		
-		  var Frequency=$("#EditFrequency").val();
-		  var FrequencyValue=$("#EditFrequencyNo").val();
-		    var ServiceDescription = $('#EdittxtSpcialInstruction').val();
-		var OtherAmt = $('#EditOtherAllowances').val();
-		  var TotalOrderValue = $("#EditTotalOrderValue ").val();
-		 
-		  
-			var basicval = $("#txtEditBasicValue").val();
-	
-			var TotalTaxValue = calculateEditTaxValue();	
-			
-			 
-		 
-                         var tr= document.getElementById(userid);
-			var cellval = tr.cells;   
-			
-                        cellval[2].innerHTML = editMaterialCode;	
-			cellval[3].innerHTML = ServiceDescription;			
-			cellval[4].innerHTML = editQuantity;
-			cellval[5].innerHTML =editUOM;
-			cellval[6].innerHTML =parseFloat(itemRate).toFixed(2);
-			cellval[7].innerHTML =parseFloat(basicval).toFixed(2);
-			cellval[8].innerHTML =parseFloat(TotalTaxValue).toFixed(2);
-			cellval[9].innerHTML =parseFloat(TotalOrderValue).toFixed(2);
-					
-			
-			$('#materialCode'+userid).val(editMaterialCode);
-			$('#materialName'+userid).val(editDescription);
-			$('#uom'+userid).val(editUOM);
-			$('#quantity'+userid).val(editQuantity);
-                        $('#itemRate'+userid).val(itemRate);
-			$('#Cgst'+userid).val(Cgst);
-                        $('#AfterCgst'+userid).val(AfterCgst);
-			$('#Sgst'+userid).val(Sgst);
-			$('#AfterSgst'+userid).val(AfterSgst);	
-			$('#Igst'+userid).val(Igst);
-			$('#AfterIgst'+userid).val(AfterIgst);
-                        $('#ItemDescription'+userid).val(ServiceDescription);
-                        $('#OtherAmt'+userid).val(OtherAmt);
-               
-			$('#TotalOrderValue'+userid).val(TotalOrderValue);
-			
-			populateValueMainFormForEditServiceTax();	 			
-		
-      }
-    
- });
- function addHidden(theForm, key, value) {
-    // Create a hidden input element, and append it to the form:
-    var input = document.createElement('input');
-    input.type = 'hidden';
-    input.name = key;'name-as-seen-at-the-server';
-    input.id = key;'name-as-seen-at-the-server';
-    input.value = value;
-    theForm.append(input);
-}
-
-function populateValueMainFormForServiceTax()
-{
-		var AfterCgst = $('#AfterCgst').val() == '' ? '0.00' : $('#AfterCgst').val();
-		var AfterSgst = $('#AfterSgst').val() == '' ? '0.00' : $('#AfterSgst').val();
-		var AfterIgst = $('#AfterIgst').val() == '' ? '0.00' : $('#AfterIgst').val();
-	        var OtherAmt = $('#OtherAllowances').val() == '' ? '0.00' : $('#OtherAllowances').val();
-		var TotalVal = $('#TotalOrderValue ').val() == '' ? '0.00' : $('#TotalOrderValue').val();
-		
-		var BasicVal = $('#txtBasicValue').val() == '' ? '0.00' : $('#txtBasicValue').val();
-		
-		
-		var TotalOrderValueSummary = $('#txtTotalOrderValueSummary').val() == '' ? '0.00' : $('#txtTotalOrderValueSummary').val();
-		
-		var totBasicAmt = $('#txtTotBasicAmount').val() == '' ? '0.00' : $('#txtTotBasicAmount').val();
-		var TotalCgst = $('#txtTotCgst').val() == '' ? '0.00' : $('#txtTotCgst').val();
-		var TotSgst = $('#txtTotSgst').val() == '' ? '0.00' : $('#txtTotSgst').val();
-		var TotalIgst = $('#txtTotIgst').val() == '' ? '0.00' : $('#txtTotIgst').val();
-		 var TotalAllowance = $('#TotalOtherAllowances').val() == '' ? '0.00' : $('#TotalOtherAllowances').val();
-		$('#txtTotBasicAmount').val((parseFloat(totBasicAmt) + parseFloat(BasicVal)).toFixed(2) );
-		$('#txtTotCgst').val((parseFloat(TotalCgst) + parseFloat(AfterCgst)).toFixed(2) );
-		$('#txtTotSgst').val((parseFloat(TotSgst) + parseFloat(AfterSgst)).toFixed(2) );
-		$('#txtTotIgst').val((parseFloat(TotalIgst) + parseFloat(AfterIgst)).toFixed(2) );
-                $('#TotalOtherAllowances').val((parseFloat(TotalAllowance) + parseFloat(OtherAmt)).toFixed(2) );
-		
-		$('#txtTotalOrderValueSummary').val((parseFloat(TotalOrderValueSummary) + parseFloat(TotalVal)).toFixed(2) );
-		
-}
-function populateValueMainFormForEditServiceTax()
-{
-	  
-		var rows =  document.getElementById('serviceTax').rows.length;
-       
-		var TotCgst = 0;
-		var TotSgst = 0;
-		var TotIgst = 0;
-	        var TotOther = 0;
-		var TotSummary = 0;
-		var TotBasicAmout = 0;
-                var i = 0;
-                 do {
-		   i += 1;
-		   var tr= document.getElementById(i);
-			 //alert(tr);
-			 if(tr != null)
-			 {
-			 cells = tr.getElementsByTagName('td');
-					
-			
-		     var rowid = cells[0].innerHTML;
-			
-		var AfterCgst = $('#AfterCgst'+rowid).val() == '' ? '0.00' : $('#AfterCgst'+rowid).val();
-		var AfterSgst = $('#AfterSgst'+rowid).val() == '' ? '0.00' : $('#AfterSgst'+rowid).val();
-		var AfterIgst = $('#AfterIgst'+rowid).val() == '' ? '0.00' : $('#AfterIgst'+rowid).val();
-		var OtherAmt = $('#OtherAmt'+rowid).val() == '' ? '0.00' : $('#OtherAmt'+rowid).val();
-		var TotalVal =$('#TotalOrderValue'+rowid).val() == '' ? '0.00' : $('#TotalOrderValue'+rowid).val();
-		
-		var Quantity = $('#quantity'+rowid).val() == '' ? '0.00' : $('#quantity'+rowid).val();
-		var ItemRate = $('#itemRate'+rowid).val() == '' ? '0.00' : $('#itemRate'+rowid).val();
-                var FrequencyValue = $('#FrequencyValue'+rowid).val() == '' ? '1.00' : $('#FrequencyValue'+rowid).val();	
-		var BasicVal = parseFloat(Quantity) * parseFloat(ItemRate) *  parseFloat(FrequencyValue);
-		
-		TotCgst = parseFloat(TotCgst) + parseFloat(AfterCgst);
-		TotSgst = parseFloat(TotSgst) + parseFloat(AfterSgst);
-		TotIgst = parseFloat(TotIgst) + parseFloat(AfterIgst);
-		TotOther = parseFloat(TotOther) + parseFloat(OtherAmt);
-		TotSummary = parseFloat(TotSummary) + parseFloat(TotalVal);
-		TotBasicAmout = parseFloat(TotBasicAmout) + parseFloat(BasicVal);
-		
-		}    
-			
-		
-            }		while (i < rows);  	
-
-		$('#txtTotBasicAmount').val(parseFloat(TotBasicAmout).toFixed(2) );
-		$('#txtTotCgst').val(parseFloat(TotCgst).toFixed(2) );
-		$('#txtTotSgst').val(parseFloat(TotSgst).toFixed(2) );
-		$('#txtTotIgst').val(parseFloat(TotIgst).toFixed(2) );
-		$('#TotalOtherAllowances').val(parseFloat(TotOther).toFixed(2) );
-		$('#txtTotalOrderValueSummary').val(parseFloat(TotSummary).toFixed(2) );
-		
-}
-function calculateEditTaxValue()
- {
-	var Cgst = parseFloat($('#EditAfterCgst').val());
-	var Sgst = parseFloat($('#EditAfterSgst').val());
-	var Igst = parseFloat($('#EditAfterIgst').val());
-	
-
-	var TottaxAmt = Cgst + Sgst + Igst;
-	return parseFloat(TottaxAmt).toFixed(2); 
- }
-function clearServiceModalFields()
-{
-	// To reset the Modal controls
-	$('#ReqNo').val('0'); 	
-	$('#deptName').val('');	
-	$('#CostCenter').val("0");
-	$('#AvlBudAmt').val('');
-	$('#MaterialCode').val("0")	;
-	$("#ItemName").val('');		
-	$('#UOM').val(''); 
-	$('#Quantity').val('');       
-	$("#Rate").val('');			 
-
-	$("#txtBasicValue").val('');
-	$("#AfterCgst").val(0);
-	$("#AfterSgst").val(0);
-	$("#AfterIgst").val(0);
-	$("#Cgst").val(0);
-	$("#Sgst").val(0);
-	$("#Igst").val(0);
-	$("#TotalOrderValue").val('');
-        $("#OtherAllowances").val(0);
-        $("#txtSpcialInstruction").val('');
-	$("#Frequency").val('');
-}
-
-function DeleteRow(rowid)
-{
-	   var DelRows  = $('#txtDeletedRow').val();
-	  
-	   var answer = confirm(" Do you want to delete the Item from the List?")
-		if (answer) 
-		{ 			
-			var td = document.getElementById(rowid);
-			td.parentNode.removeChild(td);
-			
-			var removeItem = $('#materialCode'+rowid).val();      
-		
-		
-			
-		  SelectedMaterialCode.splice( SelectedMaterialCode.indexOf('removeItem'), 1 );
-			$.each(SelectedMaterialList.Mat, function(i, el){
-	    
-			if (this.materialCode == removeItem){//Type = '';
-		          SelectedMaterialList.Mat.splice(i, 1);
-		}
-		});
-		
-		  if(DelRows != '')
-		  {
-		  DelRows = DelRows + ":" + rowid;
-		  }
-		  else
-		  {
-			  DelRows=  "0" + ":" + rowid;
-		  }
-		  $('#txtDeletedRow').val(DelRows);
-		   populateValueMainFormForDeleteItem(rowid);
-		}
-       	
-} 
-
-function populateValueMainFormForDeleteItem(rowid)
-{
-	  
-		
-       // alert(rows);
-		var TotCgst = $('#txtTotCgst').val();
-		var TotSgst = $('#txtTotSgst').val();
-		var TotIgst = $('#txtTotIgst').val();
-		var TotOtherAmt = $('#TotalOtherAllowances').val();
-		var TotSummary = $('#txtTotalOrderValueSummary').val();
-		var TotBasicAmout = $('#txtTotBasicAmount').val();
-		
-	  
-			
-		var AfterCgst = $('#AfterCgst'+rowid).val() == '' ? '0.00' : $('#AfterCgst'+rowid).val();
-		var AfterSgst = $('#AfterSgst'+rowid).val() == '' ? '0.00' : $('#AfterSgst'+rowid).val();
-		var AfterIgst = $('#AfterIgst'+rowid).val() == '' ? '0.00' : $('#AfterIgst'+rowid).val();
-		var OtherAmt =  $('#OtherAmt'+rowid).val() == '' ? '0.00' : $('#OtherAmt'+rowid).val();
-		var TotalVal =$('#TotalOrderValue'+rowid).val() == '' ? '0.00' : $('#TotalOrderValue'+rowid).val();
-		
-		var Quantity = $('#quantity'+rowid).val() == '' ? '0.00' : $('#quantity'+rowid).val();
-		var ItemRate = $('#itemRate'+rowid).val() == '' ? '0.00' : $('#itemRate'+rowid).val();	
-                 var FrequencyValue = $('#FrequencyValue'+rowid).val() == '' ? '1.00' : $('#FrequencyValue'+rowid).val();
-		var BasicVal = parseFloat(Quantity) * parseFloat(ItemRate) * parseFloat(FrequencyValue);
-		//alert(TotalVal);
-		
-		TotCgst = parseFloat(TotCgst) -  parseFloat(AfterCgst);
-		TotSgst = parseFloat(TotSgst) - parseFloat(AfterSgst);
-		TotIgst = parseFloat(TotIgst) - parseFloat(AfterIgst);
-		TotOtherAmt = parseFloat(TotOtherAmt) - parseFloat(OtherAmt);
-		TotSummary = parseFloat(TotSummary) - parseFloat(TotalVal);
-		TotBasicAmout = parseFloat(TotBasicAmout) - parseFloat(BasicVal);
-		
-			
-		$('#txtTotBasicAmount').val(parseFloat(TotBasicAmout).toFixed(2) );
-		$('#txtTotCgst').val(parseFloat(TotCgst).toFixed(2) );
-		$('#txtTotSgst').val(parseFloat(TotSgst).toFixed(2) );
-		$('#txtTotIgst').val(parseFloat(TotIgst).toFixed(2) );
-                $('#TotalOtherAllowances').val(parseFloat(TotOtherAmt).toFixed(2) );
-		
-		$('#txtTotalOrderValueSummary').val(parseFloat(TotSummary).toFixed(2) );	
-
-		
-		
-}
-
-function validateServiceTax()
- {  
-
-	if($('#ReqNo').val() == "0")
-	{
-		alert('Please select the Requisition Number');
-		$('#ReqNo').focus();
-		return false;
-	}
-	else if($('#CostCenter').val() == "0")
-	{
-		alert('Please select the Cost center');
-		$('#CostCenter').focus();
-		return false;
-	}
-	else if($('#MaterialCode').val() == "0")
-	{
-		alert('Please select the Material Code');
-		$('#MaterialCode').focus();
-		return false;
-	}		
-	else if($('#Quantity').val() == '')
-	{
-		alert('Please Enter the Quantity value');
-		$('#Quantity').focus();
-		return false;
-	}
-	else if($('#Rate').val() == '')
-	{
-		alert('Please Enter the Rate of the Item');
-		$('#Rate').focus();
-		return false;
-	}
-	else if(ExceedQuantityCheck() ==  false)
-	{  
-		return false;
-	}
-	else if(ExceedBudget($('#TotalOrderValue').val(),$('#AvlBudAmt').val()) == false)
-	{
-		 $('#Rate').focus(); 
-				return false;
-	}
-	else
-	{
-		return true;
-	}
-		
- }
- function validateEditServiceTax()
- {  
-
-	if($('#EditCostCenter').val() == "0")
-	{
-		alert('Please select the Cost center');
-		$('#EditCostCenter').focus();
-		return false;
-	}
-	else if($('#EditMaterialCode').val() == "0")
-	{
-		alert('Please select the Material Code');
-		$('#EditMaterialCode').focus();
-		return false;
-	}		
-	else if($('#EditQuantity').val() == '')
-	{
-		alert('Please Enter the Quantity value');
-		$('#EditQuantity').focus();
-		return false;
-	}
-	else if($('#EditRate').val() == '')
-	{
-		alert('Please Enter the Rate of the Item');
-		$('#EditRate').focus();
-		return false;
-	}
-	else if(EditExceedQuantityCheck() ==  false)
-	{  
-		return false;
-	}
-	else if(ExceedBudget($('#EditTotalOrderValue').val(),$('#EditAvlBudAmt').val()) == false)
-	{
-		 $('#EditRate').focus(); 
-		 return false;
-	}
-	else
-	{
-		return true;
-	}
-		
- }
-// this function is used to clear data changing schedule option
-$('#Scheduleby').change(function(){
-        
-             $("#Deliverydt").datepicker({
-            minDate : 'now',
-            dateFormat: 'mm/dd/yy',changeMonth: true, changeYear: true,yearRange: '0:+10'
-        });
-                
-            });
-            $('#Deliverydt').change(function(){
-
-            
-           $('#Scheduleby').val('');
-                
-            });
-//
-</script>
-<script>
-function Save(status)
-{  
-if(status == '0')
-{
-	stat = '<?php echo PO_DRAFT; ?>';
-}
-else
-{
-	stat = '<?php echo PO_CREATED; ?>';
-}
-tinyMCE.triggerSave();
-var splinstr = $('#ScopeOfWork').val();
-$('#ScopeOfWork').val(splinstr);
-var deladd = $('#DeliveryAddr').val();
-
-$('#txtDeliveryAddress').val(deladd);
-$('#txtStatus').val(stat);
-	if(validate())
-		{ 	
-			if(document.getElementById('serviceTax').rows.length < 2)
-			{
-				alert('Please Select Line item to Create PO');
-				$('#Deliverydt').focus();
-				return false;
-			}
-			else
-			{
-			$('#content').loader('show');
-		  $.ajax({ 
-			data:$('.ServicePO').serialize(),
-			type:"POST",
-			url:"<?php echo base_url() ?>servicepurchaseorder/addNewServicePurchaseOrder", 
-			success:function(data) {
-			if(data)
-			{
-				$('#content').loader('hide'); 
-				alert(data);
-				$('#txtRowCount').val('');
-				$('#txtDeletedRow').val('');
-				$('#SpcialInstruction').val('');
-				$('#txtDeliveryAddress').val('');
-				window.location =	"purchaseorderListing";
-			
-			}
-				else
-				{
-				$('#content').loader('hide'); 
-				alert("Error");	
-				}				
-		
-				}
-  
-				});
-			}
-
-}
-}
-<!-- script for table , It works under the datatable plugin-->
- /* $(function () {  
-    $('#serviceTax').DataTable({
-      "paging": true,
-      "lengthChange": true,
-      "searching": false,
-      //"ordering": true,
-     // "info": true,
-      "autoWidth": true
-	   
-    }); 
-  }); */
-
-
- var Detail = <?php echo json_encode($Payment, JSON_PRETTY_PRINT) ?>;
-//console.log(Detail);
-  
-       $.each(Detail, function (index, value) 
-       {
-          // $("#PaymentTerms").append( $('<option></option>').val(value.ConfigValue).html(value.ConfigValue) );
-
-
-         
-       } ); 
-
-
-
-
-
-
-function openModal()
-{
-	if(vaildateBeforeOpenModal())
-	{
-		 $('#SERVICE').modal('show');	
-	}
-}
-
-function vaildateBeforeOpenModal()
-{
-	if($('#PODate').val() == '')
-	{
-		alert('Please Enter the Purchase Order date');
-		$('#PODate').focus();
-		return false;
-	}
-	else if($('#drpSupplier').val() == "0")
-	{
-		alert('Please Select the Supplier details');
-		$('#drpSupplier').focus();
-		return false;
-	}
-	else if($('#DeliveryAddr').val() == '')
-	{
-		alert('Please Enter the Delivery Address');
-		$('#DeliveryAddr').focus();
-		return false;
-	}
-	else if($('#Deliverydt').val() == '' && $('#Scheduleby').val() == '')
-	{
-		alert('Please Enter the Delivery Date');
-		$('#Deliverydt').focus();
-		return false;
-	}
-	else if($('#workstatus').val()=="0")
-	{
-      alert('Please Enter WorkStatus');
-      $('#workstatus').focus();
-      return false;
-
-	}
-
-    
-	else 
-	{
-		return true;
-	}
-}
-
-function calculateCgstTax(varBasicValue,Cgst)
- {
-	
-		 var basicValue = parseFloat(varBasicValue);
-		var Cgst = parseFloat(Cgst);	 
-		 var ServiceTaxValue = 0.0;  
-		 
-		 ServiceTaxValue = <?php echo SERVICETAX_CGST; ?>;
-		
-	     var TAXval =  parseFloat(ServiceTaxValue).toFixed(2);
-	 
-		return   TAXval;//  $('#AfterServiceTax').val(TAXval); 
-		 
- }
-function calculateSgstTax(varBasicValue,Sgst)
- {
-	
-		 var basicValue = parseFloat(varBasicValue);
-		var Sgst = parseFloat(Sgst);	 
-		 var ServiceTaxValue = 0.0;  
-		 
-		 ServiceTaxValue = <?php echo SERVICETAX_SGST; ?>;
-		
-	     var TAXval =  parseFloat(ServiceTaxValue).toFixed(2);
-	 
-		return   TAXval;//  $('#AfterServiceTax').val(TAXval); 
-		 
- }
-function calculateIgstTax(varBasicValue,Igst)
- {
-	
-		 var basicValue = parseFloat(varBasicValue);
-		var Igst = parseFloat(Igst);	 
-		 var ServiceTaxValue = 0.0;  
-		 
-		 ServiceTaxValue = <?php echo SERVICETAX_IGST; ?>;
-		
-	     var TAXval =  parseFloat(ServiceTaxValue).toFixed(2);
-	 
-		return   TAXval;//  $('#AfterServiceTax').val(TAXval); 
-		 
- }
-
-
-
-
-</script>
diff --git a/application/views/servicepopdf.php~ b/application/views/servicepopdf.php~
deleted file mode 100644
index 96803adb..00000000
--- a/application/views/servicepopdf.php~
+++ /dev/null
@@ -1,431 +0,0 @@
-<?php
-
-		$PONO = ''; 
-		$postatus ='';
-		$CompanyAddress = '';
-                $CompanyName = '';
-	    $SuplierName = '';
-		$SuplierAddress = '';
-		$DeliveryAddress = '';
-		$Podt = '';
-		$DeliveryDate ='';
-		$DeliverySchedule='';
-		$Cgst=0.00;
-		$Sgst =0.00;
-		$Igst =0.00;
-		
-		$TotalAmount =0.00;
-		$SubTotalAmount =0.00;
-		$TaxAmount =0.00;
-		$BasicAmount = 0.00;
-			$OtherAllowance = 0.00;
-		$ServiceDescription = '';
-                $PaymentTerms='';
-             
-        
-	if(!empty($CompanyDetails))
-		{
-    foreach ($CompanyDetails as $CO)
-    {
-		$CompanyName = $CO->CompanyName;
-		$CompanyAddress = $CO->Address;
-		
-	}
-        }
-
-          $currencyName='INR';
-        $currencyCode ='';
-            if(!empty($CurrencySymbol))
-                            {
-                foreach ($CurrencySymbol as $Curr)
-                {
-                   
-                            $currencyCode = $Curr->FontCode2000;
-                            //$currencyName = $currencyName;
-                        
-
-                    }
-
-                    }
-
-            
-
-	
-		if(!empty($POItem))
-		{
-			
-    foreach ($POItem as $PO)
-    {
-
-		 $PONO = $PO->PONO;
-		 $postatus= $PO->Status;
-		 $SuplierName = $PO->SupplierName;
-		$SuplierAddress = $PO->Address;
-		$DeliveryAddress = $PO->DeliveryAddress;		
-		$dt = new DateTime($PO->PODate, new DateTimeZone('Asia/Kolkata'));				
-		$Podt =  $dt->format('d-m-Y');
-		$dtDe = new DateTime($PO->DeliveryDate, new DateTimeZone('Asia/Kolkata'));				
-		$DeliveryDate =  $dtDe->format('d-m-Y');
-		$ServiceDescription =$PO->ServiceDescription;
-                $PaymentTerms = $PO->PaymentTerms;
-                
-		
-	}
-}
-
-		
-         ?>
-         
-<style>
-	@page { margin: 280px 50px 30px 50px; }
-	.header { position: fixed; left: 0px; top: -280px; right: 0px; height: 550px;text-align: center; }
-	.footer { position: fixed; bottom: 0px; }
-	.pagenum:before { content: counter(page); }
-</style>
-<div class="footer">Page: <span class="pagenum"></span></div> 
- 
-<div class="header">
-			<div style="text-align:right;">
-			<?php 
-				if ($postatus == 'ST026')
-				{}
-				else
-				{
-					echo '<div><b>DRAFT</b> </div>';
-					 
-				}
-
-				?>
-				</div>
-				 
-	<center> <span style="font-size:24px;">PURCHASE ORDER - <a style="color:#515151">PO NO:<?php echo $PONO?> </a></span></center>
-	 
- 
-<table style="border-collapse: collapse;font-size:12px;" border="1" width="100%" cellspacing="0" cellpadding="0">
-<tbody>
-<tr> 
- 
-<td colspan="2">
-<p style="color:#3c8dbc;font-size:16px;"><strong><?php echo $CompanyName; ?></strong></p>
-<p> <?php echo $CompanyAddress; ?></p>
-</td>
-<td align="right"><img  width="100" height="100"  src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAABQCAYAAACOEfKtAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA11JREFUeNrsnT9IHEEYxWfFw8rgpUhlo5URi2gTbIUUSrq1ui4oRLRIY9JIKrGKTQrBgJLuuutEi4CtSSOpPIuATdIEcid2YpN9C3sc8c6bf7uZmX0P7k7ultm7337zzXxvZjGaiaIfQoiqoHTUHk6eniSPUbLQUmUoebojB23dDZGBmQiQAAmQAAmQIkACJEACpAiweA3bbvDV5mb6+iKOxfTc3MDjf15dicbBQfr3591d7wBGM1H0J3l9bNLI84UFsby6mkIzFWACJMCafJ9PJyfSx29vbHQuoqJaxl34zc5O+mVtwIPi5EIcXV52IjnoLvx+by/9wXkIF8aHbq0dgYi4vOB1Q7QV2c4BXM4Z3r+RGBTAR9VqmqhVBoZnIyOdx9taTXqQGJ+YUDqXFwBV4WGU69aXRkNsr69LtyEzHfIKIKJCVl9PT3u+/63P+6bnC64SuWm3jdsYn5xkKcdamCJAAiwjQJcHAC8ATs/OBg1Qy0y4ub6WPhb1cuPwUFycn9/77OPWlvXzeQGw2QPGQ9o/PhZrS0v3IPpooFrpwgChYniidq6fnTnvrBSaA3Uc3A/1uvPuSmEA0f0uFLsyBKcZDjaisvSj8DsFW6pbcHPQpV12WQoBCHhri4taEOGwhJAXjeeBgFebn1eyp0LKi1Ym0rCsXieRqLk06HVetFqJwHmWnRz3yotHzabT9n0hpRxGZ0SjjpGKCEQkxgUtWDlbCyMfIi/qTHMgrDf7srCem5mQDS5YQNKRD2vCuQLMhCVM3bwIiK4PLIUYqrp5EXPFeGWFALO8CEdGddId7NYOHWFQUa1cUO4Fty78/fZW6tFrjx7gqfqAT0PbmWAqVCwq+bDUOxMeyokh6L8B1J1kE2BgIkACJMDyAbSx56/cACV3CoyOjfX9rNSrcrI7E/qVYYCnYhKY3LXkJECVOdx+Us51m6Nwm7HVQyUCf4UGEJuFZPMgIhC+XlYfw21WWQ/GxXJ50q09iBS1MSjYW73ww3SXMVXOobsk4MU80GQZc5DQbl5tOzWRRpS8nJqy1tUAzWZ7ecvKDdfdggWfTV0GbdnA4JB1UdhbHjo0LesAS6YWa2GaCQRIgARIESABEiABUgRIgARYRoAVYtBWBfcL/xb8hwS6av8VYADVjF2M5sTWJAAAAABJRU5ErkJggg=="></td> 
-</tr>
-<tr>
-<td>
-<p><strong>Vendor Address :</strong></p>
-<p><?php echo $SuplierName; ?><br /><?php  echo $SuplierAddress; ?></p>
-</td>
-<td colspan="2">
-<p><strong>Delivery To :</strong></p>
-<p><?php  echo $DeliveryAddress; ?></p>
-</td>
-</tr>
-<tr>
-<td>PO DATE :<?php echo $Podt; ?></td>
-<td colspan="2">DELIVERY DATE / SCHEDULE BY :<?php echo $DeliveryDate.$DeliverySchedule;?></td>
-</tr>
-</tbody>
-</table>
-	
-	 
-</div>
-<table style="border-collapse: collapse;" border="1" width="100%" cellspacing="0" cellpadding="0">
-
-<tbody>
-
-<tr>
-
-<td>Requistion Number</td>
-
-<td>Requested By</td>
-
-<td>Requested Department</td>
-
-<td>Cost Center &nbsp;</td>
-
-</tr>
-
-
-
-<?php
-				if(!empty($RequistionDetails))
-				{
-					
-					foreach($RequistionDetails as $ReqDetails)
-					{
-												  						
-				?>
-			<tr>
-			<td><?php echo $ReqDetails['RequistionNo']; ?></td>
-			<td><?php echo $ReqDetails['RequestedName']; ?></td>
-			<td><?php echo $ReqDetails['RequestedDept']; ?></td>
-			<td><?php echo $ReqDetails['CostCenterCode']; ?></td>
-			</tr> 
-			 <?php
-						}
-						}
-						
-					  ?>
-
-
-
-</tbody>
-
-</table>
-
-<p>&nbsp;</p>
-
-<p>&nbsp;</p>
-
-<table style="border-collapse: collapse;" border="1" width="100%" cellspacing="0" cellpadding="0">
-
-<tbody>
-
-<tr>
-
-<td>#</td>
-
-<td>Item Name</td>
-
-<td>Service Description</td>
-
-<td>UOM</td>
-
-<td>Qty</td>
-
-<td>Rate In INR</td>
-
-<td>Basic Value In INR</td>
-
-<td>CGST In INR</td>
-
-<td>SGST In INR</td>
-
-<td>IGST In INR</td>
-
-<td>Other Allow In INR</td>
-
-<td>Total Amount In INR</td>
-
-</tr>
-
-
-
- <?php
-							if(!empty($POItem))
-							{
-								 $index = 0;
-								 $TotalAmount = 0;
-								 $OrderValue = 0;
-								  $TotalTax = 0;
-                                                                  $SubTotalAmount=0;
-								foreach($POItem as $record)
-								{
-									$index = $index + 1;
-									
-							?>
-		<tr  style="line-height: 1.5em;">
-		<td><?php echo $index ; ?></td>
-		<td><?php echo $record->MaterialName ; ?></td>
-		<td><?php echo $record->ServiceMaterialDescription ; ?></td>
-		<td align="right"><?php echo $record->UOM ; ?></td>
-		<td align="right"><?php echo $record->Quantity ; ?></td>
-		
-		<td align="right"><?php echo $record->Rate  ; ?></td>
-		<td align="right"><?php if($record->NumberOfService==0 || $record->NumberOfService==''){
-			echo $record->BasicValue;
-			$TotalAmount = $record->BasicValue + $record->Taxamount + $record->otherallowance;
-			$SubTotalAmount  = $SubTotalAmount + $record->BasicValue + $record->otherallowance;
-		}  
-     else{
-	echo $record->BasicValue  *  $record->NumberOfService;
-	$TotalAmount = $record->BasicValue *  $record->NumberOfService + $record->Taxamount + $record->otherallowance;
-	$SubTotalAmount  = $SubTotalAmount + $record->BasicValue * $record->NumberOfService  + $record->otherallowance;
-         }		
-		?></td>
-		<td align="right"><?php echo $record->After_SGST  ; ?></td>
-		<td align="right"><?php echo $record->After_CGST ; ?></td>
-		<td align="right"><?php echo $record->After_IGST  ; ?></td>
-		<td align="right"><?php echo $record->otherallowance  ; ?></td>
-		<td align="right"><?php echo  number_format($TotalAmount,2)  ; ?></td>
-		</tr>
-								
-		 <?php
-		 						
-								
-								$Sgst =$Sgst + $record->After_SGST;
-								$Cgst =$Cgst + $record->After_CGST;
-								$Igst = $Igst + $record->After_IGST; 
-								
-								
-								}
-							
-								$TotalTax =$TotalTax+ $Sgst + $Cgst+$Igst;
-									$OrderValue = $OrderValue + $SubTotalAmount + $TotalTax;
-							}
-							
-							?>
-
-</tbody>
-
-</table>
-
-<p>&nbsp;</p>
-
-
- 
-
-
-
-<table style="border-collapse: collapse;" border="1" width="100%" cellspacing="0" cellpadding="0">
-
-
-
-<tbody>
-
-
-
-<tr>
-
-
-
-<td style="text-align: center;" rowspan="3">
-
-
-
-<p><strong>Total Amount In Words</strong><br /><br /><br /></p>
-
-
-
-<p><em><strong><?php echo $TotalAmountInWords;?></strong></em></p>
-
-
-
-</td>
-
-
-
-<td style="text-align: right;"><strong>Total Amount Before Tax In INR -  <?php echo  number_format($SubTotalAmount,2);?></strong></td>
-
-
-
-</tr>
-
-
-
-<tr>
-
-
-
-<td style="text-align: right;"><strong>Total Tax Amount In INR - <?php echo  number_format($TotalTax,2);?></strong></td>
-
-
-
-</tr>
-
-
-
-<tr>
-
-
-
-<td style="text-align: right;"><strong>Total Amount After Tax In INR - <?php echo  number_format($OrderValue,2);?></strong></td>
-
-
-
-</tr>
-
-
-
-<tr>
-
-
-
-<td>
-
-
-
-<p><strong>Payment Terms&nbsp;</strong></p>
-
-
-
-
- <p><?php echo $PaymentTerms;?></p>
-
-
-
-</td>
-
-
-
-<td>
-
-
-
-<p style="text-align: center;">Certified that the particulars given&nbsp;above are true and correct</p>
-
-
-
-<p style="text-align: center;"><strong><?php echo $CompanyName; ?></strong></p>
-
-
-
-<p>&nbsp;</p>
-
-
-
-<p style="text-align: center;">Authorized Signatory</p>
-
-</td>
-
-</tr>
-
-</tbody>
-
-</table>
-
-<p><strong>Scope Of Work:</strong></p>
-
-<p><?php echo $ServiceDescription;?></p>
-	
-     <?php 
-
-		if(!empty($releasedetails)){
-			
-			 $releasedOn = '';
-			foreach($releasedetails as $detail){
-                $releasedOn= new DateTime($detail->ReleasedOn, new DateTimeZone('Asia/Kolkata'));
-                      
-
-		?>
-	
-		
-		<!-- <table   width="100%">
-			<tbody>
-			<tr>
-			<td><b>Released By:</b></td>
-			<td style="text-align:right;"><b>Released On:</b></td>
-			</tr>
-			<tr>
-			<td><?php echo $detail->FirstName;?></td>
-			<td style="text-align:right;"><?php echo $releasedOn->format('d-m-Y');?></td>
-			</tr>
-			</tbody>
-		</table> -->
-		<p>&nbsp;</p>
-		 <div align="Left"> <b>Released By : </b><?php echo $detail->FirstName;?></div> 
-		 <div align="Left"> <b>Released On : </b><?php echo $releasedOn->format('d-m-Y');?></div> 
-		<?php 
-					}
-				}
-						 else {
-						
-					 
-				?>
-						  
- 
-						   <?php } ?>   
-
- 
- 
\ No newline at end of file
diff --git a/application/views/statusofservicepurchaseorder.php~ b/application/views/statusofservicepurchaseorder.php~
deleted file mode 100644
index 95f21f79..00000000
--- a/application/views/statusofservicepurchaseorder.php~
+++ /dev/null
@@ -1,189 +0,0 @@
-
-
-
-<script>
- $(document).ready(function(){
- 
-        $("#PONO").select2();
-    	
-});
-
-</script>
-	
-	<div class="content-wrapper" style="min-height:435px;">
-    <!-- Content Header (Page header) -->
-    <section class="content-header">
-      <h1>
-        <center>Status Of Service Purchase Order</center>        
-      </h1>	  	  	 
-    </section>    
-    <section class="content"><br/>  
-	<?php
-                      $attributes = array('class' => 'form-label-left Status ','name'  => 'Status','id'  => 'Status');
-                        
-                        echo form_open($this->config->base_url().'servicepurchaseorder/UpdateServiceStatus',$attributes); ?>	
-						
-	<div class="row" style="padding-bottom:1%">
-	 <div id="content" > </div> 
-		<div class="col-md-12">
-			  <div class="col-md-3">			
-<?php
-                      /* $attributes = array('class' => 'form-label-left ','name'  => 'IGR','id'  => ''); */
-                        
-                        /* echo form_open($this->config->base_url().'/inwardgateregister/addNewigr/',$attributes); 			   */?>
-						<label>Select Service Purchase Order NO </label>	
-						<div>								 									 
-							 <?php
-									$options = array("-1"=>'Purchase Order No'); 
-									
-													if(!empty($PO))
-										{
-											//print_r($PO_NO);
-									    foreach ($PO as $SI):
-												
-									   	  $options[$SI->PONO] =  $SI->PONO  ;
-										 // $PONO = $SI->PONO;									
-													
-											endforeach;
-											
-										}
-					
-									echo form_dropdown('PONO', $options,set_value('PONO'),'id="PONO"' ,'class="form-control select2"' , 'required="true"');
-									
-?>									
-								
-						</div> 
-					</div>
-					 <div class="col-md-3">
-					 <label>Work Status</label>	
-					 <div>								 									 
-							 <?php
-									$options = array(); 
-									
-										if(!empty($WorkStatus))
-										{
-											//print_r($PO_NO);
-									    foreach ($WorkStatus as $SI):
-												
-									   	  $options[$SI->StatusCode] =  $SI->StatusName  ;
-													
-													
-											endforeach;
-											
-										}			
-					
-									echo form_dropdown('WorkStatus', $options,set_value('WorkStatus'),'id="WorkStatus"' ,'class="form-control"' , 'required="true"');
-									
-?>									
-								
-						</div>  
-					</div>
-					<div class="col-md-3">
-					 <label>Remarks</label>	
-					 <div>								 									 
-							 <?php
-									 $data = array('name' => 'Remarks','value' => set_value('Remarks'),'id'=>'Remarks',  'class' => 'form-control' );
-				echo form_input($data);									
-					
-									
-?>									
-								
-						</div>
-						 
-						
-					
-					 </div>
-					 <div class="col-md-2" align="right"><br/>
-
-						 <input type="submit" value="Submit"   class="btn btn-primary">
-						
-					</div>
-					</div>
-		
-					 
-					 
-		
-		
-			
-        <div class="row"> 
-		<div class="col-md-12" style="padding:1% 2%;">
-            								
-				<table id="StatusTable"  class="table table-bordered table-hover editabletable IGR_Line" style="background-color:#fff;font-size:12px;">
-					<thead style="background-color:#ddf">
-						<tr>
-						  <th>S.NO</th>		
-						<th>Req No</th>	
-						<th>Req By</th>
-						<th>Req Date</th>
-						 <th>Supplier Name</th>						 
-						  <th>Item Code</th>
-						  <th>Description</th>
-						  <th>UOM</th>
-						   <th>Ordered Quantity</th>
-						     <th>Rate</th>
-						 
-						 <th>Work Status</th>
-						
-						</tr>
-					</thead>
-				<tbody id="tblAppend">
-					         
-			    </tbody>
-					
-					
-				</table>
-				<input type="hidden" name="txtRowCount" id="txtRowCount" />
-				
-				
-				</div>
-			
-			</div> 
-			 <script>
-		 $(function () { 
-$('#PONO').change(function() {
-	 $("#tblAppend").empty();  
-	 
- var id = $('#PONO').val();
-
-   if(id != '-1')
-   {
-	  
-	  $('#content').loader('show'); 
-	
-	
-	$.ajax({ 
-			data:{id:id},
-			type:"POST",
-			url:"<?php echo base_url() ?>servicepurchaseorder/getPODetails", 		
-			success:function(data) {
-				$('#content').loader('hide'); 
-		              
-							
-				$("#tblAppend").empty();
-				
-				
-				$('#tblAppend').append(data);
-				
-				
-                
-             }	    
-				
-			}); 
-					 
-		
-				
-   }
-   else
-   {
-	   alert('Please Select the Purchase Order Number to change the status');
-   }
-	});
-	});
-
-	
-
- 
-		</script>
-			</section>
-			</div>
-      
\ No newline at end of file