diff --git a/htdocs/admin/carrier.php b/htdocs/admin/carrier.php
new file mode 100644
index 0000000000000000000000000000000000000000..d105dd28e6ac8996c94b549ae6656685808e0a0a
--- /dev/null
+++ b/htdocs/admin/carrier.php
@@ -0,0 +1,218 @@
+<?php
+/*
+ * 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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \file htdocs/admin/carrier.php
+ * \ingroup expedition
+ * \brief Page d'administration des Transporteurs
+ */
+
+require '../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php';
+
+$langs->load("admin");
+$langs->load("sendings");
+$langs->load("deliveries");
+$langs->load('other');
+
+if (! $user->admin)
+ accessforbidden();
+
+$action=GETPOST('action','alpha');
+$carrier=GETPOST('carrier','int');
+
+$object = new Expedition($db);
+
+
+/*
+ * Actions
+ */
+if ($action==setvalue AND $carrier)
+{
+ //$object->update_delivery_method($carrier);
+}
+
+if ($action==activate_carrier AND $carrier)
+{
+ $object->activ_delivery_method($carrier);
+}
+
+if ($action==disable_carrier AND $carrier)
+{
+ $object->disable_delivery_method($carrier);
+}
+
+/*
+ * View
+ */
+
+$form=new Form($db);
+
+llxHeader("","");
+
+$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
+print_fiche_titre($langs->trans("SendingsSetup"),$linkback,'setup');
+print '<br>';
+
+
+//if ($mesg) print $mesg.'<br>';
+
+
+$h = 0;
+
+$head[$h][0] = DOL_URL_ROOT."/admin/confexped.php";
+$head[$h][1] = $langs->trans("Setup");
+$h++;
+
+$head[$h][0] = DOL_URL_ROOT."/admin/carrier.php";
+$head[$h][1] = $langs->trans("Carriers");
+$hselected=$h;
+$h++;
+
+if (! empty($conf->global->MAIN_SUBMODULE_EXPEDITION))
+{
+ $head[$h][0] = DOL_URL_ROOT."/admin/expedition.php";
+ $head[$h][1] = $langs->trans("Sending");
+ $h++;
+}
+
+if (! empty($conf->global->MAIN_SUBMODULE_LIVRAISON))
+{
+ $head[$h][0] = DOL_URL_ROOT."/admin/livraison.php";
+ $head[$h][1] = $langs->trans("Receivings");
+ $h++;
+}
+
+dol_fiche_head($head, $hselected, $langs->trans("ModuleSetup"));
+
+/*
+ * Carrier List
+ */
+if ($action=='edit_carrier' || $action=='setvalue')
+{
+ // Carrier Edit
+ if ($carrier) $object->list_delivery_methods($carrier);
+ print_titre($langs->trans("CarrierEdit"));
+
+ print '<form method="post" action="'.$_SERVER["PHP_SELF"].'?carrier='.$carrier.'">';
+ print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+ print '<input type="hidden" name="action" value="setvalue">';
+
+
+ print '<table class="nobordernopadding" width="100%">';
+
+ $var=true;
+ print '<tr class="liste_titre">';
+ print '<td width="150">'.$langs->trans("CarrierParameter").'</td>';
+ print '<td>'.$langs->trans("Value").'</td>';
+ print "</tr>\n";
+
+ $var=!$var;
+ print '<tr '.$bc[$var].'><td class="fieldrequired">';
+ print $langs->trans("Code").'</td><td>';
+ print '<input size="32" type="text" name="code" value="'.$object->listmeths[0][code].'">';
+ print ' '.$langs->trans("Example").': CODE';
+ print '</td></tr>';
+
+ $var=!$var;
+ print '<tr '.$bc[$var].'><td class="fieldrequired">';
+ print $langs->trans("Name").'</td><td>';
+ print '<input size="32" type="text" name="name" value="'.$object->listmeths[0][libelle].'">';
+ print '</td></tr>';
+
+ $var=!$var;
+ print '<tr '.$bc[$var].'><td class="fieldrequired">';
+ print $langs->trans("Description").'</td><td>';
+ print '<input size="64" type="text" name="description" value="'.$object->listmeths[0][description].'">';
+ print '</td></tr>';
+
+ $var=!$var;
+ print '<tr '.$bc[$var].'><td class="fieldrequired">';
+ print $langs->trans("Tracking").'</td><td>';
+ print '<input size="128" type="text" name="tracking" value="'.$object->listmeths[0][tracking].'">';
+ print ' '.$langs->trans("Example").': http://www.website.com/dir/{TRACKID}';
+ print '</td></tr>';
+
+ if ($carrier)
+ {
+ print '<tr><td colspan="2" align="center"><br><input type="submit" class="button" value="'.$langs->trans("Modify").'"></td></tr>';
+ }
+ else
+ {
+ print '<tr><td colspan="2" align="center"><br><input type="submit" class="button" value="'.$langs->trans("Add").'"></td></tr>';
+ }
+
+ print '</table>';
+ print '</form>';
+
+}
+else
+{
+ // Display List
+ $object->list_delivery_methods();
+ $var=true;
+ print_titre($langs->trans("CarrierList"));
+
+ print '<table class="noborder" width="100%">';
+ print '<tr class="liste_titre">';
+ print '<td width="80">'.$langs->trans("Code").'</td>';
+ print '<td width="150">'.$langs->trans("Name").'</td>';
+ print '<td>'.$langs->trans("Description").'</td>';
+ print '<td>'.$langs->trans("TrackingUrl").'</td>';
+ print '<td align="center" width="60">'.$langs->trans("Status").'</td>';
+ print '<td align="center" width="30">'.$langs->trans("Edit").'</td>';
+ print "</tr>\n";
+ for ($i=0; $i<sizeof($object->listmeths); $i++)
+ {
+ $var=!$var;
+ print "<tr ".$bc[$var].">";
+ print '<td>'.$object->listmeths[$i][code].'</td>';
+ print '<td>'.$object->listmeths[$i][libelle].'</td>';
+ print '<td>'.$object->listmeths[$i][description].'</td>';
+ print '<td>'.$object->listmeths[$i][tracking].'</td>';
+ print '<td align="center">';
+ if($object->listmeths[$i][active] == 0)
+ {
+ print '<a href="carrier.php?action=activate_carrier&carrier='.$object->listmeths[$i][rowid].'">'.img_picto($langs->trans("Disabled"),'switch_off').'</a>';
+ }
+ else
+ {
+ print '<a href="carrier.php?action=disable_carrier&carrier='.$object->listmeths[$i][rowid].'">'.img_picto($langs->trans("Enabled"),'switch_on').'</a>';
+ }
+ print '</td><td align="center">';
+ if($object->listmeths[$i][editable] == 1)
+ {
+ print '<a href="carrier.php?action=edit_carrier&carrier='.$object->listmeths[$i][rowid].'">'.img_picto($langs->trans("Edit"),'edit').'</a>';
+ }
+ else
+ {
+ print ' ';
+ }
+ print '</td>';
+ print "</tr>\n";
+ }
+ print '<tr><td align="center"><a href="carrier.php?action=edit_carrier"><br>'.$langs->trans("Add").'</a></td><tr>';
+
+ print '</table><br>';
+
+ print '</div>';
+}
+
+llxFooter();
+
+$db->close();
+?>
\ No newline at end of file
diff --git a/htdocs/admin/confexped.php b/htdocs/admin/confexped.php
index d9be768461ffa088a69e55ddf0ab9205253a99ab..6653badfb36443924471fe1336435488ec187dda 100644
--- a/htdocs/admin/confexped.php
+++ b/htdocs/admin/confexped.php
@@ -84,6 +84,10 @@ $head[$h][1] = $langs->trans("Setup");
$hselected=$h;
$h++;
+$head[$h][0] = DOL_URL_ROOT."/admin/carrier.php";
+$head[$h][1] = $langs->trans("Carriers");
+$h++;
+
if (! empty($conf->global->MAIN_SUBMODULE_EXPEDITION))
{
$head[$h][0] = DOL_URL_ROOT."/admin/expedition.php";
diff --git a/htdocs/admin/expedition.php b/htdocs/admin/expedition.php
index 709832b1968cb3ba3994fc3531a9426f97efe726..c012d52efb1f3e49301832b54b1b9f3c20312d8f 100644
--- a/htdocs/admin/expedition.php
+++ b/htdocs/admin/expedition.php
@@ -201,6 +201,10 @@ $head[$h][0] = DOL_URL_ROOT."/admin/confexped.php";
$head[$h][1] = $langs->trans("Setup");
$h++;
+$head[$h][0] = DOL_URL_ROOT."/admin/carrier.php";
+$head[$h][1] = $langs->trans("Carriers");
+$h++;
+
$head[$h][0] = DOL_URL_ROOT."/admin/expedition.php";
$head[$h][1] = $langs->trans("Sending");
$hselected=$h;
@@ -208,9 +212,9 @@ $h++;
if (! empty($conf->global->MAIN_SUBMODULE_LIVRAISON))
{
- $head[$h][0] = DOL_URL_ROOT."/admin/livraison.php";
- $head[$h][1] = $langs->trans("Receivings");
- $h++;
+ $head[$h][0] = DOL_URL_ROOT."/admin/livraison.php";
+ $head[$h][1] = $langs->trans("Receivings");
+ $h++;
}
dol_fiche_head($head, $hselected, $langs->trans("ModuleSetup"));
diff --git a/htdocs/admin/livraison.php b/htdocs/admin/livraison.php
index 2603a0a1d5138ff3c71244314d27b2e7b6a0ebcd..fa4b7b3c1d40edc0408846ed9f4941e7e8dc98f8 100644
--- a/htdocs/admin/livraison.php
+++ b/htdocs/admin/livraison.php
@@ -5,8 +5,8 @@
* Copyright (C) 2004 Benoit Mortier <benoit.mortier@opensides.be>
* Copyright (C) 2004 Eric Seigne <eric.seigne@ryxeo.com>
* Copyright (C) 2005-2012 Regis Houssin <regis.houssin@capnetworks.com>
- * Copyright (C) 2011-2012 Juanjo Menent <jmenent@2byte.es>
- * Copyright (C) 2011-2012 Philippe Grand <philippe.grand@atoo-net.com>
+ * Copyright (C) 2011-2012 Juanjo Menent <jmenent@2byte.es>
+ * Copyright (C) 2011-2012 Philippe Grand <philippe.grand@atoo-net.com>
*
* 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,13 +50,13 @@ $type='delivery';
if ($action == 'updateMask')
{
- $maskconstdelivery=GETPOST('maskconstdelivery','alpha');
- $maskdelivery=GETPOST('maskdelivery','alpha');
- if ($maskconstdelivery) $res = dolibarr_set_const($db,$maskconstdelivery,$maskdelivery,'chaine',0,'',$conf->entity);
+ $maskconstdelivery=GETPOST('maskconstdelivery','alpha');
+ $maskdelivery=GETPOST('maskdelivery','alpha');
+ if ($maskconstdelivery) $res = dolibarr_set_const($db,$maskconstdelivery,$maskdelivery,'chaine',0,'',$conf->entity);
- if (! $res > 0) $error++;
+ if (! $res > 0) $error++;
- if (! $error)
+ if (! $error)
{
$mesg = "<font class=\"ok\">".$langs->trans("SetupSaved")."</font>";
}
@@ -68,12 +68,12 @@ if ($action == 'updateMask')
if ($action == 'set_DELIVERY_FREE_TEXT')
{
- $free=GETPOST('DELIVERY_FREE_TEXT','alpha');
+ $free=GETPOST('DELIVERY_FREE_TEXT','alpha');
$res=dolibarr_set_const($db, "DELIVERY_FREE_TEXT",$free,'chaine',0,'',$conf->entity);
if (! $res > 0) $error++;
- if (! $error)
+ if (! $error)
{
$mesg = "<font class=\"ok\">".$langs->trans("SetupSaved")."</font>";
}
@@ -85,58 +85,58 @@ if ($action == 'set_DELIVERY_FREE_TEXT')
if ($action == 'specimen')
{
- $modele=GETPOST('module','alpha');
+ $modele=GETPOST('module','alpha');
- $sending = new Livraison($db);
- $sending->initAsSpecimen();
+ $sending = new Livraison($db);
+ $sending->initAsSpecimen();
- // Search template files
- $file=''; $classname=''; $filefound=0;
- $dirmodels=array_merge(array('/'),(array) $conf->modules_parts['models']);
- foreach($dirmodels as $reldir)
- {
- $file=dol_buildpath($reldir."core/modules/livraison/pdf/pdf_".$modele.".modules.php",0);
- if (file_exists($file))
- {
- $filefound=1;
- $classname = "pdf_".$modele;
- break;
- }
- }
+ // Search template files
+ $file=''; $classname=''; $filefound=0;
+ $dirmodels=array_merge(array('/'),(array) $conf->modules_parts['models']);
+ foreach($dirmodels as $reldir)
+ {
+ $file=dol_buildpath($reldir."core/modules/livraison/pdf/pdf_".$modele.".modules.php",0);
+ if (file_exists($file))
+ {
+ $filefound=1;
+ $classname = "pdf_".$modele;
+ break;
+ }
+ }
- if ($filefound)
- {
- require_once $file;
-
- $module = new $classname($db);
-
- if ($module->write_file($sending,$langs) > 0)
- {
- header("Location: ".DOL_URL_ROOT."/document.php?modulepart=livraison&file=SPECIMEN.pdf");
- return;
- }
- else
- {
- $mesg='<font class="error">'.$module->error.'</font>';
- dol_syslog($module->error, LOG_ERR);
- }
- }
- else
- {
- $mesg='<font class="error">'.$langs->trans("ErrorModuleNotFound").'</font>';
- dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
- }
+ if ($filefound)
+ {
+ require_once $file;
+
+ $module = new $classname($db);
+
+ if ($module->write_file($sending,$langs) > 0)
+ {
+ header("Location: ".DOL_URL_ROOT."/document.php?modulepart=livraison&file=SPECIMEN.pdf");
+ return;
+ }
+ else
+ {
+ $mesg='<font class="error">'.$module->error.'</font>';
+ dol_syslog($module->error, LOG_ERR);
+ }
+ }
+ else
+ {
+ $mesg='<font class="error">'.$langs->trans("ErrorModuleNotFound").'</font>';
+ dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
+ }
}
if ($action == 'set')
-{
- $ret = addDocumentModel($value, $type, $label, $scandir);
+{
+ $ret = addDocumentModel($value, $type, $label, $scandir);
}
if ($action == 'del')
{
$ret = delDocumentModel($value, $type);
- if ($ret > 0)
+ if ($ret > 0)
{
if ($conf->global->LIVRAISON_ADDON_PDF == "$value") dolibarr_del_const($db, 'LIVRAISON_ADDON_PDF',$conf->entity);
}
@@ -146,17 +146,17 @@ if ($action == 'setdoc')
{
if (dolibarr_set_const($db, "LIVRAISON_ADDON_PDF",$value,'chaine',0,'',$conf->entity))
{
- // La constante qui a ete lue en avant du nouveau set
- // on passe donc par une variable pour avoir un affichage coherent
+ // La constante qui a ete lue en avant du nouveau set
+ // on passe donc par une variable pour avoir un affichage coherent
$conf->global->LIVRAISON_ADDON_PDF = $value;
}
// On active le modele
- $ret = delDocumentModel($value, $type);
- if ($ret > 0)
- {
- $ret = addDocumentModel($value, $type, $label, $scandir);
- }
+ $ret = delDocumentModel($value, $type);
+ if ($ret > 0)
+ {
+ $ret = addDocumentModel($value, $type, $label, $scandir);
+ }
}
if ($action == 'setmod')
@@ -164,7 +164,7 @@ if ($action == 'setmod')
// TODO Verifier si module numerotation choisi peut etre active
// par appel methode canBeActivated
- dolibarr_set_const($db, "LIVRAISON_ADDON",$value,'chaine',0,'',$conf->entity);
+ dolibarr_set_const($db, "LIVRAISON_ADDON",$value,'chaine',0,'',$conf->entity);
}
@@ -189,11 +189,15 @@ $head[$h][0] = DOL_URL_ROOT."/admin/confexped.php";
$head[$h][1] = $langs->trans("Setup");
$h++;
+$head[$h][0] = DOL_URL_ROOT."/admin/carrier.php";
+$head[$h][1] = $langs->trans("Carriers");
+$h++;
+
if (! empty($conf->global->MAIN_SUBMODULE_EXPEDITION))
{
- $head[$h][0] = DOL_URL_ROOT."/admin/expedition.php";
- $head[$h][1] = $langs->trans("Sending");
- $h++;
+ $head[$h][0] = DOL_URL_ROOT."/admin/expedition.php";
+ $head[$h][1] = $langs->trans("Sending");
+ $h++;
}
$head[$h][0] = DOL_URL_ROOT."/admin/livraison.php";
@@ -222,34 +226,34 @@ clearstatcache();
foreach ($dirmodels as $reldir)
{
- $dir = dol_buildpath($reldir."core/modules/livraison/");
+ $dir = dol_buildpath($reldir."core/modules/livraison/");
- if (is_dir($dir))
- {
- $handle = opendir($dir);
- if (is_resource($handle))
- {
- $var=true;
- while (($file = readdir($handle))!==false)
- {
- if (substr($file, 0, 14) == 'mod_livraison_' && substr($file, dol_strlen($file)-3, 3) == 'php')
- {
- $file = substr($file, 0, dol_strlen($file)-4);
-
- require_once DOL_DOCUMENT_ROOT ."/core/modules/livraison/".$file.'.php';
-
- $module = new $file;
-
- // Show modules according to features level
- if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) continue;
- if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) continue;
-
- if ($module->isEnabled())
- {
- $var=!$var;
- print '<tr '.$bc[$var].'><td>'.$module->nom."</td><td>\n";
- print $module->info();
- print '</td>';
+ if (is_dir($dir))
+ {
+ $handle = opendir($dir);
+ if (is_resource($handle))
+ {
+ $var=true;
+ while (($file = readdir($handle))!==false)
+ {
+ if (substr($file, 0, 14) == 'mod_livraison_' && substr($file, dol_strlen($file)-3, 3) == 'php')
+ {
+ $file = substr($file, 0, dol_strlen($file)-4);
+
+ require_once DOL_DOCUMENT_ROOT ."/core/modules/livraison/".$file.'.php';
+
+ $module = new $file;
+
+ // Show modules according to features level
+ if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) continue;
+ if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) continue;
+
+ if ($module->isEnabled())
+ {
+ $var=!$var;
+ print '<tr '.$bc[$var].'><td>'.$module->nom."</td><td>\n";
+ print $module->info();
+ print '</td>';
// Show example of numbering module
print '<td nowrap="nowrap">';
@@ -259,48 +263,48 @@ foreach ($dirmodels as $reldir)
else print $tmp;
print '</td>'."\n";
- print '<td align="center">';
- if ($conf->global->LIVRAISON_ADDON == "$file")
- {
- print img_picto($langs->trans("Activated"),'switch_on');
- }
- else
- {
- print '<a href="'.$_SERVER["PHP_SELF"].'?action=setmod&value='.$file.'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"),'switch_off').'</a>';
- }
- print '</td>';
-
- $livraison=new Livraison($db);
- $livraison->initAsSpecimen();
-
- // Info
- $htmltooltip='';
- $htmltooltip.=''.$langs->trans("Version").': <b>'.$module->getVersion().'</b><br>';
- $nextval=$module->getNextValue($mysoc,$livraison);
- if ("$nextval" != $langs->trans("NotAvailable")) // Keep " on nextval
- {
- $htmltooltip.=''.$langs->trans("NextValue").': ';
- if ($nextval)
- {
- $htmltooltip.=$nextval.'<br>';
- }
- else
- {
- $htmltooltip.=$langs->trans($module->error).'<br>';
- }
- }
-
- print '<td align="center">';
- print $form->textwithpicto('',$htmltooltip,1,0);
- print '</td>';
-
- print '</tr>';
- }
- }
- }
- closedir($handle);
- }
- }
+ print '<td align="center">';
+ if ($conf->global->LIVRAISON_ADDON == "$file")
+ {
+ print img_picto($langs->trans("Activated"),'switch_on');
+ }
+ else
+ {
+ print '<a href="'.$_SERVER["PHP_SELF"].'?action=setmod&value='.$file.'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"),'switch_off').'</a>';
+ }
+ print '</td>';
+
+ $livraison=new Livraison($db);
+ $livraison->initAsSpecimen();
+
+ // Info
+ $htmltooltip='';
+ $htmltooltip.=''.$langs->trans("Version").': <b>'.$module->getVersion().'</b><br>';
+ $nextval=$module->getNextValue($mysoc,$livraison);
+ if ("$nextval" != $langs->trans("NotAvailable")) // Keep " on nextval
+ {
+ $htmltooltip.=''.$langs->trans("NextValue").': ';
+ if ($nextval)
+ {
+ $htmltooltip.=$nextval.'<br>';
+ }
+ else
+ {
+ $htmltooltip.=$langs->trans($module->error).'<br>';
+ }
+ }
+
+ print '<td align="center">';
+ print $form->textwithpicto('',$htmltooltip,1,0);
+ print '</td>';
+
+ print '</tr>';
+ }
+ }
+ }
+ closedir($handle);
+ }
+ }
}
print '</table>';
@@ -352,77 +356,77 @@ clearstatcache();
$var=true;
foreach ($dirmodels as $reldir)
{
- $dir = dol_buildpath($reldir."core/modules/livraison/pdf/");
+ $dir = dol_buildpath($reldir."core/modules/livraison/pdf/");
- if (is_dir($dir))
- {
- $handle = opendir($dir);
- if (is_resource($handle))
- {
- while (($file = readdir($handle))!==false)
- {
- if (substr($file, dol_strlen($file) -12) == '.modules.php' && substr($file,0,4) == 'pdf_')
- {
- $name = substr($file, 4, dol_strlen($file) - 16);
- $classname = substr($file, 0, dol_strlen($file) - 12);
-
- $var=!$var;
-
- print '<tr '.$bc[$var].'><td>';
- print $name;
- print "</td><td>\n";
- require_once $dir.$file;
- $module = new $classname($db);
-
- print $module->description;
- print '</td>';
-
- // Activ
- if (in_array($name, $def))
- {
- print "<td align=\"center\">\n";
- print '<a href="'.$_SERVER["PHP_SELF"].'?action=del&value='.$name.'&scandir='.$module->scandir.'&label='.urlencode($module->name).'">';
- print img_picto($langs->trans("Enabled"),'switch_on');
- print '</a>';
- print "</td>";
- }
- else
- {
- print "<td align=\"center\">\n";
- print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&value='.$name.'&scandir='.$module->scandir.'&label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"),'switch_off').'</a>';
- print "</td>";
- }
-
- // Defaut
- print "<td align=\"center\">";
- if ($conf->global->LIVRAISON_ADDON_PDF == "$name")
- {
- print img_picto($langs->trans("Default"),'on');
- }
- else
- {
- print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&value='.$name.'&scandir='.$module->scandir.'&label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"),'off').'</a>';
- }
- print '</td>';
-
- // Info
- $htmltooltip = ''.$langs->trans("Type").': '.($module->type?$module->type:$langs->trans("Unknown"));
- $htmltooltip.='<br>'.$langs->trans("Width").'/'.$langs->trans("Height").': '.$module->page_largeur.'/'.$module->page_hauteur;
- $htmltooltip.='<br><br>'.$langs->trans("FeaturesSupported").':';
- $htmltooltip.='<br>'.$langs->trans("Logo").': '.yn($module->option_logo,1,1);
- print '<td align="center">';
- print $form->textwithpicto('',$htmltooltip,1,0);
- print '</td>';
- print '<td align="center">';
- print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"),'sending').'</a>';
- print '</td>';
-
- print '</tr>';
- }
- }
- closedir($handle);
- }
- }
+ if (is_dir($dir))
+ {
+ $handle = opendir($dir);
+ if (is_resource($handle))
+ {
+ while (($file = readdir($handle))!==false)
+ {
+ if (substr($file, dol_strlen($file) -12) == '.modules.php' && substr($file,0,4) == 'pdf_')
+ {
+ $name = substr($file, 4, dol_strlen($file) - 16);
+ $classname = substr($file, 0, dol_strlen($file) - 12);
+
+ $var=!$var;
+
+ print '<tr '.$bc[$var].'><td>';
+ print $name;
+ print "</td><td>\n";
+ require_once $dir.$file;
+ $module = new $classname($db);
+
+ print $module->description;
+ print '</td>';
+
+ // Activ
+ if (in_array($name, $def))
+ {
+ print "<td align=\"center\">\n";
+ print '<a href="'.$_SERVER["PHP_SELF"].'?action=del&value='.$name.'&scandir='.$module->scandir.'&label='.urlencode($module->name).'">';
+ print img_picto($langs->trans("Enabled"),'switch_on');
+ print '</a>';
+ print "</td>";
+ }
+ else
+ {
+ print "<td align=\"center\">\n";
+ print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&value='.$name.'&scandir='.$module->scandir.'&label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"),'switch_off').'</a>';
+ print "</td>";
+ }
+
+ // Defaut
+ print "<td align=\"center\">";
+ if ($conf->global->LIVRAISON_ADDON_PDF == "$name")
+ {
+ print img_picto($langs->trans("Default"),'on');
+ }
+ else
+ {
+ print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&value='.$name.'&scandir='.$module->scandir.'&label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"),'off').'</a>';
+ }
+ print '</td>';
+
+ // Info
+ $htmltooltip = ''.$langs->trans("Type").': '.($module->type?$module->type:$langs->trans("Unknown"));
+ $htmltooltip.='<br>'.$langs->trans("Width").'/'.$langs->trans("Height").': '.$module->page_largeur.'/'.$module->page_hauteur;
+ $htmltooltip.='<br><br>'.$langs->trans("FeaturesSupported").':';
+ $htmltooltip.='<br>'.$langs->trans("Logo").': '.yn($module->option_logo,1,1);
+ print '<td align="center">';
+ print $form->textwithpicto('',$htmltooltip,1,0);
+ print '</td>';
+ print '<td align="center">';
+ print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"),'sending').'</a>';
+ print '</td>';
+
+ print '</tr>';
+ }
+ }
+ closedir($handle);
+ }
+ }
}
print '</table>';
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index 9e0a2f4d3dcd1a60d7305a4b1a75d61be2dfb27b..93dc92f08b39699624cc951dfe2e5f9e708d7e3c 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -463,7 +463,7 @@ function print_eldy_menu($db,$atarget,$type_user,&$tabMenu)
{
if (! preg_match('/\?/',$url)) $url.='?';
else $url.='&';
- $url.='mainmenu='.$newTabMenu[$i]['mainmenu'].'&leftmenu=';
+ $url.='mainmenu='.$newTabMenu[$i]['mainmenu'].'&leftmenu=';
}
//$url.="idmenu=".$newTabMenu[$i]['rowid']; // Already done by menuLoad
}
@@ -617,7 +617,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
$langs->load("help");
// Setup
- $newmenu->add("/admin/index.php?mainmenu=home&leftmenu=setup", $langs->trans("Setup"), 0, 1, '', $mainmenu, 'setup');
+ $newmenu->add("/admin/index.php?mainmenu=home&leftmenu=setup", $langs->trans("Setup"), 0, 1, '', $mainmenu, 'setup');
if ($leftmenu=="setup")
{
$warnpicto='';
@@ -652,38 +652,38 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
}
// System tools
- $newmenu->add("/admin/tools/index.php?mainmenu=home&leftmenu=admintools", $langs->trans("SystemTools"), 0, 1, '', $mainmenu, 'admintools');
+ $newmenu->add("/admin/tools/index.php?mainmenu=home&leftmenu=admintools", $langs->trans("SystemTools"), 0, 1, '', $mainmenu, 'admintools');
if (preg_match('/^admintools/',$leftmenu))
{
- $newmenu->add('/admin/system/dolibarr.php?mainmenu=home&leftmenu=admintools_info', $langs->trans('InfoDolibarr'), 1);
- if ($leftmenu=='admintools_info') $newmenu->add('/admin/system/modules.php?mainmenu=home&leftmenu=admintools_info', $langs->trans('Modules'), 2);
- if ($leftmenu=='admintools_info') $newmenu->add('/admin/triggers.php?mainmenu=home&leftmenu=admintools_info', $langs->trans('Triggers'), 2);
- $newmenu->add('/admin/system/os.php?mainmenu=home&leftmenu=admintools', $langs->trans('InfoOS'), 1);
- $newmenu->add('/admin/system/web.php?mainmenu=home&leftmenu=admintools', $langs->trans('InfoWebServer'), 1);
- $newmenu->add('/admin/system/phpinfo.php?mainmenu=home&leftmenu=admintools', $langs->trans('InfoPHP'), 1);
+ $newmenu->add('/admin/system/dolibarr.php?mainmenu=home&leftmenu=admintools_info', $langs->trans('InfoDolibarr'), 1);
+ if ($leftmenu=='admintools_info') $newmenu->add('/admin/system/modules.php?mainmenu=home&leftmenu=admintools_info', $langs->trans('Modules'), 2);
+ if ($leftmenu=='admintools_info') $newmenu->add('/admin/triggers.php?mainmenu=home&leftmenu=admintools_info', $langs->trans('Triggers'), 2);
+ $newmenu->add('/admin/system/os.php?mainmenu=home&leftmenu=admintools', $langs->trans('InfoOS'), 1);
+ $newmenu->add('/admin/system/web.php?mainmenu=home&leftmenu=admintools', $langs->trans('InfoWebServer'), 1);
+ $newmenu->add('/admin/system/phpinfo.php?mainmenu=home&leftmenu=admintools', $langs->trans('InfoPHP'), 1);
//if (function_exists('xdebug_is_enabled')) $newmenu->add('/admin/system/xdebug.php', $langs->trans('XDebug'),1);
- $newmenu->add('/admin/system/database.php?mainmenu=home&leftmenu=admintools', $langs->trans('InfoDatabase'), 1);
-
- $newmenu->add("/admin/tools/dolibarr_export.php?mainmenu=home&leftmenu=admintools", $langs->trans("Backup"),1);
- $newmenu->add("/admin/tools/dolibarr_import.php?mainmenu=home&leftmenu=admintools", $langs->trans("Restore"),1);
- $newmenu->add("/admin/tools/update.php?mainmenu=home&leftmenu=admintools", $langs->trans("MenuUpgrade"),1);
- if (function_exists('eaccelerator_info')) $newmenu->add("/admin/tools/eaccelerator.php?mainmenu=home&leftmenu=admintools", $langs->trans("EAccelerator"),1);
- $newmenu->add("/admin/tools/listevents.php?mainmenu=home&leftmenu=admintools", $langs->trans("Audit"),1);
- $newmenu->add("/admin/tools/listsessions.php?mainmenu=home&leftmenu=admintools", $langs->trans("Sessions"),1);
- $newmenu->add("/admin/tools/purge.php?mainmenu=home&leftmenu=admintools", $langs->trans("Purge"),1);
- $newmenu->add('/admin/system/about.php?mainmenu=home&leftmenu=admintools', $langs->trans('About'), 1);
- $newmenu->add("/support/index.php?mainmenu=home&leftmenu=admintools", $langs->trans("HelpCenter"),1,1,'targethelp');
+ $newmenu->add('/admin/system/database.php?mainmenu=home&leftmenu=admintools', $langs->trans('InfoDatabase'), 1);
+
+ $newmenu->add("/admin/tools/dolibarr_export.php?mainmenu=home&leftmenu=admintools", $langs->trans("Backup"),1);
+ $newmenu->add("/admin/tools/dolibarr_import.php?mainmenu=home&leftmenu=admintools", $langs->trans("Restore"),1);
+ $newmenu->add("/admin/tools/update.php?mainmenu=home&leftmenu=admintools", $langs->trans("MenuUpgrade"),1);
+ if (function_exists('eaccelerator_info')) $newmenu->add("/admin/tools/eaccelerator.php?mainmenu=home&leftmenu=admintools", $langs->trans("EAccelerator"),1);
+ $newmenu->add("/admin/tools/listevents.php?mainmenu=home&leftmenu=admintools", $langs->trans("Audit"),1);
+ $newmenu->add("/admin/tools/listsessions.php?mainmenu=home&leftmenu=admintools", $langs->trans("Sessions"),1);
+ $newmenu->add("/admin/tools/purge.php?mainmenu=home&leftmenu=admintools", $langs->trans("Purge"),1);
+ $newmenu->add('/admin/system/about.php?mainmenu=home&leftmenu=admintools', $langs->trans('About'), 1);
+ $newmenu->add("/support/index.php?mainmenu=home&leftmenu=admintools", $langs->trans("HelpCenter"),1,1,'targethelp');
}
// Modules system tools
if (! empty($conf->product->enabled) || ! empty($conf->service->enabled) || ! empty($conf->global->MAIN_MENU_ENABLE_MODULETOOLS))
{
if (empty($user->societe_id))
{
- $newmenu->add("/admin/tools/index.php?mainmenu=home&leftmenu=modulesadmintools", $langs->trans("ModulesSystemTools"), 0, 1, '', $mainmenu, 'modulesadmintools');
+ $newmenu->add("/admin/tools/index.php?mainmenu=home&leftmenu=modulesadmintools", $langs->trans("ModulesSystemTools"), 0, 1, '', $mainmenu, 'modulesadmintools');
if ($leftmenu=="modulesadmintools" && $user->admin)
{
$langs->load("products");
- $newmenu->add("/product/admin/product_tools.php?mainmenu=home&leftmenu=modulesadmintools", $langs->trans("ProductVatMassChange"), 1, $user->admin);
+ $newmenu->add("/product/admin/product_tools.php?mainmenu=home&leftmenu=modulesadmintools", $langs->trans("ProductVatMassChange"), 1, $user->admin);
}
}
}
@@ -860,7 +860,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
{
$langs->load("interventions");
$newmenu->add("/fichinter/list.php?leftmenu=ficheinter", $langs->trans("Interventions"), 0, $user->rights->ficheinter->lire, '', $mainmenu, 'ficheinter');
- $newmenu->add("/fichinter/fiche.php?action=create&leftmenu=ficheinter", $langs->trans("NewIntervention"), 1, $user->rights->ficheinter->creer);
+ $newmenu->add("/fichinter/fiche.php?action=create&leftmenu=ficheinter", $langs->trans("NewIntervention"), 1, $user->rights->ficheinter->creer);
$newmenu->add("/fichinter/list.php?leftmenu=ficheinter", $langs->trans("List"), 1, $user->rights->ficheinter->lire);
}
@@ -1148,7 +1148,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
{
$langs->load("sendings");
$newmenu->add("/expedition/index.php?leftmenu=sendings", $langs->trans("Shipments"), 0, $user->rights->expedition->lire, '', $mainmenu, 'sendings');
- if ($leftmenu=="sendings") $newmenu->add("/expedition/fiche.php?action=create2&leftmenu=sendings", $langs->trans("NewSending"), 1, $user->rights->expedition->creer);
+ if ($leftmenu=="sendings") $newmenu->add("/expedition/fiche.php?action=create2&leftmenu=sendings", $langs->trans("NewSending"), 1, $user->rights->expedition->creer);
if ($leftmenu=="sendings") $newmenu->add("/expedition/liste.php?leftmenu=sendings", $langs->trans("List"), 1, $user->rights->expedition->lire);
if ($leftmenu=="sendings") $newmenu->add("/expedition/stats/index.php?leftmenu=sendings", $langs->trans("Statistics"), 1, $user->rights->expedition->lire);
}
diff --git a/htdocs/core/modules/expedition/methode_expedition_chrono.modules.php b/htdocs/core/modules/expedition/methode_expedition_chrono.modules.php
index acebea5343087823a854917ddfc1c8fb1870c97a..412545b3f6f65877465901096026e8c72e9570e7 100644
--- a/htdocs/core/modules/expedition/methode_expedition_chrono.modules.php
+++ b/htdocs/core/modules/expedition/methode_expedition_chrono.modules.php
@@ -35,7 +35,7 @@ class methode_expedition_chrono extends ModeleShippingMethod
{
$this->db = $db;
$this->id = 8; // Do not change this value
- $this->code = "COLCHRONO"; // Do not change this value
+ $this->code = "CHRONO"; // Do not change this value
$this->name = "Chronopost";
$this->description = "Chronopost";
}
diff --git a/htdocs/core/modules/expedition/methode_expedition_gls.modules.php b/htdocs/core/modules/expedition/methode_expedition_gls.modules.php
index 2f63ff927af7fb0def4b602c35b3bf95b4c2b84e..0fc67831a38c24c6ee2c81a752c26eaac99e681d 100644
--- a/htdocs/core/modules/expedition/methode_expedition_gls.modules.php
+++ b/htdocs/core/modules/expedition/methode_expedition_gls.modules.php
@@ -35,7 +35,7 @@ class methode_expedition_gls extends ModeleShippingMethod
{
$this->db = $db;
$this->id = 7; // Do not change this value
- $this->code = "COLGLS"; // Do not change this value
+ $this->code = "GLS"; // Do not change this value
$this->name = "GLS";
$this->description = "General Logistics Systems";
}
diff --git a/htdocs/core/modules/expedition/methode_expedition_kiala.modules.php b/htdocs/core/modules/expedition/methode_expedition_kiala.modules.php
index fa8072ecda3309e54f11b2b8f01740e6142af7e6..503bacdc421d0ae380d60b7886b6df343d57b0fd 100644
--- a/htdocs/core/modules/expedition/methode_expedition_kiala.modules.php
+++ b/htdocs/core/modules/expedition/methode_expedition_kiala.modules.php
@@ -35,7 +35,7 @@ Class methode_expedition_kiala extends ModeleShippingMethod
{
$this->db = $db;
$this->id = 6; // Do not change this value
- $this->code = "COLKIALA"; // Do not change this value
+ $this->code = "KIALA"; // Do not change this value
$this->name = "KIALA";
$this->description = "KIALA";
}
diff --git a/htdocs/core/modules/expedition/methode_expedition_ups.modules.php b/htdocs/core/modules/expedition/methode_expedition_ups.modules.php
index 582f23c9e0a873fb96f92d9c39d971be14e30d9c..1225b5d7959e332db493435d7cfa3ad1cb8633d6 100644
--- a/htdocs/core/modules/expedition/methode_expedition_ups.modules.php
+++ b/htdocs/core/modules/expedition/methode_expedition_ups.modules.php
@@ -34,7 +34,7 @@ class methode_expedition_ups extends ModeleShippingMethod
{
$this->db = $db;
$this->id = 5; // Do not change this value
- $this->code = "COLUPS"; // Do not change this value
+ $this->code = "UPS"; // Do not change this value
$this->name = "UPS";
$this->description = "United Parcel Service";
}
diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php
index fe66ea0fd788db2a66739fa98ac54d0d1e74248d..c850b3ae077a4300cd5e35a67fd02b61309aed08 100644
--- a/htdocs/expedition/class/expedition.class.php
+++ b/htdocs/expedition/class/expedition.class.php
@@ -1173,6 +1173,85 @@ class Expedition extends CommonObject
}
}
+ /**
+ * Fetch all deliveries method and return an array. Load array this->listmeths.
+ * @param id $id only this carrier, all if none
+ * @return void
+ */
+ function list_delivery_methods($id='')
+ {
+ global $langs;
+ $listmeths = array();
+ $i=0;
+
+ $sql = "SELECT em.rowid, em.code, em.libelle, em.description, em.tracking, em.active";
+ $sql.= " FROM ".MAIN_DB_PREFIX."c_shipment_mode as em";
+ if ($id) $sql.= " WHERE em.rowid=".$id;
+
+ $resql = $this->db->query($sql);
+ if ($resql)
+ {
+ while ($obj = $this->db->fetch_object($resql))
+ {
+ $this->listmeths[$i][rowid] = $obj->rowid;
+ $this->listmeths[$i][code] = $obj->code;
+ $label=$langs->trans('SendingMethod'.$obj->code);
+ $this->listmeths[$i][libelle] = ($label != 'SendingMethod'.$obj->code?$label:$obj->libelle);
+ $this->listmeths[$i][description] = $obj->description;
+ if ($obj->tracking)
+ {
+ $this->listmeths[$i][tracking] = $obj->tracking;
+ // editable or hardcoded
+ $this->listmeths[$i][editable] = 1;
+ }
+ else
+ {
+ if ($obj->code)
+ {
+ $classname = "methode_expedition_".strtolower($obj->code);
+
+ if (file_exists(DOL_DOCUMENT_ROOT."/core/modules/expedition/methode_expedition_".strtolower($obj->code).".modules.php") )
+ {
+ require_once DOL_DOCUMENT_ROOT."/core/modules/expedition/methode_expedition_".strtolower($obj->code).'.modules.php';
+ $shipmethod = new $classname();
+ $this->listmeths[$i][tracking] = $shipmethod->provider_url_status('{TRACKID}');
+ }
+ }
+ }
+ $this->listmeths[$i][active] = $obj->active;
+ $i++;
+ }
+ }
+ }
+
+ /**
+ * Activate delivery method.
+ * @param id $id id method to activate
+ * @return void
+ */
+ function activ_delivery_method($id)
+ {
+ $sql = 'UPDATE '.MAIN_DB_PREFIX.'c_shipment_mode SET active=1';
+ $sql.= ' WHERE rowid='.$id;
+
+ $resql = $this->db->query($sql);
+
+ }
+
+ /**
+ * DesActivate delivery method.
+ * @param id $id id method to desactivate
+ * @return void
+ */
+ function disable_delivery_method($id)
+ {
+ $sql = 'UPDATE '.MAIN_DB_PREFIX.'c_shipment_mode SET active=0';
+ $sql.= ' WHERE rowid='.$id;
+
+ $resql = $this->db->query($sql);
+
+ }
+
/**
* Get tracking url status
*
@@ -1185,7 +1264,7 @@ class Expedition extends CommonObject
if (! empty($this->expedition_method_id))
{
- $sql = "SELECT em.code";
+ $sql = "SELECT em.code, em.tracking";
$sql.= " FROM ".MAIN_DB_PREFIX."c_shipment_mode as em";
$sql.= " WHERE em.rowid = ".$this->expedition_method_id;
@@ -1195,36 +1274,45 @@ class Expedition extends CommonObject
if ($obj = $this->db->fetch_object($resql))
{
$code = $obj->code;
+ $tracking = $obj->tracking;
}
}
}
- if ($code)
- {
- $classname = "methode_expedition_".strtolower($code);
-
- $url='';
- if (file_exists(DOL_DOCUMENT_ROOT."/core/modules/expedition/methode_expedition_".strtolower($code).".modules.php") && ! empty($this->tracking_number))
- {
- require_once DOL_DOCUMENT_ROOT."/core/modules/expedition/methode_expedition_".strtolower($code).'.modules.php';
- $shipmethod = new $classname();
- $url = $shipmethod->provider_url_status($this->tracking_number);
- }
-
- if ($url)
- {
- $this->tracking_url = sprintf('<a target="_blank" href="%s">'.($value?$value:'url').'</a>',$url,$url);
- }
- else
- {
- $this->tracking_url = $value;
- }
- }
- else
- {
- $this->tracking_url = $value;
- }
- }
+ if ($tracking)
+ {
+ $url = str_replace('{TRACKID}', $value, $tracking);
+ $this->tracking_url = sprintf('<a target="_blank" href="%s">'.($value?$value:'url').'</a>',$url,$url);
+ }
+ else
+ {
+ if ($code)
+ {
+ $classname = "methode_expedition_".strtolower($code);
+
+ $url='';
+ if (file_exists(DOL_DOCUMENT_ROOT."/core/modules/expedition/methode_expedition_".strtolower($code).".modules.php") && ! empty($this->tracking_number))
+ {
+ require_once DOL_DOCUMENT_ROOT."/core/modules/expedition/methode_expedition_".strtolower($code).'.modules.php';
+ $shipmethod = new $classname();
+ $url = $shipmethod->provider_url_status($this->tracking_number);
+ }
+
+ if ($url)
+ {
+ $this->tracking_url = sprintf('<a target="_blank" href="%s">'.($value?$value:'url').'</a>',$url,$url);
+ }
+ else
+ {
+ $this->tracking_url = $value;
+ }
+ }
+ else
+ {
+ $this->tracking_url = $value;
+ }
+ }
+ }
/**
* Classify the shipping as invoiced
diff --git a/htdocs/index.php b/htdocs/index.php
index 49f50ea1a690267e1f56f614aca0a9117988afcf..430e2652a135f863b258251738a506bf8446d9c5 100644
--- a/htdocs/index.php
+++ b/htdocs/index.php
@@ -368,7 +368,7 @@ if (! empty($conf->contrat->enabled) && $user->rights->contrat->lire)
$board->load_board($user,"inactives");
$board->warning_delay=$conf->contrat->services->inactifs->warning_delay/60/60/24;
$board->label=$langs->trans("BoardNotActivatedServices");
- $board->url=DOL_URL_ROOT.'/contrat/services.php?mainmenu=commercial&leftmenu=contracts&mode=0';
+ $board->url=DOL_URL_ROOT.'/contrat/services.php?mainmenu=commercial&leftmenu=contracts&mode=0';
$board->img=img_object($langs->trans("Contract"),"contract");
$rowspan++;
$dashboardlines[]=$board;
@@ -384,7 +384,7 @@ if (! empty($conf->contrat->enabled) && $user->rights->contrat->lire)
$board->load_board($user,"expired");
$board->warning_delay=$conf->contrat->services->expires->warning_delay/60/60/24;
$board->label=$langs->trans("BoardRunningServices");
- $board->url=DOL_URL_ROOT.'/contrat/services.php?mainmenu=commercial&leftmenu=contracts&mode=4&filter=expired';
+ $board->url=DOL_URL_ROOT.'/contrat/services.php?mainmenu=commercial&leftmenu=contracts&mode=4&filter=expired';
$board->img=img_object($langs->trans("Contract"),"contract");
$rowspan++;
$dashboardlines[]=$board;
diff --git a/htdocs/install/mysql/data/llx_c_shipment_mode.sql b/htdocs/install/mysql/data/llx_c_shipment_mode.sql
index ba625191e3d9a952293706a137a2a404dd9364a3..74b8eaea6ce245a09b0da2556a5161d427096768 100644
--- a/htdocs/install/mysql/data/llx_c_shipment_mode.sql
+++ b/htdocs/install/mysql/data/llx_c_shipment_mode.sql
@@ -29,11 +29,12 @@
--
-- Sending method
--
-INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (1,'CATCH','Catch','Catch by client',1);
-INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (2,'TRANS','Transporter','Generic transporter',1);
-INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (3,'COLSUI','Colissimo Suivi','Colissimo Suivi',0);
-INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (4,'LETTREMAX','Lettre Max','Courrier Suivi et Lettre Max',0);
-INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (5,'COLUPS','UPS','United Parcel Service',0);
-INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (6,'COLKIALA','KIALA','Relais Kiala',0);
-INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (7,'COLGLS','GLS','General Logistics Systems',0);
-INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (8,'COLCHRONO','Chronopost','Chronopost',0);
+INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,tracking,active) VALUES (1,'CATCH','Catch','Catch by client','',1);
+INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,tracking,active) VALUES (2,'TRANS','Transporter','Generic transporter','',1);
+INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,tracking,active) VALUES (3,'COLSUI','Colissimo Suivi','Colissimo Suivi','',0);
+INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,tracking,active) VALUES (4,'LETTREMAX','Lettre Max','Courrier Suivi et Lettre Max','',0);
+INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,tracking,active) VALUES (5,'UPS','UPS','United Parcel Service','',0);
+INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,tracking,active) VALUES (6,'KIALA','KIALA','Relais Kiala','',0);
+INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,tracking,active) VALUES (7,'GLS','GLS','General Logistics Systems','',0);
+INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,tracking,active) VALUES (8,'CHRONO','Chronopost','Chronopost','',0);
+INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,tracking,active) VALUES (9,'EDIT','EDITABLE','Transporteur Modifiable','http://www.website.com/dir/{TRACKID}',0);
diff --git a/htdocs/install/mysql/migration/3.3.0-3.4.0.sql b/htdocs/install/mysql/migration/3.3.0-3.4.0.sql
index 63142254bf30897d3c3a63f767c88b387b38dc1f..f1b05b925e53e4b7e3981b49d6f7a041bdecbc94 100755
--- a/htdocs/install/mysql/migration/3.3.0-3.4.0.sql
+++ b/htdocs/install/mysql/migration/3.3.0-3.4.0.sql
@@ -59,7 +59,10 @@ alter table llx_societe CHANGE COLUMN ville town text;
alter table llx_socpeople CHANGE COLUMN ville town text;
alter table llx_bank_account CHANGE COLUMN adresse_proprio owner_address text;
-INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (5,'COLUPS','UPS','United Parcel Service',0);
-INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (6,'COLKIALA','KIALA','Relais Kiala',0);
-INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (7,'COLGLS','GLS','General Logistics Systems',0);
-INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (8,'COLCHRONO','Chronopost','Chronopost',0);
+INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (5,'UPS','UPS','United Parcel Service',0);
+INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (6,'KIALA','KIALA','Relais Kiala',0);
+INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (7,'GLS','GLS','General Logistics Systems',0);
+INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (8,'CHRONO','Chronopost','Chronopost',0);
+
+ALTER TABLE llx_c_shipment_mode ADD COLUMN tracking VARCHAR(256) NOT NULL AFTER description;
+INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,tracking,active) VALUES (9,'EDIT','EDITABLE','Transporteur Modifiable','http://www.website.com/dir/{TRACKID}',0);
diff --git a/htdocs/install/mysql/tables/llx_c_shipment_mode.sql b/htdocs/install/mysql/tables/llx_c_shipment_mode.sql
index 7733c980ab40debc99a0eb8f26811b08f388a641..591e3ff9b932a04d6db0f39e6a7c8e94f27a9195 100644
--- a/htdocs/install/mysql/tables/llx_c_shipment_mode.sql
+++ b/htdocs/install/mysql/tables/llx_c_shipment_mode.sql
@@ -23,6 +23,7 @@ create table llx_c_shipment_mode
code varchar(30) NOT NULL,
libelle varchar(50) NOT NULL,
description text,
+ tracking varchar(256) NOT NULL,
active tinyint DEFAULT 0,
module varchar(32) NULL
)ENGINE=innodb;
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 202a7c0dfb108237c0af8cbe21cb2d8cc15aeadc..caec4de00aefa7c04e389766741a8ea5b15c01aa 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -1369,7 +1369,7 @@ function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $a
if (empty($conf->global->MAIN_PRINT_DISABLELINK) && empty($conf->browser->phone))
{
$qs=$_SERVER["QUERY_STRING"].($_SERVER["QUERY_STRING"]?'&':'').$morequerystring;
- $text ='<a href="'.$_SERVER["PHP_SELF"].'?'.$qs.($qs?'&':'').'optioncss=print" target="_blank">';
+ $text ='<a href="'.$_SERVER["PHP_SELF"].'?'.$qs.($qs?'&':'').'optioncss=print" target="_blank">';
$text.= img_picto('', 'printer.png', 'class="printer"');
$text.='</a>';
$toprightmenu.=$form->textwithtooltip('',$langs->trans("PrintContentArea"),2,1,$text,'',1);