Update app.py

app.py

@@ -15,7 +15,7 @@ warnings.filterwarnings('ignore', category=UserWarning, module='openpyxl')
 PKT = pytz.timezone('Asia/Karachi')
 
 # --- CONFIGURATION ---
-# usage: If Excel gives a relative link (e.g. /sites/...), we add this prefix.
+# If Excel gives a relative link (e.g. /sites/...), we add this prefix.
 SHAREPOINT_DOMAIN = "https://sphereconsultingpk.sharepoint.com"
 
 def process_excel_streaming(file_obj):
@@ -71,38 +71,58 @@ def process_excel_streaming(file_obj):
         for index, row in df_to_process.iterrows():
             excel_row_num = index + 5
             
-            # Check JV No
+            # 1. Check JV No
             if pd.isna(row.get('JV No.')) or str(row.get('JV No.')).strip() == '':
                 error_list.append(f"Row {excel_row_num}: Missing 'JV No.'")
                 
-            # Check Date
+            # 2. Check Date
             if pd.isna(row.get('Date')):
                 error_list.append(f"Row {excel_row_num}: Missing 'Date'")
                 
-            # Check Vendor
+            # 3. Check Vendor
             if pd.isna(row.get('Paid To / Vendor')) or str(row.get('Paid To / Vendor')).strip() == '':
                 error_list.append(f"Row {excel_row_num}: Missing 'Paid To / Vendor'")
             
-            # Check Account Code (COA)
+            # 4. Check Account Code (COA)
             if pd.isna(row.get('COA Code Odoo')) or str(row.get('COA Code Odoo')).strip() == '':
                 error_list.append(f"Row {excel_row_num}: Missing 'COA Code Odoo' (Account Code)")
 
-            # Check Amount
+            # 5. Check Amount
             if pd.isna(row.get('Amount')):
                  error_list.append(f"Row {excel_row_num}: Missing 'Amount'")
 
+            # 6. --- NEW: CHECK PROJECT vs ANALYTIC MATCH ---
+            project_val = row.get('Project')
+            analytic_val = row.get('Analytical Account Odoo')
+
+            # Only check if Project column has a value
+            if pd.notna(project_val) and str(project_val).strip() != "":
+                p_str = str(project_val).strip().lower()
+                
+                # Check if Analytic is empty when Project is present
+                if pd.isna(analytic_val) or str(analytic_val).strip() == "":
+                    error_list.append(f"Row {excel_row_num}: Project '{project_val}' is set, but 'Analytical Account Odoo' is empty.")
+                else:
+                    a_str = str(analytic_val).strip().lower()
+                    # THE CHECK: Is project name inside the analytic string?
+                    if p_str not in a_str:
+                        error_list.append(f"Row {excel_row_num}: Mismatch! Project '{project_val}' not found in Analytic '{analytic_val}'")
+
+        # --- IF ERRORS FOUND, STOP IMMEDIATELY ---
         if error_list:
             yield log("❌ VALIDATION FAILED! Fix these errors in Excel and re-upload:"), None
             yield log("-" * 40), None
-            for err in error_list[:20]:
+            # Print first 25 errors to log
+            for err in error_list[:25]:
                 yield log(f"⛔ {err}"), None
-            if len(error_list) > 20:
-                yield log(f"... and {len(error_list) - 20} more errors."), None
+            if len(error_list) > 25:
+                yield log(f"... and {len(error_list) - 25} more errors."), None
+            
             yield log("-" * 40), None
             yield log("🚫 Process Aborted. No file generated."), None
             return
 
-        yield log("✅ All Data Validated Successfully!"), None
+        yield log("✅ All Data & Project Matches Validated Successfully!"), None
 
         # --- 4. FORMATTING DATES ---
         df_to_process['Date'] = pd.to_datetime(df_to_process['Date'])
@@ -132,17 +152,18 @@ def process_excel_streaming(file_obj):
                 excel_row = index + 5
                 try:
                     cell = ws[f"{url_col_letter}{excel_row}"]
-                    raw_url = cell.hyperlink.target if cell.hyperlink else None
+                    # Get raw URL
+                    if cell.hyperlink:
+                        raw_url = cell.hyperlink.target
+                    else:
+                        raw_url = None
                     
-                    # --- URL FIX LOGIC ---
+                    # Fix Logic: Check for relative paths
                     if raw_url:
-                        # If it's a relative path (doesn't start with http), add the domain
                         if not raw_url.startswith(('http://', 'https://')):
-                            # Ensure we don't double slash (e.g. domain/ + /sites)
-                            clean_path = raw_url.lstrip('/') 
-                            # Reconstruct full URL
-                            full_url = f"{SHAREPOINT_DOMAIN}/{clean_path}"
-                            urls.append(full_url)
+                            # Remove leading slash if present to avoid double slash
+                            clean_path = raw_url.lstrip('/')
+                            urls.append(f"{SHAREPOINT_DOMAIN}/{clean_path}")
                         else:
                             urls.append(raw_url)
                     else: