Update src/streamlit_app.py

src/streamlit_app.py

@@ -537,687 +537,689 @@ elif st.session_state.page == 'viewer':
     
     # LEFT SIDE: Image Display with OCR Canvas
     with left_col:
-        file_name = current_record.get('file_name', '')
-        
-        if file_name:
-            # Find the actual file name (handle cases where extension is missing)
-            actual_file_name = None
-            if file_name in st.session_state.images:
-                actual_file_name = file_name
-            else:
-                # Try adding common extensions
-                for ext in ['.pdf', '.png', '.jpg', '.jpeg', '.tiff', '.tif', '.bmp']:
-                    if file_name + ext in st.session_state.images:
-                        actual_file_name = file_name + ext
-                        break
-                
-                # Try matching without extension
-                if not actual_file_name:
-                    for uploaded_name in st.session_state.images.keys():
-                        uploaded_base = uploaded_name.rsplit('.', 1)[0]
-                        if uploaded_base == file_name:
-                            actual_file_name = uploaded_name
-                            break
+        with st.container(height=700, border=True):
+            file_name = current_record.get('file_name', '')
             
-            if actual_file_name:
-                # Check if this is a PDF with multiple pages
-                is_pdf = actual_file_name in st.session_state.pdf_metadata
-                
-                if is_pdf:
-                    pdf_meta = st.session_state.pdf_metadata[actual_file_name]
-                    total_pages = pdf_meta['total_pages']
-                    current_page = st.session_state.current_page_num.get(actual_file_name, 0)
-                    
-                    # PDF Navigation Header
-                    col_prev, col_info, col_next = st.columns([1, 2, 1])
-                    
-                    with col_prev:
-                        prev_clicked = st.button("⬅️ Previous", key=f"prev_page_{selected_file}_{actual_file_name}", 
-                                   disabled=(current_page == 0), use_container_width=True)
+            if file_name:
+                # Find the actual file name (handle cases where extension is missing)
+                actual_file_name = None
+                if file_name in st.session_state.images:
+                    actual_file_name = file_name
+                else:
+                    # Try adding common extensions
+                    for ext in ['.pdf', '.png', '.jpg', '.jpeg', '.tiff', '.tif', '.bmp']:
+                        if file_name + ext in st.session_state.images:
+                            actual_file_name = file_name + ext
+                            break
                     
-                    with col_info:
-                        st.markdown(f"<div style='text-align: center; padding: 5px;'><b>📄 Page {current_page + 1} of {total_pages}</b></div>", unsafe_allow_html=True)
+                    # Try matching without extension
+                    if not actual_file_name:
+                        for uploaded_name in st.session_state.images.keys():
+                            uploaded_base = uploaded_name.rsplit('.', 1)[0]
+                            if uploaded_base == file_name:
+                                actual_file_name = uploaded_name
+                                break
+                
+                if actual_file_name:
+                    # Check if this is a PDF with multiple pages
+                    is_pdf = actual_file_name in st.session_state.pdf_metadata
                     
-                    with col_next:
-                        next_clicked = st.button("Next ➡️", key=f"next_page_{selected_file}_{actual_file_name}",
-                                   disabled=(current_page >= total_pages - 1), use_container_width=True)
+                    if is_pdf:
+                        pdf_meta = st.session_state.pdf_metadata[actual_file_name]
+                        total_pages = pdf_meta['total_pages']
+                        current_page = st.session_state.current_page_num.get(actual_file_name, 0)
+                        
+                        # PDF Navigation Header
+                        col_prev, col_info, col_next = st.columns([1, 2, 1])
+                        
+                        with col_prev:
+                            prev_clicked = st.button("⬅️ Previous", key=f"prev_page_{selected_file}_{actual_file_name}", 
+                                       disabled=(current_page == 0), use_container_width=True)
+                        
+                        with col_info:
+                            st.markdown(f"<div style='text-align: center; padding: 5px;'><b>📄 Page {current_page + 1} of {total_pages}</b></div>", unsafe_allow_html=True)
+                        
+                        with col_next:
+                            next_clicked = st.button("Next ➡️", key=f"next_page_{selected_file}_{actual_file_name}",
+                                       disabled=(current_page >= total_pages - 1), use_container_width=True)
+                        
+                        # Handle navigation only if not already navigating
+                        if not st.session_state.navigating_page:
+                            if prev_clicked:
+                                st.session_state.navigating_page = True
+                                st.session_state.current_page_num[actual_file_name] = max(0, current_page - 1)
+                                st.session_state.canvas_key += 1
+                                st.session_state.ocr_active_section = None
+                                st.session_state.ocr_active_field = None
+                                st.rerun()
+                            elif next_clicked:
+                                st.session_state.navigating_page = True
+                                st.session_state.current_page_num[actual_file_name] = min(total_pages - 1, current_page + 1)
+                                st.session_state.canvas_key += 1
+                                st.session_state.ocr_active_section = None
+                                st.session_state.ocr_active_field = None
+                                st.rerun()
+                        else:
+                            # Reset the flag after rerun
+                            st.session_state.navigating_page = False
+                
+                if actual_file_name:
+                    # Determine if PDF and get the appropriate image
+                    is_pdf = actual_file_name in st.session_state.pdf_metadata
                     
-                    # Handle navigation only if not already navigating
-                    if not st.session_state.navigating_page:
-                        if prev_clicked:
-                            st.session_state.navigating_page = True
-                            st.session_state.current_page_num[actual_file_name] = max(0, current_page - 1)
-                            st.session_state.canvas_key += 1
-                            st.session_state.ocr_active_section = None
-                            st.session_state.ocr_active_field = None
-                            st.rerun()
-                        elif next_clicked:
-                            st.session_state.navigating_page = True
-                            st.session_state.current_page_num[actual_file_name] = min(total_pages - 1, current_page + 1)
-                            st.session_state.canvas_key += 1
-                            st.session_state.ocr_active_section = None
-                            st.session_state.ocr_active_field = None
-                            st.rerun()
+                    if is_pdf:
+                        # Get the current page image
+                        current_page = st.session_state.current_page_num.get(actual_file_name, 0)
+                        pdf_meta = st.session_state.pdf_metadata[actual_file_name]
+                        current_image = pdf_meta['pages'][current_page]
                     else:
-                        # Reset the flag after rerun
-                        st.session_state.navigating_page = False
-            
-            if actual_file_name:
-                # Determine if PDF and get the appropriate image
-                is_pdf = actual_file_name in st.session_state.pdf_metadata
-                
-                if is_pdf:
-                    # Get the current page image
-                    current_page = st.session_state.current_page_num.get(actual_file_name, 0)
-                    pdf_meta = st.session_state.pdf_metadata[actual_file_name]
-                    current_image = pdf_meta['pages'][current_page]
+                        current_image = st.session_state.images[actual_file_name]
                 else:
-                    current_image = st.session_state.images[actual_file_name]
-            else:
-                st.error(f"❌ File '{file_name}' not found in uploaded files")
-                st.info("💡 Available files:")
-                with st.expander("Show available files"):
-                    for img_name in list(st.session_state.images.keys())[:20]:
-                        st.text(f"  • {img_name}")
-                    if len(st.session_state.images) > 20:
-                        st.text(f"  ... and {len(st.session_state.images) - 20} more")
-            
-            if current_image:
-                # Scale to a reasonable size so canvas doesn't become excessively large
-                scaled_image, scale_ratio, paste_x, paste_y = scale_image_to_fixed_size(current_image)
+                    st.error(f"❌ File '{file_name}' not found in uploaded files")
+                    st.info("💡 Available files:")
+                    with st.expander("Show available files"):
+                        for img_name in list(st.session_state.images.keys())[:20]:
+                            st.text(f"  • {img_name}")
+                        if len(st.session_state.images) > 20:
+                            st.text(f"  ... and {len(st.session_state.images) - 20} more")
                 
