From cd00ec29bf6f307c74d301599f4fcbb3ce757ef9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 4 Sep 2014 19:00:28 +0200
Subject: [PATCH] Fix: Dictionnary with one n
Conflicts:
htdocs/expedition/fiche.php
---
htdocs/expedition/fiche.php | 4 ++--
htdocs/fichinter/fiche.php | 9 ++++-----
2 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/htdocs/expedition/fiche.php b/htdocs/expedition/fiche.php
index 9a52ce47788..f676c1b2138 100644
--- a/htdocs/expedition/fiche.php
+++ b/htdocs/expedition/fiche.php
@@ -698,7 +698,7 @@ if ($action == 'create')
print '<td colspan="3">';
$expe->fetch_delivery_methods();
print $form->selectarray("shipping_method_id",$expe->meths,GETPOST('shipping_method_id','int'),1,0,0,"",1);
- if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionnarySetup"),1);
+ if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
print "</td></tr>\n";
// Tracking number
@@ -1262,7 +1262,7 @@ else if ($id || $ref)
print '<input type="hidden" name="action" value="setshipping_method_id">';
$object->fetch_delivery_methods();
print $form->selectarray("shipping_method_id",$object->meths,$object->shipping_method_id,1,0,0,"",1);
- if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionnarySetup"),1);
+ if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
print '<input type="submit" class="button" value="'.$langs->trans('Modify').'">';
print '</form>';
}
diff --git a/htdocs/fichinter/fiche.php b/htdocs/fichinter/fiche.php
index fcd03755136..bf0583ce0ba 100644
--- a/htdocs/fichinter/fiche.php
+++ b/htdocs/fichinter/fiche.php
@@ -63,6 +63,7 @@ $confirm = GETPOST('confirm','alpha');
$mesg = GETPOST('msg','alpha');
$origin=GETPOST('origin','alpha');
$originid=(GETPOST('originid','int')?GETPOST('originid','int'):GETPOST('origin_id','int')); // For backward compatibility
+$note_public = GETPOST('note_public');
//PDF
$hidedetails = (GETPOST('hidedetails','int') ? GETPOST('hidedetails','int') : (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS) ? 1 : 0));
@@ -919,8 +920,8 @@ if ($action == 'create')
$soc = $objectsrc->client;
- $note_private = (! empty($objectsrc->note) ? $objectsrc->note : (! empty($objectsrc->note_private) ? $objectsrc->note_private : ''));
- $note_public = (! empty($objectsrc->note_public) ? $objectsrc->note_public : '');
+ $note_private = (! empty($objectsrc->note) ? $objectsrc->note : (! empty($objectsrc->note_private) ? $objectsrc->note_private : GETPOST('note_private')));
+ $note_public = (! empty($objectsrc->note_public) ? $objectsrc->note_public : GETPOST('note_public'));
// Object source contacts list
$srccontactslist = $objectsrc->liste_contact(-1,'external',1);
@@ -928,8 +929,6 @@ if ($action == 'create')
}
else {
$projectid = GETPOST('projectid','int');
- $note_private = '';
- $note_public = '';
}
if (! $conf->global->FICHEINTER_ADDON)
@@ -966,7 +965,7 @@ if ($action == 'create')
// Description (must be a textarea and not html must be allowed (used in list view)
print '<tr><td valign="top">'.$langs->trans("Description").'</td>';
print '<td>';
- print '<textarea name="description" cols="80" rows="'.ROWS_3.'"></textarea>';
+ print '<textarea name="description" cols="80" rows="'.ROWS_3.'">'.GETPOST('description').'</textarea>';
print '</td></tr>';
// Project
--
GitLab