diff --git a/application/config/constants.php b/application/config/constants.php
index 09e1c7e4..ab4d5b62 100755
--- a/application/config/constants.php
+++ b/application/config/constants.php
@@ -65,7 +65,6 @@ 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('REQUISTSTATUS',                     '0');
@@ -94,8 +93,6 @@ define('TRP',                            			'DEP07');
 define('COATING',                            		'DEP08');
 define('MAINTENANANCE',                            	'DEP09');
 define('FINANCE',                            		'DEP10');
-define('PURCHASE',                            		'DEP11');
-define('MANAGEMENT',                            		'DEP12');
 
 /* PO Type  */
 define('REVENUE',                            		'REVENUE');
@@ -153,6 +150,8 @@ define('SERVICETAX_KRISHIKALYAN',                            			'(((.5)/100) * b
 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');
@@ -168,8 +167,9 @@ define('GROSS_DUTY',   'landingcha+highsesssalless+customcha+excisecha+exciseedc
 define('PURCHASE_RATE',                                    'txtbasicinrprice/txtCtablequantity');
 define('CUSTOMDUTY_EXP',                                   'txtgrossexp/txtCtablequantity');
 define('RMC_CAL',                                          'txtpurchaserate+txtcustomdutyexp');
+define('CALCULATE_TOTAL',                                  'txtrmc+basicamt');
 
 
 
 /* End of file constants.php */
-/* Location: ./application/config/constants.php */
+/* Location: ./application/config/constants.php */
\ No newline at end of file
diff --git a/application/controllers/emergencypurchaseorder.php b/application/controllers/emergencypurchaseorder.php
index d5996bb2..1153eca3 100755
--- a/application/controllers/emergencypurchaseorder.php
+++ b/application/controllers/emergencypurchaseorder.php
@@ -18,499 +18,295 @@ class emergencypurchaseorder extends BaseController
     {
         parent::__construct();
         $this->load->model('purchaseorder_model');
-
+		
         $this->load->library('session');
-        $this->load->library('form_validation');
-        $this->load->model('requistion_model');
-        $this->isLoggedIn();
+	     $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()
-    {
-        $this->global['pageTitle'] = 'Siddharth : Create Emergency Purchase Order';
-        $data['RequestType'] = $this->requistion_model->getConfigValue('C004');
+    
+   
+    
+	
+	
+	function CreateEmergencyPO()
+	{
+			
+		$this->global['pageTitle'] = 'Siddharth : Create Emergency Purchase Order';
+		
+        $data['RequestType'] = $this->requistion_model->getConfigValue('C004'); 
+		
         $data['Suplist'] = $this->purchaseorder_model->getSupplierName();
+		
         $data['DeptList'] = $this->purchaseorder_model->getDepartmentListForAllReq();
+		
         $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'); 
+		
+        $this->loadViews("alterpurchaseorder", $this->global, $data,Null);
+		
+	}
+	
 
-        $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');
-        $Deliverydt = $this->getDateformat($dt);
-        $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');
-        //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,'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'];
-        }
-        
-        $RegDetailsStatus=REQITEM_POCREATED;
-
-        // PO Line Items
-        $LineItemStatus = REQITEM_POCREATED;
-
-        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);
-            $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'];
-                }
-
-
-                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 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
-        {
-
+    
+	 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);
-        }
+			$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."'>
+	
+	 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>
 							   
@@ -521,30 +317,30 @@ class emergencypurchaseorder extends BaseController
 							<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."'>
+							</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>
 													                      
@@ -554,371 +350,371 @@ class emergencypurchaseorder extends BaseController
 							<td align='left'>".$Quantity."</td>								
 							</tr>";
 
-            //$index =  $index + 1;
+					//$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');
 
-        $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)));
-    }
+                $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);
 
-    //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');
+								$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');
 
-        $SpcialInstruction = $this->input->post('txtSpcialInstruction');
-        $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);
 
-        $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 ;
-    }
+								$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);
-
-    }
-    /**
+	
+	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;
-
-    }
+     {
+		   	  
+ 		    $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;	  
+        
+     }
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/application/controllers/login.php b/application/controllers/login.php
index 60352858..3f4e9766 100755
--- a/application/controllers/login.php
+++ b/application/controllers/login.php
@@ -78,8 +78,7 @@ class Login extends CI_Controller
 											'DEPCode'=>$res->DEPCode,
 											'HeadDept'=>$res->HeadDept,
 											'DepartmentName'=>$res->DepartmentName,
-                                            'isLoggedIn' => TRUE,
-											'EmpID' => $res->EmpID
+                                            'isLoggedIn' => TRUE
                                     );
                  
                     $this->session->set_userdata($sessionArray); 
@@ -254,4 +253,3 @@ class Login extends CI_Controller
 }
 
 ?>
-
diff --git a/application/controllers/purchaseorder.php b/application/controllers/purchaseorder.php
index 3e135ed0..0e684c44 100755
--- a/application/controllers/purchaseorder.php
+++ b/application/controllers/purchaseorder.php
@@ -155,7 +155,7 @@ class purchaseorder extends BaseController
 			  $ViewName = '';	  
 			 if($ReqType  == REVENUE)
 			 {
-				 $ViewName = 'Purchaseorder';
+				 $ViewName = 'purchaseorder';
 			 }				 
              else if($ReqType  == SERVICE)
 			 {
@@ -806,6 +806,243 @@ class purchaseorder extends BaseController
            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');
+				
+				$SpcialInstruction = $this->input->post('txtSpcialInstruction');
+				$TotalOrder = $this->input->post('txtToatlOrder');
+			    $POStatus = $this->input->post('textStatus');
+
+                $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');
+				//echo($SupplierID);
+
+				//echo($dt);
+				//echo($Deliverydt);
+				//echo($POType);
+				//echo($PoRange);
+				//echo($TotalOrder);
+				//echo($POStatus);
+				//echo($SupplierID);
+				// PO Master
+				$POList = array('SupplierID'=>$SupplierID, 'TotalOrderValue'=>$TotalOrder,'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++)
+							{	
+							//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('AfterLandingChargee'.$i);
+								$HighSeas = $this->input->post('AfterHighseass'.$i);
+								$CustomDuty = $this->input->post('AfterCustomduty'.$i); 
+								$ExciseDuty = $this->input->post('AfterExcisedutyTax'.$i);
+								$ExciseDutyEd = $this->input->post('AfterExcisedutyED'.$i);
+								$ExciseDutySH = $this->input->post('AfterExcisedutySH'.$i);
+								$CustomEd= $this->input->post('AfterCustomEDcess'.$i); 
+								$CustomSH = $this->input->post('AfterCustomSHcess'.$i);
+								$AddAdtional = $this->input->post('AfterAdditionalExciseduty'.$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);
+							
+										$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, 'ExchangeRate'=>$Exchangerate,'BasicPriceInMTon'=>$BasicPriceinmton,'ProductPrice'=>$Productprice,'LandingCharge'=>$LandingCharge,'HighSeasSalesCharge'=>$HighSeas,'CustomDuty'=>$CustomDuty,'ExciseDuty'=>$ExciseDuty,'ExciseDutyEdCess'=>$ExciseDutyEd, 'ExciseDutyS&HCess'=>$ExciseDutySH,'CustomEdCess'=>$CustomEd,'CustomS&HCess'=>$CustomSH,'AddlExciseDuty'=>$AddAdtional,'CreatedBy'=>$CreateBy,'CreatedDate'=>$createddt);
+										
+										$ImportList = $this->purchaseorder_model->addImportTax($ImportTaxList);
+										//echo 'Revenue tax Success';
+										}
+								}
+								
+							}							
+					echo 'Purchase Order Created Successfully! PO Number Is: '.$PONO ;
+    }
+
+    function EditImportPurchaseOrder()
+    {
+
+      $PONO =$this->input->post('txtPONO');
+				$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');
+				$TotalOrder = $this->input->post('txtTotalOrder');
+			    $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');
+				// PO Master
+				// PO Master
+				$POList = array('SupplierID'=>$SupplierID, 'TotalOrderValue'=>$TotalOrder,'PODate'=>$PODate,'Status'=>$POStatus,'PORange'=>$PoRange,'ServiceDescription'=>$SpcialInstruction,'CreatedBy'=>$CreateBy,'DeliveryAddress'=>$DeliveryAddr,'DeliveryDate'=>$Deliverydt,'CreatedDate'=>$createddt );
+					
+					$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);
+
+								$Exchangerate = $this->input->post('ExchangeRate'.$i);
+								$BasicPriceinmton = $this->input->post('imBasicPrice'.$i); 
+								$Productprice = $this->input->post('BasicValue'.$i);
+								$LandingCharge = $this->input->post('txttotallanding'.$i);
+								$HighSeas = $this->input->post('txttotalhighseas'.$i);
+								$CustomDuty = $this->input->post('txttotalcustom'.$i); 
+								$ExciseDuty = $this->input->post('txttotalexcise'.$i);
+								$ExciseDutyEd = $this->input->post('txttotalexciseED'.$i);
+								$ExciseDutySH = $this->input->post('txttotalexciseSH'.$i);
+								$CustomEd= $this->input->post('txttotalcustomED'.$i); 
+								$CustomSH = $this->input->post('txttotalcustomSH'.$i);
+								$AddAdtional = $this->input->post('txttotalAdditionalExciseduty'.$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'=>$CreateBy,'CreatedDate'=>$createddt,'CostCenterCode'=>$CostCenter);
+									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)
+								{
+									$ImportTaxList = array('LineItemNo'=>$LineItemNo, 'ExchangeRate'=>$Exchangerate,'BasicPriceInMTon'=>$BasicPriceinmton,'ProductPrice'=>$Productprice,'LandingCharge'=>$LandingCharge,'HighSeasSalesCharge'=>$HighSeas,'CustomDuty'=>$CustomDuty,'ExciseDuty'=>$ExciseDuty,'ExciseDutyEdCess'=>$ExciseDutyEd, 'ExciseDutyS&HCess'=>$ExciseDutySH,'CustomEdCess'=>$CustomEd,'CustomS&HCess'=>$CustomSH,'AddlExciseDuty'=>$AddAdtional,'CreatedBy'=>$CreateBy,'CreatedDate'=>$createddt);
+								
+									$ImportList = $this->purchaseorder_model->addImportTax($RevenueTaxList);
+								
+								}
+								else
+								{
+									$ImportTaxList = array('LineItemNo'=>$LineItemNo, 'ExchangeRate'=>$Exchangerate,'BasicPriceInMTon'=>$BasicPriceinmton,'ProductPrice'=>$Productprice,'LandingCharge'=>$LandingCharge,'HighSeasSalesCharge'=>$HighSeas,'CustomDuty'=>$CustomDuty,'ExciseDuty'=>$ExciseDuty,'ExciseDutyEdCess'=>$ExciseDutyEd, 'ExciseDutyS&HCess'=>$ExciseDutySH,'CustomEdCess'=>$CustomEd,'CustomS&HCess'=>$CustomSH,'AddlExciseDuty'=>$AddAdtional,'CreatedBy'=>$CreateBy,'CreatedDate'=>$createddt);
+									
+									$this->purchaseorder_model->updateImportTax($LineItemNo,$RevenueTaxList); 
+									
+										}
+							 }								
+								
+							}							
+					
+					echo 'Purchase Order Updated Successfully! PO Number Is: '.$PONO ;
+    }
+
+
 }
 
 ?>
\ No newline at end of file
diff --git a/application/libraries/BaseController.php b/application/libraries/BaseController.php
index b0e812cf..fa1575cf 100755
--- a/application/libraries/BaseController.php
+++ b/application/libraries/BaseController.php
@@ -16,7 +16,6 @@ class BaseController extends CI_Controller {
 	protected $HeadDept = '';
 	protected $DepartmentName = '';
 	protected $roleText = '';
-	protected $EmpID = '';
 	protected $global = array ();
 	
 	/**
@@ -49,13 +48,10 @@ class BaseController extends CI_Controller {
 			$this->DEPCode = $this->session->userdata ( 'DEPCode' );
 			$this->HeadDept = $this->session->userdata ( 'HeadDept' );
 			$this->DepartmentName = $this->session->userdata ( 'DepartmentName' );
-			$this->EmpID = $this->session->userdata ( 'EmpID' );
-			
 			$this->global ['name'] = $this->name;
 			$this->global ['role'] = $this->role;
 			$this->global ['role_text'] = $this->roleText;
 			$this->global ['DEPCode'] = $this->DEPCode;
-			$this->global ['EmpID'] = $this->EmpID;
 		}
 	}
 	
@@ -159,4 +155,4 @@ class BaseController extends CI_Controller {
 				"segment" => $segment
 		);
 	}
-}
+}
\ No newline at end of file
diff --git a/application/models/login_model.php b/application/models/login_model.php
index d6ccf023..b7afc93f 100755
--- a/application/models/login_model.php
+++ b/application/models/login_model.php
@@ -10,7 +10,7 @@ class Login_model extends CI_Model
      */
     function loginMe($email, $password)
     {
-        $this->db->select('BaseTbl.userId, BaseTbl.password, Emp.EmpID,Emp.FirstName,Emp.Designation, BaseTbl.roleId, Roles.role,DEPT.DEPCode,DEPT.DepartmentName,DEPT.HeadDept');
+        $this->db->select('BaseTbl.userId, BaseTbl.password, Emp.FirstName,Emp.Designation, BaseTbl.roleId, Roles.role,DEPT.DEPCode,DEPT.DepartmentName,DEPT.HeadDept');
         $this->db->from('tbl_users as BaseTbl');
         $this->db->join('tbl_roles as Roles','Roles.roleId = BaseTbl.roleId');
 		 $this->db->join('T_Employee_Details as Emp','BaseTbl.EmpID = Emp.EmpID');
@@ -34,4 +34,4 @@ class Login_model extends CI_Model
     }
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/application/views/alterpurchaseorder.php b/application/views/alterpurchaseorder.php
index 2796b368..0766d864 100755
--- a/application/views/alterpurchaseorder.php
+++ b/application/views/alterpurchaseorder.php
@@ -44,30 +44,10 @@ if(!empty($CompanyDetails))
     }
     .form-control
     {
-        text-align:left;
+        text-align:right;
     }
 
 </style>
-<script type="text/html" id="ServiceList">
-    <tr  id="<%=index%>">
-        <td align="left"><%=index%></td>
-        <td align="left"><%=ReqNo%></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 src="<?php echo base_url(); ?>assets/js/CreatePOValidation.js" type="text/javascript"></script>
 <script>
     var NilType = '<?php echo NILTYPE;?>';
@@ -83,7 +63,7 @@ if(!empty($CompanyDetails))
 
 
         $("#PODate").datepicker({
-            minDate : 'now',
+            //minDate : d,
             maxDate : 'now',
             dateFormat: 'mm/dd/yy',changeMonth: true, changeYear: true,yearRange: '-100:+0'
         });
