diff --git a/htdocs/fichinter/card.php b/htdocs/fichinter/card.php
index 5887de9b4f4..4034abad733 100644
--- a/htdocs/fichinter/card.php
+++ b/htdocs/fichinter/card.php
@@ -173,7 +173,7 @@ if (empty($reshook))
header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
exit;
} else {
- $mesg = '
'.$object->error.'
';
+ $mesg = $object->error;
}
} elseif ($action == 'confirm_modify' && $confirm == 'yes' && $user->rights->ficheinter->creer)
{
@@ -198,7 +198,7 @@ if (empty($reshook))
header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
exit;
} else {
- $mesg = ''.$object->error.'
';
+ $mesg = $object->error;
}
} elseif ($action == 'add' && $user->rights->ficheinter->creer)
{
@@ -372,11 +372,11 @@ if (empty($reshook))
}
}
} else {
- $mesg = $srcobject->error;
+ $mesg = $srcobject->error;
$error++;
}
} else {
- $mesg = $object->error;
+ $mesg = $object->error;
$error++;
}
} else {
@@ -406,7 +406,7 @@ if (empty($reshook))
}
}
} else {
- $mesg = ''.$langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("ThirdParty")).'
';
+ $mesg = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("ThirdParty"));
$action = 'create';
}
} elseif ($action == 'update' && $user->rights->ficheinter->creer)
@@ -456,17 +456,17 @@ if (empty($reshook))
{
if (!GETPOST('np_desc', 'restricthtml') && empty($conf->global->FICHINTER_EMPTY_LINE_DESC))
{
- $mesg = ''.$langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Description")).'
';
+ $mesg = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Description"));
$error++;
}
if (empty($conf->global->FICHINTER_WITHOUT_DURATION) && !GETPOST('durationhour', 'int') && !GETPOST('durationmin', 'int'))
{
- $mesg = ''.$langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Duration")).'
';
+ $mesg = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Duration"));
$error++;
}
if (empty($conf->global->FICHINTER_WITHOUT_DURATION) && GETPOST('durationhour', 'int') >= 24 && GETPOST('durationmin', 'int') > 0)
{
- $mesg = ''.$langs->trans("ErrorValueTooHigh").'
';
+ $mesg = $langs->trans("ErrorValueTooHigh");
$error++;
}
if (!$error)
@@ -538,7 +538,7 @@ if (empty($reshook))
header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
exit;
} else {
- $mesg = ''.$object->error.'
';
+ $mesg = $object->error;
}
}
@@ -555,6 +555,20 @@ if (empty($reshook))
}
}
+ // Reopen
+ elseif ($action == 'confirm_reopen' && $user->rights->ficheinter->creer)
+ {
+ $result = $object->setStatut(Fichinter::STATUS_VALIDATED);
+ if ($result > 0)
+ {
+ header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
+ exit;
+ }
+ else {
+ $mesg = $object->error;
+ }
+ }
+
/*
* Mise a jour d'une ligne d'intervention
*/
@@ -735,9 +749,9 @@ if (empty($reshook))
if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
{
$langs->load("errors");
- $mesg = ''.$langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType").'
';
+ $mesg = $langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType");
} else {
- $mesg = ''.$object->error.'
';
+ $mesg = $object->error;
}
}
}
@@ -784,7 +798,11 @@ if ($action == 'create')
print load_fiche_titre($langs->trans("AddIntervention"), '', 'intervention');
- dol_htmloutput_mesg($mesg);
+ if ($error > 0) {
+ dol_htmloutput_errors($mesg);
+ } else {
+ dol_htmloutput_mesg($mesg);
+ }
if ($socid) $res = $soc->fetch($socid);
@@ -1058,7 +1076,11 @@ if ($action == 'create')
$soc = new Societe($db);
$soc->fetch($object->socid);
- dol_htmloutput_mesg($mesg);
+ if ($error > 0) {
+ dol_htmloutput_errors($mesg);
+ } else {
+ dol_htmloutput_mesg($mesg);
+ }
$head = fichinter_prepare_head($object);
@@ -1099,6 +1121,12 @@ if ($action == 'create')
$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ModifyIntervention'), $langs->trans('ConfirmModifyIntervention'), 'confirm_modify', '', 0, 1);
}
+ // Confirm back to open
+ if ($action == 'reopen')
+ {
+ $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('Reopen'), $langs->trans('ConfirmReopenIntervention', $object->ref), 'confirm_reopen', '', 0, 1);
+ }
+
// Confirm deletion of line
if ($action == 'ask_deleteline')
{
@@ -1596,6 +1624,15 @@ if ($action == 'create')
print '';
}
+ // Reopen
+ if ($object->statut > Fichinter::STATUS_CLOSED)
+ {
+ if ($user->rights->ficheinter->creer)
+ {
+ print '';
+ } else print '';
+ }
+
// Send
if (empty($user->socid)) {
if ($object->statut > Fichinter::STATUS_DRAFT)
diff --git a/htdocs/langs/en_US/interventions.lang b/htdocs/langs/en_US/interventions.lang
index e5936f8246e..51079fca278 100644
--- a/htdocs/langs/en_US/interventions.lang
+++ b/htdocs/langs/en_US/interventions.lang
@@ -64,3 +64,5 @@ InterLineDuration=Line duration intervention
InterLineDesc=Line description intervention
RepeatableIntervention=Template of intervention
ToCreateAPredefinedIntervention=To create a predefined or recurring intervention, create a common intervention and convert it into intervention template
+Reopen=Reopen
+ConfirmReopenIntervention=Are you sure you want to open back the intervention %s?
diff --git a/htdocs/product/fournisseurs.php b/htdocs/product/fournisseurs.php
index 1f347353b81..ac0b2596d1c 100644
--- a/htdocs/product/fournisseurs.php
+++ b/htdocs/product/fournisseurs.php
@@ -883,9 +883,7 @@ SCRIPT;
foreach ($extralabels as $key => $value) {
// Show field if not hidden
if (!empty($extrafields->attributes["product_fournisseur_price"]['list'][$key]) && $extrafields->attributes["product_fournisseur_price"]['list'][$key] != 3) {
- if (!empty($extrafields->attributes["product_fournisseur_price"]['langfile'][$key])) $langs->load($extrafields->attributes["product_fournisseur_price"]['langfile'][$key]);
- if (!empty($extrafields->attributes["product_fournisseur_price"]['help'][$key])) $extratitle = $form->textwithpicto($langs->trans($value), $langs->trans($extrafields->attributes["product_fournisseur_price"]['help'][$key]));
- else $extratitle = $langs->trans($value);
+ $extratitle = $langs->trans($value);
$arrayfields['ef.'.$key] = array('label'=>$extratitle, 'checked'=>0, 'position'=>(end($arrayfields)['position']+1));
}
}