diff --git a/htdocs/admin/holiday.php b/htdocs/admin/holiday.php index 21ae01b1f3f..2345f893bae 100644 --- a/htdocs/admin/holiday.php +++ b/htdocs/admin/holiday.php @@ -214,7 +214,7 @@ foreach ($dirmodels as $reldir) { } if ($module->isEnabled()) { - print ''.$module->nom."\n"; + print ''.$module->name."\n"; print $module->info($langs); print ''; diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php index e873930bf55..78dfaf6a63d 100644 --- a/htdocs/fourn/facture/list.php +++ b/htdocs/fourn/facture/list.php @@ -1508,6 +1508,9 @@ $totalarray['val']['f.total_vat'] = 0; $totalarray['val']['f.total_localtax1'] = 0; $totalarray['val']['f.total_localtax1'] = 0; $totalarray['val']['f.total_ttc'] = 0; +$totalarray['val']['totalam']=0; +$totalarray['val']['rtp']=0; + $imaxinloop = ($limit ? min($num, $limit) : $num); while ($i < $imaxinloop) { $obj = $db->fetch_object($resql); diff --git a/htdocs/fourn/paiement/info.php b/htdocs/fourn/paiement/info.php index 4ec07225f49..4687da22c8c 100644 --- a/htdocs/fourn/paiement/info.php +++ b/htdocs/fourn/paiement/info.php @@ -46,6 +46,7 @@ include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be includ $result = restrictedArea($user, $object->element, $object->id, 'paiementfourn', ''); // Security check +$socid = ''; // Prevents PHP Warning: Undefined variable $socid on line 55 if ($user->socid) { $socid = $user->socid; } diff --git a/htdocs/projet/class/task.class.php b/htdocs/projet/class/task.class.php index 57ec51cb9ad..302b5a7c88e 100644 --- a/htdocs/projet/class/task.class.php +++ b/htdocs/projet/class/task.class.php @@ -308,7 +308,14 @@ class Task extends CommonObjectLine if (!$error) { $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."projet_task"); + // Update extrafield + $result = $this->insertExtraFields(); + if ($result < 0) { + $error++; + } + } + if (!$error) { if (!$notrigger) { // Call trigger $result = $this->call_trigger('TASK_CREATE', $user); @@ -319,14 +326,6 @@ class Task extends CommonObjectLine } } - // Update extrafield - if (!$error) { - $result = $this->insertExtraFields(); - if ($result < 0) { - $error++; - } - } - // Commit or rollback if ($error) { foreach ($this->errors as $errmsg) {