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

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

Browse Source
This commit is contained in:
Laurent Destailleur 2014-08-26 15:24:51 +02:00
commit 21ff810952
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/core/menus/standard/eldy.lib.php
View File

@ -1236,7 +1236,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
else dol_print_error($db); else dol_print_error($db);
$db->free($resql); $db->free($resql);
} }
if ($conf->ftp->enabled && $mainmenu == 'ftp') // Entry for FTP if (!empty($conf->ftp->enabled) && $mainmenu == 'ftp') // Entry for FTP
{ {
$MAXFTP=20; $MAXFTP=20;
$i=1; $i=1;

2
htdocs/fichinter/class/fichinter.class.php
View File

@ -227,7 +227,7 @@ class Fichinter extends CommonObject
$this->db->begin(); $this->db->begin();
$sql = "UPDATE ".MAIN_DB_PREFIX."fichinter SET "; $sql = "UPDATE ".MAIN_DB_PREFIX."fichinter SET ";
$sql.= ", description = '".$this->db->escape($this->description)."'"; $sql.= "description = '".$this->db->escape($this->description)."'";
$sql.= ", duree = ".$this->duree; $sql.= ", duree = ".$this->duree;
$sql.= ", fk_projet = ".$this->fk_project; $sql.= ", fk_projet = ".$this->fk_project;
$sql.= ", note_private = ".($this->note_private?"'".$this->db->escape($this->note_private)."'":"null"); $sql.= ", note_private = ".($this->note_private?"'".$this->db->escape($this->note_private)."'":"null");