From de9b8f427d8960c2bfd471223eafbfafffef01e5 Mon Sep 17 00:00:00 2001 From: markus Date: Fri, 18 Jan 2019 16:16:55 +0100 Subject: [PATCH] Add configurable days to SEPA Withdrawal Execution Date --- htdocs/admin/prelevement.php | 14 +++++++++++++- htdocs/compta/prelevement/create.php | 2 +- htdocs/langs/en_US/withdrawals.lang | 1 + 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/htdocs/admin/prelevement.php b/htdocs/admin/prelevement.php index b69a9ee9d80..d8671b29557 100644 --- a/htdocs/admin/prelevement.php +++ b/htdocs/admin/prelevement.php @@ -3,6 +3,7 @@ * Copyright (C) 2005-2014 Laurent Destailleur * Copyright (C) 2005-2010 Regis Houssin * Copyright (C) 2010-2013 Juanjo Menent + * Copyright (C) 2019 Markus Welters * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -21,7 +22,7 @@ /** * \file htdocs/admin/prelevement.php * \ingroup prelevement - * \brief Page configuration des prelevements + * \brief Page to setup Withdrawals */ require '../main.inc.php'; @@ -91,6 +92,12 @@ if ($action == "set") if (! $res > 0) $error++; } + if (GETPOST("PRELEVEMENT_ADDDAYS") || GETPOST("PRELEVEMENT_ADDDAYS")=="") + { + $res = dolibarr_set_const($db, "ADDDAYS", GETPOST("PRELEVEMENT_ADDDAYS"),'chaine',0,'',$conf->entity); + if (! $res > 0) $error++; + } + if (! $error) { $db->commit(); @@ -243,6 +250,11 @@ print ''; print ''; print ''; +//ADDDAYS +print ''.$langs->trans("ADDDAYS").''; +print ''; +print ''; +print ''; print ''; print '
'; diff --git a/htdocs/compta/prelevement/create.php b/htdocs/compta/prelevement/create.php index ed12348753b..f50b81073d6 100644 --- a/htdocs/compta/prelevement/create.php +++ b/htdocs/compta/prelevement/create.php @@ -67,7 +67,7 @@ if ($action == 'create') { // $conf->global->PRELEVEMENT_CODE_BANQUE and $conf->global->PRELEVEMENT_CODE_GUICHET should be empty $bprev = new BonPrelevement($db); - $executiondate = dol_mktime(0, 0, 0, GETPOST('remonth'), GETPOST('reday'), GETPOST('reyear')); + $executiondate = dol_mktime(0, 0, 0, GETPOST('remonth'), (GETPOST('reday')+$conf->global->ADDDAYS), GETPOST('reyear')); $result = $bprev->create($conf->global->PRELEVEMENT_CODE_BANQUE, $conf->global->PRELEVEMENT_CODE_GUICHET, $mode, $format,$executiondate); if ($result < 0) diff --git a/htdocs/langs/en_US/withdrawals.lang b/htdocs/langs/en_US/withdrawals.lang index 5ff75d40d8c..e5e1aa71891 100644 --- a/htdocs/langs/en_US/withdrawals.lang +++ b/htdocs/langs/en_US/withdrawals.lang @@ -105,6 +105,7 @@ CreateForSepa=Create direct debit file ICS=Creditor Identifier CI END_TO_END="EndToEndId" SEPA XML tag - Unique id assigned per transaction USTRD="Unstructured" SEPA XML tag +ADDDAYS=Add days to Execution Date ### Notifications InfoCreditSubject=Payment of direct debit payment order %s by the bank