-                # Render the canvas. Its internal canvas will be constrained by the wrapper due to CSS above.
-                canvas_result = st_canvas(
-                    fill_color="rgba(255, 165, 0, 0.3)",
-                    stroke_width=2,
-                    stroke_color="#FF0000",
-                    background_image=scaled_image,
-                    update_streamlit=True,
-                    height=scaled_image.height,
-                    width=scaled_image.width,
-                    drawing_mode="rect",
-                    key=f"canvas_{selected_file}_{st.session_state.canvas_key}",
-                )
-                
-                # Only attempt OCR if there's an active OCR target AND the user has drawn something (objects exist)
-                if canvas_result.json_data is not None and st.session_state.ocr_active_field:
-                    objects = canvas_result.json_data.get("objects", [])
-                    if len(objects) > 0:
-                        rect = objects[-1]
-                        
-                        bbox = [
-                            (rect["left"] - paste_x) / scale_ratio,
-                            (rect["top"] - paste_y) / scale_ratio,
-                            (rect["left"] + rect["width"] - paste_x) / scale_ratio,
-                            (rect["top"] + rect["height"] - paste_y) / scale_ratio
-                        ]
-                        
-                        with st.spinner("Performing OCR..."):
-                            ocr_text = perform_ocr(current_image, bbox)
-                        
-                        if ocr_text and not ocr_text.startswith("OCR Error"):
-                            st.success(f"✅ OCR Result: {ocr_text}")
+                if current_image:
+                    # Scale to a reasonable size so canvas doesn't become excessively large
+                    scaled_image, scale_ratio, paste_x, paste_y = scale_image_to_fixed_size(current_image)
+                    
+                    # Render the canvas. Its internal canvas will be constrained by the wrapper due to CSS above.
+                    canvas_result = st_canvas(
+                        fill_color="rgba(255, 165, 0, 0.3)",
+                        stroke_width=2,
+                        stroke_color="#FF0000",
+                        background_image=scaled_image,
+                        update_streamlit=True,
+                        height=scaled_image.height,
+                        width=scaled_image.width,
+                        drawing_mode="rect",
+                        key=f"canvas_{selected_file}_{st.session_state.canvas_key}",
+                    )
+                    
+                    # Only attempt OCR if there's an active OCR target AND the user has drawn something (objects exist)
+                    if canvas_result.json_data is not None and st.session_state.ocr_active_field:
+                        objects = canvas_result.json_data.get("objects", [])
+                        if len(objects) > 0:
+                            rect = objects[-1]
+                            
+                            bbox = [
+                                (rect["left"] - paste_x) / scale_ratio,
+                                (rect["top"] - paste_y) / scale_ratio,
+                                (rect["left"] + rect["width"] - paste_x) / scale_ratio,
+                                (rect["top"] + rect["height"] - paste_y) / scale_ratio
+                            ]
                             
-                            gt_parse = st.session_state.edited_data[selected_file].get('gt_parse', {})
+                            with st.spinner("Performing OCR..."):
+                                ocr_text = perform_ocr(current_image, bbox)
                             
-                            if st.session_state.ocr_active_section == 'Line_items':
-                                line_items = gt_parse.get('Line_items', [])
-                                row_idx = st.session_state.ocr_line_item_row
-                                if row_idx is not None and row_idx < len(line_items):
-                                    line_items[row_idx][st.session_state.ocr_active_field] = ocr_text
-                                    gt_parse['Line_items'] = line_items
+                            if ocr_text and not ocr_text.startswith("OCR Error"):
+                                st.success(f"✅ OCR Result: {ocr_text}")
+                                
+                                gt_parse = st.session_state.edited_data[selected_file].get('gt_parse', {})
+                                
+                                if st.session_state.ocr_active_section == 'Line_items':
+                                    line_items = gt_parse.get('Line_items', [])
+                                    row_idx = st.session_state.ocr_line_item_row
+                                    if row_idx is not None and row_idx < len(line_items):
+                                        line_items[row_idx][st.session_state.ocr_active_field] = ocr_text
+                                        gt_parse['Line_items'] = line_items
 
-                                    # ensure expander stays open for this row after OCR
-                                    expander_key = f"line_item_expander_{selected_file}_{row_idx}"
-                                    st.session_state[expander_key] = True
+                                        # ensure expander stays open for this row after OCR
+                                        expander_key = f"line_item_expander_{selected_file}_{row_idx}"
+                                        st.session_state[expander_key] = True
+                                else:
+                                    section = st.session_state.ocr_active_section
+                                    field = st.session_state.ocr_active_field
+                                    if section not in gt_parse:
+                                        gt_parse[section] = {}
+                                    gt_parse[section][field] = ocr_text
+                                
+                                st.session_state.edited_data[selected_file]['gt_parse'] = gt_parse
+                                st.session_state.modified_indices.add(selected_file)
+                                
+                                # After successful OCR, deactivate OCR target to prevent repeated triggers/loops
+                                st.session_state.ocr_active_section = None
+                                st.session_state.ocr_active_field = None
+                                st.session_state.ocr_line_item_row = None
+                                
+                                # Clear canvas for next OCR by bumping canvas_key then rerun
+                                st.session_state.canvas_key += 1
+                                st.rerun()
                             else:
-                                section = st.session_state.ocr_active_section
-                                field = st.session_state.ocr_active_field
-                                if section not in gt_parse:
-                                    gt_parse[section] = {}
-                                gt_parse[section][field] = ocr_text
-                            
-                            st.session_state.edited_data[selected_file]['gt_parse'] = gt_parse
-                            st.session_state.modified_indices.add(selected_file)
-                            
-                            # After successful OCR, deactivate OCR target to prevent repeated triggers/loops
-                            st.session_state.ocr_active_section = None
-                            st.session_state.ocr_active_field = None
-                            st.session_state.ocr_line_item_row = None
-                            
-                            # Clear canvas for next OCR by bumping canvas_key then rerun
-                            st.session_state.canvas_key += 1
-                            st.rerun()
-                        else:
-                            st.error(ocr_text)
-        else:
-            st.warning("No file name specified in record")
+                                st.error(ocr_text)
+            else:
+                st.warning("No file name specified in record")
     
     # RIGHT SIDE: Editable Details
     with right_col:
