diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/hooks/obps/useBPAInbox.js b/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/hooks/obps/useBPAInbox.js
index 2a3ff7bab03..4965bc5b07e 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/hooks/obps/useBPAInbox.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/hooks/obps/useBPAInbox.js
@@ -47,12 +47,13 @@ const useBPAInbox = ({ tenantId, filters, config={} }) => {
           table: data?.items.map( application => ({
               applicationId: application.businessObject.applicationNo || application.businessObject.applicationNumber,
               date: application.businessObject.auditDetails.createdTime,
+              submissionDate: application?.ProcessInstanceForBPA?.auditDetails?.createdTime ,
               businessService: application?.ProcessInstance?.businessService,
               applicationType: application?.businessObject?.additionalDetails?.applicationType ? `WF_BPA_${application?.businessObject?.additionalDetails?.applicationType}` : "-",
               locality: `${application.businessObject?.tenantId?.toUpperCase()?.split(".")?.join("_")}_REVENUE_${application.businessObject?.landInfo?.address?.locality?.code?.toUpperCase()}`,
               status: application?.ProcessInstance?.state?.state,
               state:  application?.ProcessInstance?.state?.state,
-              owner: application?.ProcessInstance?.assignes?.[0]?.name || "NA",
+              owner: application?.businessObject?.additionalDetails?.ownerName || "NA",
               sla: application?.businessObject?.status.match(/^(APPROVED)$/) ? "CS_NA" : Math.round(application.ProcessInstance?.businesssServiceSla / (24 * 60 * 60 * 1000))
           })),
           totalCount: data.totalCount,
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/getBPAAcknowledgement.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/getBPAAcknowledgement.js
index c773bd90af7..43b1abc47b3 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/getBPAAcknowledgement.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/getBPAAcknowledgement.js
@@ -129,16 +129,15 @@ const getMohallaLocale = (value = "", tenantId = "") => {
                     }   
                 ]
              },