@@ -283,11 +263,10 @@ if(!empty($CompanyDetails))
         });
         $('#txtVat').change(function() {
 
-           /* if(VatCalculation == '')
+            if(VatCalculation == '')
             {
                 $('#VatCalModel').modal('show');
             }
-            */
 
         });
         $('#txtCST').change(function() {
@@ -536,19 +515,15 @@ if(!empty($CompanyDetails))
         }
         else
         {
-    
             var basicValue = parseFloat($('#txtBasicValue').val());
             var ExciseDuty = parseFloat($('#txtAfterExciseDuty').val());
-            var discountValue = parseFloat($('#txtAfterDiscount').val());
-             var packageValue = parseFloat($('#txtAfterPackaging').val());
-            
+
             if($('#txtVat').val() != '' && $('#txtVat').val() != '0')
             {
                 var vatValue =  parseFloat($('#txtVat').val());
                 var AfterVat = 0.0;
-              // AfterVat =  VatCalculation == '0' ? <?php echo VAT_ONBASICVALUE; ?>:<?php echo VAT_ONEXICSEVALUE; ?>;
-             AfterVat = <?php echo VAT_ONEXICSEVALUE; ?>;
-           
+                AfterVat =  VatCalculation == '0' ? <?php echo VAT_ONBASICVALUE; ?>:<?php echo VAT_ONEXICSEVALUE; ?>;
+
                 var Vatval =  parseFloat(AfterVat).toFixed(2);
 
                 $('#txtAfterVat').val(Vatval);
@@ -841,54 +816,23 @@ if(!empty($CompanyDetails))
         VatCalculation = '';
         CSTCalculation = '';
     }
-    function showmodel() {
-        
 
-        var input = document.getElementById('purpose').value;
-        var avaBud=document.getElementById('AvalBuget').value;
-        var getLocal = document.getElementById('Local').value;
-               StateTaxCheck = $("input:radio[name='Range']:checked").val();
-              
-       // $('#txtPoRange').val(StateTaxCheck) ;
-        //alert('Radio clicke:'+StateTaxCheck);
-      
+    function showmodel() {
+
+        var input = document.getElementById('RequestType').value;
         if (input == -1)
         {
             alert ("Select Request Type");
         }
-        else if(avaBud==''){
-        alert ("Select Cost Center Name");
-        }
         else
         {
             $("#" + input  ).modal('show');
-              if(StateTaxCheck == "0")
-        {
-            // style="display:none;"
-          //  $('#Vat').removeAttr("style");
-           // $('#TotVat').removeAttr("style");
-          //  $('#CST').attr("style","display:none;");
-         //   $('#TotCST').attr("style","display:none;");
-         $('#Vat').show();
-         $('#CST').hide();
-
-        }
-        else
-        {
-          //  $('#CST').removeAttr("style");
-          //  $('#TotCST').removeAttr("style");
-           // $('#Vat').attr("style","display:none;");
-           // $('#TotVat').attr("style","display:none;");
-            $('#Vat').hide();
-         $('#CST').show();
-
-        }
         }
     }
     $(document).ready(function(){
 
         //Initialize Select2 Elements
-        $("#purpose").select2();
+		$("#RequestType").select2();
         $("#DepartmentName").select2();
         $("#CostCenterName").select2();
     });
@@ -923,7 +867,7 @@ if(!empty($CompanyDetails))
                                 endforeach;
                             }
 
-                            echo form_dropdown('RequestType', $options,set_value('ConfigValue'),'id="purpose"' ,'class = "form-control select2"','required="true"');
+                            echo form_dropdown('RequestType', $options,set_value('ConfigValue'),'id="RequestType"' ,'class = "form-control select2"','required="true"');
 
                             ?>
 
@@ -1097,7 +1041,7 @@ if(!empty($CompanyDetails))
                             </div>
                         </div>
                         <div class="col-md-3">
-                            <label>Available Buget</label><img id="AlertImg"  src="<?php echo base_url(); ?>assets/dist/img/red.png" alt="your image" width="25px"  style="display:none;"/>
+                            <label>Available Buget</label>
                             <div class="form-group">
                                 <?php
                                 $data = array('name' => 'AvalBuget','value' => set_value('AvalBuget'),'id'=>'AvalBuget',  'class' => 'form-control' ,'required' => 'true' ,'readonly' => 'true');
@@ -1238,241 +1182,6 @@ if(!empty($CompanyDetails))
 
                 </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;">
-                                <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>Available Budget Amount</label><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' => 'EditAvlBudAmt','value' => set_value('EditAvlBudAmt'),'id'=>'EditAvlBudAmt',  'class' => 'form-control' ,'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');
-                                            //print_r(  $options);
-
-                                            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' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'EditRatechange()');
-                                            echo form_input($data);
-                                            ?>
-                                        </div>
-                                    </div>
-                                    <div class="col-md-2">
-                                        <label>Rate</label>
-                                        <div class="form-group">
-                                            <?php
-                                            $data = array('name' => 'EditRate','value' => set_value('EditRate'),'id'=>'EditRate',  'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);' ,'onchange'=>'EditRatechange()' );
-                                            echo form_input($data);
-                                            ?>
-                                        </div>
-                                    </div>
-                                    <div class="col-md-2">
-                                        <label>Basic Amount</label>
-                                        <div class="form-group">
-                                            <?php
-                                            $data = array('name' => 'txtEditBasicValue','value' => set_value('txtEditBasicValue'),'id'=>'txtEditBasicValue',  'class' => 'form-control' ,'readonly' => 'true');
-                                            echo form_input($data);
-                                            ?>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="col-md-12" style="border:1px solid">
-                                    <br/>
-                                    <div class="col-md-12">
-                                        <div class="col-md-5  col-md-offset-4" align="right">
-
-                                            Service Tax @14% :
-                                        </div>
-
-                                        <div class="col-md-3">
-                                            <div class="form-group">
-                                                <?php
-                                                $data = array('name' => 'EditAfterServiceTax','value' => set_value('EditAfterServiceTax'),'id'=>'EditAfterServiceTax',  'class' => 'form-control','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">
-                                            Edu. cess @2% on service Tax 	:
-
-                                        </div>
-
-                                        <div class="col-md-3">
-                                            <div class="form-group">
-                                                <?php
-                                                $data = array('name' => 'EditAfterEduCess','value' => set_value('EditAfterEduCess'),'id'=>'EditAfterEduCess',  'class' => 'form-control' ,'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">
-                                            Sec. & Higher Edu. cess @1 % on service Tax  :
-
-                                        </div>
-
-                                        <div class="col-md-3">
-                                            <div class="form-group">
-                                                <?php
-                                                $data = array('name' => 'EditAfterSecHighTax','value' => set_value('EditAfterSecHighTax'),'id'=>'EditAfterSecHighTax',  'class' => 'form-control' ,'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">
-                                            Krishi Kalyan tax  @.5 % on Basic Amount:
-
-                                        </div>
-
-                                        <div class="col-md-3">
-                                            <div class="form-group">
-                                                <?php
-                                                $data = array('name' => 'EditAfterKrishiTax','value' => set_value('EditAfterKrishiTax'),'id'=>'EditAfterKrishiTax',  'class' => 'form-control' ,'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">
-                                            Swachh Bharat tax @.5 % on Basic Amount:
-
-                                        </div>
-
-                                        <div class="col-md-3">
-                                            <div class="form-group">
-                                                <?php
-                                                $data = array('name' => 'EditAfterSwachhTax','value' => set_value('EditAfterSwachhTax'),'id'=>'EditAfterSwachhTax',  'class' => 'form-control' ,'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">
-                                            Total Order value :
-                                        </div>
-                                        <div class="col-md-3">
-                                            <div class="form-group">
-                                                <?php
-                                                $data = array('name' => 'EditTotalOrderValue','value' => set_value('EditTotalOrderValue'),'id'=>'EditTotalOrderValue',  'class' => 'form-control' ,'readonly' => 'true');
-                                                echo form_input($data);
-                                                ?>
-                                            </div>
-                                        </div>
-                                    </div>
-
-                                </div>
-
-
-                                <br/>
-                                <br/>
-                                <div class="modal-footer">
-                                    <a class="btn btn-primary font EditService"  ID="Edit"  style="margin-top: -24px;">&nbsp;&nbsp;<span class="bold">Update Service</span></a>
-                                    <a class="btn btn-primary" data-dismiss="modal" style="margin-top: -24px;" value="Cancel">Cancel</a>
-
-                                </div>
-                            </div>
-                    </form>
-
-                </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">
@@ -1613,8 +1322,8 @@ if(!empty($CompanyDetails))
                                                                 </div>
                                                             </div>
                                                         </div>
-                                                        <div id="CST">
-                                                            <div class="col-md-2" >
+                                                        <div style="display:none;"  id="CST">
+                                                            <div class="col-md-2 col-md-offset-2" >
                                                                 <label>CST in %</label>
                                                                 <div class="form-group">
                                                                     <?php
@@ -1893,7 +1602,7 @@ if(!empty($CompanyDetails))
                                                     <label>Rate</label>
                                                     <div class="form-group">
                                                         <?php
-                                                        $data = array('name' => 'ServiceRate','value' => set_value('ServiceRate'),'id'=>'ServiceRate',  'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);' ,'onchange'=>'Ratechange()');
+                                                        $data = array('name' => 'ServiceRate','value' => set_value('ServiceRate'),'id'=>'ServiceRate',  'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);' );
                                                         echo form_input($data);
                                                         ?>
                                                     </div>
@@ -1910,15 +1619,19 @@ if(!empty($CompanyDetails))
                                             </div>
                                             <div class="col-md-12">
                                                 <div class="col-md-12">
-                                                <div class="col-md-4" align="right">
-
-                                                    
-                                                    </div>
                                                     <div class="col-md-4" align="right">
 
-                                                        Service Tax @14% :
+                                                        Service Tax @12% :
+                                                    </div>
+                                                    <div class="col-md-4">
+                                                        <div class="form-group">
+                                                            <?php
+                                                            $data = array('name' => 'ServiceTax','value' => set_value('ServiceTax'),'id'=>'ServiceTax',  'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);');
+                                                            echo form_input($data);
+                                                            ?>
+                                                        </div>
+
                                                     </div>
-                                                   
                                                     <div class="col-md-4">
                                                         <div class="form-group">
                                                             <?php
@@ -1931,15 +1644,19 @@ if(!empty($CompanyDetails))
 
                                                 </div>
                                                 <div class="col-md-12">
-                                                  <div class="col-md-4" align="right">
-
-                                                    
-                                                    </div>
                                                     <div class="col-md-4" align="right">
                                                         Edu. cess @2% on service Tax 	:
 
                                                     </div>
-                                                  
+                                                    <div class="col-md-4">
+                                                        <div class="form-group">
+                                                            <?php
+                                                            $data = array('name' => 'EduCess','value' => set_value('EduCess'),'id'=>'EduCess',  'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);' );
+                                                            echo form_input($data);
+                                                            ?>
+                                                        </div>
+
+                                                    </div>
                                                     <div class="col-md-4">
                                                         <div class="form-group">
                                                             <?php
@@ -1952,16 +1669,20 @@ if(!empty($CompanyDetails))
 
                                                 </div>
                                                 <div class="col-md-12">
-                                                  <div class="col-md-4" align="right">
-
-                                                    
-                                                    </div>
 
                                                     <div class="col-md-4" align="right">
                                                         Sec. & Higher Edu. cess @1 % on service Tax  :
 
                                                     </div>
-                                                  
+                                                    <div class="col-md-4">
+                                                        <div class="form-group">
+                                                            <?php
+                                                            $data = array('name' => 'SecHighTax','value' => set_value('SecHighTax'),'id'=>'SecHighTax',  'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);');
+                                                            echo form_input($data);
+                                                            ?>
+                                                        </div>
+
+                                                    </div>
                                                     <div class="col-md-4">
                                                         <div class="form-group">
                                                             <?php
@@ -1973,38 +1694,45 @@ if(!empty($CompanyDetails))
                                                     </div>
                                                 </div>
                                                 <div class="col-md-12">
-                                                  <div class="col-md-4" align="right">
-
-                                                    
-                                                    </div>
 
                                                     <div class="col-md-4" align="right">
                                                         Krishi Kalyan tax  :
 
                                                     </div>
-                                                  
                                                     <div class="col-md-4">
                                                         <div class="form-group">
                                                             <?php
-                                                            $data = array('name' => 'AfterKrishiTax','value' => set_value('AfterKrishiTax'),'id'=>'AfterKrishiTax',  'class' => 'form-control' ,'placeholder' => 'After Krishi Kalyan tax.','required' => 'true','readonly' => 'true');
+                                                            $data = array('name' => 'KrishiTax','value' => set_value('KrishiTax'),'id'=>'KrishiTax',  'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);');
                                                             echo form_input($data);
                                                             ?>
+                                                        </div>
 
+                                                    </div>
+                                                    <div class="col-md-4">
+                                                        <div class="form-group">
+                                                            <?php
+                                                            $data = array('name' => 'After KrishiTax','value' => set_value('Quantity'),'id'=>'Quantity',  'class' => 'form-control' ,'placeholder' => 'After Krishi Kalyan tax.','required' => 'true','readonly' => 'true');
+                                                            echo form_input($data);
+                                                            ?>
                                                         </div>
 
                                                     </div>
                                                 </div>
                                                 <div class="col-md-12">
-                                                  <div class="col-md-4" align="right">
-
-                                                    
-                                                    </div>
 
                                                     <div class="col-md-4" align="right">
                                                         Swachh Bharat tax  :
 
                                                     </div>
-                                                   
+                                                    <div class="col-md-4">
+                                                        <div class="form-group">
+                                                            <?php
+                                                            $data = array('name' => 'SwachhTax','value' => set_value('SwachhTax'),'id'=>'SwachhTax',  'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);');
+                                                            echo form_input($data);
+                                                            ?>
+                                                        </div>
+
+                                                    </div>
                                                     <div class="col-md-4">
                                                         <div class="form-group">
                                                             <?php
@@ -2015,7 +1743,31 @@ if(!empty($CompanyDetails))
 
                                                     </div>
                                                 </div>
-                                                
+                                                <div class="col-md-12">
+                                                    <div class="col-md-4" align="right">
+                                                        Other Taxes :
+
+                                                    </div>
+                                                    <div class="col-md-4">
+                                                        <div class="form-group">
+                                                            <?php
+                                                            $data = array('name' => 'ServiceOtherTax','value' => set_value('ServiceOtherTax'),'id'=>'ServiceOtherTax',  'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);');
+                                                            echo form_input($data);
+                                                            ?>
+                                                        </div>
+
+                                                    </div>
+                                                    <div class="col-md-4">
+                                                        <div class="form-group">
+                                                            <?php
+                                                            $data = array('name' => 'AfterServiceOtherTax','value' => set_value('AfterServiceOtherTax'),'id'=>'AfterServiceOtherTax',  'class' => 'form-control' ,'placeholder' => 'After Other Taxes','readonly' => 'true');
+                                                            echo form_input($data);
+                                                            ?>
+                                                        </div>
+
+                                                    </div>
+
+                                                </div>
                                                 <div class="col-md-6 col-md-offset-6" >
                                                     <label>Total Order value</label>
                                                     <div class="form-group">
@@ -3002,402 +2754,13 @@ if(!empty($CompanyDetails))
                             </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:1000px;">
-			<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' => 'EditRevenueReqNo','value' => set_value('EditReqNo'),'id'=>'EditRevenueReqNo',  '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' => 'EditRevenuedeptName','value' => set_value('EditdeptName'),'id'=>'EditRevenuedeptName',  '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' => 'EditRevenueCostCenter','value' => set_value('EditCostCenter'),'id'=>'EditRevenueCostCenter',  'class' => 'form-control' ,'readonly' => 'true');
-												echo form_input($data);
-								?>		
-											</div>
-								 </div>
-								  <div class="col-md-2">
-								   <label>Avl Bud Amt</label>
-											<div class="form-group">
-														<?php
-												 $data = array('name' => 'EditRevenueAvlBudAmt','value' => set_value('EditAvlBudAmt'),'id'=>'EditRevenueAvlBudAmt',  'class' => 'form-control' ,'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('EditRevenueMaterialCode', $options,set_value('EditMaterialCode'),'id="EditRevenueMaterialCode"' ,'class="form-control"');
-
-											?>						 
-										</div>
-						   </div>
-						  
-							 <div class="col-md-2">
-							  <label>Item Name</label>
-										<div class="form-group">
-													<?php
-											 $data = array('name' => 'EditRevenueItemName','value' => set_value('EditItemName'),'id'=>'EditRevenueItemName',  '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' => 'EditRevenueUOM','value' => set_value('EditUOM'),'id'=>'EditRevenueUOM',  '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' => 'EditRevenueQuantity','value' => set_value('EditQuantity'),'id'=>'EditRevenueQuantity',  'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'Editchange()','style'=>'text-align:right;');
-											echo form_input($data);
-											?>   
-										</div>
-							 </div>
-							 <div class="col-md-2">
-							  <label>Rate</label>
-										<div class="form-group">
-													<?php
-											 $data = array('name' => 'EditRevenueRate','value' => set_value('EditRate'),'id'=>'EditRevenueRate',  'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'Editchange()','style'=>'text-align:right;' );
-											echo form_input($data);
-											?>   
-										</div>
-							 </div>
-							 <div class="col-md-2">
-							  <label>Basic Amount</label>
-										<div class="form-group">
-													<?php
-											 $data = array('name' => 'txtEditRevenueBasicValue','value' => set_value('txtEditBasicValue'),'id'=>'txtEditRevenueBasicValue',  'class' => 'form-control' ,'readonly' => 'true','style'=>'text-align:right;');
-											echo form_input($data);
-											?>   
-										</div>
-							 </div>
-				</div>
-				</div><br/>				
-				<div class="col-md-12" style="border : 1px solid">		 	 				 
-					<div class="row">
-					 <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' ,'onkeypress'=>'return isNumberKey(event);' ,'onchange'=>'calculateDiscount(1);','style'=>'text-align:right;');
-													echo form_input($data);
-													?>   
-												</div> 
-					</div>
-					 <div class="col-md-2">
-									  <label>After Discount </label>
-									  <div class="form-group">
-															<?php
-													 $data = array('name' => 'txtEditAfterDiscount','value' => set_value('txtEditAfterDiscount'),'id'=>'txtEditAfterDiscount',  'class' => 'form-control' ,'readonly' => 'true','style'=>'text-align:right;');
-													echo form_input($data);
-													?>   
-												</div> 
-					</div>					
-					<div id="EditVat" >
-					 <div class="col-md-2"  >
-									  <label>Vat in %</label>
-									  <div class="form-group">
-															<?php
-													 $data = array('name' => 'txtEditVat','value' => set_value('txtEditVat'),'id'=>'txtEditVat',  'class' => 'form-control','onchange'=>'calculateVat(1);' ,'style'=>'text-align:right;');
-													echo form_input($data);
-													?>   
-												</div> 
-												
-					</div>
-					 <div class="col-md-2" >
-									  <label>Vat Rate </label>
-									  <div class="form-group">
-															<?php
-													 $data = array('name' => 'txtEditAfterVat','value' => set_value('txtEditAfterVat'),'id'=>'txtEditAfterVat',  'class' => 'form-control' ,'readonly' => 'true','onkeypress'=>'return isNumberKey(event);','style'=>'text-align:right;');
-													echo form_input($data);
-													?>   
-												</div> 
-					
-					</div>
-					</div>
-					  <div style="display:none;"  id="EditCST">
-					 <div class="col-md-2"  >
-									  <label>CST in %</label>
-									  <div class="form-group">
-															<?php
-													 $data = array('name' => 'txtEditCST','value' => set_value('txtEditCST'),'id'=>'txtEditCST',  'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'calculateCST(1);','style'=>'text-align:right;');
-													echo form_input($data);
-													?>   
-												</div> 
-					</div>
-					 <div class="col-md-2" >
-									  <label>CST Rate</label>
-									  <div class="form-group">
-															<?php
-													 $data = array('name' => 'txtEditAfterCST','value' => set_value('txtEditAfterCST'),'id'=>'txtEditAfterCST',  'class' => 'form-control' ,'readonly' => 'true','style'=>'text-align:right;');
-													echo form_input($data);
-													?>   
-												</div> 
-					
-					</div>
-					 </div>
-					</div>
-					</div> 
-					</div>
-					<div class="row">
-					 <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' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'calculatePackaging(1);','style'=>'text-align:right;');
-													echo form_input($data);
-													?>   
-												</div> 
-					</div>
-					 <div class="col-md-2">
-									  <label>After Packaging </label>
-									  <div class="form-group">
-															<?php
-													 $data = array('name' => 'txtEditAfterPackaging','value' => set_value('txtEditAfterPackaging'),'id'=>'txtEditAfterPackaging',  'class' => 'form-control' ,'readonly' => 'true','style'=>'text-align:right;');
-													echo form_input($data);
-													?>   
-												</div> 
-					</div>  
-					<div class="col-md-2">
-									  <label>GST in %</label>
-									  <div class="form-group">
-															<?php
-													 $data = array('name' => 'txtEditGST','value' => set_value('txtEditGST'),'id'=>'txtEditGST',  'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>' calculateGST(1);','style'=>'text-align:right;');
-													echo form_input($data);
-													?>   
-												</div> 
-					</div>
-					 <div class="col-md-2">
-									  <label>GST Rate</label>
-									  <div class="form-group">
-															<?php
-													 $data = array('name' => 'txtEditAfterGST','value' => set_value('txtEditAfterGST'),'id'=>'txtEditAfterGST',  'class' => 'form-control' ,'readonly' => 'true','style'=>'text-align:right;');
-													echo form_input($data);
-													?>   
-												</div> 
-					</div>
-					
-					</div> 
-					</div>
-					<div class="row">
-					<div class="col-md-12 "  >
-					<div class="col-md-2 col-md-offset-4">
-									  <label>Excise Duty in %	</label>
-									  <div class="form-group">
-															<?php
-													 $data = array('name' => 'txtEditExciseDuty','value' => set_value('txtEditExciseDuty'),'id'=>'txtEditExciseDuty',  'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'calculateExcise(1);','style'=>'text-align:right;');
-													echo form_input($data);
-													?>   
-												</div> 
-					</div>
-					 <div class="col-md-2">
-									  <label> Excise Duty Rate</label>
-									  <div class="form-group">
-															<?php
-													 $data = array('name' => 'txtEditAfterExciseDuty','value' => set_value('txtEditAfterExciseDuty'),'id'=>'txtEditAfterExciseDuty',  'class' => 'form-control' ,'readonly' => 'true','style'=>'text-align:right;');
-													echo form_input($data);
-													?>   
-												</div>
-					</div>
-					<div class="col-md-2">
-									  <label>Other  Taxes in %</label>
-									  <div class="form-group">
-															<?php
-													 $data = array('name' => 'txtEditOtherTax','value' => set_value('txtEditOtherTax'),'id'=>'txtEditOtherTax',  'class' => 'form-control','onkeypress'=>'return isNumberKey(event);','onchange'=>'calculateOtherTaxes(1);','style'=>'text-align:right;');
-													echo form_input($data);
-													?>   
-												</div> 
-					</div>
-					 <div class="col-md-2">
-									  <label>Other Taxes Rate</label>
-									  <div class="form-group">
-															<?php
-													 $data = array('name' => 'txtEditAfterOtherTax','value' => set_value('txtEditAfterOtherTax'),'id'=>'txtEditAfterOtherTax',  'class' => 'form-control' ,'readonly' => 'true','style'=>'text-align:right;');
-													echo form_input($data);
-													?>  
-												</div> 
-												
-					</div>
-					 
-					</div>
-					</div>
-					<div class="row">
-					<div class="col-md-12"  >
-									<div class="col-md-4">
-									  <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">
-									  <label>Freight Rate </label>
-									  <div class="form-group">
-															<?php
-													 $data = array('name' => 'txtEditFreight','value' => set_value('txtEditFreight'),'id'=>'txtEditFreight',  'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'calculateFreight(1);','style'=>'text-align:right;');
-													echo form_input($data);
-													?>   
-												</div> 
-					</div>
-					 <div class="col-md-2">
-									  <label>After Freight </label>
-									  <div class="form-group">
-															<?php
-													 $data = array('name' => 'txtEditAfterFreight','value' => set_value('txtEditAfterFreight'),'id'=>'txtEditAfterFreight',  'class' => 'form-control' ,'readonly' => 'true','style'=>'text-align:right;');
-													echo form_input($data);
-													?>   
-												</div> 
-					</div> 
-					 <div class="col-md-4">
-									  <label> Insurance if Any</label>
-									  <div class="form-group">
-															<?php
-													 $data = array('name' => 'txtEditInsurance','value' => set_value('txtEditInsurance'),'id'=>'txtEditInsurance',  'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'calculateEditTotalValue(1);','style'=>'text-align:right;');
-													echo form_input($data);
-													?>   
-												</div>
-					</div>
-					
-					
-					</div>
-					</div><hr/>
-					<div class="row">
-					 <div class="col-md-12" >
-					 
-						<div class="col-md-4" align="right"> <label>Total Order Amount :</label></div>
-						<div class="col-md-4">  
-							<div class="form-group">
-											<?php
-									 $data = array('name' => 'txtEditRevenueTotalOrderValue','value' => set_value('txtEditTotalOrderValue'),'id'=>'txtEditRevenueTotalOrderValue',  'class' => 'form-control' ,'readonly' => 'true','style'=>'text-align:right;');
-									echo form_input($data);
-									?>   
-							</div> 
-						</div>
-					 <div class="col-md-4">
-					 		<a class="btn btn-primary EditRevenue"  ID="EditRevenue"><i class="fa fa-plus"></i>&nbsp;&nbsp;<span class="bold">Edit Revenue</span></a>
-					<a class="btn btn-primary" data-dismiss="modal"  value="Cancel">Cancel</a>					 
-					</div>
-					</div> 
-					</div>			 				
-					</div>
-				<br/><br/>				
-				<!-- footer for revenue po -->
-			<div class="modal-footer">
-					
-			</div>
-			</div>
- 		  
-		 </div>
-		 </form>			 
-	</div>	  
-	</div>
 
 
                         <div class="box-body" style="margin-top:-5%;">
-                            <table id="serviceTax" class="table table-bordered table-hover" style="background-color:#fff;font-size:12px">
+                            <table id="TaxesTabel" class="table table-bordered table-hover" style="background-color:#fff;font-size:12px">
                                 <thead>
                                 <tr>
                                     <th>SNo</th>
@@ -3412,32 +2775,31 @@ if(!empty($CompanyDetails))
                                     <th>Action</th>
                                 </tr>
                                 </thead>
-                                <tbody id="ServiceAppend">
-
-                                </tbody>
-                                 <tbody id="RevenueAppend">
+                                <tbody id="taxes">
 
                                 </tbody>
 
                             </table>
                         </div>
-                       
                         <!-- /.box-body -->
 
-   
 
-                        
+
+                        <tbody id='RevenueAppend'>
+
+
+                        </tbody>
                     </div>
                 </table>
                 <div class="row">
-                    <!-- Revenue po taxes -->
+                    <!-- Revenue po taxes tabel-->
                     <div class="col-md-12"  style='border : 1px solid; display:none;' id="revenuepotaxes">
                         <br/>
                         <div class="col-md-12">
                             <div class="col-md-3">
                                 <label >Basic Amount  :</label>
                                 <?php
-                                $data = array('name' => 'txtTotBasicAmountRevenue','value' => set_value('txtTotBasicAmountRevenue'),'id'=>'txtTotBasicAmountRevenue',  'class' => 'form-control'  ,'readonly' => 'true');
+                                $data = array('name' => 'txtTotBasicAmount','value' => set_value('txtTotBasicAmount'),'id'=>'txtTotBasicAmount',  'class' => 'form-control'  ,'readonly' => 'true');
                                 echo form_input($data);
                                 ?>
 
@@ -3539,21 +2901,18 @@ if(!empty($CompanyDetails))
                         <div class="col-md-12">
                             <div class="col-md-3 col-md-offset-9"><br/>
                                 <input type="hidden" name="txtPoRange" id="txtPoRange" />
-                                <input type="hidden" name="txtStatus1" id="txtStatus1" />
-                                <input type="hidden" name="txtRowCount1" id="txtRowCount1" />
-                                <input type="hidden" name="txtDeletedRow1" id="txtDeletedRow1" />
-                                <input type="hidden" name="CheckLocalInter" id="CheckLocalInter" />
-                              <!-- <a class="btn btn-primary Save"  ID="Save" onclick="Save()" >&nbsp;&nbsp;<span class="bold">Save</span></a> -->
+                                <input type="hidden" name="txtStatus" id="txtStatus" />
+                                <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>
 
-                                <a class="btn btn-primary Submit"  ID="Submit" onclick="RevenueSave(1)" >&nbsp;&nbsp;<span class="bold">Submit</span></a>
-                                    <input type="reset" class="btn btn-primary">
-                               
-                                
+                                <input type="submit" class="btn btn-primary" >
+                                <input type="reset" class="btn btn-primary"> <br/>
                             </div>
                         </div>
                     </div>
 
-                    <!-- Service po taxes need to work-->
+                    <!-- Service po taxes tabel-->
                     <div class="col-md-12  " style='border : 1px solid; display:none;' id="servicepotaxes">
                         <div class="col-md-12">
                             <div class="col-md-4">
@@ -3606,7 +2965,7 @@ if(!empty($CompanyDetails))
                             <div class="col-md-6" align="right"> <label >Total Order Value   :</label></div>
                             <div class="col-md-6">
                                 <?php
-                                $data = array('name' => 'txtTotalOrderValueSummaryService','value' => set_value('txtTotalOrderValueSummaryService'),'id'=>'txtTotalOrderValueSummaryService',  'class' => 'form-control'  ,'readonly' => 'true');
+                                $data = array('name' => 'txtTotalOrderValueSummary','value' => set_value('txtTotalOrderValueSummary'),'id'=>'txtTotalOrderValueSummary',  'class' => 'form-control'  ,'readonly' => 'true');
                                 echo form_input($data);
                                 ?>
 
@@ -3628,8 +2987,138 @@ if(!empty($CompanyDetails))
                                     <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 Submit"  ID="Submit" onclick="Save(1)" >&nbsp;&nbsp;<span class="bold">Submit</span></a>
+                                    <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>
+                    
+                    <!-- Import po taxes tabel-->
+                     <div class="col-md-12  " style='border : 1px solid; display:none;' id="importpotaxes">
+                        <div class="col-md-12">
+                            <div class="col-md-4">
+                                <label>Basic Amount  :</label>
+                                <?php
+                                $data = array('name' => 'txtTotBasicAmount','value' => set_value('txtTotBasicAmount'),'id'=>'txtTotBasicAmount',  'class' => 'form-control'  ,'readonly' => 'true');
+                                echo form_input($data);
+                                ?>
+                            </div>
+                            <div class="col-md-4">
+                                <label>Landing Charge   :</label>
+                                <?php
+                                $data = array('name' => 'landingcharge','value' => set_value('landingcharge'),'id'=>'landingcharge',  'class' => 'form-control'   ,'readonly' => 'true');
+                                echo form_input($data);
+                                ?>
+                            </div>
+                            <div class="col-md-4">
+                                <label >High Ceas Sales Charge :</label>
+                                <?php
+                                $data = array('name' => 'highceassalescharge','value' => set_value('highceassalescharge'),'id'=>'highceassalescharge',  'class' => 'form-control' ,'readonly' => 'true');
+                                echo form_input($data);
+                                ?>
+                            </div>
+                        </div>
+                        <div class="col-md-12">
+                            <div class="col-md-4">
+                                <label >Custom Duty  :</label>
+                                <?php
+                                $data = array('name' => 'customduty','value' => set_value('customduty'),'id'=>'customduty',  'class' => 'form-control' ,'readonly' => 'true');
+                                echo form_input($data);
+                                ?>
+                            </div>
+                            <div class="col-md-4">
+                                <label >Custom Duty Edu. Cess  :</label>
+                                <?php
+                                $data = array('name' => 'custeducess','value' => set_value('custeducess'),'id'=>'custeducess',  'class' => 'form-control'  ,'readonly' => 'true');
+                                echo form_input($data);
+                                ?>
+                            </div>
+                            <div class="col-md-4">
+                                <label >Custom Duty Sec & High Cess :</label>
+                                <?php
+                                $data = array('name' => 'custsecandhighcess','value' => set_value('custsecandhighcess'),'id'=>'custsecandhighcess',  'class' => 'form-control'   ,'readonly' => 'true');
+                                echo form_input($data);
+                                ?>
+                            </div>
+                        </div>
+                         <div class="col-md-12">
+                            <div class="col-md-4">
+                                <label >Excise Duty  :</label>
+                                <?php
+                                $data = array('name' => 'exciseduty','value' => set_value('exciseduty'),'id'=>'exciseduty',  'class' => 'form-control' ,'readonly' => 'true');
+                                echo form_input($data);
+                                ?>
+                            </div>
+                            <div class="col-md-4">
+                                <label >Excise Duty Edu. Cess  :</label>
+                                <?php
+                                $data = array('name' => 'excieducess','value' => set_value('excieducess'),'id'=>'excieducess',  'class' => 'form-control'  ,'readonly' => 'true');
+                                echo form_input($data);
+                                ?>
+                            </div>
+                            <div class="col-md-4">
+                                <label >Excise Duty Sec & High Cess :</label>
+                                <?php
+                                $data = array('name' => 'excisecandhighcess','value' => set_value('excisecandhighcess'),'id'=>'excisecandhighcess',  'class' => 'form-control'   ,'readonly' => 'true');
+                                echo form_input($data);
+                                ?>
+                            </div>
+                        </div>
+                          <div class="col-md-12">
+                            <div class="col-md-4">
+                                <label >Additional Excise Duty  :</label>
+                                <?php
+                                $data = array('name' => 'addexciseduty','value' => set_value('addexciseduty'),'id'=>'addexciseduty',  'class' => 'form-control' ,'readonly' => 'true');
+                                echo form_input($data);
+                                ?>
+                            </div>
+                            <div class="col-md-4">
+                                <label >Gross Duty Payable :</label>
+                                <?php
+                                $data = array('name' => 'grossdutypayable','value' => set_value('grossdutypayable'),'id'=>'grossdutypayable',  'class' => 'form-control'  ,'readonly' => 'true');
+                                echo form_input($data);
+                                ?>
+                            </div>
+                            <div class="col-md-4">
+                                <label >Available Modvat Set-off On Import :</label>
+                                <?php
+                                $data = array('name' => 'availmodvat','value' => set_value('availmodvat'),'id'=>'availmodvat',  'class' => 'form-control'   ,'readonly' => 'true');
+                                echo form_input($data);
+                                ?>
+                            </div>
+                        </div>
+                        <div class="col-md-6 col-md-offset-6">
+                            <br/>
+                            <div class="col-md-6" align="right"> <label >Gross Expenses Due To Custome Duty  :</label></div>
+                            <div class="col-md-6">
+                                <?php
+                                $data = array('name' => 'grocessexpenses','value' => set_value('grocessexpenses'),'id'=>'grocessexpenses', 'class' => 'form-control'  ,'readonly' => 'true');
+                                echo form_input($data);
+                                ?>
+
+                            </div>
+                        </div>
+                        <div class="col-md-12">
+                            <div class="col-md-12">
+                                <label>Comments Of Special Instructions :</label>	<?php
+                                $data = array('name' => 'txtSpcialInstruction','value' => set_value('txtSpcialInstruction'),'id'=>'txtSpcialInstruction',  'class' => 'form-control' ,'rows' => '4', '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>
@@ -3654,7 +3143,7 @@ if(!empty($CompanyDetails))
                 <td align="left"><%=TotalValue%></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>
+                    <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  <%=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>
@@ -3664,16 +3153,14 @@ if(!empty($CompanyDetails))
             var index     = '1';
             var userid  = '';
             $('.AddRevenue').click(function(){
-            
+
                 if(validateRevenueTax() && validateExceedLimit())
                 {
-               	
-                	
                     var temp = index;
-                    var Reqnumber = $('#purpose').val();
-                    var departmentName = $('#DepartmentName').val();
-                    var AvilBudget = $('#AvalBuget').val();
-                    var costCode = $('#CostCenterName').val();
+                    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();
@@ -3714,8 +3201,6 @@ if(!empty($CompanyDetails))
                     var basicval = $("#txtBasicValue").val();
                     var Insval = $("#txtInsurance").val();
                     var TotalOrderValue = $("#txtTotalOrderValue").val();
-                     var CheckLocalInter = $("input:radio[name='Range']:checked").val();
-                 
 
                     var TotalTaxValue = calculateTaxValue();
 
@@ -3731,50 +3216,49 @@ if(!empty($CompanyDetails))
 
                     var template = jQuery("#RevenueList").html();
 
-               
+
                     $('#RevenueAppend').append(_.template(template,{index:temp,ReqNo:Reqnumber,MaterialName:materialName,Quantity:quantity,UOM:uom,Rate:itemRate,BasicAmount:basicval,Taxvalue:TotalTaxValue,TotalValue:TotalOrderValue}));
 
                     clearRevenueModalFields();
-                    var theForm1 = $(".CreatealterPO1");
+                    var theForm = $(".CreatePO");
 
-                    addHidden(theForm1,"Reqnumber"+temp,Reqnumber );
-                    addHidden(theForm1,"departmentName"+temp,departmentName );
-                    addHidden(theForm1,"AvilBudget"+temp,AvilBudget );
-                    addHidden(theForm1,"costCode"+temp,costCode );
-                    addHidden(theForm1,"materialCode"+temp,materialCode );
-                    addHidden(theForm1,"materialName"+temp,materialName );
-                    addHidden(theForm1,"uom"+temp,uom);
-                    addHidden(theForm1,"quantity"+temp,quantity);
-                    addHidden(theForm1,"itemRate"+temp,itemRate);
-                    addHidden(theForm1,"DisType"+temp,DisType);
-                    addHidden(theForm1,"DisVal"+temp,DisVal);
-                    addHidden(theForm1,"AfterDisVal"+temp,AfterDisVal);
-                    addHidden(theForm1,"PackOption"+temp,PackOption);
-                    addHidden(theForm1,"PackType"+temp,PackType);
-                    addHidden(theForm1,"PackVal"+temp,PackVal);
-                    addHidden(theForm1,"AfterPackVal"+temp,AfterPackVal);
-                    addHidden(theForm1,"ExciseOption"+temp,ExciseOption);
-                    addHidden(theForm1,"ExciseVal"+temp,ExciseVal);
-                    addHidden(theForm1,"AfterExciseVal"+temp,AfterExciseVal);
-                    addHidden(theForm1,"VatOption"+temp,VatOption);
-                    addHidden(theForm1,"VatVal"+temp,VatVal);
-                    addHidden(theForm1,"AfterVatVal"+temp,AfterVatVal);
-                    addHidden(theForm1,"CSTOption"+temp,CSTOption);
-                    addHidden(theForm1,"CSTVal"+temp,CSTVal);
-                    addHidden(theForm1,"AfterCSTVal"+temp,AfterCSTVal);
-                    addHidden(theForm1,"GSTVal"+temp,GSTVal);
-                    addHidden(theForm1,"AfterGSTVal"+temp,AfterGSTVal);
-                    addHidden(theForm1,"OtherTaxVal"+temp,OtherTaxVal);
-                    addHidden(theForm1,"AfterOtherTaxVal"+temp,AfterOtherTaxVal);
-                    addHidden(theForm1,"FreightType"+temp,FreightType);
-                    addHidden(theForm1,"FreightVal"+temp,FreightVal);
-                    addHidden(theForm1,"AfterFreightVal"+temp,AfterFreightVal);
-                    addHidden(theForm1,"basicval"+temp,basicval);
-                    addHidden(theForm1,"Insval"+temp,Insval);
-                    addHidden(theForm1,"TotalOrderValue"+temp,TotalOrderValue);
-                     addHidden(theForm1,"CheckLocalInter"+temp,CheckLocalInter);
+                    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,"ExciseOption"+temp,ExciseOption);
+                    addHidden(theForm,"ExciseVal"+temp,ExciseVal);
+                    addHidden(theForm,"AfterExciseVal"+temp,AfterExciseVal);
+                    addHidden(theForm,"VatOption"+temp,VatOption);
+                    addHidden(theForm,"VatVal"+temp,VatVal);
+                    addHidden(theForm,"AfterVatVal"+temp,AfterVatVal);
+                    addHidden(theForm,"CSTOption"+temp,CSTOption);
+                    addHidden(theForm,"CSTVal"+temp,CSTVal);
+                    addHidden(theForm,"AfterCSTVal"+temp,AfterCSTVal);
+                    addHidden(theForm,"GSTVal"+temp,GSTVal);
+                    addHidden(theForm,"AfterGSTVal"+temp,AfterGSTVal);
+                    addHidden(theForm,"OtherTaxVal"+temp,OtherTaxVal);
+                    addHidden(theForm,"AfterOtherTaxVal"+temp,AfterOtherTaxVal);
+                    addHidden(theForm,"FreightType"+temp,FreightType);
+                    addHidden(theForm,"FreightVal"+temp,FreightVal);
+                    addHidden(theForm,"AfterFreightVal"+temp,AfterFreightVal);
+                    addHidden(theForm,"basicval"+temp,basicval);
+                    addHidden(theForm,"Insval"+temp,Insval);
+                    addHidden(theForm,"TotalOrderValue"+temp,TotalOrderValue);
 
-                    $('#txtRowCounttxtRowCount1').val(temp);
+                    $('#txtRowCount').val(temp);
                     // $('#REVENUE').modal('hide');
 
                 }
@@ -3802,8 +3286,10 @@ if(!empty($CompanyDetails))
                 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 = $('#txtTotBasicAmountRevenue').val() == '' ? '0.00' : $('#txtTotBasicAmountRevenue').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 totExciseAmt = $('#txtTotExciseDuty').val() == '' ? '0.00' : $('#txtTotExciseDuty').val();
@@ -3814,7 +3300,8 @@ if(!empty($CompanyDetails))
                 var totFreightAmt = $('#txtTotalFreight').val() == '' ? '0.00' : $('#txtTotalFreight').val();
                 var totInsuranceAmt = $('#txtTotalInsurance').val() == '' ? '0.00' : $('#txtTotalInsurance').val();
                 var totOrderSummaryAmt = $('#txtTotalOrderValueSummary').val() == '' ? '0.00' : $('#txtTotalOrderValueSummary').val();
-                $('#txtTotBasicAmountRevenue').val(parseFloat(totBasicAmt) + parseFloat(BasicVal) );
+
+                $('#txtTotBasicAmount').val(parseFloat(totBasicAmt) + parseFloat(BasicVal) );
                 $('#txtTotalDiscount').val(parseFloat(totDiscountAmt) + parseFloat(Discount) );
                 $('#txtTotalPackaing').val(parseFloat(totPackagingAmt) + parseFloat(Packaging) );
                 $('#txtTotExciseDuty').val(parseFloat(totExciseAmt) + parseFloat(ExciseDuty) );
@@ -3877,10 +3364,9 @@ if(!empty($CompanyDetails))
             }
         </script>
         <script>
-            var SelectedMaterialCode = [];
-            var CollIndex = 0;
             function Save()
             {
+
                 $('#txtStatus').val('<?php echo PO_DRAFT;?>');
                 if(validate())
                 {
@@ -3924,13 +3410,14 @@ if(!empty($CompanyDetails))
                 });
             });
             $(document).ready(function(){
-                $('#purpose').on('change', function() {
+                $('#RequestType').on('change', function() { 
                     if ( this.value == 'REVENUE') //Revenue po
                     {
                         $("#txtPoRange").show();
                         $("#revenuepotaxes").show();
                         $("#currencyexchange").hide();
                         $("#servicepotaxes").hide();
+                        $("#importpotaxes").hide();
                     }
                     else if ( this.value == 'SERVICE') // Service po
                     {
@@ -3938,16 +3425,19 @@ if(!empty($CompanyDetails))
                         $("#currencyexchange").hide();
                         $("#txtPoRange").hide();
                         $("#revenuepotaxes").hide();
+                        $("#importpotaxes").hide();
                     }
                     else if ( this.value == 'IMPORT') // Import pop
-                    {
+                    {   
+                        $("#importpotaxes").show();
                         $("#currencyexchange").show();
                         $("#txtPoRange").hide();
                         $("#revenuepotaxes").hide();
                         $("#servicepotaxes").hide();
                     }
                     else if ( this.value == 'CAPITAL') // Capital po
-                    {
+                    {   
+                        $("#importpotaxes").hide();
                         $("#currencyexchange").show();
                         $("#txtPoRange").hide();
                         $("#revenuepotaxes").hide();
@@ -3959,6 +3449,7 @@ if(!empty($CompanyDetails))
                         $("#txtPoRange").hide();
                         $("#revenuepotaxes").hide();
                         $("#servicepotaxes").hide();
+                         $("#importpotaxes").hide();
                     }
                 });
             });
@@ -3985,6 +3476,7 @@ if(!empty($CompanyDetails))
                 {
                     var y = <?php echo json_encode($Suplist, JSON_PRETTY_PRINT) ?>;
 
+
                     $.each(y, function(idx, obj) {
                         if(obj.SupplierID === id)
                         {
@@ -4001,1440 +3493,6 @@ if(!empty($CompanyDetails))
                     return false;
                 }
 
-            });
-            /*get cost center name using department*/
-           var CostArray='';
-            $('#DepartmentName').change(function() {
-                $("#AvalBuget").val('');
-                $('#AlertImg').attr("style","display:none;");
-                CostArray='';
-                var id = $('#DepartmentName').val();
-                if(id != '0')
-                {
-                     $('#content').loader('show');
+            }); 
 
-
-                    $.ajax({
-                        data:{id:id},
-                        type:"POST",
-                        url:"<?php echo base_url() ?>emergencypurchaseorder/getCostCenterName",
-                        success:function(data) {
-                            if(data)
-                            {
-                            	CostArray=data;
-                                $('#CostCenterName').empty();
-                                $("#CostCenterName").append( $('<option></option>').val("0").html("Select Cost Center") );
-
-                                $.each(JSON.parse(data), function (index, value) {
-                                             
-                                            $("#CostCenterName").append( $('<option></option>').val(value.CostCenterCode).html(value.CostCenterCode + "-" + value.CostCenterName) );
-
-
-                        });
-                                $('#content').loader('hide');
-
-
-                            }
-                            else
-                            {
-                                alert("Error");
-                            }
-
-                        }
-
-                    });
-
-
-
-
-                }
-                else
-                {
-                    alert('Please select the Department');
-                    return false;
-                }
-
-            });
-            /**
-             * update available budget calculation using regNo and cost center  
-             */
-            $('#CostCenterName').change(function() {
-
-                var id = $('#CostCenterName').val();
-                $("#AvlBudAmt").val('');
-                var ReqType =$('#purpose').val();
-                if(id != '0')
-                {
-                    $('#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');
-                                $("#AvalBuget").val(data);
-                                if(parseFloat($("#AvalBuget").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 MaterialCode');
-                    return false;
-                }
-
-            });
-            /**
-             * getting item name and uom using global variable materialData each change
-             */
-            $('#ServiceMaterialCode').change(function(){
-                var selectedMaterialCode='';
-                selectedMaterialCode=$("#ServiceMaterialCode").val();
-                $.each(JSON.parse(materialData), function (index, value) {
-                     if(selectedMaterialCode==value.MaterialCode){
-                         $("#ServiceDescription").val(value.MaterialName);
-                         $("#ServiceUOM").val(value.UOM);
-                         
-                     }
-
-                });
-                
-            });
-             /**
-             * getting item name and uom using global variable materialData each change in revenue
-             */
-              $('#MaterialCode').change(function(){
-                var selectedRevenueMaterialCode='';
-                selectedRevenueMaterialCode=$("#MaterialCode").val();
-                $.each(JSON.parse(materialData), function (index, value) {
-                     if(selectedRevenueMaterialCode==value.MaterialCode){
-                         $("#ItemName").val(value.MaterialName);
-                         $("#UOM").val(value.UOM);
-                         
-                     }
-
-                });
-                
-            });
-
-            /**
-             * get material list when selecting the request type
-             */
-            var materialData;
-
-            $('#purpose').change(function(){
-                var input='';
-                input=$("#purpose").val();
-if(input == -1){
-    $("#POType").val('');
-
-}
-                else {
-                    $("#POType").val(input);
-                   // $('#content').loader('show');
-                    $.ajax({
-                        data:{input:input},
-                        type:"POST",
-                        url:"<?php echo base_url() ?>emergencypurchaseorder/getMaterialCode?input="+input,
-                        success:function(data) {
-
-                            if(data)
-                            {
-                                materialData=data;
-                                if (input=='SERVICE') {
-                            
-                                	 $('#ServiceMaterialCode').empty();
-                                $("#ServiceMaterialCode").append( $('<option></option>').val("0").html("Select Iten Code") );
-
-                                $.each(JSON.parse(data), function (index, value) {
-                                    $("#ServiceMaterialCode").append( $('<option></option>').val(value.MaterialCode).html(value.MaterialCode + "-" + value.MaterialName) );
-
-
-                                });
-                                }
-                                else if (input=='REVENUE') {
-                                	 	 $('#MaterialCode').empty();
-                                $("#MaterialCode").append( $('<option></option>').val("0").html("Select Iten Code") );
-
-                                $.each(JSON.parse(data), function (index, value) {
-                                    $("#MaterialCode").append( $('<option></option>').val(value.MaterialCode).html(value.MaterialCode + "-" + value.MaterialName) );
-
-
-                                });
-                                }
-                                else {
-                                	
-                                }
-                               
-                                $('#content').loader('hide');
-
-                            }
-
-                        }
-                    });
-
-                }
-
-            });
-            /**
-             * calculating taxes using quanty and rate
-             */
-            function Ratechange(){
-                if($('#ServiceMaterialCode').val() == "0")
-                {
-                    alert('Please Select Item Code ');
-                    $('#ServiceMaterialCode').focus();
-                    return false;
-                }
-
-
-
-                if($('#ServiceQuantity').val() != '' && $('#ServiceRate').val() != '')
-                {
-                    var txtQuantity = parseFloat( $('#ServiceQuantity').val());
-                    var txtUnitPrice = parseFloat($('#ServiceRate').val());
-                    var Tot =  txtQuantity * txtUnitPrice
-                    $('#ServiceBasAmt').val(Tot);
-
-                    //Service Tax calculation
-                    $('#AfterServiceTax').val(calculateServiceTax($('#ServiceBasAmt').val())); // calculateServiceTax();
-
-                    //Edu. cess @2% on service Tax
-                    $('#AfterEduCess').val( calculateEduess($('#AfterServiceTax').val()));
-
-                    //Sec. & Higher Edu. cess @1 % on service Tax
-
-                    $('#AfterSecHighTax').val(calculateHigherEdu($('#AfterServiceTax').val()));
-                    //Krishi Kalyan tax
-                    $('#AfterKrishiTax').val(calculateKrishiKalyantax($('#ServiceBasAmt').val()));
-
-                    //Swachh Bharat tax
-
-                    $('#AfterSwachhTax').val(calculateSwachhBharattax($('#ServiceBasAmt').val()));
-                    calculateTotalOrdervalue();
-
-                    var res = ExceedBudget($('#TotalOrderValue').val(), $('#AvalBuget').val());
-                    if(!res)
-                    {
-                        $('#ServiceRate').focus();
-                        return false;
-                    }
-                }
-
-            }
-            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($('#ServiceBasAmt').val());
-                var ServiceTaxAmount = parseFloat($('#AfterServiceTax').val());
-                var EduCessTaxAmount = parseFloat($('#AfterEduCess').val());
-                var SecHighTaxAmount = parseFloat($('#AfterSecHighTax').val());
-                var KrishiTaxAmount = parseFloat($('#AfterKrishiTax').val());
-                var SwachhTaxAmount = parseFloat($('#AfterSwachhTax').val());
-
-                var TotAmt = basicValue + ServiceTaxAmount+ EduCessTaxAmount + SecHighTaxAmount+ KrishiTaxAmount + SwachhTaxAmount;
-
-                $('#TotalOrderValue').val( parseFloat(TotAmt).toFixed(2));
-
-            }
-            function ExceedBudget(ValuetoCheck,budgetAmount)
-            {
-                var ReqAmount = parseFloat(ValuetoCheck);
-                var BudAmount = parseFloat(budgetAmount);
-
-                if(ReqAmount > BudAmount )
-                {
-                    alert('Your exceeding the Avaiable Budget :'+ budgetAmount  +'.Please adjust the Product to proceed further.');
-                    return false;
-                }
-                else
-                {
-                    return true;
-                }
-            }
-            /**
-             * This function is used when clicking add service button that time store the info for submit
-             */
-
-            $('.AddService').click(function(){
-                if(validateServiceTax())
-                {
-                    // alert('inside Addservice');
-                    var temp = index;
-                    var Reqnumber = $('#purpose').val();
-                    var departmentName = $('#DepartmentName').val();
-                    var AvilBudget = $('#AvalBuget').val();
-                    var costCode = $('#CostCenterName').val();
-                    var materialCode =$('#ServiceMaterialCode').val();
-                    var materialName =  $("#ServiceDescription").val();
-                    var uom = $("#ServiceUOM").val();
-                    var quantity = $("#ServiceQuantity").val();
-                    var itemRate = $("#ServiceRate").val();
-
-
-                    var AfterServiceTax = $("#AfterServiceTax").val();
-
-
-                    var AfterEduCess = $("#AfterEduCess").val();
-
-
-                    var AfterSecHighTax = $("#AfterSecHighTax").val();
-
-
-                    var AfterKrishiTax = $("#AfterKrishiTax").val();
-
-
-                    var AfterSwachhTax = $("#AfterSwachhTax").val();
-
-                    var TotalOrderValue = $("#TotalOrderValue ").val();
-
-
-                    var basicval = $("#ServiceBasAmt").val();
-
-
-                    var TotalTaxValue = calculateTaxValue();
-
-                    $('#ServiceMaterialCode option[value='+materialCode+']').remove();
-
-                    SelectedMaterialCode[CollIndex] = materialCode;
-                    CollIndex = CollIndex + 1;
-
-                    populateValueMainFormForServiceTax();
-
-
-                    index = parseInt(index)+1;
-
-                    var template = jQuery("#ServiceList").html();
-
-
-                    $('#ServiceAppend').append(_.template(template,{index:temp,ReqNo:Reqnumber,MaterialName:materialName,Quantity:quantity,UOM:uom,Rate:itemRate,BasicAmount:basicval,Taxvalue:TotalTaxValue,TotalValue:TotalOrderValue}));
-
-                    clearServiceModalFields();
-
-                    var theForm = $(".CreatealterPO");
-
-                    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,"ServiceTax"+temp,AfterServiceTax);
-                    addHidden(theForm,"EduCess"+temp,AfterEduCess);
-                    addHidden(theForm,"SecHighTax"+temp,AfterSecHighTax);
-                    addHidden(theForm,"KrishiTax"+temp,AfterKrishiTax);
-                    addHidden(theForm,"SwachhTax"+temp,AfterSwachhTax);
-                    addHidden(theForm,"TotalOrderValue"+temp,TotalOrderValue);
-                   
-                    $('#txtRowCount').val(temp);
-                   
-                }
-
-            });
-            /**
-             * validate fields when clicking add service button
-             */
-            function validateServiceTax()
-            {
-
-                 if($('#ServiceMaterialCode').val() == "0")
-                {
-                    alert('Please select the Material Code');
-                    $('#ServiceMaterialCode').focus();
-                    return false;
-                }
-                else if($('#ServiceQuantity').val() == '')
-                {
-                    alert('Please Enter the Quantity value');
-                    $('#ServiceQuantity').focus();
-                    return false;
-                }
-                else if($('#ServiceRate').val() == '')
-                {
-                    alert('Please Enter the Rate of the Item');
-                    $('#ServiceRate').focus();
-                    return false;
-                }
-
-                else if(ExceedBudget($('#TotalOrderValue').val(),$('#AvalBuget').val()) == false)
-                {
-                    $('#ServiceRate').focus();
-                    return false;
-                }
-                else
-                {
-                    return true;
-                }
-
-            }
-            function populateValueMainFormForServiceTax()
-            {
-                var AfterServiceTax = $('#AfterServiceTax').val() == '' ? '0.00' : $('#AfterServiceTax').val();
-                var AfterEduCess = $('#AfterEduCess').val() == '' ? '0.00' : $('#AfterEduCess').val();
-                var AfterSecHighTax = $('#AfterSecHighTax').val() == '' ? '0.00' : $('#AfterSecHighTax').val();
-                var AfterKrishiTax = $('#AfterKrishiTax').val() == '' ? '0.00' : $('#AfterKrishiTax').val();
-                var AfterSwachhTax = $('#AfterSwachhTax').val() == '' ? '0.00' : $('#AfterSwachhTax').val();
-                var TotalVal = $('#TotalOrderValue ').val() == '' ? '0.00' : $('#TotalOrderValue').val();
-                var BasicVal = $('#ServiceBasAmt').val() == '' ? '0.00' : $('#ServiceBasAmt').val();
-
-                var TotalOrderValueSummary = $('#txtTotalOrderValueSummaryService').val() == '' ? '0.00' : $('#txtTotalOrderValueSummaryService').val();
-
-                var totBasicAmt = $('#txtTotBasicAmount').val() == '' ? '0.00' : $('#txtTotBasicAmount').val();
-                var TotalServiceTax = $('#txtTotalServiceTax').val() == '' ? '0.00' : $('#txtTotalServiceTax').val();
-                var TotHigherEdu = $('#txtTotHigherEdu').val() == '' ? '0.00' : $('#txtTotHigherEdu').val();
-                var TotalEducess = $('#txtTotalEducess').val() == '' ? '0.00' : $('#txtTotalEducess').val();
-                var TotalKrishiKalyan = $('#txtTotalKrishiKalyan').val() == '' ? '0.00' : $('#txtTotalKrishiKalyan').val();
-                var TotSwachhBharat = $('#txtTotSwachhBharat').val() == '' ? '0.00' : $('#txtTotSwachhBharat').val();
-                $('#txtTotBasicAmount').val((parseFloat(totBasicAmt) + parseFloat(BasicVal)).toFixed(2) );
-                $('#txtTotalServiceTax').val((parseFloat(TotalServiceTax) + parseFloat(AfterServiceTax)).toFixed(2) );
-                $('#txtTotHigherEdu').val((parseFloat(TotHigherEdu) + parseFloat(AfterSecHighTax)).toFixed(2) );
-                $('#txtTotalEducess').val((parseFloat(TotalEducess) + parseFloat(AfterEduCess)).toFixed(2) );
-                $('#txtTotalKrishiKalyan').val((parseFloat(TotalKrishiKalyan) + parseFloat(AfterKrishiTax)).toFixed(2) );
-                $('#txtTotSwachhBharat').val((parseFloat(TotSwachhBharat) + parseFloat(AfterSwachhTax)).toFixed(2) );
-                $('#txtTotalOrderValueSummaryService').val((parseFloat(TotalOrderValueSummary) + parseFloat(TotalVal)).toFixed(2) );
-
-            }
-            function calculateTaxValue()
-            {
-                var ServiceTaxAmount = parseFloat($('#AfterServiceTax').val());
-                var EduCessTaxAmount = parseFloat($('#AfterEduCess').val());
-                var SecHighTaxAmount = parseFloat($('#AfterSecHighTax').val());
-                var KrishiTaxAmount = parseFloat($('#AfterKrishiTax').val());
-                var SwachhTaxAmount = parseFloat($('#AfterSwachhTax').val());
-
-                var TottaxAmt = ServiceTaxAmount+ EduCessTaxAmount + SecHighTaxAmount+ KrishiTaxAmount + SwachhTaxAmount;
-                return parseFloat(TottaxAmt.toFixed(2));
-            }
-            <!-- script for table , It works under the datatable plugin-->
-            $(function () {
-                $('#serviceTax').DataTable({
-                    "paging": true,
-                    "lengthChange": true,
-                    "searching": false,
-                    //"ordering": true,
-                    // "info": true,
-                    "autoWidth": true
-
-                });
-            });
-            /**
-             * clear the seleted fields after clicking add service
-             */
-            function clearServiceModalFields()
-            {
-                // To reset the Modal controls
-
-                $('#ServiceMaterialCode').val("0")	;
-                $("#ServiceDescription").val('');
-                $('#ServiceUOM').val('');
-                $('#ServiceQuantity').val('');
-                $("#ServiceRate").val('');
-
-                $("#ServiceBasAmt").val('');
-                $("#AfterServiceTax").val('');
-                $("#AfterEduCess").val('');
-                $("#AfterSecHighTax").val('');
-                $("#AfterKrishiTax").val('');
-                $("#AfterSwachhTax").val('');
-                $("#TotalOrderValue ").val('');
-
-            }
-            /**
-             * This function is used to edit the service seleted po
-             */
-             var EditGetMaterialData;
-           
-            $("#EDITSERVICE").on("shown.bs.modal", function(e) {
-         
-            	EditGetMaterialData='';
-
-                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());
-
-
-                $('#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[6].innerHTML);
-                $('#EditAfterServiceTax').val($('#ServiceTax'+userid).val());
-                $('#EditAfterEduCess').val($('#EduCess'+userid).val());
-                $('#EditAfterSecHighTax').val($('#SecHighTax'+userid).val());
-                $('#EditAfterKrishiTax').val($('#KrishiTax'+userid).val());
-                $('#EditAfterSwachhTax').val($('#SwachhTax'+userid).val());
-                $('#EditTotalOrderValue').val(cellval[8].innerHTML);
-
-                 
- 
-                  
-
-                                $.each(JSON.parse(CostArray), function (index, value) {
-                                	if ($('#costCode'+userid).val()==value.CostCenterCode) {
-                 $('#EditCostCenter').val($('#costCode'+userid).val() + '-'+ value.CostCenterName);
-                                		
-                                	}
-                                	
-                                
-                                $("#EditMaterialCode").empty();
-                               
-                          $("#EditMaterialCode").append( $('<option></option>').val($('#materialCode'+userid).val()).html($('#materialCode'+userid).val() + "-" + $('#materialName'+userid).val()) );
-                                $.each(JSON.parse(materialData), function (index, value) {
-                         
-
-                                 if($('#materialCode'+userid).val() != value.MaterialCode)
-						 {
-
-						                                    $("#EditMaterialCode").append( $('<option></option>').val(value.MaterialCode).html(value.MaterialCode + "-" + value.MaterialName) );
-
-						}
-						
-
-		
-                                });
-                                           
-
-
-
-                        });                 
-                 
- 				/*get Material list while editing
- 				
-                     var EditPoType=$('#Reqnumber'+userid).val();
-                   
-                    $.ajax({
-                        data:{input:EditPoType},
-                        type:"POST",
-                        url:"<?php echo base_url() ?>emergencypurchaseorder/getMaterialCode?input="+EditPoType,
-                        success:function(data) {
-$('#content').loader('hide');
-                            if(data)
-                            {
-                            	EditGetMaterialData=data;
-                             
-                                $("#EditMaterialCode").empty();
-                               
-                          $("#EditMaterialCode").append( $('<option></option>').val($('#materialCode'+userid).val()).html($('#materialCode'+userid).val() + "-" + $('#materialName'+userid).val()) );
-                                $.each(JSON.parse(data), function (index, value) {
-                         
-
-                                 if($('#materialCode'+userid).val() != value.MaterialCode)
-						 {
-
-						                                    $("#EditMaterialCode").append( $('<option></option>').val(value.MaterialCode).html(value.MaterialCode + "-" + value.MaterialName) );
-
-						}
-						
-
-		
-                                });
-                               
-
-                            }
-
-                        }
-                    });*/
-
-      
- 
-
-		
-	    
-          
-            });
-
-            /**
-             * edit emenergency service po validations
-             */
-
-            function EditRatechange(){
-
-
-                if($('#EditQuantity').val() != '' && $('#EditRate').val() != '')
-                {
-                    var txtQuantity = parseFloat( $('#EditQuantity').val());
-                    var txtUnitPrice = parseFloat($('#EditRate').val());
-                    var Tot =  txtQuantity * txtUnitPrice
-                    $('#txtEditBasicValue').val(Tot);
-                    ExceedBudget(Tot, $('#EditAvlBudAmt').val());
-
-                    //Service Tax calculation
-                    $('#EditAfterServiceTax').val(calculateServiceTax($('#txtEditBasicValue').val())); // calculateServiceTax();
-
-                    //Edu. cess @2% on service Tax
-                    $('#EditAfterEduCess').val( calculateEduess($('#EditAfterServiceTax').val()));
-
-                    //Sec. & Higher Edu. cess @1 % on service Tax
-
-                    $('#EditAfterSecHighTax').val(calculateHigherEdu($('#EditAfterServiceTax').val()));
-                    //Krishi Kalyan tax
-
-                    $('#EditAfterKrishiTax').val(calculateKrishiKalyantax($('#txtEditBasicValue').val()));
-                    //Swachh Bharat tax
-
-                    $('#EditAfterSwachhTax').val(calculateSwachhBharattax($('#txtEditBasicValue').val()));
-
-                    calculateTotalEditOrdervalue();
-                }
-
-            }
-            /**
-             * calculate total edit order value
-             */
-            function calculateTotalEditOrdervalue()
-            {
-                var basicValue = parseFloat($('#txtEditBasicValue').val());
-                var ServiceTaxAmount = parseFloat($('#EditAfterServiceTax').val());
-                var EduCessTaxAmount = parseFloat($('#EditAfterEduCess').val());
-                var SecHighTaxAmount = parseFloat($('#EditAfterSecHighTax').val());
-                var KrishiTaxAmount = parseFloat($('#EditAfterKrishiTax').val());
-                var SwachhTaxAmount = parseFloat($('#EditAfterSwachhTax').val());
-
-                var TotAmt = basicValue + ServiceTaxAmount+ EduCessTaxAmount + SecHighTaxAmount+ KrishiTaxAmount + SwachhTaxAmount;
-
-                $('#EditTotalOrderValue').val( parseFloat(TotAmt).toFixed(2));
-
-            }
-            /**
-             * This function is used for update service
-             */
-            $('.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 AfterServiceTax = $("#EditAfterServiceTax").val();
-
-
-                    var AfterEduCess = $("#EditAfterEduCess").val();
-
-
-                    var AfterSecHighTax = $("#EditAfterSecHighTax").val();
-
-
-                    var AfterKrishiTax = $("#EditAfterKrishiTax").val();
-
-
-                    var AfterSwachhTax = $("#EditAfterSwachhTax").val();
-
-                    var TotalOrderValue = $("#EditTotalOrderValue ").val();
-
-
-                    var basicval = $("#txtEditBasicValue").val();
-
-                    var TotalTaxValue = calculateEditTaxValue();
-
-
-
-                    var tr= document.getElementById(userid);
-                    var cellval = tr.cells;
-
-                    cellval[2].innerHTML = editDescription;
-                    cellval[3].innerHTML = editQuantity;
-                    cellval[4].innerHTML =editUOM;
-                    cellval[5].innerHTML =itemRate;
-                    cellval[6].innerHTML =basicval;
-                    cellval[7].innerHTML =TotalTaxValue;
-                    cellval[8].innerHTML =TotalOrderValue;
-
-
-                    $('#materialCode'+userid).val(editMaterialCode);
-                    $('#materialName'+userid).val(editDescription);
-                    $('#uom'+userid).val(editUOM);
-                    $('#quantity'+userid).val(editQuantity);
-                    $('#itemRate'+userid).val(itemRate);
-                    $('#ServiceTax'+userid).val(AfterServiceTax);
-                    $('#EduCess'+userid).val(AfterEduCess);
-                    $('#SecHighTax'+userid).val(AfterSecHighTax);
-                    $('#KrishiTax'+userid).val(AfterKrishiTax);
-                    $('#SwachhTax'+userid).val(AfterSwachhTax);
-                    $('#TotalOrderValue'+userid).val(TotalOrderValue);
-
-                    populateValueMainFormForEditServiceTax();
-
-                }
-
-            });
-            /**
-             * This function is used for validate while update
-             */
-            function validateEditServiceTax()
-            {
-                
-                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(ExceedBudget($('#EditTotalOrderValue').val(),$('#EditAvlBudAmt').val()) == false)
-                {
-                    $('#EditRate').focus();
-                    return false;
-                }
-                else
-                {
-                    return true;
-                }
-
-            }
-            function calculateEditTaxValue()
-            {
-                var ServiceTaxAmount = parseFloat($('#EditAfterServiceTax').val());
-                var EduCessTaxAmount = parseFloat($('#EditAfterEduCess').val());
-                var SecHighTaxAmount = parseFloat($('#EditAfterSecHighTax').val());
-                var KrishiTaxAmount = parseFloat($('#EditAfterKrishiTax').val());
-                var SwachhTaxAmount = parseFloat($('#EditAfterSwachhTax').val());
-
-                var TottaxAmt = ServiceTaxAmount+ EduCessTaxAmount + SecHighTaxAmount+ KrishiTaxAmount + SwachhTaxAmount;
-                return parseFloat(TottaxAmt.toFixed(2));
-            }
-            function populateValueMainFormForEditServiceTax()
-            {
-
-                var rows =  document.getElementById('serviceTax').rows.length;
-                var TotServiceTax = 0;
-                var TotEduCess = 0;
-                var TotSecHighTax = 0;
-                var TotKrishiTax = 0;
-                var TotSwachhTax = 0;
-                var TotSummary = 0;
-                var TotBasicAmout = 0;
-                for (i = 1; i < rows-1; i++) {
-
-                    var AfterServiceTax = $('#ServiceTax'+i).val() == '' ? '0.00' : $('#ServiceTax'+i).val();
-                    var AfterEduCess = $('#EduCess'+i).val() == '' ? '0.00' : $('#EduCess'+i).val();
-                    var AfterSecHighTax = $('#SecHighTax'+i).val() == '' ? '0.00' : $('#SecHighTax'+i).val();
-                    var AfterKrishiTax =$('#KrishiTax'+i).val() == '' ? '0.00' : $('#KrishiTax'+i).val();
-                    var AfterSwachhTax = $('#SwachhTax'+i).val() == '' ? '0.00' : $('#SwachhTax'+i).val();
-                    var TotalVal =$('#TotalOrderValue'+i).val() == '' ? '0.00' : $('#TotalOrderValue'+i).val();
-                    var Quantity = $('#quantity'+i).val() == '' ? '0.00' : $('#quantity'+i).val();
-                    var ItemRate = $('#itemRate'+i).val() == '' ? '0.00' : $('#itemRate'+i).val();
-                    var BasicVal = parseFloat(Quantity) * parseFloat(ItemRate);
-
-                    TotServiceTax = parseFloat(TotServiceTax) + parseFloat(AfterServiceTax);
-                    TotEduCess = parseFloat(TotEduCess) + parseFloat(AfterEduCess);
-                    TotSecHighTax = parseFloat(TotSecHighTax) + parseFloat(AfterSecHighTax);
-                    TotKrishiTax = parseFloat(TotKrishiTax) + parseFloat(AfterKrishiTax);
-                    TotSwachhTax = parseFloat(TotSwachhTax) + parseFloat(AfterSwachhTax);
-                    TotSummary = parseFloat(TotSummary) + parseFloat(TotalVal);
-                    TotBasicAmout = parseFloat(TotBasicAmout) + parseFloat(BasicVal);
-
-                }
-
-
-                $('#txtTotBasicAmount').val(parseFloat(TotBasicAmout).toFixed(2) );
-                $('#txtTotalServiceTax').val(parseFloat(TotServiceTax).toFixed(2) );
-                $('#txtTotHigherEdu').val(parseFloat(TotSecHighTax).toFixed(2) );
-                $('#txtTotalEducess').val(parseFloat(TotEduCess).toFixed(2) );
-                $('#txtTotalKrishiKalyan').val(parseFloat(TotKrishiTax).toFixed(2) );
-                $('#txtTotSwachhBharat').val(parseFloat(TotSwachhTax).toFixed(2) );
-                $('#txtTotalOrderValueSummaryService').val(parseFloat(TotSummary).toFixed(2) );
-                
-
-            }
-            /**
-             * This function is used for delete list of tem from selected list
-             */
-            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 );
-
-                    if(DelRows != '')
-                    {
-                        DelRows = DelRows + ":" + rowid;
-                        populateValueMainFormForDeleteServiceTax(rowid);
-                    }
-                    else
-                    {
-                        DelRows=  "0" + ":" + rowid;
-                        populateValueMainFormForDeleteServiceTax(rowid);
-
-                    }
-                    $('#txtDeletedRow').val(DelRows);
-                }
-
-            }
-            /**
-             * This function is used to submit and save the emergency service Po list
-             */
-            function Save(status)
-            {
-                if(status == '0')
-                {
-                    stat = '<?php echo PO_DRAFT; ?>';
-                }
-                else
-                {
-                    stat = '<?php echo REQITEM_Emergency_PO_CREATED; ?>';
-                }
-
-
-                var splinstr = $('#txtSpcialInstruction').val();
-                var deladd = $('#DeliveryAddr').val();
-                $('#SpcialInstruction').val(splinstr);
-                $('#txtDeliveryAddress').val(deladd);
-                $('#txtStatus').val(stat);
-                var TextRowCount = $('#txtRowCount').val();
-                var TextDeletedRowCount = $('#txtDeletedRow').val();
-               var TextTotalOrderValueSummaryService = $('#txtTotalOrderValueSummaryService').val();
-                var TextSpcialInstruction = $('#txtSpcialInstruction').val();
-                var TextStatus = stat;
-              
-                if(validate())
-                {
-                    if(document.getElementById('serviceTax').rows.length < 3)
-                    {
-                        alert('Please Select Line item to Create PO');
-                        $('#Deliverydt').focus();
-                        return false;
-                    }
-                    else
-                    {
-                        $('#content').loader('show');
-                        $.ajax({
-                            data:$('.CreatealterPO').serialize()+"&TextRowCount="+TextRowCount+"&TextDeletedRowCount="+TextDeletedRowCount+"&TextTotalOrderValueSummaryService="+TextTotalOrderValueSummaryService+"&TextSpcialInstruction="+TextSpcialInstruction+"&TextStatus="+TextStatus,
-                            type:"POST",
-                            url:"<?php echo base_url() ?>emergencypurchaseorder/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");
-                                }
-
-                            }
-
-                        });
-                    }
-
-                }
-            }
-            /**
-             * This function is used to calculate the total amounts after delete the row
-             */
-            function populateValueMainFormForDeleteServiceTax(deletedRow)
-            {
-                var rows =  document.getElementById('serviceTax').rows.length+1;
-                var TotServiceTax = 0;
-                var TotEduCess = 0;
-                var TotSecHighTax = 0;
-                var TotKrishiTax = 0;
-                var TotSwachhTax = 0;
-                var TotSummary = 0;
-                var TotBasicAmout = 0;
-                for (var i = 1; i < rows; i++) {
-                    if(deletedRow==i){
-                        $('#ServiceTax'+i).val('');
-                        $('#EduCess'+i).val('');
-                        $('#SecHighTax'+i).val('');
-                        $('#KrishiTax'+i).val('');
-                        $('#SwachhTax'+i).val('');
-                        $('#ServiceTax'+i).val('');
-                        $('#TotalOrderValue'+i).val('');
-                        $('#quantity'+i).val('');
-                        $('#itemRate'+i).val('');
-
-                        var AfterServiceTax = $('#ServiceTax'+i).val() == '' ? '0.00' : $('#ServiceTax'+i).val();
-                        var AfterEduCess = $('#EduCess'+i).val() == '' ? '0.00' : $('#EduCess'+i).val();
-                        var AfterSecHighTax = $('#SecHighTax'+i).val() == '' ? '0.00' : $('#SecHighTax'+i).val();
-                        var AfterKrishiTax =$('#KrishiTax'+i).val() == '' ? '0.00' : $('#KrishiTax'+i).val();
-                        var AfterSwachhTax = $('#SwachhTax'+i).val() == '' ? '0.00' : $('#SwachhTax'+i).val();
-                        var TotalVal =$('#TotalOrderValue'+i).val() == '' ? '0.00' : $('#TotalOrderValue'+i).val();
-
-                        var Quantity = $('#quantity'+i).val() == '' ? '0.00' : $('#quantity'+i).val();
-                        var ItemRate = $('#itemRate'+i).val() == '' ? '0.00' : $('#itemRate'+i).val();
-                        var BasicVal = parseFloat(Quantity) * parseFloat(ItemRate);
-
-                        TotServiceTax = parseFloat(TotServiceTax) + parseFloat(AfterServiceTax);
-                        TotEduCess = parseFloat(TotEduCess) + parseFloat(AfterEduCess);
-                        TotSecHighTax = parseFloat(TotSecHighTax) + parseFloat(AfterSecHighTax);
-                        TotKrishiTax = parseFloat(TotKrishiTax) + parseFloat(AfterKrishiTax);
-                        TotSwachhTax = parseFloat(TotSwachhTax) + parseFloat(AfterSwachhTax);
-                        TotSummary = parseFloat(TotSummary) + parseFloat(TotalVal);
-                        TotBasicAmout = parseFloat(TotBasicAmout) + parseFloat(BasicVal);
-                    }
-                    else if(deletedRow!=i){
-                        var AfterServiceTax = $('#ServiceTax'+i).val() == '' ? '0.00' : $('#ServiceTax'+i).val();
-                        var AfterEduCess = $('#EduCess'+i).val() == '' ? '0.00' : $('#EduCess'+i).val();
-                        var AfterSecHighTax = $('#SecHighTax'+i).val() == '' ? '0.00' : $('#SecHighTax'+i).val();
-                        var AfterKrishiTax =$('#KrishiTax'+i).val() == '' ? '0.00' : $('#KrishiTax'+i).val();
-                        var AfterSwachhTax = $('#SwachhTax'+i).val() == '' ? '0.00' : $('#SwachhTax'+i).val();
-                        var TotalVal =$('#TotalOrderValue'+i).val() == '' ? '0.00' : $('#TotalOrderValue'+i).val();
-
-                        var Quantity = $('#quantity'+i).val() == '' ? '0.00' : $('#quantity'+i).val();
-                        var ItemRate = $('#itemRate'+i).val() == '' ? '0.00' : $('#itemRate'+i).val();
-                        var BasicVal = parseFloat(Quantity) * parseFloat(ItemRate);
-                        if(AfterServiceTax!=undefined){
-                            TotServiceTax = parseFloat(TotServiceTax) + parseFloat(AfterServiceTax);
-                            TotEduCess = parseFloat(TotEduCess) + parseFloat(AfterEduCess);
-                            TotSecHighTax = parseFloat(TotSecHighTax) + parseFloat(AfterSecHighTax);
-                            TotKrishiTax = parseFloat(TotKrishiTax) + parseFloat(AfterKrishiTax);
-                            TotSwachhTax = parseFloat(TotSwachhTax) + parseFloat(AfterSwachhTax);
-                            TotSummary = parseFloat(TotSummary) + parseFloat(TotalVal);
-                            TotBasicAmout = parseFloat(TotBasicAmout) + parseFloat(BasicVal);
-                        }
-
-                    }
-                    else{
-                        
-                    }
-                  
-
-                }
-
-
-                $('#txtTotBasicAmount').val(parseFloat(TotBasicAmout).toFixed(2) );
-                $('#txtTotalServiceTax').val(parseFloat(TotServiceTax).toFixed(2) );
-                $('#txtTotHigherEdu').val(parseFloat(TotSecHighTax).toFixed(2) );
-                $('#txtTotalEducess').val(parseFloat(TotEduCess).toFixed(2) );
-                $('#txtTotalKrishiKalyan').val(parseFloat(TotKrishiTax).toFixed(2) );
-                $('#txtTotSwachhBharat').val(parseFloat(TotSwachhTax).toFixed(2) );
-                $('#txtTotalOrderValueSummaryService').val(parseFloat(TotSummary).toFixed(2) );
-
-
-            }
-              /**
-             * update available budget calculation using regNo and cost center while editing 
-             */
-            $('#EditCostCenter').change(function() {
-
-                var getCostId = $('#EditCostCenter').val();
-                $("#EditAvlBudAmt").val('');
-                var EditReqType =$('#EditReqNo').val();
-                if(getCostId != '0')
-                {
-                
-                    $('#content').loader('show');
-                    $.ajax({
-                        data:{id:getCostId},
-                        type:"POST",
-                        url:"<?php echo base_url() ?>servicepurchaseorder/AvilBudgetAmount?ReqType="+EditReqType,
-                        success:function(data) {
-                            if(data)
-                            {
-                                $('#content').loader('hide');
-                                $("#EditAvlBudAmt").val(data);
-                                if(parseFloat($("#EditAvlBudAmt").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 MaterialCode');
-                    return false;
-                }
-
-            });
-             /**
-             * getting item name and uom using global variable materialData each change ehile editing
-             */
-            $('#EditMaterialCode').change(function(){
-            
-                var editselectedMaterialCode='';
-                editselectedMaterialCode=$("#EditMaterialCode").val();
-              
-                $.each(JSON.parse(materialData), function (index, value) {
-                     if(editselectedMaterialCode==value.MaterialCode){
-                     	$("#EditMaterialCode").val(value.MaterialCode);
-                         $("#EditItemName").val(value.MaterialName);
-                         $("#EditItemUOM").val(value.UOM);
-                         
-                     }
-
-                });
-                
-            });
-            $("#EDITREVENUE").on("shown.bs.modal", function(e) {
-            
-           
-	
-		userid = $(e.relatedTarget).data('userid');
-		
-		 var CheckLocalInter = $('#CheckLocalInter'+userid).val();
-		       if(CheckLocalInter == "0")
-        {
-            // style="display:none;"
-          //  $('#Vat').removeAttr("style");
-           // $('#TotVat').removeAttr("style");
-          //  $('#CST').attr("style","display:none;");
-         //   $('#TotCST').attr("style","display:none;");
-         $('#EditVat').show();
-         $('#EditCST').hide();
-
-        }
-        else
-        {
-          //  $('#CST').removeAttr("style");
-          //  $('#TotCST').removeAttr("style");
-           // $('#Vat').attr("style","display:none;");
-           // $('#TotVat').attr("style","display:none;");
-            $('#EditVat').hide();
-         $('#EditCST').show();
-
-        }
-		
-		$('#isEdit').val(1);
-	    //alert(userid);
-		var tr= document.getElementById(userid);
-		
-		var cellval = tr.cells;
-
-		var id= $('#Reqnumber'+userid).val();
-		
-		$('#EditRevenueReqNo').val($('#Reqnumber'+userid).val());
-		$('#EditRevenuedeptName').val($('#departmentName'+userid).val());
-		//$("#EditRevenueCostCenter").val($('#costCode'+userid).val());
-		$('#EditRevenueAvlBudAmt').val($('#AvilBudget'+userid).val());
-		
-		$('#EditRevenueItemName').val($('#materialName'+userid).val());
-		$('#EditRevenueUOM').val($('#uom'+userid).val());
-		$('#EditRevenueQuantity').val($('#quantity'+userid).val());
-		$('#EditRevenueRate').val($('#itemRate'+userid).val());
-		$('#txtEditRevenueBasicValue').val(cellval[6].innerHTML);
-		RequistQuantity = $('#quantity'+userid).val();
-		$('#txtEditDiscount').val($('#DisVal'+userid).val());
-		$('#txtEditAfterDiscount').val($('#AfterDisVal'+userid).val());
-		$('#txtEditVat').val($('#VatVal'+userid).val());
-		$('#txtEditAfterVat').val($('#AfterVatVal'+userid).val());
-		$('#txtEditCST').val($('#CSTVal'+userid).val());
-		$('#txtEditAfterCST').val($('#AfterCSTVal'+userid).val());
-		
-		$('#txtEditPackaging').val($('#PackVal'+userid).val());
-		$('#txtEditAfterPackaging').val($('#AfterPackVal'+userid).val());
-		$('#txtEditGST').val($('#GSTVal'+userid).val());
-		$('#txtEditAfterGST').val($('#AfterGSTVal'+userid).val());
-		$('#txtEditExciseDuty').val($('#ExciseVal'+userid).val()); 
-		$('#txtEditAfterExciseDuty').val($('#AfterExciseVal'+userid).val()); 
-		$('#txtEditOtherTax').val($('#OtherTaxVal'+userid).val());
-		$('#txtEditAfterOtherTax').val($('#AfterOtherTaxVal'+userid).val());
-		$('#txtEditFreight').val($('#FreightVal'+userid).val());
-		$('#txtEditAfterFreight').val($('#AfterFreightVal'+userid).val());
-		$('#txtEditInsurance').val($('#Insval'+userid).val());
-		
-		$('#txtEditRevenueTotalOrderValue').val($('#TotalOrderValue'+userid).val());
-		
-		
-		     $.each(JSON.parse(CostArray), function (index, value) {
-                                	if ($('#costCode'+userid).val()==value.CostCenterCode) {
-                 $('#EditRevenueCostCenter').val($('#costCode'+userid).val() + '-'+ value.CostCenterName);
-                                		
-                                	}
-                                	
-                                
-                                $("#EditRevenueMaterialCode").empty();
-                               
-                          $("#EditRevenueMaterialCode").append( $('<option></option>').val($('#materialCode'+userid).val()).html($('#materialCode'+userid).val() + "-" + $('#materialName'+userid).val()) );
-                                $.each(JSON.parse(materialData), function (index, value) {
-                         
-
-                                 if($('#materialCode'+userid).val() != value.MaterialCode)
-						 {
-
-						                                    $("#EditRevenueMaterialCode").append( $('<option></option>').val(value.MaterialCode).html(value.MaterialCode + "-" + value.MaterialName) );
-
-						}
-						
-
-		
-                                });
-                                           
-
-
-
-                        }); 
-                        $("#EditDiscountType").val($('#DisType'+userid).val());
-		$("#drpEditFreight").val($('#FreightType'+userid).val());
-		$("#EditPackagingType").val($('#PackType'+userid).val())
-		
-		
-		
-	   
-});
- $('#EditRevenueMaterialCode').change(function(){
-            
-                var editselectedMaterialCode='';
-                editselectedMaterialCode=$("#EditRevenueMaterialCode").val();
-              
-                $.each(JSON.parse(materialData), function (index, value) {
-                     if(editselectedMaterialCode==value.MaterialCode){
-                     	$("#EditRevenueMaterialCode").val(value.MaterialCode);
-                         $("#EditRevenueItemName").val(value.MaterialName);
-                         $("#EditRevenueUOM").val(value.UOM);
-                         
-                     }
-
-                });
-                
-            });
-$('.EditRevenue').click(function(){
-         
-   		
-       if(validateEditRevenueTax() && validateEditExceedLimit())	  
-        {
-            //alert('inside Add');			
-            var CostCode =  $("#EditRevenueCostCenter").val();
-			 var AvilBudget = $('#EditRevenueAvlBudAmt').val();
-			var editMaterialCode =  $("#EditRevenueMaterialCode").val();
-			var editDescription = $("#EditRevenueItemName").val();		
-			var editUOM = $('#EditRevenueUOM').val();
-			var editQuantity = $('#EditRevenueQuantity').val();
-			
-			 var itemRate = $("#EditRevenueRate").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 ExciseOption = ExciseCalculation ;
-		  var ExciseVal = $("#txtEditExciseDuty").val();
-		  var AfterExciseVal = $("#txtEditAfterExciseDuty").val();
-		  
-		  var VatOption = VatCalculation ;
-		  var VatVal = $("#txtEditVat").val();
-		  var AfterVatVal = $("#txtEditAfterVat").val();
-			
-		  var CSTOption = CSTCalculation ;
-		  var CSTVal = $("#txtCST").val();
-		  var AfterCSTVal = $("#txtEditAfterCST").val();
-		  
-		  var GSTVal = $("#txtEditCST").val();
-		  var AfterGSTVal = $("#txtEditAfterCST").val();
-		  
-		   var OtherTaxVal = $("#txtEditOtherTax").val();
-		  var AfterOtherTaxVal = $("#txtEditAfterOtherTax").val();
-		  
-	      var FreightType = $("#drpEditFreight").val();
-		  var FreightVal = $("#txtEditFreight").val();
-		  var AfterFreightVal = $("#txtEditAfterFreight").val();
-		  
-		 var basicval = $("#txtEditBasicValue").val();
-		 var Insval = $("#txtEditInsurance").val();
-		 var TotalOrderValue = $("#txtEditRevenueTotalOrderValue").val();
-		 
-		  var TotalTaxValue = calculateEditTaxValue();				
-		 
-		 
-            var tr= document.getElementById(userid);
-			var cellval = tr.cells;   
-			
-			cellval[2].innerHTML = editDescription;			
-			cellval[3].innerHTML = editQuantity;
-			cellval[4].innerHTML =editUOM;
-			cellval[5].innerHTML =itemRate;
-			cellval[6].innerHTML =basicval;
-			cellval[7].innerHTML =TotalTaxValue;
-			cellval[8].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);
-			$('#ExciseOption'+userid).val(ExciseOption);
-			$('#ExciseVal'+userid).val(ExciseVal);
-			$('#AfterExciseVal'+userid).val(AfterExciseVal);
-            $('#VatOption'+userid).val(VatOption);
-			$('#VatVal'+userid).val(VatVal);
-			$('#AfterVatVal'+userid).val(AfterVatVal);
-			$('#CSTOption'+userid).val(CSTOption);	
-			$('#CSTVal'+userid).val(CSTVal);
-			$('#AfterCSTVal'+userid).val(AfterCSTVal);
-			$('#GSTVal'+userid).val(GSTVal);
-			$('#AfterGSTVal'+userid).val(AfterGSTVal);
-			$('#OtherTaxVal'+userid).val(OtherTaxVal);	
-			$('#AfterOtherTaxVal'+userid).val(AfterOtherTaxVal);
-			$('#FreightType'+userid).val(FreightType);
-			$('#FreightVal'+userid).val(FreightVal);	
-			$('#AfterFreightVal'+userid).val(AfterFreightVal);	
-			$('#basicval'+userid).val(basicval);
-			$('#Insval'+userid).val(Insval);
-			$('#TotalOrderValue'+userid).val(TotalOrderValue);			
-		    populateValueMainFormForEditRevenueTax();	 
-      }
-    
- });
- function validateEditRevenueTax()
- {  
-	 if($('#EditRevenueCostCenter').val() == "0")
-	{
-		alert('Please select the Cost center');
-		$('#EditRevenueCostCenter').focus();
-		return false;
-	}
-	else if($('#EditRevenueMaterialCode').val() == "0")
-	{
-		alert('Please select the Material Code');
-		$('#EditRevenueMaterialCode').focus();
-		return false;
-	}		
-	else if($('#EditRevenueQuantity').val() == '')
-	{
-		alert('Please Enter the Quantity value');
-		$('#EditRevenueQuantity').focus();
-		return false;
-	}
-	else if($('#EditRevenueRate').val() == '')
-	{
-		alert('Please Enter the Rate of the Item');
-		$('#EditRevenueRate').focus();
-		return false;
-	}
-	else
-	{
-		return true;
-	}	
- }
- 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 populateValueMainFormForEditRevenueTax()
-{
-	  
-		var rows =  document.getElementById('serviceTax').rows.length;
-        //alert(rows);
-		var totBasicAmt = 0;
-		var totDiscountAmt = 0;
-		var totPackagingAmt = 0;
-		var totExciseAmt = 0;
-		var totVATAmt = 0;
-		var totCSTAmt = 0;
-		var totGSTAmt = 0;
-		var totOtherTaxAmt = 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 ExciseDuty = $('#AfterExciseVal'+rowid).val() == '' ? '0.00' : $('#AfterExciseVal'+rowid).val();
-		var Vat  = $('#AfterVatVal'+rowid).val() == '' ? '0.00' : $('#AfterVatVal'+rowid).val();
-		var CST  =$('#AfterCSTVal'+rowid).val() == '' ? '0.00' : $('#AfterCSTVal'+rowid).val();
-	    var GST  = $('#AfterGSTVal'+rowid).val() == '' ? '0.00' : $('#AfterGSTVal'+rowid).val();
-		var OtherTax  = $('#AfterOtherTaxVal'+rowid).val() == '' ? '0.00' : $('#AfterOtherTaxVal'+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);
-		totExciseAmt  = parseFloat(totExciseAmt) + parseFloat(ExciseDuty);
-		totVATAmt  = parseFloat(totVATAmt ) + parseFloat(Vat);
-		totCSTAmt  = parseFloat(totCSTAmt ) + parseFloat(CST);
-		totGSTAmt  = parseFloat(totGSTAmt ) + parseFloat(GST);
-		totOtherTaxAmt  = parseFloat(totOtherTaxAmt ) + parseFloat(OtherTax);
-		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)  );
-		$('#txtTotExciseDuty').val(parseFloat(totExciseAmt).toFixed(2)  );
-		$('#txtTotalVat').val(parseFloat(totVATAmt).toFixed(2)  );
-		$('#txtTotCST').val(parseFloat(totCSTAmt).toFixed(2) );
-		$('#txtTotalGST').val(parseFloat(totGSTAmt).toFixed(2)  );
-		$('#txtTotalOtherTaxes').val(parseFloat(totOtherTaxAmt).toFixed(2) );
-		$('#txtTotalFreight').val(parseFloat(totFreightAmt).toFixed(2) );
-		$('#txtTotalInsurance').val(parseFloat(totInsuranceAmt).toFixed(2) );
-		$('#txtTotalOrderValueSummary').val(parseFloat(totOrderSummaryAmt).toFixed(2)  );
-		
-}
-
-
-        </script>
-      
+        </script>
\ No newline at end of file
diff --git a/application/views/costListing.php b/application/views/costListing.php
index 8ae8b376..20cc131a 100755
--- a/application/views/costListing.php
+++ b/application/views/costListing.php
@@ -1,18 +1,14 @@
-<script>
-$(document).ready(function() {
-
-$('table').tableSort( {
-animation :'slide',
-speed:500
-} );
-});  
- 
-</script>
+ <script>
+ (function(l,q){var e=function(b,c){b.extend(!0,c.defaults,{dom:"<'row'<'col-sm-9'l><'col-sm-3'f>><'row'<'col-sm-12'tr>><'row'<'col-sm-8'i><'col-sm-4'p>>",renderer:"bootstrap"});b.extend(c.ext.classes,{sWrapper:"dataTables_wrapper form-inline dt-bootstrap",sFilterInput:"form-control input-sm",sLengthSelect:"form-control input-sm"});c.ext.renderer.pageButton.bootstrap=function(g,e,r,s,i,m){var t=new c.Api(g),u=g.oClasses,j=g.oLanguage.oPaginate,d,f,n=0,p=function(c,e){var k,h,o,a,l=function(a){a.preventDefault();
+b(a.currentTarget).hasClass("disabled")||t.page(a.data.action).draw(!1)};k=0;for(h=e.length;k<h;k++)if(a=e[k],b.isArray(a))p(c,a);else{f=d="";switch(a){case "ellipsis":d="&hellip;";f="disabled";break;case "first":d=j.sFirst;f=a+(0<i?"":" disabled");break;case "previous":d=j.sPrevious;f=a+(0<i?"":" disabled");break;case "next":d=j.sNext;f=a+(i<m-1?"":" disabled");break;case "last":d=j.sLast;f=a+(i<m-1?"":" disabled");break;default:d=a+1,f=i===a?"active":""}d&&(o=b("<li>",{"class":u.sPageButton+" "+
+f,id:0===r&&"string"===typeof a?g.sTableId+"_"+a:null}).append(b("<a>",{href:"#","aria-controls":g.sTableId,"data-dt-idx":n,tabindex:g.iTabIndex}).html(d)).appendTo(c),g.oApi._fnBindAction(o,{action:a},l),n++)}},h;try{h=b(q.activeElement).data("dt-idx")}catch(l){}p(b(e).empty().html('<ul class="pagination"/>').children("ul"),s);h&&b(e).find("[data-dt-idx="+h+"]").focus()};c.TableTools&&(b.extend(!0,c.TableTools.classes,{container:"DTTT btn-group",buttons:{normal:"btn btn-default",disabled:"disabled"},
+collection:{container:"DTTT_dropdown dropdown-menu",buttons:{normal:"",disabled:"disabled"}},print:{info:"DTTT_print_info"},select:{row:"active"}}),b.extend(!0,c.TableTools.DEFAULTS.oTags,{collection:{container:"ul",button:"li",liner:"a"}}))};"function"===typeof define&&define.amd?define(["jquery","datatables"],e):"object"===typeof exports?e(require("jquery"),require("datatables")):jQuery&&e(jQuery,jQuery.fn.dataTable)})(window,document);
+ </script>
 <div class="content-wrapper">
     <!-- Content Header (Page header) -->
     <section class="content-header">
       <h1>
-       <center>COST LIST</center>       
+       <center>Siddharth Industries - Cost Details</center>       
       </h1>
     </section>
     <section class="content">
@@ -20,35 +16,23 @@ speed:500
             <div class="col-xs-12 text-right">
                 <div class="form-group">
                     <a class="btn btn-primary" href="<?php echo base_url(); ?>CostCenter/addCostCenter">Add New Cost List</a>
-					<a class="btn btn-primary" href="<?php echo base_url(); ?>CostCenter/export_cost">Export Cost Details <i class="fa fa-download"aira-hidden="true"></i></a>
+					<a class="btn btn-primary" href="<?php echo base_url(); ?>costcenter/export_cost">Export Cost Details <i class="fa fa-download"aira-hidden="true"></i></a>
                 </div>
             </div>
         </div>
         <div class="row">
-            <div class="col-xs-12">
-              <div class="box">
-                <div class="box-header">
-                     
-                    <div class="box-tools">
-                        <form action="<?php echo base_url() ?>CostCenter/costListing" method="POST" id="searchList">
-                            <div class="input-group">
-                              <input type="text" name="searchText" value="<?php echo $searchText; ?>" class="form-control input-sm pull-right" style="width: 150px;" placeholder="Search"/>
-                              <div class="input-group-btn">
-                                <button class="btn btn-sm btn-default searchList"><i class="fa fa-search"></i></button>
-                              </div>
-                            </div>
-                        </form>
-                    </div>
-                </div><!-- /.box-header -->
-                 <div class="box-body table-responsive no-padding" >
-                 <table id="datatable" class="table table-hover tableSorter" >
-                       <tr bgcolor="steelblue">
-                      <th>Cost Center ID</th>
-                      <th>Cost Name</th>
-                      <th>Description</th>
-                      <th>Create Date</th>
-                      <th>Action</th>                      
-                    </tr>
+            <div class="col-xs-12"> 
+                 <table id="datatable" class="table table-bordered table-hover" style="background-color:#fff;font-size:12px;" >
+					<thead>
+						<tr>
+						  <th>Cost Center ID</th>
+						  <th>Cost Name</th>
+						  <th>Description</th>
+						  <th>Create Date</th>
+						  <th>Action</th>                      
+						</tr>
+					</thead>
+					<tbody>
                     <?php
                     if(!empty($userRecords))
                     {
@@ -73,26 +57,28 @@ speed:500
                         }
                     }
                     ?>
+					</tbody>
                   </table>
                   
-                </div><!-- /.box-body -->
-                <div class="box-footer clearfix">
-                    <?php echo $this->pagination->create_links(); ?>
-                </div>
-              </div><!-- /.box -->
+                 
             </div>
         </div>
     </section>
 </div>
 <script type="text/javascript" src="<?php echo base_url(); ?>assets/js/common.js" charset="utf-8"></script>
-<script type="text/javascript">
-    jQuery(document).ready(function(){
-        jQuery('ul.pagination li a').click(function (e) {
-            e.preventDefault();            
-            var link = jQuery(this).get(0).href;            
-            var value = link.substring(link.lastIndexOf('/') + 1);
-            jQuery("#searchList").attr("action", baseURL + "costListing/" + value);
-            jQuery("#searchList").submit();
-        });
-    });
+  <script type="text/javascript">
+   
+	$(function () {
+   
+    $('#datatable').DataTable({
+      "paging": true,
+      "lengthChange": true,
+      "searching": true,
+      "ordering": true,
+      "info": true,
+      "autoWidth": true
+	   
+    }); 
+  });
+	
 </script>
diff --git a/application/views/importpo.php b/application/views/importpo.php
index d5591af6..77c0daa7 100755
--- a/application/views/importpo.php
+++ b/application/views/importpo.php
@@ -1,5 +1,5 @@
 <?php
-
+$AvlAmount = 0;
 $ReqType =''; 
 $CompanyAddress = '';
 if(!empty($CompanyDetails))
@@ -21,6 +21,13 @@ if(!empty($MaxPODate))
         $MaxPoDate = $date->PODate;     
     }
 }
+
+if(!empty($AvlBudAmt))
+{
+   
+        $AvlAmount = $AvlBudAmt;        
+    
+}
 ?>
 
 <style>
@@ -104,7 +111,7 @@ if(!empty($MaxPODate))
 
             ?>  
      </div>
-     <div class="col-md-12">
+  <!--   <div class="col-md-12">
                 Basic Price in US $ per Ton :
                 <div class="form-group">
                     <?php
@@ -112,7 +119,7 @@ if(!empty($MaxPODate))
                     echo form_input($data);
                     ?>
                 </div>
-        </div>    
+        </div> -->   
         <div class="col-md-12">
             <a href="http://www.xe.com/" target="_blank"><u>Click here to check Today's Foreign Exchange value</u></a>        
         </div>                                           
@@ -180,7 +187,7 @@ if(!empty($MaxPODate))
                         ?>   
                     </div>
             </div>
-            <div class="col-md-12">
+           <!-- <div class="col-md-12">
                 Basic value in INR :
                 <div class="form-group">
                     <?php
@@ -188,7 +195,7 @@ if(!empty($MaxPODate))
                     echo form_input($data);
                     ?>
                 </div>
-            </div>
+            </div>-->
         </div>
         <div class="col-md-4">
             <div class="col-md-12">
@@ -220,7 +227,8 @@ if(!empty($MaxPODate))
      <table class="table table-bordered" style="border:1px solid #333">
   <div align="right" style="padding-right:10px">
 <div align="right">
- <a data-toggle="modal" data-target="#importpomodel"  class="btn btn-primary" data-dismiss="modal" onclick="myFunction();,clearTaxField();" >Add Line Item </a>
+<a data-toggle="modal" data-target="#importpomodel"  class="btn btn-primary" data-dismiss="modal" onclick="myFunction();" >Add Line Item </a>
+  
 
    
 
@@ -275,9 +283,12 @@ if(!empty($MaxPODate))
                                                     <label>Cost Center Name</label>
                                                     <div class="form-group">
                                                         <?php
-                                                        $options = array("0"=>'Select Cost Center');
+                                                        //$options = array("0"=>'Select Cost Center');
 
-                                                        echo form_dropdown('CostCenter', $options,set_value('CostCenter'),'id="CostCenter"' ,'class="form-control"');
+                                                        //echo form_dropdown('CostCenter', $options,set_value('CostCenter'),'id="CostCenter"' ,'class="form-control"');
+
+                                                        $data = array('name' => 'CostCenter','value' => set_value('CostCenter'),'id'=>'CostCenter',  'class' => 'form-control' ,'readonly' => 'true');
+                                                echo form_input($data);
 
                                                         ?>
                                                     </div>
@@ -383,7 +394,7 @@ if(!empty($MaxPODate))
 
                                                     <div class="form-group">
                                                         <?php
-                                                        $data = array('name' => 'imBasicPrice','value' => set_value('imBasicPrice'),'id'=>'imBasicPrice',  'class' => 'form-control' ,'placeholder '=>'basic price','onkeypress'=>'return isNumberKey(event);','readonly'=>'true');
+                                                        $data = array('name' => 'imBasicPrice','value' => set_value('imBasicPrice'),'id'=>'imBasicPrice',  'class' => 'form-control' ,'placeholder '=>'basic price','onkeypress'=>'return isNumberKey(event);','onchange'=>'USRate()');
                                                         echo form_input($data);
                                                         ?>
                                                     </div>
@@ -734,7 +745,17 @@ if(!empty($MaxPODate))
                                                                     ?>
                                                                 </div>
                                                             </div>
-
+                                                         <div class="col-md-4">
+                                                                Total Amount:
+                                                            </div>
+                                                           <div class="col-md-4">
+                                                                <div class="form-group">
+                                                                    <?php
+                                                                    $data = array('name' => 'TotalExp','value' => set_value('TotalExp'),'id'=>'TotalExp',  'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);','readonly'=>'true');
+                                                                    echo form_input($data);
+                                                                    ?>
+                                                                </div>
+                                                            </div>
 
                                                         </div>
 
@@ -800,7 +821,10 @@ if(!empty($MaxPODate))
                                                         <?php
                                                         $options = array("0"=>'Select Cost Center');
 
-                                                        echo form_dropdown('EditCostCenter', $options,set_value('EditCostCenter'),'id="EditCostCenter"' ,'class="form-control"');
+                                                        //echo form_dropdown('EditCostCenter', $options,set_value('EditCostCenter'),'id="EditCostCenter"' ,'class="form-control"');
+
+                                                          $data = array('name' => 'EditCostCenter','value' => set_value('EditCostCenter'),'id'=>'EditCostCenter',  'class' => 'form-control' ,'readonly' => 'true');
+                                                echo form_input($data);
 
                                                         ?>
                                                     </div>
@@ -974,7 +998,7 @@ if(!empty($MaxPODate))
                                                             <div class="col-md-4">
                                                                 <div class="form-group">
                                                                     <?php
-                                                                    $data = array('name' => 'EditLandingCharge','value' => set_value('EditLandingCharge'),'id'=>'EditLandingCharge',  'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'Calculateloadingcharge()');
+                                                                    $data = array('name' => 'EditLandingCharge','value' => set_value('EditLandingCharge'),'id'=>'EditLandingCharge',  'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'EditCalculateloadingcharge()');
                                                                     echo form_input($data);
 
                                                   
@@ -998,7 +1022,7 @@ if(!empty($MaxPODate))
                                                             <div class="col-md-4">
                                                                 <div class="form-group">
                                                                     <?php
-                                                                    $data = array('name' => 'EditHighseas ','value' => set_value('EditHighseas'),'id'=>'EditHighseas',  'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'CalculateHighseassalescharge()');
+                                                                    $data = array('name' => 'EditHighseas ','value' => set_value('EditHighseas'),'id'=>'EditHighseas',  'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'EditCalculateHighseassalescharge()');
                                                                     echo form_input($data);
                                                                     ?>
                                                                 </div>
@@ -1019,7 +1043,7 @@ if(!empty($MaxPODate))
                                                             <div class="col-md-4">
                                                                 <div class="form-group">
                                                                     <?php
-                                                                    $data = array('name' => 'EditCustomduty','value' => set_value('EditCustomduty'),'id'=>'EditCustomduty',  'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);');
+                                                                    $data = array('name' => 'EditCustomduty','value' => set_value('EditCustomduty'),'id'=>'EditCustomduty',  'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'EditCalculateCustomduty()');
                                                                     echo form_input($data);
                                                                     ?>
                                                                 </div>
@@ -1040,7 +1064,7 @@ if(!empty($MaxPODate))
                                                             <div class="col-md-4">
                                                                 <div class="form-group">
                                                                     <?php
-                                                                    $data = array('name' => 'EditExcisedutyTax','value' => set_value('EditExcisedutyTax'),'id'=>'EditExcisedutyTax',  'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);');
+                                                                    $data = array('name' => 'EditExcisedutyTax','value' => set_value('EditExcisedutyTax'),'id'=>'EditExcisedutyTax',  'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'EditCalculateExciseDuty()');
                                                                     echo form_input($data);
                                                                     ?>
                                                                 </div>
@@ -1061,7 +1085,7 @@ if(!empty($MaxPODate))
                                                             <div class="col-md-4">
                                                                 <div class="form-group">
                                                                     <?php
-                                                                    $data = array('name' => 'EditExcisedutyEDcess','value' => set_value('EditExcisedutyEDcess'),'id'=>'EditExcisedutyEDcess',  'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);');
+                                                                    $data = array('name' => 'EditExcisedutyEDcess','value' => set_value('EditExcisedutyEDcess'),'id'=>'EditExcisedutyEDcess',  'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'EditCalculateExciseED1()');
                                                                     echo form_input($data);
                                                                     ?>
                                                                 </div>
@@ -1082,7 +1106,7 @@ if(!empty($MaxPODate))
                                                             <div class="col-md-4">
                                                                 <div class="form-group">
                                                                     <?php
-                                                                    $data = array('name' => 'EditExcisedutySHcess','value' => set_value('EditExcisedutySHcess'),'id'=>'EditExcisedutySHcess',  'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);');
+                                                                    $data = array('name' => 'EditExcisedutySHcess','value' => set_value('EditExcisedutySHcess'),'id'=>'EditExcisedutySHcess',  'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'EditCalculateexciseSHcess()');
                                                                     echo form_input($data);
                                                                     ?>
                                                                 </div>
@@ -1103,7 +1127,7 @@ if(!empty($MaxPODate))
                                                             <div class="col-md-4">
                                                                 <div class="form-group">
                                                                     <?php
-                                                                    $data = array('name' => 'EditCustomEDcess','value' => set_value('EditCustomEDcess'),'id'=>'EditCustomEDcess',  'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);');
+                                                                    $data = array('name' => 'EditCustomEDcess','value' => set_value('EditCustomEDcess'),'id'=>'EditCustomEDcess',  'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'EditCalculateCustomEdcess()');
                                                                     echo form_input($data);
                                                                     ?>
                                                                 </div>
@@ -1124,7 +1148,7 @@ if(!empty($MaxPODate))
                                                             <div class="col-md-4">
                                                                 <div class="form-group">
                                                                     <?php
-                                                                    $data = array('name' => 'EditCustomSHcess','value' => set_value('EditCustomSHcess'),'id'=>'EditCustomSHcess',  'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);');
+                                                                    $data = array('name' => 'EditCustomSHcess','value' => set_value('EditCustomSHcess'),'id'=>'EditCustomSHcess',  'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'EditCalculateCustomSHcess()');
                                                                     echo form_input($data);
                                                                     ?>
                                                                 </div>
@@ -1147,7 +1171,7 @@ if(!empty($MaxPODate))
                                                             <div class="col-md-4">
                                                                 <div class="form-group">
                                                                     <?php
-                                                                    $data = array('name' => 'EditAdditionalExciseduty ','value' => set_value('EditAdditionalExciseduty'),'id'=>'EditAdditionalExciseduty',  'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);');
+                                                                    $data = array('name' => 'EditAdditionalExciseduty ','value' => set_value('EditAdditionalExciseduty'),'id'=>'EditAdditionalExciseduty',  'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'EditCalculateaddlExciseDuty(),EditCalculateAvlModvat(),EditCalculateGrossExpense()');
                                                                     echo form_input($data);
                                                                     ?>
                                                                 </div>
@@ -1223,7 +1247,7 @@ if(!empty($MaxPODate))
                                                                 <span>Quantity</span>
                                                                 <div class="form-group">
                                                                     <?php
-                                                                    $data = array('name' => 'EditPurQuantity','value' => set_value('EditPurQuantity'),'id'=>'EditPurQuantity',  'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);');
+                                                                    $data = array('name' => 'EditPurQuantity','value' => set_value('EditPurQuantity'),'id'=>'EditPurQuantity',  'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'EditCalculateCtable()');
                                                                     echo form_input($data);
                                                                     ?>
                                                                 </div>
@@ -1257,7 +1281,17 @@ if(!empty($MaxPODate))
                                                                     ?>
                                                                 </div>
                                                             </div>
-
+                                                         <div class="col-md-4">
+                                                                Total Amount:
+                                                            </div>
+                                                           <div class="col-md-4">
+                                                                <div class="form-group">
+                                                                    <?php
+                                                                    $data = array('name' => 'EditTotalExp','value' => set_value('TotalExp'),'id'=>'TotalExp',  'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);','readonly'=>'true');
+                                                                    echo form_input($data);
+                                                                    ?>
+                                                                </div>
+                                                            </div>
 
                                                         </div>
 
@@ -1268,7 +1302,7 @@ if(!empty($MaxPODate))
 
                                         </div>
                                         <div class="modal-footer">
-                                            <a class="btn btn-info font AddImport"  ID="AddImport" ><i class="fa fa-plus" ></i>&nbsp;&nbsp;<span class="bold">Add Import</span></a>
+                                            <a class="btn btn-info font EditImport"  ID="EditImport" ><i class="fa fa-plus" ></i>&nbsp;&nbsp;<span class="bold">Edit Import</span></a>
                                             <!--<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-info" data-dismiss="modal"  value="Cancel">Cancel</a>
@@ -1312,6 +1346,129 @@ if(!empty($MaxPODate))
        
   </table>
       <div class="col-md-3 col-md-offset-9">
+
+       <div class="col-md-12">
+            <div class="col-md-6">
+              <label >Total Landing Charge  :</label> 
+                                            
+                            <?php
+                         $data = array('name' => 'txttotallanding','value' => set_value('txttotallanding'),'id'=>'txttotallanding',  'class' => 'form-control'   ,'readonly' => 'true','style'=>'text-align:right;');
+                        echo form_input($data);
+                        ?>                      
+            </div>
+
+            <div class="col-md-6">
+              <label >Total High seas sales Charge  :</label> 
+                                            
+                            <?php
+                         $data = array('name' => 'txttotalhighseas','value' => set_value('txttotalhighseas'),'id'=>'txttotalhighseas',  'class' => 'form-control'   ,'readonly' => 'true','style'=>'text-align:right;');
+                        echo form_input($data);
+                        ?>                      
+            </div>
+
+            <div class="col-md-6">
+              <label >Total Custom Duty Charge  :</label> 
+                                            
+                            <?php
+                         $data = array('name' => 'txttotalcustom','value' => set_value('txttotalcustom'),'id'=>'txttotalcustom',  'class' => 'form-control'   ,'readonly' => 'true','style'=>'text-align:right;');
+                        echo form_input($data);
+                        ?>                      
+            </div>
+
+            <div class="col-md-6">
+              <label >Total Excise duty  Charge  :</label> 
+                                            
+                            <?php
+                         $data = array('name' => 'txttotalexcise','value' => set_value('txttotalexcise'),'id'=>'txttotalexcise',  'class' => 'form-control'   ,'readonly' => 'true','style'=>'text-align:right;');
+                        echo form_input($data);
+                        ?>                      
+            </div>
+
+            <div class="col-md-6">
+              <label >Total Excise duty ED_cess Charge  :</label> 
+                                            
+                            <?php
+                         $data = array('name' => 'txttotalexciseED','value' => set_value('txttotalexciseED'),'id'=>'txttotalexciseED',  'class' => 'form-control'   ,'readonly' => 'true','style'=>'text-align:right;');
+                        echo form_input($data);
+                        ?>                      
+            </div>
+
+
+            <div class="col-md-6">
+              <label >Total Excise duty S & H cess  Charge  :</label> 
+                                            
+                            <?php
+                         $data = array('name' => 'txttotalexciseSH','value' => set_value('txttotalexciseSH'),'id'=>'txttotalexciseSH',  'class' => 'form-control'   ,'readonly' => 'true','style'=>'text-align:right;');
+                        echo form_input($data);
+                        ?>                      
+            </div>
+
+            <div class="col-md-6">
+              <label >Total Custom ED_cess Charge  :</label> 
+                                            
+                            <?php
+                         $data = array('name' => 'txttotalcustomED','value' => set_value('txttotalcustomED'),'id'=>'txttotalcustomED',  'class' => 'form-control'   ,'readonly' => 'true','style'=>'text-align:right;');
+                        echo form_input($data);
+                        ?>                      
+            </div>
+
+            <div class="col-md-6">
+              <label >Total Custom S & H cess Charge  :</label> 
+                                            
+                            <?php
+                         $data = array('name' => 'txttotalcustomSH','value' => set_value('txttotalcustomSH'),'id'=>'txttotalcustomSH',  'class' => 'form-control'   ,'readonly' => 'true','style'=>'text-align:right;');
+                        echo form_input($data);
+                        ?>                      
+            </div>
+
+            <div class="col-md-6">
+              <label >Total Additional Excise duty Charge  :</label> 
+                                            
+                            <?php
+                         $data = array('name' => 'txttotalAdditionalExciseduty','value' => set_value('txttotalAdditionalExciseduty'),'id'=>'txttotalAdditionalExciseduty',  'class' => 'form-control'   ,'readonly' => 'true','style'=>'text-align:right;');
+                        echo form_input($data);
+                        ?>                      
+            </div>
+
+
+            <div class="col-md-6">
+              <label >Total Gross duty payable Charge  :</label> 
+                                            
+                            <?php
+                         $data = array('name' => 'txttotalgrossduty','value' => set_value('txttotalgrossduty'),'id'=>'txttotalgrossduty',  'class' => 'form-control'   ,'readonly' => 'true','style'=>'text-align:right;');
+                        echo form_input($data);
+                        ?>                      
+            </div>
+
+             <div class="col-md-6">
+              <label >Total Available Modvat set-off on import Charge  :</label> 
+                                            
+                            <?php
+                         $data = array('name' => 'txttotalavlmodvat','value' => set_value('txttotalavlmodvat'),'id'=>'txttotalavlmodvat',  'class' => 'form-control'   ,'readonly' => 'true','style'=>'text-align:right;');
+                        echo form_input($data);
+                        ?>                      
+            </div>
+
+
+            <div class="col-md-6">
+              <label >Total Gross expenses due to custom duty Charge  :</label> 
+                                            
+                            <?php
+                         $data = array('name' => 'txttotalgrossexpense','value' => set_value('txttotalgrossexpense'),'id'=>'txttotalgrossexpense',  'class' => 'form-control'   ,'readonly' => 'true','style'=>'text-align:right;');
+                        echo form_input($data);
+                        ?>                      
+            </div>
+        
+
+           
+
+                    <div class="form-group">
+                            <label>Total Order Value :</label>  <?php
+                         $data = array('name' => 'txtToatlOrder','value' => set_value('txtToatlOrder'),'id'=>'txtToatlOrder',  'class' => 'form-control' ,'required' => 'true','readonly' => 'true');
+                        echo form_input($data);
+                        ?>   
+                    </div>
+            </div> 
                 
                     <div class="form-group">
                             <label>Total Order Value :</label>  <?php
@@ -1319,10 +1476,30 @@ if(!empty($MaxPODate))
                         echo form_input($data);
                         ?>   
                     </div>
+
+                    <div class="col-md-12">
+                      <div class="col-md-12">
+                            <label>Comments for Special Instructions :</label>  <?php
+                         $data = array('name' => 'txtSpcialInstruction','value' => set_value('txtSpcialInstruction'),'id'=>'txtSpcialInstruction',  'class' => 'form-control','rows' => '3', 'cols' => '40' );
+                        echo form_textarea($data);
+                        ?>   
+                      </div>   
+                     </div> 
             </div> 
  <div align="right" style="padding-right:10px">
-  <button type="button" class="btn btn-primary">Save</button>
-  <button type="button" class="btn btn-primary">Cancel</button>
+
+<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" />
+        <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 Submit"  ID="Submit" onclick="Save(1)" >&nbsp;&nbsp;<span class="bold">Submit</span></a> 
+    <input type="reset" class="btn btn-primary" value="Reset">
+
+  <!--<button type="button" class="btn btn-primary">Save</button>
+  <button type="button" class="btn btn-primary">Cancel</button>-->
     
   </div>
          <br/>
@@ -1354,13 +1531,19 @@ if(!empty($MaxPODate))
 
 
 <script type="text/javascript">
- 
+ //alert();
 var SelectedMaterialCode = [];
 var RequistQuantity = '';
 var AvilBudAmt = '';
  var CollIndex = 0;
 var index='1';
 var userid  = '';
+var NilType = '<?php echo NILTYPE;?>';
+ var PercentageType = '<?php echo PERCENTAGE;?>';
+ var IsEdit = '0';
+ var SelectedMaterialList = {
+    Mat: []
+};
 
 $('#drpSupplier').change(function() {
     
@@ -1393,7 +1576,6 @@ $('#drpSupplier').change(function() {
 
 
 
-
 $('#ReqNo').change(function() {
     
  var id = $('#ReqNo').val();
@@ -1406,12 +1588,13 @@ $("#Quantity").val('');
 $("#ItemName").val('');
 $("#Rate").val('');
 $("#txtBasicValue").val('');
- clearTaxField();
+ //clearTaxField();
         if(id != '0')
         {
             var y = <?php echo json_encode($RequistionDetails, JSON_PRETTY_PRINT) ?>;
-            var cost = <?php echo json_encode($CostList, JSON_PRETTY_PRINT) ?>;
+          
             var Material = <?php echo json_encode($MaterialList, JSON_PRETTY_PRINT) ?>;
+            var AvlBudAmt = '<?php echo $AvlAmount ?>'; 
             //alert(Material);
             
         // For Binding DepartmentName                       
@@ -1419,11 +1602,13 @@ $("#txtBasicValue").val('');
             if(obj.ReqNo === id)
             {
                 $("#deptName").val(obj.DepartmentName);
+                $("#CostCenter").val(obj.CostCenterCode);
                 
             }           
         });
+        $("#AvlBudAmt").val(AvlBudAmt); 
             // For Binding Cost center for the selected department  
-        $("#CostCenter").append( $('<option></option>').val("0").html("Select Cost Center") );
+       /* $("#CostCenter").append( $('<option></option>').val("0").html("Select Cost Center") );
         $.each(cost, function(idx, obj) {
             if(obj.ReqNo === id)
             {
@@ -1431,46 +1616,58 @@ $("#txtBasicValue").val('');
                 
             }
             
-        });
+        });*/
         // For Binding Material list center for the selected Requistion Number  
         $("#MaterialCode").append( $('<option></option>').val("0").html("Select Material Code") );
-        for(i=0;i<Material.length;i++)
+        var isAdded = "0";
+         for(i=0;i<Material.length;i++)
         {
         $.each(Material[i], function(idx, obj) {
+            
                 if(obj.ReqNo === id )
                 {
-                    if(SelectedMaterialCode.length > 0)
-                    {
-                    for (i = 0; i < CollIndex; i++) { 
-                        if( SelectedMaterialCode[i] != obj.MaterialCode)
-                         {
-                         $("#MaterialCode").append( $('<option></option>').val(obj.MaterialCode).html(obj.MaterialCode + "-" + obj.MaterialName) );
+                                    
+                        $.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
-                    {
-                         $("#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();
@@ -1507,53 +1704,38 @@ $("#txtBasicValue").val('');
   
 });
 
+function USRate()
+{ 
 
+    if($('#imBasicPrice').val() != '' && $('#ExchangeRate').val() != '')
+    {
+       var txtbasics=parseFloat($('#imBasicPrice').val());
+       var txtexchangerate=parseFloat($('#ExchangeRate').val());
+       $('#ExchangeRt').val(txtexchangerate);
+       var txtINRvalue=txtbasics*txtexchangerate;
+       $('#INRBasicvalues').val(txtINRvalue)
+       $('#INRBasicvalue').val(txtINRvalue);
+       $('#BasicPriceTax').val(txtINRvalue);
+       //txtINR = Math.ceil(txtINR*10)/10;
+       txtINR = Math.round(txtINRvalue);
+       //alert(txtINR);BasicPriceTax
+       
+      $('#AfterBasicPriceTax').val(txtINR);
+      $('#imBasicPrice').val(txtbasics);
+      $('#ExchangeRt').val(txtexchangerate);
+      $('#EditAfterBasicPriceTax').val(txtINR);
+      $('#EditimBasicPrice').val(txtbasics);
+      $('#EditExchangeRt').val(txtexchangerate);
+      $('#EditINRBasicvalue').val(txtINRvalue);
 
-$('#CostCenter').change(function() {
-    
- var id = $('#CostCenter').val();
- $("#AvlBudAmt").val('');
- var ReqType =$('#POType').val();
-
-
-        if(id != '0')
-        {
-            $('#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'); 
-                $("#AvlBudAmt").val(data);
-
-                
-            }
-            else
-            {
-                $('#content').loader('hide'); 
-                alert("Error"); 
-            }           
-        
-        }
-          });
-        }
-        else
-        {
-            alert('Please select the CostCenter');
-            return false;
-        }
-
-  
-});
-
+     
+    }
+}
 
 
 
 function Ratechange(){
+    //alert();
     if($('#ReqNo').val() == "0")
          {
              alert('Please select the Requisition Number');
@@ -1573,7 +1755,7 @@ function Ratechange(){
             return false;
          }
 
-          ExceedQuantityCheck();
+          //ExceedQuantityCheck();
 
            if($('#Quantity').val() != '' && $('#Rate').val() != '')
      {    
@@ -1585,254 +1767,967 @@ function Ratechange(){
 }
 
 
-
-
-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 USRate()
- {
-
-/*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;
-         }*/
-
-if($('#BasicUSPrice').val() != '' && $('#ExchangeRate').val() != '')
-    {
-       var txtbasics=parseFloat($('#BasicUSPrice').val());
-       var txtexchangerate=parseFloat($('#ExchangeRate').val());
-       var txtINRvalue=txtbasics*txtexchangerate;
-       $('#INRBasicvalues').val(txtINRvalue)
-       $('#INRBasicvalue').val(txtINRvalue);
-       $('#BasicPriceTax').val(txtINRvalue);
-       //txtINR = Math.ceil(txtINR*10)/10;
-       txtINR = Math.round(txtINRvalue);
-       //alert(txtINR);BasicPriceTax
-       
-      $('#AfterBasicPriceTax').val(txtINR);
-      $('#imBasicPrice').val(txtbasics);
-      $('#ExchangeRt').val(txtexchangerate);
-     
-    }
-
-
- }
-
- function Calculateloadingcharge()
+function Calculateloadingcharge()
  {
     //alert();
-    var txtlanding=parseFloat($('#LandingCharge').val());
-    var txtbasicprice=parseFloat($('#AfterBasicPriceTax').val());
+$('#AfterHighseas').val('');
+$('#AfterCustomduty').val('');
+$('#AfterExcisedutyTax').val('');
+$('#AfterExcisedutyEDcess').val('');
+$('#AfterExcisedutySHcess').val('');
+$('#AfterCustomEDcess').val('');
+$('#AfterCustomSHcess').val('');
+$('#AfterAdditionalExciseduty').val('');
+$('#Grossdutypayable').val('');
+$('#AvailableModvat').val('');
+$('#Grossexpenses').val('');
+$('#purchaserate').val('');
+$('#CustomDutyExpenses').val('');
+$('#RMCIncludingCustomers').val('');
+$('#TotalExp').val('');
+
+    var txtlanding=0;
+    var txtbasicprice=0;
+    txtlanding=parseFloat($('#LandingCharge').val());
+    txtbasicprice=parseFloat($('#AfterBasicPriceTax').val());
+    
     //var result=(txtlanding*txtbasicprice/100);
     var result= <?php echo LOADING_CHARGE;?>;
-    $('#AfterLandingCharge').val(Math.round(result));
+
+    $('#AfterLandingCharge').val(parseFloat(Math.round(result)));
+    CalculateHighseassalescharge();
+
     //alert();
  }
 
-function CalculateHighseassalescharge()
+
+ function EditCalculateloadingcharge()
+ {
+    //alert();
+    var txtlanding=0;
+    var txtbasicprice=0;
+
+    
+    txtlanding=parseFloat($('#EditLandingCharge').val());
+    txtbasicprice=parseFloat($('#EditAfterBasicPriceTax').val());
+    //var result=(txtlanding*txtbasicprice/100);
+    var result= <?php echo LOADING_CHARGE;?>;
+    $('#EditAfterLandingCharge').val(parseFloat(Math.round(result)));
+    EditCalculateHighseassalescharge();
+    //alert();
+ }
+
+
+ function CalculateHighseassalescharge()
+ {
+     
+    //alert();
+    var txtbasicprice=0;
+    var txtlandingcharge=0;
+    var totalhighsess=0;
+    var highsesspercentage=0;
+    txtbasicprice=parseFloat($('#AfterBasicPriceTax').val());  
+    txtlandingcharge=parseFloat($('#AfterLandingCharge').val());
+   // alert(txtlandingcharge);
+    totalhighsess=txtbasicprice+txtlandingcharge;
+    highsesspercentage=parseFloat($('#Highseas').val());
+    
+     
+    //var txthighsess=(totalhighsess*highsesspercentage)/100;
+    var txtAfterhighsess=<?php echo HIGHSEAS_SALES;?>;
+    if(isNaN(txtAfterhighsess))
+    {
+        $('#AfterHighseas').val('');
+    }
+    else{
+    $('#AfterHighseas').val(parseFloat(Math.round(txtAfterhighsess)));
+     }
+    
+    CalculateCustomduty();
+ }
+
+function EditCalculateHighseassalescharge()
  {
 
     //alert();
-    var txtbasicprice=parseFloat($('#AfterBasicPriceTax').val());  
-    var txtlandingcharge=parseFloat($('#AfterLandingCharge').val());
-    var totalhighsess=txtbasicprice+txtlandingcharge;
-    var highsesspercentage=parseFloat($('#Highseas').val());
+    var txtbasicprice=0;
+    var txtlandingcharge=0;
+    var totalhighsess=0;
+    var highsesspercentage=0;
+    var txthighsess=0;
+    txtbasicprice=parseFloat($('#EditAfterBasicPriceTax').val());  
+    txtlandingcharge=parseFloat($('#EditAfterLandingCharge').val());
+    totalhighsess=txtbasicprice+txtlandingcharge;
+    highsesspercentage=parseFloat($('#EditHighseas').val());
     //var txthighsess=(totalhighsess*highsesspercentage)/100;
-    var txthighsess=<?php echo HIGHSEAS_SALES;?>;
-    $('#AfterHighseas').val(Math.round(txthighsess));
+    txthighsess=<?php echo HIGHSEAS_SALES;?>;
+    if(isNaN(txthighsess))
+    {
+        $('#EditAfterHighseas').val('');
+    }
+    else{
+    $('#EditAfterHighseas').val(parseFloat(Math.round(txthighsess)));
+    }
+    EditCalculateCustomduty();
  }
 
-function CalculateCustomduty()
+ function CalculateCustomduty()
 {
-   var txtbasic=parseFloat($('#AfterBasicPriceTax').val());
-   var txtcustompercentage=parseFloat($('#Customduty').val());
-   var txthighse=parseFloat($('#AfterHighseas').val());
-   var txtlandingch=parseFloat($('#AfterLandingCharge').val());
-   var sumcustom=txthighse+txtlandingch+txtbasic;
+    var txtbasic=0;
+    var txtcustompercentage=0;
+    var txthighse=0;
+    var txtlandingch=0;
+    var sumcustom=0;
+    var txtcustomduty=0;
+   txtbasic=parseFloat($('#AfterBasicPriceTax').val());
+   txtcustompercentage=parseFloat($('#Customduty').val());
+   txthighse=parseFloat($('#AfterHighseas').val());
+   txtlandingch=parseFloat($('#AfterLandingCharge').val());
+   sumcustom=txthighse+txtlandingch+txtbasic;
    //var txtcustomduty=(txtbasic*txtcustompercentage)/100;
-   var txtcustomduty=<?php echo CUSTOM_DUTY;?>;
-   $('#AfterCustomduty').val(Math.round(txtcustomduty));
+   txtcustomduty=<?php echo CUSTOM_DUTY;?>;
+   if(isNaN(txtcustomduty))
+   {
+     $('#AfterCustomduty').val('');
+   }
+   else{
+   $('#AfterCustomduty').val(parseFloat(Math.round(txtcustomduty)));
+   }
+   CalculateExciseDuty() ;
 
 }
 
+function EditCalculateCustomduty()
+{
+    var txtbasic=0;
+    var txtcustompercentage=0;
+    var txthighse=0;
+    var txtlandingch=0;
+    var sumcustom=0;
+    var txtcustomduty=0;
+   txtbasic=parseFloat($('#EditAfterBasicPriceTax').val());
+   txtcustompercentage=parseFloat($('#EditCustomduty').val());
+   txthighse=parseFloat($('#EditAfterHighseas').val());
+   txtlandingch=parseFloat($('#EditAfterLandingCharge').val());
+   sumcustom=txthighse+txtlandingch+txtbasic;
+   //var txtcustomduty=(txtbasic*txtcustompercentage)/100;
+   txtcustomduty=<?php echo CUSTOM_DUTY;?>;
+   if(isNaN(txtcustomduty))
+   {
+    $('#EditAfterCustomduty').val('');
+   }
+   else{
+   $('#EditAfterCustomduty').val(parseFloat(Math.round(txtcustomduty)));
+   }
+   EditCalculateExciseDuty() ;
+
+}
+
+
 function CalculateExciseDuty()  
 {
 
+    var txtcustomduty=0;
+    var txthighsess=0;
+    var txtaftrlanding=0;
+    var txtbasicc=0;
+    var txtpercentage=0;
+    var txtexcisesum=0;
+    var totalexcise=0;
+    txtcustomduty=parseFloat($('#AfterCustomduty').val());
+    txthighsess=parseFloat($('#AfterHighseas').val());
+    txtaftrlanding=parseFloat($('#AfterLandingCharge').val());
+    txtbasicc=parseFloat($('#AfterBasicPriceTax').val());
 
-    var txtcustomduty=parseFloat($('#AfterCustomduty').val());
-    var txthighsess=parseFloat($('#AfterHighseas').val());
-    var txtaftrlanding=parseFloat($('#AfterLandingCharge').val());
-    var txtbasicc=parseFloat($('#AfterBasicPriceTax').val());
-
-    var txtpercentage=parseFloat($('#ExcisedutyTax').val());
-    var txtexcisesum=txtcustomduty+txthighsess+txtaftrlanding+txtbasicc;
+    txtpercentage=parseFloat($('#ExcisedutyTax').val());
+    txtexcisesum=txtcustomduty+txthighsess+txtaftrlanding+txtbasicc;
     //var Exciseduty=(txtexcisesum*txtpercentage)/100;
-    var totalexcise=<?php echo EXCISE_DUTY;?>;
+    totalexcise=<?php echo EXCISE_DUTY;?>;
+    if(isNaN(totalexcise))
+    {
+        $('#AfterExcisedutyTax').val('');
+    }
     //var totalexcise=txtcustomduty+Exciseduty;
-    $('#AfterExcisedutyTax').val(Math.round(totalexcise));
+    else{
+    $('#AfterExcisedutyTax').val(parseFloat(Math.round(totalexcise)));
+      }
+    CalculateExciseED1();
+}
+
+
+
+function EditCalculateExciseDuty()  
+{  //alert('edit');
+     var txtcustomduty=0;
+     var txthighsess=0;
+     var txtaftrlanding=0;
+     var txtbasicc=0;
+     var txtpercentage=0;
+     var txtexcisesum=0;
+     var totalexcise=0;     
+    txtcustomduty=parseFloat($('#EditAfterCustomduty').val());
+    txthighsess=parseFloat($('#EditAfterHighseas').val());
+    txtaftrlanding=parseFloat($('#EditAfterLandingCharge').val());
+    txtbasicc=parseFloat($('#EditAfterBasicPriceTax').val());
+
+    txtpercentage=parseFloat($('#EditExcisedutyTax').val());
+    txtexcisesum=txtcustomduty+txthighsess+txtaftrlanding+txtbasicc;
+    //var Exciseduty=(txtexcisesum*txtpercentage)/100;
+    totalexcise=<?php echo EXCISE_DUTY;?>;
+    if(isNaN(totalexcise))
+    {
+        $('#EditAfterExcisedutyTax').val('');
+    }
+    else{
+    //var totalexcise=txtcustomduty+Exciseduty;
+    $('#EditAfterExcisedutyTax').val(parseFloat(Math.round(totalexcise)));
+}
+    EditCalculateExciseED1();
 }
 
 
 function CalculateExciseED1()
 {
-  var txtexcise=parseFloat($('#AfterExcisedutyTax').val());
-  var txtexcisepercentage=parseFloat($('#ExcisedutyEDcess').val());
+  var txtexcise=0;    
+  var txtexcisepercentage=0;
+  var txtexcisetot=0;
+  txtexcise=parseFloat($('#AfterExcisedutyTax').val());
+  txtexcisepercentage=parseFloat($('#ExcisedutyEDcess').val());
   //var txtexcisetot=(txtexcise*txtexcisepercentage)/100;
-  var txtexcisetot=<?php echo EXCISE_ED;?>;
-  $('#AfterExcisedutyEDcess').val(Math.round(txtexcisetot));
+  txtexcisetot=<?php echo EXCISE_ED;?>;
+  if(isNaN(txtexcisetot))
+  {
+    $('#AfterExcisedutyEDcess').val('');
+  }
+  else
+  {
+  $('#AfterExcisedutyEDcess').val(parseFloat(Math.round(txtexcisetot)));
+   }
+ 
+  CalculateexciseSHcess();
 
 //AfterExcisedutyEDcess
 }
- function CalculateexciseSHcess()
- {
 
-    var excisetxt=parseFloat($('#AfterExcisedutyTax').val());
-    var exciseshcess=parseFloat($('#ExcisedutySHcess').val());
+function EditCalculateExciseED1()
+{
+    var txtexcise=0;
+    var txtexcisepercentage=0;
+    var txtexcisetot=0; 
+  txtexcise=parseFloat($('#EditAfterExcisedutyTax').val());
+  txtexcisepercentage=parseFloat($('#EditExcisedutyEDcess').val());
+  //var txtexcisetot=(txtexcise*txtexcisepercentage)/100;
+  txtexcisetot=<?php echo EXCISE_ED;?>;
+  if(isNaN(txtexcisetot))
+  {
+   $('#EditAfterExcisedutyEDcess').val('');
+  }
+  else
+  {
+  $('#EditAfterExcisedutyEDcess').val(parseFloat(Math.round(txtexcisetot)));
+  }
+  EditCalculateexciseSHcess();
+
+//AfterExcisedutyEDcess
+}
+
+function CalculateexciseSHcess()
+ {
+    var excisetxt=0;
+    var exciseshcess=0; 
+    var exciseshcesstot=0;
+    excisetxt=parseFloat($('#AfterExcisedutyTax').val());
+    exciseshcess=parseFloat($('#ExcisedutySHcess').val());
     //var exciseshcesstot=(excisetxt*exciseshcess)/100;
-    var exciseshcesstot=<?php echo EXCISE_SH;?>;
-    $('#AfterExcisedutySHcess').val(Math.round(exciseshcesstot));
+    exciseshcesstot=<?php echo EXCISE_SH;?>;
+    if(isNaN(exciseshcesstot))
+    {
+     $('#AfterExcisedutySHcess').val('');
+    }
+    else
+    {
+    $('#AfterExcisedutySHcess').val(parseFloat(Math.round(exciseshcesstot)));
+    //$('#AfterExcisedutySHcess').val('');
+    }
+    CalculateCustomEdcess();
 
  }
 
+ function EditCalculateexciseSHcess()
+ {
+    //alert();
+    var excisetxt=0;
+    var exciseshcess=0;
+    //var exciseshcesstot=(excisetxt*exciseshcess)/100;
+    var exciseshcesstot=0;
+
+    excisetxt=parseFloat($('#EditAfterExcisedutyTax').val());
+    exciseshcess=parseFloat($('#EditExcisedutySHcess').val());
+    //var exciseshcesstot=(excisetxt*exciseshcess)/100;
+    exciseshcesstot=<?php echo EXCISE_SH;?>;
+    if(isNaN(exciseshcesstot))
+    {
+     $('#EditAfterExcisedutySHcess').val('');
+    }
+    else
+    {
+    $('#EditAfterExcisedutySHcess').val(parseFloat(Math.round(exciseshcesstot)));
+    }
+    EditCalculateCustomEdcess();
+
+ }
+
+
  function CalculateCustomEdcess()
  {
-    var txtloading=parseFloat($('#AfterLandingCharge').val());
-    var txthighses=parseFloat($('#AfterHighseas').val());
-    var txtcustomduty1=parseFloat($('#AfterCustomduty').val());
-    var txtexciseduty=parseFloat($('#AfterExcisedutyTax').val());
-    var txtedexciseduty=parseFloat($('#AfterExcisedutyEDcess').val());
-    var txtshexcisesess=parseFloat($('#AfterExcisedutySHcess').val());
-    var totalval=txtloading+txtcustomduty1+txtexciseduty+ txtedexciseduty+txthighses+txtshexcisesess;
-    var txtedcesspercentage=parseFloat($('#CustomEDcess').val());
+
+    var txtloading=0;
+    var txthighses=0;
+    var txtcustomduty1=0;
+    var txtexciseduty=0;
+    var txtedexciseduty=0;
+    var txtshexcisesess=0;
+    var totalval=0;
+    var txtedcesspercentage=0;
     //var txtcustomedsess=(totalval*txtedcesspercentage)/100;
-    var txtcustomedsess=<?php echo CUSTOM_ED;?>;
-    $('#AfterCustomEDcess').val(Math.round(txtcustomedsess));
+    var txtcustomedsess=0;
+
+
+
+
+    txtloading=parseFloat($('#AfterLandingCharge').val());
+    txthighses=parseFloat($('#AfterHighseas').val());
+    txtcustomduty1=parseFloat($('#AfterCustomduty').val());
+    txtexciseduty=parseFloat($('#AfterExcisedutyTax').val());
+    txtedexciseduty=parseFloat($('#AfterExcisedutyEDcess').val());
+    txtshexcisesess=parseFloat($('#AfterExcisedutySHcess').val());
+    totalval=txtloading+txtcustomduty1+txtexciseduty+ txtedexciseduty+txthighses+txtshexcisesess;
+    txtedcesspercentage=parseFloat($('#CustomEDcess').val());
+    //var txtcustomedsess=(totalval*txtedcesspercentage)/100;
+    txtcustomedsess=<?php echo CUSTOM_ED;?>;
+    if(isNaN(txtcustomedsess))
+    {
+
+     $('#AfterCustomEDcess').val('');
+    }
+    else
+    {
+    $('#AfterCustomEDcess').val(parseFloat(Math.round(txtcustomedsess)));
+    }
+    CalculateCustomSHcess();
 
  }
 
+
+
+function EditCalculateCustomEdcess()
+ {
+    var txtloading=0;
+    var txthighses=0;
+    var txtcustomduty1=0;
+    var txtexciseduty=0;
+    var txtedexciseduty=0;
+    var txtshexcisesess=0;
+    var totalval=0;
+    var txtedcesspercentage=0;
+    //var txtcustomedsess=(totalval*txtedcesspercentage)/100;
+    var txtcustomedsess=0;
+
+    txtloading=parseFloat($('#EditAfterLandingCharge').val());
+    txthighses=parseFloat($('#EditAfterHighseas').val());
+    txtcustomduty1=parseFloat($('#EditAfterCustomduty').val());
+    txtexciseduty=parseFloat($('#EditAfterExcisedutyTax').val());
+    txtedexciseduty=parseFloat($('#EditAfterExcisedutyEDcess').val());
+    txtshexcisesess=parseFloat($('#EditAfterExcisedutySHcess').val());
+    totalval=txtloading+txtcustomduty1+txtexciseduty+ txtedexciseduty+txthighses+txtshexcisesess;
+    txtedcesspercentage=parseFloat($('#EditCustomEDcess').val());
+    //var txtcustomedsess=(totalval*txtedcesspercentage)/100;
+    txtcustomedsess=<?php echo CUSTOM_ED;?>;
+    if(isNaN(txtcustomedsess))
+    {
+     $('#EditAfterCustomEDcess').val('');
+    }
+    else
+    {
+    $('#EditAfterCustomEDcess').val(parseFloat(Math.round(txtcustomedsess)));
+    }
+    EditCalculateCustomSHcess();
+
+ }
+
+
  function CalculateCustomSHcess()
  {//alert();
-  var landingch=parseFloat($('#AfterLandingCharge').val());
-  var highsesssalles=parseFloat($('#AfterHighseas').val());
-  var customch=parseFloat($('#AfterCustomduty').val());
-  var excisech=parseFloat($('#AfterExcisedutyTax').val());
-  var exciseedch=parseFloat($('#AfterExcisedutyEDcess').val());
-  var exciseshch=parseFloat($('#AfterExcisedutySHcess').val());
-  var totcustomsh=landingch+highsesssalles+customch+excisech+exciseedch+exciseshch;
 
-  var txtshpercentage=parseFloat($('#CustomSHcess').val());
+  var landingch=0;
+  var highsesssalles=0;
+  var customch=0;
+  var excisech=0;
+  var exciseedch=0;
+  var exciseshch=0;
+  var totcustomsh=0;
+
+  var txtshpercentage=0;
+  //var totresult=(totcustomsh*txtshpercentage)/100;
+  var totresult=0;
+
+
+
+  landingch=parseFloat($('#AfterLandingCharge').val());
+  highsesssalles=parseFloat($('#AfterHighseas').val());
+  customch=parseFloat($('#AfterCustomduty').val());
+  excisech=parseFloat($('#AfterExcisedutyTax').val());
+  exciseedch=parseFloat($('#AfterExcisedutyEDcess').val());
+  exciseshch=parseFloat($('#AfterExcisedutySHcess').val());
+  totcustomsh=landingch+highsesssalles+customch+excisech+exciseedch+exciseshch;
+
+  txtshpercentage=parseFloat($('#CustomSHcess').val());
+  //var totresult=(totcustomsh*txtshpercentage)/100;
+  totresult=<?php echo CUSTOM_SH;?>;
+  if(isNaN(totresult))
+  {
+     $('#AfterCustomSHcess').val('');
+  }
+  else
+  {
+  $('#AfterCustomSHcess').val(parseFloat(Math.round(totresult)));
+  }
+  CalculateaddlExciseDuty();
+
+ }
+
+
+ function EditCalculateCustomSHcess()
+ {//alert();
+
+  var landingch=0;
+  var highsesssalles=0;
+  var customch=0;
+  var excisech=0;
+  var exciseedch=0;
+  var exciseshch=0;
+  var totcustomsh=0;
+
+  var txtshpercentage=0;
+  //var totresult=(totcustomsh*txtshpercentage)/100;
+  var totresult=0;
+
+  landingch=parseFloat($('#EditAfterLandingCharge').val());
+  highsesssalles=parseFloat($('#EditAfterHighseas').val());
+  customch=parseFloat($('#EditAfterCustomduty').val());
+  excisech=parseFloat($('#EditAfterExcisedutyTax').val());
+  exciseedch=parseFloat($('#EditAfterExcisedutyEDcess').val());
+  exciseshch=parseFloat($('#EditAfterExcisedutySHcess').val());
+  totcustomsh=landingch+highsesssalles+customch+excisech+exciseedch+exciseshch;
+
+  txtshpercentage=parseFloat($('#EditCustomSHcess').val());
   //var totresult=(totcustomsh*txtshpercentage)/100;
   var totresult=<?php echo CUSTOM_SH;?>;
-  $('#AfterCustomSHcess').val(Math.round(totresult));
+  if(isNaN(totresult))
+  {
+    $('#EditAfterCustomSHcess').val('');
+  }
+  else
+  {
+  $('#EditAfterCustomSHcess').val(parseFloat(Math.round(totresult)));
+  }
+  EditCalculateaddlExciseDuty();
 
  }
   
 function CalculateaddlExciseDuty()
 {
-  var basic=parseFloat($('#AfterBasicPriceTax').val());
-  var landingcha=parseFloat($('#AfterLandingCharge').val());
-  var highsesssalless=parseFloat($('#AfterHighseas').val());
-  var customcha=parseFloat($('#AfterCustomduty').val());
-  var excisecha=parseFloat($('#AfterExcisedutyTax').val());
-  var exciseedcha=parseFloat($('#AfterExcisedutyEDcess').val());
-  var exciseshcha=parseFloat($('#AfterExcisedutySHcess').val());
-  var customed=parseFloat($('#AfterCustomEDcess').val());
-  var customsh=parseFloat($('#AfterCustomSHcess').val());
-  var totaddtnlexcise=basic+landingcha+highsesssalless+customcha+excisecha+exciseedcha+exciseshcha+customed+customsh;
-  var addtnpercentage=parseFloat($('#AdditionalExciseduty').val());
- // var txtaddtnexciseduty=(totaddtnlexcise*addtnpercentage)/100;
- var txtaddtnexciseduty=<?php echo ADDTNL_EXCISEDUTY;?>;
-  $('#AfterAdditionalExciseduty').val(Math.round(txtaddtnexciseduty));
 
+  var basic=0;
+  var landingcha=0;
+  var highsesssalless=0;
+  var customcha=0;
+  var excisecha=0;
+  var exciseedcha=0;
+  var exciseshcha=0;
+  var customed=0;
+  var customsh=0;
+  var totaddtnlexcise=0;
+  var addtnpercentage=0;
+ // var txtaddtnexciseduty=(totaddtnlexcise*addtnpercentage)/100;
+ var txtaddtnexciseduty=0;
+ var txtgrossduty=0;
+
+  basic=parseFloat($('#AfterBasicPriceTax').val());
+  landingcha=parseFloat($('#AfterLandingCharge').val());
+  highsesssalless=parseFloat($('#AfterHighseas').val());
+  customcha=parseFloat($('#AfterCustomduty').val());
+  excisecha=parseFloat($('#AfterExcisedutyTax').val());
+  exciseedcha=parseFloat($('#AfterExcisedutyEDcess').val());
+  exciseshcha=parseFloat($('#AfterExcisedutySHcess').val());
+  customed=parseFloat($('#AfterCustomEDcess').val());
+  customsh=parseFloat($('#AfterCustomSHcess').val());
+  totaddtnlexcise=basic+landingcha+highsesssalless+customcha+excisecha+exciseedcha+exciseshcha+customed+customsh;
+  addtnpercentage=parseFloat($('#AdditionalExciseduty').val());
+ // var txtaddtnexciseduty=(totaddtnlexcise*addtnpercentage)/100;
+ txtaddtnexciseduty=<?php echo ADDTNL_EXCISEDUTY;?>;
+ if(isNaN(txtaddtnexciseduty))
+ {
+      $('#AfterAdditionalExciseduty').val('');
+ }
+ else
+ {
+  $('#AfterAdditionalExciseduty').val(parseFloat(Math.round(txtaddtnexciseduty)));
+  }
   //var txtgrossduty=landingcha+highsesssalless+customcha+excisecha+exciseedcha+exciseshcha+customed+customsh+txtaddtnexciseduty;
 
-  var txtgrossduty=<?php echo GROSS_DUTY;?>;
-  $('#Grossdutypayable').val(Math.round(txtgrossduty));
+  txtgrossduty=<?php echo GROSS_DUTY;?>;
+  if(isNaN(txtgrossduty))
+  {
+    $('#Grossdutypayable').val('');
+  }
+  else{
+  $('#Grossdutypayable').val(parseFloat(Math.round(txtgrossduty)));
+  }
+  CalculateAvlModvat();
+
+}
+
+
+function EditCalculateaddlExciseDuty()
+{
+  
+  var basic=0;
+  var landingcha=0;
+  var highsesssalless=0;
+  var customcha=0;
+  var excisecha=0;
+  var exciseedcha=0;
+  var exciseshcha=0;
+  var customed=0;
+  var customsh=0;
+  var totaddtnlexcise=0;
+  var addtnpercentage=0;
+ // var txtaddtnexciseduty=(totaddtnlexcise*addtnpercentage)/100;
+ var txtaddtnexciseduty=0;
+ var txtgrossduty=0;
+
+
+  basic=parseFloat($('#EditAfterBasicPriceTax').val());
+  landingcha=parseFloat($('#EditAfterLandingCharge').val());
+  highsesssalless=parseFloat($('#EditAfterHighseas').val());
+  customcha=parseFloat($('#EditAfterCustomduty').val());
+  excisecha=parseFloat($('#EditAfterExcisedutyTax').val());
+  exciseedcha=parseFloat($('#EditAfterExcisedutyEDcess').val());
+  exciseshcha=parseFloat($('#EditAfterExcisedutySHcess').val());
+  customed=parseFloat($('#EditAfterCustomEDcess').val());
+  customsh=parseFloat($('#EditAfterCustomSHcess').val());
+  totaddtnlexcise=basic+landingcha+highsesssalless+customcha+excisecha+exciseedcha+exciseshcha+customed+customsh;
+  addtnpercentage=parseFloat($('#EditAdditionalExciseduty').val());
+ // var txtaddtnexciseduty=(totaddtnlexcise*addtnpercentage)/100;
+ txtaddtnexciseduty=<?php echo ADDTNL_EXCISEDUTY;?>;
+ if(isNaN(txtaddtnexciseduty))
+ {
+    $('#EditAfterAdditionalExciseduty').val('');
+ }
+ else
+ {
+  $('#EditAfterAdditionalExciseduty').val(Math.round(txtaddtnexciseduty));
+ }
+  //var txtgrossduty=landingcha+highsesssalless+customcha+excisecha+exciseedcha+exciseshcha+customed+customsh+txtaddtnexciseduty;
+
+  txtgrossduty=<?php echo GROSS_DUTY;?>;
+  if(isNaN(txtgrossduty))
+  {
+    $('#EditGrossdutypayable').val('');
+  }
+  else
+  {
+  $('#EditGrossdutypayable').val(parseFloat(Math.round(txtgrossduty)));
+  }
+  EditCalculateAvlModvat();
 
 }
 
 function CalculateAvlModvat()
 {
 
-  var txtexciseduty1=parseFloat($('#AfterExcisedutyTax').val());
-  var txtexciseedcess=parseFloat($('#AfterExcisedutyEDcess').val());
-  var txtexciseshcess=parseFloat($('#AfterExcisedutySHcess').val());
-  var txtaddtnlexcise=parseFloat($('#AfterAdditionalExciseduty').val());
+  var txtexciseduty1=0;
+  var txtexciseedcess=0;
+  var txtexciseshcess=0;
+  var txtaddtnlexcise=0;
   //var totavlmodvat=txtexciseduty1+txtexciseedcess+txtexciseshcess+txtaddtnlexcise;
-  var totavlmodvat=<?php echo AVL_MODVAT;?>;
-  $('#AvailableModvat').val(Math.round(totavlmodvat));
+  var totavlmodvat=0;
 
+  txtexciseduty1=parseFloat($('#AfterExcisedutyTax').val());
+  txtexciseedcess=parseFloat($('#AfterExcisedutyEDcess').val());
+  txtexciseshcess=parseFloat($('#AfterExcisedutySHcess').val());
+  txtaddtnlexcise=parseFloat($('#AfterAdditionalExciseduty').val());
+  //var totavlmodvat=txtexciseduty1+txtexciseedcess+txtexciseshcess+txtaddtnlexcise;
+  totavlmodvat=<?php echo AVL_MODVAT;?>;
+  if(isNaN(totavlmodvat))
+  {
+    $('#AvailableModvat').val('');
+  }
+  else
+  {
+  $('#AvailableModvat').val(parseFloat(Math.round(totavlmodvat)));
+  }
+  CalculateGrossExpense();
+
+}
+
+
+function EditCalculateAvlModvat()
+{
+
+  
+  var txtexciseduty1=0;
+  var txtexciseedcess=0;
+  var txtexciseshcess=0;
+  var txtaddtnlexcise=0;
+  //var totavlmodvat=txtexciseduty1+txtexciseedcess+txtexciseshcess+txtaddtnlexcise;
+  var totavlmodvat=0;
+
+
+  txtexciseduty1=parseFloat($('#EditAfterExcisedutyTax').val());
+  txtexciseedcess=parseFloat($('#EditAfterExcisedutyEDcess').val());
+  txtexciseshcess=parseFloat($('#EditAfterExcisedutySHcess').val());
+  txtaddtnlexcise=parseFloat($('#EditAfterAdditionalExciseduty').val());
+  //var totavlmodvat=txtexciseduty1+txtexciseedcess+txtexciseshcess+txtaddtnlexcise;
+  totavlmodvat=<?php echo AVL_MODVAT;?>;
+  if(isNaN(totavlmodvat))
+  {
+    $('#EditAvailableModvat').val('');
+  }
+  else
+  {
+  $('#EditAvailableModvat').val(parseFloat(Math.round(totavlmodvat)));
+   }
+  EditCalculateGrossExpense();
 }
  
 
 function CalculateGrossExpense()
 {
 
-    var txtgrossdutypayable=parseFloat($('#Grossdutypayable').val());
-    var txtmodvat=parseFloat($('#AvailableModvat').val());
+    var txtgrossdutypayable=0;
+    var txtmodvat=0;
     //var grossexp=(txtgrossdutypayable-txtmodvat);
-    var grossexp=<?php echo GROSS_EXP;?>;
-    $('#Grossexpenses').val(Math.round(grossexp));
+    var grossexp=0;
+
+
+    txtgrossdutypayable=parseFloat($('#Grossdutypayable').val());
+    txtmodvat=parseFloat($('#AvailableModvat').val());
+    //var grossexp=(txtgrossdutypayable-txtmodvat);
+    grossexp=<?php echo GROSS_EXP;?>;
+    if(isNaN(grossexp))
+    {
+        $('#Grossexpenses').val('');
+    }
+    else
+    {
+    $('#Grossexpenses').val(parseFloat(Math.round(grossexp)));
+    }
+    CalculateCtable();
+
+}
+
+
+function EditCalculateGrossExpense()
+{
+
+
+    var txtgrossdutypayable=0;
+    var txtmodvat=0;
+    //var grossexp=(txtgrossdutypayable-txtmodvat);
+    var grossexp=0;
+
+
+    txtgrossdutypayable=parseFloat($('#EditGrossdutypayable').val());
+    txtmodvat=parseFloat($('#EditAvailableModvat').val());
+    //var grossexp=(txtgrossdutypayable-txtmodvat);
+    grossexp=<?php echo GROSS_EXP;?>;
+    if(isNaN(grossexp))
+    {
+        $('#EditGrossexpenses').val('');
+    }
+    else
+    {
+    $('#EditGrossexpenses').val(parseFloat(Math.round(grossexp)));
+    }
+    EditCalculateCtable()
 
 }
 
 function CalculateCtable()
 {
     //alert();
-    purchaserate 
+    //purchaserate 
+
+    var txtCtablequantity=0;
+    var txtbasicinrprice=0;
+    var txtpurchaserate=0;
+    var txtgrossexp=0;
+    var txtcustomdutyexp=0;
+    var txtrmc=0;
+    var total=0;
+    var basicamt=0;
+    basicamt=parseFloat($('#txtBasicValue').val());
+
     txtCtablequantity=parseFloat($('#PurQuantity').val());
     txtbasicinrprice=parseFloat($('#AfterBasicPriceTax').val());
     //txtpurchaserate=txtbasicinrprice/txtCtablequantity;
     txtpurchaserate=<?php echo PURCHASE_RATE;?>;
+    if(isNaN(txtpurchaserate))
+    {
+        $('#purchaserate').val('');
+    }
+    else
+    {
     $('#purchaserate').val(txtpurchaserate);
+    }
     //CustomDutyExpenses
     //RMCIncludingCustomers
     txtgrossexp=parseFloat($('#Grossexpenses').val());
     //txtcustomdutyexp=txtgrossexp/txtCtablequantity;
     txtcustomdutyexp=<?php echo CUSTOMDUTY_EXP;?>;
-    $('#CustomDutyExpenses').val(txtcustomdutyexp);
+    if(isNaN(txtcustomdutyexp))
+    {
+        $('#CustomDutyExpenses').val('');
+    }
+    else
+    {
+    $('#CustomDutyExpenses').val(Math.round(txtcustomdutyexp));
+    }
     //txtrmc=txtpurchaserate+txtcustomdutyexp;
     txtrmc=<?php echo RMC_CAL;?>;
-    $('#RMCIncludingCustomers').val(txtrmc);
+    if(isNaN(txtrmc))
+    {
+        $('#RMCIncludingCustomers').val('');
+    }
+    else
+    {
+    $('#RMCIncludingCustomers').val(Math.round(txtrmc));
+    }
+    total=<?php echo CALCULATE_TOTAL;?>;
+    if(isNaN(total))
+    {
+     $('#TotalExp').val('');
+    }
+    else
+    {
+    $('#TotalExp').val(Math.round(total));
+    }
+
+//$('#AfterHighseas').val('');
+//$('#AfterCustomduty').val('');
+///$('#AfterExcisedutyTax').val('');
+//$('#AfterExcisedutyEDcess').val('');
+//$('#AfterExcisedutySHcess').val('');
+//$('#AfterCustomEDcess').val('');
+//$('#AfterCustomSHcess').val('');
+//$('#AfterAdditionalExciseduty').val('');
+//$('#Grossdutypayable').val('');
+//$('#AvailableModvat').val('');
+//$('#Grossexpenses').val('');
+//$('#purchaserate').val('');
+//$('#CustomDutyExpenses').val('');
+//$('#RMCIncludingCustomers').val('');
+//$('#TotalExp').val('');
 
 }
+
+
+function EditCalculateCtable()
+{
+    //alert();
+    //purchaserate 
+    var txtCtablequantity=0;
+    var txtbasicinrprice=0;
+    var txtpurchaserate=0;
+    var txtgrossexp=0;
+    var txtcustomdutyexp=0;
+    var txtrmc=0;
+    var total=0;
+    var basicamt=0;
+    basicamt=parseFloat($('#EdittxtBasicValue').val());
+    txtCtablequantity=parseFloat($('#EditPurQuantity').val());
+    txtbasicinrprice=parseFloat($('#EditAfterBasicPriceTax').val());
+    //txtpurchaserate=txtbasicinrprice/txtCtablequantity;
+    txtpurchaserate=<?php echo PURCHASE_RATE;?>;
+    $('#Editpurchaserate').val(txtpurchaserate);
+    //CustomDutyExpenses
+    //RMCIncludingCustomers
+    txtgrossexp=parseFloat($('#EditGrossexpenses').val());
+    //txtcustomdutyexp=txtgrossexp/txtCtablequantity;
+    txtcustomdutyexp=<?php echo CUSTOMDUTY_EXP;?>;
+    $('#EditCustomDutyExpenses').val(txtcustomdutyexp);
+    //txtrmc=txtpurchaserate+txtcustomdutyexp;
+    txtrmc=<?php echo RMC_CAL;?>;
+    $('#EditRMCIncludingCustomers').val(txtrmc);
+    total=<?php echo CALCULATE_TOTAL;?>;
+    $('#EditTotalExp').val(total);
+
+}
+
+
+
+$('.AddImport').click(function()
+{
  
+   //alert('out');
+   if(validateImport())
+   {
+   //alert('in');
+   
+   var temp = index;
+   //alert('in');
+   var Reqnumber = $('#ReqNo').val();
+   //alert(JSON.strigify(Reqnumber));
+   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 = $("#Rate").val();
+   var BasicAmt=parseFloat($("#txtBasicValue").val());
+   var taxamt=parseFloat($("#RMCIncludingCustomers").val());
+   var totalexp=parseFloat($("#TotalExp").val());
+   var Exchangerate=parseFloat($("#ExchangeRt").val());
+   var Basicpriceinus=parseFloat($("#imBasicPrice").val());
+
+   //alert(JSON.strigify(totalexp));
+
+
+  // index = parseInt(index)+1;   
+ // alert('in');
+   //var template = jQuery("#ImportList").html();
+   //$('#ImportAppend').append(_.template(template,{index:temp,ReqNo:Reqnumber,ItemName:materialName,Quantity:quantity,UOM:uom,Rate:itemRate,BasicAmount:BasicAmt,Taxvalue:taxamt,TotalValue:totalexp}));
+
+    
+
+  //var template = jQuery("#ImportList").html();
+  //from design id
+   
+    var BasicPrice=$("#BasicPriceTax").val();
+    var AfterBasicPrice=parseFloat($("#AfterBasicPriceTax").val());
+    var LandingChargee=$("#LandingCharge").val();
+    var AfterLandingChargee=$("#AfterLandingCharge").val();
+    var Highseass=$("#Highseas").val();
+    var AfterHighseass=$("#AfterHighseas").val();
+    //var AfterHighseass=($"#AfterHighseas").val();
+    var CustomDutyy=$("#Customduty").val();
+    var AfterCustomDutyy=$("#AfterCustomduty").val();
+    
+    var ExciseDutyy=$("#ExcisedutyTax").val();
+    var AfterExciseDutyy=$("#AfterExcisedutyTax").val();
+    var ExciseDutyEd=$("#ExcisedutyEDcess").val();
+    var AfterExciseDutyEd=$("#AfterExcisedutyEDcess").val();
+    var ExciseDutySH=$("#ExcisedutySHcess").val();
+    var AfterExciseDutySH=$("#AfterExcisedutySHcess").val();
+    var CustomED=$("#CustomEDcess").val();
+    var AfterCustomED=$("#AfterCustomEDcess").val();
+    var CustomSH=$("#CustomSHcess").val();
+    var AfterCustomSH=$("#AfterCustomSHcess").val();
+    var AdditnlExcise=$("#AdditionalExciseduty").val();
+    var AfterAdditnlExcise=$("#AfterAdditionalExciseduty").val();
+    var GrossDuty=$("#Grossdutypayable").val();
+    var Avlmodvat=$("#AvailableModvat").val();
+    var Grossexpenseduetocustom=$("#Grossexpenses").val();
+    var PurchaseQuantity=$("#PurQuantity").val();
+    var purate=$("#purchaserate").val();
+    var CustomDutyExpense=$("#CustomDutyExpenses").val();
+    var RMCIncluderate=$("#RMCIncludingCustomers").val();
+    $('#MaterialCode option[value='+materialCode+']').remove();
+    
+    
+      $('#MaterialCode option[value='+materialCode+']').remove();
+       SelectedMaterialCode[CollIndex] = materialCode;
+            CollIndex = CollIndex + 1;
+
+            SelectedMaterialList.Mat.push({ 
+        "materialCode" :  materialCode,
+        "ReqNo"  : Reqnumber,
+      
+        }); 
+
+
+
+            populateValueMainFormForImportTax();
+
+            index = parseInt(index)+1;   
+  //alert('in');
+   var template = jQuery("#ImportList").html();
+   $('#ImportAppend').append(_.template(template,{index:temp,ReqNo:Reqnumber,ItemName:materialName,Quantity:quantity,UOM:uom,Rate:itemRate,BasicAmount:BasicAmt,Taxvalue:taxamt,TotalValue:totalexp}));
+   //alert(JSON.strigify(BasicAmt));
+
+    
+ //$('#ImportAppend').append(_.template(template,{index:temp,ReqNo:Reqnumber,ItemName:materialName,Quantity:quantity,UOM:uom,Rate:itemRate,BasicAmount:BasicAmt,Taxvalue:taxamt,TotalValue:totalexp}));
+          //clearTaxField();
+
+          //from above defined variables
+
+         var theForm = $(".ImportPO");
+          
+          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,"BasicAmt"+temp,BasicAmt);
+          addHidden(theForm,"taxamt"+temp,taxamt); 
+          addHidden(theForm,"Exchangerate"+temp,Exchangerate);
+          addHidden(theForm,"BasicPriceTax"+temp,BasicPriceTax);
+          addHidden(theForm,"BasicPriceinUS"+temp,Basicpriceinus);
+          addHidden(theForm,"AfterBasicPriceTax"+temp,AfterBasicPrice);
+          addHidden(theForm,"LandingChargee"+temp,LandingChargee);
+          addHidden(theForm,"AfterLandingChargee"+temp,AfterLandingChargee);
+          addHidden(theForm,"Highseass"+temp,Highseass);
+          addHidden(theForm,"AfterHighseass"+temp,AfterHighseass);
+          addHidden(theForm,"Customduty"+temp,CustomDutyy);
+          addHidden(theForm,"AfterCustomduty"+temp,AfterCustomDutyy);
+          addHidden(theForm,"ExcisedutyTax"+temp,ExciseDutyy);
+          addHidden(theForm,"AfterExcisedutyTax"+temp,AfterExciseDutyy);
+          addHidden(theForm,"ExcisedutyED"+temp,ExciseDutyEd);
+          addHidden(theForm,"AfterExcisedutyED"+temp,AfterExciseDutyEd);
+          addHidden(theForm,"ExcisedutySH"+temp,ExciseDutySH);
+          addHidden(theForm,"AfterExcisedutySH"+temp,AfterExciseDutySH);
+          addHidden(theForm,"CustomEDcess"+temp,CustomED);
+          addHidden(theForm,"AfterCustomEDcess"+temp,AfterCustomED);
+          addHidden(theForm,"CustomSHcess"+temp,CustomSH);
+          addHidden(theForm,"AfterCustomSHcess"+temp,AfterCustomSH);
+          addHidden(theForm,"AdditionalExciseduty"+temp,AdditnlExcise);
+          addHidden(theForm,"AfterAdditionalExciseduty"+temp,AfterAdditnlExcise);
+          addHidden(theForm,"Grossdutypayable"+temp,GrossDuty);
+          addHidden(theForm,"Grossexpenses"+temp,Grossexpenseduetocustom);
+          addHidden(theForm,"PurQuantity"+temp,PurchaseQuantity);
+          addHidden(theForm,"purchaserate"+temp,purate);
+          addHidden(theForm,"CustomDutyExpenses"+temp,CustomDutyExpense);
+          addHidden(theForm,"RMCIncludingCustomers"+temp,RMCIncluderate);
+          addHidden(theForm,"AvilableModvat"+temp,Avlmodvat);
+          addHidden(theForm,"TotalExp"+temp,totalexp);
+
+     
+         
+       
+         // addHidden(theForm,"AfterBasicPriceTax"+temp,AfterBasicPriceTax);
+          //addHidden(theForm,"AfterBasicPriceTax"+temp,AfterBasicPriceTax);
+           $('#txtRowCount').val(temp);
+           clearTaxField();
+
+ 
+ }
+    
+   
+});
+
+
 
 function validateImport()
 {
-
+ //alert();
     if($('#ReqNo').val() == "0")
     {
         alert('Please select the Requisition Number');
@@ -1863,89 +2758,81 @@ function validateImport()
         $('#Rate').focus();
         return false;
     }
-    else if(ExceedQuantityCheck() ==  false)
-    {  
+    else if($('#imBasicPrice').val()=='')
+    {
+        alert('Please Enter Basic Price In Us');
+        $('#imBasicPrice').focus();
         return false;
     }
+   /* else if(ExceedQuantityCheck() ==  false)
+    {  
+        return false;
+    }*/
     else 
         return true;
 }
 
 
-$('.AddImport').click(function()
+
+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 populateValueMainFormForImportTax()
 {
- 
-   alert('out');
-   if(validateImport())
-   {
-   //alert('in');
-   
-   var temp = index;
-   //alert('in');
-   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 = $("#Rate").val();
-   var BasicAmt=parseFloat($("#txtBasicValue").val());
-   var taxamt=parseFloat($("#RMCIncludingCustomers").val());
-   var totalexp=Math.round((BasicAmt+taxamt));
-   
+
+//$('#txtToatlOrder').val(parseFloat(TotalOrderValue)).toFixed(2);
+
+var AfterLandingCharge= $('#AfterLandingCharge').val() == '' ? '0.00' : $('#AfterLandingCharge').val();
+var AfterHighseas=$('#AfterHighseas').val()==''?'0.00':$('#AfterHighseas').val();
+var AfterCustomduty=$('#AfterCustomduty').val()==''?'0.00':$('#AfterCustomduty').val();
+var AfterExcisedutyTax=$('#AfterExcisedutyTax').val()==''?'0.00':$('#AfterExcisedutyTax').val();
+var AfterExcisedutyEDcess=$('#AfterExcisedutyEDcess').val()==''?'0.00':$('#AfterExcisedutyEDcess').val();
+var AfterExciseDutySH=$("#AfterExcisedutySHcess").val()==''?'0.00':$('#AfterExcisedutySHcess').val();
+var AfterCustomEDcess=$('#AfterCustomEDcess').val()==''?'0.00':$('#AfterCustomEDcess').val();
+var AfterCustomSHcess=$('#AfterCustomSHcess').val()==''?'0.00':$('#AfterCustomSHcess').val();
+var AfterAdditionalExciseduty=$('#AfterAdditionalExciseduty').val()==''?'0.00':$('#AfterAdditionalExciseduty').val();
+var Grossdutypayable=$('#Grossdutypayable').val()==''?'0.00':$('#Grossdutypayable').val();
+var AvailableModvat=$('#AvailableModvat').val()==''?'0.00':$('#AvailableModvat').val();
+var Grossexpenses=$('#Grossexpenses').val()==''?'0.00':$('#Grossexpenses').val();
+var totalexp=$('#TotalExp').val()==''?'0.00':$('#TotalExp').val();
+var TotalLanding=$('#txttotallanding').val()==''?'0.00':$('#txttotallanding').val();
+var TotalHighseas=$('#txttotalhighseas').val()==''?'0.00':$('#txttotalhighseas').val();
+var TotalCustom=$('#txttotalcustom').val()==''?'0.00':$('#txttotalcustom').val();
+var TotalExcise=$('#txttotalexcise').val()==''?'0.00':$('#txttotalexcise').val();
+var TotalExciseED=$('#txttotalexciseED').val()==''?'0.00':$('#txttotalexciseED').val();
+var TotalExciseSH=$('#txttotalexciseSH').val()==''?'0.00':$('#txttotalexciseSH').val();
+var TotalCustomED=$('#txttotalcustomED').val()==''?'0.00':$('#txttotalcustomED').val();
+var TotalCustomSH=$('#txttotalcustomSH').val()==''?'0.00':$('#txttotalcustomSH').val();
+var TotalAdditionalExcise=$('#txttotalAdditionalExciseduty').val()==''?'0.00':$('#txttotalAdditionalExciseduty').val();
+var TotalGrossDuty=$('#txttotalgrossduty').val()==''?'0.00':$('#txttotalgrossduty').val();
+var TotalAvlmodvat=$('#txttotalavlmodvat').val()==''?'0.00':$('#txttotalavlmodvat').val();
+var TotalGrossExpense=$('#txttotalgrossexpense').val()==''?'0.00':$('#txttotalgrossexpense').val();
+var TotalOrder=$('#txtToatlOrder').val()==''?'0.00':$('txtToatlOrder').val();
+$('#txttotallanding').val((parseFloat(AfterLandingCharge) + parseFloat(TotalLanding)).toFixed(2) );
+$('#txttotalhighseas').val((parseFloat(TotalHighseas) + parseFloat(AfterHighseas)).toFixed(2) );
+$('#txttotalcustom').val((parseFloat(TotalCustom) + parseFloat(AfterCustomduty)).toFixed(2) );
+$('#txttotalexcise').val((parseFloat(TotalExcise) + parseFloat(AfterExcisedutyTax)).toFixed(2) );
+$('#txttotalexciseED').val((parseFloat(TotalExciseED) + parseFloat(AfterExcisedutyEDcess)).toFixed(2) );
+$('#txttotalexciseSH').val((parseFloat(TotalExciseSH) + parseFloat(AfterExciseDutySH)).toFixed(2) );
+$('#txttotalcustomED').val((parseFloat(TotalCustomED) + parseFloat(AfterCustomEDcess)).toFixed(2) );
+$('#txttotalcustomSH').val((parseFloat(TotalCustomSH) + parseFloat(AfterCustomSHcess)).toFixed(2) );
+$('#txttotalAdditionalExciseduty').val((parseFloat(TotalAdditionalExcise) + parseFloat(AfterAdditionalExciseduty)).toFixed(2) );
+$('#txttotalgrossduty').val((parseFloat(TotalGrossDuty) + parseFloat(Grossdutypayable)).toFixed(2) );
+$('#txttotalavlmodvat').val((parseFloat(TotalAvlmodvat) + parseFloat(AvailableModvat)).toFixed(2) );
+$('#txttotalgrossexpense').val((parseFloat(TotalGrossExpense) + parseFloat(Grossexpenses)).toFixed(2) );
+$('#txtToatlOrder').val((parseFloat(TotalOrder) + parseFloat(totalexp)).toFixed(2) );
 
 
-   index = parseInt(index)+1;   
-  alert('in');
-  var template = jQuery("#ImportList").html();
-   
-    var BasicPrice=$("#BasicPriceTax").val();
-    var AfterBasicPrice=$("#AfterBasicPriceTax").val();
-    var LandingChargee=$("#LandingCharge").val();
-    var AfterLandingChargee=$("#AfterLandingChargee").val();
-    var Highseass=$("#Highseas").val();
-    var CustomDutyy=$("#Customduty").val();
-    var AfterCustomDutyy=$("#AfterCustomduty").val();
-    var ExciseDutyy=$("#ExcisedutyTax").val();
-    var AfterExciseDutyy=$("#AfterExcisedutyTax").val();
-    var ExciseDutyEd=$("#ExcisedutyEDcess").val();
-    var AfterExciseDutyEd=$("#AfterExcisedutyEDcess").val();
-    var ExciseDutySH=$("#ExcisedutySHcess").val();
-    var AfterExciseDutySH=$("#AfterExcisedutySHcess").val();
-    var CustomEd=$("#CustomEDcess").val();
-    var AfterCustomED=$("#AfterCustomEDcess").val();
-    var CustomSH=$("#CustomSHcess").val();
-    var AfterCustomSH=$("#AfterCustomSHcess").val();
-    var AdditnlExcise=$("#AdditionalExciseduty").val();
-    var BasicPrice=$("#BasicPriceTax").val();
-    var BasicPrice=$("#BasicPriceTax").val();
-    var BasicPrice=$("#BasicPriceTax").val();
-    var BasicPrice=$("#BasicPriceTax").val();
-    var BasicPrice=$("#BasicPriceTax").val();
-    var BasicPrice=$("#BasicPriceTax").val();
-    var BasicPrice=$("#BasicPriceTax").val();
-    var BasicPrice=$("#BasicPriceTax").val();
-    var BasicPrice=$("#BasicPriceTax").val();
-    var BasicPrice=$("#BasicPriceTax").val();
-    var BasicPrice=$("#BasicPriceTax").val();
-    var BasicPrice=$("#BasicPriceTax").val();
-    var BasicPrice=$("#BasicPriceTax").val();
-    var BasicPrice=$("#BasicPriceTax").val();
-    
-   
-
-   $('#ImportAppend').append(_.template(template,{index:temp,ReqNo:Reqnumber,ItemName:materialName,Quantity:quantity,UOM:uom,Rate:itemRate,BasicAmount:BasicAmt,Taxvalue:taxamt,TotalValue:totalexp}));
-          //clearTaxField();
-     
-    
-   }
-    
-   
-});
-
 
+}
 
 
 function clearTaxField()
@@ -1967,6 +2854,7 @@ function clearTaxField()
     $('#CustomEDcess').val('');
     $('#AfterCustomSHcess').val('')
     $('#CustomSHcess').val('');
+    $('#AfterCustomSHcess').val('');
     $('#AfterAdditionalExciseduty').val('');
     $('#AdditionalExciseduty').val('');
     $('#Grossdutypayable').val('');
@@ -1982,14 +2870,509 @@ function clearTaxField()
 $("#editimportpomodel").on("shown.bs.modal", function(e) {
         userid = $(e.relatedTarget).data('userid');
         //alert(userid);
+        //alert('inadd');
         var tr= document.getElementById(userid);
+        //alert(tr);
         var cellval = tr.cells;
+        //alert(cellval);
         var id= $('#Reqnumber'+userid).val();
-        alert(id);
-        $('#EditReqNo').val($('#Reqno'+userid).val());
-        $('#EditdeptName').val
+        //alert(id);
+        $('#EditReqNo').val($('#Reqnumber'+userid).val());
 
-      
+//alert($('#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());
+         $('#EdittxtBasicValue').val($('#BasicAmt'+userid).val());
+        $('#EditBasicPrice').val($("#BasicPriceTax"+userid).val());
+       //$('#EditAfterBasicPrice').val($("#AfterBasicPriceTax"+userid).val());
+        $('#EditLandingCharge').val($("#LandingChargee"+userid).val());
+        $('#EditAfterLandingCharge').val($("#AfterLandingChargee"+userid).val());
+        $('#EditHighseas').val($("#Highseass"+userid).val());
+        $('#EditAfterHighseas').val($("#AfterHighseass"+userid).val());
+        $('#EditCustomduty').val($("#Customduty"+userid).val());
+        $('#EditAfterCustomduty').val($("#AfterCustomduty"+userid).val());
+        $('#EditExcisedutyTax').val($("#ExcisedutyTax"+userid).val());
+        $('#EditAfterExcisedutyTax').val($("#AfterExcisedutyTax"+userid).val());
+        $('#EditExcisedutyEDcess').val($("#ExcisedutyED"+userid).val());
+        $('#EditAfterExcisedutyEDcess').val($("#AfterExcisedutyED"+userid).val());
+        $('#EditExcisedutySHcess').val($("#ExcisedutySH"+userid).val());
+        $('#EditAfterExcisedutySHcess').val($("#AfterExcisedutySH"+userid).val());
+
+        $('#EditCustomEDcess').val($("#CustomEDcess"+userid).val());
+        $('#EditAfterCustomEDcess').val($("#AfterCustomEDcess"+userid).val());
+        $('#EditCustomSHcess').val($("#CustomSHcess"+userid).val());
+        $('#EditAfterCustomSHcess').val($("#AfterCustomSHcess"+userid).val());
+        $('#EditAdditionalExciseduty').val($("#AdditionalExciseduty"+userid).val());
+        $('#EditAfterAdditionalExciseduty').val($("#AfterAdditionalExciseduty"+userid).val());
+        $('#EditGrossdutypayable').val($("#Grossdutypayable"+userid).val());
+        $('#EditGrossexpenses').val($("#Grossexpenses"+userid).val());
+        $('#EditPurQuantity').val($("#PurQuantity"+userid).val());
+        $('#Editpurchaserate').val($("#purchaserate"+userid).val());
+        $('#EditCustomDutyExpenses').val($("#CustomDutyExpenses"+userid).val());
+        $('#EditRMCIncludingCustomers').val($("#RMCIncludingCustomers"+userid).val());
+        $('#EditAfterBasicPriceTax').val($("#AfterBasicPriceTax"+userid).val());
+        $('#EditAvailableModvat').val($("#AvilableModvat"+userid).val());
+        $('#EditTotalExp').val($("#TotalExp"+userid).val());
+        $('#EditTotalOrderValue').val(cellval[8].innerHTML);
+        $("#EditMaterialCode").empty();
+        var Material = <?php echo json_encode($MaterialList, JSON_PRETTY_PRINT) ?>;
+        $("#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));
+                        }
+                                                
+                }
+            
+            
+        });
+        }
+        
 });
+
+
+
+$('.EditImport').click(function(){
+    //alert('inside edit');
+
+   var CostCode =  $("#EditCostCenter").val();
+   var AvilBudget = $('#EditAvlBudAmt').val();
+   var editMaterialCode =  $("#EditMaterialCode").val();
+   var edititemname = $("#EditItemName").val();     
+   var editUOM = $('#EditUOM').val();
+   var editQuantity = $('#EditQuantity').val();
+   var itemRate = $("#EditRate").val();
+   var BasicValue=$("#EdittxtBasicValue").val();
+   //var BasicValue=$("#EdittxtBasicValue").val();
+   var BasicPrice=$("#EditBasicPriceTax").val();
+   var AfterBasicPrice=$("#EditAfterBasicPriceTax").val();
+   var Landingcharge=$("#EditLandingCharge").val();
+   var AfterLanding=$("#EditAfterLandingCharge").val();
+   var Highseass=$("#EditHighseas").val();
+   var AfterHighseas=$("#EditAfterHighseas").val();
+   var CustomDuty=$("#EditCustomduty").val();
+   var AfterCustomDuty=$("#EditAfterCustomduty").val();
+   var ExciseDuty=$("#EditExcisedutyTax").val();
+   var AfterExciseDuty=$("#EditAfterExcisedutyTax").val();
+   var ExciseEd=$("#EditExcisedutyEDcess").val();
+   var AfterExciseEd=$("#EditAfterExcisedutyEDcess").val();  
+   var ExciseDutySH=$("#EditExcisedutySHcess").val();
+   var AfterExciseDutySH=$("#EditAfterExcisedutySHcess").val();
+   var CustomED=$("#EditCustomEDcess").val();
+   var AfterCustomED=$("#EditAfterCustomEDcess").val();
+   var CustomSH=$("#EditCustomSHcess").val();
+   var AfterCustomSH=$("#EditAfterCustomSHcess").val();
+   var AdditionalExciseduty=$("#EditAdditionalExciseduty ").val();
+   var AfterAdditionalExciseduty=$("#EditAfterAdditionalExciseduty").val();
+   var GrossDuty=$("#EditGrossdutypayable").val();
+   var AvailaleModvat=$("#EditAvailableModvat").val();
+   var GrossExpense=$("#EditGrossexpenses").val();
+   var PurchaseRate=$("#Editpurchaserate").val();
+   var Quantity=$("#EditPurQuantity").val();
+   var CustomDutyExpense=$("#EditCustomDutyExpenses").val();
+   var RMC=$("#EditRMCIncludingCustomers").val();
+   var TotalExp=$('#EditTotalExp').val();
+
+
+   var tr= document.getElementById(userid);
+   var cellval = tr.cells; 
+
+             
+   cellval[3].innerHTML = editQuantity;
+   cellval[4].innerHTML =editUOM;
+   cellval[5].innerHTML =itemRate;
+   cellval[6].innerHTML =BasicValue;
+  
+          $('#materialCode'+userid).val(editMaterialCode);
+          $('#materialName'+userid).val(edititemname);
+          $('#uom'+userid).val(editUOM);
+          $('#Quantity'+userid).val(EditQuantity);
+          $('#itemRate'+userid).val(EditRate);
+          $('#BasicAmt'+userid).val(BasicValue);
+          $('#BasicPriceTax'+userid).val(BasicPrice);
+          $('#AfterBasicPriceTax'+userid).val(AfterBasicPrice);
+          $('#LandingChargee'+userid).val(Landingcharge);
+          $('#AfterLandingChargee'+userid).val(AfterLanding);
+          $('#Highseass'+userid).val(Highseass);
+          $('#AfterHighseass'+userid).val(AfterHighseas);
+          $('#Customduty'+userid).val(CustomDuty); 
+          $('#AfterCustomduty'+userid).val(AfterCustomDuty);
+          $('#ExcisedutyTax'+userid).val(ExciseDuty);
+          $('#AfterExcisedutyTax'+userid).val(AfterExciseDuty);
+          $('#ExcisedutyED'+userid).val(ExciseEd);
+          $('#AfterExcisedutyED'+userid).val(AfterExciseEd);
+          $('#ExcisedutySH'+userid).val(ExciseDutySH);
+          $('#AfterExcisedutySH'+userid).val(AfterExciseDutySH);
+          $('#CustomEDcess'+userid).val(CustomED);
+          $('#AfterCustomEDcess'+userid).val(AfterCustomED);
+          $('#CustomSHcess'+userid).val(CustomSH);
+          $('#AfterCustomSHcess'+userid).val(AfterCustomSH);
+          $('#AdditionalExciseduty'+userid).val(AdditionalExciseduty);
+          $('#AfterAdditionalExciseduty'+userid).val(AfterAdditionalExciseduty);
+          $('#Grossdutypayable'+userid).val(GrossDuty);
+          $('#Grossexpenses'+userid).val(GrossExpense);
+          $('#purchaserate'+userid).val(PurchaseRate);
+          $('#PurQuantity'+userid).val(Quantity);
+          $('#CustomDutyExpenses'+userid).val(CustomDutyExpense);
+          $('#RMCIncludingCustomers'+userid).val(RMC);
+          $('#TotalExp'+userid).val(TotalExp);
+           populateValueMainFormForEditImportTax();
+          //$('#Grossexpenses'+userid).val(GrossExpense);
+
+          //addHidden(theForm,"taxamt"+temp,taxamt);//RMC 
+          //addHidden(theForm,"totalexp"+temp,totalexp);//totalexpense
+          
+          //addHidden(theForm,"AfterBasicPriceTax"+,AfterBasicPrice);
+          
+          /*addHidden(theForm,"Grossdutypayable"+temp,GrossDuty);
+          addHidden(theForm,"Grossexpenses"+temp,Grossexpenseduetocustom);
+          addHidden(theForm,"PurQuantity"+temp,PurchaseQuantity);
+          addHidden(theForm,"purchaserate"+temp,purate);
+          addHidden(theForm,"CustomDutyExpenses"+temp,CustomDutyExpense);
+          addHidden(theForm,"RMCIncludingCustomers"+temp,RMCIncluderate);
+          addHidden(theForm,"AvilableModvat"+temp,Avlmodvat);*/
+
+
+  } );   
+
+
+function populateValueMainFormForEditImportTax()
+{
+  var rows =document.getElementById('ImportTax').rows.length;
+  var TotalLanding=0;
+  var TotalHighseas=0;
+  var TotalCustom=0;
+  var TotalExcise=0;
+  var TotalExciseED=0;
+  var TotalExciseSH=0;
+  var TotalCustomED=0;
+  var TotalCustomSH=0;
+  var TotalAdditionalExcise=0;
+  var TotalGrossDuty=0;
+  var TotalAvlmodvat=0;
+  var TotalGrossExpense=0;
+  var i = 0;
+  var TotalRMC=0;
+  do{
+     i += 1;
+     var tr= document.getElementById(i);
+     if(tr != null)
+     {
+       cells = tr.getElementsByTagName('td');
+       var rowid = cells[0].innerHTML;
+
+var AfterLandingCharge= $('#AfterLandingCharge').val() == '' ? '0.00' : $('#AfterLandingCharge').val();
+var AfterHighseas=$('#AfterHighseas').val()==''?'0.00':$('#AfterHighseas').val();
+var AfterCustomduty=$('#AfterCustomduty').val()==''?'0.00':$('#AfterCustomduty').val();
+var AfterExcisedutyTax=$('#AfterExcisedutyTax').val()==''?'0.00':$('#AfterExcisedutyTax').val();
+var AfterExcisedutyEDcess=$('#AfterExcisedutyEDcess').val()==''?'0.00':$('#AfterExcisedutyEDcess').val();
+var AfterExciseDutySH=$("#AfterExcisedutySHcess").val()==''?'0.00':$('#AfterExcisedutySHcess').val();
+var AfterAdditionalExciseduty=$('#AfterAdditionalExciseduty').val()==''?'0.00':$('#AfterAdditionalExciseduty').val();
+var AfterCustomEDcess=$('#AfterCustomEDcess').val()==''?'0.00':$('#AfterCustomEDcess').val();
+var AfterCustomSHcess=$('#AfterCustomSHcess').val()==''?'0.00':$('#AfterCustomSHcess').val();
+var AdditionalExciseduty=$('#AdditionalExciseduty').val()==''?'0.00':$('#AdditionalExciseduty').val();
+var Grossdutypayable=$('#Grossdutypayable').val()==''?'0.00':$('#Grossdutypayable').val();
+var AvailableModvat=$('#AvailableModvat').val()==''?'0.00':$('#AvailableModvat').val();
+var Grossexpenses=$('#Grossexpenses').val()==''?'0.00':$('#Grossexpenses').val();
+var RMC=$('#RMCIncludingCustomers').val()==''?'0.00':$('#RMCIncludingCustomers').val();
+TotalLanding  = parseFloat(TotalLanding) + parseFloat(AfterLandingCharge);
+TotalHighseas  = parseFloat(TotalHighseas) + parseFloat(AfterHighseas);
+TotalCustom  = parseFloat(TotalCustom) + parseFloat(AfterCustomduty);
+TotalExcise  = parseFloat(TotalExcise) + parseFloat(AfterExcisedutyTax);
+TotalExciseED  = parseFloat(TotalExciseED ) + parseFloat(AfterExcisedutyEDcess);
+TotalExciseSH  = parseFloat(TotalExciseSH) + parseFloat(AfterExciseDutySH);
+TotalCustomED  = parseFloat(TotalCustomED) + parseFloat(AfterCustomEDcess);
+TotalCustomSH  = parseFloat(TotalCustomSH ) + parseFloat(AfterCustomSHcess);
+TotalAdditionalExcise  = parseFloat(TotalAdditionalExcise ) + parseFloat(AdditionalExciseduty);
+TotalGrossDuty  = parseFloat(TotalGrossDuty) + parseFloat(Grossdutypayable);
+TotalAvlmodvat  = parseFloat(TotalAvlmodvat ) + parseFloat(AvailableModvat);
+TotalGrossExpense  = parseFloat(TotalGrossExpense ) + parseFloat(Grossexpenses);
+//TotalRMC=parseFloat(TotalRMC)+parseFloat(RMC);
+   
+
+
+   var AfterLandingCharge= $('#AfterLandingCharge').val() == '' ? '0.00' : $('#AfterLandingCharge').val();
+var AfterHighseas=$('#AfterHighseas').val()==''?'0.00':$('#AfterHighseas').val();
+var AfterCustomduty=$('#AfterCustomduty').val()==''?'0.00':$('#AfterCustomduty').val();
+var AfterExcisedutyTax=$('#AfterExcisedutyTax').val()==''?'0.00':$('#AfterExcisedutyTax').val();
+var AfterExcisedutyEDcess=$('#AfterExcisedutyEDcess').val()==''?'0.00':$('#AfterExcisedutyEDcess').val();
+var AfterExciseDutySH=$("#AfterExcisedutySHcess").val()==''?'0.00':$('#AfterExcisedutySHcess').val();
+var AfterCustomEDcess=$('#AfterCustomEDcess').val()==''?'0.00':$('#AfterCustomEDcess').val();
+var AfterCustomSHcess=$('#AfterCustomSHcess').val()==''?'0.00':$('#AfterCustomSHcess').val();
+var AfterAdditionalExciseduty=$('#AfterAdditionalExciseduty').val()==''?'0.00':$('#AfterAdditionalExciseduty').val();
+var Grossdutypayable=$('#Grossdutypayable').val()==''?'0.00':$('#Grossdutypayable').val();
+var AvailableModvat=$('#AvailableModvat').val()==''?'0.00':$('#AvailableModvat').val();
+var Grossexpenses=$('#Grossexpenses').val()==''?'0.00':$('#Grossexpenses').val();
+var totalexp=$('#TotalExp').val()==''?'0.00':$('#TotalExp').val();
+var TotalLanding=$('#txttotallanding').val()==''?'0.00':$('#txttotallanding').val();
+var TotalHighseas=$('#txttotalhighseas').val()==''?'0.00':$('#txttotalhighseas').val();
+var TotalCustom=$('#txttotalcustom').val()==''?'0.00':$('#txttotalcustom').val();
+var TotalExcise=$('#txttotalexcise').val()==''?'0.00':$('#txttotalexcise').val();
+var TotalExciseED=$('#txttotalexciseED').val()==''?'0.00':$('#txttotalexciseED').val();
+var TotalExciseSH=$('#txttotalexciseSH').val()==''?'0.00':$('#txttotalexciseSH').val();
+var TotalCustomED=$('#txttotalcustomED').val()==''?'0.00':$('#txttotalcustomED').val();
+var TotalCustomSH=$('#txttotalcustomSH').val()==''?'0.00':$('#txttotalcustomSH').val();
+var TotalAdditionalExcise=$('#txttotalAdditionalExciseduty').val()==''?'0.00':$('#txttotalAdditionalExciseduty').val();
+var TotalGrossDuty=$('#txttotalgrossduty').val()==''?'0.00':$('#txttotalgrossduty').val();
+var TotalAvlmodvat=$('#txttotalavlmodvat').val()==''?'0.00':$('#txttotalavlmodvat').val();
+var TotalGrossExpense=$('#txttotalgrossexpense').val()==''?'0.00':$('#txttotalgrossexpense').val();
+var TotalOrder=$('#txtToatlOrder').val()==''?'0.00':$('txtToatlOrder').val();
+
+     }
+
+
+    }while (i < rows);
+
+    $('#txttotallanding').val(parseFloat(TotalLanding).toFixed(2));
+    $('#txttotalhighseas').val(parseFloat(TotalHighseas).toFixed(2));
+    $('#txttotalcustom').val(parseFloat(TotalCustom).toFixed(2));
+    $('#txttotalexcise').val(parseFloat(TotalExcise).toFixed(2));
+    $('#txttotalexciseED').val(parseFloat(TotalExciseED).toFixed(2));
+    $('#txttotalexciseSH').val(parseFloat(TotalExciseSH).toFixed(2));
+    $('#txttotalcustomED').val(parseFloat(TotalCustomED).toFixed(2));
+    $('#txttotalcustomSH').val(parseFloat(TotalCustomSH).toFixed(2));
+    $('#txttotalAdditionalExciseduty').val(parseFloat(TotalAdditionalExcise).toFixed(2));
+    $('#txttotalgrossduty').val(parseFloat(TotalGrossDuty).toFixed(2));
+    $('#txttotalavlmodvat').val(parseFloat(TotalAvlmodvat).toFixed(2));
+    $('#txttotalgrossexpense').val(parseFloat(TotalGrossExpense).toFixed(2));
+    $('#txtToatlOrder').val(parseFloat(TotalOrder).toFixed(2));
+
+
+
+    //$('#txttotallanding').val(parseFloat(TotalLanding).toFixed(2));
+}
+
+
+
+function DeleteRow(rowid)
+{ //alert('Delete');
+    var DelRows  = $('#txtDeletedRow').val();
+    var answer = confirm(" Do you want to delete the Item from the List?")
+    if (answer) 
+        {   
+            //alert('Confirm');
+            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);
+        }
+        });
+         // alert(SelectedMaterialCode);
+          if(DelRows != '')
+          {
+          DelRows = DelRows + ":" + rowid;
+          }
+          else
+          {
+              DelRows=  "0" + ":" + rowid;
+          }
+          $('#txtDeletedRow').val(DelRows);
+         populateValueMainFormForDeleteItem(rowid);
+        }
+        
+        }
+
+
+
+function populateValueMainFormForDeleteItem(rowid)
+{
+  var TotalLanding=0;
+  var TotalHighseas=0;
+  var TotalCustom=0;
+  var TotalExcise=0;
+  var TotalExciseED=0;
+  var TotalExciseSH=0;
+  var TotalCustomED=0;
+  var TotalCustomSH=0;
+  var TotalAdditionalExcise=0;
+  var TotalGrossDuty=0;
+  var TotalAvlmodvat=0;
+  var TotalGrossExpense=0;
+var AfterLandingCharge= $('#AfterLandingCharge').val() == '' ? '0.00' : $('#AfterLandingCharge').val();
+var AfterHighseas=$('#AfterHighseas').val()==''?'0.00':$('#AfterHighseas').val();
+var AfterCustomduty=$('#AfterCustomduty').val()==''?'0.00':$('#AfterCustomduty').val();
+var AfterExcisedutyTax=$('#AfterExcisedutyTax').val()==''?'0.00':$('#AfterExcisedutyTax').val();
+var AfterExcisedutyEDcess=$('#AfterExcisedutyEDcess').val()==''?'0.00':$('#AfterExcisedutyEDcess').val();
+var AfterExciseDutySH=$("#AfterExcisedutySHcess").val()==''?'0.00':$('#AfterExcisedutySHcess').val();
+var AfterAdditionalExciseduty=$('#AfterAdditionalExciseduty').val()==''?'0.00':$('#AfterAdditionalExciseduty').val();
+var AfterCustomEDcess=$('#AfterCustomEDcess').val()==''?'0.00':$('#AfterCustomEDcess').val();
+var AfterCustomSHcess=$('#AfterCustomSHcess').val()==''?'0.00':$('#AfterCustomSHcess').val();
+var AdditionalExciseduty=$('#AdditionalExciseduty').val()==''?'0.00':$('#AdditionalExciseduty').val();
+var Grossdutypayable=$('#Grossdutypayable').val()==''?'0.00':$('#Grossdutypayable').val();
+var AvailableModvat=$('#AvailableModvat').val()==''?'0.00':$('#AvailableModvat').val();
+var Grossexpenses=$('#Grossexpenses').val()==''?'0.00':$('#Grossexpenses').val();
+var totalExp=$('#TotalExp').val()==''?'0.00':$('#TotalExp').val();
+TotalLanding  = parseFloat(TotalLanding) - parseFloat(AfterLandingCharge);
+TotalHighseas  = parseFloat(TotalHighseas) - parseFloat(AfterHighseas);
+TotalCustom  = parseFloat(TotalCustom) - parseFloat(AfterCustomduty);
+TotalExcise  = parseFloat(TotalExcise) - parseFloat(AfterExcisedutyTax);
+TotalExciseED  = parseFloat(TotalExciseED ) - parseFloat(AfterExcisedutyEDcess);
+TotalExciseSH  = parseFloat(TotalExciseSH) - parseFloat(AfterExciseDutySH);
+TotalCustomED  = parseFloat(TotalCustomED) - parseFloat(AfterCustomEDcess);
+TotalCustomSH  = parseFloat(TotalCustomSH ) - parseFloat(AfterCustomSHcess);
+TotalAdditionalExcise  = parseFloat(TotalAdditionalExcise ) - parseFloat(AdditionalExciseduty);
+TotalGrossDuty  = parseFloat(TotalGrossDuty) - parseFloat(Grossdutypayable);
+TotalAvlmodvat  = parseFloat(TotalAvlmodvat ) - parseFloat(AvailableModvat);
+TotalGrossExpense  = parseFloat(TotalGrossExpense ) - parseFloat(Grossexpenses);
+TotalOrderValue=parseFloat(TotalOrderValue)-parseFloat()
+
+    $('#txttotallanding').val(parseFloat(TotalLanding).toFixed(2));
+    $('#txttotalhighseas').val(parseFloat(TotalHighseas).toFixed(2));
+    $('#txttotalcustom').val(parseFloat(TotalCustom).toFixed(2));
+    $('#txttotalexcise').val(parseFloat(TotalExcise).toFixed(2));
+    $('#txttotalexciseED').val(parseFloat(TotalExciseED).toFixed(2));
+    $('#txttotalexciseSH').val(parseFloat(TotalExciseSH).toFixed(2));
+    $('#txttotalcustomED').val(parseFloat(TotalCustomED).toFixed(2));
+    $('#txttotalcustomSH').val(parseFloat(TotalCustomSH).toFixed(2));
+    $('#txttotalAdditionalExciseduty').val(parseFloat(TotalAdditionalExcise).toFixed(2));
+    $('#txttotalgrossduty').val(parseFloat(TotalGrossDuty).toFixed(2));
+    $('#txttotalavlmodvat').val(parseFloat(TotalAvlmodvat).toFixed(2));
+    $('#txttotalgrossexpense').val(parseFloat(TotalGrossExpense).toFixed(2));
+    $('#txtToatlOrder').val(parseFloat(TotalOrderValue).toFixed(2));
+
+   
+
+
+}
+
+
+
+function Save(status)
+{
+//alert();
+if(status == '0')
+{
+    stat = '<?php echo PO_DRAFT; ?>';
+}
+else
+{
+    stat = '<?php echo PO_CREATED; ?>';
+}
+
+$('#txtStatus').val(stat);
+/*var MaterialCode= $("#MaterialCode").val();
+var Quantity= $("#quantity").val();
+var Reqnumber= $("#Reqnumber").val();
+var itemRate= $("#itemRate").val();
+var Exchangerate= $("#ExchangeRate").val();
+var BasicPriceinmton= $("#imBasicPrice").val();
+var Productprice= $("#txtBasicValue").val();
+var LandingCharge= $("#txttotallanding").val();
+var HighSeas = $("#txttotalhighseas").val();
+var CustomDuty= $("#txttotalcustom").val();
+var ExciseDuty= $("#txttotalexcise").val();
+var ExciseDutyEd= $("#txttotalexciseED").val();
+var ExciseDutySH= $("#txttotalexciseSH").val();
+var CustomEd= $("#txttotalcustomED").val();
+var CustomSH= $("#txttotalcustomSH").val();
+var AddAdtional= $("#txttotalAdditionalExciseduty").val();*/
+
+var txtRowCount = $('#txtRowCount').val();
+var txtDeletedRow = $('#txtDeletedRow').val();
+if(validate())
+{
+ if(document.getElementById('ImportTax').rows.length <= 0)
+   {
+
+    alert('Please Select Line item to Create PO');
+    $('#Deliverydt').focus();
+    return false;
+   }
+   else
+   {
+
+     $('#content').loader('show');
+          $.ajax({ 
+            data:$('.ImportPO').serialize()+"&txtRowCount="+txtRowCount+"&txtDeletedRow="+txtDeletedRow+"textStatus="+stat,
+
+            //data:$('.CreatealterPO').serialize()+"&TextRowCount="+TextRowCount+"&TextDeQletedRowCount="+TextDeletedRowCount+"&TextTotalOrderValueSummaryService="+TextTotalOrderValueSummaryService+"&TextSpcialInstruction="+TextSpcialInstruction+"&TextExchangerate"+ExcLandingCharge="+hangerate+"Status="+TextStatus,
+            type:"POST",
+            url:"<?php echo base_url() ?>purchaseorder/addNewImportPurchaseOrder", 
+            success:function(data) {
+            if(data)
+            {
+                $('#content').loader('hide'); 
+                alert(data);
+                $('#txtRowCount').val('');
+                $('#txtDeletedRow').val('');
+                //$('#SpcialInstruction').val('');
+                //$('#txtDeliveryAddress').val('');
+               window.location =   "purchaseorderListing";
+            
+            }
+                else
+                {
+                    alert("Error"); 
+                }           
+        
+                }
+  
+            });
+
+   }
+
+}
+
+
+
+
+}
+
+ $(function () {
+   //$("#revenueTax").DataTable();
+    $('#ImportTax').DataTable({
+      "paging": false,
+      "lengthChange": true,
+      "searching": false,
+      "ordering": false,
+     // "info": true,
+      "autoWidth": true
+       
+    }); 
+  });
+
+ 
 </script>
  
diff --git a/application/views/includes/header.php b/application/views/includes/header.php
index f59e0045..dc6402a1 100755
--- a/application/views/includes/header.php
+++ b/application/views/includes/header.php
@@ -79,8 +79,6 @@
 	<!-- fullCalendar 2.2.5-->
 	<link rel="stylesheet" href="<?php echo base_url(); ?>assets/plugins/fullcalendar/fullcalendar.min.css">
 	<link rel="stylesheet" href="<?php echo base_url(); ?>assets/plugins/fullcalendar/fullcalendar.print.css" media="print">
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-datepicker/1.5.0/js/bootstrap-datepicker.js"></script>
-    <link href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-datepicker/1.5.0/css/bootstrap-datepicker.css" rel="stylesheet">
 	
     <style>
     	.error{
@@ -151,7 +149,7 @@
                 <i class="fa fa-dashboard"></i> <span>Dashboard</span> 
               </a>
             </li>
-				<?php 
+				<?php  
 						 if($role == ROLE_ADMIN || $DEPCode == SALES || $DEPCode == FINANCE )
 						{ 
 						?>
@@ -252,7 +250,7 @@
 					<li class="treeview">
 					  <span id="menu" data-toggle="dropdown" ><i class="fa fa-thumb-tack"></i> Requisition<span class="caret"></span></span> 
 						<ul class="dropdown-menu" role="menu" aria-labelledby="menu2">
-						<?php  if($role == ROLE_MANAGER || $role == ROLE_EMPLOYEE || $role == ROLE_ADMIN  )
+						<?php  if($role == ROLE_MANAGER || $role == ROLE_EMPLOYEE || $role == ROLE_ADMIN )
 								{									
 								?>
 						<li class="treeview">
@@ -277,7 +275,7 @@
 								<?Php 
 								} ?>
 								<?Php  
-								 if($DEPCode != FINANCE || $DEPCode == PURCHASE)
+								 if($DEPCode == FINANCE)
 								 {
 								?>
 								
@@ -296,8 +294,7 @@
 					?>
 					
 			<?php
-						//if(($DEPCode == FINANCE && $role == ROLE_MANAGER)|| ($(DEPCode == PURCHASE && $role == ROLE_EMPLOYEE)))
-						if($DEPCode == FINANCE || $DEPCode == PURCHASE )
+						if($DEPCode == FINANCE && $role == ROLE_MANAGER)
 						{
 						?>
 						 
@@ -305,8 +302,7 @@
               <span id="menu" data-toggle="dropdown"><i class="fa fa-first-order"></i> Purchase order<span class="caret"></span></span> 
 			  	<ul class="dropdown-menu" role="menu" aria-labelledby="menu2">
 				<?php
-						//if($DEPCode != FINANCE || $DEPCode == PURCHASE)
-							if( $DEPCode == PURCHASE)
+						if($DEPCode == FINANCE)
 						{
 						?>
 				<li class="treeview">
@@ -320,8 +316,7 @@
 						}
 						?>
 						<?php
-						//if($DEPCode == PURCHASE && $role == ROLE_EMPLOYEE)
-							if($DEPCode == PURCHASE )
+						if($DEPCode == FINANCE && $role == ROLE_MANAGER)
 						{
 						?>
 						<li class="treeview">
@@ -333,36 +328,14 @@
 						<?php
 						}
 						?>
-						<!-- For Finance Team for PO approval list-->
-						<?php
-						//if($DEPCode == FINANCE && $role == ROLE_MANAGER)
-						if($DEPCode == FINANCE  && $role == ROLE_MANAGER)
-						{
-						?>
-						<li class="treeview">
-								  <a href="<?php echo base_url(); ?>purchaseorder/poapproval">
-									<i class="fa fa-users"></i>
-									<span>Approve Purchase Order</span>
-								  </a>
-								</li>
-						<?php
-						}
-						?>
 						<!-- this page is for gate keeper for view the full po list-->
-						<?php
-						//if($DEPCode != FINANCE && $DEPCode == PURCHASE)
-							if( $DEPCode == PURCHASE)
-						{
-						?>
                         <li class="treeview">
                           <a href="<?php echo base_url(); ?>purchaseorder/viewfullpurchaseorder">
                             <i class="fa fa-history"></i>
                             <span>View Purchase Order</span>
                           </a>
                         </li>
-						 <?php
-						}
-						?>
+						 
 				</ul> 
             </li>
 						<?php