From dbb0fa09ff2fc72b7c5fff9f198c1ca0078e2c4b Mon Sep 17 00:00:00 2001
From: simnandez <jmenent@2byte.es>
Date: Sat, 11 May 2013 18:36:44 +0200
Subject: [PATCH] Fix: Debug of withdrawals rejects
---
.../class/rejetprelevement.class.php | 4 ++--
htdocs/compta/prelevement/ligne.php | 24 +++++++++++++++----
2 files changed, 21 insertions(+), 7 deletions(-)
diff --git a/htdocs/compta/prelevement/class/rejetprelevement.class.php b/htdocs/compta/prelevement/class/rejetprelevement.class.php
index a6b37df813d..b7edbcd63fd 100644
--- a/htdocs/compta/prelevement/class/rejetprelevement.class.php
+++ b/htdocs/compta/prelevement/class/rejetprelevement.class.php
@@ -1,7 +1,7 @@
<?php
/* Copyright (C) 2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2005-2009 Regis Houssin <regis.houssin@capnetworks.com>
- * Copyright (C) 2010-2011 Juanjo Menent <jmenent@2byte.es>
+ * Copyright (C) 2010-2013 Juanjo Menent <jmenent@2byte.es>
*
* 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
@@ -50,7 +50,7 @@ class RejetPrelevement
$this->motifs = array();
$this->facturer = array();
- $this->motifs[0] = $langs->trans("StatusMotif0");
+ $this->motifs[0] = "";//$langs->trans("StatusMotif0");
$this->motifs[1] = $langs->trans("StatusMotif1");
$this->motifs[2] = $langs->trans("StatusMotif2");
$this->motifs[3] = $langs->trans("StatusMotif3");
diff --git a/htdocs/compta/prelevement/ligne.php b/htdocs/compta/prelevement/ligne.php
index 45dc325f5c1..a828d1218e9 100644
--- a/htdocs/compta/prelevement/ligne.php
+++ b/htdocs/compta/prelevement/ligne.php
@@ -55,12 +55,24 @@ if ($action == 'confirm_rejet')
{
$daterej = mktime(2, 0, 0, GETPOST('remonth','int'), GETPOST('reday','int'), GETPOST('reyear','int'));
+ if (empty($daterej))
+ {
+ $error++;
+ setEventMessage($langs->trans("ErrorFieldRequired",$langs->trans("Date")),'errors');
+ }
+
+ if (GETPOST('motif','alpha') == 0)
+ {
+ $error++;
+ setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentities("RefusedReason")),'errors');
+ }
+
$lipre = new LignePrelevement($db, $user);
if ($lipre->fetch($id) == 0)
{
- if (GETPOST('motif','alpha') > 0 && $daterej < time())
+ if ( ! $error && $daterej < time())
{
$rej = new RejetPrelevement($db, $user);
@@ -73,8 +85,8 @@ if ($action == 'confirm_rejet')
{
dol_syslog("Motif : ".GETPOST('motif','alpha'));
dol_syslog("$daterej $time ");
- header("Location: ligne.php?id=".$id."&action=rejet");
- exit;
+
+ $action="rejet";
}
}
}
@@ -305,9 +317,11 @@ if ($id)
{
dol_print_error($db);
}
-
- $db->close();
}
+dol_htmloutput_mesg($mesg);
+
llxFooter();
+
+$db->close();
?>
--
GitLab