New: Always use th for table head
This commit is contained in:
parent
8f19ee66e4
commit
4cbc4bb365
@ -261,7 +261,7 @@ if ($action == 'create')
|
|||||||
if ($res)
|
if ($res)
|
||||||
{
|
{
|
||||||
|
|
||||||
while ($menu = $db->fetch_array ($res))
|
while ($menu = $db->fetch_array($res))
|
||||||
{
|
{
|
||||||
$parent_rowid = $menu['rowid'];
|
$parent_rowid = $menu['rowid'];
|
||||||
$parent_mainmenu = $menu['mainmenu'];
|
$parent_mainmenu = $menu['mainmenu'];
|
||||||
|
|||||||
@ -300,7 +300,7 @@ if ($conf->use_javascript_ajax)
|
|||||||
$num = $db->num_rows($res);
|
$num = $db->num_rows($res);
|
||||||
|
|
||||||
$i = 1;
|
$i = 1;
|
||||||
while ($menu = $db->fetch_array ($res))
|
while ($menu = $db->fetch_array($res))
|
||||||
{
|
{
|
||||||
if (! empty($menu['langs'])) $langs->load($menu['langs']);
|
if (! empty($menu['langs'])) $langs->load($menu['langs']);
|
||||||
$titre = $langs->trans($menu['titre']);
|
$titre = $langs->trans($menu['titre']);
|
||||||
|
|||||||
@ -32,7 +32,7 @@ if (! defined('NOREQUIREMENU')) define('NOREQUIREMENU',1);
|
|||||||
if (! defined('NOREQUIREHTML')) define('NOREQUIREHTML',1);
|
if (! defined('NOREQUIREHTML')) define('NOREQUIREHTML',1);
|
||||||
if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1');
|
if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1');
|
||||||
|
|
||||||
session_cache_limiter( FALSE );
|
session_cache_limiter(FALSE);
|
||||||
|
|
||||||
require_once("../../master.inc.php");
|
require_once("../../master.inc.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/lib/functions.lib.php");
|
require_once(DOL_DOCUMENT_ROOT."/lib/functions.lib.php");
|
||||||
|
|||||||
@ -40,9 +40,11 @@ $action = GETPOST("action");
|
|||||||
|
|
||||||
if ($action == "set")
|
if ($action == "set")
|
||||||
{
|
{
|
||||||
|
$db->begin();
|
||||||
for ($i = 0 ; $i < 2 ; $i++)
|
for ($i = 0 ; $i < 2 ; $i++)
|
||||||
{
|
{
|
||||||
$res = dolibarr_set_const($db, $_POST["nom$i"], $_POST["value$i"],'chaine',0,'',$conf->entity);
|
$res = dolibarr_set_const($db, $_POST["nom$i"], $_POST["value$i"],'chaine',0,'',$conf->entity);
|
||||||
|
if (! $res > 0) $error++;
|
||||||
}
|
}
|
||||||
|
|
||||||
$id=$_POST["PRELEVEMENT_ID_BANKACCOUNT"];
|
$id=$_POST["PRELEVEMENT_ID_BANKACCOUNT"];
|
||||||
@ -51,23 +53,32 @@ if ($action == "set")
|
|||||||
if($account->fetch($id)>0)
|
if($account->fetch($id)>0)
|
||||||
{
|
{
|
||||||
$res = dolibarr_set_const($db, "PRELEVEMENT_ID_BANKACCOUNT", $id,'chaine',0,'',$conf->entity);
|
$res = dolibarr_set_const($db, "PRELEVEMENT_ID_BANKACCOUNT", $id,'chaine',0,'',$conf->entity);
|
||||||
$res = dolibarr_set_const($db, "PRELEVEMENT_CODE_BANQUE", $account->code_banque,'chaine',0,'',$conf->entity);
|
|
||||||
$res = dolibarr_set_const($db, "PRELEVEMENT_CODE_GUICHET", $account->code_guichet,'chaine',0,'',$conf->entity);
|
|
||||||
$res = dolibarr_set_const($db, "PRELEVEMENT_NUMERO_COMPTE", $account->number,'chaine',0,'',$conf->entity);
|
|
||||||
$res = dolibarr_set_const($db, "PRELEVEMENT_NUMBER_KEY", $account->cle_rib,'chaine',0,'',$conf->entity);
|
|
||||||
$res = dolibarr_set_const($db, "PRELEVEMENT_IBAN", $account->iban,'chaine',0,'',$conf->entity);
|
|
||||||
$res = dolibarr_set_const($db, "PRELEVEMENT_BIC", $account->bic,'chaine',0,'',$conf->entity);
|
|
||||||
$res = dolibarr_set_const($db, "PRELEVEMENT_RAISON_SOCIALE", $account->proprio,'chaine',0,'',$conf->entity);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (! $res > 0) $error++;
|
if (! $res > 0) $error++;
|
||||||
|
$res = dolibarr_set_const($db, "PRELEVEMENT_CODE_BANQUE", $account->code_banque,'chaine',0,'',$conf->entity);
|
||||||
|
if (! $res > 0) $error++;
|
||||||
|
$res = dolibarr_set_const($db, "PRELEVEMENT_CODE_GUICHET", $account->code_guichet,'chaine',0,'',$conf->entity);
|
||||||
|
if (! $res > 0) $error++;
|
||||||
|
$res = dolibarr_set_const($db, "PRELEVEMENT_NUMERO_COMPTE", $account->number,'chaine',0,'',$conf->entity);
|
||||||
|
if (! $res > 0) $error++;
|
||||||
|
$res = dolibarr_set_const($db, "PRELEVEMENT_NUMBER_KEY", $account->cle_rib,'chaine',0,'',$conf->entity);
|
||||||
|
if (! $res > 0) $error++;
|
||||||
|
$res = dolibarr_set_const($db, "PRELEVEMENT_IBAN", $account->iban,'chaine',0,'',$conf->entity);
|
||||||
|
if (! $res > 0) $error++;
|
||||||
|
$res = dolibarr_set_const($db, "PRELEVEMENT_BIC", $account->bic,'chaine',0,'',$conf->entity);
|
||||||
|
if (! $res > 0) $error++;
|
||||||
|
$res = dolibarr_set_const($db, "PRELEVEMENT_RAISON_SOCIALE", $account->proprio,'chaine',0,'',$conf->entity);
|
||||||
|
if (! $res > 0) $error++;
|
||||||
|
}
|
||||||
|
else $error++;
|
||||||
|
|
||||||
if (! $error)
|
if (! $error)
|
||||||
{
|
{
|
||||||
|
$db->commit();
|
||||||
$mesg = "<font class=\"ok\">".$langs->trans("SetupSaved")."</font>";
|
$mesg = "<font class=\"ok\">".$langs->trans("SetupSaved")."</font>";
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
$db->rollback();
|
||||||
$mesg = "<font class=\"error\">".$langs->trans("Error")."</font>";
|
$mesg = "<font class=\"error\">".$langs->trans("Error")."</font>";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1804,7 +1804,7 @@ else
|
|||||||
print_liste_field_titre($langs->trans('Price'),$_SERVER["PHP_SELF"],'p.total_ht','',$param, 'align="right"',$sortfield,$sortorder);
|
print_liste_field_titre($langs->trans('Price'),$_SERVER["PHP_SELF"],'p.total_ht','',$param, 'align="right"',$sortfield,$sortorder);
|
||||||
print_liste_field_titre($langs->trans('Author'),$_SERVER["PHP_SELF"],'u.login','',$param,'align="right"',$sortfield,$sortorder);
|
print_liste_field_titre($langs->trans('Author'),$_SERVER["PHP_SELF"],'u.login','',$param,'align="right"',$sortfield,$sortorder);
|
||||||
print_liste_field_titre($langs->trans('Status'),$_SERVER["PHP_SELF"],'p.fk_statut','',$param,'align="right"',$sortfield,$sortorder);
|
print_liste_field_titre($langs->trans('Status'),$_SERVER["PHP_SELF"],'p.fk_statut','',$param,'align="right"',$sortfield,$sortorder);
|
||||||
print '<td class="liste_titre"> </td>';
|
print_liste_field_titre('');
|
||||||
print "</tr>\n";
|
print "</tr>\n";
|
||||||
// Lignes des champs de filtre
|
// Lignes des champs de filtre
|
||||||
print '<form method="get" action="'.$_SERVER["PHP_SELF"].'">';
|
print '<form method="get" action="'.$_SERVER["PHP_SELF"].'">';
|
||||||
|
|||||||
@ -2572,43 +2572,36 @@ function print_liste_field_titre($name, $file="", $field="", $begin="", $morepar
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Get title line of an array
|
* Get title line of an array
|
||||||
|
*
|
||||||
* @param name Label of field
|
* @param name Label of field
|
||||||
* @param thead For thead format
|
* @param thead For thead format
|
||||||
* @param file Url used when we click on sort picto
|
* @param file Url used when we click on sort picto
|
||||||
* @param field Field to use for new sorting
|
* @param field Field to use for new sorting
|
||||||
* @param begin ("" by defaut)
|
* @param begin ("" by defaut)
|
||||||
* @param moreparam Add more parameters on sort url links ("" by default)
|
* @param moreparam Add more parameters on sort url links ("" by default)
|
||||||
* @param td Options of attribute td ("" by defaut)
|
* @param moreattrib Add more attributes on th ("" by defaut)
|
||||||
* @param sortfield Current field used to sort
|
* @param sortfield Current field used to sort
|
||||||
* @param sortorder Current sort order
|
* @param sortorder Current sort order
|
||||||
*/
|
*/
|
||||||
function getTitleFieldOfList($name, $thead=0, $file="", $field="", $begin="", $moreparam="", $td="", $sortfield="", $sortorder="")
|
function getTitleFieldOfList($name, $thead=0, $file="", $field="", $begin="", $moreparam="", $moreattrib="", $sortfield="", $sortorder="")
|
||||||
{
|
{
|
||||||
global $conf;
|
global $conf;
|
||||||
//print "$name, $file, $field, $begin, $options, $td, $sortfield, $sortorder<br>\n";
|
//print "$name, $file, $field, $begin, $options, $moreattrib, $sortfield, $sortorder<br>\n";
|
||||||
|
|
||||||
$out='';
|
$out='';
|
||||||
|
// If field is used as sort criteria we use a specific class
|
||||||
if ($thead)
|
// Example if (sortfield,field)=("nom","xxx.nom") or (sortfield,field)=("nom","nom")
|
||||||
{
|
|
||||||
$out.= '<th>'.$name.'</th>';
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
// Le champ de tri est mis en evidence.
|
|
||||||
// Exemple si (sortfield,field)=("nom","xxx.nom") ou (sortfield,field)=("nom","nom")
|
|
||||||
if ($field && ($sortfield == $field || $sortfield == preg_replace("/^[^\.]+\./","",$field)))
|
if ($field && ($sortfield == $field || $sortfield == preg_replace("/^[^\.]+\./","",$field)))
|
||||||
{
|
{
|
||||||
$out.= '<td class="liste_titre_sel" '. $td.'>';
|
$out.= '<th class="liste_titre_sel" '. $moreattrib.'>';
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
$out.= '<td class="liste_titre" '. $td.'>';
|
$out.= '<th class="liste_titre" '. $moreattrib.'>';
|
||||||
}
|
}
|
||||||
$out.= $name;
|
$out.=$name;
|
||||||
|
|
||||||
// If this is a sort field
|
if (empty($thead) && $field) // If this is a sort field
|
||||||
if ($field)
|
|
||||||
{
|
{
|
||||||
$options=preg_replace('/sortfield=([a-zA-Z0-9,\s\.]+)/i','',$moreparam);
|
$options=preg_replace('/sortfield=([a-zA-Z0-9,\s\.]+)/i','',$moreparam);
|
||||||
$options=preg_replace('/sortorder=([a-zA-Z0-9,\s\.]+)/i','',$options);
|
$options=preg_replace('/sortorder=([a-zA-Z0-9,\s\.]+)/i','',$options);
|
||||||
@ -2642,8 +2635,7 @@ function getTitleFieldOfList($name, $thead=0, $file="", $field="", $begin="", $m
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
$out.= "</td>";
|
$out.='</th>';
|
||||||
}
|
|
||||||
|
|
||||||
return $out;
|
return $out;
|
||||||
}
|
}
|
||||||
@ -2672,6 +2664,7 @@ function print_fiche_titre($titre, $mesg='', $picto='title.png', $pictoisfullpat
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Load a title with picto
|
* Load a title with picto
|
||||||
|
*
|
||||||
* @param titre Title to show
|
* @param titre Title to show
|
||||||
* @param mesg Added message to show on right
|
* @param mesg Added message to show on right
|
||||||
* @param picto Icon to use before title (should be a 32x32 transparent png file)
|
* @param picto Icon to use before title (should be a 32x32 transparent png file)
|
||||||
@ -2704,6 +2697,7 @@ function load_fiche_titre($titre, $mesg='', $picto='title.png', $pictoisfullpath
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Print a title with navigation controls for pagination
|
* Print a title with navigation controls for pagination
|
||||||
|
*
|
||||||
* @param titre Title to show (required)
|
* @param titre Title to show (required)
|
||||||
* @param page Numero of page (required)
|
* @param page Numero of page (required)
|
||||||
* @param file Url of page (required)
|
* @param file Url of page (required)
|
||||||
@ -2813,6 +2807,7 @@ function print_barre_liste($titre, $page, $file, $options='', $sortfield='', $so
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Fonction servant a afficher les fleches de navigation dans les pages de listes
|
* Fonction servant a afficher les fleches de navigation dans les pages de listes
|
||||||
|
*
|
||||||
* @param page Numero of page
|
* @param page Numero of page
|
||||||
* @param file Lien
|
* @param file Lien
|
||||||
* @param options Autres parametres d'url a propager dans les liens ("" par defaut)
|
* @param options Autres parametres d'url a propager dans les liens ("" par defaut)
|
||||||
@ -2837,6 +2832,7 @@ function print_fleche_navigation($page,$file,$options='',$nextpage,$betweenarrow
|
|||||||
/**
|
/**
|
||||||
* Fonction qui retourne un taux de tva formate pour visualisation
|
* Fonction qui retourne un taux de tva formate pour visualisation
|
||||||
* Utilisee dans les pdf et les pages html
|
* Utilisee dans les pdf et les pages html
|
||||||
|
*
|
||||||
* @param rate Rate value to format (19.6 19,6 19.6% 19,6%,...)
|
* @param rate Rate value to format (19.6 19,6 19.6% 19,6%,...)
|
||||||
* @param addpercent Add a percent % sign in output
|
* @param addpercent Add a percent % sign in output
|
||||||
* @param info_bits Miscellanous information on vat
|
* @param info_bits Miscellanous information on vat
|
||||||
@ -2865,6 +2861,7 @@ function vatrate($rate,$addpercent=false,$info_bits=0)
|
|||||||
/**
|
/**
|
||||||
* Fonction qui formate un montant pour visualisation
|
* Fonction qui formate un montant pour visualisation
|
||||||
* Fonction utilisee dans les pdf et les pages html
|
* Fonction utilisee dans les pdf et les pages html
|
||||||
|
*
|
||||||
* @param amount Montant a formater
|
* @param amount Montant a formater
|
||||||
* @param html Type de formatage, html ou pas (par defaut)
|
* @param html Type de formatage, html ou pas (par defaut)
|
||||||
* @param outlangs Objet langs pour formatage text
|
* @param outlangs Objet langs pour formatage text
|
||||||
@ -2937,7 +2934,8 @@ function price($amount, $html=0, $outlangs='', $trunc=1, $rounding=-1, $forcerou
|
|||||||
/**
|
/**
|
||||||
* Function that return a number with universal decimal format (decimal separator is '.') from
|
* Function that return a number with universal decimal format (decimal separator is '.') from
|
||||||
* an amount typed by a user.
|
* an amount typed by a user.
|
||||||
* Function to use on each input amount before any numeric test or database insert.
|
* Function to use on each input amount before any numeric test or database insert
|
||||||
|
*
|
||||||
* @param amount Amount to convert/clean
|
* @param amount Amount to convert/clean
|
||||||
* @param rounding ''=No rounding
|
* @param rounding ''=No rounding
|
||||||
* 'MU'=Round to Max unit price (MAIN_MAX_DECIMALS_UNIT)
|
* 'MU'=Round to Max unit price (MAIN_MAX_DECIMALS_UNIT)
|
||||||
@ -3022,6 +3020,7 @@ function price2num($amount,$rounding='',$alreadysqlnb=0)
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Return localtaxe rate for a particular tva
|
* Return localtaxe rate for a particular tva
|
||||||
|
*
|
||||||
* @param tva Vat taxe
|
* @param tva Vat taxe
|
||||||
* @param local Local taxe to search and return
|
* @param local Local taxe to search and return
|
||||||
* @param societe_acheteuse Object of buying third party
|
* @param societe_acheteuse Object of buying third party
|
||||||
@ -3060,7 +3059,8 @@ function get_localtax($tva, $local, $societe_acheteuse="")
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Return vat rate of a product in a particular selling country or default country
|
* Return vat rate of a product in a particular selling country or default country
|
||||||
* vat if product is unknown.
|
* vat if product is unknown
|
||||||
|
*
|
||||||
* @param idprod Id of product or 0 if not a predefined product
|
* @param idprod Id of product or 0 if not a predefined product
|
||||||
* @param countrycode Country code (FR, US, IT, ...)
|
* @param countrycode Country code (FR, US, IT, ...)
|
||||||
* @return int <0 if KO, Vat rate if OK
|
* @return int <0 if KO, Vat rate if OK
|
||||||
@ -3119,6 +3119,7 @@ function get_product_vat_for_country($idprod, $countrycode)
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Return localtax rate of a product in a particular selling country
|
* Return localtax rate of a product in a particular selling country
|
||||||
|
*
|
||||||
* @param idprod Id of product
|
* @param idprod Id of product
|
||||||
* @package local 1 for localtax1, 2 for localtax 2
|
* @package local 1 for localtax1, 2 for localtax 2
|
||||||
* @param countrycode Country code (FR, US, IT, ...)
|
* @param countrycode Country code (FR, US, IT, ...)
|
||||||
@ -3276,6 +3277,7 @@ function get_default_localtax($societe_vendeuse, $societe_acheteuse, $local, $id
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Return yes or no in current language
|
* Return yes or no in current language
|
||||||
|
*
|
||||||
* @param yesno Value to test (1, 'yes', 'true' or 0, 'no', 'false')
|
* @param yesno Value to test (1, 'yes', 'true' or 0, 'no', 'false')
|
||||||
* @param case 1=Yes/No, 0=yes/no
|
* @param case 1=Yes/No, 0=yes/no
|
||||||
* @param color 0=texte only, 1=Text is formated with a color font style ('ok' or 'error'), 2=Text is formated with 'ok' color.
|
* @param color 0=texte only, 1=Text is formated with a color font style ('ok' or 'error'), 2=Text is formated with 'ok' color.
|
||||||
@ -3304,6 +3306,7 @@ function yn($yesno, $case=1, $color=0)
|
|||||||
* Return a path to have a directory according to an id
|
* Return a path to have a directory according to an id
|
||||||
* Examples: '001' with level 3->"0/0/1/", '015' with level 3->"0/1/5/"
|
* Examples: '001' with level 3->"0/0/1/", '015' with level 3->"0/1/5/"
|
||||||
* Examples: 'ABC-1' with level 3 ->"0/0/1/", '015' with level 1->"5/"
|
* Examples: 'ABC-1' with level 3 ->"0/0/1/", '015' with level 1->"5/"
|
||||||
|
*
|
||||||
* @param $num Id to develop
|
* @param $num Id to develop
|
||||||
* @param $level Level of development (1, 2 or 3 level)
|
* @param $level Level of development (1, 2 or 3 level)
|
||||||
* @param $alpha Use alpha ref
|
* @param $alpha Use alpha ref
|
||||||
@ -3330,6 +3333,7 @@ function create_exdir($dir)
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Creation of a directory (recursive)
|
* Creation of a directory (recursive)
|
||||||
|
*
|
||||||
* @param $dir Directory to create
|
* @param $dir Directory to create
|
||||||
* @return int < 0 if KO, 0 = already exists, > 0 if OK
|
* @return int < 0 if KO, 0 = already exists, > 0 if OK
|
||||||
*/
|
*/
|
||||||
@ -3391,6 +3395,7 @@ function dol_mkdir($dir)
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Return picto saying a field is required
|
* Return picto saying a field is required
|
||||||
|
*
|
||||||
* @return string Chaine avec picto obligatoire
|
* @return string Chaine avec picto obligatoire
|
||||||
*/
|
*/
|
||||||
function picto_required()
|
function picto_required()
|
||||||
@ -3401,6 +3406,7 @@ function picto_required()
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Clean a string from all HTML tags and entities
|
* Clean a string from all HTML tags and entities
|
||||||
|
*
|
||||||
* @param StringHtml String to clean
|
* @param StringHtml String to clean
|
||||||
* @param removelinefeed Replace also all lines feeds by a space
|
* @param removelinefeed Replace also all lines feeds by a space
|
||||||
* @return string String cleaned
|
* @return string String cleaned
|
||||||
@ -3425,7 +3431,8 @@ function dol_string_nohtmltag($StringHtml,$removelinefeed=1)
|
|||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Replace CRLF in string with a HTML BR tag.
|
* Replace CRLF in string with a HTML BR tag
|
||||||
|
*
|
||||||
* @param stringtoencode String to encode
|
* @param stringtoencode String to encode
|
||||||
* @param nl2brmode 0=Adding br before \n, 1=Replacing \n by br
|
* @param nl2brmode 0=Adding br before \n, 1=Replacing \n by br
|
||||||
* @param forxml false=Use <br>, true=Use <br />
|
* @param forxml false=Use <br>, true=Use <br />
|
||||||
@ -3455,7 +3462,8 @@ function dol_nl2br($stringtoencode,$nl2brmode=0,$forxml=false)
|
|||||||
* - writeHTMLCell -> param must be encoded into HTML.
|
* - writeHTMLCell -> param must be encoded into HTML.
|
||||||
* - MultiCell -> param must not be encoded into HTML.
|
* - MultiCell -> param must not be encoded into HTML.
|
||||||
* Because writeHTMLCell convert also \n into <br>, if function
|
* Because writeHTMLCell convert also \n into <br>, if function
|
||||||
* is used to build PDF, nl2brmode must be 1.
|
* is used to build PDF, nl2brmode must be 1
|
||||||
|
*
|
||||||
* @param stringtoencode String to encode
|
* @param stringtoencode String to encode
|
||||||
* @param nl2brmode 0=Adding br before \n, 1=Replacing \n by br (for use with FPDF writeHTMLCell function for example)
|
* @param nl2brmode 0=Adding br before \n, 1=Replacing \n by br (for use with FPDF writeHTMLCell function for example)
|
||||||
* @param pagecodefrom Pagecode stringtoencode is encoded
|
* @param pagecodefrom Pagecode stringtoencode is encoded
|
||||||
@ -3482,6 +3490,7 @@ function dol_htmlentitiesbr($stringtoencode,$nl2brmode=0,$pagecodefrom='UTF-8')
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* This function is called to decode a HTML string (it decodes entities and br tags)
|
* This function is called to decode a HTML string (it decodes entities and br tags)
|
||||||
|
*
|
||||||
* @param stringtodecode String to decode
|
* @param stringtodecode String to decode
|
||||||
* @param pagecodeto Page code for result
|
* @param pagecodeto Page code for result
|
||||||
*/
|
*/
|
||||||
@ -3497,6 +3506,7 @@ function dol_htmlentitiesbr_decode($stringtodecode,$pagecodeto='UTF-8')
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* This function remove all ending \n and br at end
|
* This function remove all ending \n and br at end
|
||||||
|
*
|
||||||
* @param stringtodecode String to decode
|
* @param stringtodecode String to decode
|
||||||
*/
|
*/
|
||||||
function dol_htmlcleanlastbr($stringtodecode)
|
function dol_htmlcleanlastbr($stringtodecode)
|
||||||
@ -3507,6 +3517,7 @@ function dol_htmlcleanlastbr($stringtodecode)
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* This function is called to decode a string with HTML entities (it decodes entities tags)
|
* This function is called to decode a string with HTML entities (it decodes entities tags)
|
||||||
|
*
|
||||||
* @param stringhtml stringhtml
|
* @param stringhtml stringhtml
|
||||||
* @param pagecodeto Encoding of input string
|
* @param pagecodeto Encoding of input string
|
||||||
* @return string decodestring
|
* @return string decodestring
|
||||||
@ -3519,6 +3530,7 @@ function dol_entity_decode($stringhtml,$pagecodeto='UTF-8')
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Replace html_entity_decode functions to manage errors
|
* Replace html_entity_decode functions to manage errors
|
||||||
|
*
|
||||||
* @param a
|
* @param a
|
||||||
* @param b
|
* @param b
|
||||||
* @param c
|
* @param c
|
||||||
@ -3533,6 +3545,7 @@ function dol_html_entity_decode($a,$b,$c)
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Replace htmlentities functions to manage errors
|
* Replace htmlentities functions to manage errors
|
||||||
|
*
|
||||||
* @param a
|
* @param a
|
||||||
* @param b
|
* @param b
|
||||||
* @param c
|
* @param c
|
||||||
@ -3549,7 +3562,8 @@ function dol_htmlentities($a,$b,$c)
|
|||||||
/**
|
/**
|
||||||
* Check if a string is a correct iso string
|
* Check if a string is a correct iso string
|
||||||
* If not, it will we considered not HTML encoded even if it is by FPDF.
|
* If not, it will we considered not HTML encoded even if it is by FPDF.
|
||||||
* Example, if string contains euro symbol that has ascii code 128.
|
* Example, if string contains euro symbol that has ascii code 128
|
||||||
|
*
|
||||||
* @param s String to check
|
* @param s String to check
|
||||||
* @return int 0 if bad iso, 1 if good iso
|
* @return int 0 if bad iso, 1 if good iso
|
||||||
*/
|
*/
|
||||||
@ -3570,6 +3584,7 @@ function dol_string_is_good_iso($s)
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Return nb of lines of a clear text
|
* Return nb of lines of a clear text
|
||||||
|
*
|
||||||
* @param s String to check
|
* @param s String to check
|
||||||
* @param maxchar Not yet used
|
* @param maxchar Not yet used
|
||||||
* @return int Number of lines
|
* @return int Number of lines
|
||||||
@ -3586,6 +3601,7 @@ function dol_nboflines($s,$maxchar=0)
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Return nb of lines of a formated text with \n and <br>
|
* Return nb of lines of a formated text with \n and <br>
|
||||||
|
*
|
||||||
* @param text Text
|
* @param text Text
|
||||||
* @param maxlinesize Largeur de ligne en caracteres (ou 0 si pas de limite - defaut)
|
* @param maxlinesize Largeur de ligne en caracteres (ou 0 si pas de limite - defaut)
|
||||||
* @param charset Give the charset used to encode the $text variable in memory.
|
* @param charset Give the charset used to encode the $text variable in memory.
|
||||||
@ -3622,6 +3638,7 @@ function dol_nboflines_bis($text,$maxlinesize=0,$charset='UTF-8')
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Same function than microtime in PHP 5 but compatible with PHP4
|
* Same function than microtime in PHP 5 but compatible with PHP4
|
||||||
|
*
|
||||||
* @return float Time (millisecondes) with microsecondes in decimal part
|
* @return float Time (millisecondes) with microsecondes in decimal part
|
||||||
*/
|
*/
|
||||||
function dol_microtime_float()
|
function dol_microtime_float()
|
||||||
@ -3632,6 +3649,7 @@ function dol_microtime_float()
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Return if a text is a html content
|
* Return if a text is a html content
|
||||||
|
*
|
||||||
* @param msg Content to check
|
* @param msg Content to check
|
||||||
* @param option 0=Full detection, 1=Fast check
|
* @param option 0=Full detection, 1=Fast check
|
||||||
* @return boolean true/false
|
* @return boolean true/false
|
||||||
@ -4094,7 +4112,8 @@ function verifCond($strRights)
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Replace eval function to add more security.
|
* Replace eval function to add more security.
|
||||||
* This function is called by verifCond().
|
* This function is called by verifCond()
|
||||||
|
*
|
||||||
* @param string $s
|
* @param string $s
|
||||||
*/
|
*/
|
||||||
function dol_eval($s)
|
function dol_eval($s)
|
||||||
|
|||||||
@ -1200,64 +1200,66 @@ padding: 0px 0px;
|
|||||||
/* For lists */
|
/* For lists */
|
||||||
|
|
||||||
table.liste {
|
table.liste {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
border-collapse: collapse;
|
border-collapse: collapse;
|
||||||
border-top-color: #FEFEFE;
|
border-top-color: #FEFEFE;
|
||||||
|
|
||||||
border-left-width: 1px;
|
border-left-width: 1px;
|
||||||
border-left-color: #BBBBBB;
|
border-left-color: #BBBBBB;
|
||||||
border-left-style: solid;
|
border-left-style: solid;
|
||||||
|
|
||||||
border-right-width: 1px;
|
border-right-width: 1px;
|
||||||
border-right-color: #BBBBBB;
|
border-right-color: #BBBBBB;
|
||||||
border-right-style: solid;
|
border-right-style: solid;
|
||||||
|
|
||||||
border-bottom-width: 1px;
|
border-bottom-width: 1px;
|
||||||
border-bottom-color: #BBBBBB;
|
border-bottom-color: #BBBBBB;
|
||||||
border-bottom-style: solid;
|
border-bottom-style: solid;
|
||||||
|
|
||||||
margin-bottom: 2px;
|
margin-bottom: 2px;
|
||||||
margin-top: 0px;
|
margin-top: 0px;
|
||||||
|
|
||||||
-moz-box-shadow: 4px 4px 4px #CCC;
|
-moz-box-shadow: 4px 4px 4px #CCC;
|
||||||
-webkit-box-shadow: 4px 4px 4px #CCC;
|
-webkit-box-shadow: 4px 4px 4px #CCC;
|
||||||
box-shadow: 4px 4px 4px #CCC;
|
box-shadow: 4px 4px 4px #CCC;
|
||||||
}
|
}
|
||||||
table.liste td {
|
table.liste td {
|
||||||
padding-right: 2px;
|
padding-right: 2px;
|
||||||
}
|
}
|
||||||
|
|
||||||
tr.liste_titre {
|
tr.liste_titre
|
||||||
height: 24px;
|
|
||||||
background: #7699A9;
|
|
||||||
background-image: url(<?php echo $img_liste_titre ?>);
|
|
||||||
background-repeat: repeat-x;
|
|
||||||
color: #FFFFFF;
|
|
||||||
font-family: <?php print $fontlist ?>;
|
|
||||||
/* border-bottom: 1px solid #FDFFFF; */
|
|
||||||
white-space: nowrap;
|
|
||||||
}
|
|
||||||
td.liste_titre {
|
|
||||||
background: #7699A9;
|
|
||||||
background-image: url(<?php echo $img_liste_titre ?>);
|
|
||||||
background-repeat: repeat-x;
|
|
||||||
color: #FFFFFF;
|
|
||||||
font-family: <?php print $fontlist ?>;
|
|
||||||
font-weight: normal;
|
|
||||||
/* border-bottom: 1px solid #FDFFFF; */
|
|
||||||
white-space: nowrap;
|
|
||||||
}
|
|
||||||
td.liste_titre_sel
|
|
||||||
{
|
{
|
||||||
background: #7699A9;
|
height: 24px;
|
||||||
background-image: url(<?php echo $img_liste_titre ?>);
|
background: #7699A9;
|
||||||
background-repeat: repeat-x;
|
background-image: url(<?php echo $img_liste_titre ?>);
|
||||||
color: #FFFFFF;
|
background-repeat: repeat-x;
|
||||||
font-family: <?php print $fontlist ?>;
|
color: #FFFFFF;
|
||||||
font-weight: normal;
|
font-family: <?php print $fontlist ?>;
|
||||||
/* text-decoration: underline; */
|
/* border-bottom: 1px solid #FDFFFF; */
|
||||||
/* border-bottom: 1px solid #FDFFFF; */
|
white-space: nowrap;
|
||||||
white-space: nowrap;
|
}
|
||||||
|
th.liste_titre, td.liste_titre
|
||||||
|
{
|
||||||
|
background: #7699A9;
|
||||||
|
background-image: url(<?php echo $img_liste_titre ?>);
|
||||||
|
background-repeat: repeat-x;
|
||||||
|
color: #FFFFFF;
|
||||||
|
font-family: <?php print $fontlist ?>;
|
||||||
|
font-weight: normal;
|
||||||
|
/* border-bottom: 1px solid #FDFFFF; */
|
||||||
|
white-space: nowrap;
|
||||||
|
}
|
||||||
|
th.liste_titre_sel, td.liste_titre_sel
|
||||||
|
{
|
||||||
|
background: #7699A9;
|
||||||
|
background-image: url(<?php echo $img_liste_titre ?>);
|
||||||
|
background-repeat: repeat-x;
|
||||||
|
color: #FFFFFF;
|
||||||
|
font-family: <?php print $fontlist ?>;
|
||||||
|
font-weight: normal;
|
||||||
|
/* text-decoration: underline; */
|
||||||
|
/* border-bottom: 1px solid #FDFFFF; */
|
||||||
|
white-space: nowrap;
|
||||||
}
|
}
|
||||||
input.liste_titre {
|
input.liste_titre {
|
||||||
background: transparent;
|
background: transparent;
|
||||||
@ -1274,19 +1276,6 @@ font-weight: normal;
|
|||||||
white-space: nowrap;
|
white-space: nowrap;
|
||||||
}
|
}
|
||||||
|
|
||||||
th {
|
|
||||||
/* background: #7699A9; */
|
|
||||||
background: #91ABB3;
|
|
||||||
color: #334444;
|
|
||||||
font-family: <?php print $fontlist ?>;
|
|
||||||
font-weight: bold;
|
|
||||||
border-left: 1px solid #FFFFFF;
|
|
||||||
border-right: 1px solid #FFFFFF;
|
|
||||||
border-top: 1px solid #FFFFFF;
|
|
||||||
border-bottom: 1px solid #FFFFFF;
|
|
||||||
white-space: nowrap;
|
|
||||||
}
|
|
||||||
|
|
||||||
.impair {
|
.impair {
|
||||||
/* background: #d0d4d7; */
|
/* background: #d0d4d7; */
|
||||||
background: #eaeaea;
|
background: #eaeaea;
|
||||||
|
|||||||
@ -1402,7 +1402,7 @@ tr.liste_titre:first-child {
|
|||||||
background-position: top right;
|
background-position: top right;
|
||||||
}
|
}
|
||||||
|
|
||||||
td.liste_titre_sel,
|
th.liste_titre_sel, td.liste_titre_sel,
|
||||||
tr.liste_titre:first-child td {
|
tr.liste_titre:first-child td {
|
||||||
color: #FFFFFF !important;
|
color: #FFFFFF !important;
|
||||||
}
|
}
|
||||||
@ -1430,7 +1430,8 @@ tr.liste_titre td {
|
|||||||
background: none !important;
|
background: none !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
td.liste_titre {
|
th.liste_titre, td.liste_titre
|
||||||
|
{
|
||||||
background-repeat: repeat-x;
|
background-repeat: repeat-x;
|
||||||
color: #333333;
|
color: #333333;
|
||||||
font-family: <?php print $fontlist ?>;
|
font-family: <?php print $fontlist ?>;
|
||||||
@ -1481,19 +1482,6 @@ white-space: nowrap;
|
|||||||
padding: 5px;
|
padding: 5px;
|
||||||
}
|
}
|
||||||
|
|
||||||
th {
|
|
||||||
/* background: #7699A9; */
|
|
||||||
background: #91ABB3;
|
|
||||||
color: #334444;
|
|
||||||
font-family: <?php print $fontlist ?>;
|
|
||||||
font-weight: bold;
|
|
||||||
border-left: 1px solid #FFFFFF;
|
|
||||||
border-right: 1px solid #FFFFFF;
|
|
||||||
border-top: 1px solid #FFFFFF;
|
|
||||||
border-bottom: 1px solid #FFFFFF;
|
|
||||||
white-space: nowrap;
|
|
||||||
}
|
|
||||||
|
|
||||||
.impair {
|
.impair {
|
||||||
/* background: #d0d4d7; */
|
/* background: #d0d4d7; */
|
||||||
background: #eaeaea;
|
background: #eaeaea;
|
||||||
|
|||||||
@ -1339,30 +1339,29 @@ table.liste td {
|
|||||||
}
|
}
|
||||||
|
|
||||||
tr.liste_titre {
|
tr.liste_titre {
|
||||||
height: 20px;
|
height: 20px;
|
||||||
color: #842F00;
|
color: #842F00;
|
||||||
font-weight: bold;
|
font-weight: bold;
|
||||||
font-family: "Trebuchet MS",Arial,Helvetica,sans-serif;
|
font-family: "Trebuchet MS",Arial,Helvetica,sans-serif;
|
||||||
/*border-bottom: 1px solid #FDFFFF;*/
|
/*border-bottom: 1px solid #FDFFFF;*/
|
||||||
border-radius: 8px;
|
border-radius: 8px;
|
||||||
line-height: 18px;
|
line-height: 18px;
|
||||||
padding-left: 10px;
|
padding-left: 10px;
|
||||||
padding-right: 10px;
|
padding-right: 10px;
|
||||||
white-space: nowrap;
|
white-space: nowrap;
|
||||||
}
|
}
|
||||||
|
th.liste_titre, td.liste_titre
|
||||||
tr.liste_titre td {
|
{
|
||||||
padding-left: 6px;
|
padding-left: 6px;
|
||||||
padding-right: 6px;
|
padding-right: 6px;
|
||||||
/*vertical-align: text-top;*/
|
/*vertical-align: text-top;*/
|
||||||
}
|
}
|
||||||
|
th.liste_titre_sel, td.liste_titre_sel
|
||||||
td.liste_titre_sel
|
|
||||||
{
|
{
|
||||||
background-position: top right;
|
background-position: top right;
|
||||||
color: #A51B00;
|
color: #A51B00;
|
||||||
font-weight: bold;
|
font-weight: bold;
|
||||||
white-space: nowrap;
|
white-space: nowrap;
|
||||||
}
|
}
|
||||||
|
|
||||||
input.liste_titre {
|
input.liste_titre {
|
||||||
@ -1383,19 +1382,6 @@ font-weight: normal;
|
|||||||
white-space: nowrap;
|
white-space: nowrap;
|
||||||
}
|
}
|
||||||
|
|
||||||
th {
|
|
||||||
/* background: #7699A9; */
|
|
||||||
background: #91ABB3;
|
|
||||||
color: #334444;
|
|
||||||
font-family: <?php print $fontlist ?>;
|
|
||||||
font-weight: bold;
|
|
||||||
border-left: 1px solid #FFFFFF;
|
|
||||||
border-right: 1px solid #FFFFFF;
|
|
||||||
border-top: 1px solid #FFFFFF;
|
|
||||||
border-bottom: 1px solid #FFFFFF;
|
|
||||||
white-space: nowrap;
|
|
||||||
}
|
|
||||||
|
|
||||||
.impair {
|
.impair {
|
||||||
/* background: #d0d4d7; */
|
/* background: #d0d4d7; */
|
||||||
background: #eaeaea;
|
background: #eaeaea;
|
||||||
|
|||||||
@ -1222,59 +1222,61 @@ padding: 0px 0px;
|
|||||||
/* For lists */
|
/* For lists */
|
||||||
|
|
||||||
table.liste {
|
table.liste {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
border-collapse: collapse;
|
border-collapse: collapse;
|
||||||
border-top-color: #FEFEFE;
|
border-top-color: #FEFEFE;
|
||||||
|
|
||||||
border-right-width: 1px;
|
border-right-width: 1px;
|
||||||
border-right-color: #BBBBBB;
|
border-right-color: #BBBBBB;
|
||||||
border-right-style: solid;
|
border-right-style: solid;
|
||||||
|
|
||||||
border-bottom-width: 1px;
|
border-bottom-width: 1px;
|
||||||
border-bottom-color: #BBBBBB;
|
border-bottom-color: #BBBBBB;
|
||||||
border-bottom-style: solid;
|
border-bottom-style: solid;
|
||||||
|
|
||||||
margin-bottom: 2px;
|
margin-bottom: 2px;
|
||||||
margin-top: 0px;
|
margin-top: 0px;
|
||||||
|
|
||||||
-moz-box-shadow: 4px 4px 4px #CCC;
|
-moz-box-shadow: 4px 4px 4px #CCC;
|
||||||
-webkit-box-shadow: 4px 4px 4px #CCC;
|
-webkit-box-shadow: 4px 4px 4px #CCC;
|
||||||
box-shadow: 4px 4px 4px #CCC;
|
box-shadow: 4px 4px 4px #CCC;
|
||||||
}
|
}
|
||||||
table.liste td {
|
table.liste td {
|
||||||
padding-right: 2px;
|
padding-right: 2px;
|
||||||
}
|
}
|
||||||
|
|
||||||
tr.liste_titre {
|
tr.liste_titre
|
||||||
height: 20px !important;
|
|
||||||
background: #7699A9;
|
|
||||||
background-image: url(<?php echo $img_liste_titre ?>);
|
|
||||||
background-repeat: repeat-x;
|
|
||||||
color: #334444;
|
|
||||||
font-family: <?php print $fontlist ?>;
|
|
||||||
border-bottom: 1px solid #FDFFFF;
|
|
||||||
white-space: nowrap;
|
|
||||||
}
|
|
||||||
td.liste_titre {
|
|
||||||
background: #7699A9;
|
|
||||||
background-image: url(<?php echo $img_liste_titre ?>);
|
|
||||||
background-repeat: repeat-x;
|
|
||||||
color: #334444;
|
|
||||||
font-family: <?php print $fontlist ?>;
|
|
||||||
font-weight: normal;
|
|
||||||
border-bottom: 1px solid #FDFFFF;
|
|
||||||
white-space: nowrap;
|
|
||||||
}
|
|
||||||
td.liste_titre_sel
|
|
||||||
{
|
{
|
||||||
background: #7699A9;
|
height: 20px !important;
|
||||||
background-image: url(<?php echo $img_liste_titre ?>);
|
background: #7699A9;
|
||||||
background-repeat: repeat-x;
|
background-image: url(<?php echo $img_liste_titre ?>);
|
||||||
color: #F5FFFF;
|
background-repeat: repeat-x;
|
||||||
font-family: <?php print $fontlist ?>;
|
color: #334444;
|
||||||
font-weight: normal;
|
font-family: <?php print $fontlist ?>;
|
||||||
border-bottom: 1px solid #FDFFFF;
|
border-bottom: 1px solid #FDFFFF;
|
||||||
white-space: nowrap;
|
white-space: nowrap;
|
||||||
|
}
|
||||||
|
th.liste_titre, td.liste_titre
|
||||||
|
{
|
||||||
|
background: #7699A9;
|
||||||
|
background-image: url(<?php echo $img_liste_titre ?>);
|
||||||
|
background-repeat: repeat-x;
|
||||||
|
color: #334444;
|
||||||
|
font-family: <?php print $fontlist ?>;
|
||||||
|
font-weight: normal;
|
||||||
|
border-bottom: 1px solid #FDFFFF;
|
||||||
|
white-space: nowrap;
|
||||||
|
}
|
||||||
|
th.liste_titre_sel, td.liste_titre_sel
|
||||||
|
{
|
||||||
|
background: #7699A9;
|
||||||
|
background-image: url(<?php echo $img_liste_titre ?>);
|
||||||
|
background-repeat: repeat-x;
|
||||||
|
color: #F5FFFF;
|
||||||
|
font-family: <?php print $fontlist ?>;
|
||||||
|
font-weight: normal;
|
||||||
|
border-bottom: 1px solid #FDFFFF;
|
||||||
|
white-space: nowrap;
|
||||||
}
|
}
|
||||||
input.liste_titre {
|
input.liste_titre {
|
||||||
background: #7699A9;
|
background: #7699A9;
|
||||||
@ -1292,18 +1294,6 @@ font-weight: normal;
|
|||||||
white-space: nowrap;
|
white-space: nowrap;
|
||||||
}
|
}
|
||||||
|
|
||||||
th {
|
|
||||||
/* background: #7699A9; */
|
|
||||||
background: #91ABB3;
|
|
||||||
color: #334444;
|
|
||||||
font-family: <?php print $fontlist ?>;
|
|
||||||
font-weight: bold;
|
|
||||||
border-left: 1px solid #FFFFFF;
|
|
||||||
border-right: 1px solid #FFFFFF;
|
|
||||||
border-top: 1px solid #FFFFFF;
|
|
||||||
border-bottom: 1px solid #FFFFFF;
|
|
||||||
white-space: nowrap;
|
|
||||||
}
|
|
||||||
|
|
||||||
.impair {
|
.impair {
|
||||||
/* background: #d0d4d7; */
|
/* background: #d0d4d7; */
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user