-        st.markdown("### 📝 Document Details")
-        
-        gt_parse = st.session_state.edited_data[selected_file].get('gt_parse', {})
-        
-        tab1, tab2, tab3, tab4 = st.tabs([
-            "📄 Remittance Details", 
-            "👥 Party Details", 
-            "🏦 Bank Details", 
-            "📋 Line Items"
-        ])
-        
-        # TAB 1: Remittance Details
-        with tab1:
-            remittance = gt_parse.get('Remittance_details', {})
-            
-            # Each field with OCR button
-            col_input, col_btn = st.columns([5, 1])
-            with col_input:
-                remittance['Remittance_adv_no'] = st.text_input(
-                    "Remittance Advice No", 
-                    value=remittance.get('Remittance_adv_no', ''),
-                    key=f"rem_adv_no_{selected_file}"
-                )
-            with col_btn:
-                st.markdown("<br>", unsafe_allow_html=True)
-                if st.button("🔍", key=f"ocr_rem_adv_no_{selected_file}", 
-                           type="primary" if is_ocr_active('Remittance_details', 'Remittance_adv_no') else "secondary"):
-                    activate_ocr_field('Remittance_details', 'Remittance_adv_no')
-            
-            col_input, col_btn = st.columns([5, 1])
-            with col_input:
-                remittance['Remittance_adv_date'] = st.text_input(
-                    "Remittance Advice Date", 
-                    value=remittance.get('Remittance_adv_date', ''),
-                    key=f"rem_adv_date_{selected_file}"
-                )
-            with col_btn:
-                st.markdown("<br>", unsafe_allow_html=True)
-                if st.button("🔍", key=f"ocr_rem_adv_date_{selected_file}", 
-                           type="primary" if is_ocr_active('Remittance_details', 'Remittance_adv_date') else "secondary"):
-                    activate_ocr_field('Remittance_details', 'Remittance_adv_date')
-            
-            col_input, col_btn = st.columns([5, 1])
-            with col_input:
-                remittance['Payment_method'] = st.text_input(
-                    "Payment Method", 
-                    value=remittance.get('Payment_method', ''),
-                    key=f"payment_method_{selected_file}"
-                )
-            with col_btn:
-                st.markdown("<br>", unsafe_allow_html=True)
-                if st.button("🔍", key=f"ocr_payment_method_{selected_file}", 
-                           type="primary" if is_ocr_active('Remittance_details', 'Payment_method') else "secondary"):
-                    activate_ocr_field('Remittance_details', 'Payment_method')
-            
-            col_input, col_btn = st.columns([5, 1])
-            with col_input:
-                remittance['FCY'] = st.text_input(
-                    "FCY (Foreign Currency)", 
-                    value=remittance.get('FCY', ''),
-                    key=f"fcy_{selected_file}"
-                )
-            with col_btn:
-                st.markdown("<br>", unsafe_allow_html=True)
-                if st.button("🔍", key=f"ocr_fcy_{selected_file}", 
-                           type="primary" if is_ocr_active('Remittance_details', 'FCY') else "secondary"):
-                    activate_ocr_field('Remittance_details', 'FCY')
-            
-            col_input, col_btn = st.columns([5, 1])
-            with col_input:
-                remittance['Total_payment_amt_FCY'] = st.text_input(
-                    "Total Payment Amount (FCY)", 
-                    value=remittance.get('Total_payment_amt_FCY', ''),
-                    key=f"total_payment_{selected_file}"
-                )
-            with col_btn:
-                st.markdown("<br>", unsafe_allow_html=True)
-                if st.button("🔍", key=f"ocr_total_payment_{selected_file}", 
-                           type="primary" if is_ocr_active('Remittance_details', 'Total_payment_amt_FCY') else "secondary"):
-                    activate_ocr_field('Remittance_details', 'Total_payment_amt_FCY')
-            
-            col_input, col_btn = st.columns([5, 1])
-            with col_input:
-                remittance['Payment_date'] = st.text_input(
-                    "Payment Date", 
-                    value=remittance.get('Payment_date', ''),
-                    key=f"payment_date_{selected_file}"
-                )
-            with col_btn:
-                st.markdown("<br>", unsafe_allow_html=True)
-                if st.button("🔍", key=f"ocr_payment_date_{selected_file}", 
-                           type="primary" if is_ocr_active('Remittance_details', 'Payment_date') else "secondary"):
-                    activate_ocr_field('Remittance_details', 'Payment_date')
-            
-            col_input, col_btn = st.columns([5, 1])
-            with col_input:
-                remittance['Payment_ref_no'] = st.text_input(
-                    "Payment Reference No", 
-                    value=remittance.get('Payment_ref_no', ''),
-                    key=f"payment_ref_{selected_file}"
-                )
-            with col_btn:
-                st.markdown("<br>", unsafe_allow_html=True)
-                if st.button("🔍", key=f"ocr_payment_ref_{selected_file}", 
-                           type="primary" if is_ocr_active('Remittance_details', 'Payment_ref_no') else "secondary"):
-                    activate_ocr_field('Remittance_details', 'Payment_ref_no')
-            
-            gt_parse['Remittance_details'] = remittance
-        
-        # TAB 2: Customer/Supplier Details with SWAP button
-        with tab2:
-            # SWAP BUTTON - Centered and prominent
-            col1, col2, col3 = st.columns([1, 2, 1])
-            with col2:
-                if st.button("🔄 Swap Customer ↔ Supplier", key=f"swap_btn_{selected_file}", 
-                           type="primary", use_container_width=True):
-                    if not st.session_state.just_swapped:
-                        st.session_state.just_swapped = True
-                        swap_customer_supplier_details(selected_file)
-                        st.rerun()
-            
-            # Reset the flag after rerun
-            if st.session_state.just_swapped:
-                st.session_state.just_swapped = False
+        with st.container(height=700, border=True):
+            st.markdown("### 📝 Document Details")
             
-            st.markdown("**Customer Details**")
-            customer_supplier = gt_parse.get('Customer_supplier_details', {})
+            gt_parse = st.session_state.edited_data[selected_file].get('gt_parse', {})
             
-            col_input, col_btn = st.columns([5, 1])
-            with col_input:
-                customer_supplier['Customer_name'] = st.text_input(
-                    "Customer Name", 
-                    value=customer_supplier.get('Customer_name', ''),
-                    key=f"cust_name_{selected_file}"
-                )
-            with col_btn:
-                st.markdown("<br>", unsafe_allow_html=True)
-                if st.button("🔍", key=f"ocr_cust_name_{selected_file}", 
-                           type="primary" if is_ocr_active('Customer_supplier_details', 'Customer_name') else "secondary"):
-                    activate_ocr_field('Customer_supplier_details', 'Customer_name')
+            tab1, tab2, tab3, tab4 = st.tabs([
+                "📄 Remittance Details", 
+                "👥 Party Details", 
+                "🏦 Bank Details", 
+                "📋 Line Items"
+            ])
             
