lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

Browse Source
This commit is contained in:
Laurent Destailleur 2017-06-11 10:38:09 +02:00
commit 961594afad
4 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
htdocs/expedition/class/expedition.class.php
View File

@ -195,6 +195,7 @@ class Expedition extends CommonObject
// Clean parameters
$this->brouillon = 1;
$this->tracking_number = dol_sanitizeFileName($this->tracking_number);
if (empty($this->fk_project)) $this->fk_project = 0;
$this->user = $user;

3
htdocs/fourn/class/paiementfourn.class.php
View File

@ -531,9 +531,10 @@ class PaiementFourn extends Paiement
*
* @param int $withpicto 0=No picto, 1=Include picto into link, 2=Only picto
* @param string $option Sur quoi pointe le lien
* @param string $mode 'withlistofinvoices'=Include list of invoices into tooltip
* @return string Chaine avec URL
*/
function getNomUrl($withpicto=0,$option='')
function getNomUrl($withpicto=0,$option='',$mode='withlistofinvoices')
{
global $langs;

2
htdocs/fourn/facture/card.php
View File

@ -218,7 +218,7 @@ if (empty($reshook))
{
$object->fetch($id);
$object->fetch_thirdparty();
$result=$object->delete($id);
$result=$object->delete($user);
if ($result > 0)
{
header('Location: list.php');

2
htdocs/projet/ajax/projects.php
View File

@ -61,7 +61,7 @@ $idprod = (! empty($match[0]) ? $match[0] : '');
if (! GETPOST($htmlname) && ! GETPOST($idprod)) return;
// When used from jQuery, the search term is added as GET param "term".
$searchkey=(GETPOST($idprod)?GETPOST($idprod):(GETPOST($htmlname)?GETPOST($htmlname):''));
$searchkey=((!empty($idprod) && GETPOST($idprod))?GETPOST($idprod):(GETPOST($htmlname)?GETPOST($htmlname):''));
$form = new FormProjets($db);
$arrayresult=$form->select_projects_list($socid, '', $htmlname, 0, 0, 1, $discard_closed, 0, 0, 1, $searchkey);