diff --git a/app/Controllers/Purchaseorder.php b/app/Controllers/Purchaseorder.php index 3f50a443..3a6cae55 100755 --- a/app/Controllers/Purchaseorder.php +++ b/app/Controllers/Purchaseorder.php @@ -545,7 +545,7 @@ class Purchaseorder extends BaseController $ReqType = $this->request->getVar('ReqType'); $Req = $this->purchaseorder_model->getRequistionNoFromPO($PONO); - + $data['ReqList'] = $Req; $result = array(); @@ -554,6 +554,8 @@ class Purchaseorder extends BaseController foreach ($Req as $SID) : $ReqArray[] = $SID->ReqNo; $result[] = $this->purchaseorder_model->getRawPOMaterialList($SID->ReqNo); + // echo "
";
+      // print_r($result);die;
     endforeach;
 
     $data['MaterialList'] = $result; //$this->purchaseorder_model->getRawMaterialList($ReqType,$ReqArray);
@@ -1213,8 +1215,6 @@ class Purchaseorder extends BaseController
   //This used to Edit the Revenue Purchase Order
   function EditRevenuePurchaseOrder()
   {
-
-   
     $PONO = $this->request->getPost('txtPONO');
     $POdt = $this->request->getPost('PODate');
     $PODate =  get_date_time_format($POdt);
@@ -2030,9 +2030,8 @@ class Purchaseorder extends BaseController
 
   function EditImportPurchaseOrder()
   {
+    // print_r($this->request->getPost());die;
 
-    //echo "dfds";
-    //die();
     $PONO = $this->request->getPost('txtPONO');
     $POdt = '';
     $createddt = '';
@@ -2158,11 +2157,10 @@ class Purchaseorder extends BaseController
         }
       }
     }
+   
+    // echo $PONO;
+    // echo $TotalOrder;
 
-    //echo $PONO;
-    //echo $TotalOrder;
-    //print_r($POList);
-    //die();
 
     $POMaster  = $this->purchaseorder_model->updatePOMaster($PONO, $POList);
     //echo "sdasds";
@@ -2192,7 +2190,8 @@ class Purchaseorder extends BaseController
     }
 
 
-    //echo $RowCount;
+    // echo $RowCount;
+    // die;
     for ($i = 1; $i <= $RowCount; $i++) {
 
       $MaterialCode = $this->request->getPost('materialCode' . $i);
@@ -2364,13 +2363,13 @@ class Purchaseorder extends BaseController
           $POLineItem = $this->purchaseorder_model->updatePOLineItem($PONO, $POLineItemNo, $POLineItemList);
         }
         $isExists = $this->purchaseorder_model->LineItemExistsinImportTax($LineItemNo);
-        //echo $isExists;
+        // print_r($isExists);
 