-            col_input, col_btn = st.columns([5, 1])
-            with col_input:
-                customer_supplier['Customer_address'] = st.text_area(
-                    "Customer Address", 
-                    value=customer_supplier.get('Customer_address', ''),
-                    key=f"cust_addr_{selected_file}",
-                    height=60
-                )
-            with col_btn:
-                st.markdown("<br>", unsafe_allow_html=True)
-                if st.button("🔍", key=f"ocr_cust_addr_{selected_file}", 
-                           type="primary" if is_ocr_active('Customer_supplier_details', 'Customer_address') else "secondary"):
-                    activate_ocr_field('Customer_supplier_details', 'Customer_address')
-            
-            col_input, col_btn = st.columns([5, 1])
-            with col_input:
-                customer_supplier['Customer_contact_info'] = st.text_input(
-                    "Customer Contact Info", 
-                    value=customer_supplier.get('Customer_contact_info', ''),
-                    key=f"cust_contact_{selected_file}"
-                )
-            with col_btn:
-                st.markdown("<br>", unsafe_allow_html=True)
-                if st.button("🔍", key=f"ocr_cust_contact_{selected_file}", 
-                           type="primary" if is_ocr_active('Customer_supplier_details', 'Customer_contact_info') else "secondary"):
-                    activate_ocr_field('Customer_supplier_details', 'Customer_contact_info')
-            
-            st.markdown("**Supplier Details**")
-            
-            col_input, col_btn = st.columns([5, 1])
-            with col_input:
-                customer_supplier['Supplier_name'] = st.text_input(
-                    "Supplier Name", 
-                    value=customer_supplier.get('Supplier_name', ''),
-                    key=f"supp_name_{selected_file}"
-                )
-            with col_btn:
-                st.markdown("<br>", unsafe_allow_html=True)
-                if st.button("🔍", key=f"ocr_supp_name_{selected_file}", 
-                           type="primary" if is_ocr_active('Customer_supplier_details', 'Supplier_name') else "secondary"):
-                    activate_ocr_field('Customer_supplier_details', 'Supplier_name')
-            
-            col_input, col_btn = st.columns([5, 1])
-            with col_input:
-                customer_supplier['Supplier_address'] = st.text_area(
-                    "Supplier Address", 
-                    value=customer_supplier.get('Supplier_address', ''),
-                    key=f"supp_addr_{selected_file}",
-                    height=60
-                )
-            with col_btn:
-                st.markdown("<br>", unsafe_allow_html=True)
-                if st.button("🔍", key=f"ocr_supp_addr_{selected_file}", 
-                           type="primary" if is_ocr_active('Customer_supplier_details', 'Supplier_address') else "secondary"):
-                    activate_ocr_field('Customer_supplier_details', 'Supplier_address')
-            
-            col_input, col_btn = st.columns([5, 1])
-            with col_input:
-                customer_supplier['Supplier_contact_info'] = st.text_input(
-                    "Supplier Contact Info", 
-                    value=customer_supplier.get('Supplier_contact_info', ''),
-                    key=f"supp_contact_{selected_file}"
-                )
-            with col_btn:
-                st.markdown("<br>", unsafe_allow_html=True)
-                if st.button("🔍", key=f"ocr_supp_contact_{selected_file}", 
-                           type="primary" if is_ocr_active('Customer_supplier_details', 'Supplier_contact_info') else "secondary"):
-                    activate_ocr_field('Customer_supplier_details', 'Supplier_contact_info')
-            
-            gt_parse['Customer_supplier_details'] = customer_supplier
-        
-        # TAB 3: Bank Details
-        with tab3:
-            bank = gt_parse.get('Bank_details', {})
-            
-            col_input, col_btn = st.columns([5, 1])
-            with col_input:
-                bank['Bank_name'] = st.text_input(
-                    "Bank Name", 
-                    value=bank.get('Bank_name', ''),
-                    key=f"bank_name_{selected_file}"
-                )
-            with col_btn:
-                st.markdown("<br>", unsafe_allow_html=True)
-                if st.button("🔍", key=f"ocr_bank_name_{selected_file}", 
-                           type="primary" if is_ocr_active('Bank_details', 'Bank_name') else "secondary"):
-                    activate_ocr_field('Bank_details', 'Bank_name')
-            
-            col_input, col_btn = st.columns([5, 1])
-            with col_input:
-                bank['Bank_acc_no'] = st.text_input(
-                    "Bank Account No", 
-                    value=bank.get('Bank_acc_no', ''),
-                    key=f"bank_acc_{selected_file}"
-                )
-            with col_btn:
-                st.markdown("<br>", unsafe_allow_html=True)
-                if st.button("🔍", key=f"ocr_bank_acc_{selected_file}", 
-                           type="primary" if is_ocr_active('Bank_details', 'Bank_acc_no') else "secondary"):
-                    activate_ocr_field('Bank_details', 'Bank_acc_no')
-            
-            col_input, col_btn = st.columns([5, 1])
-            with col_input:
-                bank['Bank_routing_no'] = st.text_input(
-                    "Bank Routing No", 
-                    value=bank.get('Bank_routing_no', ''),
-                    key=f"bank_routing_{selected_file}"
-                )
-            with col_btn:
-                st.markdown("<br>", unsafe_allow_html=True)
-                if st.button("🔍", key=f"ocr_bank_routing_{selected_file}", 
-                           type="primary" if is_ocr_active('Bank_details', 'Bank_routing_no') else "secondary"):
-                    activate_ocr_field('Bank_details', 'Bank_routing_no')
+            # TAB 1: Remittance Details
+            with tab1:
+                remittance = gt_parse.get('Remittance_details', {})
+                
+                # Each field with OCR button
+                col_input, col_btn = st.columns([5, 1])
+                with col_input:
+                    remittance['Remittance_adv_no'] = st.text_input(
+                        "Remittance Advice No", 
+                        value=remittance.get('Remittance_adv_no', ''),
+                        key=f"rem_adv_no_{selected_file}"
+                    )
+                with col_btn:
+                    st.markdown("<br>", unsafe_allow_html=True)
+                    if st.button("🔍", key=f"ocr_rem_adv_no_{selected_file}", 
+                               type="primary" if is_ocr_active('Remittance_details', 'Remittance_adv_no') else "secondary"):
+                        activate_ocr_field('Remittance_details', 'Remittance_adv_no')
+                
+                col_input, col_btn = st.columns([5, 1])
+                with col_input:
+                    remittance['Remittance_adv_date'] = st.text_input(
+                        "Remittance Advice Date", 
+                        value=remittance.get('Remittance_adv_date', ''),
+                        key=f"rem_adv_date_{selected_file}"
+                    )
+                with col_btn:
+                    st.markdown("<br>", unsafe_allow_html=True)
+                    if st.button("🔍", key=f"ocr_rem_adv_date_{selected_file}", 
+                               type="primary" if is_ocr_active('Remittance_details', 'Remittance_adv_date') else "secondary"):
+                        activate_ocr_field('Remittance_details', 'Remittance_adv_date')
+                
+                col_input, col_btn = st.columns([5, 1])
+                with col_input:
+                    remittance['Payment_method'] = st.text_input(
+                        "Payment Method", 
+                        value=remittance.get('Payment_method', ''),
+                        key=f"payment_method_{selected_file}"
+                    )
+                with col_btn:
+                    st.markdown("<br>", unsafe_allow_html=True)
+                    if st.button("🔍", key=f"ocr_payment_method_{selected_file}", 
+                               type="primary" if is_ocr_active('Remittance_details', 'Payment_method') else "secondary"):
+                        activate_ocr_field('Remittance_details', 'Payment_method')
+                
+                col_input, col_btn = st.columns([5, 1])
+                with col_input:
+                    remittance['FCY'] = st.text_input(
+                        "FCY (Foreign Currency)", 
+                        value=remittance.get('FCY', ''),
+                        key=f"fcy_{selected_file}"
+                    )
+                with col_btn:
+                    st.markdown("<br>", unsafe_allow_html=True)
+                    if st.button("🔍", key=f"ocr_fcy_{selected_file}", 
+                               type="primary" if is_ocr_active('Remittance_details', 'FCY') else "secondary"):
+                        activate_ocr_field('Remittance_details', 'FCY')
+                
+                col_input, col_btn = st.columns([5, 1])
+                with col_input:
+                    remittance['Total_payment_amt_FCY'] = st.text_input(
+                        "Total Payment Amount (FCY)", 
+                        value=remittance.get('Total_payment_amt_FCY', ''),
+                        key=f"total_payment_{selected_file}"
+                    )
+                with col_btn:
+                    st.markdown("<br>", unsafe_allow_html=True)
+                    if st.button("🔍", key=f"ocr_total_payment_{selected_file}", 
+                               type="primary" if is_ocr_active('Remittance_details', 'Total_payment_amt_FCY') else "secondary"):
+                        activate_ocr_field('Remittance_details', 'Total_payment_amt_FCY')
+                
+                col_input, col_btn = st.columns([5, 1])
+                with col_input:
+                    remittance['Payment_date'] = st.text_input(
+                        "Payment Date", 
+                        value=remittance.get('Payment_date', ''),
+                        key=f"payment_date_{selected_file}"
+                    )
+                with col_btn:
+                    st.markdown("<br>", unsafe_allow_html=True)
+                    if st.button("🔍", key=f"ocr_payment_date_{selected_file}", 
+                               type="primary" if is_ocr_active('Remittance_details', 'Payment_date') else "secondary"):
+                        activate_ocr_field('Remittance_details', 'Payment_date')
+                
+                col_input, col_btn = st.columns([5, 1])
+                with col_input:
+                    remittance['Payment_ref_no'] = st.text_input(
+                        "Payment Reference No", 
+                        value=remittance.get('Payment_ref_no', ''),
+                        key=f"payment_ref_{selected_file}"
+                    )
+                with col_btn:
+                    st.markdown("<br>", unsafe_allow_html=True)
+                    if st.button("🔍", key=f"ocr_payment_ref_{selected_file}", 
+                               type="primary" if is_ocr_active('Remittance_details', 'Payment_ref_no') else "secondary"):
+                        activate_ocr_field('Remittance_details', 'Payment_ref_no')
+                
+                gt_parse['Remittance_details'] = remittance
             
