Update src/streamlit_app.py

src/streamlit_app.py

@@ -1176,21 +1176,59 @@ elif len(st.session_state.batch_results) > 0:
                         "Quantity": it.get("Quantity", it.get("Item Quantity", 0)),
                         "Unit Price": it.get("Unit Price", it.get("Item Unit Price", 0.0)),
                         "Amount": it.get("Amount", it.get("Item Amount", 0.0)),
+                        "IO Number/Cost Centre": it.get("IO Number/Cost Centre", ""),  # New column
                         "Tax": it.get("Tax", it.get("Item Tax", 0.0)),
                         "Line Total": it.get("Line Total", it.get("Item Line Total", 0.0)),
                     })
 
                 items_df = pd.DataFrame(normalized) if normalized else pd.DataFrame(
-                    columns=["Description", "Quantity", "Unit Price", "Amount", "Tax", "Line Total"]
+                    columns=["Description", "Quantity", "Unit Price", "Amount", "IO Number/Cost Centre", "Tax", "Line Total"]
                 )
 
-                # Show editor without totals
+                # Configure column widths to make Description wider and avoid horizontal scrolling
+                column_config = {
+                    "Description": st.column_config.TextColumn(
+                        "Description",
+                        width="large",  # Make description column wider
+                    ),
+                    "Quantity": st.column_config.NumberColumn(
+                        "Quantity",
+                        width="small",
+                    ),
+                    "Unit Price": st.column_config.NumberColumn(
+                        "Unit Price",
+                        width="small",
+                        format="%.2f"
+                    ),
+                    "Amount": st.column_config.NumberColumn(
+                        "Amount",
+                        width="small",
+                        format="%.2f"
+                    ),
+                    "IO Number/Cost Centre": st.column_config.TextColumn(
+                        "IO Number/Cost Centre",
+                        width="medium",
+                    ),
+                    "Tax": st.column_config.NumberColumn(
+                        "Tax",
+                        width="small",
+                        format="%.2f"
+                    ),
+                    "Line Total": st.column_config.NumberColumn(
+                        "Line Total",
+                        width="small",
+                        format="%.2f"
+                    ),
+                }
+
+                # Show editor without totals - no horizontal scrolling
                 edited_df = st.data_editor(
                     items_df,
                     num_rows="dynamic",
                     key=f"items_editor_{selected_hash}",
                     use_container_width=True,
                     height=DATA_EDITOR_HEIGHT - 50,  # Reduce height slightly for totals below
+                    column_config=column_config,
                 )
 
                 # Display non-editable totals row immediately below (looks integrated)
@@ -1205,6 +1243,7 @@ elif len(st.session_state.batch_results) > 0:
                         "Quantity": "",
                         "Unit Price": "",
                         "Amount": f"${total_amount:,.2f}",
+                        "IO Number/Cost Centre": "",  # Empty for totals row
                         "Tax": f"${total_tax:,.2f}",
                         "Line Total": f"${total_line_total:,.2f}"
                     }])
@@ -1219,40 +1258,42 @@ elif len(st.session_state.batch_results) > 0:
             saved = st.form_submit_button("💾 Save All Edits")
         # ----------------- FORM END -----------------
 
-        if saved:
-            currency = st.session_state.get(f"Currency_{selected_hash}", 'USD')
-            if currency == 'Other':
-                currency = st.session_state.get(f"Currency_Custom_{selected_hash}", '')
+        # Calculate current values for display and download (always, not just on save)
+        currency = st.session_state.get(f"Currency_{selected_hash}", 'USD')
+        if currency == 'Other':
+            currency = st.session_state.get(f"Currency_Custom_{selected_hash}", '')
 
-            # Convert date objects to normalized strings (dd-MMM-yyyy format)
-            invoice_date = st.session_state.get(f"Invoice Date_{selected_hash}", None)
-            due_date = st.session_state.get(f"Due Date_{selected_hash}", None)
+        # Convert date objects to normalized strings (dd-MMM-yyyy format)
+        invoice_date = st.session_state.get(f"Invoice Date_{selected_hash}", None)
+        due_date = st.session_state.get(f"Due Date_{selected_hash}", None)
 
-            invoice_date_str = ""
-            if invoice_date is not None:
-                try:
-                    invoice_date_str = invoice_date.strftime("%d-%b-%Y")
-                except (AttributeError, ValueError):
-                    invoice_date_str = ""
+        invoice_date_str = ""
+        if invoice_date is not None:
+            try:
+                invoice_date_str = invoice_date.strftime("%d-%b-%Y")
+            except (AttributeError, ValueError):
+                invoice_date_str = ""
 
-            due_date_str = ""
-            if due_date is not None:
-                try:
-                    due_date_str = due_date.strftime("%d-%b-%Y")
-                except (AttributeError, ValueError):
-                    due_date_str = ""
+        due_date_str = ""
+        if due_date is not None:
+            try:
+                due_date_str = due_date.strftime("%d-%b-%Y")
+            except (AttributeError, ValueError):
+                due_date_str = ""
 
