From 5fafb5e2426b1600508f21f5fa536214d7c9eada Mon Sep 17 00:00:00 2001
From: s j <sj@1729.be>
Date: Fri, 27 May 2022 12:06:21 +0200
Subject: [PATCH] i7133 allow to choose vvpr reference date

---
 .../src/Form/DividendForm.php                         | 11 +++++++++++
 .../src/Plugin/DividendTax/BE2018VVPR.php             |  2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/modules/shareholder_register_dividend/src/Form/DividendForm.php b/modules/shareholder_register_dividend/src/Form/DividendForm.php
index 33eb7735..dee84740 100644
--- a/modules/shareholder_register_dividend/src/Form/DividendForm.php
+++ b/modules/shareholder_register_dividend/src/Form/DividendForm.php
@@ -195,6 +195,16 @@ class DividendForm extends FormBase {
       '#default_value' => 1,
       '#weight' => '30',
     ];
+    $form['vvpr_use_date'] = [
+      '#type' => 'select',
+      '#title' => $this->t('Date to use (VVPR)'),
+      '#options' => [
+        0 => $this->t('Validation date'),
+        1 => $this->t('Payment date'),
+      ],
+      '#default_value' => 1,
+      '#weight' => '30',
+    ];
     $form['dividend'] = [
       '#type' => 'number',
       '#title' => $this->t('Dividend'),
@@ -258,6 +268,7 @@ class DividendForm extends FormBase {
       'end_date' => $form_state->getValue('end_of_period'),
       'allocation' => $form_state->getValue('allocation_method'),
       'use_payment_date' => $form_state->getValue('use_date'),
+      'vvpr_use_payment_date' => $form_state->getValue('vvpr_use_date'),
       'tax' => $form_state->getValue('tax_method'),
       'process' => 'register',
       'distribution_name' => $form_state->getValue('distribution'),
diff --git a/modules/shareholder_register_dividend/src/Plugin/DividendTax/BE2018VVPR.php b/modules/shareholder_register_dividend/src/Plugin/DividendTax/BE2018VVPR.php
index 19eb96f9..911ca1cd 100644
--- a/modules/shareholder_register_dividend/src/Plugin/DividendTax/BE2018VVPR.php
+++ b/modules/shareholder_register_dividend/src/Plugin/DividendTax/BE2018VVPR.php
@@ -23,7 +23,7 @@ class BE2018VVPR extends DividendTaxDefinitionBase {
       return;
     }
 
-    $use_payment_date = TRUE;
+    $use_payment_date = $dividend_config['vvpr_use_payment_date'] ?? TRUE;
 
     // Totale kapitaalverlaging sinds 01/05/2013.
     $transactions = $shareholder->getValidTransactionsInRange(
-- 
GitLab