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

# WARNING: head commit changed in the meantime

Browse Source 
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
This commit is contained in:
Laurent Destailleur 2022-08-14 19:22:58 +02:00
commit 6a61c495b3
5 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/core/class/conf.class.php
View File

@ -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;

4
htdocs/fourn/facture/list.php
View File

@ -1464,8 +1464,8 @@ if ($resql) {
}
// Zip
if (!empty($arrayfields['s.zip']['checked'])) {
print '<td class="nocellnopadd center">';
print $obj->zip;
print '<td class="nocellnopadd center tdoverflowmax100" title="'.dol_escape_htmltag($obj->zip).'">';
print dol_escape_htmltag($obj->zip);
print '</td>';
if (!$i) {
$totalarray['nbfield']++;

5
htdocs/public/recruitment/index.php
View File

@ -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

5
htdocs/public/recruitment/view.php
View File

@ -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

8
htdocs/societe/class/api_thirdparties.class.php
View File

@ -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