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

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

Browse Source
This commit is contained in:
Laurent Destailleur 2014-02-15 15:23:42 +01:00
commit 46d1181aed
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -4,6 +4,8 @@ English Dolibarr ChangeLog
***** ChangeLog for 3.5.1 compared to 3.5.0 ***** ***** ChangeLog for 3.5.1 compared to 3.5.0 *****
Fix: Do not report trigger errors twice.
Fix: Error when creating event was not reported.
Fix: Bug of import of agenda when using https link Fix: Bug of import of agenda when using https link
Fix: Field nature not saved correctly Fix: Field nature not saved correctly
Fix: Substituion of extra field was ko for order Fix: Substituion of extra field was ko for order

2
htdocs/admin/delais.php
View File

@ -107,7 +107,7 @@ if ($action == 'update')
{ {
foreach($delays as $delay) foreach($delays as $delay)
{ {
if (GETPOST($delay['code'])) if (GETPOST($delay['code']) != '')
{ {
dolibarr_set_const($db, $delay['code'], GETPOST($delay['code']), 'chaine', 0, '', $conf->entity); dolibarr_set_const($db, $delay['code'], GETPOST($delay['code']), 'chaine', 0, '', $conf->entity);
} }

4
htdocs/comm/action/fiche.php
View File

@ -261,8 +261,8 @@ if ($action == 'add_action')
{ {
$db->rollback(); $db->rollback();
$langs->load("errors"); $langs->load("errors");
$error=$langs->trans($actioncomm->error); if (! empty($actioncomm->error)) setEventMessage($langs->trans($actioncomm->error), 'errors');
setEventMessage($error,'errors'); if (count($actioncomm->errors)) setEventMessage($actioncomm->errors, 'errors');
$action = 'create'; $action = 'create';
} }
} }

2
htdocs/core/class/interfaces.class.php
View File

@ -167,8 +167,8 @@ class Interfaces
// Action KO // Action KO
$nbtotal++; $nbtotal++;
$nbko++; $nbko++;
if (! empty($objMod->error)) $this->errors[]=$objMod->error;
if (! empty($objMod->errors)) $this->errors=array_merge($this->errors,$objMod->errors); if (! empty($objMod->errors)) $this->errors=array_merge($this->errors,$objMod->errors);
else if (! empty($objMod->error)) $this->errors[]=$objMod->error;
} }
} }
else else