changes

fusion_accounting/services/tools/payroll.py

@@ -66,7 +66,7 @@ def verify_source_deductions(env, params):
 def get_cra_remittance_status(env, params):
     cra_accounts = env['account.account'].search([
         ('name', 'ilike', 'CRA'),
-        ('company_id', '=', env.company.id),
+        ('company_ids', 'in', env.company.id),
     ])
     result = []
     for acct in cra_accounts:
@@ -130,21 +130,72 @@ def parse_payroll_summary(env, params):
     }
 
 
+def _resolve_account_id(env, val):
+    """Resolve an account code or ID to a valid account ID.
+    Accepts: integer ID, string ID, or account code string like '2201'."""
+    if not val:
+        return False
+    val_str = str(val).strip()
+    # Try as a direct ID first
+    try:
+        acct = env['account.account'].browse(int(val_str))
+        if acct.exists():
+            return acct.id
+    except (ValueError, TypeError):
+        pass
+    # Try as an account code
+    acct = env['account.account'].search([
+        ('code', '=', val_str),
+        ('company_ids', 'in', env.company.id),
+    ], limit=1)
+    if acct:
+        return acct.id
+    return False
+
+
 def create_payroll_journal_entry(env, params):
     journal_id = int(params['journal_id'])
     date = params['date']
+    ref = params.get('ref', 'Payroll Entry')
     lines_data = params['lines']
-    move_vals = {
-        'journal_id': journal_id,
-        'date': date,
-        'ref': params.get('ref', 'Payroll Entry'),
-        'line_ids': [(0, 0, {
-            'account_id': int(line['account_id']),
+
+    # Duplicate check: same journal + date + ref + similar amount
+    total_debit = sum(float(l.get('debit', 0)) for l in lines_data)
+    existing = env['account.move'].search([
+        ('journal_id', '=', journal_id),
+        ('date', '=', date),
+        ('ref', 'ilike', ref[:30]),
+        ('state', 'in', ('draft', 'posted')),
+    ], limit=1)
+    if existing:
+        return {
+            'status': 'duplicate',
+            'error': f'Entry already exists: {existing.name} (ref: {existing.ref}) on {existing.date} '
+                     f'for ${existing.amount_total:,.2f}. Skipping to avoid duplicate.',
+            'existing_move_id': existing.id,
+            'existing_name': existing.name,
+        }
+
+    # Resolve account codes to IDs
+    resolved_lines = []
+    for line in lines_data:
+        account_id = _resolve_account_id(env, line['account_id'])
+        if not account_id:
+            return {'error': f"Account not found: {line['account_id']}. "
+                             f"Provide a valid account code (e.g. '2201') or database ID."}
+        resolved_lines.append((0, 0, {
+            'account_id': account_id,
             'name': line.get('name', 'Payroll'),
             'debit': float(line.get('debit', 0)),
             'credit': float(line.get('credit', 0)),
             'partner_id': int(line['partner_id']) if line.get('partner_id') else False,
-        }) for line in lines_data],
+        }))
+
+    move_vals = {
+        'journal_id': journal_id,
+        'date': date,
+        'ref': ref,
+        'line_ids': resolved_lines,
     }
     move = env['account.move'].create(move_vals)
     return {'status': 'created', 'move_id': move.id, 'name': move.name}