'.$langs->trans('Discount').' ';
if ($object->thirdparty->remise_percent) print $langs->trans("CompanyHasRelativeDiscount",$object->thirdparty->remise_percent);
@@ -225,7 +225,7 @@ if ($id > 0 || ! empty($ref))
print '';
dol_fiche_end();
-
+
print ''.$langs->trans("BackToList").' ';
+ $linkback = ''.$langs->trans("BackToList").' ';
$morehtmlref='';
@@ -170,7 +170,7 @@ if ($object->id)
print '';
print '
';
-
+
print '
';
print ''.$langs->trans("NbOfAttachedFiles").' '.count($filearray).' '.$langs->trans("TotalSizeOfAttachedFiles").' '.$totalsize.' '.$langs->trans("bytes").' '.$langs->trans("BackToList").' ';
+$linkback = ''.$langs->trans("BackToList").' ';
$morehtmlref='';
diff --git a/htdocs/contrat/list.php b/htdocs/contrat/list.php
index 64f2b6b94f2..36b59309298 100644
--- a/htdocs/contrat/list.php
+++ b/htdocs/contrat/list.php
@@ -323,16 +323,17 @@ if ($resql)
}
$param='';
- if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
+ if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.urlencode($contextpage);
if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
- if ($sall != '') $param.='&sall='.$sall;
- if ($search_contract != '') $param.='&search_contract='.$search_contract;
- if ($search_name != '') $param.='&search_name='.$search_name;
- if ($search_email != '') $param.='&search_email='.$search_email;
- if ($search_ref_supplier != '') $param.='&search_ref_supplier='.$search_ref_supplier;
- if ($search_sale != '') $param.='&search_sale=' .$search_sale;
- if ($show_files) $param.='&show_files=' .$show_files;
- if ($optioncss != '') $param.='&optioncss='.$optioncss;
+ if ($sall != '') $param.='&sall='.urlencode($sall);
+ if ($search_contract != '') $param.='&search_contract='.urlencode($search_contract);
+ if ($search_name != '') $param.='&search_name='.urlencode($search_name);
+ if ($search_email != '') $param.='&search_email='.urlencode($search_email);
+ if ($search_ref_customer != '') $param.='&search_ref_customer='.urlencode($search_ref_customer);
+ if ($search_ref_supplier != '') $param.='&search_ref_supplier='.urlencode($search_ref_supplier);
+ if ($search_sale != '') $param.='&search_sale=' .urlencode($search_sale);
+ if ($show_files) $param.='&show_files=' .urlencode($show_files);
+ if ($optioncss != '') $param.='&optioncss='.urlencode($optioncss);
// Add $param from extra fields
foreach ($search_array_options as $key => $val)
{
@@ -600,6 +601,11 @@ if ($resql)
$contracttmp->ref_customer=$obj->ref_customer;
$contracttmp->ref_supplier=$obj->ref_supplier;
+ if ($obj->socid > 0)
+ {
+ $result=$socstatic->fetch($obj->socid);
+ }
+
print '';
if (! empty($arrayfields['c.ref']['checked']))
{
@@ -631,7 +637,13 @@ if ($resql)
}
if (! empty($arrayfields['s.nom']['checked']))
{
- print ''.img_object($langs->trans("ShowCompany"),"company").' '.$obj->name.' ';
+ //print ''.img_object($langs->trans("ShowCompany"),"company").' '.$obj->name.' ';
+ if ($obj->socid > 0)
+ {
+ print $socstatic->getNomUrl(1, '');
+ }
+ print ' ';
}
if (! empty($arrayfields['s.email']['checked']))
{
@@ -683,7 +695,6 @@ if ($resql)
print '';
if ($obj->socid > 0)
{
- $result=$socstatic->fetch($obj->socid);
$listsalesrepresentatives=$socstatic->getSalesRepresentatives($user);
if ($listsalesrepresentatives < 0) dol_print_error($db);
$nbofsalesrepresentative=count($listsalesrepresentatives);
diff --git a/htdocs/contrat/note.php b/htdocs/contrat/note.php
index 7d4927d19b8..ff0df34de67 100644
--- a/htdocs/contrat/note.php
+++ b/htdocs/contrat/note.php
@@ -74,7 +74,7 @@ if ($id > 0 || ! empty($ref))
// Contract card
- $linkback = ''.$langs->trans("BackToList").' ';
+ $linkback = ''.$langs->trans("BackToList").' ';
$morehtmlref='';
@@ -139,7 +139,7 @@ if ($id > 0 || ! empty($ref))
print '';
-
+
// Ligne info remises tiers
print ''.$langs->trans('Discount').' ';
if ($object->thirdparty->remise_percent) print $langs->trans("CompanyHasRelativeDiscount",$object->thirdparty->remise_percent);
@@ -161,9 +161,9 @@ if ($id > 0 || ! empty($ref))
print '
";
-
+
print '';
-
+
//print '';
-
+
// Add font-awesome
if ($val['level'] == 0 && $val['mainmenu'] == 'home') print ' '."\n";
-
+
// Search submenu fot this mainmenu entry
$tmpmainmenu=$val['mainmenu'];
$tmpleftmenu='all';
@@ -183,7 +183,7 @@ class MenuManager
//var_dump($canonnexturl);
print ''."\n";
if (($canonrelurl != $canonnexturl && ! in_array($val['mainmenu'],array('tools')))
- || (strpos($canonrelurl,'/product/index.php') !== false || strpos($canonrelurl,'/compta/bank/index.php') !== false))
+ || (strpos($canonrelurl,'/product/index.php') !== false || strpos($canonrelurl,'/compta/bank/list.php') !== false))
{
// We add sub entry
print str_pad('',1).''; // ui-btn to highlight on clic
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index 013b6ea74ae..f79ac461828 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -201,7 +201,7 @@ function print_eldy_menu($db,$atarget,$type_user,&$tabMenu,&$menu,$noout=0,$mode
else $classname = 'class="tmenu"';
$idsel='bank';
- $menu->add('/compta/bank/index.php?mainmenu=bank&leftmenu=', $langs->trans("MenuBankCash"), 0, $showmode, $atarget, "bank", '', 60, $id, $idsel, $classname);
+ $menu->add('/compta/bank/list.php?mainmenu=bank&leftmenu=', $langs->trans("MenuBankCash"), 0, $showmode, $atarget, "bank", '', 60, $id, $idsel, $classname);
}
// Projects
@@ -977,7 +977,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_admin/',$leftmenu)) $newmenu->add("/accountancy/admin/defaultaccounts.php?mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("MenuDefaultAccounts"),2, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_default', 50);
if (! empty($conf->banque->enabled))
{
- if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_admin/',$leftmenu)) $newmenu->add("/compta/bank/index.php?mainmenu=accountancy&leftmenu=accountancy_admin&search_status=-1", $langs->trans("MenuBankAccounts"),2, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_bank', 51);
+ if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_admin/',$leftmenu)) $newmenu->add("/compta/bank/list.php?mainmenu=accountancy&leftmenu=accountancy_admin&search_status=-1", $langs->trans("MenuBankAccounts"),2, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_bank', 51);
}
if (! empty($conf->facture->enabled) || ! empty($conf->fournisseur->enabled))
{
@@ -1146,11 +1146,11 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
// Bank-Caisse
if (! empty($conf->banque->enabled))
{
- $newmenu->add("/compta/bank/index.php?leftmenu=bank&mainmenu=bank",$langs->trans("MenuBankCash"),0,$user->rights->banque->lire, '', $mainmenu, 'bank');
+ $newmenu->add("/compta/bank/list.php?leftmenu=bank&mainmenu=bank",$langs->trans("MenuBankCash"),0,$user->rights->banque->lire, '', $mainmenu, 'bank');
$newmenu->add("/compta/bank/card.php?action=create",$langs->trans("MenuNewFinancialAccount"),1,$user->rights->banque->configurer);
- $newmenu->add("/compta/bank/index.php?leftmenu=bank&mainmenu=bank",$langs->trans("List"),1,$user->rights->banque->lire, '', $mainmenu, 'bank');
- $newmenu->add("/compta/bank/bankentries.php",$langs->trans("ListTransactions"),1,$user->rights->banque->lire);
+ $newmenu->add("/compta/bank/list.php?leftmenu=bank&mainmenu=bank",$langs->trans("List"),1,$user->rights->banque->lire, '', $mainmenu, 'bank');
+ $newmenu->add("/compta/bank/bankentries_list.php",$langs->trans("ListTransactions"),1,$user->rights->banque->lire);
$newmenu->add("/compta/bank/budget.php",$langs->trans("ListTransactionsByCategory"),1,$user->rights->banque->lire);
$newmenu->add("/compta/bank/transfer.php",$langs->trans("MenuBankInternalTransfer"),1,$user->rights->banque->transfer);
@@ -1498,7 +1498,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
$numr = $db->num_rows($resql);
$i = 0;
- if ($numr > 0) $newmenu->add('/compta/bank/index.php',$langs->trans("BankAccounts"),0,$user->rights->banque->lire);
+ if ($numr > 0) $newmenu->add('/compta/bank/list.php',$langs->trans("BankAccounts"),0,$user->rights->banque->lire);
while ($i < $numr)
{
@@ -1506,7 +1506,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
$newmenu->add('/compta/bank/card.php?id='.$objp->rowid,$objp->label,1,$user->rights->banque->lire);
if ($objp->rappro && $objp->courant != Account::TYPE_CASH && empty($objp->clos)) // If not cash account and not closed and can be reconciliate
{
- $newmenu->add('/compta/bank/bankentries.php?action=reconcile&contextpage=banktransactionlist-'.$objp->rowid.'&account='.$objp->rowid.'&id='.$objp->rowid.'&search_conciliated=0',$langs->trans("Conciliate"),2,$user->rights->banque->consolidate);
+ $newmenu->add('/compta/bank/bankentries_list.php?action=reconcile&contextpage=banktransactionlist-'.$objp->rowid.'&account='.$objp->rowid.'&id='.$objp->rowid.'&search_conciliated=0',$langs->trans("Conciliate"),2,$user->rights->banque->consolidate);
}
$i++;
}
diff --git a/htdocs/core/menus/standard/eldy_menu.php b/htdocs/core/menus/standard/eldy_menu.php
index d8f90cb912f..51442d54e51 100644
--- a/htdocs/core/menus/standard/eldy_menu.php
+++ b/htdocs/core/menus/standard/eldy_menu.php
@@ -177,7 +177,7 @@ class MenuManager
print $val['titre'];
print ''."\n";
-
+
// Search submenu fot this mainmenu entry
$tmpmainmenu=$val['mainmenu'];
$tmpleftmenu='all';
@@ -193,7 +193,7 @@ class MenuManager
//var_dump($canonnexturl);
print ''."\n";
if (($canonrelurl != $canonnexturl && ! in_array($val['mainmenu'],array('tools')))
- || (strpos($canonrelurl,'/product/index.php') !== false || strpos($canonrelurl,'/compta/bank/index.php') !== false))
+ || (strpos($canonrelurl,'/product/index.php') !== false || strpos($canonrelurl,'/compta/bank/list.php') !== false))
{
// We add sub entry
print str_pad('',1).''; // ui-btn to highlight on clic
diff --git a/htdocs/core/menus/standard/empty.php b/htdocs/core/menus/standard/empty.php
index dafc0486145..9de1ee345c2 100644
--- a/htdocs/core/menus/standard/empty.php
+++ b/htdocs/core/menus/standard/empty.php
@@ -199,7 +199,7 @@ class MenuManager
//var_dump($canonnexturl);
print ''."\n";
if (($canonrelurl != $canonnexturl && ! in_array($val['mainmenu'],array('tools')))
- || (strpos($canonrelurl,'/product/index.php') !== false || strpos($canonrelurl,'/compta/bank/index.php') !== false))
+ || (strpos($canonrelurl,'/product/index.php') !== false || strpos($canonrelurl,'/compta/bank/list.php') !== false))
{
// We add sub entry
print str_pad('',1).''; // ui-btn to highlight on clic
diff --git a/htdocs/core/photos_resize.php b/htdocs/core/photos_resize.php
index 69056ff02be..fcedc2a4e11 100644
--- a/htdocs/core/photos_resize.php
+++ b/htdocs/core/photos_resize.php
@@ -170,7 +170,7 @@ if ($action == 'confirm_resize' && (isset($_POST["file"]) != "") && (isset($_POS
{
$fullpath=$dir."/".$original_file;
$result=dol_imageResizeOrCrop($fullpath,0,$_POST['sizex'],$_POST['sizey']);
-
+
if ($result == $fullpath)
{
$object->addThumbs($fullpath);
@@ -178,7 +178,7 @@ if ($action == 'confirm_resize' && (isset($_POST["file"]) != "") && (isset($_POS
// Update/create database for file $fullpath
$rel_filename = preg_replace('/^'.preg_quote(DOL_DATA_ROOT,'/').'/', '', $fullpath);
$rel_filename = preg_replace('/^[\\/]/','',$rel_filename);
-
+
include_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
$ecmfile=new EcmFiles($db);
$result = $ecmfile->fetch(0, '', $rel_filename);
@@ -188,7 +188,7 @@ if ($action == 'confirm_resize' && (isset($_POST["file"]) != "") && (isset($_POS
$rel_dir = dirname($rel_filename);
$rel_dir = preg_replace('/[\\/]$/', '', $rel_dir);
$rel_dir = preg_replace('/^[\\/]/', '', $rel_dir);
-
+
$ecmfile->label = md5_file(dol_osencode($fullpath));
$result = $ecmfile->update($user);
}
@@ -198,7 +198,7 @@ if ($action == 'confirm_resize' && (isset($_POST["file"]) != "") && (isset($_POS
$rel_dir = dirname($rel_filename);
$rel_dir = preg_replace('/[\\/]$/', '', $rel_dir);
$rel_dir = preg_replace('/^[\\/]/', '', $rel_dir);
-
+
$ecmfile->filepath = $rel_dir;
$ecmfile->filename = $filename;
$ecmfile->label = md5_file(dol_osencode($fullpath)); // $fullpath is a full path to file
@@ -213,7 +213,7 @@ if ($action == 'confirm_resize' && (isset($_POST["file"]) != "") && (isset($_POS
}
$result = $ecmfile->create($user);
}
-
+
if ($backtourl)
{
header("Location: ".$backtourl);
@@ -246,7 +246,7 @@ if ($action == 'confirm_crop')
// Update/create database for file $fullpath
$rel_filename = preg_replace('/^'.preg_quote(DOL_DATA_ROOT,'/').'/', '', $fullpath);
$rel_filename = preg_replace('/^[\\/]/','',$rel_filename);
-
+
include_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
$ecmfile=new EcmFiles($db);
$result = $ecmfile->fetch(0, '', $rel_filename);
@@ -256,7 +256,7 @@ if ($action == 'confirm_crop')
$rel_dir = dirname($rel_filename);
$rel_dir = preg_replace('/[\\/]$/', '', $rel_dir);
$rel_dir = preg_replace('/^[\\/]/', '', $rel_dir);
-
+
$ecmfile->label = md5_file(dol_osencode($fullpath));
$result = $ecmfile->update($user);
}
@@ -266,7 +266,7 @@ if ($action == 'confirm_crop')
$rel_dir = dirname($rel_filename);
$rel_dir = preg_replace('/[\\/]$/', '', $rel_dir);
$rel_dir = preg_replace('/^[\\/]/', '', $rel_dir);
-
+
$ecmfile->filepath = $rel_dir;
$ecmfile->filename = $filename;
$ecmfile->label = md5_file(dol_osencode($fullpath)); // $fullpath is a full path to file
@@ -281,7 +281,7 @@ if ($action == 'confirm_crop')
}
$result = $ecmfile->create($user);
}
-
+
if ($backtourl)
{
header("Location: ".$backtourl);
@@ -311,7 +311,7 @@ llxHeader($head, $langs->trans("Image"), '', '', 0, 0, array('/includes/jquery/p
print load_fiche_titre($langs->trans("ImageEditor"));
-$infoarray=dol_getImageSize($dir."/".GETPOST("file"));
+$infoarray=dol_getImageSize($dir."/".GETPOST("file",'alpha'));
$height=$infoarray['height'];
$width=$infoarray['width'];
print $langs->trans("CurrentInformationOnImage").': ';
@@ -373,7 +373,7 @@ if (! empty($conf->use_javascript_ajax))
print $langs->trans("DefineNewAreaToPick").'...';
print '
';
- print '
';
+ print '
';
print '
';
print '
\n";
print ' ';
}
-
+
print "
";
-
+
//print '
';
//print '
';
//print '
';
-
-
+
+
//print '
';
//print '
';
-
-
+
+
dol_fiche_end();
// Lignes de contacts
diff --git a/htdocs/expedition/list.php b/htdocs/expedition/list.php
index 7a0a7fabfc7..4cdff0bd38c 100644
--- a/htdocs/expedition/list.php
+++ b/htdocs/expedition/list.php
@@ -42,9 +42,10 @@ $result = restrictedArea($user, 'expedition',$expeditionid,'');
$diroutputmassaction=$conf->expedition->dir_output . '/temp/massgeneration/'.$user->id;
-$search_ref_exp = GETPOST("search_ref_exp");
-$search_ref_liv = GETPOST('search_ref_liv');
-$search_company = GETPOST("search_company");
+$search_ref_exp = GETPOST("search_ref_exp", 'alpha');
+$search_ref_liv = GETPOST('search_ref_liv', 'alpha');
+$search_ref_customer = GETPOST('search_ref_customer', 'alpha');
+$search_company = GETPOST("search_company", 'alpha');
$search_town=GETPOST('search_town','alpha');
$search_zip=GETPOST('search_zip','alpha');
$search_state=trim(GETPOST("search_state"));
@@ -133,6 +134,7 @@ if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter.x',
{
$search_ref_exp='';
$search_ref_liv='';
+ $search_ref_customer='';
$search_company='';
$search_town='';
$search_zip="";
@@ -213,6 +215,7 @@ if ($socid)
if ($viewstatut <> '' && $viewstatut >= 0) {
$sql.= " AND e.fk_statut = ".$viewstatut;
}
+if ($search_ref_customer != '') $sql.=natural_search('e.ref_customer', $search_ref_customer);
if ($search_billed != '' && $search_billed >= 0) $sql.=' AND e.billed = '.$search_billed;
if ($search_town) $sql.= natural_search('s.town', $search_town);
if ($search_zip) $sql.= natural_search("s.zip",$search_zip);
@@ -262,13 +265,14 @@ if ($resql)
$expedition = new Expedition($db);
$param='';
- if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
+ if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.urlencode($contextpage);
if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
- if ($sall) $param.= "&sall=".$sall;
- if ($search_ref_exp) $param.= "&search_ref_exp=".$search_ref_exp;
- if ($search_ref_liv) $param.= "&search_ref_liv=".$search_ref_liv;
- if ($search_company) $param.= "&search_company=".$search_company;
- if ($optioncss != '') $param.='&optioncss='.$optioncss;
+ if ($sall) $param.= "&sall=".urlencode($sall);
+ if ($search_ref_exp) $param.= "&search_ref_exp=".urlencode($search_ref_exp);
+ if ($search_ref_liv) $param.= "&search_ref_liv=".urlencode($search_ref_liv);
+ if ($search_ref_customer) $param.= "&search_ref_customer=".urlencode($search_ref_customer);
+ if ($search_company) $param.= "&search_company=".urlencode($search_company);
+ if ($optioncss != '') $param.='&optioncss='.urlencode($optioncss);
// Add $param from extra fields
foreach ($search_array_options as $key => $val)
{
diff --git a/htdocs/expedition/note.php b/htdocs/expedition/note.php
index c32ec5c5124..cb123360288 100644
--- a/htdocs/expedition/note.php
+++ b/htdocs/expedition/note.php
@@ -100,9 +100,9 @@ if ($id > 0 || ! empty($ref))
$head=shipping_prepare_head($object);
dol_fiche_head($head, 'note', $langs->trans("Shipment"), -1, 'sending');
-
+
// Shipment card
- $linkback = ''.$langs->trans("BackToList").' ';
+ $linkback = ''.$langs->trans("BackToList").' ';
$morehtmlref='';
// Ref customer shipment
@@ -145,13 +145,13 @@ if ($id > 0 || ! empty($ref))
}
}
$morehtmlref.='
';
-
-
+
+
dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
-
-
+
+
print '
';
-
+
$cssclass='titlefield';
include DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php';
diff --git a/htdocs/expedition/shipment.php b/htdocs/expedition/shipment.php
index 849053c610c..80274f9b579 100644
--- a/htdocs/expedition/shipment.php
+++ b/htdocs/expedition/shipment.php
@@ -85,14 +85,14 @@ if (empty($reshook))
$object->fetch($id);
$object->setProject(GETPOST('projectid','int'));
}
-
+
if ($action == 'confirm_cloture' && GETPOST('confirm','alpha') == 'yes')
{
$object = new Commande($db);
$object->fetch($id);
$result = $object->cloture($user);
}
-
+
// Positionne ref commande client
else if ($action == 'setref_client' && $user->rights->commande->creer) {
$result = $object->set_ref_client($user, GETPOST('ref_client'));
@@ -101,12 +101,12 @@ if (empty($reshook))
setEventMessages($object->error, $object->errors, 'errors');
}
}
-
+
if ($action == 'setdatedelivery' && $user->rights->commande->creer)
{
//print "x ".$_POST['liv_month'].", ".$_POST['liv_day'].", ".$_POST['liv_year'];
$datelivraison=dol_mktime(0, 0, 0, GETPOST('liv_month','int'), GETPOST('liv_day','int'),GETPOST('liv_year','int'));
-
+
$object = new Commande($db);
$object->fetch($id);
$result=$object->set_date_livraison($user,$datelivraison);
@@ -131,7 +131,7 @@ if (empty($reshook))
if ($result < 0)
setEventMessages($object->error, $object->errors, 'errors');
}
-
+
if ($action == 'setavailability' && $user->rights->commande->creer) {
$object = new Commande($db);
$object->fetch($id);
@@ -139,7 +139,7 @@ if (empty($reshook))
if ($result < 0)
setEventMessages($object->error, $object->errors, 'errors');
}
-
+
if ($action == 'setdemandreason' && $user->rights->commande->creer) {
$object = new Commande($db);
$object->fetch($id);
@@ -147,7 +147,7 @@ if (empty($reshook))
if ($result < 0)
setEventMessages($object->error, $object->errors, 'errors');
}
-
+
if ($action == 'setconditions' && $user->rights->commande->creer)
{
$object = new Commande($db);
@@ -156,7 +156,7 @@ if (empty($reshook))
if ($result < 0)
setEventMessages($object->error, $object->errors, 'errors');
}
-
+
// shipping method
if ($action == 'setshippingmethod' && $user->rights->commande->creer) {
$object = new Commande($db);
@@ -165,7 +165,7 @@ if (empty($reshook))
if ($result < 0)
setEventMessages($object->error, $object->errors, 'errors');
}
-
+
// warehouse
if ($action == 'setwarehouse' && $user->rights->commande->creer) {
$object = new Commande($db);
@@ -174,14 +174,14 @@ if (empty($reshook))
if ($result < 0)
setEventMessages($object->error, $object->errors, 'errors');
}
-
+
if ($action == 'update_extras')
{
// Fill array 'array_options' with data from update form
$extralabels = $extrafields->fetch_name_optionals_label($object->table_element);
$ret = $extrafields->setOptionalsFromPost($extralabels, $object, GETPOST('attribute'));
if ($ret < 0) $error++;
-
+
if (! $error)
{
// Actions on extra fields (by external module or standard code)
@@ -197,20 +197,20 @@ if (empty($reshook))
} else if ($reshook < 0)
$error++;
}
-
+
if ($error)
$action = 'edit_extras';
}
-
+
if ($action == 'set_thirdparty' && $user->rights->commande->creer)
{
$object->fetch($id);
$object->setValueFrom('fk_soc', $socid, '', '', 'date', '', $user, 'ORDER_MODIFY');
-
+
header('Location: ' . $_SERVER["PHP_SELF"] . '?id=' . $id);
exit();
}
-
+
include DOL_DOCUMENT_ROOT.'/core/actions_printing.inc.php';
}
@@ -243,13 +243,13 @@ if ($id > 0 || ! empty($ref))
$author->fetch($object->user_author_id);
$res = $object->fetch_optionals($object->id, $extralabels);
-
+
$head = commande_prepare_head($object);
dol_fiche_head($head, 'shipping', $langs->trans("CustomerOrder"), -1, 'order');
-
+
$formconfirm = '';
-
+
// Confirm validation
if ($action == 'cloture')
{
@@ -263,14 +263,14 @@ if ($id > 0 || ! empty($ref))
if (empty($reshook)) $formconfirm.=$hookmanager->resPrint;
elseif ($reshook > 0) $formconfirm=$hookmanager->resPrint;
}
-
+
// Print form confirm
print $formconfirm;
-
-
+
+
// Order card
- $linkback = '' . $langs->trans("BackToList") . ' ';
+ $linkback = '' . $langs->trans("BackToList") . ' ';
$morehtmlref='';
@@ -320,7 +320,7 @@ if ($id > 0 || ! empty($ref))
print '
';
print '
';
print '
';
-
+
print '
';
// Discounts for third party
@@ -516,9 +516,9 @@ if ($id > 0 || ! empty($ref))
print showDimensionInBestUnit($totalVolume, 0, "volume", $langs, isset($conf->global->MAIN_VOLUME_DEFAULT_ROUND)?$conf->global->MAIN_VOLUME_DEFAULT_ROUND:-1, isset($conf->global->MAIN_VOLUME_DEFAULT_UNIT)?$conf->global->MAIN_VOLUME_DEFAULT_UNIT:'no');
print '';
}
-
+
// TODO How record was recorded OrderMode (llx_c_input_method)
-
+
// Incoterms
if (!empty($conf->incoterm->enabled))
{
@@ -541,7 +541,7 @@ if ($id > 0 || ! empty($ref))
}
print '';
}
-
+
// Other attributes
$cols = 2;
include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
@@ -561,18 +561,18 @@ if ($id > 0 || ! empty($ref))
print '' . fieldLabel('MulticurrencyAmountHT','multicurrency_total_ht') . ' ';
print '' . price($object->multicurrency_total_ht, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)) . ' ';
print '' . fieldLabel('MulticurrencyAmountVAT','multicurrency_total_tva') . ' ';
print '' . price($object->multicurrency_total_tva, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)) . ' ';
print '' . fieldLabel('MulticurrencyAmountTTC','multicurrency_total_ttc') . ' ';
print '' . price($object->multicurrency_total_ttc, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)) . ' ';
print ''.$langs->trans('AmountHT').' ';
print ''.price($object->total_ht, 0, '', 1, -1, -1, $conf->currency).' ';
@@ -593,7 +593,7 @@ if ($id > 0 || ! empty($ref))
print '' . $langs->transcountry("AmountLT2", $mysoc->country_code) . ' ';
print '' . price($object->total_localtax2, 1, '', 1, - 1, - 1, $conf->currency) . ' '.$langs->trans('AmountTTC').' '.price($object->total_ttc, 0, '', 1, -1, -1, $conf->currency).' ';
print '
';
-
+
print '
";
print "\n";
-
+
print '
';
$somethingshown=1;
diff --git a/htdocs/expensereport/card.php b/htdocs/expensereport/card.php
index 1460d97323c..631242bbd65 100644
--- a/htdocs/expensereport/card.php
+++ b/htdocs/expensereport/card.php
@@ -1454,7 +1454,7 @@ else
print '
';
}
- $linkback = '
'.$langs->trans("BackToList").' ';
+ $linkback = '
'.$langs->trans("BackToList").' ';
print '
';
@@ -1614,7 +1614,7 @@ else
print $formconfirm;
// Expense report card
- $linkback = ''.$langs->trans("BackToList").' ';
+ $linkback = ''.$langs->trans("BackToList").' ';
$morehtmlref='';
/*
diff --git a/htdocs/expensereport/class/expensereport.class.php b/htdocs/expensereport/class/expensereport.class.php
index a53fbfe21b9..0c9e22ae6ef 100644
--- a/htdocs/expensereport/class/expensereport.class.php
+++ b/htdocs/expensereport/class/expensereport.class.php
@@ -828,7 +828,7 @@ class ExpenseReport extends CommonObject
print '
';
print ''.$objp->ref_num.' '.dol_print_date($objp->date,'day').' ';
- print ''.$author->getNomUrl().' ';
+ print ''.$author->getNomUrl(1).' ';
print ''.$objp->comments.' ';
print ''.price($objp->total_ht).' ';
print ''.price($objp->total_ttc).' ';
@@ -1525,14 +1525,15 @@ class ExpenseReport extends CommonObject
/**
* Return clicable name (with picto eventually)
*
- * @param int $withpicto 0=No picto, 1=Include picto into link, 2=Only picto
- * @param int $max Max length of shown ref
- * @param int $short 1=Return just URL
- * @param string $moretitle Add more text to title tooltip
- * @param int $notooltip 1=Disable tooltip
- * @return string String with URL
+ * @param int $withpicto 0=No picto, 1=Include picto into link, 2=Only picto
+ * @param int $max Max length of shown ref
+ * @param int $short 1=Return just URL
+ * @param string $moretitle Add more text to title tooltip
+ * @param int $notooltip 1=Disable tooltip
+ * @param int $save_lastsearch_value -1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
+ * @return string String with URL
*/
- function getNomUrl($withpicto=0,$max=0,$short=0,$moretitle='',$notooltip=0)
+ function getNomUrl($withpicto=0, $max=0, $short=0, $moretitle='', $notooltip=0, $save_lastsearch_value=-1)
{
global $langs, $conf;
@@ -1554,6 +1555,14 @@ class ExpenseReport extends CommonObject
$label.= '' . $langs->trans('AmountTTC') . ': ' . price($this->total_ttc, 0, $langs, 0, -1, -1, $conf->currency);
if ($moretitle) $label.=' - '.$moretitle;
+ //if ($option != 'nolink')
+ //{
+ // Add param to save lastsearch_values or not
+ $add_save_lastsearch_values=($save_lastsearch_value == 1 ? 1 : 0);
+ if ($save_lastsearch_value == -1 && preg_match('/list\.php/',$_SERVER["PHP_SELF"])) $add_save_lastsearch_values=1;
+ if ($add_save_lastsearch_values) $url.='&save_lastsearch_values=1';
+ //}
+
$ref=$this->ref;
if (empty($ref)) $ref=$this->id;
diff --git a/htdocs/expensereport/document.php b/htdocs/expensereport/document.php
index 2b8dd3ee0c6..ed588f3f961 100644
--- a/htdocs/expensereport/document.php
+++ b/htdocs/expensereport/document.php
@@ -93,15 +93,15 @@ if ($object->id)
dol_fiche_head($head, 'documents', $langs->trans("ExpenseReport"), -1, 'trip');
- $linkback = ''.$langs->trans("BackToList").' ';
-
+ $linkback = ''.$langs->trans("BackToList").' ';
+
$morehtmlref='';
$morehtmlref.='
';
-
-
+
+
dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
-
-
+
+
// Construit liste des fichiers
$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
$totalsize=0;
@@ -112,7 +112,7 @@ if ($object->id)
print '';
print '
';
-
+
print '
';
$linkback = ''.$langs->trans("BackToList").' ';
@@ -124,8 +124,8 @@ if ($object->id)
print '';
dol_fiche_end();
-
-
+
+
$modulepart = 'expensereport';
$permission = $user->rights->expensereport->creer;
$permtoedit = $user->rights->expensereport->creer;
diff --git a/htdocs/expensereport/info.php b/htdocs/expensereport/info.php
index 0c3f687519c..6c2410aaa98 100644
--- a/htdocs/expensereport/info.php
+++ b/htdocs/expensereport/info.php
@@ -56,25 +56,25 @@ if ($id > 0 || ! empty($ref))
dol_fiche_head($head, 'info', $langs->trans("ExpenseReport"), -1, 'trip');
- $linkback = ''.$langs->trans("BackToList").' ';
-
+ $linkback = ''.$langs->trans("BackToList").' ';
+
$morehtmlref='';
$morehtmlref.='
';
-
+
dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
-
+
print '';
print '
';
-
+
print '
';
-
+
print '
';
dol_print_object_info($object);
print '
';
print '
'.$langs->trans("BackToList").' ';
-
+ $linkback = ''.$langs->trans("BackToList").' ';
+
$morehtmlref='';
$morehtmlref.='
';
-
+
dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
-
+
print '';
print '
';
-
+
$cssclass="titlefield";
include DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php';
print '
'.$langs->trans("BackToList").' ';
+ $linkback = ''.$langs->trans("BackToList").' ';
$morehtmlref='';
diff --git a/htdocs/fichinter/class/fichinter.class.php b/htdocs/fichinter/class/fichinter.class.php
index 1c023415de0..bdbb03492f7 100644
--- a/htdocs/fichinter/class/fichinter.class.php
+++ b/htdocs/fichinter/class/fichinter.class.php
@@ -655,28 +655,52 @@ class Fichinter extends CommonObject
/**
* Return clicable name (with picto eventually)
*
- * @param int $withpicto 0=_No picto, 1=Includes the picto in the linkn, 2=Picto only
- * @param string $option Options
- * @return string String with URL
+ * @param int $withpicto 0=_No picto, 1=Includes the picto in the linkn, 2=Picto only
+ * @param string $option Options
+ * @param int $notooltip 1=Disable tooltip
+ * @param int $save_lastsearch_value -1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
+ * @return string String with URL
*/
- function getNomUrl($withpicto=0,$option='')
+ function getNomUrl($withpicto=0, $option='', $notooltip=0, $save_lastsearch_value=-1)
{
global $langs;
$result='';
+
$label = '
' . $langs->trans("ShowIntervention") . ' ';
if (! empty($this->ref))
$label .= '
' . $langs->trans('Ref') . ': '.$this->ref;
- $link = '
';
+ $picto='intervention';
+ $url = DOL_URL_ROOT.'/fichinter/card.php?id='.$this->id;
+
+ //if ($option !== 'nolink')
+ //{
+ // Add param to save lastsearch_values or not
+ $add_save_lastsearch_values=($save_lastsearch_value == 1 ? 1 : 0);
+ if ($save_lastsearch_value == -1 && preg_match('/list\.php/',$_SERVER["PHP_SELF"])) $add_save_lastsearch_values=1;
+ if ($add_save_lastsearch_values) $url.='&save_lastsearch_values=1';
+ //}
+
+ $linkclose='';
+ if (empty($notooltip))
+ {
+ if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
+ {
+ $label=$langs->trans("ShowIntervention");
+ $linkclose.=' alt="'.dol_escape_htmltag($label, 1).'"';
+ }
+ $linkclose.= ' title="'.dol_escape_htmltag($label, 1).'"';
+ $linkclose.=' class="classfortooltip"';
+ }
+
+ $linkstart = ' ';
$linkend=' ';
- $picto='intervention';
-
-
- if ($withpicto) $result.=($link.img_object($label, $picto, 'class="classfortooltip"').$linkend);
+ if ($withpicto) $result.=($linkstart.img_object(($notooltip?'':$label), $picto, ($notooltip?'':'class="classfortooltip"'), 0, 0, $notooltip?0:1).$linkend);
if ($withpicto && $withpicto != 2) $result.=' ';
- if ($withpicto != 2) $result.=$link.$this->ref.$linkend;
+ if ($withpicto != 2) $result.=$linkstart.$this->ref.$linkend;
return $result;
}
diff --git a/htdocs/fichinter/contact.php b/htdocs/fichinter/contact.php
index 2b40553a3d9..d7be9c95cec 100644
--- a/htdocs/fichinter/contact.php
+++ b/htdocs/fichinter/contact.php
@@ -126,9 +126,9 @@ if ($id > 0 || ! empty($ref))
// Intervention card
- $linkback = '
'.$langs->trans("BackToList").' ';
-
-
+ $linkback = '
'.$langs->trans("BackToList").' ';
+
+
$morehtmlref='
';
// Ref customer
//$morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', 0, 1);
@@ -169,13 +169,13 @@ if ($id > 0 || ! empty($ref))
}
}
$morehtmlref.='
';
-
+
dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, '', 0, '', '', 1);
-
+
dol_fiche_end();
-
+
print '
';
-
+
if (! empty($conf->global->FICHINTER_HIDE_ADD_CONTACT_USER)) $hideaddcontactforuser=1;
if (! empty($conf->global->FICHINTER_HIDE_ADD_CONTACT_THIPARTY)) $hideaddcontactforthirdparty=1;
diff --git a/htdocs/fichinter/document.php b/htdocs/fichinter/document.php
index 3d5a3c544e8..33db56a6e78 100644
--- a/htdocs/fichinter/document.php
+++ b/htdocs/fichinter/document.php
@@ -102,9 +102,9 @@ if ($object->id)
// Intervention card
- $linkback = '
'.$langs->trans("BackToList").' ';
-
-
+ $linkback = '
'.$langs->trans("BackToList").' ';
+
+
$morehtmlref='
';
// Ref customer
//$morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', 0, 1);
@@ -145,13 +145,13 @@ if ($object->id)
}
}
$morehtmlref.='
';
-
+
dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
-
-
+
+
print '
';
print '
';
-
+
print '
';
print ''.$langs->trans("NbOfAttachedFiles").' '.count($filearray).' '.$langs->trans("TotalSizeOfAttachedFiles").' '.$totalsize.' '.$langs->trans("bytes").' '.$langs->trans("BackToList").' ';
+$linkback = ''.$langs->trans("BackToList").' ';
$morehtmlref='';
diff --git a/htdocs/fichinter/note.php b/htdocs/fichinter/note.php
index 43a2654d1fd..a5a9675eb43 100644
--- a/htdocs/fichinter/note.php
+++ b/htdocs/fichinter/note.php
@@ -61,14 +61,14 @@ $form = new Form($db);
if ($id > 0 || ! empty($ref))
{
$object->fetch_thirdparty();
-
+
$head = fichinter_prepare_head($object);
dol_fiche_head($head, 'note', $langs->trans('InterventionCard'), -1, 'intervention');
// Intervention card
- $linkback = '
'.$langs->trans("BackToList").' ';
-
-
+ $linkback = '
'.$langs->trans("BackToList").' ';
+
+
$morehtmlref='
';
// Ref customer
//$morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', 0, 1);
@@ -109,17 +109,17 @@ if ($id > 0 || ! empty($ref))
}
}
$morehtmlref.='
';
-
+
dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
-
+
print '
';
print '
';
-
+
$cssclass="titlefield";
include DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php';
print '
';
-
+
dol_fiche_end();
}
diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index abd2d85d723..b0ac73f871b 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -594,12 +594,13 @@ class CommandeFournisseur extends CommonOrder
/**
* Return clicable name (with picto eventually)
*
- * @param int $withpicto 0=No picto, 1=Include picto into link, 2=Only picto
- * @param string $option On what the link points
- * @param int $notooltip 1=Disable tooltip
- * @return string Chain with URL
+ * @param int $withpicto 0=No picto, 1=Include picto into link, 2=Only picto
+ * @param string $option On what the link points
+ * @param int $notooltip 1=Disable tooltip
+ * @param int $save_lastsearch_value -1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
+ * @return string Chain with URL
*/
- public function getNomUrl($withpicto=0,$option='',$notooltip=0)
+ public function getNomUrl($withpicto=0, $option='', $notooltip=0, $save_lastsearch_value=-1)
{
global $langs, $conf;
@@ -619,6 +620,14 @@ class CommandeFournisseur extends CommonOrder
$picto='order';
$url = DOL_URL_ROOT.'/fourn/commande/card.php?id='.$this->id;
+ if ($option !== 'nolink')
+ {
+ // Add param to save lastsearch_values or not
+ $add_save_lastsearch_values=($save_lastsearch_value == 1 ? 1 : 0);
+ if ($save_lastsearch_value == -1 && preg_match('/list\.php/',$_SERVER["PHP_SELF"])) $add_save_lastsearch_values=1;
+ if ($add_save_lastsearch_values) $url.='&save_lastsearch_values=1';
+ }
+
$linkclose='';
if (empty($notooltip))
{
diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php
index b040fdcb95d..c2f535db079 100644
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -1839,15 +1839,16 @@ class FactureFournisseur extends CommonInvoice
/**
* Return clicable name (with picto eventually)
*
- * @param int $withpicto 0=No picto, 1=Include picto into link, 2=Only picto
- * @param string $option Where point the link
- * @param int $max Max length of shown ref
- * @param int $short 1=Return just URL
- * @param string $moretitle Add more text to title tooltip
- * @param int $notooltip 1=Disable tooltip
- * @return string String with URL
+ * @param int $withpicto 0=No picto, 1=Include picto into link, 2=Only picto
+ * @param string $option Where point the link
+ * @param int $max Max length of shown ref
+ * @param int $short 1=Return just URL
+ * @param string $moretitle Add more text to title tooltip
+ * @param int $notooltip 1=Disable tooltip
+ * @param int $save_lastsearch_value -1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
+ * @return string String with URL
*/
- public function getNomUrl($withpicto=0,$option='',$max=0,$short=0,$moretitle='',$notooltip=0)
+ public function getNomUrl($withpicto=0, $option='',$max=0, $short=0, $moretitle='', $notooltip=0, $save_lastsearch_value=-1)
{
global $langs, $conf;
@@ -1858,6 +1859,14 @@ class FactureFournisseur extends CommonInvoice
if ($short) return $url;
+ if ($option !== 'nolink')
+ {
+ // Add param to save lastsearch_values or not
+ $add_save_lastsearch_values=($save_lastsearch_value == 1 ? 1 : 0);
+ if ($save_lastsearch_value == -1 && preg_match('/list\.php/',$_SERVER["PHP_SELF"])) $add_save_lastsearch_values=1;
+ if ($add_save_lastsearch_values) $url.='&save_lastsearch_values=1';
+ }
+
$picto='bill';
if ($this->type == self::TYPE_REPLACEMENT) $picto.='r'; // Replacement invoice
if ($this->type == self::TYPE_CREDIT_NOTE) $picto.='a'; // Credit note
diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index 0e23b62fbb0..ecae12d260f 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -560,7 +560,7 @@ if (empty($reshook))
$res = $line->fetch($lineid);
if (!$res) dol_print_error($db);
}
-
+
$productsupplier = new ProductFournisseur($db);
if ($productsupplier->get_buyprice(0, price2num($_POST['qty']), $line->fk_product, 'none', GETPOST('socid','int')) < 0 )
{
@@ -683,7 +683,7 @@ if (empty($reshook))
dol_print_error($db,$object->error);
exit;
}
-
+
}
// Remove a product line
@@ -1792,7 +1792,7 @@ elseif (! empty($object->id))
// Supplier order card
- $linkback = '
'.$langs->trans("BackToList").' ';
+ $linkback = '
'.$langs->trans("BackToList").' ';
$morehtmlref='
';
// Ref supplier
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index 820768ac7bd..a8c6c502f0c 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -2028,7 +2028,7 @@ else
// Supplier invoice card
- $linkback = '
'.$langs->trans("BackToList").' ';
+ $linkback = '
'.$langs->trans("BackToList").' ';
$morehtmlref='
';
// Ref supplier
diff --git a/htdocs/fourn/facture/contact.php b/htdocs/fourn/facture/contact.php
index 0f56c5f7bae..ffc58195e26 100644
--- a/htdocs/fourn/facture/contact.php
+++ b/htdocs/fourn/facture/contact.php
@@ -135,12 +135,12 @@ if ($id > 0 || ! empty($ref))
$object->fetch_thirdparty();
$alreadypaid=$object->getSommePaiement();
-
+
$head = facturefourn_prepare_head($object);
dol_fiche_head($head, 'contact', $langs->trans('SupplierInvoice'), -1, 'bill');
- $linkback = '
' . $langs->trans("BackToList") . ' ';
+ $linkback = '
' . $langs->trans("BackToList") . ' ';
$morehtmlref='
';
// Ref supplier
@@ -186,7 +186,7 @@ if ($id > 0 || ! empty($ref))
$object->totalpaye = $alreadypaid; // To give a chance to dol_banner_tab to use already paid amount to show correct status
dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
-
+
print '
';
print '
';
diff --git a/htdocs/fourn/facture/document.php b/htdocs/fourn/facture/document.php
index 6926770bd91..77c0559aeca 100644
--- a/htdocs/fourn/facture/document.php
+++ b/htdocs/fourn/facture/document.php
@@ -90,10 +90,10 @@ if ($object->id > 0)
{
$head = facturefourn_prepare_head($object);
dol_fiche_head($head, 'documents', $langs->trans('SupplierInvoice'), -1, 'bill');
-
+
$totalpaye = $object->getSommePaiement();
- $linkback = '
' . $langs->trans("BackToList") . ' ';
+ $linkback = '
' . $langs->trans("BackToList") . ' ';
$morehtmlref='
';
// Ref supplier
@@ -231,7 +231,7 @@ if ($object->id > 0)
print '
';
print '
';
-
+
print '
';
// Nb of files
@@ -241,9 +241,9 @@ if ($object->id > 0)
print '
';
print '
';
-
+
dol_fiche_end();
-
+
$modulepart = 'facture_fournisseur';
$permission = $user->rights->fournisseur->facture->creer;
diff --git a/htdocs/fourn/facture/info.php b/htdocs/fourn/facture/info.php
index 73d6b94a0d6..ffda7e2f4cd 100644
--- a/htdocs/fourn/facture/info.php
+++ b/htdocs/fourn/facture/info.php
@@ -63,7 +63,7 @@ $head = facturefourn_prepare_head($object);
$titre=$langs->trans('SupplierInvoice');
dol_fiche_head($head, 'info', $langs->trans('SupplierInvoice'), -1, 'bill');
-$linkback = '
' . $langs->trans("BackToList") . ' ';
+$linkback = '
' . $langs->trans("BackToList") . ' ';
$morehtmlref='
';
// Ref supplier
diff --git a/htdocs/fourn/facture/note.php b/htdocs/fourn/facture/note.php
index 9df425040e1..6afe9f37c8c 100644
--- a/htdocs/fourn/facture/note.php
+++ b/htdocs/fourn/facture/note.php
@@ -76,14 +76,14 @@ if ($object->id > 0)
$object->fetch_thirdparty();
$alreadypaid=$object->getSommePaiement();
-
+
$head = facturefourn_prepare_head($object);
$titre=$langs->trans('SupplierInvoice');
dol_fiche_head($head, 'note', $titre, -1, 'bill');
// Supplier invoice card
- $linkback = '
'.$langs->trans("BackToList").' ';
+ $linkback = '
'.$langs->trans("BackToList").' ';
$morehtmlref='
';
// Ref supplier
@@ -128,7 +128,7 @@ if ($object->id > 0)
$object->totalpaye = $alreadypaid; // To give a chance to dol_banner_tab to use already paid amount to show correct status
- dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
+ dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
print '
';
print '
';
diff --git a/htdocs/fourn/facture/paiement.php b/htdocs/fourn/facture/paiement.php
index d6fd80e47fe..786c459d6e5 100644
--- a/htdocs/fourn/facture/paiement.php
+++ b/htdocs/fourn/facture/paiement.php
@@ -913,7 +913,7 @@ if (empty($action))
print '
'.$objp->num_paiement.' ';
print '
';
- if ($objp->bid) print ''.img_object($langs->trans("ShowAccount"),'account').' '.dol_trunc($objp->label,24).' ';
+ if ($objp->bid) print ''.img_object($langs->trans("ShowAccount"),'account').' '.dol_trunc($objp->label,24).' ';
else print ' ';
print ' ';
diff --git a/htdocs/holiday/card.php b/htdocs/holiday/card.php
index 0c11bd1dea1..c957ec67a5b 100644
--- a/htdocs/holiday/card.php
+++ b/htdocs/holiday/card.php
@@ -1045,7 +1045,7 @@ else
dol_fiche_head($head, 'card', $langs->trans("CPTitreMenu"), -1, 'holiday');
- $linkback='
'.$langs->trans("BackToList").' ';
+ $linkback='
'.$langs->trans("BackToList").' ';
dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref');
diff --git a/htdocs/holiday/class/holiday.class.php b/htdocs/holiday/class/holiday.class.php
index 9486a4a1447..70d00bd2f01 100644
--- a/htdocs/holiday/class/holiday.class.php
+++ b/htdocs/holiday/class/holiday.class.php
@@ -819,24 +819,34 @@ class Holiday extends CommonObject
/**
* Return clicable name (with picto eventually)
*
- * @param int $withpicto 0=_No picto, 1=Includes the picto in the linkn, 2=Picto only
- * @return string String with URL
+ * @param int $withpicto 0=_No picto, 1=Includes the picto in the linkn, 2=Picto only
+ * @param int $save_lastsearch_value -1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
+ * @return string String with URL
*/
- function getNomUrl($withpicto=0)
+ function getNomUrl($withpicto=0, $save_lastsearch_value=-1)
{
global $langs;
$result='';
+ $picto='holiday';
$label=$langs->trans("Show").': '.$this->ref;
- $link = '
';
+ $url = DOL_URL_ROOT.'/holiday/card.php?id='.$this->id;
+
+ //if ($option != 'nolink')
+ //{
+ // Add param to save lastsearch_values or not
+ $add_save_lastsearch_values=($save_lastsearch_value == 1 ? 1 : 0);
+ if ($save_lastsearch_value == -1 && preg_match('/list\.php/',$_SERVER["PHP_SELF"])) $add_save_lastsearch_values=1;
+ if ($add_save_lastsearch_values) $url.='&save_lastsearch_values=1';
+ //}
+
+ $linkstart = ' ';
$linkend=' ';
- $picto='holiday';
-
- if ($withpicto) $result.=($link.img_object($label, $picto, 'class="classfortooltip"').$linkend);
+ if ($withpicto) $result.=($linkstart.img_object($label, $picto, 'class="classfortooltip"').$linkend);
if ($withpicto && $withpicto != 2) $result.=' ';
- if ($withpicto != 2) $result.=$link.$this->ref.$linkend;
+ if ($withpicto != 2) $result.=$linkstart.$this->ref.$linkend;
return $result;
}
diff --git a/htdocs/holiday/document.php b/htdocs/holiday/document.php
index c468fcd7272..94d32b3bc49 100644
--- a/htdocs/holiday/document.php
+++ b/htdocs/holiday/document.php
@@ -109,7 +109,7 @@ if ($object->id)
}
- $linkback='
'.$langs->trans("BackToList").' ';
+ $linkback='
'.$langs->trans("BackToList").' ';
dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref');
diff --git a/htdocs/holiday/list.php b/htdocs/holiday/list.php
index 2d97a73667b..2e63793cbfd 100644
--- a/htdocs/holiday/list.php
+++ b/htdocs/holiday/list.php
@@ -313,7 +313,7 @@ if ($id > 0) print '
';
if ($id > 0) // For user tab
{
$title = $langs->trans("User");
- $linkback = '
'.$langs->trans("BackToList").' ';
+ $linkback = '
'.$langs->trans("BackToList").' ';
$head = user_prepare_head($fuser);
dol_fiche_head($head, 'paidholidays', $title, -1, 'user');
diff --git a/htdocs/livraison/card.php b/htdocs/livraison/card.php
index d6ebf7b68aa..84cd7c8899d 100644
--- a/htdocs/livraison/card.php
+++ b/htdocs/livraison/card.php
@@ -44,7 +44,7 @@ if (! empty($conf->projet->enabled)) {
require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
}
-
+
$langs->load("sendings");
$langs->load("bills");
@@ -223,7 +223,7 @@ if ($action == 'update_extras_line')
{
$array_options=array();
$num=count($object->lines);
-
+
for ($i = 0; $i < $num; $i++)
{
// Extrafields
@@ -236,7 +236,7 @@ if ($action == 'update_extras_line')
unset($_POST["options_" . $key]);
}
}
-
+
$ret = $object->update_line($object->lines[$i]->id,$array_options[$i]); // extrafields update
if ($ret < 0)
{
@@ -305,7 +305,7 @@ $formfile = new FormFile($db);
if ($action == 'create') // Seems to no be used
{
-
+
}
else
/* *************************************************************************** */
@@ -333,16 +333,16 @@ else
$head=delivery_prepare_head($object);
-
+
print '
\n";
-
+
dol_fiche_end();
//if ($object->statut == 0) // only if draft
// print '
';
-
+
print '';
-
+
/*
* Boutons actions
@@ -706,7 +706,7 @@ else
{
print '
';
- if ($object->statut == 0 && $num_prod > 0)
+ if ($object->statut == 0 && $num_prod > 0)
{
if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->expedition->livraison->creer))
|| (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->expedition->livraison_advance->validate)))
diff --git a/htdocs/livraison/class/livraison.class.php b/htdocs/livraison/class/livraison.class.php
index 56ffa78f429..837b0af77f5 100644
--- a/htdocs/livraison/class/livraison.class.php
+++ b/htdocs/livraison/class/livraison.class.php
@@ -295,13 +295,13 @@ class Livraison extends CommonObject
//Incoterms
$this->fk_incoterms = $obj->fk_incoterms;
- $this->location_incoterms = $obj->location_incoterms;
+ $this->location_incoterms = $obj->location_incoterms;
$this->libelle_incoterms = $obj->libelle_incoterms;
$this->db->free($result);
if ($this->statut == 0) $this->brouillon = 1;
-
-
+
+
// Retrieve all extrafields for delivery
// fetch optionals attributes and labels
require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
@@ -524,7 +524,7 @@ class Livraison extends CommonObject
$this->fk_delivery_address = $expedition->fk_delivery_address;
$this->socid = $expedition->socid;
$this->ref_customer = $expedition->ref_customer;
-
+
//Incoterms
$this->fk_incoterms = $expedition->fk_incoterms;
$this->location_incoterms = $expedition->location_incoterms;
@@ -543,26 +543,26 @@ class Livraison extends CommonObject
{
global $conf;
$error = 0;
-
+
if ($id > 0 && !$error && empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && is_array($array_options) && count($array_options)>0) // For avoid conflicts if trigger used
{
$livraisonline = new LivraisonLigne($this->db);
$livraisonline->array_options=$array_options;
$livraisonline->id=$id;
$result=$livraisonline->insertExtraFields();
-
+
if ($result < 0)
{
$this->error[]=$livraisonline->error;
$error++;
}
}
-
+
if (! $error) return 1;
else return -1;
}
-
-
+
+
/**
* Add line
*
@@ -696,26 +696,36 @@ class Livraison extends CommonObject
/**
* Return clicable name (with picto eventually)
*
- * @param int $withpicto 0=No picto, 1=Include picto into link, 2=Only picto
- * @return string Chaine avec URL
+ * @param int $withpicto 0=No picto, 1=Include picto into link, 2=Only picto
+ * @param int $save_lastsearch_value -1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
+ * @return string Chaine avec URL
*/
- function getNomUrl($withpicto=0)
+ function getNomUrl($withpicto=0, $save_lastsearch_value=-1)
{
global $langs;
$result='';
- $urlOption='';
- $label=$langs->trans("ShowReceiving").': '.$this->ref;
-
-
- $link = '
';
- $linkend=' ';
-
$picto='sending';
- if ($withpicto) $result.=($link.img_object($label, $picto, 'class="classfortooltip"').$linkend);
+ $label=$langs->trans("ShowReceiving").': '.$this->ref;
+
+ $url=DOL_URL_ROOT.'/livraison/card.php?id='.$this->id;
+
+ //if ($option !== 'nolink')
+ //{
+ // Add param to save lastsearch_values or not
+ $add_save_lastsearch_values=($save_lastsearch_value == 1 ? 1 : 0);
+ if ($save_lastsearch_value == -1 && preg_match('/list\.php/',$_SERVER["PHP_SELF"])) $add_save_lastsearch_values=1;
+ if ($add_save_lastsearch_values) $url.='&save_lastsearch_values=1';
+ //}
+
+
+ $linkstart = '
';
+ $linkend=' ';
+
+ if ($withpicto) $result.=($linkstart.img_object($label, $picto, 'class="classfortooltip"').$linkend);
if ($withpicto && $withpicto != 2) $result.=' ';
- $result.=$link.$this->ref.$linkend;
+ $result.=$linkstart.$this->ref.$linkend;
return $result;
}
@@ -1052,7 +1062,7 @@ class Livraison extends CommonObject
class LivraisonLigne extends CommonObjectLine
{
var $db;
-
+
// From llx_expeditiondet
var $qty;
var $qty_asked;
@@ -1075,7 +1085,7 @@ class LivraisonLigne extends CommonObjectLine
public $product_ref;
public $product_label;
-
+
public $element='livraisondet';
public $table_element='livraisondet';
diff --git a/htdocs/margin/tabs/productMargins.php b/htdocs/margin/tabs/productMargins.php
index 9175736d5db..605a4272081 100644
--- a/htdocs/margin/tabs/productMargins.php
+++ b/htdocs/margin/tabs/productMargins.php
@@ -95,7 +95,7 @@ if ($id > 0 || ! empty($ref))
$picto=($object->type== Product::TYPE_SERVICE?'service':'product');
dol_fiche_head($head, 'margin', $titre, -1, $picto);
- $linkback = '
'.$langs->trans("BackToList").' ';
+ $linkback = '
'.$langs->trans("BackToList").' ';
dol_banner_tab($object, 'ref', $linkback, ($user->societe_id?0:1), 'ref');
diff --git a/htdocs/margin/tabs/thirdpartyMargins.php b/htdocs/margin/tabs/thirdpartyMargins.php
index bc8928bdc6e..5753760df66 100644
--- a/htdocs/margin/tabs/thirdpartyMargins.php
+++ b/htdocs/margin/tabs/thirdpartyMargins.php
@@ -91,7 +91,7 @@ if ($socid > 0)
dol_fiche_head($head, 'margin', $langs->trans("ThirdParty"), -1, 'company');
- $linkback = '
'.$langs->trans("BackToList").' ';
+ $linkback = '
'.$langs->trans("BackToList").' ';
dol_banner_tab($object, 'socid', $linkback, ($user->societe_id?0:1), 'rowid', 'nom');
diff --git a/htdocs/modulebuilder/template/class/myobject.class.php b/htdocs/modulebuilder/template/class/myobject.class.php
index e91a9751b60..ef4dff5ed49 100644
--- a/htdocs/modulebuilder/template/class/myobject.class.php
+++ b/htdocs/modulebuilder/template/class/myobject.class.php
@@ -268,7 +268,7 @@ class MyObject extends CommonObject
* Return a link to the object card (with optionaly the picto)
*
* @param int $withpicto Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
- * @param string $option On what the link point to
+ * @param string $option On what the link point to ('nolink', ...)
* @param int $notooltip 1=Disable tooltip
* @param string $morecss Add more css on link
* @param int $save_lastsearch_value -1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
@@ -289,11 +289,10 @@ class MyObject extends CommonObject
$label.= '
';
$label.= '
' . $langs->trans('Ref') . ': ' . $this->ref;
- $url='';
+ $url = dol_buildpath('/mymodule/myobject_card.php',1).'?id='.$this->id;
+
if ($option != 'nolink')
{
- $url = dol_buildpath('/mymodule/myobject_card.php',1).'?id='.$this->id;
-
// Add param to save lastsearch_values or not
$add_save_lastsearch_values=($save_lastsearch_value == 1 ? 1 : 0);
if ($save_lastsearch_value == -1 && preg_match('/list\.php/',$_SERVER["PHP_SELF"])) $add_save_lastsearch_values=1;
diff --git a/htdocs/modulebuilder/template/myobject_card.php b/htdocs/modulebuilder/template/myobject_card.php
index 4160b2045fd..144cde98c64 100644
--- a/htdocs/modulebuilder/template/myobject_card.php
+++ b/htdocs/modulebuilder/template/myobject_card.php
@@ -308,7 +308,11 @@ if ($action == 'create')
dol_fiche_end();
- print '
';
+ print '
';
+ print '
';
print '';
}
diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index f5e6c906e7d..cdf903639c5 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -1488,7 +1488,7 @@ else
dol_fiche_head($head, 'card', $titre, -1, $picto);
- $linkback = '
'.$langs->trans("BackToList").' ';
+ $linkback = '
'.$langs->trans("BackToList").' ';
$object->next_prev_filter=" fk_product_type = ".$object->type;
$shownav = 1;
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 0dd16fd99dc..d2c52ec4255 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -3416,12 +3416,13 @@ class Product extends CommonObject
/**
* Return clicable link of object (with eventually picto)
*
- * @param int $withpicto Add picto into link
- * @param string $option Where point the link ('stock', 'composition', 'category', 'supplier', '')
- * @param int $maxlength Maxlength of ref
- * @return string String with URL
+ * @param int $withpicto Add picto into link
+ * @param string $option Where point the link ('stock', 'composition', 'category', 'supplier', '')
+ * @param int $maxlength Maxlength of ref
+ * @param int $save_lastsearch_value -1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
+ * @return string String with URL
*/
- function getNomUrl($withpicto=0,$option='',$maxlength=0)
+ function getNomUrl($withpicto=0, $option='', $maxlength=0, $save_lastsearch_value=-1)
{
global $conf, $langs, $hookmanager;
include_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php';
@@ -3458,7 +3459,6 @@ class Product extends CommonObject
if ($this->nbphoto > 0) $label .= '
' . $tmpphoto;
}
-
$linkclose='';
if (empty($notooltip))
{
@@ -3469,7 +3469,7 @@ class Product extends CommonObject
}
$linkclose.= ' title="'.dol_escape_htmltag($label, 1, 1).'"';
- $linkclose.=' class="classfortooltip"';
+ $linkclose.= ' class="classfortooltip"';
if (! is_object($hookmanager))
{
@@ -3492,6 +3492,14 @@ class Product extends CommonObject
$url = DOL_URL_ROOT.'/product/card.php?id='.$this->id;
}
+ if ($option !== 'nolink')
+ {
+ // Add param to save lastsearch_values or not
+ $add_save_lastsearch_values=($save_lastsearch_value == 1 ? 1 : 0);
+ if ($save_lastsearch_value == -1 && preg_match('/list\.php/',$_SERVER["PHP_SELF"])) $add_save_lastsearch_values=1;
+ if ($add_save_lastsearch_values) $url.='&save_lastsearch_values=1';
+ }
+
$linkstart = '
';
$linkend=' ';
diff --git a/htdocs/product/composition/card.php b/htdocs/product/composition/card.php
index a4012b7d3c4..a6cc3427243 100644
--- a/htdocs/product/composition/card.php
+++ b/htdocs/product/composition/card.php
@@ -203,7 +203,7 @@ if ($id > 0 || ! empty($ref))
*/
if ($user->rights->produit->lire || $user->rights->service->lire)
{
- $linkback = '
'.$langs->trans("BackToList").' ';
+ $linkback = '
'.$langs->trans("BackToList").' ';
$shownav = 1;
if ($user->societe_id && ! in_array('product', explode(',',$conf->global->MAIN_MODULES_FOR_EXTERNAL))) $shownav=0;
diff --git a/htdocs/product/document.php b/htdocs/product/document.php
index 53bbbfeeabb..fd67cd72504 100644
--- a/htdocs/product/document.php
+++ b/htdocs/product/document.php
@@ -212,7 +212,7 @@ if ($object->id)
}
- $linkback = '
'.$langs->trans("BackToList").' ';
+ $linkback = '
'.$langs->trans("BackToList").' ';
$object->next_prev_filter=" fk_product_type = ".$object->type;
$shownav = 1;
diff --git a/htdocs/product/fournisseurs.php b/htdocs/product/fournisseurs.php
index cb295012795..6124bc9161a 100644
--- a/htdocs/product/fournisseurs.php
+++ b/htdocs/product/fournisseurs.php
@@ -308,7 +308,7 @@ if ($id > 0 || $ref)
dol_fiche_head($head, 'suppliers', $titre, -1, $picto);
- $linkback = '
'.$langs->trans("BackToList").' ';
+ $linkback = '
'.$langs->trans("BackToList").' ';
$object->next_prev_filter=" fk_product_type = ".$object->type;
$shownav = 1;
diff --git a/htdocs/product/info.php b/htdocs/product/info.php
index c8af676ed0a..1887e96df47 100644
--- a/htdocs/product/info.php
+++ b/htdocs/product/info.php
@@ -94,7 +94,7 @@ if ($id > 0 || $ref)
dol_fiche_head($head, 'info', $titre, -1, $picto);
- $linkback = '
'.$langs->trans("BackToList").' ';
+ $linkback = '
'.$langs->trans("BackToList").' ';
$object->next_prev_filter=" fk_product_type = ".$object->type;
$shownav = 1;
diff --git a/htdocs/product/note.php b/htdocs/product/note.php
index 19496eeb860..5e73548579c 100644
--- a/htdocs/product/note.php
+++ b/htdocs/product/note.php
@@ -93,7 +93,7 @@ if ($id > 0 || ! empty($ref))
dol_fiche_head($head, 'note', $titre, -1, $picto);
- $linkback = '
'.$langs->trans("BackToList").' ';
+ $linkback = '
'.$langs->trans("BackToList").' ';
$object->next_prev_filter=" fk_product_type = ".$object->type;
$shownav = 1;
diff --git a/htdocs/product/price.php b/htdocs/product/price.php
index af9fa2a927f..e00973902dd 100644
--- a/htdocs/product/price.php
+++ b/htdocs/product/price.php
@@ -690,7 +690,7 @@ $picto = ($object->type == Product::TYPE_SERVICE ? 'service' : 'product');
dol_fiche_head($head, 'price', $titre, -1, $picto);
-$linkback = '
'.$langs->trans("BackToList").' ';
+$linkback = '
'.$langs->trans("BackToList").' ';
$object->next_prev_filter=" fk_product_type = ".$object->type;
$shownav = 1;
diff --git a/htdocs/product/stats/card.php b/htdocs/product/stats/card.php
index 6389c5a8b8b..8f08e0b0317 100644
--- a/htdocs/product/stats/card.php
+++ b/htdocs/product/stats/card.php
@@ -138,7 +138,7 @@ if ($result && (! empty($id) || ! empty($ref)))
dol_fiche_head($head, 'stats', $titre, -1, $picto);
- $linkback = '
'.$langs->trans("BackToList").' ';
+ $linkback = '
'.$langs->trans("BackToList").' ';
dol_banner_tab($object, 'ref', $linkback, ($user->societe_id?0:1), 'ref', '', '', '', 0, '', '', 1);
diff --git a/htdocs/product/stats/commande.php b/htdocs/product/stats/commande.php
index 4eb8992d837..dc3d9a9b7d6 100644
--- a/htdocs/product/stats/commande.php
+++ b/htdocs/product/stats/commande.php
@@ -100,7 +100,7 @@ if ($id > 0 || ! empty($ref))
print $hookmanager->resPrint;
if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
- $linkback = '
'.$langs->trans("BackToList").' ';
+ $linkback = '
'.$langs->trans("BackToList").' ';
$shownav = 1;
if ($user->societe_id && ! in_array('product', explode(',',$conf->global->MAIN_MODULES_FOR_EXTERNAL))) $shownav=0;
diff --git a/htdocs/product/stats/commande_fournisseur.php b/htdocs/product/stats/commande_fournisseur.php
index 17d4bb5f962..4526af86f96 100644
--- a/htdocs/product/stats/commande_fournisseur.php
+++ b/htdocs/product/stats/commande_fournisseur.php
@@ -107,7 +107,7 @@ if ($id > 0 || ! empty($ref)) {
print $hookmanager->resPrint;
if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
- $linkback = '
'.$langs->trans("BackToList").' ';
+ $linkback = '
'.$langs->trans("BackToList").' ';
$shownav = 1;
if ($user->societe_id && ! in_array('product', explode(',',$conf->global->MAIN_MODULES_FOR_EXTERNAL))) $shownav=0;
diff --git a/htdocs/product/stats/contrat.php b/htdocs/product/stats/contrat.php
index 8780a8a6a3b..7882f251dbd 100644
--- a/htdocs/product/stats/contrat.php
+++ b/htdocs/product/stats/contrat.php
@@ -90,7 +90,7 @@ if ($id > 0 || ! empty($ref))
print $hookmanager->resPrint;
if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
- $linkback = '
'.$langs->trans("BackToList").' ';
+ $linkback = '
'.$langs->trans("BackToList").' ';
$shownav = 1;
if ($user->societe_id && ! in_array('product', explode(',',$conf->global->MAIN_MODULES_FOR_EXTERNAL))) $shownav=0;
diff --git a/htdocs/product/stats/facture.php b/htdocs/product/stats/facture.php
index 36359d1bd35..794d939bc6e 100644
--- a/htdocs/product/stats/facture.php
+++ b/htdocs/product/stats/facture.php
@@ -117,7 +117,7 @@ if ($id > 0 || ! empty($ref))
print $hookmanager->resPrint;
if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
- $linkback = '
'.$langs->trans("BackToList").' ';
+ $linkback = '
'.$langs->trans("BackToList").' ';
$shownav = 1;
if ($user->societe_id && ! in_array('product', explode(',',$conf->global->MAIN_MODULES_FOR_EXTERNAL))) $shownav=0;
diff --git a/htdocs/product/stats/facture_fournisseur.php b/htdocs/product/stats/facture_fournisseur.php
index 6618d8deac8..2e6b8d19677 100644
--- a/htdocs/product/stats/facture_fournisseur.php
+++ b/htdocs/product/stats/facture_fournisseur.php
@@ -102,7 +102,7 @@ if ($id > 0 || ! empty($ref))
print $hookmanager->resPrint;
if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
- $linkback = '
'.$langs->trans("BackToList").' ';
+ $linkback = '
'.$langs->trans("BackToList").' ';
$shownav = 1;
if ($user->societe_id && ! in_array('product', explode(',',$conf->global->MAIN_MODULES_FOR_EXTERNAL))) $shownav=0;
diff --git a/htdocs/product/stats/propal.php b/htdocs/product/stats/propal.php
index aa2c9a8e603..3173a04ee55 100644
--- a/htdocs/product/stats/propal.php
+++ b/htdocs/product/stats/propal.php
@@ -102,7 +102,7 @@ if ($id > 0 || ! empty($ref))
print $hookmanager->resPrint;
if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
- $linkback = '
'.$langs->trans("BackToList").' ';
+ $linkback = '
'.$langs->trans("BackToList").' ';
$shownav = 1;
if ($user->societe_id && ! in_array('product', explode(',',$conf->global->MAIN_MODULES_FOR_EXTERNAL))) $shownav=0;
diff --git a/htdocs/product/stats/supplier_proposal.php b/htdocs/product/stats/supplier_proposal.php
index 9406ade286f..07e8015d846 100644
--- a/htdocs/product/stats/supplier_proposal.php
+++ b/htdocs/product/stats/supplier_proposal.php
@@ -102,7 +102,7 @@ if ($id > 0 || ! empty($ref))
print $hookmanager->resPrint;
if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
- $linkback = '
'.$langs->trans("BackToList").' ';
+ $linkback = '
'.$langs->trans("BackToList").' ';
$shownav = 1;
if ($user->societe_id && ! in_array('product', explode(',',$conf->global->MAIN_MODULES_FOR_EXTERNAL))) $shownav=0;
diff --git a/htdocs/product/stock/product.php b/htdocs/product/stock/product.php
index 2963f5e278d..faee4d05a6a 100644
--- a/htdocs/product/stock/product.php
+++ b/htdocs/product/stock/product.php
@@ -544,7 +544,7 @@ if ($id > 0 || $ref)
dol_htmloutput_events();
- $linkback = '
'.$langs->trans("BackToList").' ';
+ $linkback = '
'.$langs->trans("BackToList").' ';
$shownav = 1;
if ($user->societe_id && ! in_array('stock', explode(',',$conf->global->MAIN_MODULES_FOR_EXTERNAL))) $shownav=0;
diff --git a/htdocs/product/traduction.php b/htdocs/product/traduction.php
index 791da80c05d..fd13aee1ea2 100644
--- a/htdocs/product/traduction.php
+++ b/htdocs/product/traduction.php
@@ -200,7 +200,7 @@ if (! empty($object->multilangs))
dol_fiche_head($head, 'translation', $titre, 0, $picto);
-$linkback = '
'.$langs->trans("BackToList").' ';
+$linkback = '
'.$langs->trans("BackToList").' ';
$shownav = 1;
if ($user->societe_id && ! in_array('product', explode(',',$conf->global->MAIN_MODULES_FOR_EXTERNAL))) $shownav=0;
diff --git a/htdocs/supplier_proposal/card.php b/htdocs/supplier_proposal/card.php
index a997b5f4b96..af192c63d1c 100644
--- a/htdocs/supplier_proposal/card.php
+++ b/htdocs/supplier_proposal/card.php
@@ -1327,7 +1327,7 @@ if ($action == 'create')
// Supplier proposal card
- $linkback = '
' . $langs->trans("BackToList") . ' ';
+ $linkback = '
' . $langs->trans("BackToList") . ' ';
$morehtmlref='
';
diff --git a/htdocs/supplier_proposal/class/supplier_proposal.class.php b/htdocs/supplier_proposal/class/supplier_proposal.class.php
index 53c2d4215df..8cad07a231e 100644
--- a/htdocs/supplier_proposal/class/supplier_proposal.class.php
+++ b/htdocs/supplier_proposal/class/supplier_proposal.class.php
@@ -2364,13 +2364,14 @@ class SupplierProposal extends CommonObject
/**
* Return clicable link of object (with eventually picto)
*
- * @param int $withpicto Add picto into link
- * @param string $option Where point the link ('compta', 'expedition', 'document', ...)
- * @param string $get_params Parametres added to url
- * @param int $notooltip 1=Disable tooltip
- * @return string String with URL
+ * @param int $withpicto Add picto into link
+ * @param string $option Where point the link ('compta', 'expedition', 'document', ...)
+ * @param string $get_params Parametres added to url
+ * @param int $notooltip 1=Disable tooltip
+ * @param int $save_lastsearch_value -1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
+ * @return string String with URL
*/
- function getNomUrl($withpicto=0,$option='', $get_params='', $notooltip=0)
+ function getNomUrl($withpicto=0, $option='', $get_params='', $notooltip=0, $save_lastsearch_value=-1)
{
global $langs, $conf, $user;
@@ -2397,6 +2398,14 @@ class SupplierProposal extends CommonObject
$url = DOL_URL_ROOT.'/supplier_proposal/document.php?id='.$this->id. $get_params;
}
+ if ($option !== 'nolink')
+ {
+ // Add param to save lastsearch_values or not
+ $add_save_lastsearch_values=($save_lastsearch_value == 1 ? 1 : 0);
+ if ($save_lastsearch_value == -1 && preg_match('/list\.php/',$_SERVER["PHP_SELF"])) $add_save_lastsearch_values=1;
+ if ($add_save_lastsearch_values) $url.='&save_lastsearch_values=1';
+ }
+
$linkclose='';
if (empty($notooltip) && $user->rights->propal->lire)
{
diff --git a/htdocs/supplier_proposal/document.php b/htdocs/supplier_proposal/document.php
index 4985fd34629..9bb7db0222b 100644
--- a/htdocs/supplier_proposal/document.php
+++ b/htdocs/supplier_proposal/document.php
@@ -94,7 +94,7 @@ if ($object->id > 0)
// Supplier proposal card
- $linkback = '
' . $langs->trans("BackToList") . ' ';
+ $linkback = '
' . $langs->trans("BackToList") . ' ';
$morehtmlref='
';
diff --git a/htdocs/supplier_proposal/info.php b/htdocs/supplier_proposal/info.php
index 8cee304e3bb..9f134b332ae 100644
--- a/htdocs/supplier_proposal/info.php
+++ b/htdocs/supplier_proposal/info.php
@@ -58,7 +58,7 @@ $head = supplier_proposal_prepare_head($object);
dol_fiche_head($head, 'info', $langs->trans('CommRequest'), -1, 'supplier_proposal');
// Supplier proposal card
-$linkback = '
' . $langs->trans("BackToList") . ' ';
+$linkback = '
' . $langs->trans("BackToList") . ' ';
$morehtmlref='
';
diff --git a/htdocs/supplier_proposal/note.php b/htdocs/supplier_proposal/note.php
index 10a9668382c..997cb67db2f 100644
--- a/htdocs/supplier_proposal/note.php
+++ b/htdocs/supplier_proposal/note.php
@@ -71,7 +71,7 @@ if ($id > 0 || ! empty($ref))
if ($object->fetch($id, $ref))
{
$object->fetch_thirdparty();
-
+
$societe = new Societe($db);
if ( $societe->fetch($object->socid) )
{
@@ -80,9 +80,9 @@ if ($id > 0 || ! empty($ref))
// Supplier proposal card
- $linkback = '
' . $langs->trans("BackToList") . ' ';
-
-
+ $linkback = '
' . $langs->trans("BackToList") . ' ';
+
+
$morehtmlref='
';
// Ref supplier
//$morehtmlref.=$form->editfieldkey("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, $user->rights->fournisseur->commande->creer, 'string', '', 0, 1);
@@ -123,17 +123,17 @@ if ($id > 0 || ! empty($ref))
}
}
$morehtmlref.='
';
-
-
+
+
dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
-
-
+
+
print '
';
print '
';
-
+
$cssclass="titlefield";
include DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php';
-
+
print '
';
dol_fiche_end();
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index 77ccbbcb219..a7c2d0f1a6b 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -2040,17 +2040,18 @@ class User extends CommonObject
* Return a link to the user card (with optionaly the picto)
* Use this->id,this->lastname, this->firstname
*
- * @param int $withpictoimg Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto, -1=Include photo into link, -2=Only picto photo, -3=Only photo very small)
- * @param string $option On what the link point to
- * @param integer $infologin Add complete info tooltip
- * @param integer $notooltip 1=Disable tooltip on picto and name
- * @param int $maxlen Max length of visible user name
- * @param int $hidethirdpartylogo Hide logo of thirdparty if user is external user
- * @param string $mode ''=Show firstname and lastname, 'firstname'=Show only firstname, 'login'=Show login
- * @param string $morecss Add more css on link
- * @return string String with URL
+ * @param int $withpictoimg Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto, -1=Include photo into link, -2=Only picto photo, -3=Only photo very small)
+ * @param string $option On what the link point to
+ * @param integer $infologin Add complete info tooltip
+ * @param integer $notooltip 1=Disable tooltip on picto and name
+ * @param int $maxlen Max length of visible user name
+ * @param int $hidethirdpartylogo Hide logo of thirdparty if user is external user
+ * @param string $mode ''=Show firstname and lastname, 'firstname'=Show only firstname, 'login'=Show login
+ * @param string $morecss Add more css on link
+ * @param int $save_lastsearch_value -1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
+ * @return string String with URL
*/
- function getNomUrl($withpictoimg=0, $option='', $infologin=0, $notooltip=0, $maxlen=24, $hidethirdpartylogo=0, $mode='',$morecss='')
+ function getNomUrl($withpictoimg=0, $option='', $infologin=0, $notooltip=0, $maxlen=24, $hidethirdpartylogo=0, $mode='',$morecss='', $save_lastsearch_value=-1)
{
global $langs, $conf, $db, $hookmanager;
global $dolibarr_main_authentication, $dolibarr_main_demo;
@@ -2108,10 +2109,18 @@ class User extends CommonObject
if (! empty($_SESSION["disablemodules"])) $label.= '
'.$langs->trans("DisabledModules").': '.join(', ',explode(',',$_SESSION["disablemodules"]));
}
+ if ($option == 'leave') $url.= DOL_URL_ROOT.'/holiday/list.php?id='.$this->id;
+ else $link.= $url.= DOL_URL_ROOT.'/user/card.php?id='.$this->id;
- if ($option == 'leave') $link.= '