diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php
index b810ab242b6..48ad9783367 100644
--- a/htdocs/comm/propal/list.php
+++ b/htdocs/comm/propal/list.php
@@ -176,8 +176,8 @@ $arrayfields = array(
'pr.ref'=>array('label'=>"ProjectRef", 'checked'=>1, 'enabled'=>(empty($conf->projet->enabled) ? 0 : 1)),
'pr.title'=>array('label'=>"ProjectLabel", 'checked'=>0, 'enabled'=>(empty($conf->projet->enabled) ? 0 : 1)),
's.nom'=>array('label'=>"ThirdParty", 'checked'=>1),
- 's.name_alias'=>array('label'=>"AliasNameShort", 'checked'=>1),
- 's.town'=>array('label'=>"Town", 'checked'=>1),
+ 's.name_alias'=>array('label'=>"AliasNameShort", 'checked'=>-1),
+ 's.town'=>array('label'=>"Town", 'checked'=>-1),
's.zip'=>array('label'=>"Zip", 'checked'=>1),
'state.nom'=>array('label'=>"StateShort", 'checked'=>0),
'country.code_iso'=>array('label'=>"Country", 'checked'=>0),
@@ -203,7 +203,7 @@ $arrayfields = array(
'p.multicurrency_total_ht_invoiced'=>array('label'=>'MulticurrencyAmountInvoicedHT', 'checked'=>0, 'enabled'=>!empty($conf->multicurrency->enabled) && !empty($conf->global->PROPOSAL_SHOW_INVOICED_AMOUNT)),
'p.multicurrency_total_invoiced'=>array('label'=>'MulticurrencyAmountInvoicedTTC', 'checked'=>0, 'enabled'=>!empty($conf->multicurrency->enabled) && !empty($conf->global->PROPOSAL_SHOW_INVOICED_AMOUNT)),
'u.login'=>array('label'=>"Author", 'checked'=>1, 'position'=>10),
- 'sale_representative'=>array('label'=>"SaleRepresentativesOfThirdParty", 'checked'=>1),
+ 'sale_representative'=>array('label'=>"SaleRepresentativesOfThirdParty", 'checked'=>-1),
'p.datec'=>array('label'=>"DateCreation", 'checked'=>0, 'position'=>500),
'p.tms'=>array('label'=>"DateModificationShort", 'checked'=>0, 'position'=>500),
'p.date_cloture'=>array('label'=>"DateClosing", 'checked'=>0, 'position'=>500),
@@ -560,7 +560,7 @@ if ($search_societe_alias) {
$sql .= natural_search('s.name_alias', $search_societe_alias);
}
if ($search_login) {
- $sql .= natural_search("u.login", $search_login);
+ $sql .= natural_search(array("u.login", "u.firstname", "u.lastname"), $search_login);
}
if ($search_montant_ht != '') {
$sql .= natural_search("p.total_ht", $search_montant_ht, 1);
@@ -616,7 +616,7 @@ if ($search_product_category > 0) {
$sql .= " AND cp.fk_categorie = ".$db->escape($search_product_category);
}
if ($socid > 0) {
- $sql .= ' AND s.rowid = '.$socid;
+ $sql .= ' AND s.rowid = '.((int) $socid);
}
if ($search_status != '' && $search_status != '-1') {
$sql .= ' AND p.fk_statut IN ('.$db->sanitize($search_status).')';
@@ -640,10 +640,10 @@ if ($search_datedelivery_end) {
$sql .= " AND p.date_livraison <= '".$db->idate($search_datedelivery_end)."'";
}
if ($search_sale > 0) {
- $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$db->escape($search_sale);
+ $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $search_sale);
}
if ($search_user > 0) {
- $sql .= " AND c.fk_c_type_contact = tc.rowid AND tc.element='propal' AND tc.source='internal' AND c.element_id = p.rowid AND c.fk_socpeople = ".$db->escape($search_user);
+ $sql .= " AND c.fk_c_type_contact = tc.rowid AND tc.element='propal' AND tc.source='internal' AND c.element_id = p.rowid AND c.fk_socpeople = ".((int) $search_user);
}
// Add where from extra fields
include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
@@ -907,14 +907,14 @@ if ($resql) {
$moreforfilter .= '';
$tmptitle = $langs->trans('IncludingProductWithTag');
$cate_arbo = $form->select_all_categories(Categorie::TYPE_PRODUCT, null, 'parent', null, null, 1);
- $moreforfilter .= img_picto($tmptitle, 'category', 'class="pictofixedwidth"').$form->selectarray('search_product_category', $cate_arbo, $search_product_category, $tmptitle, 0, 0, '', 0, 0, 0, 0, 'maxwidth300', 1);
+ $moreforfilter .= img_picto($tmptitle, 'category', 'class="pictofixedwidth"').$form->selectarray('search_product_category', $cate_arbo, $search_product_category, $tmptitle, 0, 0, '', 0, 0, 0, 0, (empty($conf->dol_optimize_smallscreen) ? 'maxwidth300' : 'maxwidth250'), 1);
$moreforfilter .= '
';
}
if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire) {
require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
$moreforfilter .= '';
$tmptitle = $langs->trans('CustomersProspectsCategoriesShort');
- $moreforfilter .= img_picto($tmptitle, 'category', 'class="pictofixedwidth"').$formother->select_categories('customer', $search_categ_cus, 'search_categ_cus', 1, $tmptitle);
+ $moreforfilter .= img_picto($tmptitle, 'category', 'class="pictofixedwidth"').$formother->select_categories('customer', $search_categ_cus, 'search_categ_cus', 1, $tmptitle, (empty($conf->dol_optimize_smallscreen) ? 'maxwidth300' : 'maxwidth250'));
$moreforfilter .= '
';
}
if (!empty($conf->stock->enabled) && !empty($conf->global->WAREHOUSE_ASK_WAREHOUSE_DURING_PROPAL)) {
@@ -1715,7 +1715,7 @@ if ($resql) {
// Author
if (!empty($arrayfields['u.login']['checked'])) {
- print '';
+ print ' | ';
if ($userstatic->id) {
print $userstatic->getNomUrl(-1);
}
@@ -1727,7 +1727,7 @@ if ($resql) {
if (!empty($arrayfields['sale_representative']['checked'])) {
// Sales representatives
- print ' | ';
+ print ' | ';
if ($obj->socid > 0) {
$listsalesrepresentatives = $companystatic->getSalesRepresentatives($user);
if ($listsalesrepresentatives < 0) {
diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index 3485011c1e6..f42b7c08de9 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -588,7 +588,7 @@ if ($search_multicurrency_montant_ttc != '') {
$sql .= natural_search('c.multicurrency_total_ttc', $search_multicurrency_montant_ttc, 1);
}
if ($search_login) {
- $sql .= natural_search("u.login", $search_login);
+ $sql .= natural_search(array("u.login", "u.firstname", "u.lastname"), $search_login);
}
if ($search_project_ref != '') {
$sql .= natural_search("p.ref", $search_project_ref);
@@ -1490,7 +1490,7 @@ if ($resql) {
$totalarray['nbfield']++;
}
}
- // Town
+ // Alias name
if (!empty($arrayfields['s.name_alias']['checked'])) {
print ' | ';
print $obj->alias;
@@ -1565,7 +1565,7 @@ if ($resql) {
$totalarray['nbfield']++;
}
}
- //Shipping Method
+ // Shipping Method
if (!empty($arrayfields['c.fk_shipping_method']['checked'])) {
print ' | ';
$form->formSelectShippingMethod('', $obj->fk_shipping_method, 'none', 1);
@@ -1690,7 +1690,7 @@ if ($resql) {
// Author
if (!empty($arrayfields['u.login']['checked'])) {
- print ' | ';
+ print ' | ';
if ($userstatic->id) {
print $userstatic->getNomUrl(-1);
} else {
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index 549862c53cc..bb25da4e604 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -301,7 +301,7 @@ class Facture extends CommonInvoice
'fk_soc' =>array('type'=>'integer:Societe:societe/class/societe.class.php', 'label'=>'ThirdParty', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>50),
'datef' =>array('type'=>'date', 'label'=>'DateInvoice', 'enabled'=>1, 'visible'=>1, 'position'=>20),
'date_valid' =>array('type'=>'date', 'label'=>'DateValidation', 'enabled'=>1, 'visible'=>-1, 'position'=>22),
- 'date_lim_reglement' =>array('type'=>'date', 'label'=>'DateDue', 'enabled'=>1, 'visible'=>-1, 'position'=>25),
+ 'date_lim_reglement' =>array('type'=>'date', 'label'=>'DateDue', 'enabled'=>1, 'visible'=>1, 'position'=>25),
'date_closing' =>array('type'=>'datetime', 'label'=>'Date closing', 'enabled'=>1, 'visible'=>-1, 'position'=>30),
'paye' =>array('type'=>'smallint(6)', 'label'=>'InvoicePaidCompletely', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>80),
//'amount' =>array('type'=>'double(24,8)', 'label'=>'Amount', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>85),
@@ -310,7 +310,7 @@ class Facture extends CommonInvoice
//'remise' =>array('type'=>'double', 'label'=>'Remise', 'enabled'=>1, 'visible'=>-1, 'position'=>100),
'close_code' =>array('type'=>'varchar(16)', 'label'=>'EarlyClosingReason', 'enabled'=>1, 'visible'=>-1, 'position'=>92),
'close_note' =>array('type'=>'varchar(128)', 'label'=>'EarlyClosingComment', 'enabled'=>1, 'visible'=>-1, 'position'=>93),
- 'total_ht' =>array('type'=>'double(24,8)', 'label'=>'AmountHT', 'enabled'=>1, 'visible'=>-1, 'position'=>95, 'isameasure'=>1),
+ 'total_ht' =>array('type'=>'double(24,8)', 'label'=>'AmountHT', 'enabled'=>1, 'visible'=>1, 'position'=>95, 'isameasure'=>1),
'total_tva' =>array('type'=>'double(24,8)', 'label'=>'AmountVAT', 'enabled'=>1, 'visible'=>-1, 'position'=>100, 'isameasure'=>1),
'localtax1' =>array('type'=>'double(24,8)', 'label'=>'LT1', 'enabled'=>1, 'visible'=>-1, 'position'=>110, 'isameasure'=>1),
'localtax2' =>array('type'=>'double(24,8)', 'label'=>'LT2', 'enabled'=>1, 'visible'=>-1, 'position'=>120, 'isameasure'=>1),
diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index 7c9b71e458b..282aad95d89 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -632,7 +632,7 @@ if ($search_multicurrency_montant_ttc != '') {
$sql .= natural_search('f.multicurrency_total_ttc', $search_multicurrency_montant_ttc, 1);
}
if ($search_login) {
- $sql .= natural_search('u.login', $search_login);
+ $sql .= natural_search(array('u.login', 'u.firstname', 'u.lastname'), $search_login);
}
if ($search_categ_cus > 0) {
$sql .= " AND cc.fk_categorie = ".$db->escape($search_categ_cus);
@@ -1900,7 +1900,7 @@ if ($resql) {
// Author
if (!empty($arrayfields['u.login']['checked'])) {
- print ' | ';
+ print ' | ';
if ($userstatic->id) {
print $userstatic->getNomUrl(-1);
} else {
diff --git a/htdocs/contrat/list.php b/htdocs/contrat/list.php
index 51b61c41830..e44c0411bea 100644
--- a/htdocs/contrat/list.php
+++ b/htdocs/contrat/list.php
@@ -133,10 +133,10 @@ $arrayfields = array(
's.nom'=>array('label'=>$langs->trans("ThirdParty"), 'checked'=>1, 'position'=>30),
's.email'=>array('label'=>$langs->trans("ThirdPartyEmail"), 'checked'=>0, 'position'=>30),
's.town'=>array('label'=>$langs->trans("Town"), 'checked'=>0, 'position'=>31),
- 's.zip'=>array('label'=>$langs->trans("Zip"), 'checked'=>0, 'position'=>32),
+ 's.zip'=>array('label'=>$langs->trans("Zip"), 'checked'=>1, 'position'=>32),
'state.nom'=>array('label'=>$langs->trans("StateShort"), 'checked'=>0, 'position'=>33),
'country.code_iso'=>array('label'=>$langs->trans("Country"), 'checked'=>0, 'position'=>34),
- 'sale_representative'=>array('label'=>$langs->trans("SaleRepresentativesOfThirdParty"), 'checked'=>1, 'position'=>80),
+ 'sale_representative'=>array('label'=>$langs->trans("SaleRepresentativesOfThirdParty"), 'checked'=>-1, 'position'=>80),
'c.date_contrat'=>array('label'=>$langs->trans("DateContract"), 'checked'=>1, 'position'=>45),
'c.datec'=>array('label'=>$langs->trans("DateCreation"), 'checked'=>0, 'position'=>500),
'c.tms'=>array('label'=>$langs->trans("DateModificationShort"), 'checked'=>0, 'position'=>500),
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index 981374996cf..b8e63ea8f19 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -2558,11 +2558,13 @@ class User extends CommonObject
/**
* Return clickable link of login (eventualy with picto)
*
- * @param int $withpicto Include picto into link
- * @param string $option Sur quoi pointe le lien
- * @return string Chaine avec URL
+ * @param int $withpictoimg Include picto into link
+ * @param string $option On what the link point to ('leave', 'accountancy', 'nolink', )
+ * @param integer $notooltip 1=Disable tooltip on picto and name
+ * @param string $morecss Add more css on link
+ * @return string String with URL
*/
- public function getLoginUrl($withpicto = 0, $option = '')
+ public function getLoginUrl($withpictoimg = 0, $option = '', $notooltip = 0, $morecss = '')
{
global $langs, $user;
@@ -2587,11 +2589,23 @@ class User extends CommonObject
}
$result .= $linkstart;
- if ($withpicto) {
- $result .= img_object($langs->trans("ShowUser"), 'user', 'class="paddingright"');
+ if ($withpictoimg) {
+ $paddafterimage = '';
+ if (abs($withpictoimg) == 1) {
+ $paddafterimage = 'style="margin-'.($langs->trans("DIRECTION") == 'rtl' ? 'left' : 'right').': 3px;"';
+ }
+ // Only picto
+ if ($withpictoimg > 0) {
+ $picto = ''.img_object('', 'user', $paddafterimage.' '.($notooltip ? '' : 'class="paddingright classfortooltip"'), 0, 0, $notooltip ? 0 : 1).'';
+ } else {
+ // Picto must be a photo
+ $picto = ''.Form::showphoto('userphoto', $this, 0, 0, 0, 'userphoto'.($withpictoimg == -3 ? 'small' : ''), 'mini', 0, 1).'';
+ }
+ $result .= $picto;
}
$result .= $this->login;
$result .= $linkend;
+
return $result;
}
|