-            col_input, col_btn = st.columns([5, 1])
-            with col_input:
-                bank['Swift_code'] = st.text_input(
-                    "SWIFT Code", 
-                    value=bank.get('Swift_code', ''),
-                    key=f"swift_{selected_file}"
-                )
-            with col_btn:
-                st.markdown("<br>", unsafe_allow_html=True)
-                if st.button("🔍", key=f"ocr_swift_{selected_file}", 
-                           type="primary" if is_ocr_active('Bank_details', 'Swift_code') else "secondary"):
-                    activate_ocr_field('Bank_details', 'Swift_code')
+            # TAB 2: Customer/Supplier Details with SWAP button
+            with tab2:
+                # SWAP BUTTON - Centered and prominent
+                col1, col2, col3 = st.columns([1, 2, 1])
+                with col2:
+                    if st.button("🔄 Swap Customer ↔ Supplier", key=f"swap_btn_{selected_file}", 
+                               type="primary", use_container_width=True):
+                        if not st.session_state.just_swapped:
+                            st.session_state.just_swapped = True
+                            swap_customer_supplier_details(selected_file)
+                            st.rerun()
+                
+                # Reset the flag after rerun
+                if st.session_state.just_swapped:
+                    st.session_state.just_swapped = False
+                
+                st.markdown("**Customer Details**")
+                customer_supplier = gt_parse.get('Customer_supplier_details', {})
+                
+                col_input, col_btn = st.columns([5, 1])
+                with col_input:
+                    customer_supplier['Customer_name'] = st.text_input(
+                        "Customer Name", 
+                        value=customer_supplier.get('Customer_name', ''),
+                        key=f"cust_name_{selected_file}"
+                    )
+                with col_btn:
+                    st.markdown("<br>", unsafe_allow_html=True)
+                    if st.button("🔍", key=f"ocr_cust_name_{selected_file}", 
+                               type="primary" if is_ocr_active('Customer_supplier_details', 'Customer_name') else "secondary"):
+                        activate_ocr_field('Customer_supplier_details', 'Customer_name')
+                
+                col_input, col_btn = st.columns([5, 1])
+                with col_input:
+                    customer_supplier['Customer_address'] = st.text_area(
+                        "Customer Address", 
+                        value=customer_supplier.get('Customer_address', ''),
+                        key=f"cust_addr_{selected_file}",
+                        height=60
+                    )
+                with col_btn:
+                    st.markdown("<br>", unsafe_allow_html=True)
+                    if st.button("🔍", key=f"ocr_cust_addr_{selected_file}", 
+                               type="primary" if is_ocr_active('Customer_supplier_details', 'Customer_address') else "secondary"):
+                        activate_ocr_field('Customer_supplier_details', 'Customer_address')
+                
+                col_input, col_btn = st.columns([5, 1])
+                with col_input:
+                    customer_supplier['Customer_contact_info'] = st.text_input(
+                        "Customer Contact Info", 
+                        value=customer_supplier.get('Customer_contact_info', ''),
+                        key=f"cust_contact_{selected_file}"
+                    )
+                with col_btn:
+                    st.markdown("<br>", unsafe_allow_html=True)
+                    if st.button("🔍", key=f"ocr_cust_contact_{selected_file}", 
+                               type="primary" if is_ocr_active('Customer_supplier_details', 'Customer_contact_info') else "secondary"):
+                        activate_ocr_field('Customer_supplier_details', 'Customer_contact_info')
+                
+                st.markdown("**Supplier Details**")
+                
+                col_input, col_btn = st.columns([5, 1])
+                with col_input:
+                    customer_supplier['Supplier_name'] = st.text_input(
+                        "Supplier Name", 
+                        value=customer_supplier.get('Supplier_name', ''),
+                        key=f"supp_name_{selected_file}"
+                    )
+                with col_btn:
+                    st.markdown("<br>", unsafe_allow_html=True)
+                    if st.button("🔍", key=f"ocr_supp_name_{selected_file}", 
+                               type="primary" if is_ocr_active('Customer_supplier_details', 'Supplier_name') else "secondary"):
+                        activate_ocr_field('Customer_supplier_details', 'Supplier_name')
+                
+                col_input, col_btn = st.columns([5, 1])
+                with col_input:
+                    customer_supplier['Supplier_address'] = st.text_area(
+                        "Supplier Address", 
+                        value=customer_supplier.get('Supplier_address', ''),
+                        key=f"supp_addr_{selected_file}",
+                        height=60
+                    )
+                with col_btn:
+                    st.markdown("<br>", unsafe_allow_html=True)
+                    if st.button("🔍", key=f"ocr_supp_addr_{selected_file}", 
+                               type="primary" if is_ocr_active('Customer_supplier_details', 'Supplier_address') else "secondary"):
+                        activate_ocr_field('Customer_supplier_details', 'Supplier_address')
+                
+                col_input, col_btn = st.columns([5, 1])
+                with col_input:
+                    customer_supplier['Supplier_contact_info'] = st.text_input(
+                        "Supplier Contact Info", 
+                        value=customer_supplier.get('Supplier_contact_info', ''),
+                        key=f"supp_contact_{selected_file}"
+                    )
+                with col_btn:
+                    st.markdown("<br>", unsafe_allow_html=True)
+                    if st.button("🔍", key=f"ocr_supp_contact_{selected_file}", 
+                               type="primary" if is_ocr_active('Customer_supplier_details', 'Supplier_contact_info') else "secondary"):
+                        activate_ocr_field('Customer_supplier_details', 'Supplier_contact_info')
+                
+                gt_parse['Customer_supplier_details'] = customer_supplier
             
-            gt_parse['Bank_details'] = bank
-        
-        # TAB 4: Line Items
-        with tab4:
-            current_gt_parse = st.session_state.edited_data[selected_file].get('gt_parse', {})
-            line_items = current_gt_parse.get('Line_items', [])
+            # TAB 3: Bank Details
+            with tab3:
+                bank = gt_parse.get('Bank_details', {})
+                
+                col_input, col_btn = st.columns([5, 1])
+                with col_input:
+                    bank['Bank_name'] = st.text_input(
+                        "Bank Name", 
+                        value=bank.get('Bank_name', ''),
+                        key=f"bank_name_{selected_file}"
+                    )
+                with col_btn:
+                    st.markdown("<br>", unsafe_allow_html=True)
+                    if st.button("🔍", key=f"ocr_bank_name_{selected_file}", 
+                               type="primary" if is_ocr_active('Bank_details', 'Bank_name') else "secondary"):
+                        activate_ocr_field('Bank_details', 'Bank_name')
+                
+                col_input, col_btn = st.columns([5, 1])
+                with col_input:
+                    bank['Bank_acc_no'] = st.text_input(
+                        "Bank Account No", 
+                        value=bank.get('Bank_acc_no', ''),
+                        key=f"bank_acc_{selected_file}"
+                    )
+                with col_btn:
+                    st.markdown("<br>", unsafe_allow_html=True)
+                    if st.button("🔍", key=f"ocr_bank_acc_{selected_file}", 
+                               type="primary" if is_ocr_active('Bank_details', 'Bank_acc_no') else "secondary"):
+                        activate_ocr_field('Bank_details', 'Bank_acc_no')
+                
+                col_input, col_btn = st.columns([5, 1])
+                with col_input:
+                    bank['Bank_routing_no'] = st.text_input(
+                        "Bank Routing No", 
+                        value=bank.get('Bank_routing_no', ''),
+                        key=f"bank_routing_{selected_file}"
+                    )
+                with col_btn:
+                    st.markdown("<br>", unsafe_allow_html=True)
+                    if st.button("🔍", key=f"ocr_bank_routing_{selected_file}", 
+                               type="primary" if is_ocr_active('Bank_details', 'Bank_routing_no') else "secondary"):
+                        activate_ocr_field('Bank_details', 'Bank_routing_no')
+                
+                col_input, col_btn = st.columns([5, 1])
+                with col_input:
+                    bank['Swift_code'] = st.text_input(
+                        "SWIFT Code", 
+                        value=bank.get('Swift_code', ''),
+                        key=f"swift_{selected_file}"
+                    )
+                with col_btn:
+                    st.markdown("<br>", unsafe_allow_html=True)
+                    if st.button("🔍", key=f"ocr_swift_{selected_file}", 
+                               type="primary" if is_ocr_active('Bank_details', 'Swift_code') else "secondary"):
+                        activate_ocr_field('Bank_details', 'Swift_code')
+                
+                gt_parse['Bank_details'] = bank
             