-             {
-                title: t(`BPA_NOC_DETAILS_SUMMARY`) , 
-                values: [
-                    {
-                      title: t(`BPA_NOC_NUMBER`),
-                      value: application?.additionalDetails?.nocNumber || "NA", 
-                    }
-                    
-                ],    
-             },
+            //  {
+            //     title: t(`BPA_NOC_DETAILS_SUMMARY`) , 
+            //     values: [
+            //         {
+            //           title: t(`BPA_NOC_NUMBER`),
+            //           value: application?.additionalDetails?.nocNumber || "NA", 
+            //         }                    
+            //     ],    
+            //  },
              {
                 title: t("BPA_APPLICANT_DETAILS_HEADER"),
                 values:  [
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/components/SearchApplication/SearchFormFieldsComponent.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/components/SearchApplication/SearchFormFieldsComponent.js
index 1c3bf32079d..4c40670c71a 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/components/SearchApplication/SearchFormFieldsComponent.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/components/SearchApplication/SearchFormFieldsComponent.js
@@ -112,6 +112,10 @@ const SearchFormFieldsComponent = ({ formState, Controller, register, control, t
         <label>{t("BPA_SEARCH_APPLICATION_NO_LABEL")}</label>
         <TextInput name="applicationNo" inputRef={register({})} />
       </SearchField>
+      <SearchField>
+        <label>{t("BPA_SEARCH_OWNER_NAME")}</label>
+        <TextInput name="name" inputRef={register({})} />
+      </SearchField>
       {
         !window.location.href.includes("citizen/obps/search/application") &&
         <SearchField>
@@ -190,6 +194,7 @@ const SearchFormFieldsComponent = ({ formState, Controller, register, control, t
               applicationNo: "",
               mobileNumber: window.location.href.includes("/search/obps-application") ? currentUserPhoneNumber : "",
               // mobileNumber: "",
+              name:"",
               fromDate: "",
               toDate: "",
               status: "",
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/components/SearchApplication/index.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/components/SearchApplication/index.js
index cfe24cac0f6..3715a876df3 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/components/SearchApplication/index.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/components/SearchApplication/index.js
@@ -31,6 +31,7 @@ const OBPSSearchApplication = ({ tenantId, t, onSubmit, data, error, searchData,
       applicationNo: "",
       mobileNumber: window.location.href.includes("/search/obps-application") ? currentUserPhoneNumber : "",
       // mobileNumber: "",
+      name:"",
       fromDate: "",
       toDate: "",
       status: "",
@@ -80,6 +81,7 @@ const OBPSSearchApplication = ({ tenantId, t, onSubmit, data, error, searchData,
         applicationNo: "",
         // mobileNumber: "",
        mobileNumber: window.location.href.includes("/search/obps-application") ? Digit.UserService.getUser()?.info?.mobileNumber : "",
+       name:"",
         fromDate: "",
         toDate: "",
         status: "",
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/components/SearchApplication/useTableConfig.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/components/SearchApplication/useTableConfig.js
index 43332e5d716..b7b333b1f1d 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/components/SearchApplication/useTableConfig.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/components/SearchApplication/useTableConfig.js
@@ -55,8 +55,8 @@ const useSearchApplicationTableConfig = ({t}) => {
             accessor: (row) => GetCell(t(row.additionalDetails?.serviceType || t(`TRADELICENSE_TRADETYPE_${row?.tradeLicenseDetail?.tradeUnits?.[0]?.tradeType?.split(".")[0]}`) || "-")),
         },
         {
-          Header: t("BPA_CURRENT_OWNER_HEAD"),
-          accessor: (row) => GetCell(row?.assignee || "-"),
+          Header: t("BPA_OWNER_HEAD"),
+          accessor: (row) => GetCell(row?.additionalDetails?.ownerName || "NA"),
           // accessor: (row) => GetCell(row.businessService === "BPAREG"?row?.tradeLicenseDetail?.owners.map( o => o.name ). join(",") || "-" : row?.landInfo?.owners.map( o => o.name ). join(",") || "-"),
           disableSortBy: true,
         },
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/components/Timeline.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/components/Timeline.js
index 8cad7ad68b9..81e3eeb1396 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/components/Timeline.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/components/Timeline.js
@@ -15,8 +15,8 @@ const getAction = (flow) => {
     default:
       actions = [
         "BPA_STEPPER_SCRUTINY_DETAILS_HEADER",
+        "COLONY_DETAILS",
         "BPA_OWNER_AND_DOCUMENT_DETAILS_LABEL",
-        "BPA_NOC_DETAILS_SUMMARY",
         "BPA_STEPPER_SUMMARY_HEADER",
       ];
   }
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/pageComponents/BPANewBuildingdetails.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/pageComponents/BPANewBuildingdetails.js
index 82cabc21265..9e1e9f75be9 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/pageComponents/BPANewBuildingdetails.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/pageComponents/BPANewBuildingdetails.js
@@ -1,5 +1,6 @@
   import React, { useEffect, useState, Fragment  } from "react";
-  import { FormStep, TextInput, CardLabel, Dropdown } from "@upyog/digit-ui-react-components";
+  import { FormStep, TextInput, CardLabel, Dropdown,UploadFile,SearchIcon } from "@upyog/digit-ui-react-components";
+  import Timeline from "../components/Timeline";
   import { useLocation, useRouteMatch } from "react-router-dom";
   import { Controller, useForm } from "react-hook-form";
 
@@ -25,7 +26,36 @@
       const [schemeName, setschemeName] = useState(formData?.owners?.schemeName || "");
       const [transferredscheme, settransferredscheme] = useState("Pre-Approved Standard Designs" || "");
       const [Ulblisttype, setUlblisttype] = useState(formData?.owners?.Ulblisttype || "");
-
+      const [uploadedFile, setUploadedFile] = useState(formData?.owners?.uploadedFile);
+      const [file, setFile] = useState();
+      const [error, setError] = useState(null);
+      const [uploadMessage, setUploadMessage] = useState("");
+      let Webview = !Digit.Utils.browser.isMobile();
+      let acceptFormat = ".pdf"
+      useEffect(() => {
+        (async () => {
+          setError(null);
+          if (file&& file?.type) {
+            if(!(acceptFormat?.split(",")?.includes(`.${file?.type?.split("/")?.pop()}`)))
+            {
+              setError(t("PT_UPLOAD_FORMAT_NOT_SUPPORTED"));
+            }
+            else if (file.size >= 2000000) {
+              setError(t("PT_MAXIMUM_UPLOAD_SIZE_EXCEEDED"));
+            } else {
+              try {
+                const response = await Digit.UploadServices.Filestorage("property-upload", file, Digit.ULBService.getStateId());
+                if (response?.data?.files?.length > 0) {
+                  setUploadedFile(response?.data?.files[0]?.fileStoreId);
+                } else {
+                  setError(t("PT_FILE_UPLOAD_ERROR"));
+                }
+              } catch (err) {
+              }
+            }
+          }
+        })();        
+      }, [file]);
 
 
 
@@ -202,22 +232,34 @@
       function TransferredScheme(e){
         settransferredscheme(e.target.value);
       }
-
+      function selectfile(e) {
+        setUploadedFile(e.target.files[0]);
+        setFile(e.target.files[0]);
+     }
+      function onClick(e){
+        console.log("inside_NOC_search")
+      }
 
 
       const goNext = () => {
         let owners = formData.owners && formData.owners[index];
-        let ownerStep = { ...owners, approvedColony, UlbName, Ulblisttype, District, masterPlan, coreArea, buildingStatus, schemes, schemesselection,  purchasedFAR, greenbuilding, restrictedArea, proposedSite, nameofApprovedcolony, schemeName, transferredscheme, NocNumber };
+        let ownerStep = { ...owners, approvedColony, UlbName, Ulblisttype, District, masterPlan, coreArea, buildingStatus, schemes, schemesselection,  purchasedFAR, greenbuilding, restrictedArea, proposedSite, nameofApprovedcolony, schemeName, transferredscheme, NocNumber, uploadedFile };
         let updatedFormData = { ...formData };
 
         // Check if owners array exists in formData if not , then it will add it 
         if (!updatedFormData.owners) {
           updatedFormData.owners = [];
         }
-      
-        onSelect(config.key, { ...formData[config.key], ...ownerStep }, updatedFormData, false, index);
-
-      
+        if((approvedColony?.code=="NO") ) 
+        { if(NocNumber || uploadedFile || formData?.owners?.uploadedFile || formData?.owners?.NocNumber){
+          onSelect(config.key, { ...formData[config.key], ...ownerStep }, updatedFormData, false, index);          
+        }
+        else{
+          alert("Please fill NOC number or Upload NOC Document")
+        }  }
+        else{
+          onSelect(config.key, { ...formData[config.key], ...ownerStep }, updatedFormData, false, index);
+        }        
       };
 
     
@@ -253,25 +295,40 @@
           case "NO":
             return (
               <>
-                <CardLabel>{`${t("BPA_NOC_NUMBER")}`}</CardLabel>
+              <CardLabel>{`${t("BPA_NOC_NUMBER")}`}</CardLabel>
+              <div className="field-container">
                   <TextInput
                     t={t}
                     type={"text"}
                     isMandatory={false}
                     optionKey="i18nKey"
+                    defaultValue={formData?.owners?.NocNumber}
                     name="NocNumber"
                     value={NocNumber}
                     onChange={setnocNumber}
-                    style={{ width: "86%" }}
+                    //style={{ width: "86%" }}
                     ValidationRequired={false}
                     {...(validation = {
-                      isRequired: true,
+                      //isRequired: true,
                       pattern: "^[a-zA-Z0-9]*$",
                       type: "text",
                       title: t("TL_NAME_ERROR_MESSAGE"),
                   })}
                   />
-
+                <div style={{ position: "relative", zIndex: "100", right: "20px", marginTop: "-24px", marginRight:Webview?"-20px":"-20px" }} onClick={(e) => onClick( e)}> <SearchIcon /> </div>
+                </div>
+                <div style={{ position: "relative", fontWeight:"bold", left:"20px"}}>OR</div>
+                <UploadFile
+                id={"noc-doc"}
+                onUpload={selectfile}
+                onDelete={() => {
+                    setUploadedFile(null);
+                    setFile("");
+                }}
+                message={uploadedFile ? `1 ${t(`FILEUPLOADED`)}` : t(`ES_NO_FILE_SELECTED_LABEL`)}
+                error={error}
+                uploadMessage={uploadMessage}
+            />
               </>
             );
           default:
@@ -354,6 +411,7 @@
 
       return (
         <React.Fragment>
+          <Timeline currentStep={2} />
           <FormStep
             config={config} onSelect={goNext} onSkip={onSkip} t={t}
           
@@ -385,7 +443,7 @@
             
               
 
-              <CardLabel>{`${t("BPA_MASTER_PLAN")}`}</CardLabel>
+              <CardLabel style={{marginTop:"15px"}}>{`${t("BPA_MASTER_PLAN")}`}</CardLabel>
               <Controller
                 control={control}
                 name={"masterPlan"}
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/pageComponents/DocumentDetails.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/pageComponents/DocumentDetails.js
index 4330cf323e9..813493eadaf 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/pageComponents/DocumentDetails.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/pageComponents/DocumentDetails.js
@@ -86,7 +86,7 @@ const DocumentDetails = ({ t, config, onSelect, userType, formData, setError: se
 
     return (
         <div>
-            <Timeline currentStep={checkingFlow === "OCBPA" ? 3 : 2} flow= {checkingFlow === "OCBPA" ? "OCBPA" : ""}/>
+            <Timeline currentStep={checkingFlow === "OCBPA" ? 3 : 3} flow= {checkingFlow === "OCBPA" ? "OCBPA" : ""}/>
             {!isLoading ?
                 <FormStep
                     t={t}
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/pageComponents/OwnerDetails.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/pageComponents/OwnerDetails.js
index 7e627665596..b6a1d0e60b8 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/pageComponents/OwnerDetails.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/pageComponents/OwnerDetails.js
@@ -257,7 +257,7 @@ const OwnerDetails = ({ t, config, onSelect, userType, formData }) => {
 
                 if(found){
                     setCanmovenext(false);
-                    setownerRoleCheck(found);
+                    //setownerRoleCheck(found);
                     setShowToast({ key: "true", error: true, message: `BPA_OWNER_VALIDATION_${found?.code}` });
                     return;
                 }
@@ -342,7 +342,8 @@ const OwnerDetails = ({ t, config, onSelect, userType, formData }) => {
                 payload.additionalDetails.height  = (formData?.data.edcrDetails.planDetail.blocks[0].building.buildingHeight).toString() || "NA";
                 payload.additionalDetails.usage  = formData?.data.occupancyType  || "NA";
                 payload.additionalDetails.builtUpArea =(formData?.data.edcrDetails.planDetail.blocks[0].building.totalBuitUpArea).toString();
-                payload.additionalDetails.nocNumber=(formData?.nocnumber?.nocNumber).toString();
+                //payload.additionalDetails.nocNumber=(formData?.nocnumber?.nocNumber).toString();
+                payload.additionalDetails.ownerName=conversionOwners.map(obj=>obj.name).join(',');
                 
                 if (formData?.data?.registrationDetails) payload.additionalDetails.registrationDetails = formData?.data?.registrationDetails;
                 if (formData?.data?.applicationType) payload.additionalDetails.applicationType = formData?.data?.applicationType;
@@ -380,7 +381,7 @@ const OwnerDetails = ({ t, config, onSelect, userType, formData }) => {
                 if (formData?.owners?.schemeName) payload.additionalDetails.schemeName = formData?.owners?.schemeName;
                 if (formData?.owners?.transferredscheme) payload.additionalDetails.transferredscheme = formData?.owners?.transferredscheme;
                 if (formData?.owners?.Ulblisttype?.code) payload.additionalDetails.Ulblisttype = formData?.owners?.Ulblisttype?.code;
-
+                if (formData?.owners?.uploadedFile) payload.additionalDetails.uploadedFileNoc = formData?.owners?.uploadedFile;
                 
                 //For LandInfo
                 payload.landInfo = {};
@@ -507,7 +508,7 @@ const OwnerDetails = ({ t, config, onSelect, userType, formData }) => {
 
     return (
         <div>
-        <Timeline currentStep={2} />
+        <Timeline currentStep={3} />
         <FormStep config={config} onSelect={goNext} onSkip={onSkip} t={t} isDisabled={canmovenext || getCanMoveNextMultiple() || !ownershipCategory || isDisable} forcedError={t(error)}>   
             {!isLoading ?
                 <div style={{marginBottom: "10px"}}>
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/pages/citizen/BpaApplicationDetail/index.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/pages/citizen/BpaApplicationDetail/index.js
index edb1e8a016a..198d536850e 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/pages/citizen/BpaApplicationDetail/index.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/pages/citizen/BpaApplicationDetail/index.js
@@ -675,7 +675,7 @@ const BpaApplicationDetail = () => {
                 {/* to get Fee values */}
                 {detail?.additionalDetails?.inspectionReport && detail?.isFeeDetails && <ScruntinyDetails scrutinyDetails={detail?.additionalDetails} paymentsList={[]}/>}
                  {/*blocking reason*/}
-                {detail?.additionalDetails?.inspectionReport && detail?.isFeeDetails && (workflowDetails?.data?.actionState?.nextActions[0]?.state=="POST_PAYMENT_CITIZEN_APPROVAL_PENDING"|| workflowDetails?.data?.actionState?.state=="POST_PAYMENT_CITIZEN_APPROVAL_PENDING") &&
+                {detail?.additionalDetails?.inspectionReport && detail?.isFeeDetails && (workflowDetails?.data?.actionState?.nextActions[0]?.state=="POST_PAYMENT_CITIZEN_APPROVAL_PENDING"|| workflowDetails?.data?.actionState?.state=="POST_PAYMENT_CITIZEN_APPROVAL_PENDING" || workflowDetails?.data?.actionState?.state=="POST_PAYMENT_INPROGRESS") &&
                 <div style={ { marginTop: "19px", background: "#FAFAFA", border: "1px solid #D6D5D4", borderRadius: "4px", padding: "8px", lineHeight: "19px", maxWidth: "950px", minWidth: "280px"} }>
                   <Row className="border-none" label={t(`BLOCKING_REASON`)} labelStyle={{fontSize: "15px"}} text={data?.applicationData.additionalDetails.blockingReason || "NA"}> </Row>
                 </div>
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/pages/citizen/NewBuildingPermit/CheckPage.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/pages/citizen/NewBuildingPermit/CheckPage.js
index 04cb6b8f190..14427869f43 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/pages/citizen/NewBuildingPermit/CheckPage.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/pages/citizen/NewBuildingPermit/CheckPage.js
@@ -1,6 +1,6 @@
 import {
     Card, CardHeader, CardSubHeader, CardText,TextInput,CardLabel,CheckBox, LabelFieldPair, UploadFile,
-    CitizenInfoLabel, Header, LinkButton, Row, StatusTable, SubmitBar, Table, CardSectionHeader, EditIcon, PDFSvg, Loader
+    CitizenInfoLabel, Header, LinkButton, Row, StatusTable, SubmitBar, Table, CardSectionHeader, EditIcon, PDFSvg, Loader,TextArea
   } from "@upyog/digit-ui-react-components";
   import React,{ useEffect, useMemo, useState }  from "react";
   import { useTranslation } from "react-i18next";
@@ -27,6 +27,14 @@ import {
     
     const tenantId = user?.info?.permanentCity || value?.tenantId ||Digit.ULBService.getCurrentTenantId() ;
     const { isMdmsLoading, data: mdmsData } = Digit.Hooks.obps.useMDMS(state, "BPA", ["GaushalaFees","MalbaCharges","LabourCess"]);
+    const [otherChargesDisc, setOtherChargesDisc] = useState()
+    const [uploadedFile, setUploadedFile] = useState();
+    const [uploadedFileLess, setUploadedFileLess] = useState([]);
+    const [file, setFile] = useState();
+    const [uploadMessage, setUploadMessage] = useState("");
+    const [errorFile, setError] = useState(null);
+    const [docLessAdjustment, setDocuments] = useState({});
+    let acceptFormat = ".pdf"
     let BusinessService;
     if(value.businessService === "BPA_LOW")
     BusinessService="BPA.LOW_RISK_PERMIT_FEE";
@@ -151,11 +159,40 @@ import {
 
     const isValidMobileNumber = mobileNumber.length === 10 && /^[0-9]+$/.test(mobileNumber);
 
-    
-
+    useEffect(() => {
+      (async () => {
+        setError(null);
+        if (file&& file?.type) {
+          if(!(acceptFormat?.split(",")?.includes(`.${file?.type?.split("/")?.pop()}`)))
+          {
+            setError(t("PT_UPLOAD_FORMAT_NOT_SUPPORTED"));
+          }
+          else if (file.size >= 2000000) {
+            setError(t("PT_MAXIMUM_UPLOAD_SIZE_EXCEEDED"));
+          } else {
+            try {
+              const response = await Digit.UploadServices.Filestorage("property-upload", file, Digit.ULBService.getStateId());
+              if (response?.data?.files?.length > 0) {
+                setUploadedFileLess([...uploadedFileLess,{fileStoreId:response?.data?.files[0]?.fileStoreId, time:new Date()}]);
+              } else {
+                setError(t("PT_FILE_UPLOAD_ERROR"));
+              }
+            } catch (err) {
+            }
+          }
+        }
+      })();        
+    }, [file]);
+    useEffect(()=>{
+      sessionStorage.setItem("uploadedFileLess",JSON.stringify(uploadedFileLess));
+  },[uploadedFileLess])
 
 
     useEffect(()=>{
+      if (value?.additionalDetails?.lessAdjustmentFeeFiles?.length) {
+        const fileStoresIds = value?.additionalDetails?.lessAdjustmentFeeFiles.map((document,index) =>(index===value?.additionalDetails?.lessAdjustmentFeeFiles?.length-1 ? value?.additionalDetails?.lessAdjustmentFeeFiles[value?.additionalDetails?.lessAdjustmentFeeFiles?.length-1]?.fileStoreId : null));
+        Digit.UploadServices.Filefetch(fileStoresIds, state).then((res) => setDocuments(res?.data));
+      }
       if(isEditApplication){
         setDevelopment(value?.additionalDetails?.selfCertificationCharges?.BPA_DEVELOPMENT_CHARGES);
         sessionStorage.setItem("development",value?.additionalDetails?.selfCertificationCharges?.BPA_DEVELOPMENT_CHARGES);
@@ -163,6 +200,9 @@ import {
         sessionStorage.setItem("otherCharges",value?.additionalDetails?.selfCertificationCharges?.BPA_OTHER_CHARGES);
         setLessAdjusment(value?.additionalDetails?.selfCertificationCharges?.BPA_LESS_ADJUSMENT_PLOT);
         sessionStorage.setItem("lessAdjusment",value?.additionalDetails?.selfCertificationCharges?.BPA_LESS_ADJUSMENT_PLOT);
+        setOtherChargesDisc(value?.additionalDetails?.otherFeesDiscription);
+        sessionStorage.setItem("otherChargesDisc",value?.additionalDetails?.otherFeesDiscription);
+       setUploadedFileLess(value?.additionalDetails?.lessAdjustmentFeeFiles);
       }
 let plotArea = parseInt(sessionStorage.getItem("plotArea")) || datafromAPI?.planDetail?.planInformation?.plotArea || value?.additionalDetails?.area;
 const LabourCess = plotArea > 909 ?mdmsData?.BPA?.LabourCess[1].rate * plotArea : 0
@@ -349,6 +389,15 @@ setWaterCharges(Malbafees/2)
       //alert("Please enter numbers")
     }      
     }
+    function setOtherChargesDis(value) {
+      setOtherChargesDisc(value);
+      sessionStorage.setItem("otherChargesDisc",value)  ;
+}
+
+function selectfile(e) {
+      setUploadedFile(e.target.files[0]);
+      setFile(e.target.files[0]);
+   }
 
     return (
     <React.Fragment>
@@ -520,15 +569,15 @@ setWaterCharges(Malbafees/2)
         {<DocumentsPreview documents={getOrderDocuments(applicationDocs)} svgStyles = {{}} isSendBackFlow = {false} isHrLine = {true} titleStyles ={{fontSize: "18px", lineHeight: "24px", "fontWeight": 700, marginBottom: "10px"}}/>}
         </StatusTable>
       </Card>
-      <Card style={{paddingRight:"16px"}}>
-      <StatusTable>
+      {/*<Card style={{paddingRight:"16px"}}>
+       <StatusTable>
       <CardHeader>{t("BPA_NOC_DETAILS_SUMMARY")}</CardHeader>
           <LinkButton
             label={<EditIcon style={{ marginTop: "-10px", float: "right", position: "relative", bottom: "32px" }} />}
             style={{ width: "100px", display: "inline" }}
             onClick={() => routeTo(`${routeLink}/noc-number`)}
           />
-       <Row className="border-none" label={t(`BPA_NOC_NUMBER`)} text={value?.additionalDetails?.nocNumber} />   
+       <Row className="border-none" label={t(`BPA_NOC_NUMBER`)} text={value?.additionalDetails?.nocNumber} />    */}
       {/* {nocDocuments && nocDocuments?.NocDetails.map((noc, index) => (
         <div key={`noc-${index}`} style={nocDocuments?.NocDetails?.length > 1 ?{ marginTop: "19px", background: "#FAFAFA", border: "1px solid #D6D5D4", borderRadius: "4px", padding: "8px", lineHeight: "19px", maxWidth: "960px", minWidth: "280px" } : {}}>
         <CardSectionHeader style={{marginBottom: "24px"}}>{`${t(`BPA_${noc?.nocType}_HEADER`)}`}</CardSectionHeader>
@@ -543,8 +592,8 @@ setWaterCharges(Malbafees/2)
         </StatusTable>
       </div>
       ))} */}
-      </StatusTable>
-      </Card>
+      {/* </StatusTable>
+      </Card> */}
       <Card style={{paddingRight:"16px"}}>
       <CardSubHeader>{t("BPA_SUMMARY_FEE_EST")}</CardSubHeader> 
       <StatusTable>
@@ -591,6 +640,16 @@ setWaterCharges(Malbafees/2)
               //disable={editScreen}
               {...{ required: true, pattern: /^[0-9]*$/ }}
             />
+            <CardLabel>{t("BPA_COMMON_OTHER_AMT_DISCRIPTION")}</CardLabel>
+            <TextArea
+              t={t}
+              type={"text"}
+              name="otherChargesDiscription"
+              defaultValue={value?.additionalDetails?.otherFeesDiscription }
+              value={otherChargesDisc}
+              onChange={(e) => {setOtherChargesDis(e.target.value)}}
+              {...{ required: true }}
+            />
             <CardLabel>{t("BPA_COMMON_LESS_AMT")}</CardLabel>
             <TextInput
               t={t}
@@ -605,6 +664,29 @@ setWaterCharges(Malbafees/2)
               //disable={editScreen}
               {...{ required: true, pattern: "^[0-9]*$" }}
             />
+            <CardLabel>{t("BPA_COMMON_LESS_AMT_FILE")}</CardLabel>
+            <UploadFile
+                id={"noc-doc"}
+                style={{marginBottom:"200px"}}
+                onUpload={selectfile}
+                onDelete={() => {
+                    setUploadedFile(null);
+                    setFile("");
+                }}
+                message={uploadedFile ? `1 ${t(`FILEUPLOADED`)}` : t(`ES_NO_FILE_SELECTED_LABEL`)}
+                error={errorFile}
+                uploadMessage={uploadMessage}
+            />
+            {docLessAdjustment?.fileStoreIds?.length && 
+            <CardLabel style={{marginTop:"15px"}}>{t("BPA_COMMON_LESS_AMT_PREVIOUS_FILE")}</CardLabel>            
+            }
+            {docLessAdjustment?.fileStoreIds?.length &&             
+              <a   target="_blank" href={docLessAdjustment?.fileStoreIds[0]?.url}>
+              <PDFSvg />
+            </a>
+            }            
+            <Row className="border-none"></Row>
+       <Row  className="border-none" label={t(`BPA_P2_TOTAL_FEE`)} text={`₹ ${(parseInt(development)+parseInt(otherCharges)+parseInt(malbafees)+parseInt(labourCess)+parseInt(waterCharges)+parseInt(gaushalaFees))-parseInt(lessAdjusment)}`} />
        
        </StatusTable>
        <br></br>
@@ -672,7 +754,7 @@ setWaterCharges(Malbafees/2)
       <hr style={{color:"#cccccc",backgroundColor:"#cccccc",height:"2px",marginTop:"20px",marginBottom:"20px"}}/>
       {/* <CardHeader>{t("BPA_COMMON_TOTAL_AMT")}</CardHeader> 
       <CardHeader>₹ {paymentDetails?.Bill?.[0]?.billDetails[0]?.amount || "0"}</CardHeader>  */}
-      <SubmitBar label={t("BPA_SEND_TO_CITIZEN_LABEL")} onSubmit={onSubmitCheck} disabled={ (!development||!otherCharges||!lessAdjusment || !agree || !isOTPVerified)} id/>
+      <SubmitBar label={t("BPA_SEND_TO_CITIZEN_LABEL")} onSubmit={onSubmitCheck} disabled={ (!development||!otherCharges||!lessAdjusment || !agree || !isOTPVerified || !otherChargesDisc)} id/>
       </Card>
     </React.Fragment>
     );
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/pages/citizen/NewBuildingPermit/NewConfig.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/pages/citizen/NewBuildingPermit/NewConfig.js
index 0f06fd69df6..81e6ff2c098 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/pages/citizen/NewBuildingPermit/NewConfig.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/pages/citizen/NewBuildingPermit/NewConfig.js
@@ -3,20 +3,19 @@ export const newConfig1=[
         "route": "docs-required",
         "component": "DocsRequired",
         "key": "data",
-        "nextStep": "noc-number"
-    },
-    {
-        "route": "noc-number",
-        "component": "NOCNumber",
-        "nextStep": "basic-details",
-        "key": "nocnumber",
-        "texts": {
-            "headerCaption": "BPA_NOC_NUMBER_DETAILS",
-            "header": "",
-            "submitBarLabel": "CS_COMMON_NEXT"
-        }
-
+        "nextStep": "basic-details"
     },
+    // {
+    //     "route": "noc-number",
+    //     "component": "NOCNumber",
+    //     "nextStep": "basic-details",
+    //     "key": "nocnumber",
+    //     "texts": {
+    //         "headerCaption": "BPA_NOC_NUMBER_DETAILS",
+    //         "header": "",
+    //         "submitBarLabel": "CS_COMMON_NEXT"
+    //     }
+    // },
     {
         "route": "basic-details",
         "component": "BasicDetails",
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/pages/employee/BpaApplicationDetails/index.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/pages/employee/BpaApplicationDetails/index.js
index 7ea6af57efc..bfca48c7ced 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/pages/employee/BpaApplicationDetails/index.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/pages/employee/BpaApplicationDetails/index.js
@@ -333,6 +333,25 @@ const BpaApplicationDetail = () => {
           optionsClassName={"employee-options-btn-className"}
         />}
       </div>
+      <ApplicationDetailsTemplate
+        applicationDetails={data}
+        isLoading={isLoading}
+        isDataLoading={isLoading}
+        applicationData={data?.applicationData}
+        nocMutation={nocMutation}
+        mutate={mutate}
+        id={"timeline"}
+        workflowDetails={workflowDetails}
+        businessService={workflowDetails?.data?.applicationBusinessService ? workflowDetails?.data?.applicationBusinessService : data?.applicationData?.businessService}
+        moduleCode="BPA"
+        showToast={showToast}
+        ActionBarStyle={isMobile?{}:{paddingRight:"50px"}}
+        MenuStyle={isMobile?{}:{right:"50px"}}
+        setShowToast={setShowToast}
+        closeToast={closeToast}
+        statusAttribute={"state"}
+        timelineStatusPrefix={`WF_${workflowDetails?.data?.applicationBusinessService ? workflowDetails?.data?.applicationBusinessService : data?.applicationData?.businessService}_`}
+      />
       {data?.applicationData?.status === "FIELDINSPECTION_INPROGRESS" && (userInfo?.info?.roles.filter(role => role.code === "BPA_FIELD_INSPECTOR")).length>0 && <FormComposer
         heading={t("")}
         isDisabled={!canSubmit}
@@ -353,25 +372,6 @@ const BpaApplicationDetail = () => {
         className={"employeeCard-override"}
         cardClassName={"employeeCard-override"}
       />}
-      <ApplicationDetailsTemplate
-        applicationDetails={data}
-        isLoading={isLoading}
-        isDataLoading={isLoading}
-        applicationData={data?.applicationData}
-        nocMutation={nocMutation}
-        mutate={mutate}
-        id={"timeline"}
-        workflowDetails={workflowDetails}
-        businessService={workflowDetails?.data?.applicationBusinessService ? workflowDetails?.data?.applicationBusinessService : data?.applicationData?.businessService}
-        moduleCode="BPA"
-        showToast={showToast}
-        ActionBarStyle={isMobile?{}:{paddingRight:"50px"}}
-        MenuStyle={isMobile?{}:{right:"50px"}}
-        setShowToast={setShowToast}
-        closeToast={closeToast}
-        statusAttribute={"state"}
-        timelineStatusPrefix={`WF_${workflowDetails?.data?.applicationBusinessService ? workflowDetails?.data?.applicationBusinessService : data?.applicationData?.businessService}_`}
-      />
       </div>
     </Fragment>
   )
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/pages/employee/Inbox/useInboxTableConfig.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/pages/employee/Inbox/useInboxTableConfig.js
index 646a1c015fd..e4a9924b840 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/pages/employee/Inbox/useInboxTableConfig.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/pages/employee/Inbox/useInboxTableConfig.js
@@ -29,6 +29,11 @@ const useInboxTableConfig = ({ parentRoute, onPageSizeChange, formState, totalCo
             accessor: "applicationDate",
             Cell: ({row}) => row.original?.["date"] ? GetCell(format(new Date(row.original?.["date"]), 'dd/MM/yyyy')) : ""
             },
+        {
+                Header: t("CS_APPLICATION_DETAILS_SUBMISSION_DATE"),
+                accessor: "submissionDate",
+                Cell: ({row}) => row.original?.["submissionDate"] ? GetCell(format(new Date(row.original?.["submissionDate"]), 'dd/MM/yyyy')) : "NA"
+        },
         {
             Header: t("ES_INBOX_LOCALITY"),
             accessor: (row) => t(row?.locality),
@@ -40,7 +45,7 @@ const useInboxTableConfig = ({ parentRoute, onPageSizeChange, formState, totalCo
             disableSortBy: true,
         },
         {
-            Header: t("WF_INBOX_HEADER_CURRENT_OWNER"),
+            Header: t("WF_INBOX_HEADER_OWNER_NAME"),
             accessor: (row) => t(row?.owner),
             disableSortBy: true,
         },
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/utils/index.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/utils/index.js
index 820858f38e7..21a35f45e9b 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/utils/index.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/utils/index.js
@@ -483,6 +483,8 @@ export const convertToBPAObject = (data, isOCBPA = false, isSendBackTOCitizen =
       auditDetails: data?.auditDetails,
       additionalDetails: {
         ...data?.additionalDetails,
+        otherFeesDiscription:sessionStorage.getItem("otherChargesDisc"),
+        lessAdjustmentFeeFiles:JSON.parse(sessionStorage.getItem("uploadedFileLess")),
         selfCertificationCharges:{
           "BPA_MALBA_CHARGES" : sessionStorage.getItem("Malbafees"),
           "BPA_LABOUR_CESS": sessionStorage.getItem("LabourCess"),
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/templates/ApplicationDetails/Modal/BPAActionModal.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/templates/ApplicationDetails/Modal/BPAActionModal.js
index 262401afc2e..c5f3f208844 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/templates/ApplicationDetails/Modal/BPAActionModal.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/templates/ApplicationDetails/Modal/BPAActionModal.js
@@ -217,6 +217,8 @@ const ActionModal = ({ t, action, tenantId, state, id, closeModal, submitAction,
     applicationData.additionalDetails.selfCertificationCharges.BPA_DEVELOPMENT_CHARGES=sessionStorage.getItem("development");
     applicationData.additionalDetails.selfCertificationCharges.BPA_OTHER_CHARGES=sessionStorage.getItem("otherCharges");
     applicationData.additionalDetails.selfCertificationCharges.BPA_LESS_ADJUSMENT_PLOT=sessionStorage.getItem("lessAdjusment");
+    applicationData.additionalDetails.otherFeesDiscription=sessionStorage.getItem("otherChargesDisc");
+    applicationData.additionalDetails.lessAdjustmentFeeFiles=JSON.parse(sessionStorage.getItem("uploadedFileLess"));
 
     const nocDetails = applicationDetails?.nocData?.map(noc => {
       const uploadedDocuments = Digit.SessionStorage.get(noc?.nocType) || [];
@@ -304,7 +306,7 @@ const ActionModal = ({ t, action, tenantId, state, id, closeModal, submitAction,
           uploadedFile,
           setUploadedFile,
           businessService,
-          assigneeLabel: "WF_ASSIGNEE_NAME_LABEL",
+          assigneeLabel: "WF_ASSIGNEE_NAME_LABEL_BPA",
           error,
           blockReasonFiltered
         })
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/templates/ApplicationDetails/components/ScruntinyDetails.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/templates/ApplicationDetails/components/ScruntinyDetails.js
index d6828cecbb4..fc60f8a350c 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/templates/ApplicationDetails/components/ScruntinyDetails.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/templates/ApplicationDetails/components/ScruntinyDetails.js
@@ -1,4 +1,4 @@
-import { StatusTable, Row, PDFSvg, CardLabel, CardSubHeader,TextInput  } from "@upyog/digit-ui-react-components";
+import { StatusTable, Row, PDFSvg, CardLabel, CardSubHeader,TextInput,TextArea,UploadFile } from "@upyog/digit-ui-react-components";
 import React, { Fragment,useEffect,useState } from "react";
 import { useTranslation } from "react-i18next";
 
@@ -7,6 +7,15 @@ const ScruntinyDetails = ({ scrutinyDetails, paymentsList=[],additionalDetails,a
   const [development, setDevelopment] = useState()
   const [otherCharges, setOtherCharges] = useState()
   const [lessAdjusment, setLessAdjusment] = useState()
+  const state = Digit.ULBService.getStateId();
+  const [otherChargesDisc, setOtherChargesDisc] = useState()
+  const [uploadedFile, setUploadedFile] = useState();
+  const [uploadedFileLess, setUploadedFileLess] = useState([]);
+  const [file, setFile] = useState();
+  const [uploadMessage, setUploadMessage] = useState("");
+  const [errorFile, setError] = useState(null);
+  const [docLessAdjustment, setDocuments] = useState({});
+  let acceptFormat = ".pdf"
   const styles = {
     buttonStyle: { display: "flex", justifyContent: "flex-start", color: "#a82227" },
     headerStyle: {
@@ -18,13 +27,51 @@ const ScruntinyDetails = ({ scrutinyDetails, paymentsList=[],additionalDetails,a
     },
   };
   const [showSanctionFee, setShowSanctionFee] = useState(false);
-  useEffect(()=>{    
+
+  useEffect(() => {
+    (async () => {
+      setError(null);
+      if (file&& file?.type) {
+        if(!(acceptFormat?.split(",")?.includes(`.${file?.type?.split("/")?.pop()}`)))
+        {
+          setError(t("PT_UPLOAD_FORMAT_NOT_SUPPORTED"));
+        }
+        else if (file.size >= 2000000) {
+          setError(t("PT_MAXIMUM_UPLOAD_SIZE_EXCEEDED"));
+        } else {
+          try {
+            const response = await Digit.UploadServices.Filestorage("property-upload", file, Digit.ULBService.getStateId());
+            if (response?.data?.files?.length > 0) {
+              setUploadedFileLess([...uploadedFileLess,{fileStoreId:response?.data?.files[0]?.fileStoreId, time:new Date()}]);
+            } else {
+              setError(t("PT_FILE_UPLOAD_ERROR"));
+            }
+          } catch (err) {
+          }
+        }
+      }
+    })();        
+  }, [file]);
+
+
+  useEffect(()=>{
+    sessionStorage.setItem("uploadedFileLess",JSON.stringify(uploadedFileLess));
+},[uploadedFileLess])
+
+  useEffect(()=>{   
+    if (additionalDetails?.lessAdjustmentFeeFiles?.length) {
+      const fileStoresIds = additionalDetails?.lessAdjustmentFeeFiles.map((document,index) =>(index===additionalDetails?.lessAdjustmentFeeFiles?.length-1 ? additionalDetails?.lessAdjustmentFeeFiles[additionalDetails?.lessAdjustmentFeeFiles?.length-1]?.fileStoreId : null));
+      Digit.UploadServices.Filefetch(fileStoresIds, state).then((res) => setDocuments(res?.data));
+    } 
       setDevelopment(additionalDetails?.selfCertificationCharges?.BPA_DEVELOPMENT_CHARGES);
       sessionStorage.setItem("development",additionalDetails?.selfCertificationCharges?.BPA_DEVELOPMENT_CHARGES);
       setOtherCharges(additionalDetails?.selfCertificationCharges?.BPA_OTHER_CHARGES);
       sessionStorage.setItem("otherCharges",additionalDetails?.selfCertificationCharges?.BPA_OTHER_CHARGES);
       setLessAdjusment(additionalDetails?.selfCertificationCharges?.BPA_LESS_ADJUSMENT_PLOT);
       sessionStorage.setItem("lessAdjusment",additionalDetails?.selfCertificationCharges?.BPA_LESS_ADJUSMENT_PLOT);
+      setOtherChargesDisc(additionalDetails?.otherFeesDiscription);
+      sessionStorage.setItem("otherChargesDisc",additionalDetails?.otherFeesDiscription);
+      setUploadedFileLess(additionalDetails?.lessAdjustmentFeeFiles);
       },[additionalDetails])
 
   const { t } = useTranslation();
@@ -62,6 +109,16 @@ const ScruntinyDetails = ({ scrutinyDetails, paymentsList=[],additionalDetails,a
     //alert("Please enter numbers")
   }      
   }
+  function setOtherChargesDis(value) {
+    setOtherChargesDisc(value);
+    sessionStorage.setItem("otherChargesDisc",value)  ;
+}
+
+function selectfile(e) {
+    setUploadedFile(e.target.files[0]);
+    setFile(e.target.files[0]);
+ }
+
   return (
     <Fragment>
       {!scrutinyDetails?.isChecklist && <div style={{ background: "#FAFAFA", border: "1px solid #D6D5D4", padding: "8px", borderRadius: "4px", maxWidth: "950px" }}>
@@ -137,6 +194,17 @@ const ScruntinyDetails = ({ scrutinyDetails, paymentsList=[],additionalDetails,a
               onChange={(e) => {setOtherChargesVal(e.target.value)}}
               {...{ required: true, pattern: "^[0-9]*$", type: "text" }}
             />
+            <CardLabel>{t("BPA_COMMON_OTHER_AMT_DISCRIPTION")}</CardLabel>
+            <TextArea
+              t={t}
+              type={"text"}
+              name="otherChargesDiscription"
+              defaultValue={additionalDetails?.selfCertificationCharges?.BPA_COMMON_OTHER_AMT_DISCRIPTION }
+              value={otherChargesDisc}
+              disabled={!isEditApplication}
+              onChange={(e) => {setOtherChargesDis(e.target.value)}}
+              {...{ required: true }}
+            />
             <CardLabel>{t("BPA_COMMON_LESS_AMT")}</CardLabel>
             <TextInput
               t={t}
@@ -150,6 +218,30 @@ const ScruntinyDetails = ({ scrutinyDetails, paymentsList=[],additionalDetails,a
               onChange={(e) => {setLessAdjusmentVal(e.target.value)}}
               {...{ required: true, pattern: "^[0-9]*$", type: "text" }}
             />
+            <CardLabel>{t("BPA_COMMON_LESS_AMT_FILE")}</CardLabel>
+            <UploadFile
+                id={"noc-doc"}
+                style={{marginBottom:"200px"}}
+                onUpload={selectfile}
+                disabled={!isEditApplication}
+                onDelete={() => {
+                    setUploadedFile(null);
+                    setFile("");
+                }}
+                message={uploadedFile ? `1 ${t(`FILEUPLOADED`)}` : t(`ES_NO_FILE_SELECTED_LABEL`)}
+                error={errorFile}
+                uploadMessage={uploadMessage}
+            />
+            {docLessAdjustment?.fileStoreIds?.length && 
+            <CardLabel style={{marginTop:"15px"}}>{t("BPA_COMMON_LESS_AMT_PREVIOUS_FILE")}</CardLabel>            
+            }
+            {docLessAdjustment?.fileStoreIds?.length &&             
+              <a   target="_blank" href={docLessAdjustment?.fileStoreIds[docLessAdjustment?.fileStoreIds?.length-1]?.url}>
+              <PDFSvg />
+            </a>
+            }            
+            <Row className="border-none"></Row>
+       <Row  className="border-none" label={t(`BPA_P2_TOTAL_FEE`)} text={`₹ ${(parseInt(development)+parseInt(otherCharges)+parseInt(additionalDetails?.selfCertificationCharges?.BPA_MALBA_CHARGES)+parseInt(additionalDetails?.selfCertificationCharges?.BPA_LABOUR_CESS)+parseInt(additionalDetails?.selfCertificationCharges?.BPA_WATER_CHARGES)+parseInt(additionalDetails?.selfCertificationCharges?.BPA_GAUSHALA_CHARGES_CESS))-parseInt(lessAdjusment)}`} />
             </div>}
           </div>
           }          
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/templates/ApplicationDetails/index.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/templates/ApplicationDetails/index.js
index 3da7a4f07e3..009c7a57b23 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/templates/ApplicationDetails/index.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/templates/ApplicationDetails/index.js
@@ -60,7 +60,7 @@ const ApplicationDetails = (props) => {
 
   function onActionSelect(action) {
     if (action) {
-      if(action?.action=="EDIT"){
+      if(action?.action=="EDIT PAY 2" && window.location.href.includes("bpa")){
         window.location.assign(window.location.href.split("bpa")[0]+"editApplication/bpa"+window.location.href.split("bpa")[1]);
       }
       if(action?.isToast){
@@ -81,7 +81,7 @@ const ApplicationDetails = (props) => {
         else {
           window.location.assign(`${window.location.origin}/digit-ui/employee/payment/collect/${action?.redirectionUrll?.pathname}`);
         }
-      } else if (!action?.redirectionUrl && action?.action!="EDIT") {
+      } else if (!action?.redirectionUrl && action?.action!="EDIT PAY 2") {
         setShowModal(true);
       } else {
         history.push({
@@ -110,6 +110,9 @@ const ApplicationDetails = (props) => {
     {
      alert("Please fill in the comments before submitting")
     }
+    else if( data?.BPA?.businessService=="BPA" && !data?.BPA?.additionalDetails?.blockingReason && data?.BPA?.workflow?.action=="BLOCK"){
+      alert("Please select Blocking reason")
+    }
     else{
       setIsEnableLoader(true);
       if (typeof data?.customFunctionToExecute === "function") {
@@ -214,6 +217,8 @@ const ApplicationDetails = (props) => {
     bpaDetails.BPA.additionalDetails.selfCertificationCharges.BPA_DEVELOPMENT_CHARGES=sessionStorage.getItem("development");
     bpaDetails.BPA.additionalDetails.selfCertificationCharges.BPA_OTHER_CHARGES=sessionStorage.getItem("otherCharges");
     bpaDetails.BPA.additionalDetails.selfCertificationCharges.BPA_LESS_ADJUSMENT_PLOT=sessionStorage.getItem("lessAdjusment");
+    bpaDetails.BPA.additionalDetails.otherFeesDiscription=sessionStorage.getItem("otherChargesDisc");
+    bpaDetails.BPA.additionalDetails.lessAdjustmentFeeFiles=JSON.parse(sessionStorage.getItem("uploadedFileLess"));
     if (!bpaDetails.BPA.additionalDetails.selfCertificationCharges.BPA_DEVELOPMENT_CHARGES || !bpaDetails.BPA.additionalDetails.selfCertificationCharges.BPA_OTHER_CHARGES || !bpaDetails.BPA.additionalDetails.selfCertificationCharges.BPA_LESS_ADJUSMENT_PLOT ){
       alert("Please fill P2 Manual Fees");}
     else if(parseInt(sessionStorage.getItem("lessAdjusment"))>(parseInt(sessionStorage.getItem("development"))+parseInt(sessionStorage.getItem("otherCharges"))+parseInt(bpaDetails?.BPA?.additionalDetails?.selfCertificationCharges?.BPA_MALBA_CHARGES)+parseInt(bpaDetails?.BPA?.additionalDetails?.selfCertificationCharges?.BPA_LABOUR_CESS)+parseInt(bpaDetails?.BPA?.additionalDetails?.selfCertificationCharges?.BPA_WATER_CHARGES)+parseInt(bpaDetails?.BPA?.additionalDetails?.selfCertificationCharges?.BPA_GAUSHALA_CHARGES_CESS))){