diff --git a/.travis.yml b/.travis.yml
index 6875b9bb743b4d277788e3e228e600150a32d052..81da87158f0c038600002660633b1a1622ab9d1e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -289,8 +289,8 @@ script:
- |
echo "Unit testing"
- # Ensure we catch errors
- set +e
+ # Ensure we catch errors. Set this to +e if you want to go to this end to see log file.
+ set -e
phpunit -d memory_limit=-1 -c test/phpunit/phpunittest.xml test/phpunit/AllTests.php
set +e
@@ -298,12 +298,21 @@ script:
echo Output dolibarr.log
echo cat documents/dolibarr.log
+after_script:
+- |
+ # Dolibarr log file
+ echo "After script"
+ cat documents/dolibarr.log
+
+
after_success:
- |
echo Success
after_failure:
- |
+ echo Failure
+ # This part of code seems to be never executed, error or not ???
echo "Debugging informations"
# Upgrade log files
cat *.log
@@ -319,8 +328,3 @@ after_failure:
echo
fi
-after_script:
-- |
- # Dolibarr log file
- cat documents/dolibarr.log
-
diff --git a/.tx/config b/.tx/config
index e6fbdc34190b9844f5ecdeb8ef30c4d3c1254af8..b2bc84b50715016a7571a2ca850c4b85f0e66485 100644
--- a/.tx/config
+++ b/.tx/config
@@ -356,6 +356,12 @@ source_file = htdocs/langs/en_US/withdrawals.lang
source_lang = en_US
type = MOZILLAPROPERTIES
+[dolibarr.websites]
+file_filter = htdocs/langs/<lang>/withdrawals.lang
+source_file = htdocs/langs/en_US/withdrawals.lang
+source_lang = en_US
+type = MOZILLAPROPERTIES
+
[dolibarr.workflow]
file_filter = htdocs/langs/<lang>/workflow.lang
source_file = htdocs/langs/en_US/workflow.lang
diff --git a/htdocs/admin/websites.php b/htdocs/admin/websites.php
index 5788c8059ecd42794c8007f31e12e656429ffcfd..7704e7f3198cef8cf6ac71739ec859b688ad8403 100644
--- a/htdocs/admin/websites.php
+++ b/htdocs/admin/websites.php
@@ -1,5 +1,5 @@
<?php
-/* Copyright (C) 2004-2012 Laurent Destailleur <eldy@users.sourceforge.net>
+/* Copyright (C) 2004-2015 Laurent Destailleur <eldy@users.sourceforge.net>
*
* 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
@@ -16,146 +16,978 @@
*/
/**
- * \file htdocs/admin/website.php
- * \ingroup website
- * \brief Page to setup the module Website
+ * \file htdocs/admin/websites.php
+ * \ingroup setup
+ * \brief Page to administer web sites
*/
require '../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+$langs->load("errors");
$langs->load("admin");
-$langs->load("other");
+$langs->load("companies");
+$langs->load("website");
-if (! $user->admin) accessforbidden();
+$action=GETPOST('action','alpha')?GETPOST('action','alpha'):'view';
+$confirm=GETPOST('confirm','alpha');
+$id=GETPOST('id','int');
+$rowid=GETPOST('rowid','alpha');
+$id=1;
-$type=array('yesno','texte','chaine');
+if (!$user->admin) accessforbidden();
-$action = GETPOST('action','alpha');
+$acts[0] = "activate";
+$acts[1] = "disable";
+$actl[0] = img_picto($langs->trans("Disabled"),'switch_off');
+$actl[1] = img_picto($langs->trans("Activated"),'switch_on');
-$website='website1';
+$listoffset=GETPOST('listoffset');
+$listlimit=GETPOST('listlimit')>0?GETPOST('listlimit'):1000;
+$status = 1;
+$sortfield = GETPOST("sortfield",'alpha');
+$sortorder = GETPOST("sortorder",'alpha');
+$page = GETPOST("page",'int');
+if ($page == -1) { $page = 0 ; }
+$offset = $listlimit * $page ;
+$pageprev = $page - 1;
+$pagenext = $page + 1;
+// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+$hookmanager->initHooks(array('admin'));
-/*
- * Actions
- */
+// This page is a generic page to edit dictionaries
+// Put here declaration of dictionaries properties
-// Action mise a jour ou ajout d'une constante
-if ($action == 'update')
-{
+// Name of SQL tables of dictionaries
+$tabname=array();
+$tabname[1] = MAIN_DB_PREFIX."website";
-
-
- if (! $res > 0) $error++;
+// Dictionary labels
+$tablib=array();
+$tablib[1] = "Websites";
- if (! $error)
- {
- setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
- }
- else
- {
- setEventMessages($langs->trans("Error"), null, 'errors');
- }
-}
+// Requests to extract data
+$tabsql=array();
+$tabsql[1] = "SELECT f.rowid as rowid, f.entity, f.shortname, f.description, f.status FROM ".MAIN_DB_PREFIX."website as f";
+// Criteria to sort dictionaries
+$tabsqlsort=array();
+$tabsqlsort[1] ="shortname ASC";
+// Nom des champs en resultat de select pour affichage du dictionnaire
+$tabfield=array();
+$tabfield[1] = "shortname,description";
+// Nom des champs d'edition pour modification d'un enregistrement
+$tabfieldvalue=array();
+$tabfieldvalue[1] = "shortname,description";
-/*
- * View
- */
+// Nom des champs dans la table pour insertion d'un enregistrement
+$tabfieldinsert=array();
+$tabfieldinsert[1] = "shortname,description,entity";
-$form = new Form($db);
+// Nom du rowid si le champ n'est pas de type autoincrement
+// Example: "" if id field is "rowid" and has autoincrement on
+// "nameoffield" if id field is not "rowid" or has not autoincrement on
+$tabrowid=array();
+$tabrowid[1] = "";
-$help_url='';
+// Condition to show dictionary in setup page
+$tabcond=array();
+$tabcond[1] = (! empty($conf->websites->enabled));
-llxHeader('',$langs->trans("WebsiteSetup"),$help_url);
+// List of help for fields
+$tabhelp=array();
+$tabhelp[1] = array();
+// List of check for fields (NOT USED YET)
+$tabfieldcheck=array();
+$tabfieldcheck[1] = array();
-$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print load_fiche_titre($langs->trans("WebsiteSetup"),$linkback,'title_setup');
+// Define elementList and sourceList (used for dictionary type of contacts "llx_c_type_contact")
+$elementList = array();
+$sourceList=array();
-$head = array();
+// Actions add or modify an entry into a dictionary
+if (GETPOST('actionadd') || GETPOST('actionmodify'))
+{
+ $listfield=explode(',',$tabfield[$id]);
+ $listfieldinsert=explode(',',$tabfieldinsert[$id]);
+ $listfieldmodify=explode(',',$tabfieldinsert[$id]);
+ $listfieldvalue=explode(',',$tabfieldvalue[$id]);
+
+ // Check that all fields are filled
+ $ok=1;
+ foreach ($listfield as $f => $value)
+ {
+ if (! isset($_POST[$value]) || $_POST[$value]=='') // Fields that are not mandatory
+ {
+ $ok=0;
+ $fieldnamekey=$listfield[$f];
+ setEventMessages($langs->transnoentities("ErrorFieldRequired", $langs->transnoentities($fieldnamekey)), null, 'errors');
+ }
+ }
+
+ // Si verif ok et action add, on ajoute la ligne
+ if ($ok && GETPOST('actionadd'))
+ {
+ if ($tabrowid[$id])
+ {
+ // Recupere id libre pour insertion
+ $newid=0;
+ $sql = "SELECT max(".$tabrowid[$id].") newid from ".$tabname[$id];
+ $result = $db->query($sql);
+ if ($result)
+ {
+ $obj = $db->fetch_object($result);
+ $newid=($obj->newid + 1);
+
+ } else {
+ dol_print_error($db);
+ }
+ }
+
+ // Add new entry
+ $sql = "INSERT INTO ".$tabname[$id]." (";
+ // List of fields
+ if ($tabrowid[$id] && ! in_array($tabrowid[$id],$listfieldinsert))
+ $sql.= $tabrowid[$id].",";
+ $sql.= $tabfieldinsert[$id];
+ $sql.=",status)";
+ $sql.= " VALUES(";
+
+ // List of values
+ if ($tabrowid[$id] && ! in_array($tabrowid[$id],$listfieldinsert))
+ $sql.= $newid.",";
+ $i=0;
+ foreach ($listfieldinsert as $f => $value)
+ {
+ if ($value == 'entity') {
+ $_POST[$listfieldvalue[$i]] = $conf->entity;
+ }
+ if ($i) $sql.=",";
+ if ($_POST[$listfieldvalue[$i]] == '') $sql.="null";
+ else $sql.="'".$db->escape($_POST[$listfieldvalue[$i]])."'";
+ $i++;
+ }
+ $sql.=",1)";
+
+ dol_syslog("actionadd", LOG_DEBUG);
+ $result = $db->query($sql);
+ if ($result) // Add is ok
+ {
+ setEventMessages($langs->transnoentities("RecordSaved"), null, 'mesgs');
+ $_POST=array('id'=>$id); // Clean $_POST array, we keep only
+ }
+ else
+ {
+ if ($db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
+ setEventMessages($langs->transnoentities("ErrorRecordAlreadyExists"), null, 'errors');
+ }
+ else {
+ dol_print_error($db);
+ }
+ }
+ }
+
+ // Si verif ok et action modify, on modifie la ligne
+ if ($ok && GETPOST('actionmodify'))
+ {
+ if ($tabrowid[$id]) { $rowidcol=$tabrowid[$id]; }
+ else { $rowidcol="rowid"; }
+
+ // Modify entry
+ $sql = "UPDATE ".$tabname[$id]." SET ";
+ // Modifie valeur des champs
+ if ($tabrowid[$id] && ! in_array($tabrowid[$id],$listfieldmodify))
+ {
+ $sql.= $tabrowid[$id]."=";
+ $sql.= "'".$db->escape($rowid)."', ";
+ }
+ $i = 0;
+ foreach ($listfieldmodify as $field)
+ {
+ if ($field == 'entity') {
+ $_POST[$listfieldvalue[$i]] = $conf->entity;
+ }
+ if ($i) $sql.=",";
+ $sql.= $field."=";
+ if ($_POST[$listfieldvalue[$i]] == '') $sql.="null";
+ else $sql.="'".$db->escape($_POST[$listfieldvalue[$i]])."'";
+ $i++;
+ }
+ $sql.= " WHERE ".$rowidcol." = '".$rowid."'";
+
+ dol_syslog("actionmodify", LOG_DEBUG);
+ //print $sql;
+ $resql = $db->query($sql);
+ if (! $resql)
+ {
+ setEventMessages($db->error(), null, 'errors');
+ }
+ }
+ //$_GET["id"]=GETPOST('id', 'int'); // Force affichage dictionnaire en cours d'edition
+}
+if (GETPOST('actioncancel'))
+{
+ //$_GET["id"]=GETPOST('id', 'int'); // Force affichage dictionnaire en cours d'edition
+}
-/*
- * Edition info modele document
- */
+if ($action == 'confirm_delete' && $confirm == 'yes') // delete
+{
+ if ($tabrowid[$id]) { $rowidcol=$tabrowid[$id]; }
+ else { $rowidcol="rowid"; }
+ $sql = "DELETE from ".MAIN_DB_PREFIX."website_pages WHERE fk_website ='".$rowid."'";
+ $result = $db->query($sql);
+
+ $sql = "DELETE from ".MAIN_DB_PREFIX."website WHERE rowid ='".$rowid."'";
+ $result = $db->query($sql);
+ if (! $result)
+ {
+ if ($db->errno() == 'DB_ERROR_CHILD_EXISTS')
+ {
+ setEventMessages($langs->transnoentities("ErrorRecordIsUsedByChild"), null, 'errors');
+ }
+ else
+ {
+ dol_print_error($db);
+ }
+ }
+}
-print "\n".'<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
-print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-print '<input type="hidden" name="action" value="update">';
+// activate
+if ($action == $acts[0])
+{
+ if ($tabrowid[$id]) { $rowidcol=$tabrowid[$id]; }
+ else { $rowidcol="rowid"; }
+
+ if ($rowid) {
+ $sql = "UPDATE ".$tabname[$id]." SET status = 1 WHERE rowid ='".$rowid."'";
+ }
+
+ $result = $db->query($sql);
+ if (!$result)
+ {
+ dol_print_error($db);
+ }
+}
-dol_fiche_head($head, 'general', $langs->trans("Page").': '.$langs->trans("Home"), 0, 'globe');
+// disable
+if ($action == $acts[1])
+{
+ if ($tabrowid[$id]) { $rowidcol=$tabrowid[$id]; }
+ else { $rowidcol="rowid"; }
+
+ if ($rowid) {
+ $sql = "UPDATE ".$tabname[$id]." SET status = 0 WHERE rowid ='".$rowid."'";
+ }
+
+ $result = $db->query($sql);
+ if (!$result)
+ {
+ dol_print_error($db);
+ }
+}
-print load_fiche_titre($langs->trans("SEO"),'','');
-print '<table class="noborder" width="100%">';
-print '<tr class="liste_titre">';
-print '<td>'.$langs->trans("Description").'</td>';
-print '<td>'.$langs->trans("Value").'</td>';
-print "</tr>\n";
-print '<tr><td>';
-print $langs->trans('WEBSITE_PAGEURL');
-print '</td><td>';
-print '/public/websites/'.$website.'/index.php?page=home';
-print '</td></tr>';
+/*
+ * View
+ */
-print '<tr><td>';
-print $langs->trans('WEBSITE_TITLE');
-print '</td><td>';
-print '<input type="text" class="flat" size="96" name="WEBSITE_TITLE" value="'.dol_escape_htmltag($obj->WEBSITE_TITLE).'">';
-print '</td></tr>';
+$form = new Form($db);
+$formadmin=new FormAdmin($db);
-print '<tr><td>';
-print $langs->trans('WEBSITE_DESCRIPTION');
-print '</td><td>';
-print '<input type="text" class="flat" size="96" name="WEBSITE_DESCRIPTION" value="'.dol_escape_htmltag($obj->WEBSITE_DESCRIPTION).'">';
-print '</td></tr>';
+llxHeader();
-print '<tr><td>';
-print $langs->trans('WEBSITE_KEYWORDS');
-print '</td><td>';
-print '<input type="text" class="flat" size="128" name="WEBSITE_KEYWORDS" value="'.dol_escape_htmltag($obj->WEBSITE_KEYWORDS).'">';
-print '</td></tr>';
+$titre=$langs->trans("WebsiteSetup");
+$linkback='';
+print load_fiche_titre($titre,$linkback,'title_setup');
-print '</table>';
+print $langs->trans("WebsiteSetupDesc").'<br>';
+print "<br>\n";
-print '<br>';
+// Confirmation de la suppression de la ligne
+if ($action == 'delete')
+{
+ print $form->formconfirm($_SERVER["PHP_SELF"].'?'.($page?'page='.$page.'&':'').'sortfield='.$sortfield.'&sortorder='.$sortorder.'&rowid='.$rowid.'&id='.$id, $langs->trans('DeleteWebsite'), $langs->trans('ConfirmDeleteWebsite'), 'confirm_delete','',0,1);
+}
+//var_dump($elementList);
/*
- * Editing global variables not related to a specific theme
+ * Show a dictionary
*/
+if ($id)
+{
+ // Complete requete recherche valeurs avec critere de tri
+ $sql=$tabsql[$id];
+
+ if ($sortfield)
+ {
+ // If sort order is "country", we use country_code instead
+ $sql.= " ORDER BY ".$sortfield;
+ if ($sortorder)
+ {
+ $sql.=" ".strtoupper($sortorder);
+ }
+ $sql.=", ";
+ // Clear the required sort criteria for the tabsqlsort to be able to force it with selected value
+ $tabsqlsort[$id]=preg_replace('/([a-z]+\.)?'.$sortfield.' '.$sortorder.',/i','',$tabsqlsort[$id]);
+ $tabsqlsort[$id]=preg_replace('/([a-z]+\.)?'.$sortfield.',/i','',$tabsqlsort[$id]);
+ }
+ else {
+ $sql.=" ORDER BY ";
+ }
+ $sql.=$tabsqlsort[$id];
+ $sql.=$db->plimit($listlimit+1,$offset);
+ //print $sql;
+
+ $fieldlist=explode(',',$tabfield[$id]);
+
+ print '<form action="'.$_SERVER['PHP_SELF'].'?id='.$id.'" method="POST">';
+ print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+ print '<table class="noborder" width="100%">';
+
+ // Form to add a new line
+ if ($tabname[$id])
+ {
+ $alabelisused=0;
+ $var=false;
+
+ $fieldlist=explode(',',$tabfield[$id]);
+
+ // Line for title
+ print '<tr class="liste_titre">';
+ foreach ($fieldlist as $field => $value)
+ {
+ // Determine le nom du champ par rapport aux noms possibles
+ // dans les dictionnaires de donnees
+ $valuetoshow=ucfirst($fieldlist[$field]); // Par defaut
+ $valuetoshow=$langs->trans($valuetoshow); // try to translate
+ $align="left";
+ if ($fieldlist[$field]=='lang') { $valuetoshow=$langs->trans("Language"); }
+ if ($valuetoshow != '')
+ {
+ print '<td align="'.$align.'">';
+ if (! empty($tabhelp[$id][$value]) && preg_match('/^http(s*):/i',$tabhelp[$id][$value])) print '<a href="'.$tabhelp[$id][$value].'" target="_blank">'.$valuetoshow.' '.img_help(1,$valuetoshow).'</a>';
+ else if (! empty($tabhelp[$id][$value])) print $form->textwithpicto($valuetoshow,$tabhelp[$id][$value]);
+ else print $valuetoshow;
+ print '</td>';
+ }
+ if ($fieldlist[$field]=='libelle' || $fieldlist[$field]=='label') $alabelisused=1;
+ }
+
+ if ($id == 4) print '<td></td>';
+ print '<td colspan="4">';
+ print '<input type="hidden" name="id" value="'.$id.'">';
+ print '</td>';
+ print '</tr>';
+
+ // Line to enter new values
+ print "<tr ".$bcnd[$var].">";
+
+ $obj = new stdClass();
+ // If data was already input, we define them in obj to populate input fields.
+ if (GETPOST('actionadd'))
+ {
+ foreach ($fieldlist as $key=>$val)
+ {
+ if (GETPOST($val))
+ $obj->$val=GETPOST($val);
+ }
+ }
+
+ $tmpaction = 'create';
+ $parameters=array('fieldlist'=>$fieldlist, 'tabname'=>$tabname[$id]);
+ $reshook=$hookmanager->executeHooks('createDictionaryFieldlist',$parameters, $obj, $tmpaction); // Note that $action and $object may have been modified by some hooks
+ $error=$hookmanager->error; $errors=$hookmanager->errors;
+
+ if ($id == 3) unset($fieldlist[2]);
+
+ if (empty($reshook))
+ {
+ if ($tabname[$id] == MAIN_DB_PREFIX.'c_email_templates' && $action == 'edit')
+ {
+ fieldList($fieldlist,$obj,$tabname[$id],'hide');
+ }
+ else
+ {
+ fieldList($fieldlist,$obj,$tabname[$id],'add');
+ }
+ }
+
+ if ($id == 4) print '<td></td>';
+ print '<td colspan="3" align="right">';
+ if ($action != 'edit')
+ {
+ print '<input type="submit" class="button" name="actionadd" value="'.$langs->trans("Add").'">';
+ }
+ print '</td>';
+ print "</tr>";
+
+ $colspan=count($fieldlist)+2;
+ if ($id == 4) $colspan++;
+
+ if (! empty($alabelisused) && $id != 25) // If there is one label among fields, we show legend of *
+ {
+ print '<tr><td colspan="'.$colspan.'">* '.$langs->trans("LabelUsedByDefault").'.</td></tr>';
+ }
+ print '<tr><td colspan="'.$colspan.'"> </td></tr>'; // Keep to have a line with enough height
+ }
+
+ print '</form>';
+
+
+
+ // List of available values in database
+ dol_syslog("htdocs/admin/dict", LOG_DEBUG);
+ $resql=$db->query($sql);
+ if ($resql)
+ {
+ $num = $db->num_rows($resql);
+ $i = 0;
+ $var=true;
+ if ($num)
+ {
+ // There is several pages
+ if ($num > $listlimit)
+ {
+ print '<tr class="none"><td align="right" colspan="'.(3+count($fieldlist)).'">';
+ print_fleche_navigation($page, $_SERVER["PHP_SELF"], '&id='.$id, ($num > $listlimit), '<li class="pagination"><span>'.$langs->trans("Page").' '.($page+1).'</span></li>');
+ print '</td></tr>';
+ }
+
+ // Title of lines
+ print '<tr class="liste_titre">';
+ foreach ($fieldlist as $field => $value)
+ {
+ // Determine le nom du champ par rapport aux noms possibles
+ // dans les dictionnaires de donnees
+ $showfield=1; // Par defaut
+ $align="left";
+ $sortable=1;
+ $valuetoshow='';
+ /*
+ $tmparray=getLabelOfField($fieldlist[$field]);
+ $showfield=$tmp['showfield'];
+ $valuetoshow=$tmp['valuetoshow'];
+ $align=$tmp['align'];
+ $sortable=$tmp['sortable'];
+ */
+ $valuetoshow=ucfirst($fieldlist[$field]); // Par defaut
+ $valuetoshow=$langs->trans($valuetoshow); // try to translate
+ if ($fieldlist[$field]=='source') { $valuetoshow=$langs->trans("Contact"); }
+ if ($fieldlist[$field]=='price') { $valuetoshow=$langs->trans("PriceUHT"); }
+ if ($fieldlist[$field]=='taux') {
+ if ($tabname[$id] != MAIN_DB_PREFIX."c_revenuestamp") $valuetoshow=$langs->trans("Rate");
+ else $valuetoshow=$langs->trans("Amount");
+ $align='right';
+ }
+ if ($fieldlist[$field]=='localtax1_type') { $valuetoshow=$langs->trans("UseLocalTax")." 2"; $align="center"; $sortable=0; }
+ if ($fieldlist[$field]=='localtax1') { $valuetoshow=$langs->trans("Rate")." 2"; $sortable=0; }
+ if ($fieldlist[$field]=='localtax2_type') { $valuetoshow=$langs->trans("UseLocalTax")." 3"; $align="center"; $sortable=0; }
+ if ($fieldlist[$field]=='localtax2') { $valuetoshow=$langs->trans("Rate")." 3"; $sortable=0; }
+ if ($fieldlist[$field]=='organization') { $valuetoshow=$langs->trans("Organization"); }
+ if ($fieldlist[$field]=='lang') { $valuetoshow=$langs->trans("Language"); }
+ if ($fieldlist[$field]=='type') { $valuetoshow=$langs->trans("Type"); }
+ if ($fieldlist[$field]=='code') { $valuetoshow=$langs->trans("Code"); }
+ if ($fieldlist[$field]=='libelle' || $fieldlist[$field]=='label')
+ {
+ $valuetoshow=$langs->trans("Label");
+ if ($id != 25) $valuetoshow.="*";
+ }
+ if ($fieldlist[$field]=='libelle_facture') { $valuetoshow=$langs->trans("LabelOnDocuments")."*"; }
+ if ($fieldlist[$field]=='country') { $valuetoshow=$langs->trans("Country"); }
+ if ($fieldlist[$field]=='recuperableonly') { $valuetoshow=$langs->trans("NPR"); $align="center"; }
+ if ($fieldlist[$field]=='nbjour') { $valuetoshow=$langs->trans("NbOfDays"); }
+ if ($fieldlist[$field]=='fdm') { $valuetoshow=$langs->trans("AtEndOfMonth"); }
+ if ($fieldlist[$field]=='decalage') { $valuetoshow=$langs->trans("Offset"); }
+ if ($fieldlist[$field]=='width') { $valuetoshow=$langs->trans("Width"); }
+ if ($fieldlist[$field]=='height') { $valuetoshow=$langs->trans("Height"); }
+ if ($fieldlist[$field]=='unit') { $valuetoshow=$langs->trans("MeasuringUnit"); }
+ if ($fieldlist[$field]=='region_id' || $fieldlist[$field]=='country_id') { $showfield=0; }
+ if ($fieldlist[$field]=='accountancy_code'){ $valuetoshow=$langs->trans("AccountancyCode"); }
+ if ($fieldlist[$field]=='accountancy_code_sell'){ $valuetoshow=$langs->trans("AccountancyCodeSell"); $sortable=0; }
+ if ($fieldlist[$field]=='accountancy_code_buy'){ $valuetoshow=$langs->trans("AccountancyCodeBuy"); $sortable=0; }
+ if ($fieldlist[$field]=='fk_pcg_version') { $valuetoshow=$langs->trans("Pcg_version"); }
+ if ($fieldlist[$field]=='account_parent') { $valuetoshow=$langs->trans("Accountsparent"); }
+ if ($fieldlist[$field]=='pcg_type') { $valuetoshow=$langs->trans("Pcg_type"); }
+ if ($fieldlist[$field]=='pcg_subtype') { $valuetoshow=$langs->trans("Pcg_subtype"); }
+ if ($fieldlist[$field]=='sortorder') { $valuetoshow=$langs->trans("SortOrder"); }
+ if ($fieldlist[$field]=='short_label') { $valuetoshow=$langs->trans("ShortLabel"); }
+ if ($fieldlist[$field]=='type_template') { $valuetoshow=$langs->trans("TypeOfTemplate"); }
+
+ // Affiche nom du champ
+ if ($showfield)
+ {
+ print getTitleFieldOfList($valuetoshow,0,$_SERVER["PHP_SELF"],($sortable?$fieldlist[$field]:''),($page?'page='.$page.'&':'').'&id='.$id,"","align=".$align,$sortfield,$sortorder);
+ }
+ }
+ // Favorite - Only activated on country dictionary
+ if ($id == 4) print getTitleFieldOfList($langs->trans("Favorite"),0,$_SERVER["PHP_SELF"],"favorite",($page?'page='.$page.'&':'').'&id='.$id,"",'align="center"',$sortfield,$sortorder);
+
+ print getTitleFieldOfList($langs->trans("Status"),0,$_SERVER["PHP_SELF"],"status",($page?'page='.$page.'&':'').'&id='.$id,"",'align="center"',$sortfield,$sortorder);
+ print getTitleFieldOfList('');
+ print getTitleFieldOfList('');
+ print '</tr>';
+
+ // Lines with values
+ while ($i < $num)
+ {
+ $var = ! $var;
+
+ $obj = $db->fetch_object($resql);
+ //print_r($obj);
+ print '<tr '.$bc[$var].' id="rowid-'.$obj->rowid.'">';
+ if ($action == 'edit' && ($rowid == (! empty($obj->rowid)?$obj->rowid:$obj->code)))
+ {
+ print '<form action="'.$_SERVER['PHP_SELF'].'?id='.$id.'" method="POST">';
+ print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+ print '<input type="hidden" name="page" value="'.$page.'">';
+ print '<input type="hidden" name="rowid" value="'.$rowid.'">';
+
+ $tmpaction='edit';
+ $parameters=array('fieldlist'=>$fieldlist, 'tabname'=>$tabname[$id]);
+ $reshook=$hookmanager->executeHooks('editDictionaryFieldlist',$parameters,$obj, $tmpaction); // Note that $action and $object may have been modified by some hooks
+ $error=$hookmanager->error; $errors=$hookmanager->errors;
+
+ if (empty($reshook)) fieldList($fieldlist,$obj,$tabname[$id],'edit');
+
+ print '<td colspan="3" align="right"><a name="'.(! empty($obj->rowid)?$obj->rowid:$obj->code).'"> </a><input type="submit" class="button" name="actionmodify" value="'.$langs->trans("Modify").'">';
+ print ' <input type="submit" class="button" name="actioncancel" value="'.$langs->trans("Cancel").'"></td>';
+ }
+ else
+ {
+ $tmpaction = 'view';
+ $parameters=array('var'=>$var, 'fieldlist'=>$fieldlist, 'tabname'=>$tabname[$id]);
+ $reshook=$hookmanager->executeHooks('viewDictionaryFieldlist',$parameters,$obj, $tmpaction); // Note that $action and $object may have been modified by some hooks
+
+ $error=$hookmanager->error; $errors=$hookmanager->errors;
+
+ if (empty($reshook))
+ {
+ foreach ($fieldlist as $field => $value)
+ {
+ $showfield=1;
+ $align="left";
+ $valuetoshow=$obj->$fieldlist[$field];
+ if ($value == 'type_template')
+ {
+ $valuetoshow = isset($elementList[$valuetoshow])?$elementList[$valuetoshow]:$valuetoshow;
+ }
+ if ($value == 'element')
+ {
+ $valuetoshow = isset($elementList[$valuetoshow])?$elementList[$valuetoshow]:$valuetoshow;
+ }
+ else if ($value == 'source')
+ {
+ $valuetoshow = isset($sourceList[$valuetoshow])?$sourceList[$valuetoshow]:$valuetoshow;
+ }
+ else if ($valuetoshow=='all') {
+ $valuetoshow=$langs->trans('All');
+ }
+ else if ($fieldlist[$field]=='country') {
+ if (empty($obj->country_code))
+ {
+ $valuetoshow='-';
+ }
+ else
+ {
+ $key=$langs->trans("Country".strtoupper($obj->country_code));
+ $valuetoshow=($key != "Country".strtoupper($obj->country_code)?$obj->country_code." - ".$key:$obj->country);
+ }
+ }
+ else if ($fieldlist[$field]=='recuperableonly' || $fieldlist[$field]=='fdm' || $fieldlist[$field] == 'deductible') {
+ $valuetoshow=yn($valuetoshow);
+ $align="center";
+ }
+ else if ($fieldlist[$field]=='price' || preg_match('/^amount/i',$fieldlist[$field])) {
+ $valuetoshow=price($valuetoshow);
+ }
+ else if ($fieldlist[$field]=='libelle_facture') {
+ $langs->load("bills");
+ $key=$langs->trans("PaymentCondition".strtoupper($obj->code));
+ $valuetoshow=($obj->code && $key != "PaymentCondition".strtoupper($obj->code)?$key:$obj->$fieldlist[$field]);
+ $valuetoshow=nl2br($valuetoshow);
+ }
+ else if ($fieldlist[$field]=='label' && $tabname[$id]==MAIN_DB_PREFIX.'c_country') {
+ $key=$langs->trans("Country".strtoupper($obj->code));
+ $valuetoshow=($obj->code && $key != "Country".strtoupper($obj->code)?$key:$obj->$fieldlist[$field]);
+ }
+ else if ($fieldlist[$field]=='label' && $tabname[$id]==MAIN_DB_PREFIX.'c_availability') {
+ $langs->load("propal");
+ $key=$langs->trans("AvailabilityType".strtoupper($obj->code));
+ $valuetoshow=($obj->code && $key != "AvailabilityType".strtoupper($obj->code)?$key:$obj->$fieldlist[$field]);
+ }
+ else if ($fieldlist[$field]=='libelle' && $tabname[$id]==MAIN_DB_PREFIX.'c_actioncomm') {
+ $key=$langs->trans("Action".strtoupper($obj->code));
+ $valuetoshow=($obj->code && $key != "Action".strtoupper($obj->code)?$key:$obj->$fieldlist[$field]);
+ }
+ else if (! empty($obj->code_iso) && $fieldlist[$field]=='label' && $tabname[$id]==MAIN_DB_PREFIX.'c_currencies') {
+ $key=$langs->trans("Currency".strtoupper($obj->code_iso));
+ $valuetoshow=($obj->code_iso && $key != "Currency".strtoupper($obj->code_iso)?$key:$obj->$fieldlist[$field]);
+ }
+ else if ($fieldlist[$field]=='libelle' && $tabname[$id]==MAIN_DB_PREFIX.'c_typent') {
+ $key=$langs->trans(strtoupper($obj->code));
+ $valuetoshow=($key != strtoupper($obj->code)?$key:$obj->$fieldlist[$field]);
+ }
+ else if ($fieldlist[$field]=='libelle' && $tabname[$id]==MAIN_DB_PREFIX.'c_prospectlevel') {
+ $key=$langs->trans(strtoupper($obj->code));
+ $valuetoshow=($key != strtoupper($obj->code)?$key:$obj->$fieldlist[$field]);
+ }
+ else if ($fieldlist[$field]=='label' && $tabname[$id]==MAIN_DB_PREFIX.'c_civility') {
+ $key=$langs->trans("Civility".strtoupper($obj->code));
+ $valuetoshow=($obj->code && $key != "Civility".strtoupper($obj->code)?$key:$obj->$fieldlist[$field]);
+ }
+ else if ($fieldlist[$field]=='libelle' && $tabname[$id]==MAIN_DB_PREFIX.'c_type_contact') {
+ $langs->load('agenda');
+ $key=$langs->trans("TypeContact_".$obj->element."_".$obj->source."_".strtoupper($obj->code));
+ $valuetoshow=($obj->code && $key != "TypeContact_".$obj->element."_".$obj->source."_".strtoupper($obj->code)?$key:$obj->$fieldlist[$field]);
+ }
+ else if ($fieldlist[$field]=='libelle' && $tabname[$id]==MAIN_DB_PREFIX.'c_payment_term') {
+ $langs->load("bills");
+ $key=$langs->trans("PaymentConditionShort".strtoupper($obj->code));
+ $valuetoshow=($obj->code && $key != "PaymentConditionShort".strtoupper($obj->code)?$key:$obj->$fieldlist[$field]);
+ }
+ else if ($fieldlist[$field]=='libelle' && $tabname[$id]==MAIN_DB_PREFIX.'c_paiement') {
+ $langs->load("bills");
+ $key=$langs->trans("PaymentType".strtoupper($obj->code));
+ $valuetoshow=($obj->code && $key != "PaymentType".strtoupper($obj->code)?$key:$obj->$fieldlist[$field]);
+ }
+ else if ($fieldlist[$field]=='label' && $tabname[$id]==MAIN_DB_PREFIX.'c_input_reason') {
+ $key=$langs->trans("DemandReasonType".strtoupper($obj->code));
+ $valuetoshow=($obj->code && $key != "DemandReasonType".strtoupper($obj->code)?$key:$obj->$fieldlist[$field]);
+ }
+ else if ($fieldlist[$field]=='libelle' && $tabname[$id]==MAIN_DB_PREFIX.'c_input_method') {
+ $langs->load("orders");
+ $key=$langs->trans($obj->code);
+ $valuetoshow=($obj->code && $key != $obj->code)?$key:$obj->$fieldlist[$field];
+ }
+ else if ($fieldlist[$field]=='libelle' && $tabname[$id]==MAIN_DB_PREFIX.'c_shipment_mode') {
+ $langs->load("sendings");
+ $key=$langs->trans("SendingMethod".strtoupper($obj->code));
+ $valuetoshow=($obj->code && $key != "SendingMethod".strtoupper($obj->code)?$key:$obj->$fieldlist[$field]);
+ }
+ else if ($fieldlist[$field] == 'libelle' && $tabname[$id]==MAIN_DB_PREFIX.'c_paper_format')
+ {
+ $key = $langs->trans('PaperFormat'.strtoupper($obj->code));
+ $valuetoshow = ($obj->code && $key != 'PaperFormat'.strtoupper($obj->code) ? $key : $obj->$fieldlist[$field]);
+ }
+ else if ($fieldlist[$field] == 'label' && $tabname[$id] == MAIN_DB_PREFIX.'c_type_fees')
+ {
+ $langs->load('trips');
+ $key = $langs->trans(strtoupper($obj->code));
+ $valuetoshow = ($obj->code && $key != strtoupper($obj->code) ? $key : $obj->$fieldlist[$field]);
+ }
+ else if ($fieldlist[$field]=='region_id' || $fieldlist[$field]=='country_id') {
+ $showfield=0;
+ }
+ else if ($fieldlist[$field]=='unicode') {
+ $valuetoshow = $langs->getCurrencySymbol($obj->code,1);
+ }
+ else if ($fieldlist[$field]=='label' && $tabname[$_GET["id"]]==MAIN_DB_PREFIX.'c_units') {
+ $langs->load("products");
+ $valuetoshow=$langs->trans($obj->$fieldlist[$field]);
+ }
+ else if ($fieldlist[$field]=='short_label' && $tabname[$_GET["id"]]==MAIN_DB_PREFIX.'c_units') {
+ $langs->load("products");
+ $valuetoshow = $langs->trans($obj->$fieldlist[$field]);
+ }
+ else if (($fieldlist[$field] == 'unit') && ($tabname[$id] == MAIN_DB_PREFIX.'c_paper_format'))
+ {
+ $key = $langs->trans('SizeUnit'.strtolower($obj->unit));
+ $valuetoshow = ($obj->code && $key != 'SizeUnit'.strtolower($obj->unit) ? $key : $obj->$fieldlist[$field]);
+ }
+
+ else if ($fieldlist[$field]=='localtax1_type') {
+ if ($obj->localtax1 != 0)
+ $valuetoshow=$localtax_typeList[$valuetoshow];
+ else
+ $valuetoshow = '';
+ $align="center";
+ }
+ else if ($fieldlist[$field]=='localtax2_type') {
+ if ($obj->localtax2 != 0)
+ $valuetoshow=$localtax_typeList[$valuetoshow];
+ else
+ $valuetoshow = '';
+ $align="center";
+ }
+ else if ($fieldlist[$field]=='localtax1') {
+ $valuetoshow = price($valuetoshow, 0, $langs, 0, 0);
+ if ($obj->localtax1 == 0)
+ $valuetoshow = '';
+ $align="right";
+ }
+ else if ($fieldlist[$field]=='localtax2') {
+ $valuetoshow = price($valuetoshow, 0, $langs, 0, 0);
+ if ($obj->localtax2 == 0)
+ $valuetoshow = '';
+ $align="right";
+ }
+ else if (in_array($fieldlist[$field],array('taux','localtax1','localtax2')))
+ {
+ $valuetoshow = price($valuetoshow, 0, $langs, 0, 0);
+ $align="right";
+ }
+ else if (in_array($fieldlist[$field],array('recuperableonly')))
+ {
+ $align="center";
+ }
+ else if ($fieldlist[$field]=='accountancy_code' || $fieldlist[$field]=='accountancy_code_sell' || $fieldlist[$field]=='accountancy_code_buy') {
+ $valuetoshow = length_accountg($valuetoshow);
+ }
+
+ // Show value for field
+ if ($showfield) print '<td align="'.$align.'">'.$valuetoshow.'</td>';
+ }
+ }
+
+ // Can an entry be erased or disabled ?
+ $iserasable=1;$isdisable=1; // true by default
+
+ if (isset($obj->code) && $id != 10)
+ {
+ if (($obj->code == '0' || $obj->code == '' || preg_match('/unknown/i',$obj->code))) { $iserasable = 0; $isdisable = 0; }
+ else if ($obj->code == 'RECEP') { $iserasable = 0; $isdisable = 0; }
+ else if ($obj->code == 'EF0') { $iserasable = 0; $isdisable = 0; }
+ }
+
+ if (isset($obj->type) && in_array($obj->type, array('system', 'systemauto'))) { $iserasable=0; }
+ if (in_array($obj->code, array('AC_OTH','AC_OTH_AUTO')) || in_array($obj->type, array('systemauto'))) { $isdisable=0; $isdisable = 0; }
+
+ $url = $_SERVER["PHP_SELF"].'?'.($page?'page='.$page.'&':'').'sortfield='.$sortfield.'&sortorder='.$sortorder.'&rowid='.(! empty($obj->rowid)?$obj->rowid:(! empty($obj->code)?$obj->code:'')).'&code='.(! empty($obj->code)?urlencode($obj->code):'').'&id='.$id.'&';
+
+ // Favorite
+ // Only activated on country dictionary
+ if ($id == 4)
+ {
+ print '<td align="center" class="nowrap">';
+ if ($iserasable) print '<a href="'.$url.'action='.$acts[$obj->favorite].'_favorite">'.$actl[$obj->favorite].'</a>';
+ else print $langs->trans("AlwaysActive");
+ print '</td>';
+ }
+
+ // Active
+ print '<td align="center" class="nowrap">';
+ print '<a href="'.$url.'action='.$acts[$obj->status].'">'.$actl[$obj->status].'</a>';
+ print "</td>";
+
+ // Modify link
+ if ($iserasable) print '<td align="center"><a class="reposition" href="'.$url.'action=edit">'.img_edit().'</a></td>';
+ else print '<td> </td>';
+
+ // Delete link
+ if ($iserasable) print '<td align="center"><a href="'.$url.'action=delete">'.img_delete().'</a></td>';
+ else print '<td> </td>';
+
+ print "</tr>\n";
+ }
+ $i++;
+ }
+ }
+ }
+ else {
+ dol_print_error($db);
+ }
+
+ print '</table>';
+
+ print '</form>';
+}
-print load_fiche_titre($langs->trans("Other"),'','');
-
-require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-$doleditor=new DolEditor('WEBSITE_HEADER',$obj->value,'',160,'dolibarr_notes','',false,false,$conf->fckeditor->enabled,5,60);
-$doleditor->Create();
-
-require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-$doleditor=new DolEditor('WEBSITE_CONTENT',$obj->value,'',160,'dolibarr_notes','',false,false,$conf->fckeditor->enabled,5,60);
-$doleditor->Create();
-
-require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-$doleditor=new DolEditor('WEBSITE_FOOTER',$obj->value,'',160,'dolibarr_notes','',false,false,$conf->fckeditor->enabled,5,60);
-$doleditor->Create();
-
-dol_fiche_end();
+print '<br>';
-print '<div align="center"><input type="submit" class="button" value="'.$langs->trans("Update").'" name="update"></div>';
-print '</form>';
+llxFooter();
+$db->close();
+/**
+ * Show fields in insert/edit mode
+ *
+ * @param array $fieldlist Array of fields
+ * @param Object $obj If we show a particular record, obj is filled with record fields
+ * @param string $tabname Name of SQL table
+ * @param string $context 'add'=Output field for the "add form", 'edit'=Output field for the "edit form", 'hide'=Output field for the "add form" but we dont want it to be rendered
+ * @return void
+ */
+function fieldList($fieldlist, $obj='', $tabname='', $context='')
+{
+ global $conf,$langs,$db;
+ global $form;
+ global $region_id;
+ global $elementList,$sourceList,$localtax_typeList;
+ global $bc;
+ $formadmin = new FormAdmin($db);
+ $formcompany = new FormCompany($db);
+ if (! empty($conf->accounting->enabled)) $formaccountancy = New FormVentilation($db);
-llxFooter();
+ foreach ($fieldlist as $field => $value)
+ {
+ if ($fieldlist[$field] == 'country')
+ {
+ if (in_array('region_id',$fieldlist))
+ {
+ print '<td>';
+ //print join(',',$fieldlist);
+ print '</td>';
+ continue;
+ } // For state page, we do not show the country input (we link to region, not country)
+ print '<td>';
+ $fieldname='country';
+ print $form->select_country((! empty($obj->country_code)?$obj->country_code:(! empty($obj->country)?$obj->country:'')), $fieldname, '', 28, 'maxwidth300');
+ print '</td>';
+ }
+ elseif ($fieldlist[$field] == 'country_id')
+ {
+ if (! in_array('country',$fieldlist)) // If there is already a field country, we don't show country_id (avoid duplicate)
+ {
+ $country_id = (! empty($obj->$fieldlist[$field]) ? $obj->$fieldlist[$field] : 0);
+ print '<td>';
+ print '<input type="hidden" name="'.$fieldlist[$field].'" value="'.$country_id.'">';
+ print '</td>';
+ }
+ }
+ elseif ($fieldlist[$field] == 'region')
+ {
+ print '<td>';
+ $formcompany->select_region($region_id,'region');
+ print '</td>';
+ }
+ elseif ($fieldlist[$field] == 'region_id')
+ {
+ $region_id = (! empty($obj->$fieldlist[$field])?$obj->$fieldlist[$field]:0);
+ print '<td>';
+ print '<input type="hidden" name="'.$fieldlist[$field].'" value="'.$region_id.'">';
+ print '</td>';
+ }
+ elseif ($fieldlist[$field] == 'lang')
+ {
+ print '<td>';
+ print $formadmin->select_language($conf->global->MAIN_LANG_DEFAULT,'lang');
+ print '</td>';
+ }
+ // Le type de template
+ elseif ($fieldlist[$field] == 'type_template')
+ {
+ print '<td>';
+ print $form->selectarray('type_template', $elementList,(! empty($obj->$fieldlist[$field])?$obj->$fieldlist[$field]:''));
+ print '</td>';
+ }
+ // Le type de l'element (pour les type de contact)
+ elseif ($fieldlist[$field] == 'element')
+ {
+ print '<td>';
+ print $form->selectarray('element', $elementList,(! empty($obj->$fieldlist[$field])?$obj->$fieldlist[$field]:''));
+ print '</td>';
+ }
+ // La source de l'element (pour les type de contact)
+ elseif ($fieldlist[$field] == 'source')
+ {
+ print '<td>';
+ print $form->selectarray('source', $sourceList,(! empty($obj->$fieldlist[$field])?$obj->$fieldlist[$field]:''));
+ print '</td>';
+ }
+ elseif ($fieldlist[$field] == 'type' && $tabname == MAIN_DB_PREFIX."c_actioncomm")
+ {
+ print '<td>';
+ print 'user<input type="hidden" name="type" value="user">';
+ print '</td>';
+ }
+ elseif ($fieldlist[$field] == 'recuperableonly' || $fieldlist[$field] == 'fdm' || $fieldlist[$field] == 'deductible') {
+ print '<td>';
+ print $form->selectyesno($fieldlist[$field],(! empty($obj->$fieldlist[$field])?$obj->$fieldlist[$field]:''),1);
+ print '</td>';
+ }
+ elseif (in_array($fieldlist[$field],array('nbjour','decalage','taux','localtax1','localtax2'))) {
+ $align="left";
+ if (in_array($fieldlist[$field],array('taux','localtax1','localtax2'))) $align="right"; // Fields aligned on right
+ print '<td align="'.$align.'">';
+ print '<input type="text" class="flat" value="'.(isset($obj->$fieldlist[$field])?$obj->$fieldlist[$field]:'').'" size="3" name="'.$fieldlist[$field].'">';
+ print '</td>';
+ }
+ elseif (in_array($fieldlist[$field], array('libelle_facture'))) {
+ print '<td><textarea cols="30" rows="'.ROWS_2.'" class="flat" name="'.$fieldlist[$field].'">'.(! empty($obj->$fieldlist[$field])?$obj->$fieldlist[$field]:'').'</textarea></td>';
+ }
+ elseif (in_array($fieldlist[$field], array('content')))
+ {
+ if ($tabname == MAIN_DB_PREFIX.'c_email_templates')
+ {
+ print '<td colspan="4"></td></tr><tr class="pair nohover"><td colspan="5">'; // To create an artificial CR for the current tr we are on
+ }
+ else print '<td>';
+ if ($context != 'hide')
+ {
+ //print '<textarea cols="3" rows="'.ROWS_2.'" class="flat" name="'.$fieldlist[$field].'">'.(! empty($obj->$fieldlist[$field])?$obj->$fieldlist[$field]:'').'</textarea>';
+ $doleditor = new DolEditor($fieldlist[$field], (! empty($obj->$fieldlist[$field])?$obj->$fieldlist[$field]:''), '', 140, 'dolibarr_mailings', 'In', 0, false, true, ROWS_5, '90%');
+ print $doleditor->Create(1);
+ }
+ else print ' ';
+ print '</td>';
+ }
+ elseif ($fieldlist[$field] == 'price' || preg_match('/^amount/i',$fieldlist[$field])) {
+ print '<td><input type="text" class="flat" value="'.price((! empty($obj->$fieldlist[$field])?$obj->$fieldlist[$field]:'')).'" size="8" name="'.$fieldlist[$field].'"></td>';
+ }
+ elseif ($fieldlist[$field] == 'code' && isset($obj->$fieldlist[$field])) {
+ print '<td><input type="text" class="flat" value="'.(! empty($obj->$fieldlist[$field])?$obj->$fieldlist[$field]:'').'" size="10" name="'.$fieldlist[$field].'"></td>';
+ }
+ elseif ($fieldlist[$field]=='unit') {
+ print '<td>';
+ $units = array(
+ 'mm' => $langs->trans('SizeUnitmm'),
+ 'cm' => $langs->trans('SizeUnitcm'),
+ 'point' => $langs->trans('SizeUnitpoint'),
+ 'inch' => $langs->trans('SizeUnitinch')
+ );
+ print $form->selectarray('unit', $units, (! empty($obj->$fieldlist[$field])?$obj->$fieldlist[$field]:''), 0, 0, 0);
+ print '</td>';
+ }
+ // Le type de taxe locale
+ elseif ($fieldlist[$field] == 'localtax1_type' || $fieldlist[$field] == 'localtax2_type')
+ {
+ print '<td align="center">';
+ print $form->selectarray($fieldlist[$field], $localtax_typeList, (! empty($obj->$fieldlist[$field])?$obj->$fieldlist[$field]:''));
+ print '</td>';
+ }
+ elseif ($fieldlist[$field] == 'accountancy_code' || $fieldlist[$field] == 'accountancy_code_sell' || $fieldlist[$field] == 'accountancy_code_buy')
+ {
+ print '<td>';
+ if (! empty($conf->accounting->enabled))
+ {
+ $accountancy_account = (! empty($obj->$fieldlist[$field]) ? $obj->$fieldlist[$field] : 0);
+ print $formaccountancy->select_account($accountancy_account, $fieldlist[$field], 1, '', 1, 1);
+ }
+ else
+ {
+ print '<input type="text" size="10" class="flat" value="'.(isset($obj->$fieldlist[$field])?$obj->$fieldlist[$field]:'').'" name="'.$fieldlist[$field].'">';
+ }
+ print '</td>';
+ }
+ else
+ {
+ print '<td>';
+ $size='';
+ if ($fieldlist[$field]=='code') $size='size="8" ';
+ if ($fieldlist[$field]=='position') $size='size="4" ';
+ if ($fieldlist[$field]=='libelle') $size='size="32" ';
+ if ($fieldlist[$field]=='tracking') $size='size="92" ';
+ if ($fieldlist[$field]=='sortorder') $size='size="2" ';
+ print '<input type="text" '.$size.' class="flat" value="'.(isset($obj->$fieldlist[$field])?$obj->$fieldlist[$field]:'').'" name="'.$fieldlist[$field].'">';
+ print '</td>';
+ }
+ }
+}
-$db->close();
diff --git a/htdocs/install/mysql/migration/3.9.0-4.0.0.sql b/htdocs/install/mysql/migration/3.9.0-4.0.0.sql
index 3ffb260f415cc7e720a246dd26803635fbef914e..9ac450b90f8f76f1a344667ce330618e1bed1081 100644
--- a/htdocs/install/mysql/migration/3.9.0-4.0.0.sql
+++ b/htdocs/install/mysql/migration/3.9.0-4.0.0.sql
@@ -40,4 +40,43 @@ ALTER TABLE llx_cronjob ADD COLUMN test varchar(255) DEFAULT '1';
ALTER TABLE llx_facture ADD INDEX idx_facture_fk_statut (fk_statut);
UPDATE llx_projet as p set p.opp_percent = (SELECT percent FROM llx_c_lead_status as cls WHERE cls.rowid = p.fk_opp_status) WHERE p.opp_percent IS NULL AND p.fk_opp_status IS NOT NULL;
+
+
+
+CREATE TABLE llx_website
+(
+ rowid integer AUTO_INCREMENT NOT NULL PRIMARY KEY,
+ entity integer DEFAULT 1,
+ shortname varchar(24) NOT NULL,
+ description varchar(255),
+ status integer,
+ date_creation datetime,
+ date_modification datetime,
+ tms timestamp
+) ENGINE=innodb;
+
+ALTER TABLE llx_website ADD UNIQUE INDEX uk_website_shortname (shortname, entity);
+
+CREATE TABLE llx_website_page
+(
+ rowid integer AUTO_INCREMENT NOT NULL PRIMARY KEY,
+ fk_website integer,
+ pageurl varchar(16) NOT NULL,
+ title varchar(255),
+ description varchar(255),
+ keywords varchar(255),
+ content text,
+ status integer,
+ date_creation datetime,
+ date_modification datetime,
+ tms timestamp
+) ENGINE=innodb;
+
+ALTER TABLE llx_website_page ADD UNIQUE INDEX uk_website_page_url (fk_website,pageurl);
+
+ALTER TABLE llx_website_page ADD CONSTRAINT fk_website_page_website FOREIGN KEY (fk_website) REFERENCES llx_website (rowid);
+
+
+
+
\ No newline at end of file
diff --git a/htdocs/install/mysql/tables/llx_website.key.sql b/htdocs/install/mysql/tables/llx_website.key.sql
index cdaa38079b33f09df970d2b43fafe24d6bb91376..d25a0009dbe27eea8e9d1a670812f8551f1461d0 100644
--- a/htdocs/install/mysql/tables/llx_website.key.sql
+++ b/htdocs/install/mysql/tables/llx_website.key.sql
@@ -16,8 +16,5 @@
--
-- ===========================================================================
-ALTER TABLE llx_website_page ADD UNIQUE INDEX uk_website_page_url (fk_website,pageurl);
-
-ALTER TABLE llx_website_page ADD CONSTRAINT fk_website_page_website FOREIGN KEY (fk_website) REFERENCES llx_website (rowid);
-
+ALTER TABLE llx_website ADD UNIQUE INDEX uk_website_shortname (shortname, entity);
diff --git a/htdocs/install/mysql/tables/llx_website.sql b/htdocs/install/mysql/tables/llx_website.sql
index e24a68b514ba627c947c1682fce420700147243a..81be6720d88b80c89d2a4c3c69d1fe45be70fbbe 100644
--- a/htdocs/install/mysql/tables/llx_website.sql
+++ b/htdocs/install/mysql/tables/llx_website.sql
@@ -20,7 +20,7 @@
CREATE TABLE llx_website
(
rowid integer AUTO_INCREMENT NOT NULL PRIMARY KEY,
- entity integer,
+ entity integer DEFAULT 1,
shortname varchar(24) NOT NULL,
description varchar(255),
status integer,
diff --git a/htdocs/install/mysql/tables/llx_website_pages.key.sql b/htdocs/install/mysql/tables/llx_website_pages.key.sql
index cdaa38079b33f09df970d2b43fafe24d6bb91376..095dffabc95bc6c1cacdf2629320572c7912bee3 100644
--- a/htdocs/install/mysql/tables/llx_website_pages.key.sql
+++ b/htdocs/install/mysql/tables/llx_website_pages.key.sql
@@ -20,4 +20,3 @@ ALTER TABLE llx_website_page ADD UNIQUE INDEX uk_website_page_url (fk_website,pa
ALTER TABLE llx_website_page ADD CONSTRAINT fk_website_page_website FOREIGN KEY (fk_website) REFERENCES llx_website (rowid);
-
diff --git a/htdocs/langs/en_US/website.lang b/htdocs/langs/en_US/website.lang
new file mode 100644
index 0000000000000000000000000000000000000000..58765929b6cf1ce32bd0633b4bc43464eed254e2
--- /dev/null
+++ b/htdocs/langs/en_US/website.lang
@@ -0,0 +1,5 @@
+# Dolibarr language file - Source file is en_US - website
+Shortname=Code
+WebsiteSetupDesc=Create here as much entry as number of different websites you need. Then go into menu Websites to edit them.
+DeleteWebsite=Delete website
+ConfirmDeleteWebsite=Are you sure you want to delete this web site. All its pages and content will also be removed.
\ No newline at end of file
diff --git a/htdocs/langs/en_US/workflow.lang b/htdocs/langs/en_US/workflow.lang
index 14be1a6ade63833f25caf0421cfa93ac4ea447be..1c59a3651ec9fd5352e47e3558c43a670bf45178 100644
--- a/htdocs/langs/en_US/workflow.lang
+++ b/htdocs/langs/en_US/workflow.lang
@@ -1,4 +1,4 @@
-# Dolibarr language file - Source file is en_US - admin
+# Dolibarr language file - Source file is en_US - workflow
WorkflowSetup=Workflow module setup
WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is open (you can do things in the order you want). You can activate the automatic actions you are interested in.
ThereIsNoWorkflowToModify=There is no workflow modifications available with the activated modules.
diff --git a/htdocs/websites/frametop.php b/htdocs/websites/frametop.php
index f33c8ae61a2287a673c434b1fb2d6d67cb8ae55d..9001691b72c71d33aba385660b508031ee045d73 100644
--- a/htdocs/websites/frametop.php
+++ b/htdocs/websites/frametop.php
@@ -23,9 +23,16 @@
*/
require ("../main.inc.php");
+//require_once (DOL_DOCUMENT_ROOT."/websites/class/website.class.php");
$langs->load("externalsite");
top_htmlhead("","");
top_menu("","","_top");
+
+/*
+$website = new Website($db);
+$listofwebsites = $website->fetchAll();
+*/
+print 'rrr';
diff --git a/htdocs/websites/index.php b/htdocs/websites/index.php
index b007725ec3cdd9ddf0bb8d727558623c402a6440..7c52b440f441ef21e87766ecb3acb35cfc2db7e7 100644
--- a/htdocs/websites/index.php
+++ b/htdocs/websites/index.php
@@ -1,5 +1,5 @@
<?php
-/* Copyright (C) 2004-2010 Laurent Destailleur <eldy@users.sourceforge.net>
+/* Copyright (C) 2004-2012 Laurent Destailleur <eldy@users.sourceforge.net>
*
* 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
@@ -13,59 +13,154 @@
*
* 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/externalsite/frames.php
- * \ingroup externalsite
- * \brief Page that build two frames: One for menu, the other for the target page to show
- * \author Laurent Destailleur
+ * \file htdocs/admin/website.php
+ * \ingroup website
+ * \brief Page to setup the module Website
*/
require '../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
+
+$langs->load("admin");
+$langs->load("other");
+$langs->load("website");
+
+if (! $user->admin) accessforbidden();
+
+$action = GETPOST('action','alpha');
+
+$conf->dol_hide_leftmenu = 1;
-$langs->load("externalsite");
-if (empty($conf->global->EXTERNALSITE_URL))
+$website='website1';
+
+
+
+/*
+ * Actions
+ */
+
+// Action mise a jour ou ajout d'une constante
+if ($action == 'update')
{
- llxHeader();
- print '<div class="error">'.$langs->trans('ExternalSiteModuleNotComplete').'</div>';
- llxFooter();
+
+
+
+ if (! $res > 0) $error++;
+
+ if (! $error)
+ {
+ setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+ }
+ else
+ {
+ setEventMessages($langs->trans("Error"), null, 'errors');
+ }
}
-$mainmenu=GETPOST('mainmenu', 'alpha');
-$leftmenu=GETPOST('leftmenu', 'alpha');
-$idmenu=GETPOST('idmenu', 'int');
-$theme=GETPOST('theme', 'alpha');
-$codelang=GETPOST('lang', 'alpha');
-
-print "
-<html>
-<head>
-<title>Dolibarr frame for external web site</title>
-</head>
-
-<frameset ".(empty($conf->global->MAIN_MENU_INVERT)?"rows":"cols")."=\"".($heightforframes+50).",*\" border=0 framespacing=0 frameborder=0>
- <frame name=\"barre\" src=\"frametop.php?mainmenu=".$mainmenu."&leftmenu=".$leftmenu."&idmenu=".$idmenu.($theme?'&theme='.$theme:'').($codelang?'&lang='.$codelang:'')."&nobackground=1\" noresize scrolling=\"NO\" noborder>
- <frame name=\"main\" src=\"".$conf->global->EXTERNALSITE_URL."\">
- <noframes>
- <body>
-
- </body>
- </noframes>
-</frameset>
-
-<noframes>
-<body>
- <br><div class=\"center\">
- Sorry, your browser is too old or not correctly configured to view this area.<br>
- Your browser must support frames.<br>
- </div>
-</body>
-</noframes>
-
-</html>
-";
+
+/*
+ * View
+ */
+
+$_SESSION['website_mode'] = 'edit';
+
+
+$form = new Form($db);
+
+$help_url='';
+
+llxHeader('',$langs->trans("WebsiteSetup"),$help_url);
+
+
+$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
+print load_fiche_titre($langs->trans("WebsiteSetup"),$linkback,'title_setup');
+
+
+$head = array();
+
+
+/*
+ * Edit mode
+ */
+
+if ($_SESSION['website_mode'] == 'edit')
+{
+ print "\n".'<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+ print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+ print '<input type="hidden" name="action" value="update">';
+
+ dol_fiche_head($head, 'general', $langs->trans("Page").': '.$langs->trans("Home"), 0, 'globe');
+
+ print load_fiche_titre($langs->trans("SEO"),'','');
+
+ print '<table class="noborder" width="100%">';
+ print '<tr class="liste_titre">';
+ print '<td>'.$langs->trans("Description").'</td>';
+ print '<td>'.$langs->trans("Value").'</td>';
+ print "</tr>\n";
+
+ print '<tr><td>';
+ print $langs->trans('WEBSITE_PAGEURL');
+ print '</td><td>';
+ print '/public/websites/'.$website.'/index.php?page=home';
+ print '</td></tr>';
+
+ print '<tr><td>';
+ print $langs->trans('WEBSITE_TITLE');
+ print '</td><td>';
+ print '<input type="text" class="flat" size="96" name="WEBSITE_TITLE" value="'.dol_escape_htmltag($obj->WEBSITE_TITLE).'">';
+ print '</td></tr>';
+
+ print '<tr><td>';
+ print $langs->trans('WEBSITE_DESCRIPTION');
+ print '</td><td>';
+ print '<input type="text" class="flat" size="96" name="WEBSITE_DESCRIPTION" value="'.dol_escape_htmltag($obj->WEBSITE_DESCRIPTION).'">';
+ print '</td></tr>';
+
+ print '<tr><td>';
+ print $langs->trans('WEBSITE_KEYWORDS');
+ print '</td><td>';
+ print '<input type="text" class="flat" size="128" name="WEBSITE_KEYWORDS" value="'.dol_escape_htmltag($obj->WEBSITE_KEYWORDS).'">';
+ print '</td></tr>';
+
+ print '</table>';
+
+ print '<br>';
+
+
+ /*
+ * Editing global variables not related to a specific theme
+ */
+
+ print load_fiche_titre($langs->trans("Other"),'','');
+
+ require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+ $doleditor=new DolEditor('WEBSITE_HEADER',$obj->value,'',160,'dolibarr_notes','',false,false,$conf->fckeditor->enabled,5,60);
+ $doleditor->Create();
+
+ require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+ $doleditor=new DolEditor('WEBSITE_CONTENT',$obj->value,'',160,'dolibarr_notes','',false,false,$conf->fckeditor->enabled,5,60);
+ $doleditor->Create();
+
+ require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+ $doleditor=new DolEditor('WEBSITE_FOOTER',$obj->value,'',160,'dolibarr_notes','',false,false,$conf->fckeditor->enabled,5,60);
+ $doleditor->Create();
+
+ dol_fiche_end();
+
+ print '<div align="center"><input type="submit" class="button" value="'.$langs->trans("Update").'" name="update"></div>';
+
+ print '</form>';
+}
+
+
+
+llxFooter();
+
+$db->close();