"; $contact->array_options['options_datapolicy_send'] = date('Y-m-d', time()); $contact->update($contact->id); - } else { dol_print_error($db); } @@ -348,7 +347,6 @@ Class DataPolicy extends Contact $resultmasssend .= $langs->trans("MailSent") . ': ' . $sendto . "
"; $adherent->array_options['options_datapolicy_send'] = date('Y-m-d', time()); $adherent->update($user); - } else { dol_print_error($db); } diff --git a/htdocs/datapolicy/class/datapolicycron.class.php b/htdocs/datapolicy/class/datapolicycron.class.php index f6de8b9b498..ab4b55b35dc 100644 --- a/htdocs/datapolicy/class/datapolicycron.class.php +++ b/htdocs/datapolicy/class/datapolicycron.class.php @@ -488,14 +488,12 @@ class DataPolicyCron $ret = $object->delete(); } } - } $i++; } } } - } return true; } diff --git a/htdocs/datapolicy/mailing.php b/htdocs/datapolicy/mailing.php index d65b2bdced4..e3f38b269be 100644 --- a/htdocs/datapolicy/mailing.php +++ b/htdocs/datapolicy/mailing.php @@ -31,8 +31,6 @@ if(!empty($idcontact)){ $contact = new Contact($db); $contact->fetch($idcontact); DataPolicy::sendMailDataPolicyContact($contact); - - }else{ $contacts = new DataPolicy($db); diff --git a/htdocs/don/card.php b/htdocs/don/card.php index d9542dcaaf0..38465de95ca 100644 --- a/htdocs/don/card.php +++ b/htdocs/don/card.php @@ -375,7 +375,6 @@ if ($action == 'create') print ''; } print '' . "\n"; - } // Date diff --git a/htdocs/don/document.php b/htdocs/don/document.php index 177b2b82d8b..01aab513a6a 100644 --- a/htdocs/don/document.php +++ b/htdocs/don/document.php @@ -184,7 +184,6 @@ if ($object->id) $permtoedit = $user->rights->don->creer; $param = '&id=' . $object->id; include_once DOL_DOCUMENT_ROOT . '/core/tpl/document_actions_post_headers.tpl.php'; - } else { diff --git a/htdocs/don/payment/card.php b/htdocs/don/payment/card.php index dde03cb461d..1c3a60e7e78 100644 --- a/htdocs/don/payment/card.php +++ b/htdocs/don/payment/card.php @@ -133,7 +133,6 @@ dol_fiche_head($head, $hselected, $langs->trans("DonationPayment"), -1, 'payment if ($action == 'delete') { print $form->formconfirm('card.php?id='.$object->id, $langs->trans("DeletePayment"), $langs->trans("ConfirmDeletePayment"), 'confirm_delete','',0,2); - } /* @@ -143,7 +142,6 @@ if ($action == 'valide') { $facid = GETPOST('facid','int'); print $form->formconfirm('card.php?id='.$object->id.'&facid='.$facid, $langs->trans("ValidatePayment"), $langs->trans("ConfirmValidatePayment"), 'confirm_valide','',0,2); - } diff --git a/htdocs/ecm/class/ecmdirectory.class.php b/htdocs/ecm/class/ecmdirectory.class.php index 9038b74cb2a..d3fdd115ffa 100644 --- a/htdocs/ecm/class/ecmdirectory.class.php +++ b/htdocs/ecm/class/ecmdirectory.class.php @@ -680,7 +680,6 @@ class EcmDirectory // extends CommonObject } } $i++; - } } else diff --git a/htdocs/ecm/dir_add_card.php b/htdocs/ecm/dir_add_card.php index 5dab56b29a0..922c06f0cc2 100644 --- a/htdocs/ecm/dir_add_card.php +++ b/htdocs/ecm/dir_add_card.php @@ -290,7 +290,6 @@ if (empty($action) || $action == 'delete_section') if ($action == 'delete_section') { print $form->formconfirm($_SERVER["PHP_SELF"].'?section='.$section, $langs->trans('DeleteSection'), $langs->trans('ConfirmDeleteSection',$ecmdir->label), 'confirm_deletesection'); - } // Construit fiche rubrique diff --git a/htdocs/ecm/dir_card.php b/htdocs/ecm/dir_card.php index 982fa045d32..7c3473117fc 100644 --- a/htdocs/ecm/dir_card.php +++ b/htdocs/ecm/dir_card.php @@ -271,7 +271,6 @@ if ($action == 'update' && ! GETPOST('cancel','alpha')) $upload_dir = $conf->medias->multidir_output[$conf->entity].'/'.$relativepath; $section = $relativepath; } - } } diff --git a/htdocs/ecm/file_card.php b/htdocs/ecm/file_card.php index b1b45141f4f..959a4bc5b8d 100644 --- a/htdocs/ecm/file_card.php +++ b/htdocs/ecm/file_card.php @@ -390,7 +390,6 @@ if ($action == 'edit') if ($action == 'delete_file') { print $form->formconfirm($_SERVER["PHP_SELF"].'?section='.urlencode($section), $langs->trans('DeleteFile'), $langs->trans('ConfirmDeleteFile',$urlfile), 'confirm_deletefile', '', 1, 1); - } if ($action != 'edit') diff --git a/htdocs/ecm/index_auto.php b/htdocs/ecm/index_auto.php index 382312e4434..ea5e5c13ff2 100644 --- a/htdocs/ecm/index_auto.php +++ b/htdocs/ecm/index_auto.php @@ -343,7 +343,6 @@ dol_fiche_head($head, 'index_auto', $langs->trans("ECMArea").' - '.$langs->trans if ($action == 'delete' && empty($conf->use_javascript_ajax)) { print $form->formconfirm($_SERVER["PHP_SELF"].'?section='.$section.'&urlfile='.urlencode($_GET["urlfile"]), $langs->trans('DeleteFile'), $langs->trans('ConfirmDeleteFile'), 'confirm_deletefile','','',1); - } // Start container of all panels diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php index 69deecdf4c0..292bf5e1de8 100644 --- a/htdocs/expedition/card.php +++ b/htdocs/expedition/card.php @@ -316,7 +316,6 @@ if (empty($reshook)) unset($_POST["options_" . $key]); } } - } //var_dump($batch_line[2]); @@ -859,7 +858,6 @@ if (empty($reshook)) $mode='emailfromshipment'; $trackid='shi'.$object->id; include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php'; - } @@ -1421,7 +1419,6 @@ if ($action == 'create') print ''; print '('.$stock.')'; - } else { @@ -1522,7 +1519,6 @@ if ($action == 'create') } } } - } if ($subj == 0) // Line not shown yet, we show it { @@ -1669,13 +1665,11 @@ else if ($id || $ref) } $formconfirm=$form->formconfirm($_SERVER['PHP_SELF'].'?id='.$object->id,$langs->trans('ValidateSending'),$text,'confirm_valid','',0,1); - } // Confirm cancelation if ($action == 'annuler') { $formconfirm=$form->formconfirm($_SERVER['PHP_SELF'].'?id='.$object->id,$langs->trans('CancelSending'),$langs->trans("ConfirmCancelSending",$object->ref),'confirm_cancel','',0,1); - } // Call Hook formConfirm @@ -1826,7 +1820,6 @@ else if ($id || $ref) print ' '; print ' '; print ''; - } else { @@ -1864,7 +1857,6 @@ else if ($id || $ref) print ' '; print ' '; print ''; - } else { @@ -2536,7 +2528,6 @@ else if ($id || $ref) { print ''.$langs->trans("Delete").''; } - } print ''; diff --git a/htdocs/expedition/class/api_shipments.class.php b/htdocs/expedition/class/api_shipments.class.php index 109b847fc62..834c0bf2bda 100644 --- a/htdocs/expedition/class/api_shipments.class.php +++ b/htdocs/expedition/class/api_shipments.class.php @@ -661,7 +661,6 @@ class Shipments extends DolibarrApi if (!isset($data[$field])) throw new RestException(400, "$field field missing"); $shipment[$field] = $data[$field]; - } return $shipment; } diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php index 77df09ee276..751516fc18d 100644 --- a/htdocs/expedition/class/expedition.class.php +++ b/htdocs/expedition/class/expedition.class.php @@ -383,7 +383,6 @@ class Expedition extends CommonObject $this->db->rollback(); return -1*$error; } - } else { @@ -760,7 +759,6 @@ class Expedition extends CommonObject $this->error=$this->db->error(); return -2; } - } // Change status of order to "shipment in process" @@ -2129,7 +2127,6 @@ class Expedition extends CommonObject if ($result < 0) { $error++; } - } else { $error++; $this->errors[]=$this->db->lasterror; @@ -2256,7 +2253,6 @@ class Expedition extends CommonObject $error++; } } - } else { $error++; $this->errors[]=$this->db->lasterror(); diff --git a/htdocs/expedition/contact.php b/htdocs/expedition/contact.php index acc2b5e1142..ce31e760b7f 100644 --- a/htdocs/expedition/contact.php +++ b/htdocs/expedition/contact.php @@ -265,7 +265,6 @@ if ($id > 0 || ! empty($ref)) $res=@include dol_buildpath($reldir.'/contacts.tpl.php'); if ($res) break; } - } // End of page diff --git a/htdocs/expedition/list.php b/htdocs/expedition/list.php index 327a9394b77..c3632ca57fd 100644 --- a/htdocs/expedition/list.php +++ b/htdocs/expedition/list.php @@ -160,7 +160,6 @@ if (empty($reshook)) setEventMessages($langs->trans('TooManyRecordForMassAction',$maxformassaction), null, 'errors'); $error++; } - } diff --git a/htdocs/expedition/shipment.php b/htdocs/expedition/shipment.php index 33e1dd97f7b..920b5508e59 100644 --- a/htdocs/expedition/shipment.php +++ b/htdocs/expedition/shipment.php @@ -215,7 +215,6 @@ if (empty($reshook)) } include DOL_DOCUMENT_ROOT.'/core/actions_printing.inc.php'; - } /* @@ -257,7 +256,6 @@ if ($id > 0 || ! empty($ref)) if ($action == 'cloture') { $formconfirm = $form->formconfirm($_SERVER['PHP_SELF']."?id=".$id,$langs->trans("CloseShipment"),$langs->trans("ConfirmCloseShipment"),"confirm_cloture"); - } // Call Hook formConfirm @@ -908,7 +906,6 @@ if ($id > 0 || ! empty($ref)) print ''; $somethingshown=1; - } else { diff --git a/htdocs/expensereport/card.php b/htdocs/expensereport/card.php index d877ad00b2f..7174e42f363 100644 --- a/htdocs/expensereport/card.php +++ b/htdocs/expensereport/card.php @@ -1160,7 +1160,6 @@ if (empty($reshook)) unset($fk_projet); unset($date); - } else { setEventMessages($object->error, $object->errors, 'errors'); } @@ -1552,7 +1551,6 @@ else $userfee->fetch($user->id); print $userfee->getNomUrl(-1); print ''; - } // Other attributes @@ -2225,17 +2223,13 @@ else print ''; dol_fiche_end(); - } // end edit or not edit - } // end of if result else { dol_print_error($db); } - } //fin si id > 0 - } /* @@ -2449,7 +2443,6 @@ if ($action != 'presend') $somethingshown = $formactions->showactions($object, 'expensereport', null); print ''; - } // Presend form diff --git a/htdocs/expensereport/class/api_expensereports.class.php b/htdocs/expensereport/class/api_expensereports.class.php index 80c22fb961a..e6475665fb8 100644 --- a/htdocs/expensereport/class/api_expensereports.class.php +++ b/htdocs/expensereport/class/api_expensereports.class.php @@ -522,7 +522,6 @@ class ExpenseReports extends DolibarrApi if (!isset($data[$field])) throw new RestException(400, "$field field missing"); $expensereport[$field] = $data[$field]; - } return $expensereport; } diff --git a/htdocs/expensereport/class/expensereport.class.php b/htdocs/expensereport/class/expensereport.class.php index 6cc7b13ee7c..2b343dd0074 100644 --- a/htdocs/expensereport/class/expensereport.class.php +++ b/htdocs/expensereport/class/expensereport.class.php @@ -719,7 +719,6 @@ class ExpenseReport extends CommonObject $auser->fetch($obj->fk_user_approve); $this->user_approve = $auser; } - } $this->db->free($resql); } @@ -891,7 +890,6 @@ class ExpenseReport extends CommonObject print '
';
diff --git a/htdocs/fichinter/card-rec.php b/htdocs/fichinter/card-rec.php
index 66f693858c9..0113f7fbea6 100644
--- a/htdocs/fichinter/card-rec.php
+++ b/htdocs/fichinter/card-rec.php
@@ -420,7 +420,6 @@ if ($action == 'create') {
$i++;
}
$db->free($result);
-
} else
print $db->error();
print "";
@@ -439,7 +438,6 @@ if ($action == 'create') {
}
else
dol_print_error('', "Error, no invoice ".$object->id);
-
} elseif ($action == 'selsocforcreatefrommodel') {
print load_fiche_titre($langs->trans("CreateRepeatableIntervention"), '', 'title_commercial.png');
dol_fiche_head('');
@@ -574,11 +572,9 @@ if ($action == 'create') {
print $contratstatic->getNomUrl(0, '', 1);
} else
print " ";
-
}
print '';
print '';
-
}
print "";
print '
';
@@ -775,7 +771,6 @@ if ($action == 'create') {
print '';
} else
print $langs->trans("ErrorRecordNotFound");
-
} else {
/*
* List mode
diff --git a/htdocs/fichinter/card.php b/htdocs/fichinter/card.php
index 75866d586f6..5896a5c5723 100644
--- a/htdocs/fichinter/card.php
+++ b/htdocs/fichinter/card.php
@@ -378,10 +378,8 @@ if (empty($reshook))
$error++;
break;
}
-
}
}
-
}
else
{
@@ -1099,7 +1097,6 @@ if ($action == 'create')
print '';
}
-
}
else if ($id > 0 || ! empty($ref))
{
@@ -1471,8 +1468,6 @@ else if ($id > 0 || ! empty($ref))
$line->fetch_optionals();
print $line->showOptionals($extrafieldsline, 'view', array('style'=>$bc[$var], 'colspan'=>5));
-
-
}
// Line in update mode
@@ -1519,8 +1514,6 @@ else if ($id > 0 || ! empty($ref))
$line->fetch_optionals();
print $line->showOptionals($extrafieldsline, 'edit', array('style'=>$bc[$var], 'colspan'=>5));
-
-
}
$i++;
@@ -1711,7 +1704,6 @@ else if ($id > 0 || ! empty($ref))
print '';
}
-
}
}
}
diff --git a/htdocs/fichinter/class/fichinter.class.php b/htdocs/fichinter/class/fichinter.class.php
index d8be14c298a..05a139e2a9a 100644
--- a/htdocs/fichinter/class/fichinter.class.php
+++ b/htdocs/fichinter/class/fichinter.class.php
@@ -882,7 +882,6 @@ class Fichinter extends CommonObject
$muser->fetch($obj->fk_user_modification);
$this->user_modification = $muser;
}
-
}
$this->db->free($resql);
}
diff --git a/htdocs/fichinter/contact.php b/htdocs/fichinter/contact.php
index d3b2ea6f78e..b69aa5952fa 100644
--- a/htdocs/fichinter/contact.php
+++ b/htdocs/fichinter/contact.php
@@ -185,7 +185,6 @@ if ($id > 0 || ! empty($ref))
$res=@include dol_buildpath($reldir.'/contacts.tpl.php');
if ($res) break;
}
-
}
diff --git a/htdocs/fichinter/document.php b/htdocs/fichinter/document.php
index d52ed81da48..42273785a61 100644
--- a/htdocs/fichinter/document.php
+++ b/htdocs/fichinter/document.php
@@ -168,7 +168,6 @@ if ($object->id)
$permtoedit = $user->rights->ficheinter->creer;
$param = '&id=' . $object->id;
include_once DOL_DOCUMENT_ROOT . '/core/tpl/document_actions_post_headers.tpl.php';
-
}
else
{
diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index ce9665cc6c8..ced75842606 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -2132,7 +2132,6 @@ class CommandeFournisseur extends CommonOrder
$this->errors[]='ErrorCantSetReceptionToTotalDoneWithReceptionToApprove';
dol_syslog('ErrorCantSetReceptionToTotalDoneWithReceptionToApprove', LOG_DEBUG);
}
-
}
if (! $error && ! empty($conf->global->SUPPLIER_ORDER_USE_DISPATCH_STATUS_NEED_APPROVE) && ($type == 'tot')) // Accept to move to reception done, only if status of all line are ok (refuse denied)
{
@@ -3088,7 +3087,6 @@ class CommandeFournisseur extends CommonOrder
{
$close++;
}
-
}
}
@@ -3112,8 +3110,6 @@ class CommandeFournisseur extends CommonOrder
}
return 4;
}
-
-
}
else
{//all the products are not received
@@ -3123,7 +3119,6 @@ class CommandeFournisseur extends CommonOrder
}
return 4;
}
-
}
else
{
diff --git a/htdocs/fourn/class/fournisseur.commande.dispatch.class.php b/htdocs/fourn/class/fournisseur.commande.dispatch.class.php
index 2bcdce36b3c..c7b5d00c797 100644
--- a/htdocs/fourn/class/fournisseur.commande.dispatch.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.dispatch.class.php
@@ -279,8 +279,6 @@ class CommandeFournisseurDispatch extends CommonObject
$this->batch = $obj->batch;
$this->eatby = $this->db->jdate($obj->eatby);
$this->sellby = $this->db->jdate($obj->sellby);
-
-
}
$this->db->free($resql);
diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php
index f4c37a1113c..58230038fcc 100644
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -680,7 +680,6 @@ class FactureFournisseur extends CommonInvoice
$this->error=$this->db->lasterror();
return -3;
}
-
}
else
{
@@ -3152,7 +3151,6 @@ class SupplierInvoiceLine extends CommonObjectLine
$this->db->commit();
return $this->id;
-
}
else
{
diff --git a/htdocs/fourn/class/paiementfourn.class.php b/htdocs/fourn/class/paiementfourn.class.php
index fcf7332dbd0..a366faa0400 100644
--- a/htdocs/fourn/class/paiementfourn.class.php
+++ b/htdocs/fourn/class/paiementfourn.class.php
@@ -262,7 +262,6 @@ class PaiementFourn extends Paiement
$this->error=$this->db->lasterror();
$error++;
}
-
}
else
{
diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index 134856112d4..70fcaf004fb 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -221,7 +221,6 @@ if (empty($reshook))
//$newstatus=3; // Submited
// TODO If there is at least one reception, we can set to Received->Received partially
$newstatus=4; // Received partially
-
}
else if ($object->statut == 6) $newstatus=2; // Canceled->Approved
else if ($object->statut == 7) $newstatus=3; // Canceled->Process running
@@ -700,7 +699,6 @@ if (empty($reshook))
dol_print_error($db,$object->error);
exit;
}
-
}
// Remove a product line
@@ -1443,7 +1441,6 @@ if ($action=='create')
// Object source contacts list
$srccontactslist = $objectsrc->liste_contact(- 1, 'external', 1);
-
}
else
{
@@ -1700,7 +1697,6 @@ elseif (! empty($object->id))
if ($action == 'delete')
{
$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('DeleteOrder'), $langs->trans('ConfirmDeleteOrder'), 'confirm_delete', '', 0, 2);
-
}
// Clone confirmation
@@ -1712,7 +1708,6 @@ elseif (! empty($object->id))
);
// Paiement incomplet. On demande si motif = escompte ou autre
$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id,$langs->trans('CloneOrder'),$langs->trans('ConfirmCloneOrder',$object->ref),'confirm_clone',$formquestion,'yes',1);
-
}
// Confirmation de la validation
@@ -1791,14 +1786,12 @@ elseif (! empty($object->id))
if ($action == 'refuse')
{
$formconfirm = $form->formconfirm($_SERVER['PHP_SELF']."?id=$object->id",$langs->trans("DenyingThisOrder"),$langs->trans("ConfirmDenyingThisOrder",$object->ref),"confirm_refuse", '', 0, 1);
-
}
// Confirmation de l'annulation
if ($action == 'cancel')
{
$formconfirm = $form->formconfirm($_SERVER['PHP_SELF']."?id=$object->id",$langs->trans("Cancel"),$langs->trans("ConfirmCancelThisOrder",$object->ref),"confirm_cancel", '', 0, 1);
-
}
// Confirmation de l'envoi de la commande
@@ -1806,7 +1799,6 @@ elseif (! empty($object->id))
{
$date_com = dol_mktime(GETPOST('rehour'),GETPOST('remin'),GETPOST('resec'),GETPOST("remonth"),GETPOST("reday"),GETPOST("reyear"));
$formconfirm = $form->formconfirm($_SERVER['PHP_SELF']."?id=".$object->id."&datecommande=".$date_com."&methode=".$_POST["methodecommande"]."&comment=".urlencode($_POST["comment"]), $langs->trans("MakeOrder"),$langs->trans("ConfirmMakeOrder",dol_print_date($date_com,'day')),"confirm_commande",'',0,2);
-
}
// Confirmation to delete line
@@ -2449,7 +2441,6 @@ elseif (! empty($object->id))
{
print ''.$langs->trans("Delete").'';
}
-
}
print "";
@@ -2724,7 +2715,6 @@ elseif (! empty($object->id))
}
}
}
-
}
elseif ($user_status_code == "PERMISSION_DENIED")
{
diff --git a/htdocs/fourn/commande/contact.php b/htdocs/fourn/commande/contact.php
index 85739bdb6ef..c69c92ead29 100644
--- a/htdocs/fourn/commande/contact.php
+++ b/htdocs/fourn/commande/contact.php
@@ -192,7 +192,6 @@ if ($id > 0 || ! empty($ref))
// Contacts lines
include DOL_DOCUMENT_ROOT.'/core/tpl/contacts.tpl.php';
-
}
else
{
diff --git a/htdocs/fourn/commande/document.php b/htdocs/fourn/commande/document.php
index 8aa4da9c307..eb299d6a94d 100644
--- a/htdocs/fourn/commande/document.php
+++ b/htdocs/fourn/commande/document.php
@@ -175,7 +175,6 @@ if ($object->id > 0)
$permtoedit = $user->rights->fournisseur->commande->creer;
$param = '&id=' . $object->id;
include_once DOL_DOCUMENT_ROOT . '/core/tpl/document_actions_post_headers.tpl.php';
-
}
else
{
diff --git a/htdocs/fourn/commande/list.php b/htdocs/fourn/commande/list.php
index 06857526731..7158d7b2c0e 100644
--- a/htdocs/fourn/commande/list.php
+++ b/htdocs/fourn/commande/list.php
@@ -263,7 +263,6 @@ if (empty($reshook))
$res = $object->create($user);
if($res > 0) $nb_bills_created++;
-
}
if ($object->id > 0)
diff --git a/htdocs/fourn/commande/orderstoinvoice.php b/htdocs/fourn/commande/orderstoinvoice.php
index 9b9743f201f..5456627384e 100644
--- a/htdocs/fourn/commande/orderstoinvoice.php
+++ b/htdocs/fourn/commande/orderstoinvoice.php
@@ -261,7 +261,6 @@ if (($action == 'create' || $action == 'add') && ! $error) {
$error++;
break;
}
-
}
}
@@ -270,7 +269,6 @@ if (($action == 'create' || $action == 'add') && ! $error) {
header('Location: ' . DOL_URL_ROOT . '/fourn/facture/card.php?facid=' . $id);
exit();
}
-
} else {
$db->rollback();
$action = 'create';
diff --git a/htdocs/fourn/contact.php b/htdocs/fourn/contact.php
index a6adb0bad27..3225ce63714 100644
--- a/htdocs/fourn/contact.php
+++ b/htdocs/fourn/contact.php
@@ -123,7 +123,6 @@ if ($result)
}
print "";
$db->free($result);
-
}
else
{
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index af7f21f3628..9df540da197 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -525,7 +525,6 @@ if (empty($reshook))
{
$error++;
}
-
}
if ($object->type == FactureFournisseur::TYPE_CREDIT_NOTE || $object->type == FactureFournisseur::TYPE_DEPOSIT)
{
@@ -543,7 +542,6 @@ if (empty($reshook))
break;
}
}
-
}
if (empty($error))
@@ -757,7 +755,6 @@ if (empty($reshook))
$object->update_price(1);
}
-
}
if(GETPOST('invoiceAvoirWithPaymentRestAmount', 'int')==1 && $id>0)
@@ -1669,7 +1666,6 @@ if ($action == 'create')
// Replicate extrafields
$objectsrc->fetch_optionals($originid);
$object->array_options = $objectsrc->array_options;
-
}
}
else
@@ -2257,7 +2253,6 @@ else
}
$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ValidateBill'), $text, 'confirm_valid', $formquestion, 1, 1);
-
}
// Confirmation edit (back to draft)
@@ -2293,27 +2288,23 @@ else
);
}
$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('UnvalidateBill'), $langs->trans('ConfirmUnvalidateBill', $object->ref), 'confirm_edit', $formquestion, 1, 1);
-
}
// Confirmation set paid
if ($action == 'paid')
{
$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ClassifyPaid'), $langs->trans('ConfirmClassifyPaidBill', $object->ref), 'confirm_paid', '', 0, 1);
-
}
// Confirmation de la suppression de la facture fournisseur
if ($action == 'delete')
{
$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('DeleteBill'), $langs->trans('ConfirmDeleteBill'), 'confirm_delete', '', 0, 1);
-
}
if ($action == 'deletepaiement')
{
$payment_id = GETPOST('paiement_id');
$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&paiement_id='.$payment_id, $langs->trans('DeletePayment'), $langs->trans('ConfirmDeletePayment'), 'confirm_delete_paiement', '', 0, 1);
-
}
// Confirmation to delete line
diff --git a/htdocs/fourn/facture/contact.php b/htdocs/fourn/facture/contact.php
index cb17be828ca..58e5630c0d6 100644
--- a/htdocs/fourn/facture/contact.php
+++ b/htdocs/fourn/facture/contact.php
@@ -266,7 +266,6 @@ if ($id > 0 || ! empty($ref))
// Contacts lines
include DOL_DOCUMENT_ROOT.'/core/tpl/contacts.tpl.php';
-
}
else
{
diff --git a/htdocs/fourn/facture/document.php b/htdocs/fourn/facture/document.php
index 4239331d0a6..d38a7992bd8 100644
--- a/htdocs/fourn/facture/document.php
+++ b/htdocs/fourn/facture/document.php
@@ -157,7 +157,6 @@ if ($object->id > 0)
if ($action == 'delete')
{
print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&urlfile='.urlencode($_GET["urlfile"]), $langs->trans('DeleteFile'), $langs->trans('ConfirmDeleteFile'), 'confirm_deletefile', '', 0, 1);
-
}
print '| '; } print ''; - } } diff --git a/htdocs/fourn/paiement/card.php b/htdocs/fourn/paiement/card.php index 22b3e307ab3..9cc5fb27b84 100644 --- a/htdocs/fourn/paiement/card.php +++ b/htdocs/fourn/paiement/card.php @@ -166,7 +166,6 @@ if ($result > 0) if ($action == 'delete') { print $form->formconfirm($_SERVER['PHP_SELF'].'?id='.$object->id, $langs->trans("DeletePayment"), $langs->trans("ConfirmDeletePayment"), 'confirm_delete'); - } /* @@ -175,7 +174,6 @@ if ($result > 0) if ($action == 'valide') { print $form->formconfirm($_SERVER['PHP_SELF'].'?id='.$object->id, $langs->trans("ValidatePayment"), $langs->trans("ConfirmValidatePayment"), 'confirm_valide'); - } $linkback = '' . $langs->trans("BackToList") . ''; @@ -345,7 +343,6 @@ if ($result > 0) || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->fournisseur->supplier_invoice_advance->validate))) { print ''.$langs->trans('Valid').''; - } } } diff --git a/htdocs/ftp/index.php b/htdocs/ftp/index.php index 7c9527f3a9a..64b9fb0a8ea 100644 --- a/htdocs/ftp/index.php +++ b/htdocs/ftp/index.php @@ -235,7 +235,6 @@ if ($_POST["const"] && $_POST["delete"] && $_POST["delete"] == $langs->trans("De $action=''; } } - } else { @@ -339,7 +338,6 @@ if ($action == 'download') { setEventMessages($langs->transnoentitiesnoconv('FailedToGetFile',$remotefile), null, 'errors'); } - } else { @@ -408,7 +406,6 @@ else if ($action == 'delete') { print $form->formconfirm($_SERVER["PHP_SELF"].'?numero_ftp='.$numero_ftp.'§ion='.urlencode($_REQUEST["section"]).'&file='.urlencode($_GET["file"]), $langs->trans('DeleteFile'), $langs->trans('ConfirmDeleteFile'), 'confirm_deletefile','','',1); - } // Confirmation de la suppression d'une ligne categorie @@ -610,7 +607,6 @@ else $i++; $nbofentries++; } - } print " |
';
print $langs->trans('ErrorUserViewCP');
print '
'; print '
';
}
-
} else {
print ''; print '
';
print $langs->trans('ErrorIDFicheCP');
print '
'; print '
';
}
-
}
-
}
// End of page
diff --git a/htdocs/holiday/class/holiday.class.php b/htdocs/holiday/class/holiday.class.php
index a888a4919a6..9b42655fe5f 100644
--- a/htdocs/holiday/class/holiday.class.php
+++ b/htdocs/holiday/class/holiday.class.php
@@ -1468,7 +1468,6 @@ class Holiday extends CommonObject
$this->error="Error ".$this->db->lasterror();
return -1;
}
-
}
else
{
@@ -1510,7 +1509,6 @@ class Holiday extends CommonObject
return -1;
}
}
-
}
else
{ // Si faux donc return array
diff --git a/htdocs/holiday/list.php b/htdocs/holiday/list.php
index fcd5cc9d8b0..d4abba41c02 100644
--- a/htdocs/holiday/list.php
+++ b/htdocs/holiday/list.php
@@ -605,7 +605,6 @@ elseif (! empty($holiday->holiday) && !empty($mysoc->country_id))
print '';
print ''."\n";
-
}
}
diff --git a/htdocs/holiday/month_report.php b/htdocs/holiday/month_report.php
index e9b98deb1f9..53fab6a825f 100644
--- a/htdocs/holiday/month_report.php
+++ b/htdocs/holiday/month_report.php
@@ -189,7 +189,6 @@ else
print ''; print '
'; return $res; diff --git a/htdocs/projet/class/task.class.php b/htdocs/projet/class/task.class.php index a4ef7965851..c5a7a334eb0 100644 --- a/htdocs/projet/class/task.class.php +++ b/htdocs/projet/class/task.class.php @@ -1568,7 +1568,6 @@ class Task extends CommonObject { $clone_task->date_end = $now + $clone_task->date_end - $orign_project_dt_start; } - } if (!$clone_prog) diff --git a/htdocs/projet/document.php b/htdocs/projet/document.php index e585acd7d85..af9f7c2d8fc 100644 --- a/htdocs/projet/document.php +++ b/htdocs/projet/document.php @@ -152,7 +152,6 @@ if ($object->id > 0) $permission = ($userWrite > 0); $permtoedit = ($userWrite > 0); include_once DOL_DOCUMENT_ROOT . '/core/tpl/document_actions_post_headers.tpl.php'; - } else { diff --git a/htdocs/projet/element.php b/htdocs/projet/element.php index 489c5d04be4..2c64826853c 100644 --- a/htdocs/projet/element.php +++ b/htdocs/projet/element.php @@ -489,7 +489,6 @@ $resHook = $hookmanager->executeHooks('completeListOfReferent', $parameters, $ob if(!empty($hookmanager->resArray)) { $listofreferent = array_merge($listofreferent, $hookmanager->resArray); - } if ($action=="addelement") diff --git a/htdocs/projet/list.php b/htdocs/projet/list.php index a93fac0edbd..5a13b16560d 100644 --- a/htdocs/projet/list.php +++ b/htdocs/projet/list.php @@ -888,7 +888,6 @@ while ($i < min($num,$limit)) if (! $i) $totalarray['nbfield']++; print "\n"; - } $i++; diff --git a/htdocs/projet/tasks.php b/htdocs/projet/tasks.php index bffe5f4a373..d9fcc8b642a 100644 --- a/htdocs/projet/tasks.php +++ b/htdocs/projet/tasks.php @@ -524,7 +524,6 @@ if ($action == 'create' && $user->rights->projet->creer && (empty($object->third print ''; print ''; - } else if ($id > 0 || ! empty($ref)) { diff --git a/htdocs/projet/tasks/comment.php b/htdocs/projet/tasks/comment.php index 19ba461fbe4..ba54b35a59e 100644 --- a/htdocs/projet/tasks/comment.php +++ b/htdocs/projet/tasks/comment.php @@ -275,7 +275,6 @@ if ($id > 0 || ! empty($ref)) // Include comment tpl view include DOL_DOCUMENT_ROOT . '/core/tpl/bloc_comment.tpl.php'; - } } diff --git a/htdocs/projet/tasks/contact.php b/htdocs/projet/tasks/contact.php index 3272c43ad10..d86c8b469ae 100644 --- a/htdocs/projet/tasks/contact.php +++ b/htdocs/projet/tasks/contact.php @@ -518,7 +518,6 @@ if ($id > 0 || ! empty($ref)) } } print ""; - } else { diff --git a/htdocs/public/cron/cron_run_jobs.php b/htdocs/public/cron/cron_run_jobs.php index 320a8e3895a..df207e87d85 100644 --- a/htdocs/public/cron/cron_run_jobs.php +++ b/htdocs/public/cron/cron_run_jobs.php @@ -169,7 +169,6 @@ if (is_array($qualifiedjobs) && (count($qualifiedjobs)>0)) dol_syslog("cron_run_jobs.php::reprogram_jobs Error".$cronjob->error, LOG_ERR); exit; } - } } echo "Result: ".($nbofjobs)." jobs - ".($nbofjobslaunchedok+$nbofjobslaunchedko)." launched = ".$nbofjobslaunchedok." OK + ".$nbofjobslaunchedko." KO"; diff --git a/htdocs/public/donations/donateurs_code.php b/htdocs/public/donations/donateurs_code.php index 9f03f9e293e..86db4b089aa 100644 --- a/htdocs/public/donations/donateurs_code.php +++ b/htdocs/public/donations/donateurs_code.php @@ -99,7 +99,6 @@ if ($resql) $i++; } print ""; - } else { diff --git a/htdocs/public/emailing/mailing-read.php b/htdocs/public/emailing/mailing-read.php index 23511974137..0b79f656450 100644 --- a/htdocs/public/emailing/mailing-read.php +++ b/htdocs/public/emailing/mailing-read.php @@ -86,7 +86,6 @@ if (! empty($tag)) dol_syslog("public/emailing/mailing-read.php : Mail read contact : ".$sql, LOG_DEBUG); $resql=$db->query($sql); - } $db->close(); diff --git a/htdocs/public/members/public_card.php b/htdocs/public/members/public_card.php index eda1aaf2c68..bc8fd0cde17 100644 --- a/htdocs/public/members/public_card.php +++ b/htdocs/public/members/public_card.php @@ -113,7 +113,6 @@ if ($id > 0) print ''; } - } diff --git a/htdocs/public/onlinesign/newonlinesign.php b/htdocs/public/onlinesign/newonlinesign.php index e8db916ad91..277cd1ada78 100644 --- a/htdocs/public/onlinesign/newonlinesign.php +++ b/htdocs/public/onlinesign/newonlinesign.php @@ -120,7 +120,6 @@ $creditor = $mysoc->name; if ($action == 'dosign') { // TODO - } @@ -256,8 +255,6 @@ if ($source == 'proposal') print ''; print ''; print ''."\n"; - - } diff --git a/htdocs/public/payment/newpayment.php b/htdocs/public/payment/newpayment.php index 47cdc8bb31e..0975186eb03 100644 --- a/htdocs/public/payment/newpayment.php +++ b/htdocs/public/payment/newpayment.php @@ -620,7 +620,6 @@ if ($action == 'charge' && ! empty($conf->stripe->enabled)) header("Location: ".$urlok); exit; } - } diff --git a/htdocs/public/stripe/ipn.php b/htdocs/public/stripe/ipn.php index e1b160541b2..45fd6489f92 100644 --- a/htdocs/public/stripe/ipn.php +++ b/htdocs/public/stripe/ipn.php @@ -234,28 +234,23 @@ elseif ($event->type == 'payout.paid') { elseif ($event->type == 'charge.succeeded') { //TODO: create fees - } elseif ($event->type == 'customer.source.created') { //TODO: save customer's source - } elseif ($event->type == 'customer.source.updated') { //TODO: update customer's source - } elseif ($event->type == 'customer.source.delete') { //TODO: delete customer's source - } elseif ($event->type == 'charge.failed') { $subject = 'Your payment has been received: '.$event->data->object->id.''; $headers = 'From: "'.$conf->global->MAIN_INFO_SOCIETE_MAIL.'" <'.$conf->global->MAIN_INFO_SOCIETE_MAIL.'>'; - } elseif (($event->type == 'source.chargeable') && ($event->data->object->type == 'three_d_secure') && ($event->data->object->three_d_secure->authenticated==true)) { diff --git a/htdocs/resource/card.php b/htdocs/resource/card.php index 5ba98ae9f69..49cad87e990 100644 --- a/htdocs/resource/card.php +++ b/htdocs/resource/card.php @@ -171,7 +171,6 @@ if (empty($reshook)) setEventMessages($object->error, $object->errors, 'errors'); $error++; } - } else { diff --git a/htdocs/resource/class/dolresource.class.php b/htdocs/resource/class/dolresource.class.php index c6e25c4d837..ad3355e3972 100644 --- a/htdocs/resource/class/dolresource.class.php +++ b/htdocs/resource/class/dolresource.class.php @@ -384,7 +384,6 @@ class Dolresource extends CommonObject if($obj->element_id && $obj->element_type) { $this->objelement = fetchObjectByElement($obj->element_id,$obj->element_type); } - } $this->db->free($resql); @@ -646,7 +645,6 @@ class Dolresource extends CommonObject if($obj->element_id && $obj->element_type) $line->objelement = fetchObjectByElement($obj->element_id,$obj->element_type); $this->lines[] = $line; - } $this->db->free($resql); } diff --git a/htdocs/resource/document.php b/htdocs/resource/document.php index 6a32ba9f645..85ec5b96c79 100644 --- a/htdocs/resource/document.php +++ b/htdocs/resource/document.php @@ -135,7 +135,6 @@ if ($object->id) $permission = $user->rights->resource->write; include_once DOL_DOCUMENT_ROOT . '/core/tpl/document_actions_post_headers.tpl.php'; - } else { diff --git a/htdocs/resource/element_resource.php b/htdocs/resource/element_resource.php index adbd8eec87f..a83e37bc0b4 100644 --- a/htdocs/resource/element_resource.php +++ b/htdocs/resource/element_resource.php @@ -462,7 +462,6 @@ else if(file_exists(dol_buildpath($path.'/core/tpl/resource_'.$element_prop['element'].'_view.tpl.php'))) { $res=@include dol_buildpath($path.'/core/tpl/resource_'.$element_prop['element'].'_view.tpl.php'); - } else { diff --git a/htdocs/societe/admin/societe.php b/htdocs/societe/admin/societe.php index 49a9538e225..0166b6a233a 100644 --- a/htdocs/societe/admin/societe.php +++ b/htdocs/societe/admin/societe.php @@ -788,7 +788,6 @@ if (!empty($conf->global->SOCIETE_ADD_REF_IN_LIST)) { print ''; print img_picto($langs->trans("Activated"),'switch_on'); - } else { @@ -806,7 +805,6 @@ if (!empty($conf->global->COMPANY_SHOW_ADDRESS_SELECTLIST)) { print ''; print img_picto($langs->trans("Activated"),'switch_on'); - } else { @@ -826,7 +824,6 @@ if (!empty($conf->global->SOCIETE_ASK_FOR_SHIPPING_METHOD)) { print ''; print img_picto($langs->trans("Activated"),'switch_on'); - } else { @@ -845,7 +842,6 @@ if (!empty($conf->global->SOCIETE_DISABLE_PROSPECTSCUSTOMERS)) { print ''; print img_picto($langs->trans("Activated"),'switch_on'); - } else { diff --git a/htdocs/societe/canvas/actions_card_common.class.php b/htdocs/societe/canvas/actions_card_common.class.php index 2577f5bed5d..92d009db604 100644 --- a/htdocs/societe/canvas/actions_card_common.class.php +++ b/htdocs/societe/canvas/actions_card_common.class.php @@ -258,7 +258,6 @@ abstract class ActionsCardCommon $this->tpl['localtax'].= '
'.dol_htmlentitiesbr($objp->description):''; } - } else { if (! empty($objp->label) || ! empty($objp->description)) diff --git a/htdocs/societe/price.php b/htdocs/societe/price.php index 0fbc4368a87..a9b280a3f47 100644 --- a/htdocs/societe/price.php +++ b/htdocs/societe/price.php @@ -609,7 +609,6 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES)) { print ""; print ""; - } } diff --git a/htdocs/stripe/charge.php b/htdocs/stripe/charge.php index 0f26bf0e11a..73c1f7b86c8 100644 --- a/htdocs/stripe/charge.php +++ b/htdocs/stripe/charge.php @@ -221,7 +221,6 @@ if (!$rowid) } elseif ($charge->paid=='1'){ print img_picto($langs->trans("".$charge->status.""),'statut4'); - } else { $label="Message: ".$charge->failure_message."
"; $label.="Réseau: ".$charge->outcome->network_status."
"; diff --git a/htdocs/stripe/class/actions_stripe.class.php b/htdocs/stripe/class/actions_stripe.class.php index f3c76be9d35..a74b2d52eef 100644 --- a/htdocs/stripe/class/actions_stripe.class.php +++ b/htdocs/stripe/class/actions_stripe.class.php @@ -109,7 +109,6 @@ class ActionsStripeconnect $this->resprints.= $langs->trans("NoStripe"); } $this->resprints.= ''; - } elseif (is_object($object) && $object->element == 'member'){ $this->resprints.= '