-        //die();
-        if (count($isExists) == 0) {
+        // die();
+        if (is_array($isExists) && count($isExists) == 0) {
           // print_r(count($isExists));
-          //echo $isExists;
-          //die();
+          // echo $isExists;
+          // die();
           $ImportTaxList = array('LineItemNo' => $LineItemNo, 'BasicPriceInMTon' => $BasicPriceinmton, 'ProductPrice' => $Productprice, 'LandingCharge' => $LandingCharge, 'AfterLandingCharge' => $AfterLandingCharge, 'CustomDuty' => $CustomDuty, 'AfterCustomDuty' => $AfterCustomDuty, 'CustomEdCess' => $CustomEd, 'CustomSHCess' => $CustomSH, 'CreatedBy' => $CreateBy, 'UpdatedOn' => $updateddt, 'Grossdutypayable' => $Grossdutypayable, 'CustomDutyExpensesPerKG' => $CustomDutyExpensesPerKG, 'QuantityKG' => $QuantityKG, 'AfterCustomSHCess' => $AfterCustomSH, 'AfterCustomEdCess' => $AfterCustomEd, 'TotalValue' => $Totalvalueitem, 'FreightType' => $FreightType, 'NoOfTrip' => $Nosoftrip, 'FreightValue' => $FreightRate, 'AfterFreightValue' => $FreightAmount, 'AssessableValue' => $AssessableValue, 'SubTotal' => $Subtotal, 'IGST' => $Igst, 'AfterIGST' => $AfterIgst, 'DutyImpact' => $Dutyimpact, 'ClearingCharge' => $Clearingcharge, 'NetValue' => $Nettvalue);
 
 
diff --git a/app/Controllers/Servicepurchaseorder.php b/app/Controllers/Servicepurchaseorder.php
index 5e3843aa..b75c8607 100755
--- a/app/Controllers/Servicepurchaseorder.php
+++ b/app/Controllers/Servicepurchaseorder.php
@@ -560,8 +560,7 @@ class Servicepurchaseorder extends BaseController
 
 				if (trim((string)$POType) == SERVICE) {
 					$isExists = $this->purchaseorder_model->LineItemExists($LineItemNo);
-
-					if (count($isExists) == 0) {
+					if (is_array($isExists) && count($isExists) == 0) {
 						$ServiceTaxList = array('LineItemNo' => $LineItemNo, 'CGST' => $Cgst, 'After_CGST' => $AfterCgst, 'SGST' => $Sgst, 'After_SGST' => $AfterSgst, 'IGST' => $Igst, 'After_IGST' => $AfterIgst, 'TotalValue' => $TotalOrderValue, 'CreatedBy' => $updatedBy, 'CreatedDate' => $updateddt, 'otherallowance' => $OtherAmt);
 
 						$this->purchaseorder_model->addServiceTax($ServiceTaxList);
diff --git a/app/Models/Purchaseorder_model.php b/app/Models/Purchaseorder_model.php
index a57ce3be..247b5267 100755
--- a/app/Models/Purchaseorder_model.php
+++ b/app/Models/Purchaseorder_model.php
@@ -141,11 +141,11 @@ Where IGRM.PONO = ? ';
 	}
 	///////////////////end this function used to pono reset financeyear configuration 
 	public function isFileExists($filename)
-    {
+	{
 		$result = $this->db->table('t_purchaseorder_master')->where('POFile', $filename);
 		$query = $result->get();
 		return $query->getResult();
-    }
+	}
 
 
 
@@ -458,7 +458,7 @@ mstr.CourierNo,pom.Status,pom.POType') //,bill.BillNo,bill.FilePath,
 	function getRawPOMaterialList($ReqNo, $IsArray = '')
 	{
 
-		
+
 		$result =   $this->db->query("CALL P_GET_REQUISTIONLIST('" . $ReqNo . "')"); //  or die(mysql_error());
 
 		// $result ->next_result();
@@ -593,7 +593,7 @@ mstr.CourierNo,pom.Status,pom.POType') //,bill.BillNo,bill.FilePath,
 	{
 
 		$ReqDeatis = $this->GetRequistionMasterUsingReqNo($ReqNoList);
-		
+
 		foreach ($ReqDeatis as $SID) :
 			$ReqBy     =  $SID->Requestedby;
 		endforeach;
@@ -604,7 +604,7 @@ mstr.CourierNo,pom.Status,pom.POType') //,bill.BillNo,bill.FilePath,
 								Dept.DEPCode,Dept.DepartmentName,mast.ReqDate,mast.CostCenterCode,mast.Status')
 				->join('t_departmentdetails Dept', 'mast.RequestedDept = Dept.DEPCode')
 				->whereIn('mast.ReqNo', $ReqNoList);
-		} else if ($ReqBy != '') {			
+		} else if ($ReqBy != '') {
 			$builder = $this->db->table('t_requestion_master  mast')->distinct()
 				->select('ReqNo,ReqType,Status,Requestedby,mast.CreatedDate,mast.Schedule_Type,mast.NumberOfService,mast.Service_Period,emp.FirstName,emp.EmpID,emp.Designation, Dept.DEPCode,Dept.DepartmentName,mast.ReqDate,mast.CostCenterCode,mast.Status')
 				->join('t_employee_details emp', 'mast.Requestedby = emp.EmpID')
@@ -787,38 +787,38 @@ mstr.CourierNo,pom.Status,pom.POType') //,bill.BillNo,bill.FilePath,
 	 * This function is used to add New Purchase order to  the system
 	 */
 	function addPOMaster($POMaster, $POType, $revenuetype)
-		{
-			// print_r($POMaster);die;
-			try {
-				$this->db->transStart();
-				$builder = $this->db->table('t_purchaseorder_master');
-				$builder->insert($POMaster);
-				$aff_row = $this->db->affectedRows();
-				$insertId = $this->db->insertId();
-				log_message('error', 'addPOMaster POID : ' . $insertId);
-				$this->db->transComplete();
-				if ($aff_row > 0) {
-				
-					// log_message('error', 'Error inside if now insertId: ' . $this->db->insertId());
+	{
+		// print_r($POMaster);die;
+		try {
+			$this->db->transStart();
+			$builder = $this->db->table('t_purchaseorder_master');
+			$builder->insert($POMaster);
+			$aff_row = $this->db->affectedRows();
+			$insertId = $this->db->insertId();
+			log_message('error', 'addPOMaster POID : ' . $insertId);
+			$this->db->transComplete();
+			if ($aff_row > 0) {
 
-					$subQuery = 'SELECT PONO FROM t_purchaseorder_master 
+				// log_message('error', 'Error inside if now insertId: ' . $this->db->insertId());
+
+				$subQuery = 'SELECT PONO FROM t_purchaseorder_master 
 								WHERE POID = ? AND ParentPO IS NULL 
 								ORDER BY CreatedDate DESC LIMIT 1';
 
-					$query = $this->db->query($subQuery, [$insertId]);
-					$result = $query->getResultArray();
-					log_message('error', 'addPOMaster subQuery: ' . $this->db->getLastQuery()->getQuery());
-					log_message('error', 'addPOMaster subQuery result : ' . json_encode($result));
-					return $result;
-				}
-				return [];
-			} catch (\Exception $e) {
-				$this->db->transRollback();
-				log_message('error', 'not inserted in addPOMaster due to : ' . $e->getMessage());
-				throw $e;
-				return false;
+				$query = $this->db->query($subQuery, [$insertId]);
+				$result = $query->getResultArray();
+				log_message('error', 'addPOMaster subQuery: ' . $this->db->getLastQuery()->getQuery());
+				log_message('error', 'addPOMaster subQuery result : ' . json_encode($result));
+				return $result;
 			}
+			return [];
+		} catch (\Exception $e) {
+			$this->db->transRollback();
+			log_message('error', 'not inserted in addPOMaster due to : ' . $e->getMessage());
+			throw $e;
+			return false;
 		}
+	}
 
 	function addAmendPOMaster($POMaster, $CreatedBy, $ParentPO)
 	{
@@ -837,7 +837,7 @@ mstr.CourierNo,pom.Status,pom.POType') //,bill.BillNo,bill.FilePath,
 			$query = $this->db->query($subQuery, array($CreatedBy, $ParentPO));
 
 			return $query->getResultArray();
-		}else{
+		} else {
 			return false;
 		}
 	}
@@ -862,9 +862,9 @@ mstr.CourierNo,pom.Status,pom.POType') //,bill.BillNo,bill.FilePath,
 			$result = $query->getResultArray();
 			log_message('error', 'addPOLineItem subQuery: ' . $this->db->getLastQuery()->getQuery());
 			log_message('error', 'addPOLineItem subQuery result : ' . json_encode($result));
-					
+
 			return $query->getResultArray();
-		}else{
+		} else {
 			return [];
 		}
 	}
@@ -882,18 +882,18 @@ mstr.CourierNo,pom.Status,pom.POType') //,bill.BillNo,bill.FilePath,
 		$insertId = $this->db->insertId();
 		$aff_row = $this->db->affectedRows();
 		$this->db->transComplete();
-		
+
 		log_message('error', 'addRevenueTax query: ' . $this->db->getLastQuery()->getQuery());
 		log_message('error', 'addRevenueTax affrow : ' . $aff_row);
 		log_message('error', 'addRevenueTax insertId : ' . $insertId);
-		return $insertId ;
+		return $insertId;
 	}
 	/**
 	 *  This function is used to add Service Tax  to  the system      
 	 */
 	function addServiceTax($ServiceTaxList)
 	{
-		
+
 		log_message('error', 'addServiceTax Requested : ' . json_encode($ServiceTaxList));
 
 		$this->db->transStart();
@@ -902,11 +902,11 @@ mstr.CourierNo,pom.Status,pom.POType') //,bill.BillNo,bill.FilePath,
 		$insertId = $this->db->insertId();
 		$aff_row = $this->db->affectedRows();
 		$this->db->transComplete();
-		
+
 		log_message('error', 'addServiceTax query: ' . $this->db->getLastQuery()->getQuery());
 		log_message('error', 'addServiceTax affrow : ' . $aff_row);
 		log_message('error', 'addServiceTax insertId : ' . $insertId);
-		return $insertId ;
+		return $insertId;
 	}
 
 
@@ -914,7 +914,7 @@ mstr.CourierNo,pom.Status,pom.POType') //,bill.BillNo,bill.FilePath,
 	 *  This function is used to add Service Tax  to  the system      
 	 */
 	function addImportTax($ImportTaxList)
-	{	
+	{
 		log_message('error', 'addImportTax Requested : ' . json_encode($ImportTaxList));
 
 		$this->db->transStart();
@@ -923,11 +923,11 @@ mstr.CourierNo,pom.Status,pom.POType') //,bill.BillNo,bill.FilePath,
 		$insertId = $this->db->insertId();
 		$aff_row = $this->db->affectedRows();
 		$this->db->transComplete();
-		
+
 		log_message('error', 'addImportTax query: ' . $this->db->getLastQuery()->getQuery());
 		log_message('error', 'addImportTax affrow : ' . $aff_row);
 		log_message('error', 'addImportTax insertId : ' . $insertId);
-		return $insertId ;
+		return $insertId;
 	}
 
 
@@ -1239,31 +1239,37 @@ where LineItem.PONO =?';
 
 	function GetImportPurchaseOrderDetails($PONO = '')
 	{
-
-		$subQuery = 'SELECT distinct LineItem.LineItemNo,Req.ReqNo,Mat.MaterialCode,Mat.MaterialName,
-Mat.UOM,Quantity,Rate,Req.Status,ROUND((Quantity *Rate),2 ) as BasicValue,ReceivedQuantity,
-QuantityRejected,ROUND(Quantity-ReceivedQuantity)as PendingQty,Per,
- ROUND((RMCIncludingCustomersPerKG*Quantity),2)as Taxamount,LandingCharge,HighSeasSalesCharge,CustomDuty,ExciseDuty,ExciseDutyEdCess,CustomEdCess,POMast.ExchangeRate,AfterLandingCharge,AfterHighSeasSalesCharge,AfterCustomDuty,AfterExciseDuty,AfterExciseDutyEdCess,AddlExciseDuty,AfterAddlExciseDuty,Grossdutypayable,AvailableModvat,Grossexpensesduetocustomduty,purchaseratePerKG,CustomDutyExpensesPerKG,RMCIncludingCustomersPerKG,QuantityKG,BasicPriceInMTon,ProductPrice,CustomSHCess,AfterCustomSHCess,AfterExciseDutySHCess,ExciseDutySHCess,
- AfterCustomEdCess,ROUND((Quantity *Rate),2)as TotalOrderValue,ROUND((POMast.ExchangeRate*BasicPriceInMTon),2) as BasicINRValue,TotalValue,CurrencyType,ReceivedQuantity,Tax.*,LineItem.ServiceMaterialDescription,
- 
- Req.CostCenterCode,Dept.DepartmentName FROM t_purchaseorder_lineitem LineItem 
- join t_purchaseorder_master POMast on POMast.PONO = LineItem.PONO
- join t_materialmaster Mat on Mat.MaterialCode = LineItem.MaterialCode 
- join t_import_tax Tax on Tax.LineItemNo = LineItem.LineItemNo 
- join t_requestion_master Req on Req.ReqNo = LineItem.ReqNo 
- left join t_employee_details emp on Req.Requestedby = emp.EmpID 
- 
- left join t_mrir_master Mast on POMast.PONO=Mast.PONO
- 
- left join t_mrir_details Det on Det.MaterialCode=LineItem.MaterialCode and Mast.MRIRNO=Det.MRIRNO
- 
- join t_departmentdetails Dept on Req.RequestedDept = Dept.DEPCode where LineItem.PONO =?';
-		//print_r($subQuery);
-
+		$subQuery = 'SELECT DISTINCT LineItem.LineItemNo, Req.ReqNo, Mat.MaterialCode, Mat.MaterialName, 
+		Mat.UOM, Quantity, Rate, Req.Status, ROUND((Quantity * Rate), 2) AS BasicValue, 
+		ReceivedQuantity, QuantityRejected, ROUND(Quantity - ReceivedQuantity) AS PendingQty, Per, 
+		ROUND((RMCIncludingCustomersPerKG * Quantity), 2) AS Taxamount, LandingCharge, HighSeasSalesCharge, 
+		CustomDuty, ExciseDuty, ExciseDutyEdCess, CustomEdCess, POMast.ExchangeRate, AfterLandingCharge, 
+		AfterHighSeasSalesCharge, AfterCustomDuty, AfterExciseDuty, AfterExciseDutyEdCess, AddlExciseDuty, 
+		AfterAddlExciseDuty, Grossdutypayable, AvailableModvat, Grossexpensesduetocustomduty, 
+		purchaseratePerKG, CustomDutyExpensesPerKG, RMCIncludingCustomersPerKG, QuantityKG, 
+		BasicPriceInMTon, ProductPrice, CustomSHCess, AfterCustomSHCess, AfterExciseDutySHCess, 
+		ExciseDutySHCess, AfterCustomEdCess, ROUND((Quantity * Rate), 2) AS TotalOrderValue, 
+		ROUND((POMast.ExchangeRate * BasicPriceInMTon), 2) AS BasicINRValue, TotalValue, CurrencyType, 
+		ReceivedQuantity, Tax.*, LineItem.ServiceMaterialDescription, Req.CostCenterCode, 
+		Dept.DepartmentName 
+	
+		FROM t_purchaseorder_lineitem LineItem 
+		LEFT JOIN t_purchaseorder_master POMast ON POMast.PONO = LineItem.PONO 
+		LEFT JOIN t_materialmaster Mat ON Mat.MaterialCode = LineItem.MaterialCode 
+		LEFT JOIN t_import_tax Tax ON Tax.LineItemNo = LineItem.LineItemNo 
+		LEFT JOIN t_requestion_master Req ON Req.ReqNo = LineItem.ReqNo 
+		LEFT JOIN t_employee_details emp ON Req.Requestedby = emp.EmpID 
+		LEFT JOIN t_mrir_master Mast ON POMast.PONO = Mast.PONO 
+		LEFT JOIN t_mrir_details Det ON Det.MaterialCode = LineItem.MaterialCode AND Mast.MRIRNO = Det.MRIRNO 
+		LEFT JOIN t_departmentdetails Dept ON Req.RequestedDept = Dept.DEPCode 
+		
+		WHERE LineItem.PONO = ?';
+	
 		$query = $this->db->query($subQuery, array($PONO));
-
+	
 		return $query->getResult();
 	}
+	
 
 
 
@@ -1585,7 +1591,7 @@ QuantityRejected,ROUND(Quantity-ReceivedQuantity)as PendingQty,Per,
 			->select('mast.PODate,mast.PONO,mast.TotalOrderValue,st.StatusCode,st.StatusName,emp.FirstName,mast.CreatedDate,ccm.CostCenterName,ccm.CostCenterCode,mast.POType as RType,mast.Remarks,DepartmentName,mast.ApprovedBy,(select EmpID from tbl_users where userId=mast.ApprovedBy )as EID,rmast.ReqType,mast.Status,mast.CapitalRange,
 		  (select FirstName from t_employee_details where EmpID=EID)as Approver,sup.SupplierName,sup.MSME')
 			// ->orderBy('mast.Status',"PO_CREATED");
-			
+
 			->join('t_supplierdetailsn sup', 'sup.SupplierID = mast.SupplierID')
 			->join('t_status st', 'st.StatusCode=mast.Status')
 			->join('t_purchaseorder_lineitem req', 'req.PONO= mast.PONO')
@@ -1623,8 +1629,8 @@ QuantityRejected,ROUND(Quantity-ReceivedQuantity)as PendingQty,Per,
 			$builder->orWhere('mast.Status', REQITEM_Emergency_PO_CREATED);
 			// $builder->orderBy('mast.Status');
 		}
-		$builder->orderBy('mast.CreatedDate','DESC');
-		
+		$builder->orderBy('mast.CreatedDate', 'DESC');
+
 		$result = $builder->get();
 
 		return $result->getResult();
@@ -1703,11 +1709,11 @@ QuantityRejected,ROUND(Quantity-ReceivedQuantity)as PendingQty,Per,
 			->join('t_employee_details re', 're.EmpID = tbl.EmpID', 'left')
 			->join('t_departmentdetails Dept', 're.Departmentcode = Dept.DEPCode', 'left')
 			->where('mast.PONO', $PONO);
-		
+
 		$result = $builder->get();
 		return $result->getResult();
 	}
-	
+
 
 	// get domestic capital po list
 
@@ -1760,7 +1766,7 @@ QuantityRejected,ROUND(Quantity-ReceivedQuantity)as PendingQty,Per,
 
 				$Details['RequestedDept'] = $Reqresult->getResult()[0]->shortName;
 				$Details['CostCenterCode'] = $Reqresult->getResult()[0]->CostCenterCode;
-				$retDate = format_date($Reqresult->getResult()[0]->ReqDate,0,$format = 'd-m-Y');
+				$retDate = format_date($Reqresult->getResult()[0]->ReqDate, 0, $format = 'd-m-Y');
 				$Details['ReqDate'] = $retDate;
 				$ScheduleType = $Reqresult->getResult()[0]->Schedule_Type;
 				if ($ScheduleType != 'Recurring') {
@@ -2463,31 +2469,32 @@ st.CGST,st.SGST,st.IGST,st.otherallowance FROM t_service_tax st
 		$subQuery = 'select  bill.BillNo,IGR.IGRNO, IGR.PONO  FROM t_igr_master IGR
    join t_purchaseorder_billupload bill on  bill.IGRNO = IGR.IGRNO 
    where bill.BillNO = ? ';
-   
+
 
 		$query = $this->db->query($subQuery, array($bill));
 
 		return $query->getResultArray();
 	}
 
-	function VerifyWithSupplierForPendingPO($supplierid,$materialcode){
+	function VerifyWithSupplierForPendingPO($supplierid, $materialcode)
+	{
 
 		$subQuery = 'SELECT COUNT(t_purchaseorder_master.PONO) AS PO_count,GROUP_CONCAT(t_purchaseorder_master.PONO) AS PONO,t_purchaseorder_lineitem.MaterialCode 
 		FROM t_purchaseorder_lineitem
 		LEFT JOIN t_purchaseorder_master  ON t_purchaseorder_lineitem.PONO = t_purchaseorder_master .PONO
 		WHERE t_purchaseorder_master.SupplierID != ? AND t_purchaseorder_lineitem.MaterialCode = ? AND t_purchaseorder_master.Status = "ST014"
 		GROUP BY t_purchaseorder_lineitem.MaterialCode';
-        //    -- and t_purchaseorder_master.Status != "ST026"
-		$query = $this->db->query($subQuery, array($supplierid,$materialcode));
+		//    -- and t_purchaseorder_master.Status != "ST026"
+		$query = $this->db->query($subQuery, array($supplierid, $materialcode));
 
 		return $query->getResultArray();
-
 	}
 
-	function lastPONO(){
+	function lastPONO()
+	{
 		$query   = $this->db->table('t_purchaseorder_master')->select('PONO')->orderBy('PONO', 'DESC')->limit(1)->get();
 		$lastPONO = $query->getRow()->PONO;
 		return $lastPONO;
 	}
 	/***       -----------------------------            */
-}
\ No newline at end of file
+}
diff --git a/app/Views/alterpurchaseorder.php b/app/Views/alterpurchaseorder.php
index 1b674c97..b4fd7bfb 100755
--- a/app/Views/alterpurchaseorder.php
+++ b/app/Views/alterpurchaseorder.php
@@ -39,23 +39,27 @@ if (!empty($INRSYMBOL)) {
 
 
 
+
+    /* Custom width for the modal */
+    .modal-dialog {
+        width: 100%; /* You can adjust this percentage to your needs */
+        max-width: 1200px; /* Optional: This ensures the modal doesn't grow too large on large screens */
+    }
+
+    /* Ensure content inside the modal scales properly */
+    .modal-content {
+        width: 100%;
+    }
+
+
     .txtSpcialInstruction{
         background-color: #f4f9fb;
     }
-    #packagingcalmodel {
-        margin-top: 200px;
-        z-index: 1080 !important;
-    }
+    
 
-    #submitmodel {
-        margin-top: 200px;
-        z-index: 1080 !important;
-    }
+    
 
-    #freightmodel {
-        margin-top: 200px;
-        z-index: 1080 !important;
-    }
+   
 
     #ExciseDutyCalModel {
         margin-top: 200px;
@@ -72,9 +76,7 @@ if (!empty($INRSYMBOL)) {
         z-index: 1080 !important;
     }
 
-    .modal {
-        width:100% ! important;
-    }
+   
 
     .form-control {
         text-align: left;
@@ -2726,6 +2728,1851 @@ if (!empty($INRSYMBOL)) {
                                         Item
                                 
                             
+
+                            
+                            

+                                
+                                    

+
+                                        
+                                        
+
+                                        
+                                        
+
+
+                                    

+                                        

+                                            
+                                                
+                                                    
+                                                    
+                                                    
+                                                    
+                                                    
+                                                    
+                                                    
+                                                    
+                                                    
+                                                    
+                                                    
+                                                
+                                            
+                                            
+                                            
+                                        
SNoRequisition NoItem CodeItem DescriptionQuantityUOMRateBasic AmountTax AmountTotal Order AmountAction

+                                    

+                                    
+                                    
+                            
+
+                            
+
+
+
+
+
+
+
+
+
+
+
+
                         
                     
                 
@@ -2739,7 +4586,7 @@ if (!empty($INRSYMBOL)) {
                     style="display: none;">
                     

                         

+                            >
                             

                                 
Packing Calculation On 

                                 
@@ -2805,57 +4652,66 @@ if (!empty($INRSYMBOL)) {
              
               
 
-