\n";
}
+
// List of products or services (type is type of category)
if ($object->type == Categorie::TYPE_PRODUCT)
{
@@ -339,7 +340,7 @@ if ($object->type == Categorie::TYPE_PRODUCT)
$var=!$var;
print "\t
';
diff --git a/htdocs/compta/paiement.php b/htdocs/compta/paiement.php
index 393070d410b..655bed80031 100644
--- a/htdocs/compta/paiement.php
+++ b/htdocs/compta/paiement.php
@@ -673,7 +673,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
if (! GETPOST('action'))
{
if ($page == -1) $page = 0 ;
- $limit = $conf->liste_limit;
+ $limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
$offset = $limit * $page ;
if (! $sortorder) $sortorder='DESC';
diff --git a/htdocs/compta/paiement/avalider.php b/htdocs/compta/paiement/avalider.php
index 6a891b72bda..02201093830 100644
--- a/htdocs/compta/paiement/avalider.php
+++ b/htdocs/compta/paiement/avalider.php
@@ -53,7 +53,7 @@ $pageprev = $page - 1;
$pagenext = $page + 1;
if (! $sortorder) $sortorder="DESC";
if (! $sortfield) $sortfield="p.rowid";
-$limit = $conf->liste_limit;
+$limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
$sql = "SELECT p.rowid, p.datep as dp, p.amount, p.statut";
$sql.=", c.libelle as paiement_type, p.num_paiement";
diff --git a/htdocs/compta/paiement/cheque/card.php b/htdocs/compta/paiement/cheque/card.php
index 163f242b76d..e93ff737440 100644
--- a/htdocs/compta/paiement/cheque/card.php
+++ b/htdocs/compta/paiement/cheque/card.php
@@ -54,7 +54,7 @@ $page=GETPOST('page', 'int');
if (! $sortorder) $sortorder="ASC";
if (! $sortfield) $sortfield="b.dateo,b.rowid";
if ($page < 0) { $page = 0 ; }
-$limit = $conf->liste_limit;
+$limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
$offset = $limit * $page ;
$dir=$conf->banque->dir_output.'/bordereau/';
diff --git a/htdocs/compta/paiement/cheque/list.php b/htdocs/compta/paiement/cheque/list.php
index f4451178e71..5324a9f81db 100644
--- a/htdocs/compta/paiement/cheque/list.php
+++ b/htdocs/compta/paiement/cheque/list.php
@@ -43,7 +43,7 @@ $search_account = GETPOST('search_account','int');
$search_amount = GETPOST('search_amount','alpha');
$sortfield = GETPOST("sortfield",'alpha');
$sortorder = GETPOST("sortorder",'alpha');
-$limit = $conf->liste_limit;
+$limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
$page = GETPOST("page",'int');
if ($page == -1) { $page = 0; }
$offset = $limit * $page;
diff --git a/htdocs/compta/paiement/class/paiement.class.php b/htdocs/compta/paiement/class/paiement.class.php
index 35d0f838ff9..7e94a1f5448 100644
--- a/htdocs/compta/paiement/class/paiement.class.php
+++ b/htdocs/compta/paiement/class/paiement.class.php
@@ -29,8 +29,8 @@
require_once DOL_DOCUMENT_ROOT .'/core/class/commonobject.class.php';
-/** \class Paiement
- * \brief Classe permettant la gestion des paiements des factures clients
+/**
+ * Class to manage payments of customer invoices
*/
class Paiement extends CommonObject
{
@@ -78,7 +78,7 @@ class Paiement extends CommonObject
* @param int $id Id of payment to get
* @param string $ref Ref of payment to get (currently ref = id but this may change in future)
* @param int $fk_bank Id of bank line associated to payment
- * @return int <0 if KO, 0 if not found, >0 if OK
+ * @return int <0 if KO, 0 if not found, >0 if OK
*/
function fetch($id, $ref='', $fk_bank='')
{
@@ -96,14 +96,12 @@ class Paiement extends CommonObject
else if ($fk_bank)
$sql.= ' AND p.fk_bank = '.$fk_bank;
- dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
- $result = $this->db->query($sql);
-
- if ($result)
+ $resql = $this->db->query($sql);
+ if ($resql)
{
- if ($this->db->num_rows($result))
+ if ($this->db->num_rows($resql))
{
- $obj = $this->db->fetch_object($result);
+ $obj = $this->db->fetch_object($resql);
$this->id = $obj->rowid;
$this->ref = $obj->ref;
$this->date = $this->db->jdate($obj->dp);
@@ -120,12 +118,12 @@ class Paiement extends CommonObject
$this->fk_account = $obj->fk_account;
$this->bank_line = $obj->fk_bank;
- $this->db->free($result);
+ $this->db->free($resql);
return 1;
}
else
{
- $this->db->free($result);
+ $this->db->free($resql);
return 0;
}
}
diff --git a/htdocs/compta/paiement/list.php b/htdocs/compta/paiement/list.php
index 0a5c2cd1572..3e70ac0c5bc 100644
--- a/htdocs/compta/paiement/list.php
+++ b/htdocs/compta/paiement/list.php
@@ -57,7 +57,7 @@ $search_amount=GETPOST("search_amount");
$search_company=GETPOST("search_company");
$sortfield = GETPOST("sortfield",'alpha');
$sortorder = GETPOST("sortorder",'alpha');
-$limit = $conf->liste_limit;
+$limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
$page = GETPOST("page",'int');
if ($page == -1) { $page = 0; }
$offset = $limit * $page;
diff --git a/htdocs/compta/salaries/index.php b/htdocs/compta/salaries/index.php
index ddff5dad895..f3312761141 100644
--- a/htdocs/compta/salaries/index.php
+++ b/htdocs/compta/salaries/index.php
@@ -46,7 +46,7 @@ if ($page == -1) { $page = 0; }
$offset = $conf->liste_limit * $page;
$pageprev = $page - 1;
$pagenext = $page + 1;
-$limit = $conf->liste_limit;
+$limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
if (! $sortfield) $sortfield="s.datep";
if (! $sortorder) $sortorder="DESC";
$optioncss = GETPOST('optioncss','alpha');
diff --git a/htdocs/compta/sociales/index.php b/htdocs/compta/sociales/index.php
index 6df15c9ba8e..dec724c95d5 100644
--- a/htdocs/compta/sociales/index.php
+++ b/htdocs/compta/sociales/index.php
@@ -46,7 +46,7 @@ if ($page == -1) { $page = 0; }
$offset = $conf->liste_limit * $page;
$pageprev = $page - 1;
$pagenext = $page + 1;
-$limit = $conf->liste_limit;
+$limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
if (! $sortfield) $sortfield="cs.date_ech";
if (! $sortorder) $sortorder="DESC";
diff --git a/htdocs/compta/tva/reglement.php b/htdocs/compta/tva/reglement.php
index 4156bc977a3..b603101ad29 100644
--- a/htdocs/compta/tva/reglement.php
+++ b/htdocs/compta/tva/reglement.php
@@ -49,7 +49,7 @@ if ($page == -1) { $page = 0; }
$offset = $conf->liste_limit * $page;
$pageprev = $page - 1;
$pagenext = $page + 1;
-$limit = $conf->liste_limit;
+$limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
if (! $sortfield) $sortfield="t.datev";
if (! $sortorder) $sortorder="DESC";
diff --git a/htdocs/compta/ventilation/fournisseur/list.php b/htdocs/compta/ventilation/fournisseur/list.php
index 888f9152240..20ca396aa30 100644
--- a/htdocs/compta/ventilation/fournisseur/list.php
+++ b/htdocs/compta/ventilation/fournisseur/list.php
@@ -45,7 +45,7 @@ llxHeader('','Ventilation');
*/
$page = $_GET["page"];
if ($page < 0) $page = 0;
-$limit = $conf->liste_limit;
+$limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
$offset = $limit * $page ;
$sql = "SELECT f.facnumber, f.rowid as facid, l.fk_product, l.description, l.total_ttc as price, l.rowid, l.fk_code_ventilation ";
diff --git a/htdocs/compta/ventilation/list.php b/htdocs/compta/ventilation/list.php
index 264673049ad..fc022cade0d 100644
--- a/htdocs/compta/ventilation/list.php
+++ b/htdocs/compta/ventilation/list.php
@@ -47,7 +47,7 @@ llxHeader('','Ventilation');
$sortfield = GETPOST("sortfield",'alpha');
$sortorder = GETPOST("sortorder",'alpha');
-$limit = $conf->liste_limit;
+$limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
$page = GETPOST("page",'int');
if ($page == -1) { $page = 0; }
$offset = $limit * $page;
diff --git a/htdocs/contact/card.php b/htdocs/contact/card.php
index 1da57afc2f6..d762b134b1c 100644
--- a/htdocs/contact/card.php
+++ b/htdocs/contact/card.php
@@ -288,17 +288,16 @@ if (empty($reshook))
// Photo save
$dir = $conf->societe->dir_output."/contact/".$object->id."/photos";
$file_OK = is_uploaded_file($_FILES['photo']['tmp_name']);
+ if (GETPOST('deletephoto') && $object->photo)
+ {
+ $fileimg=$dir.'/'.$object->photo;
+ $dirthumbs=$dir.'/thumbs';
+ dol_delete_file($fileimg);
+ dol_delete_dir_recursive($dirthumbs);
+ $object->photo = '';
+ }
if ($file_OK)
{
- if (GETPOST('deletephoto'))
- {
- $fileimg=$dir.'/'.$object->photo;
- $dirthumbs=$dir.'/thumbs';
- dol_delete_file($fileimg);
- dol_delete_dir_recursive($dirthumbs);
- $object->photo = '';
- }
-
if (image_format_supported($_FILES['photo']['name']) > 0)
{
dol_mkdir($dir);
@@ -980,7 +979,7 @@ else
print " \n";
}
print '
';
- if ($object->photo) print '
'.$langs->trans("Delete").'
';
+ if ($object->photo) print '
'.$langs->trans("Delete").'
';
//print '
'.$langs->trans("PhotoFile").'
';
print '
';
print '
';
diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php
index ac7411b49c3..c916710e087 100644
--- a/htdocs/contact/list.php
+++ b/htdocs/contact/list.php
@@ -76,7 +76,7 @@ $begin=GETPOST('begin');
if (! $sortorder) $sortorder="ASC";
if (! $sortfield) $sortfield="p.lastname";
if ($page < 0) { $page = 0; }
-$limit = $conf->liste_limit;
+$limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
$offset = $limit * $page;
$langs->load("companies");
diff --git a/htdocs/contrat/list.php b/htdocs/contrat/list.php
index ef226d35908..22b619c599c 100644
--- a/htdocs/contrat/list.php
+++ b/htdocs/contrat/list.php
@@ -40,7 +40,7 @@ $sortfield=GETPOST('sortfield','alpha');
$sortorder=GETPOST('sortorder','alpha');
$page=GETPOST('page','int');
if ($page == -1) { $page = 0 ; }
-$limit = $conf->liste_limit;
+$limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
$offset = $limit * $page ;
$search_name=GETPOST('search_name');
diff --git a/htdocs/contrat/services.php b/htdocs/contrat/services.php
index 1ce7c91343e..c59c67fe91c 100644
--- a/htdocs/contrat/services.php
+++ b/htdocs/contrat/services.php
@@ -38,7 +38,7 @@ $sortfield = GETPOST("sortfield",'alpha');
$sortorder = GETPOST("sortorder",'alpha');
$page = GETPOST("page",'int');
if ($page == -1) { $page = 0 ; }
-$limit = $conf->liste_limit;
+$limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
$offset = $limit * $page ;
if (! $sortfield) $sortfield="c.rowid";
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 4b86fa378cd..bcdcdea6147 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -1718,13 +1718,13 @@ class Form
foreach ($scrit as $crit)
{
if ($i > 0) $sql.=" AND ";
- $sql.="(p.ref LIKE '".$prefix.$crit."%' OR p.label LIKE '".$prefix.$crit."%'";
- if (! empty($conf->global->MAIN_MULTILANGS)) $sql.=" OR pl.label LIKE '".$prefix.$crit."%'";
+ $sql.="(p.ref LIKE '".$db->escape($prefix.$crit)."%' OR p.label LIKE '".$db->escape($prefix.$crit)."%'";
+ if (! empty($conf->global->MAIN_MULTILANGS)) $sql.=" OR pl.label LIKE '".$db->escape($prefix.$crit)."%'";
$sql.=")";
$i++;
}
if (count($scrit) > 1) $sql.=")";
- if (! empty($conf->barcode->enabled)) $sql.= " OR p.barcode LIKE '".$prefix.$filterkey."%'";
+ if (! empty($conf->barcode->enabled)) $sql.= " OR p.barcode LIKE '".$db->escape($prefix.$filterkey)."%'";
$sql.=')';
}
$sql.= $db->order("p.ref");
@@ -2087,7 +2087,7 @@ class Form
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON pfp.fk_soc = s.rowid";
$sql.= " WHERE p.entity IN (".getEntity('product', 1).")";
$sql.= " AND p.tobuy = 1";
- if (strval($filtertype) != '') $sql.=" AND p.fk_product_type=".$filtertype;
+ if (strval($filtertype) != '') $sql.=" AND p.fk_product_type=".$this->db->escape($filtertype);
if (! empty($filtre)) $sql.=" ".$filtre;
// Add criteria on ref/label
if ($filterkey != '')
@@ -2101,11 +2101,11 @@ class Form
foreach ($scrit as $crit)
{
if ($i > 0) $sql.=" AND ";
- $sql.="(pfp.ref_fourn LIKE '".$prefix.$crit."%' OR p.ref LIKE '".$prefix.$crit."%' OR p.label LIKE '".$prefix.$crit."%')";
+ $sql.="(pfp.ref_fourn LIKE '".$this->db->escape($prefix.$crit)."%' OR p.ref LIKE '".$this->db->escape($prefix.$crit)."%' OR p.label LIKE '".$this->db->escape($prefix.$crit)."%')";
$i++;
}
if (count($scrit) > 1) $sql.=")";
- if (! empty($conf->barcode->enabled)) $sql.= " OR p.barcode LIKE '".$prefix.$filterkey."%'";
+ if (! empty($conf->barcode->enabled)) $sql.= " OR p.barcode LIKE '".$this->db->escape($prefix.$filterkey)."%'";
$sql.=')';
}
$sql.= " ORDER BY pfp.ref_fourn DESC, pfp.quantity ASC";
@@ -2619,7 +2619,7 @@ class Form
/**
* Charge dans cache la liste des types de paiements possibles
*
- * @return int Nb of lines loaded, <0 if KO
+ * @return int Nb of lines loaded, <0 if KO
*/
function load_cache_types_paiements()
{
@@ -2632,9 +2632,9 @@ class Form
$this->cache_types_paiements = array();
- $sql = "SELECT id, code, libelle as label, type";
+ $sql = "SELECT id, code, libelle as label, type, active";
$sql.= " FROM ".MAIN_DB_PREFIX."c_paiement";
- $sql.= " WHERE active > 0";
+ //if ($active >= 0) $sql.= " WHERE active = ".$active;
$resql = $this->db->query($sql);
if ($resql)
@@ -2651,6 +2651,7 @@ class Form
$this->cache_types_paiements[$obj->id]['code'] =$obj->code;
$this->cache_types_paiements[$obj->id]['label']=$label;
$this->cache_types_paiements[$obj->id]['type'] =$obj->type;
+ $this->cache_types_paiements[$obj->id]['active'] =$obj->active;
$i++;
}
@@ -2708,14 +2709,15 @@ class Form
*
* @param string $selected Id du mode de paiement pre-selectionne
* @param string $htmlname Nom de la zone select
- * @param string $filtertype To filter on field type in llx_c_paiement (array('code'=>xx,'label'=>zz))
+ * @param string $filtertype To filter on field type in llx_c_paiement ('CRDT' or 'DBIT' or array('code'=>xx,'label'=>zz))
* @param int $format 0=id+libelle, 1=code+code, 2=code+libelle, 3=id+code
* @param int $empty 1=peut etre vide, 0 sinon
* @param int $noadmininfo 0=Add admin info, 1=Disable admin info
* @param int $maxlength Max length of label
+ * @param int $active Active or not, -1 = all
* @return void
*/
- function select_types_paiements($selected='', $htmlname='paiementtype', $filtertype='', $format=0, $empty=0, $noadmininfo=0, $maxlength=0)
+ function select_types_paiements($selected='', $htmlname='paiementtype', $filtertype='', $format=0, $empty=0, $noadmininfo=0, $maxlength=0, $active=1)
{
global $langs,$user;
@@ -2732,6 +2734,9 @@ class Form
if ($empty) print '';
foreach($this->cache_types_paiements as $id => $arraytypes)
{
+ // If not good status
+ if ($active >= 0 && $arraytypes['active'] != $active) continue;
+
// On passe si on a demande de filtrer sur des modes de paiments particuliers
if (count($filterarray) && ! in_array($arraytypes['type'],$filterarray)) continue;
@@ -3685,9 +3690,10 @@ class Form
* @param int $selected Id mode pre-selectionne
* @param string $htmlname Name of select html field
* @param string $filtertype To filter on field type in llx_c_paiement (array('code'=>xx,'label'=>zz))
+ * @param int $active Active or not, -1 = all
* @return void
*/
- function form_modes_reglement($page, $selected='', $htmlname='mode_reglement_id', $filtertype='')
+ function form_modes_reglement($page, $selected='', $htmlname='mode_reglement_id', $filtertype='', $active=1)
{
global $langs;
if ($htmlname != "none")
@@ -3697,7 +3703,7 @@ class Form
print '';
print '
';
if ($object->element == 'societe' && ! empty($conf->use_javascript_ajax) && $user->rights->societe->creer && ! empty($conf->global->MAIN_DIRECT_STATUS_UPDATE)) {
@@ -3961,9 +3961,12 @@ function get_exdir($num,$level,$alpha,$withoutslash,$object,$modulepart)
else
{
// TODO
- // We will introduce here a common way of forging path for document storage
+ // We will enhance here a common way of forging path for document storage
// Here, object->id, object->ref and object->modulepart are required.
-
+ if (in_array($modulepart, array('thirdparty','contact')))
+ {
+ $path=$object->ref?$object->ref:$object->id;
+ }
}
if (empty($withoutslash) && ! empty($path)) $path.='/';
diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php
index aaa7738a9b1..62a92f4d5ac 100644
--- a/htdocs/core/lib/pdf.lib.php
+++ b/htdocs/core/lib/pdf.lib.php
@@ -1008,17 +1008,16 @@ function pdf_writeLinkedObjects(&$pdf,$object,$outputlangs,$posx,$posy,$w,$h,$al
{
foreach($linkedobjects as $linkedobject)
{
+ $reftoshow = $linkedobject["ref_title"].' : '.$linkedobject["ref_value"];
+ if (! empty($linkedobject["date_value"]))
+ {
+ $reftoshow .= ' / '.$linkedobject["date_value"];
+ }
+
$posy+=3;
$pdf->SetXY($posx,$posy);
$pdf->SetFont('','', $default_font_size - 2);
- $pdf->MultiCell($w, $h, $linkedobject["ref_title"].' : '.$linkedobject["ref_value"], '', $align);
-
- if (! empty($linkedobject["date_title"]) && ! empty($linkedobject["date_value"]))
- {
- $posy+=3;
- $pdf->SetXY($posx,$posy);
- $pdf->MultiCell($w, $h, $linkedobject["date_title"].' : '.$linkedobject["date_value"], '', $align);
- }
+ $pdf->MultiCell($w, $h, $reftoshow, '', $align);
}
}
@@ -1826,10 +1825,11 @@ function pdf_getTotalQty($object,$type,$outputlangs)
/**
* Return linked objects
+ * FIXME This function returns only one link per link type instead of all links. If we fix this, we must also fix function pdf_writeLinkedObjects
*
* @param object $object Object
* @param Translate $outputlangs Object lang for output
- * @return array Linked objects
+ * @return array Linked objects
*/
function pdf_getLinkedObjects($object,$outputlangs)
{
diff --git a/htdocs/core/lib/treeview.lib.php b/htdocs/core/lib/treeview.lib.php
index b3f3e16a3bd..e900931037e 100644
--- a/htdocs/core/lib/treeview.lib.php
+++ b/htdocs/core/lib/treeview.lib.php
@@ -98,6 +98,7 @@ function tree_showpad(&$fulltree,$key,$silent=0)
/**
* Recursive function to output menu tree.
...
+ * It is also used for the tree of categories.
* Note: To have this function working, check you have loaded the js and css for treeview.
* $arrayofjs=array('/includes/jquery/plugins/jquerytreeview/jquery.treeview.js',
* '/includes/jquery/plugins/jquerytreeview/lib/jquery.cookie.js');
@@ -132,7 +133,7 @@ function tree_recur($tab, $pere, $rang, $iddivjstree='iddivjstree')
print '
';
}
- if ($rang > 10) return; // Protection contre boucle infinie
+ if ($rang > 50) return; // Protect against infinite loop. Max 50 depth
//ballayage du tableau
$sizeoftab=count($tab);
diff --git a/htdocs/core/lib/usergroups.lib.php b/htdocs/core/lib/usergroups.lib.php
index c1d13b49429..ed95bdc4023 100644
--- a/htdocs/core/lib/usergroups.lib.php
+++ b/htdocs/core/lib/usergroups.lib.php
@@ -410,7 +410,7 @@ function show_theme($fuser,$edit=0,$foruserprofile=false)
else
{
$color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TOPMENU_BACK1,array()),'');
- if ($color) print '';
+ if ($color) print '';
else print '';
}
if ($edit) print ' ('.$langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis").')';
@@ -430,7 +430,7 @@ function show_theme($fuser,$edit=0,$foruserprofile=false)
else
{
$color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_BACKBODY,array()),'');
- if ($color) print '';
+ if ($color) print '';
else print $langs->trans("Default");
}
print ' ('.$langs->trans("Default").': ffffff, '.$langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis").')';
@@ -455,7 +455,7 @@ function show_theme($fuser,$edit=0,$foruserprofile=false)
else
{
$color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TOPMENU_BACK1,array()),'');
- if ($color) print '';
+ if ($color) print '';
else print '';
}
if ($edit) print ' ('.$langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis").')';
@@ -474,7 +474,7 @@ function show_theme($fuser,$edit=0,$foruserprofile=false)
else
{
$color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TOPMENU_BACK1,array()),'');
- if ($color) print '';
+ if ($color) print '';
else print $langs->trans("Default");
}
print ' ('.$langs->trans("Default").': 7882aa, '.$langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis").')';
@@ -567,7 +567,7 @@ function show_theme($fuser,$edit=0,$foruserprofile=false)
else $color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_USE_HOVER,array()),'');
if ($color)
{
- if ($color != 'edf4fb') print '';
+ if ($color != 'edf4fb') print '';
else print $langs->trans("Default");
}
else print $langs->trans("None");
@@ -595,7 +595,7 @@ function show_theme($fuser,$edit=0,$foruserprofile=false)
else
{
$color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TOPMENU_BACK1,array()),'');
- if ($color) print '';
+ if ($color) print '';
else print '';
}
if ($edit) print ' ('.$langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis").')';
@@ -614,7 +614,7 @@ function show_theme($fuser,$edit=0,$foruserprofile=false)
else
{
$color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TEXTLINK,array()),'');
- if ($color) print '';
+ if ($color) print '';
else print $langs->trans("Default");
}
print ' ('.$langs->trans("Default").': 000078, '.$langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis").')';
diff --git a/htdocs/core/modules/modSupplierProposal.class.php b/htdocs/core/modules/modSupplierProposal.class.php
index 98320a6f08b..692cf2aefab 100644
--- a/htdocs/core/modules/modSupplierProposal.class.php
+++ b/htdocs/core/modules/modSupplierProposal.class.php
@@ -142,7 +142,7 @@ class modSupplierProposal extends DolibarrModules
$this->menu[$r]=array(
'fk_menu'=>'fk_mainmenu=commercial', // Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
'type'=>'left', // This is a Left menu entry
- 'titre'=>'supplier_proposalMENU_LEFT_TITLE',
+ 'titre'=>'SupplierProposalShort',
'leftmenu'=>'supplier_proposalsubmenu',
'url'=>'/supplier_proposal/index.php',
'langs'=>'supplier_proposal', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
@@ -156,7 +156,7 @@ class modSupplierProposal extends DolibarrModules
$this->menu[$r]=array(
'fk_menu'=>'fk_mainmenu=commercial,fk_leftmenu=supplier_proposalsubmenu',
'type'=>'left',
- 'titre'=>'supplier_proposalMENU_LEFT_TITLE_NEW',
+ 'titre'=>'SupplierProposalNew',
'url'=>'/supplier_proposal/card.php?action=create',
'langs'=>'supplier_proposal',
'enabled'=>'$conf->supplier_proposal->enabled',
@@ -169,7 +169,7 @@ class modSupplierProposal extends DolibarrModules
$this->menu[$r]=array(
'fk_menu'=>'fk_mainmenu=commercial,fk_leftmenu=supplier_proposalsubmenu',
'type'=>'left',
- 'titre'=>'supplier_proposalMENU_LEFT_TITLE_LIST',
+ 'titre'=>'List',
'url'=>'/supplier_proposal/list.php',
'langs'=>'supplier_proposal',
'enabled'=>'$conf->supplier_proposal->enabled',
diff --git a/htdocs/core/tpl/passwordforgotten.tpl.php b/htdocs/core/tpl/passwordforgotten.tpl.php
index 2b201ae2f68..f6a076660d8 100644
--- a/htdocs/core/tpl/passwordforgotten.tpl.php
+++ b/htdocs/core/tpl/passwordforgotten.tpl.php
@@ -28,7 +28,7 @@ if (GETPOST('dol_use_jmobile')) $conf->dol_use_jmobile=1;
// If we force to use jmobile, then we reenable javascript
if (! empty($conf->dol_use_jmobile)) $conf->use_javascript_ajax=1;
-print top_htmlhead('',$langs->trans('Login').' '.$title);
+print top_htmlhead('',$langs->trans('SendNewPassword'));
?>
@@ -48,7 +48,7 @@ $(document).ready(function () {