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

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

Browse Source
This commit is contained in:
Laurent Destailleur 2018-04-11 13:21:36 +02:00
commit 4f7fbb80ba
6 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
htdocs/blockedlog/class/blockedlog.class.php
View File

@ -313,12 +313,15 @@ class BlockedLog
* @param Object $object object to store
* @param string $action action
* @param string $amounts amounts
* @param User $fuser User object (forced)
* @return int >0 if OK, <0 if KO
*/
public function setObjectData(&$object, $action, $amounts)
public function setObjectData(&$object, $action, $amounts, $fuser = null)
{
global $langs, $user, $mysoc;
if (is_object($fuser)) $user = $fuser;
// Generic fields
// action

2
htdocs/categories/viewcat.php
View File

@ -674,7 +674,7 @@ if ($type == Categorie::TYPE_PROJECT)
{
print "\t".'<tr class="oddeven">'."\n";
print '<td class="nowrap" valign="top">';
print $project->getNomUrl(1,0);
print $project->getNomUrl(1);
print "</td>\n";
print '<td class="tdtop">'.$project->ref."</td>\n";
print '<td class="tdtop">'.$project->title."</td>\n";

2
htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php
View File

@ -111,7 +111,7 @@ class InterfaceActionsBlockedLog extends DolibarrTriggers
return 0; // not implemented action log
}
$result = $b->setObjectData($object, $action, $amounts); // Set field date_object, ref_object, fk_object, element, object_data
$result = $b->setObjectData($object, $action, $amounts, $user); // Set field date_object, ref_object, fk_object, element, object_data
if ($result < 0)
{

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

@ -1356,6 +1356,8 @@ if ($action=='create')
dol_htmloutput_events();
$currency_code = $conf->currency;
$societe='';
if ($socid>0)
{

2
htdocs/install/upgrade.php
View File

@ -183,7 +183,7 @@ if (! GETPOST('action','aZ09') || preg_match('/upgrade/i',GETPOST('action','aZ09
print '<tr><td>'.$langs->trans("ServerVersion").'</td>';
print '<td align="right">'.$version.'</td></tr>';
dolibarr_install_syslog("upgrade: " . $langs->transnoentities("ServerVersion") . ": " .$version);
if ($db->type == 'mysqli')
if ($db->type == 'mysqli' && function_exists('mysqli_get_charset'))
{
$tmparray = $db->db->get_charset();
print '<tr><td>'.$langs->trans("ClientCharset").'</td>';

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

@ -942,7 +942,7 @@ class Societe extends CommonObject
$sql .= ",fk_effectif = ".(! empty($this->effectif_id)?"'".$this->db->escape($this->effectif_id)."'":"null");
if (isset($this->stcomm_id))
{
$sql .= ",fk_stcomm=".($this->stcomm_id > 0 ? $this->stcomm_id : "0");
$sql .= ",fk_stcomm=".(!empty($this->stcomm_id) ? $this->stcomm_id : "0");
}
$sql .= ",fk_typent = ".(! empty($this->typent_id)?"'".$this->db->escape($this->typent_id)."'":"0");