-            # Calculate totals from line items
-            line_items_list = edited_df.to_dict('records')
-            calculated_subtotal = sum(clean_float(item.get('Amount', 0)) for item in line_items_list)
-            calculated_total_tax = sum(clean_float(item.get('Tax', 0)) for item in line_items_list)
-            calculated_total = sum(clean_float(item.get('Line Total', 0)) for item in line_items_list)
+        # Calculate totals from line items (always, for both save and download)
+        line_items_list = edited_df.to_dict('records')
+        calculated_subtotal = sum(clean_float(item.get('Amount', 0)) for item in line_items_list)
+        calculated_total_tax = sum(clean_float(item.get('Tax', 0)) for item in line_items_list)
+        calculated_total = sum(clean_float(item.get('Line Total', 0)) for item in line_items_list)
 
-            # Calculate tax percentage if possible
-            calculated_tax_pct = 0.0
-            if calculated_subtotal > 0 and calculated_total_tax > 0:
-                calculated_tax_pct = round((calculated_total_tax / calculated_subtotal) * 100, 4)
+        # Calculate tax percentage if possible
+        calculated_tax_pct = 0.0
+        if calculated_subtotal > 0 and calculated_total_tax > 0:
+            calculated_tax_pct = round((calculated_total_tax / calculated_subtotal) * 100, 4)
 
+        if saved:
+            # Build updated data structure
             updated = {
                 'Invoice Number': st.session_state.get(f"Invoice Number_{selected_hash}", ''),
                 'Invoice Date': invoice_date_str,
@@ -1282,48 +1323,22 @@ elif len(st.session_state.batch_results) > 0:
                               "Address": st.session_state.get(f"Recipient Address_{selected_hash}", '')},
             }
 
-            # Update session state fields to reflect the new calculated values
-            st.session_state[f"Subtotal_{selected_hash}"] = calculated_subtotal
-            st.session_state[f"Tax Percentage_{selected_hash}"] = calculated_tax_pct
-            st.session_state[f"Total Tax_{selected_hash}"] = calculated_total_tax
-            st.session_state[f"Total Amount_{selected_hash}"] = calculated_total
-
+            # Save to batch_results (this persists the data)
             st.session_state.batch_results[selected_hash]["edited_data"] = updated
+            
+            # Show success message
             st.success(f"✅ Saved: {current['file_name']} | Updated totals: Subtotal=${calculated_subtotal:,.2f}, Tax=${calculated_total_tax:,.2f}, Total=${calculated_total:,.2f}")
-            # REMOVED st.rerun() - This was causing the download button to disappear
-
-        # Per-file CSV download (MOVED OUTSIDE THE FORM - Always visible)
-        d_currency = st.session_state.get(f"Currency_{selected_hash}", 'USD')
-        if d_currency == 'Other':
-            d_currency = st.session_state.get(f"Currency_Custom_{selected_hash}", '')
-
-        # Convert date objects to strings for download
-        d_invoice_date = st.session_state.get(f"Invoice Date_{selected_hash}", None)
-        d_due_date = st.session_state.get(f"Due Date_{selected_hash}", None)
-
-        d_invoice_date_str = ""
-        if d_invoice_date is not None:
-            try:
-                d_invoice_date_str = d_invoice_date.strftime("%d-%b-%Y")
-            except (AttributeError, ValueError):
-                d_invoice_date_str = ""
-
-        d_due_date_str = ""
-        if d_due_date is not None:
-            try:
-                d_due_date_str = d_due_date.strftime("%d-%b-%Y")
-            except (AttributeError, ValueError):
-                d_due_date_str = ""
 
+        # Per-file CSV download (ALWAYS visible, uses current edited values)
         download_data = {
             'Invoice Number': st.session_state.get(f"Invoice Number_{selected_hash}", ''),
-            'Invoice Date': d_invoice_date_str,
-            'Due Date': d_due_date_str,
-            'Currency': d_currency,
-            'Subtotal': st.session_state.get(f"Subtotal_{selected_hash}", 0.0),
-            'Tax Percentage': st.session_state.get(f"Tax Percentage_{selected_hash}", 0.0),
-            'Total Tax': st.session_state.get(f"Total Tax_{selected_hash}", 0.0),
-            'Total Amount': st.session_state.get(f"Total Amount_{selected_hash}", 0.0),
+            'Invoice Date': invoice_date_str,
+            'Due Date': due_date_str,
+            'Currency': currency,
+            'Subtotal': calculated_subtotal,  # Use calculated value
+            'Tax Percentage': calculated_tax_pct,  # Use calculated value
+            'Total Tax': calculated_total_tax,  # Use calculated value
+            'Total Amount': calculated_total,  # Use calculated value
             'Sender Name': st.session_state.get(f"Sender Name_{selected_hash}", ''),
             'Sender Address': st.session_state.get(f"Sender Address_{selected_hash}", ''),
             'Recipient Name': st.session_state.get(f"Recipient Name_{selected_hash}", ''),
@@ -1337,7 +1352,7 @@ elif len(st.session_state.batch_results) > 0:
                 'bank_routing': st.session_state.get(f"Bank_bank_routing_{selected_hash}", ''),
                 'bank_branch': st.session_state.get(f"Bank_bank_branch_{selected_hash}", '')
             },
-            'Itemized Data': edited_df.to_dict('records')
+            'Itemized Data': line_items_list
         }
         rows = flatten_invoice_to_rows(download_data)
         full_df = pd.DataFrame(rows)