diff --git a/modules/shareholder_register_dividend/src/DividendService.php b/modules/shareholder_register_dividend/src/DividendService.php index 0bb15d12be9a7ea049a17389b7bd5205fd1490ba..0d7a1fec64821d046ba20f7c8fe4e9020c7a262f 100644 --- a/modules/shareholder_register_dividend/src/DividendService.php +++ b/modules/shareholder_register_dividend/src/DividendService.php @@ -115,10 +115,11 @@ class DividendService implements DividendServiceInterface { } for ($i = 0; $i < 1000; $i++) { if ($details = array_pop($context['sandbox']['total_details'])) { - $hash = "{$details->shareholder_id}-{$details->tax}"; + $hash = "{$details->shareholder_id}-{$details->tax}-{$details->taxcode}"; if (!array_key_exists($hash, $context['results']['totals'])) { $context['results']['totals'][$hash] = [ 'tax' => $details->tax, + 'taxcode' => $details->taxcode, 'fraction' => $details->fraction, 'shareholder_id' => $details->shareholder_id, 'details' => [(array) $details], diff --git a/modules/shareholder_register_dividend/src/Form/DividendForm.php b/modules/shareholder_register_dividend/src/Form/DividendForm.php index a898a05d7e2489e2e010a11c29aeb2c30a222577..38fe5a2d37013969d154baa5982c2f449c07af15 100644 --- a/modules/shareholder_register_dividend/src/Form/DividendForm.php +++ b/modules/shareholder_register_dividend/src/Form/DividendForm.php @@ -212,6 +212,7 @@ class DividendForm extends FormBase { $sheet->setCellValue("E6", t('Gross')); $sheet->setCellValue("F6", t('Tax Amount')); $sheet->setCellValue("G6", t('Dividend')); + $sheet->setCellValue("H6", t('Tax code')); $context['sandbox']['row'] = 7; $context['sandbox']['to_write'] = $context['results']['totals']; @@ -233,6 +234,7 @@ class DividendForm extends FormBase { $sheet->setCellValue("E{$row}", "=ROUND(C{$row}*B3/C3, 2)"); $sheet->setCellValue("F{$row}", "=ROUND(E{$row}*(D{$row}/100), 2)"); $sheet->setCellValue("G{$row}", "=E{$row}-F{$row}"); + $sheet->setCellValue("H{$row}", $line['taxcode']); $sheet->setCellValue("B4", "=SUM(E7:E{$row})");