diff --git a/htdocs/admin/expedition.php b/htdocs/admin/expedition.php
index 4571302871a..b49100642a0 100644
--- a/htdocs/admin/expedition.php
+++ b/htdocs/admin/expedition.php
@@ -23,19 +23,24 @@
* $Source$
*/
-/*!
- \file htdocs/admin/expedition.php
- \ingroup expedition
- \brief Page d'administration/configuration du module Expedition
- \version $Revision$
+/**
+ \file htdocs/admin/expedition.php
+ \ingroup expedition
+ \brief Page d'administration/configuration du module Expedition
+ \version $Revision$
*/
require("./pre.inc.php");
$langs->load("admin");
+$langs->load("sendings");
if (!$user->admin) accessforbidden();
+
+/*
+ * Actions
+ */
if ($_GET["action"] == 'set')
{
$file = DOL_DOCUMENT_ROOT . '/includes/modules/expedition/methode_expedition_'.$_GET["value"].'.modules.php';
@@ -44,15 +49,12 @@ if ($_GET["action"] == 'set')
require_once($file);
$obj = new $classname();
- $sql = "DELETE FROM ".MAIN_DB_PREFIX."expedition_methode WHERE rowid = ".$obj->id.";";
- $db->query($sql);
- $sql='';
- $sql = "INSERT INTO ".MAIN_DB_PREFIX."expedition_methode (rowid,code,libelle,description,status) VALUES (".$obj->id.",'".$obj->code."','".$obj->name."','".addslashes($obj->description)."',".$_GET["statut"].");";
-
- if ($db->query($sql))
- {
-
- }
+
+ // Mise a jour statut
+ $sql = "UPDATE ".MAIN_DB_PREFIX."expedition_methode set status='".$_GET["statut"]."'";
+ $sql.= " WHERE rowid = ".$obj->id;
+ print "$sql";
+ exit;
Header("Location: expedition.php");
@@ -85,16 +87,14 @@ if ($_GET["action"] == 'setpdf')
}
+
llxHeader();
// positionne la variable pour le test d'affichage de l'icone
-
$expedition_addon_var_pdf = EXPEDITION_ADDON_PDF;
-
-
-
$expedition_default = EXPEDITION_DEFAULT;
+
if ($_GET["action"] == 'setdef')
{
$sql = "DELETE FROM ".MAIN_DB_PREFIX."const WHERE name = 'EXPEDITION_ADDON';";
@@ -141,17 +141,17 @@ $dir = DOL_DOCUMENT_ROOT."/includes/modules/expedition/";
* Méthode de livraison
*/
-print_titre("Configuration du module Expedition/Livraisons");
+print_titre($langs->trans("SendingsSetup"));
print "
";
-print_titre("Méthode de livraison");
+print_titre($langs->trans("SendingMethod"));
-print '
';
+print '';
print '';
-print '| Nom | Info | ';
-print 'Actif | ';
-print 'Défaut | ';
+print ''.$langs->trans("Name").' | '.$langs->trans("Description").' | ';
+print ''.$langs->trans("Active").' | ';
+print ''.$langs->trans("Default").' | ';
print "
\n";
if(is_dir($dir)) {
@@ -202,7 +202,7 @@ if(is_dir($dir)) {
print "\n";
- print 'activer';
+ print ''.$langs->trans("Activate").'';
print ' | ';
}
@@ -221,13 +221,13 @@ print '
';
*
*/
-print_titre("Modèles bordereau de livraison");
+print_titre($langs->trans("SendingsReceiptModel"));
-print '';
+print '';
print '';
-print '| Nom | Info | ';
-print 'Actif | ';
-print 'Défaut | ';
+print ''.$langs->trans("Name").' | '.$langs->trans("Description").' | ';
+print ''.$langs->trans("Active").' | ';
+print ''.$langs->trans("Default").' | ';
print "
\n";
clearstatcache();