From 9b1caefbf9c68ba433333efbeb125cb15d4b10dd Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 28 Jun 2016 02:40:42 +0200
Subject: [PATCH] Fix bad var
---
htdocs/commande/orderstoinvoice.php | 2 +-
htdocs/fourn/commande/orderstoinvoice.php | 14 ++++++++------
2 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/htdocs/commande/orderstoinvoice.php b/htdocs/commande/orderstoinvoice.php
index bcbe3ea408e..64c52764599 100644
--- a/htdocs/commande/orderstoinvoice.php
+++ b/htdocs/commande/orderstoinvoice.php
@@ -72,7 +72,7 @@ $date_endy = dol_mktime(23,59,59,$_REQUEST["date_end_delymonth"],$_REQUEST["date
if ($action == 'create')
{
- if (is_array($selected) == false)
+ if (! is_array($selected))
{
$error++;
setEventMessages($langs->trans('Error_OrderNotChecked'), null, 'errors');
diff --git a/htdocs/fourn/commande/orderstoinvoice.php b/htdocs/fourn/commande/orderstoinvoice.php
index 64f6aa4dff0..33c3e268565 100644
--- a/htdocs/fourn/commande/orderstoinvoice.php
+++ b/htdocs/fourn/commande/orderstoinvoice.php
@@ -71,11 +71,12 @@ $date_end = dol_mktime(23, 59, 59, $_REQUEST["date_endmonth"], $_REQUEST["date_e
$date_starty = dol_mktime(0, 0, 0, $_REQUEST["date_start_delymonth"], $_REQUEST["date_start_delyday"], $_REQUEST["date_start_delyyear"]); // Date for local PHP server
$date_endy = dol_mktime(23, 59, 59, $_REQUEST["date_end_delymonth"], $_REQUEST["date_end_delyday"], $_REQUEST["date_end_delyyear"]);
-if ($action == 'create') {
- if (is_array($selected) == false) {
- $mesgs = array (
- '<div class="error">' . $langs->trans('Error_OrderNotChecked') . '</div>'
- );
+if ($action == 'create')
+{
+ if (! is_array($selected))
+ {
+ $error++;
+ setEventMessages($langs->trans('Error_OrderNotChecked'), null, 'errors');
} else {
$origin = GETPOST('origin');
$originid = GETPOST('originid');
@@ -87,11 +88,12 @@ include_once DOL_DOCUMENT_ROOT . '/core/class/hookmanager.class.php';
$hookmanager = new HookManager($db);
$hookmanager->initHooks(array('orderstoinvoicesupplier'));
+
/*
* Actions
*/
-if (($action == 'create' || $action == 'add') && empty($mesgs)) {
+if (($action == 'create' || $action == 'add') && ! $error) {
require_once DOL_DOCUMENT_ROOT . '/core/lib/fourn.lib.php';
if (! empty($conf->projet->enabled))
--
GitLab