changes

fusion_accounting/services/tools/adp.py

@@ -7,7 +7,7 @@ _logger = logging.getLogger(__name__)
 def get_adp_receivable_aging(env, params):
     accounts = env['account.account'].search([
         ('code', '=like', '1101%'),
-        ('company_id', '=', env.company.id),
+        ('company_ids', 'in', env.company.id),
     ])
     today = fields.Date.today()
     amls = env['account.move.line'].search([
@@ -81,7 +81,7 @@ def get_adp_summary(env, params):
     date_from = params.get('date_from')
     date_to = params.get('date_to')
     accounts = env['account.account'].search([
-        ('code', '=like', '1101%'), ('company_id', '=', env.company.id),
+        ('code', '=like', '1101%'), ('company_ids', 'in', env.company.id),
     ])
     domain = [
         ('account_id', 'in', accounts.ids),
@@ -102,10 +102,136 @@ def get_adp_summary(env, params):
     }
 
 
+def register_adp_batch_payment(env, params):
+    """Register payments for a batch of ADP invoices from a remittance advice.
+
+    Takes a list of invoice numbers with payment amounts and a payment date.
+    Registers a payment for each invoice via Odoo's payment wizard, which
+    creates outstanding receipt entries (PBNK2) on account 1050.
+
+    After calling this, use suggest_bank_line_matches on the bank deposit line
+    to match the outstanding receipts against the bank line.
+    """
+    invoices_data = params.get('invoices', [])
+    payment_date = params.get('payment_date')
+    journal_id = int(params.get('journal_id', 50))  # Default Scotia Current
+
+    if not invoices_data:
+        return {'error': 'No invoices provided'}
+    if not payment_date:
+        return {'error': 'payment_date is required (YYYY-MM-DD)'}
+
+    ADP_PARTNER_ID = 3421  # ADP (Assistive Device Program)
+    results = []
+    total_paid = 0.0
+    errors = []
+
+    for inv_data in invoices_data:
+        inv_number = str(inv_data.get('invoice_number', '')).strip()
+        amount = float(inv_data.get('amount', 0))
+
+        if not inv_number or not amount:
+            errors.append(f"Skipped: missing invoice_number or amount in {inv_data}")
+            continue
+
+        # Find the invoice by name/number
+        invoice = env['account.move'].search([
+            ('name', 'ilike', inv_number),
+            ('move_type', '=', 'out_invoice'),
+            ('state', '=', 'posted'),
+            ('company_id', '=', env.company.id),
+        ], limit=1)
+
+        if not invoice:
+            # Try without leading zeros or with different format
+            invoice = env['account.move'].search([
+                ('name', '=like', f'%{inv_number}'),
+                ('move_type', '=', 'out_invoice'),
+                ('state', '=', 'posted'),
+            ], limit=1)
+
+        if not invoice:
+            errors.append(f"Invoice {inv_number} not found")
+            continue
+
+        if invoice.payment_state == 'paid':
+            results.append({
+                'invoice': inv_number,
+                'status': 'already_paid',
+                'move_id': invoice.id,
+            })
+            continue
+
+        # Check if amount matches residual (allow partial)
+        if amount > invoice.amount_residual + 0.01:
+            errors.append(
+                f"Invoice {inv_number}: payment ${amount:.2f} exceeds "
+                f"residual ${invoice.amount_residual:.2f}"
+            )
+            continue
+
+        # Register payment via the payment wizard
+        try:
+            payment_vals = {
+                'payment_type': 'inbound',
+                'partner_type': 'customer',
+                'partner_id': invoice.partner_id.id or ADP_PARTNER_ID,
+                'amount': amount,
+                'date': payment_date,
+                'journal_id': journal_id,
+                'ref': f'ADP Remittance - {inv_number}',
+            }
+            # Use the payment register wizard
+            ctx = {
+                'active_model': 'account.move',
+                'active_ids': [invoice.id],
+            }
+            wizard = env['account.payment.register'].with_context(**ctx).create({
+                'payment_date': payment_date,
+                'amount': amount,
+                'journal_id': journal_id,
+                'payment_method_line_id': env['account.payment.method.line'].search([
+                    ('journal_id', '=', journal_id),
+                    ('payment_type', '=', 'inbound'),
+                ], limit=1).id,
+            })
+            wizard.action_create_payments()
+
+            results.append({
+                'invoice': inv_number,
+                'status': 'paid',
+                'amount': amount,
+                'move_id': invoice.id,
+                'move_name': invoice.name,
+            })
+            total_paid += amount
+        except Exception as e:
+            _logger.warning("ADP payment failed for %s: %s", inv_number, e)
+            errors.append(f"Invoice {inv_number}: payment failed — {e}")
+
+    env.cr.commit()
+
+    return {
+        'status': 'completed',
+        'paid_count': len([r for r in results if r.get('status') == 'paid']),
+        'already_paid_count': len([r for r in results if r.get('status') == 'already_paid']),
+        'total_paid': total_paid,
+        'results': results,
+        'errors': errors,
+        'message': (
+            f"Registered payments for {len([r for r in results if r.get('status') == 'paid'])} invoices "
+            f"totalling ${total_paid:,.2f}. "
+            + (f"{len(errors)} errors." if errors else "No errors.")
+            + " Now use suggest_bank_line_matches to match the bank deposit."
+        ),
+    }
+
+
 TOOLS = {
     'get_adp_receivable_aging': get_adp_receivable_aging,
     'match_adp_payment_to_invoice': match_adp_payment_to_invoice,
     'verify_adp_split': verify_adp_split,
     'find_adp_without_payment': find_adp_without_payment,
     'get_adp_summary': get_adp_summary,
+    'register_adp_batch_payment': register_adp_batch_payment,
 }