-            # Add/Remove row buttons
-            col_add, col_remove = st.columns([1, 1])
-            with col_add:
-                if st.button("➕ Add New Row", key=f"add_row_{selected_file}", use_container_width=True):
-                    if not st.session_state.button_clicked:
-                        st.session_state.button_clicked = True
-                        new_row = {
-                            "Po_number": "", "Invoice_no": "", "Other_doc_ref_no": "",
-                            "Invoice_date": "", "Invoice_amount_FCY": "",
-                            "Amount_paid_for_each_invoice": "", "Outstanding_balance_FCY": "",
-                            "Discounts_taken_FCY": "", "Adjustments(without_holding_tax)_FCY": "",
-                            "Descriptions": ""
-                        }
-                        current_gt_parse = st.session_state.edited_data[selected_file].get('gt_parse', {})
-                        current_line_items = current_gt_parse.get('Line_items', [])
-                        current_line_items.append(new_row)
-                        current_gt_parse['Line_items'] = current_line_items
-                        st.session_state.edited_data[selected_file]['gt_parse'] = current_gt_parse
-                        st.session_state.modified_indices.add(selected_file)
-
-                        # Ensure the newly added row's expander is open
-                        new_idx = len(current_line_items) - 1
-                        expander_key_new = f"line_item_expander_{selected_file}_{new_idx}"
-                        st.session_state[expander_key_new] = True
+            # TAB 4: Line Items
+            with tab4:
+                current_gt_parse = st.session_state.edited_data[selected_file].get('gt_parse', {})
+                line_items = current_gt_parse.get('Line_items', [])
+                
+                # Add/Remove row buttons
+                col_add, col_remove = st.columns([1, 1])
+                with col_add:
+                    if st.button("➕ Add New Row", key=f"add_row_{selected_file}", use_container_width=True):
+                        if not st.session_state.button_clicked:
+                            st.session_state.button_clicked = True
+                            new_row = {
+                                "Po_number": "", "Invoice_no": "", "Other_doc_ref_no": "",
+                                "Invoice_date": "", "Invoice_amount_FCY": "",
+                                "Amount_paid_for_each_invoice": "", "Outstanding_balance_FCY": "",
+                                "Discounts_taken_FCY": "", "Adjustments(without_holding_tax)_FCY": "",
+                                "Descriptions": ""
+                            }
+                            current_gt_parse = st.session_state.edited_data[selected_file].get('gt_parse', {})
+                            current_line_items = current_gt_parse.get('Line_items', [])
+                            current_line_items.append(new_row)
+                            current_gt_parse['Line_items'] = current_line_items
+                            st.session_state.edited_data[selected_file]['gt_parse'] = current_gt_parse
+                            st.session_state.modified_indices.add(selected_file)
 
-                        st.rerun()
-            
-            with col_remove:
-                if st.button("➖ Remove Last Row", key=f"remove_row_{selected_file}", 
-                           disabled=(len(line_items) == 0), use_container_width=True):
-                    if not st.session_state.button_clicked and len(line_items) > 0:
-                        st.session_state.button_clicked = True
-                        current_gt_parse = st.session_state.edited_data[selected_file].get('gt_parse', {})
-                        current_line_items = current_gt_parse.get('Line_items', [])
-                        N = len(current_line_items)
-                        current_line_items.pop()
-                        current_gt_parse['Line_items'] = current_line_items
-                        st.session_state.edited_data[selected_file]['gt_parse'] = current_gt_parse
-                        st.session_state.modified_indices.add(selected_file)
+                            # Ensure the newly added row's expander is open
+                            new_idx = len(current_line_items) - 1
+                            expander_key_new = f"line_item_expander_{selected_file}_{new_idx}"
+                            st.session_state[expander_key_new] = True
 
-                        # Remove the expander flag for the popped row (if present)
-                        popped_idx = N - 1
-                        expander_key_popped = f"line_item_expander_{selected_file}_{popped_idx}"
-                        if expander_key_popped in st.session_state:
-                            del st.session_state[expander_key_popped]
+                            st.rerun()
+                
+                with col_remove:
+                    if st.button("➖ Remove Last Row", key=f"remove_row_{selected_file}", 
+                               disabled=(len(line_items) == 0), use_container_width=True):
+                        if not st.session_state.button_clicked and len(line_items) > 0:
+                            st.session_state.button_clicked = True
+                            current_gt_parse = st.session_state.edited_data[selected_file].get('gt_parse', {})
+                            current_line_items = current_gt_parse.get('Line_items', [])
+                            N = len(current_line_items)
+                            current_line_items.pop()
+                            current_gt_parse['Line_items'] = current_line_items
+                            st.session_state.edited_data[selected_file]['gt_parse'] = current_gt_parse
+                            st.session_state.modified_indices.add(selected_file)
 
-                        st.rerun()
-            
-            if st.session_state.button_clicked:
-                st.session_state.button_clicked = False
-            
-            # Display each row as an expander with OCR buttons
-            current_gt_parse = st.session_state.edited_data[selected_file].get('gt_parse', {})
-            line_items = current_gt_parse.get('Line_items', [])
-            
-            if line_items:
-                for idx, item in enumerate(line_items):
-                    # Use a persistent session_state flag so expansion state is preserved across reruns.
-                    expander_key = f"line_item_expander_{selected_file}_{idx}"
-                    expanded_default = st.session_state.get(expander_key, False)
+                            # Remove the expander flag for the popped row (if present)
+                            popped_idx = N - 1
+                            expander_key_popped = f"line_item_expander_{selected_file}_{popped_idx}"
+                            if expander_key_popped in st.session_state:
+                                del st.session_state[expander_key_popped]
 
