diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php
index 2e544a9953a..e3063f6f4e2 100644
--- a/htdocs/core/class/conf.class.php
+++ b/htdocs/core/class/conf.class.php
@@ -1018,7 +1018,9 @@ class Conf
}
if (empty($handler_file_found)) {
- throw new Exception('Missing log handler file '.$handler.'.php');
+ // If log handler has been removed of is badly setup, we must be able to continue code.
+ //throw new Exception('Missing log handler file '.$handler.'.php');
+ continue;
}
require_once $handler_file_found;
diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php
index 0a54792c665..f9419653c2f 100644
--- a/htdocs/fourn/facture/list.php
+++ b/htdocs/fourn/facture/list.php
@@ -1464,8 +1464,8 @@ if ($resql) {
}
// Zip
if (!empty($arrayfields['s.zip']['checked'])) {
- print '
';
- print $obj->zip;
+ print ' | ';
+ print dol_escape_htmltag($obj->zip);
print ' | ';
if (!$i) {
$totalarray['nbfield']++;
diff --git a/htdocs/public/recruitment/index.php b/htdocs/public/recruitment/index.php
index ce30306eb2f..632a3f57da2 100644
--- a/htdocs/public/recruitment/index.php
+++ b/htdocs/public/recruitment/index.php
@@ -272,9 +272,10 @@ if (is_array($results)) {
if ($action != 'dosubmit') {
- if ($found && !$error) { // We are in a management option and no error
+ if ($found && !$error) {
+ // We are in a management option and no error
} else {
- dol_print_error_email('ERRORNEWONLINESIGN');
+ dol_print_error_email('ERRORSUBMITAPPLICATION');
}
} else {
// Print
diff --git a/htdocs/public/recruitment/view.php b/htdocs/public/recruitment/view.php
index 4516b9c0d2f..b92dcbf9824 100644
--- a/htdocs/public/recruitment/view.php
+++ b/htdocs/public/recruitment/view.php
@@ -323,9 +323,10 @@ print "\n";
if ($action != 'dosubmit') {
- if ($found && !$error) { // We are in a management option and no error
+ if ($found && !$error) {
+ // We are in a management option and no error
} else {
- dol_print_error_email('ERRORNEWONLINESIGN');
+ dol_print_error_email('ERRORSUBMITAPPLICATION');
}
} else {
// Print
diff --git a/htdocs/societe/class/api_thirdparties.class.php b/htdocs/societe/class/api_thirdparties.class.php
index 962bbf021b8..5021712c010 100644
--- a/htdocs/societe/class/api_thirdparties.class.php
+++ b/htdocs/societe/class/api_thirdparties.class.php
@@ -425,8 +425,9 @@ class Thirdparties extends DolibarrApi
// TODO Mutualise the list into object societe.class.php
$objects = array(
'Adherent' => '/adherents/class/adherent.class.php',
+ 'Don' => '/don/class/don.class.php',
'Societe' => '/societe/class/societe.class.php',
- 'Categorie' => '/categories/class/categorie.class.php',
+ //'Categorie' => '/categories/class/categorie.class.php',
'ActionComm' => '/comm/action/class/actioncomm.class.php',
'Propal' => '/comm/propal/class/propal.class.php',
'Commande' => '/commande/class/commande.class.php',
@@ -442,12 +443,13 @@ class Thirdparties extends DolibarrApi
'FactureFournisseur' => '/fourn/class/fournisseur.facture.class.php',
'SupplierProposal' => '/supplier_proposal/class/supplier_proposal.class.php',
'ProductFournisseur' => '/fourn/class/fournisseur.product.class.php',
- 'Livraison' => '/delivery/class/delivery.class.php',
+ 'Delivery' => '/delivery/class/delivery.class.php',
'Product' => '/product/class/product.class.php',
'Project' => '/projet/class/project.class.php',
'Ticket' => '/ticket/class/ticket.class.php',
'User' => '/user/class/user.class.php',
- 'Account' => '/compta/bank/class/account.class.php'
+ 'Account' => '/compta/bank/class/account.class.php',
+ 'ConferenceOrBoothAttendee' => '/eventorganization/class/conferenceorboothattendee.class.php'
);
//First, all core objects must update their tables