-                    # Note: do NOT pass a 'key' arg to st.expander to maintain compatibility; control expanded via session_state flag.
-                    with st.expander(f"**Row {idx + 1}** - Invoice: {item.get('Invoice_no', 'N/A')}", expanded=expanded_default):
-                        # PO Number
-                        col_input, col_btn = st.columns([5, 1])
-                        with col_input:
-                            item['Po_number'] = st.text_input(
-                                "PO Number", 
-                                value=item.get('Po_number', ''),
-                                key=f"po_num_{selected_file}_{idx}"
-                            )
-                        with col_btn:
-                            st.markdown("<br>", unsafe_allow_html=True)
-                            if st.button("🔍", key=f"ocr_po_{selected_file}_{idx}", 
-                                       type="primary" if is_ocr_active('Line_items', 'Po_number', idx) else "secondary"):
-                                # ensure expander stays open when user explicitly requests OCR
-                                st.session_state[expander_key] = True
-                                activate_ocr_field('Line_items', 'Po_number', idx)
-                        
-                        # Invoice No
-                        col_input, col_btn = st.columns([5, 1])
-                        with col_input:
-                            item['Invoice_no'] = st.text_input(
-                                "Invoice No", 
-                                value=item.get('Invoice_no', ''),
-                                key=f"inv_no_{selected_file}_{idx}"
-                            )
-                        with col_btn:
-                            st.markdown("<br>", unsafe_allow_html=True)
-                            if st.button("🔍", key=f"ocr_inv_{selected_file}_{idx}", 
-                                       type="primary" if is_ocr_active('Line_items', 'Invoice_no', idx) else "secondary"):
-                                st.session_state[expander_key] = True
-                                activate_ocr_field('Line_items', 'Invoice_no', idx)
-                        
-                        # Other Doc Ref No
-                        col_input, col_btn = st.columns([5, 1])
-                        with col_input:
-                            item['Other_doc_ref_no'] = st.text_input(
-                                "Other Doc Ref No", 
-                                value=item.get('Other_doc_ref_no', ''),
-                                key=f"other_doc_{selected_file}_{idx}"
-                            )
-                        with col_btn:
-                            st.markdown("<br>", unsafe_allow_html=True)
-                            if st.button("🔍", key=f"ocr_other_{selected_file}_{idx}", 
-                                       type="primary" if is_ocr_active('Line_items', 'Other_doc_ref_no', idx) else "secondary"):
-                                st.session_state[expander_key] = True
-                                activate_ocr_field('Line_items', 'Other_doc_ref_no', idx)
-                        
-                        # Invoice Date
-                        col_input, col_btn = st.columns([5, 1])
-                        with col_input:
-                            item['Invoice_date'] = st.text_input(
-                                "Invoice Date", 
-                                value=item.get('Invoice_date', ''),
-                                key=f"inv_date_{selected_file}_{idx}"
-                            )
-                        with col_btn:
-                            st.markdown("<br>", unsafe_allow_html=True)
-                            if st.button("🔍", key=f"ocr_inv_date_{selected_file}_{idx}", 
-                                       type="primary" if is_ocr_active('Line_items', 'Invoice_date', idx) else "secondary"):
-                                st.session_state[expander_key] = True
-                                activate_ocr_field('Line_items', 'Invoice_date', idx)
-                        
-                        # Invoice Amount FCY
-                        col_input, col_btn = st.columns([5, 1])
-                        with col_input:
-                            item['Invoice_amount_FCY'] = st.text_input(
-                                "Invoice Amount FCY", 
-                                value=item.get('Invoice_amount_FCY', ''),
-                                key=f"inv_amt_{selected_file}_{idx}"
-                            )
-                        with col_btn:
-                            st.markdown("<br>", unsafe_allow_html=True)
-                            if st.button("🔍", key=f"ocr_inv_amt_{selected_file}_{idx}", 
-                                       type="primary" if is_ocr_active('Line_items', 'Invoice_amount_FCY', idx) else "secondary"):
-                                st.session_state[expander_key] = True
-                                activate_ocr_field('Line_items', 'Invoice_amount_FCY', idx)
-                        
-                        # Amount Paid
-                        col_input, col_btn = st.columns([5, 1])
-                        with col_input:
-                            item['Amount_paid_for_each_invoice'] = st.text_input(
-                                "Amount Paid", 
-                                value=item.get('Amount_paid_for_each_invoice', ''),
-                                key=f"amt_paid_{selected_file}_{idx}"
-                            )
-                        with col_btn:
-                            st.markdown("<br>", unsafe_allow_html=True)
-                            if st.button("🔍", key=f"ocr_amt_paid_{selected_file}_{idx}", 
-                                       type="primary" if is_ocr_active('Line_items', 'Amount_paid_for_each_invoice', idx) else "secondary"):
-                                st.session_state[expander_key] = True
-                                activate_ocr_field('Line_items', 'Amount_paid_for_each_invoice', idx)
-                        
-                        # Outstanding Balance
-                        col_input, col_btn = st.columns([5, 1])
-                        with col_input:
-                            item['Outstanding_balance_FCY'] = st.text_input(
-                                "Outstanding Balance FCY", 
-                                value=item.get('Outstanding_balance_FCY', ''),
-                                key=f"out_bal_{selected_file}_{idx}"
-                            )
-                        with col_btn:
-                            st.markdown("<br>", unsafe_allow_html=True)
-                            if st.button("🔍", key=f"ocr_out_bal_{selected_file}_{idx}", 
-                                       type="primary" if is_ocr_active('Line_items', 'Outstanding_balance_FCY', idx) else "secondary"):
-                                st.session_state[expander_key] = True
-                                activate_ocr_field('Line_items', 'Outstanding_balance_FCY', idx)
-                        
-                        # Discounts
-                        col_input, col_btn = st.columns([5, 1])
-                        with col_input:
-                            item['Discounts_taken_FCY'] = st.text_input(
-                                "Discounts Taken FCY", 
-                                value=item.get('Discounts_taken_FCY', ''),
-                                key=f"disc_{selected_file}_{idx}"
-                            )
-                        with col_btn:
-                            st.markdown("<br>", unsafe_allow_html=True)
-                            if st.button("🔍", key=f"ocr_disc_{selected_file}_{idx}", 
-                                       type="primary" if is_ocr_active('Line_items', 'Discounts_taken_FCY', idx) else "secondary"):
-                                st.session_state[expander_key] = True
-                                activate_ocr_field('Line_items', 'Discounts_taken_FCY', idx)
-                        
-                        # Adjustments
-                        col_input, col_btn = st.columns([5, 1])
-                        with col_input:
-                            item['Adjustments(without_holding_tax)_FCY'] = st.text_input(
-                                "Adjustments FCY", 
-                                value=item.get('Adjustments(without_holding_tax)_FCY', ''),
-                                key=f"adj_{selected_file}_{idx}"
-                            )
-                        with col_btn:
-                            st.markdown("<br>", unsafe_allow_html=True)
-                            if st.button("🔍", key=f"ocr_adj_{selected_file}_{idx}", 
-                                       type="primary" if is_ocr_active('Line_items', 'Adjustments(without_holding_tax)_FCY', idx) else "secondary"):
-                                st.session_state[expander_key] = True
-                                activate_ocr_field('Line_items', 'Adjustments(without_holding_tax)_FCY', idx)
-                        
-                        # Descriptions
-                        col_input, col_btn = st.columns([5, 1])
-                        with col_input:
-                            item['Descriptions'] = st.text_area(
-                                "Descriptions", 
-                                value=item.get('Descriptions', ''),
-                                key=f"desc_{selected_file}_{idx}",
-                                height=60
-                            )
-                        with col_btn:
-                            st.markdown("<br>", unsafe_allow_html=True)
-                            if st.button("🔍", key=f"ocr_desc_{selected_file}_{idx}", 
-                                       type="primary" if is_ocr_active('Line_items', 'Descriptions', idx) else "secondary"):
-                                st.session_state[expander_key] = True
-                                activate_ocr_field('Line_items', 'Descriptions', idx)
-                
-                # Update line items back to gt_parse
-                current_gt_parse['Line_items'] = line_items
+                            st.rerun()
                 
-                st.markdown("**📊 Line Items Summary Table**")
+                if st.session_state.button_clicked:
+                    st.session_state.button_clicked = False
                 
-                # Display summary table with index starting from 1
-                df = pd.DataFrame(line_items)
-                df.index = df.index + 1  # Start index from 1
-                df.index.name = 'SL No'
+                # Display each row as an expander with OCR buttons
+                current_gt_parse = st.session_state.edited_data[selected_file].get('gt_parse', {})
+                line_items = current_gt_parse.get('Line_items', [])
                 
-                st.dataframe(
-                    df,
-                    use_container_width=True,
-                    height=300
-                )
-            else:
-                st.info("No line items. Click '➕ Add New Row' to add a new row.")
-        
-        st.session_state.edited_data[selected_file]['gt_parse'] = gt_parse
-        
-        # Save button
-        col1, col2 = st.columns([1, 1])
-        with col1:
-            if st.button("💾 Save Changes", type="primary", use_container_width=True, key=f"save_btn_{selected_file}"):
-                if not st.session_state.just_saved:
-                    st.session_state.just_saved = True
-                    auto_save(selected_file)
-                    st.session_state.save_message = "✅ Changes saved successfully!"
-                    st.session_state.save_message_time = time.time()
-                    st.rerun()
-        
-        if st.session_state.just_saved:
-            st.session_state.just_saved = False
-        
-        if st.session_state.save_message:
-            st.success(st.session_state.save_message)
+                if line_items:
+                    for idx, item in enumerate(line_items):
+                        # Use a persistent session_state flag so expansion state is preserved across reruns.
+                        expander_key = f"line_item_expander_{selected_file}_{idx}"
+                        expanded_default = st.session_state.get(expander_key, False)
+
+                        # Note: do NOT pass a 'key' arg to st.expander to maintain compatibility; control expanded via session_state flag.
+                        with st.expander(f"**Row {idx + 1}** - Invoice: {item.get('Invoice_no', 'N/A')}", expanded=expanded_default):
+                            # PO Number
+                            col_input, col_btn = st.columns([5, 1])
+                            with col_input:
+                                item['Po_number'] = st.text_input(
+                                    "PO Number", 
+                                    value=item.get('Po_number', ''),
+                                    key=f"po_num_{selected_file}_{idx}"
+                                )
+                            with col_btn:
+                                st.markdown("<br>", unsafe_allow_html=True)
+                                if st.button("🔍", key=f"ocr_po_{selected_file}_{idx}", 
+                                           type="primary" if is_ocr_active('Line_items', 'Po_number', idx) else "secondary"):
+                                    # ensure expander stays open when user explicitly requests OCR
+                                    st.session_state[expander_key] = True
+                                    activate_ocr_field('Line_items', 'Po_number', idx)
+                            
+                            # Invoice No
+                            col_input, col_btn = st.columns([5, 1])
+                            with col_input:
+                                item['Invoice_no'] = st.text_input(
+                                    "Invoice No", 
+                                    value=item.get('Invoice_no', ''),
+                                    key=f"inv_no_{selected_file}_{idx}"
+                                )
+                            with col_btn:
+                                st.markdown("<br>", unsafe_allow_html=True)
+                                if st.button("🔍", key=f"ocr_inv_{selected_file}_{idx}", 
+                                           type="primary" if is_ocr_active('Line_items', 'Invoice_no', idx) else "secondary"):
+                                    st.session_state[expander_key] = True
+                                    activate_ocr_field('Line_items', 'Invoice_no', idx)
+                            
+                            # Other Doc Ref No
+                            col_input, col_btn = st.columns([5, 1])
+                            with col_input:
+                                item['Other_doc_ref_no'] = st.text_input(
+                                    "Other Doc Ref No", 
+                                    value=item.get('Other_doc_ref_no', ''),
+                                    key=f"other_doc_{selected_file}_{idx}"
+                                )
+                            with col_btn:
+                                st.markdown("<br>", unsafe_allow_html=True)
+                                if st.button("🔍", key=f"ocr_other_{selected_file}_{idx}", 
+                                           type="primary" if is_ocr_active('Line_items', 'Other_doc_ref_no', idx) else "secondary"):
+                                    st.session_state[expander_key] = True
+                                    activate_ocr_field('Line_items', 'Other_doc_ref_no', idx)
+                            
+                            # Invoice Date
+                            col_input, col_btn = st.columns([5, 1])
+                            with col_input:
+                                item['Invoice_date'] = st.text_input(
+                                    "Invoice Date", 
+                                    value=item.get('Invoice_date', ''),
+                                    key=f"inv_date_{selected_file}_{idx}"
+                                )
+                            with col_btn:
+                                st.markdown("<br>", unsafe_allow_html=True)
+                                if st.button("🔍", key=f"ocr_inv_date_{selected_file}_{idx}", 
+                                           type="primary" if is_ocr_active('Line_items', 'Invoice_date', idx) else "secondary"):
+                                    st.session_state[expander_key] = True
+                                    activate_ocr_field('Line_items', 'Invoice_date', idx)
+                            
+                            # Invoice Amount FCY
+                            col_input, col_btn = st.columns([5, 1])
+                            with col_input:
+                                item['Invoice_amount_FCY'] = st.text_input(
+                                    "Invoice Amount FCY", 
+                                    value=item.get('Invoice_amount_FCY', ''),
+                                    key=f"inv_amt_{selected_file}_{idx}"
+                                )
+                            with col_btn:
+                                st.markdown("<br>", unsafe_allow_html=True)
+                                if st.button("🔍", key=f"ocr_inv_amt_{selected_file}_{idx}", 
+                                           type="primary" if is_ocr_active('Line_items', 'Invoice_amount_FCY', idx) else "secondary"):
+                                    st.session_state[expander_key] = True
+                                    activate_ocr_field('Line_items', 'Invoice_amount_FCY', idx)
+                            
+                            # Amount Paid
+                            col_input, col_btn = st.columns([5, 1])
+                            with col_input:
+                                item['Amount_paid_for_each_invoice'] = st.text_input(
+                                    "Amount Paid", 
+                                    value=item.get('Amount_paid_for_each_invoice', ''),
+                                    key=f"amt_paid_{selected_file}_{idx}"
+                                )
+                            with col_btn:
+                                st.markdown("<br>", unsafe_allow_html=True)
+                                if st.button("🔍", key=f"ocr_amt_paid_{selected_file}_{idx}", 
+                                           type="primary" if is_ocr_active('Line_items', 'Amount_paid_for_each_invoice', idx) else "secondary"):
+                                    st.session_state[expander_key] = True
+                                    activate_ocr_field('Line_items', 'Amount_paid_for_each_invoice', idx)
+                            
+                            # Outstanding Balance
+                            col_input, col_btn = st.columns([5, 1])
+                            with col_input:
+                                item['Outstanding_balance_FCY'] = st.text_input(
+                                    "Outstanding Balance FCY", 
+                                    value=item.get('Outstanding_balance_FCY', ''),
+                                    key=f"out_bal_{selected_file}_{idx}"
+                                )
+                            with col_btn:
+                                st.markdown("<br>", unsafe_allow_html=True)
+                                if st.button("🔍", key=f"ocr_out_bal_{selected_file}_{idx}", 
+                                           type="primary" if is_ocr_active('Line_items', 'Outstanding_balance_FCY', idx) else "secondary"):
+                                    st.session_state[expander_key] = True
+                                    activate_ocr_field('Line_items', 'Outstanding_balance_FCY', idx)
+                            
+                            # Discounts
+                            col_input, col_btn = st.columns([5, 1])
+                            with col_input:
+                                item['Discounts_taken_FCY'] = st.text_input(
+                                    "Discounts Taken FCY", 
+                                    value=item.get('Discounts_taken_FCY', ''),
+                                    key=f"disc_{selected_file}_{idx}"
+                                )
+                            with col_btn:
+                                st.markdown("<br>", unsafe_allow_html=True)
+                                if st.button("🔍", key=f"ocr_disc_{selected_file}_{idx}", 
+                                           type="primary" if is_ocr_active('Line_items', 'Discounts_taken_FCY', idx) else "secondary"):
+                                    st.session_state[expander_key] = True
+                                    activate_ocr_field('Line_items', 'Discounts_taken_FCY', idx)
+                            
+                            # Adjustments
+                            col_input, col_btn = st.columns([5, 1])
+                            with col_input:
+                                item['Adjustments(without_holding_tax)_FCY'] = st.text_input(
+                                    "Adjustments FCY", 
+                                    value=item.get('Adjustments(without_holding_tax)_FCY', ''),
+                                    key=f"adj_{selected_file}_{idx}"
+                                )
+                            with col_btn:
+                                st.markdown("<br>", unsafe_allow_html=True)
+                                if st.button("🔍", key=f"ocr_adj_{selected_file}_{idx}", 
+                                           type="primary" if is_ocr_active('Line_items', 'Adjustments(without_holding_tax)_FCY', idx) else "secondary"):
+                                    st.session_state[expander_key] = True
+                                    activate_ocr_field('Line_items', 'Adjustments(without_holding_tax)_FCY', idx)
+                            
+                            # Descriptions
+                            col_input, col_btn = st.columns([5, 1])
+                            with col_input:
+                                item['Descriptions'] = st.text_area(
+                                    "Descriptions", 
+                                    value=item.get('Descriptions', ''),
+                                    key=f"desc_{selected_file}_{idx}",
+                                    height=60
+                                )
+                            with col_btn:
+                                st.markdown("<br>", unsafe_allow_html=True)
+                                if st.button("🔍", key=f"ocr_desc_{selected_file}_{idx}", 
+                                           type="primary" if is_ocr_active('Line_items', 'Descriptions', idx) else "secondary"):
+                                    st.session_state[expander_key] = True
+                                    activate_ocr_field('Line_items', 'Descriptions', idx)
+                    
+                    # Update line items back to gt_parse
+                    current_gt_parse['Line_items'] = line_items
+                    
+                    st.markdown("**📊 Line Items Summary Table**")
+                    
+                    # Display summary table with index starting from 1
+                    df = pd.DataFrame(line_items)
+                    df.index = df.index + 1  # Start index from 1
+                    df.index.name = 'SL No'
+                    
+                    st.dataframe(
+                        df,
+                        use_container_width=True,
+                        height=300
+                    )
+                else:
+                    st.info("No line items. Click '➕ Add New Row' to add a new row.")
+            
+            st.session_state.edited_data[selected_file]['gt_parse'] = gt_parse
+            
+            # Save button
+            col1, col2 = st.columns([1, 1])
+            with col1:
+                if st.button("💾 Save Changes", type="primary", use_container_width=True, key=f"save_btn_{selected_file}"):
+                    if not st.session_state.just_saved:
+                        st.session_state.just_saved = True
+                        auto_save(selected_file)
+                        st.session_state.save_message = "✅ Changes saved successfully!"
+                        st.session_state.save_message_time = time.time()
+                        st.rerun()
+            
+            if st.session_state.just_saved:
+                st.session_state.just_saved = False
+            
+            if st.session_state.save_message:
+                st.success(st.session_state.save_message)